8000
From a9ec12aaa0901137b6795be07002865bc9ac2f56 Mon Sep 17 00:00:00 2001
From: Nommyde <b@keev.me>
Date: Mon, 31 Oct 2022 04:22:35 +0400
Subject: [PATCH 001/475] [Messenger] Improve DX

---
 .../Component/Messenger/Command/FailedMessagesRetryCommand.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
index df007540c4e2b..77295b6a64370 100644
--- a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
+++ b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
@@ -176,7 +176,7 @@ private function runWorker(string $failureTransportName, ReceiverInterface $rece
                 throw new \RuntimeException(sprintf('The message with id "%s" could not decoded, it can only be shown or removed.', $this->getMessageId($envelope) ?? '?'));
             }
 
-            $shouldHandle = $shouldForce || $io->confirm('Do you want to retry (yes) or delete this message (no)?');
+            $shouldHandle = $shouldForce || 'retry' === $io->choice('Please select an action', ['retry', 'delete'], 'retry');
 
             if ($shouldHandle) {
                 return;

From d2b6b49b766bd089e7b411cef42a52bf007ea843 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Thu, 3 Nov 2022 16:56:46 +0100
Subject: [PATCH 002/475] [HttpFoundation][Validator] Leverage json_validate()

---
 composer.json                                             | 1 +
 .../RequestMatcher/IsJsonRequestMatcher.php               | 8 +-------
 src/Symfony/Component/HttpFoundation/composer.json        | 3 ++-
 .../Component/Validator/Constraints/JsonValidator.php     | 4 +---
 src/Symfony/Component/Validator/composer.json             | 1 +
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index eda77e963e5ef..ea78be5f30023 100644
--- a/composer.json
+++ b/composer.json
@@ -51,6 +51,7 @@
         "symfony/polyfill-intl-idn": "^1.10",
         "symfony/polyfill-intl-normalizer": "~1.0",
         "symfony/polyfill-mbstring": "~1.0",
+        "symfony/polyfill-php83": "^1.27",
         "symfony/polyfill-uuid": "^1.15"
     },
     "replace": {
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher/IsJsonRequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher/IsJsonRequestMatcher.php
index 5da46840f4fd1..875f992be156a 100644
--- a/src/Symfony/Component/HttpFoundation/RequestMatcher/IsJsonRequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/RequestMatcher/IsJsonRequestMatcher.php
@@ -23,12 +23,6 @@ class IsJsonRequestMatcher implements RequestMatcherInterface
 {
     public function matches(Request $request): bool
     {
-        try {
-            json_decode($request->getContent(), true, 512, \JSON_BIGINT_AS_STRING | \JSON_THROW_ON_ERROR);
-        } catch (\JsonException) {
-            return false;
-        }
-
-        return true;
+        return json_validate($request->getContent());
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
index e333a23b7ab31..ddcb502515b74 100644
--- a/src/Symfony/Component/HttpFoundation/composer.json
+++ b/src/Symfony/Component/HttpFoundation/composer.json
@@ -18,7 +18,8 @@
     "require": {
         "php": ">=8.1",
         "symfony/deprecation-contracts": "^2.1|^3",
-        "symfony/polyfill-mbstring": "~1.1"
+        "symfony/polyfill-mbstring": "~1.1",
+        "symfony/polyfill-php83": "^1.27"
     },
     "require-dev": {
         "predis/predis": "~1.0",
diff --git a/src/Symfony/Component/Validator/Constraints/JsonValidator.php b/src/Symfony/Component/Validator/Constraints/JsonValidator.php
index 32807a12ec59c..dd7a47eb3ef05 100644
--- a/src/Symfony/Component/Validator/Constraints/JsonValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/JsonValidator.php
@@ -36,9 +36,7 @@ public function validate(mixed $value, Constraint $constraint)
 
         $value = (string) $value;
 
-        json_decode($value);
-
-        if (\JSON_ERROR_NONE !== json_last_error()) {
+        if (!json_validate($value)) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(Json::INVALID_JSON_ERROR)
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index 63cb9e3a9745e..1b076c4290f55 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -20,6 +20,7 @@
         "symfony/deprecation-contracts": "^2.1|^3",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",
+        "symfony/polyfill-php83": "^1.27",
         "symfony/translation-contracts": "^1.1|^2|^3"
     },
     "require-dev": {

From f95f1f977075531e3981bcfd4dee9efe29bedfa8 Mon Sep 17 00:00:00 2001
From: Yannick Ihmels <yannick@ihmels.org>
Date: Tue, 8 Nov 2022 21:58:02 +0100
Subject: [PATCH 003/475] Add encoder option for saving options

---
 src/Symfony/Component/Serializer/CHANGELOG.md         |  5 +++++
 .../Component/Serializer/Encoder/XmlEncoder.php       | 11 +++++++++--
 .../Serializer/Tests/Encoder/XmlEncoderTest.php       |  4 +++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
index 3342ada2fea86..d7799bb50236f 100644
--- a/src/Symfony/Component/Serializer/CHANGELOG.md
+++ b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `XmlEncoder::SAVE_OPTIONS` context option
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index 0132f1ebf3c83..2207012ca6225 100644
--- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -44,9 +44,15 @@ class XmlEncoder implements EncoderInterface, DecoderInterface, NormalizationAwa
     public const FORMAT_OUTPUT = 'xml_format_output';
 
     /**
-     * A bit field of LIBXML_* constants.
+     * A bit field of LIBXML_* constants for loading XML documents.
      */
     public const LOAD_OPTIONS = 'load_options';
+
+    /**
+     * A bit field of LIBXML_* constants for saving XML documents.
+     */
+    public const SAVE_OPTIONS = 'save_options';
+
     public const REMOVE_EMPTY_TAGS = 'remove_empty_tags';
     public const ROOT_NODE_NAME = 'xml_root_node_name';
     public const STANDALONE = 'xml_standalone';
@@ -58,6 +64,7 @@ class XmlEncoder implements EncoderInterface, DecoderInterface, NormalizationAwa
         self::DECODER_IGNORED_NODE_TYPES => [\XML_PI_NODE, \XML_COMMENT_NODE],
         self::ENCODER_IGNORED_NODE_TYPES => [],
         self::LOAD_OPTIONS => \LIBXML_NONET | \LIBXML_NOBLANKS,
+        self::SAVE_OPTIONS => 0,
         self::REMOVE_EMPTY_TAGS => false,
         self::ROOT_NODE_NAME => 'response',
         self::TYPE_CAST_ATTRIBUTES => true,
@@ -88,7 +95,7 @@ public function encode(mixed $data, string $format, array $context = []): string
             $this->appendNode($dom, $data, $format, $context, $xmlRootNodeName);
         }
 
-        return $dom->saveXML($ignorePiNode ? $dom->documentElement : null);
+        return $dom->saveXML($ignorePiNode ? $dom->documentElement : null, $context[self::SAVE_OPTIONS] ?? $this->defaultContext[self::SAVE_OPTIONS]);
     }
 
     public function decode(string $data, string $format, array $context = []): mixed
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
index 77b220d585346..11e7bef3e5f17 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -189,12 +189,13 @@ public function testEncodeNotRemovingEmptyTags()
 
     public function testContext()
     {
-        $array = ['person' => ['name' => 'George Abitbol']];
+        $array = ['person' => ['name' => 'George Abitbol', 'age' => null]];
         $expected = <<<'XML'
 <?xml version="1.0"?>
 <response>
   <person>
     <name>George Abitbol</name>
+    <age></age>
   </person>
 </response>
 
@@ -202,6 +203,7 @@ public function testContext()
 
         $context = [
             'xml_format_output' => true,
+            'save_options' => \LIBXML_NOEMPTYTAG,
         ];
 
         $this->assertSame($expected, $this->encoder->encode($array, 'xml', $context));

From 215e80274172d70e3c7146a878724f0ef910bee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Sch=C3=A4dlich?= <jan.schaedlich@sensiolabs.de>
Date: Sun, 6 Dec 2020 15:59:31 +0100
Subject: [PATCH 004/475] Allow to configure or disable the message bus to use

---
 .../DependencyInjection/Configuration.php     |  3 ++
 .../Resources/config/notifier.php             | 19 +++++++++----
 .../DependencyInjection/ConfigurationTest.php |  1 +
 .../notifier_with_disabled_message_bus.php    | 19 +++++++++++++
 .../notifier_with_specific_message_bus.php    | 19 +++++++++++++
 .../notifier_with_disabled_message_bus.xml    | 17 +++++++++++
 .../notifier_with_specific_message_bus.xml    | 17 +++++++++++
 .../notifier_with_disabled_message_bus.yml    | 11 ++++++++
 .../notifier_with_specific_message_bus.yml    | 11 ++++++++
 .../FrameworkExtensionTest.php                | 28 +++++++++++++++++++
 10 files changed, 140 insertions(+), 5 deletions(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_disabled_message_bus.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_specific_message_bus.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_disabled_message_bus.xml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_specific_message_bus.xml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_disabled_message_bus.yml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_specific_message_bus.yml

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 698fb84fc769f..c1e567cc0e436 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -2014,6 +2014,9 @@ private function addNotifierSection(ArrayNodeDefinition $rootNode, callable $ena
                 ->arrayNode('notifier')
                     ->info('Notifier configuration')
                     ->{$enableIfStandalone('symfony/notifier', Notifier::class)}()
+                    ->children()
+                        ->scalarNode('message_bus')->defaultNull()->info('The message bus to use. Defaults to the default bus if the Messenger component is installed.')->end()
+                    ->end()
                     ->fixXmlConfig('chatter_transport')
                     ->children()
                         ->arrayNode('chatter_transports')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier.php
index fde0533140809..2f53ff03de03d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier.php
@@ -52,15 +52,24 @@
             ->tag('notifier.channel', ['channel' => 'browser'])
 
         ->set('notifier.channel.chat', ChatChannel::class)
-            ->args([service('chatter.transports'), service('messenger.default_bus')->ignoreOnInvalid()])
+            ->args([
+                service('chatter.transports'),
+                abstract_arg('message bus'),
+            ])
             ->tag('notifier.channel', ['channel' => 'chat'])
 
         ->set('notifier.channel.sms', SmsChannel::class)
-            ->args([service('texter.transports'), service('messenger.default_bus')->ignoreOnInvalid()])
+            ->args([
+                service('texter.transports'),
+                abstract_arg('message bus'),
+            ])
             ->tag('notifier.channel', ['channel' => 'sms'])
 
         ->set('notifier.channel.email', EmailChannel::class)
-            ->args([service('mailer.transports'), service('messenger.default_bus')->ignoreOnInvalid()])
+            ->args([
+                service('mailer.transports'),
+                abstract_arg('message bus'),
+            ])
             ->tag('notifier.channel', ['channel' => 'email'])
 
         ->set('notifier.channel.push', PushChannel::class)
@@ -76,7 +85,7 @@
         ->set('chatter', Chatter::class)
             ->args([
                 service('chatter.transports'),
-                service('messenger.default_bus')->ignoreOnInvalid(),
+                abstract_arg('message bus'),
                 service('event_dispatcher')->ignoreOnInvalid(),
             ])
 
@@ -96,7 +105,7 @@
         ->set('texter', Texter::class)
             ->args([
                 service('texter.transports'),
-                service('messenger.default_bus')->ignoreOnInvalid(),
+                abstract_arg('message bus'),
                 service('event_dispatcher')->ignoreOnInvalid(),
             ])
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index 59c7bf7a8b875..f37794e3d7fe5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -655,6 +655,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
             ],
             'notifier' => [
                 'enabled' => !class_exists(FullStack::class) && class_exists(Notifier::class),
+                'message_bus' => null,
                 'chatter_transports' => [],
                 'texter_transports' => [],
                 'channel_policy' => [],
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_disabled_message_bus.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_disabled_message_bus.php
new file mode 100644
index 0000000000000..014b54b94a5dd
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_disabled_message_bus.php
@@ -0,0 +1,19 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'messenger' => [
+        'enabled' => true,
+    ],
+    'mailer' => [
+        'dsn' => 'smtp://example.com',
+    ],
+    'notifier' => [
+        'message_bus' => false,
+        'chatter_transports' => [
+            'test' => 'null'
+        ],
+        'texter_transports' => [
+            'test' => 'null'
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_specific_message_bus.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_specific_message_bus.php
new file mode 100644
index 0000000000000..75074e073ce29
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_specific_message_bus.php
@@ -0,0 +1,19 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'messenger' => [
+        'enabled' => true,
+    ],
+    'mailer' => [
+        'dsn' => 'smtp://example.com',
+    ],
+    'notifier' => [
+        'message_bus' => 'app.another_bus',
+        'chatter_transports' => [
+            'test' => 'null'
+        ],
+        'texter_transports' => [
+            'test' => 'null'
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_disabled_message_bus.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_disabled_message_bus.xml
new file mode 100644
index 0000000000000..599bd23cb8f43
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_disabled_message_bus.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+
+<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 enabled="true" />
+        <framework:mailer dsn="smtp://example.com" />
+        <framework:notifier enabled="true" message-bus="false">
+            <framework:chatter-transport name="test">null</framework:chatter-transport>
+            <framework:texter-transport name="test">null</framework:texter-transport>
+        </framework:notifier>
+    </framework:config>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_specific_message_bus.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_specific_message_bus.xml
new file mode 100644
index 0000000000000..62373497056ac
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_specific_message_bus.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+
+<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 enabled="true" />
+        <framework:mailer dsn="smtp://example.com" />
+        <framework:notifier enabled="true" message-bus="app.another_bus">
+            <framework:chatter-transport name="test">null</framework:chatter-transport>
+            <framework:texter-transport name="test">null</framework:texter-transport>
+        </framework:notifier>
+    </framework:config>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_disabled_message_bus.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_disabled_message_bus.yml
new file mode 100644
index 0000000000000..08b3d6ad6e759
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_disabled_message_bus.yml
@@ -0,0 +1,11 @@
+framework:
+    messenger:
+        enabled: true
+    mailer:
+        dsn: 'smtp://example.com'
+    notifier:
+        message_bus: false
+        chatter_transports:
+            test: 'null'
+        texter_transports:
+            test: 'null'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_specific_message_bus.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_specific_message_bus.yml
new file mode 100644
index 0000000000000..1851717bd9627
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_specific_message_bus.yml
@@ -0,0 +1,11 @@
+framework:
+    messenger:
+        enabled: true
+    mailer:
+        dsn: 'smtp://example.com'
+    notifier:
+        message_bus: 'app.another_bus'
+        chatter_transports:
+            test: 'null'
+        texter_transports:
+            test: 'null'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 640a152402bea..225da8671b1da 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -2173,6 +2173,34 @@ public function testHtmlSanitizerDefaultConfig()
         $this->assertSame('html_sanitizer', (string) $container->getAlias(HtmlSanitizerInterface::class));
     }
 
+    public function testNotifierWithDisabledMessageBus()
+    {
+        $container = $this->createContainerFromFile('notifier_with_disabled_message_bus');
+
+        $this->assertNull($container->getDefinition('chatter')->getArgument(1));
+        $this->assertNull($container->getDefinition('texter')->getArgument(1));
+        $this->assertNull($container->getDefinition('notifier.channel.chat')->getArgument(1));
+        $this->assertNull($container->getDefinition('notifier.channel.email')->getArgument(1));
+        $this->assertNull($container->getDefinition('notifier.channel.sms')->getArgument(1));
+    }
+
+    public function testNotifierWithSpecificMessageBus()
+    {
+        $container = $this->createContainerFromFile('notifier_with_specific_message_bus');
+
+        $this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('chatter')->getArgument(1));
+        $this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('texter')->getArgument(1));
+        $this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('notifier.channel.chat')->getArgument(1));
+        $this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('notifier.channel.email')->getArgument(1));
+        $this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('notifier.channel.sms')->getArgument(1));
+
+        $this->assertNull($container->getDefinition('chatter')->getArgument(0));
+        $this->assertNull($container->getDefinition('texter')->getArgument(0));
+        $this->assertNull($container->getDefinition('notifier.channel.chat')->getArgument(0));
+        $this->assertNull($container->getDefinition('notifier.channel.email')->getArgument(0));
+        $this->assertNull($container->getDefinition('notifier.channel.sms')->getArgument(0));
+    }
+
     protected function createContainer(array $data = [])
     {
         return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([

From fc7aaa6123c3e0cf4543bb3faeb65cbde26112bc Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Thu, 21 Jul 2022 12:04:37 +0200
Subject: [PATCH 005/475] Fix logic and tests

---
 .../DependencyInjection/FrameworkExtension.php       | 12 ++++++++++++
 .../DependencyInjection/FrameworkExtensionTest.php   |  6 ------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 982210c5fcc4b..6092506f9b3a2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2522,6 +2522,18 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             $container->removeDefinition('notifier.channel.email');
         }
 
+        foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms'] as $serviceId) {
+            if (!$container->hasDefinition($serviceId)) {
+                continue;
+            }
+
+            if (false === $messageBus = $config['message_bus']) {
+                $container->getDefinition($serviceId)->replaceArgument(1, null);
+            } else {
+                $container->getDefinition($serviceId)->replaceArgument(1, $messageBus ? new Reference($messageBus) : new Reference('messenger.default_bus', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+            }
+        }
+
         if ($this->isInitializedConfigEnabled('messenger')) {
             if ($config['notification_on_failed_messages']) {
                 $container->getDefinition('notifier.failed_message_listener')->addTag('kernel.event_subscriber');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 225da8671b1da..b87a877690815 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -2193,12 +2193,6 @@ public function testNotifierWithSpecificMessageBus()
         $this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('notifier.channel.chat')->getArgument(1));
         $this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('notifier.channel.email')->getArgument(1));
         $this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('notifier.channel.sms')->getArgument(1));
-
-        $this->assertNull($container->getDefinition('chatter')->getArgument(0));
-        $this->assertNull($container->getDefinition('texter')->getArgument(0));
-        $this->assertNull($container->getDefinition('notifier.channel.chat')->getArgument(0));
-        $this->assertNull($container->getDefinition('notifier.channel.email')->getArgument(0));
-        $this->assertNull($container->getDefinition('notifier.channel.sms')->getArgument(0));
     }
 
     protected function createContainer(array $data = [])

From a9d621cca9b3c1bf019c725a140644dafbaeaa09 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 31 Oct 2022 15:48:15 +0100
Subject: [PATCH 006/475] [Notifier] Add Twitter notifier

---
 .../FrameworkExtension.php                    |   2 +
 .../Resources/config/notifier_transports.php  |   5 +
 .../Notifier/Bridge/Twitter/.gitattributes    |   4 +
 .../Notifier/Bridge/Twitter/.gitignore        |   3 +
 .../Notifier/Bridge/Twitter/CHANGELOG.md      |   7 +
 .../Component/Notifier/Bridge/Twitter/LICENSE |  19 ++
 .../Notifier/Bridge/Twitter/README.md         |  25 ++
 .../Tests/TwitterTransportFactoryTest.php     |  44 +++
 .../Twitter/Tests/TwitterTransportTest.php    | 201 +++++++++++
 .../Bridge/Twitter/Tests/fixtures.gif         | Bin 0 -> 185 bytes
 .../Bridge/Twitter/TwitterOptions.php         | 189 +++++++++++
 .../Bridge/Twitter/TwitterTransport.php       | 311 ++++++++++++++++++
 .../Twitter/TwitterTransportFactory.php       |  50 +++
 .../Notifier/Bridge/Twitter/composer.json     |  36 ++
 .../Notifier/Bridge/Twitter/phpunit.xml.dist  |  31 ++
 .../Exception/UnsupportedSchemeException.php  |   4 +
 .../UnsupportedSchemeExceptionTest.php        |   3 +
 src/Symfony/Component/Notifier/Transport.php  |   2 +
 18 files changed, 936 insertions(+)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/.gitattributes
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/.gitignore
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/README.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/Tests/fixtures.gif
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/TwitterOptions.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransport.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransportFactory.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/composer.json
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twitter/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 982210c5fcc4b..a0e2d58abad65 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -172,6 +172,7 @@
 use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
 use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransport;
 use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
+use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransportFactory;
 use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory;
 use Symfony\Component\Notifier\Bridge\Yunpian\YunpianTransportFactory;
 use Symfony\Component\Notifier\Bridge\Zendesk\ZendeskTransportFactory;
@@ -2593,6 +2594,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             TelnyxTransportFactory::class => 'notifier.transport_factory.telnyx',
             TurboSmsTransport::class => 'notifier.transport_factory.turbo-sms',
             TwilioTransportFactory::class => 'notifier.transport_factory.twilio',
+            TwitterTransportFactory::class => 'notifier.transport_factory.twitter',
             VonageTransportFactory::class => 'notifier.transport_factory.vonage',
             YunpianTransportFactory::class => 'notifier.transport_factory.yunpian',
             ZendeskTransportFactory::class => 'notifier.transport_factory.zendesk',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
index 237ae18a59eb7..1d2772727f782 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -59,6 +59,7 @@
 use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
 use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
+use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransportFactory;
 use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory;
 use Symfony\Component\Notifier\Bridge\Yunpian\YunpianTransportFactory;
 use Symfony\Component\Notifier\Bridge\Zendesk\ZendeskTransportFactory;
@@ -105,6 +106,10 @@
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
+        ->set('notifier.transport_factory.twitter', TwitterTransportFactory::class)
+            ->parent('notifier.transport_factory.abstract')
+            ->tag('chatter.transport_factory')
+
         ->set('notifier.transport_factory.all-my-sms', AllMySmsTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/.gitattributes b/src/Symfony/Component/Notifier/Bridge/Twitter/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/.gitignore b/src/Symfony/Component/Notifier/Bridge/Twitter/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Twitter/CHANGELOG.md
new file mode 100644
index 0000000000000..1f2c8f86cde72
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+ * Add the bridge
diff --git a/src/Symfony/Component/Notifier/
8000
Bridge/Twitter/LICENSE b/src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE
new file mode 100644
index 0000000000000..0ece8964f767d
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/README.md b/src/Symfony/Component/Notifier/Bridge/Twitter/README.md
new file mode 100644
index 0000000000000..6a145177815e5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/README.md
@@ -0,0 +1,25 @@
+Twitter Notifier
+===============
+
+Provides [Twitter](https://twitter.com) integration for Symfony Notifier.
+
+DSN example
+-----------
+
+```
+TWITTER_DSN=twitter://API_KEY:API_SECRET:ACCESS_TOKEN:ACCESS_SECRET@default
+```
+
+where:
+ - `API_KEY` is your Twitter API Key
+ - `API_SECRET` is your Twitter API Key Secret
+ - `ACCESS_TOKEN` is your read+write Twitter Access Token
+ - `ACCESS_SECRET` is your read+write Twitter Access Token Secret
+
+Resources
+---------
+
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php
new file mode 100644
index 0000000000000..7aa6c0f2b4966
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Twitter\Tests;
+
+use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransportFactory;
+use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+
+class TwitterTransportFactoryTest extends TransportFactoryTestCase
+{
+    public function createFactory(): TwitterTransportFactory
+    {
+        return new TwitterTransportFactory();
+    }
+
+    public function createProvider(): iterable
+    {
+        yield ['twitter://host.test', 'twitter://A:B:C:D@host.test'];
+    }
+
+    public function supportsProvider(): iterable
+    {
+        yield [true, 'twitter://default'];
+        yield [false, 'somethingElse://default'];
+    }
+
+    public function unsupportedSchemeProvider(): iterable
+    {
+        yield ['somethingElse://default'];
+    }
+
+    public function incompleteDsnProvider(): iterable
+    {
+        yield ['twitter://A:B@default', 'Invalid "twitter://A:B@default" notifier DSN: Access Token is missing'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportTest.php
new file mode 100644
index 0000000000000..fd79faea69601
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportTest.php
@@ -0,0 +1,201 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Twitter\Tests;
+
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+use Symfony\Component\Mime\Part\File;
+use Symfony\Component\Notifier\Bridge\Twitter\TwitterOptions;
+use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransport;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+class TwitterTransportTest extends TransportTestCase
+{
+    public function createTransport(HttpClientInterface $client = null): TwitterTransport
+    {
+        return new TwitterTransport('APIK', 'APIS', 'TOKEN', 'SECRET', $client ?? $this->createMock(HttpClientInterface::class));
+    }
+
+    public function toStringProvider(): iterable
+    {
+        yield ['twitter://api.twitter.com', $this->createTransport()];
+    }
+
+    public function supportedMessagesProvider(): iterable
+    {
+        yield [new ChatMessage('Hello!')];
+    }
+
+    public function unsupportedMessagesProvider(): iterable
+    {
+        yield [new SmsMessage('0611223344', 'Hello!')];
+        yield [$this->createMock(MessageInterface::class)];
+    }
+
+    public function testBasicTweet()
+    {
+        $transport = $this->createTransport(new MockHttpClient(function (string $method, string $url, array $options) {
+            $this->assertSame('POST', $method);
+            $this->assertSame('https://api.twitter.com/2/tweets', $url);
+            $this->assertSame('{"text":"Hello World!"}', $options['body']);
+            $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+            return new MockResponse('{"data":{"id":"abc123"}}');
+        }));
+
+        $result = $transport->send(new ChatMessage('Hello World!'));
+
+        $this->assertSame('abc123', $result->getMessageId());
+    }
+
+    public function testTweetImage()
+    {
+        $transport = $this->createTransport(new MockHttpClient((function () {
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://upload.twitter.com/1.1/media/upload.json?command=INIT&total_bytes=185&media_type=image%2Fgif&media_category=tweet_image', $url);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse('{"media_id_string":"gif123"}');
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://upload.twitter.com/1.1/media/upload.json?command=APPEND&media_id=gif123&segment_index=0', $url);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse();
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://upload.twitter.com/1.1/media/upload.json?command=FINALIZE&media_id=gif123', $url);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse('{"processing_info":{"state":"pending","check_after_secs": 0}}');
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('GET', $method);
+                $this->assertSame('https://upload.twitter.com/1.1/media/upload.json?command=STATUS&media_id=gif123', $url);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse('{"processing_info":{"state":"succeeded"}}');
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://upload.twitter.com/1.1/media/metadata/create.json', $url);
+                $this->assertSame('{"media_id":"gif123","alt_text":{"text":"A fixture"}}', $options['body']);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse('{"processing_info":{"state":"succeeded"}}');
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://api.twitter.com/2/tweets', $url);
+                $this->assertSame('{"text":"Hello World!","media":{"media_ids":["gif123"]}}', $options['body']);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse('{"data":{"id":"abc123"}}');
+            };
+        })()));
+
+        $result = $transport->send(new ChatMessage('Hello World!', (new TwitterOptions())
+            ->attachImage(new File(__DIR__.'/fixtures.gif'), 'A fixture'))
+        );
+
+        $this->assertSame('abc123', $result->getMessageId());
+    }
+
+    public function testTweetVideo()
+    {
+        $transport = $this->createTransport(new MockHttpClient((function () {
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://upload.twitter.com/1.1/media/upload.json?command=INIT&total_bytes=185&media_type=image%2Fgif&media_category=tweet_video', $url);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse('{"media_id_string":"gif123"}');
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://upload.twitter.com/1.1/media/upload.json?command=INIT&total_bytes=185&media_type=image%2Fgif&media_category=subtitles', $url);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse('{"media_id_string":"sub234"}');
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://upload.twitter.com/1.1/media/upload.json?command=APPEND&media_id=gif123&segment_index=0', $url);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse();
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://upload.twitter.com/1.1/media/upload.json?command=APPEND&media_id=sub234&segment_index=0', $url);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse();
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://upload.twitter.com/1.1/media/upload.json?command=FINALIZE&media_id=gif123', $url);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse('{}');
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://upload.twitter.com/1.1/media/upload.json?command=FINALIZE&media_id=sub234', $url);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse('{}');
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://upload.twitter.com/1.1/media/subtitles/create.json', $url);
+                $this->assertSame('{"media_id":"gif123","media_category":"tweet_video","subtitle_info":{"subtitles":[{"media_id":"sub234","language_code":"en","display_name":"English"}]}}', $options['body']);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse();
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://api.twitter.com/2/tweets', $url);
+                $this->assertSame('{"text":"Hello World!","media":{"media_ids":["gif123"]}}', $options['body']);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse('{"data":{"id":"abc123"}}');
+            };
+        })()));
+
+        $result = $transport->send(new ChatMessage('Hello World!', (new TwitterOptions())
+            ->attachVideo(new File(__DIR__.'/fixtures.gif'), '', new File(__DIR__.'/fixtures.gif', 'English.en.srt')))
+        );
+
+        $this->assertSame('abc123', $result->getMessageId());
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/fixtures.gif b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/fixtures.gif
new file mode 100644
index 0000000000000000000000000000000000000000..443aca422f7624b271903e5fbb577c7f99786c0e
GIT binary patch
literal 185
zcmZ?wbhEHb<YC}pXklRZ|Nr~fukT*Ie43V)#=yYv{Q2{^xVX=s-}d$OJ$Ue7{`~oq
zCr@6!eEGb2^D;9tlarGdFJ9cz((?b`Pa=`xKR(~YlvIWC%#sWRcTe8{1|6U^K)ZPu
z7+7@_6#5zs<~?>0d66k_<YE_x%=rdim8$pu4O$C!Y%omYl|ILKm{CqZU7?AKk--`O
DSo&ob

literal 0
HcmV?d00001

diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterOptions.php b/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterOptions.php
new file mode 100644
index 0000000000000..6037cb22660e5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterOptions.php
@@ -0,0 +1,189 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Twitter;
+
+use Symfony\Component\Mime\Part\File;
+use Symfony\Component\Notifier\Message\MessageOptionsInterface;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class TwitterOptions implements MessageOptionsInterface
+{
+    public const REPLY_MENTIONED_USERS = 'mentionedUsers';
+    public const REPLY_FOLLOWING = 'following';
+
+
+    public function __construct(
+        private array $options = [],
+    ) {
+    }
+
+    public function toArray(): array
+    {
+        return $this->options;
+    }
+
+    public function getRecipientId(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * @param string[] $choices
+     *
+     * @return $this
+     */
+    public function poll(array $choices, int $duration): static
+    {
+        $this->options['poll'] = [
+            'options' => $choices,
+            'duration_minutes' => $duration,
+        ];
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function quote(string $tweetId): static
+    {
+        $this->options['quote_tweet_id'] = $tweetId;
+
+        return $this;
+    }
+
+    /**
+     * @param string[] $excludedUserIds
+     *
+     * @return $this
+     */
+    public function inReplyTo(string $tweetId, array $excludedUserIds = []): static
+    {
+        $this->options['reply']['in_reply_to_tweet_id'] = $tweetId;
+        $this->options['reply']['exclude_reply_user_ids'] = $excludedUserIds;
+
+        return $this;
+    }
+
+    /**
+     * @param string[] $extraOwners
+     *
+     * @return $this
+     */
+    public function attachImage(File $file, string $alt = '', array $extraOwners = []): static
+    {
+        $this->options['attach'][] = [
+            'file' => $file,
+            'alt' => $alt,
+            'subtitles' => null,
+            'category' => 'tweet_image',
+            'owners' => $extraOwners,
+        ];
+
+        return $this;
+    }
+
+    /**
+     * @param string[] $extraOwners
+     *
+     * @return $this
+     */
+    public function attachGif(File $file, string $alt = '', array $extraOwners = []): static
+    {
+        $this->options['attach'][] = [
+            'file' => $file,
+            'alt' => $alt,
+            'subtitles' => null,
+            'category' => 'tweet_gif',
+            'owners' => $extraOwners,
+        ];
+
+        return $this;
+    }
+
+    /**
+     * @param File|null $subtitles   File should be named as "display_name.language_code.srt"
+     * @param string[]  $extraOwners
+     *
+     * @return $this
+     */
+    public function attachVideo(File $file, string $alt = '', File $subtitles = null, bool $amplify = false, array $extraOwners = []): static
+    {
+        $this->options['attach'][] = [
+            'file' => $file,
+            'alt' => $alt,
+            'subtitles' => $subtitles,
+            'category' => $amplify ? 'amplify_video' : 'tweet_video',
+            'owners' => $extraOwners,
+        ];
+
+        return $this;
+    }
+
+    /**
+     * @param self::REPLY_* $settings
+     *
+     * @return $this
+     */
+    public function replySettings(string $settings): static
+    {
+        $this->options['reply_settings'] = $settings;
+
+        return $this;
+    }
+
+    /**
+     * @param string[] $userIds
+     *
+     * @return $this
+     */
+    public function taggedUsers(array $userIds): static
+    {
+        $this->options['media']['tagged_user_ids'] = $userIds;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function deepLink(string $url): static
+    {
+        $this->options['direct_message_deep_link'] = $url;
+
+        return $this;
+    }
+
+    /**
+     * @see https://developer.twitter.com/en/docs/twitter-api/v1/geo/places-near-location/api-reference/get-geo-search
+     *
+     * @return $this
+     */
+    public function place(string $placeId): static
+    {
+        $this->options['geo']['place_id'] = $placeId;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function forSuperFollowersOnly(bool $flag = true): static
+    {
+        $this->options['for_super_followers_only'] = $flag;
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransport.php b/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransport.php
new file mode 100644
index 0000000000000..b5f450b92eae5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransport.php
@@ -0,0 +1,311 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Twitter;
+
+use Symfony\Component\Mime\Part\DataPart;
+use Symfony\Component\Mime\Part\File;
+use Symfony\Component\Mime\Part\Multipart\FormDataPart;
+use Symfony\Component\Notifier\Exception\RuntimeException;
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Transport\AbstractTransport;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\ChunkInterface;
+use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class TwitterTransport extends AbstractTransport
+{
+    protected const HOST = 'api.twitter.com';
+
+    private static $nonce;
+
+    private string $apiKey;
+    private string $apiSecret;
+    private string $accessToken;
+    private string $accessSecret;
+
+    public function __construct(#[\SensitiveParameter] string $apiKey, #[\SensitiveParameter] string $apiSecret, #[\SensitiveParameter] string $accessToken, #[\SensitiveParameter] string $accessSecret, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    {
+        parent::__construct($client, $dispatcher);
+
+        $this->apiKey = $apiKey;
+        $this->apiSecret = $apiSecret;
+        $this->accessToken = $accessToken;
+        $this->accessSecret = $accessSecret;
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('twitter://%s', $this->getEndpoint());
+    }
+
+    public function supports(MessageInterface $message): bool
+    {
+        return $message instanceof ChatMessage && (null === $message->getOptions() || $message->getOptions() instanceof TwitterOptions);
+    }
+
+    public function request(string $method, string $url, array $options): ResponseInterface
+    {
+        $url = 'https://'.str_replace('api.', str_starts_with($url, '/1.1/media/') ? 'upload.' : 'api.', $this->getEndpoint()).$url;
+
+        foreach (\is_array($options['body'] ?? null) ? $options['body'] : [] as $v) {
+            if (!$v instanceof DataPart) {
+                continue;
+            }
+
+            $formDataPart = new FormDataPart($options['body']);
+
+            foreach ($formDataPart->getPreparedHeaders()->all() as $header) {
+                $options['headers'][] = $header->toString();
+            }
+
+            $options['body'] = $formDataPart->bodyToIterable();
+
+            break;
+        }
+
+        $oauth = [
+            'oauth_consumer_key' => $this->apiKey,
+            'oauth_nonce' => self::$nonce = md5(self::$nonce ??= random_bytes(16)),
+            'oauth_signature_method' => 'HMAC-SHA1',
+            'oauth_timestamp' => time(),
+            'oauth_token' => $this->accessToken,
+            'oauth_version' => '1.0',
+        ];
+
+        $sign = $oauth + ($options['query'] ?? []) + (\is_array($options['body'] ?? null) ? $options['body'] : []);
+        ksort($sign);
+
+        $oauth['oauth_signature'] = base64_encode(hash_hmac(
+            'sha1',
+            implode('&', array_map('rawurlencode', [
+                $method,
+                $url,
+                implode('&', array_map(fn ($k) => rawurlencode($k).'='.rawurlencode($sign[$k]), array_keys($sign))),
+            ])),
+            rawurlencode($this->apiSecret).'&'.rawurlencode($this->accessSecret),
+            true
+        ));
+
+        $options['headers'][] = 'Authorization: OAuth '.implode(', ', array_map(fn ($k) => $k.'="'.rawurlencode($oauth[$k]).'"', array_keys($oauth)));
+
+        return $this->client->request($method, $url, $options);
+    }
+
+    protected function doSend(MessageInterface $message): SentMessage
+    {
+        if (!$message instanceof ChatMessage) {
+            throw new UnsupportedMessageTypeException(__CLASS__, ChatMessage::class, $message);
+        }
+
+        $options = $message->getOptions()?->toArray() ?? [];
+        $options['text'] = $message->getSubject();
+        $response = null;
+
+        try {
+            if (isset($options['attach'])) {
+                $options['media']['media_ids'] = $this->uploadMedia($options['attach']);
+                unset($options['attach']);
+            }
+
+            $response = $this->request('POST', '/2/tweets', ['json' => $options]);
+            $statusCode = $response->getStatusCode();
+            $result = $response->toArray(false);
+        } catch (ExceptionInterface $e) {
+            if (null !== $response) {
+                throw new TransportException($e->getMessage(), $response, 0, $e);
+            }
+            throw new RuntimeException($e->getMessage(), 0, $e);
+        }
+
+        if (400 <= $statusCode) {
+            throw new TransportException($result['title'].': '.($result['errors'][0]['message'] ?? $result['detail']), $response);
+        }
+
+        $sentMessage = new SentMessage($message, (string) $this);
+        $sentMessage->setMessageId($result['data']['id']);
+
+        return $sentMessage;
+    }
+
+    /**
+     * @param array<array{file: File, alt: string, subtitles: File|null, category: string|null, owners: string[]}> $media
+     */
+    private function uploadMedia(array $media): array
+    {
+        $i = 0;
+        $pool = [];
+
+        foreach ($media as [
+            'file' => $file,
+            'alt' => $alt,
+            'subtitles' => $subtitles,
+            'category' => $category,
+            'owners' => $extraOwners,
+        ]) {
+            $query = [
+                'command' => 'INIT',
+                'total_bytes' => $file->getSize(),
+                'media_type' => $file->getContentType(),
+            ];
+
+            if ($category) {
+                $query['media_category'] = $category;
+            }
+
+            if ($extraOwners) {
+                $query['additional_owners'] = implode(',', $extraOwners);
+            }
+
+            $pool[++$i] = $this->request('POST', '/1.1/media/upload.json', [
+                'query' => $query,
+                'user_data' => [$i, null, 0, fopen($file->getPath(), 'r'), $alt, $subtitles],
+            ]);
+
+            if ($subtitles) {
+                $query['total_bytes'] = $subtitles->getSize();
+                $query['media_type'] = $subtitles->getContentType();
+                $query['media_category'] = 'subtitles';
+
+                $pool[++$i] = $this->request('POST', '/1.1/media/upload.json', [
+                    'query' => $query,
+                    'user_data' => [$i, null, 0, fopen($subtitles->getPath(), 'r'), null, $subtitles],
+                ]);
+            }
+        }
+
+        $mediaIds = [];
+        $subtitlesVideoIds = [];
+        $subtitlesMediaIds = [];
+        $response = null;
+
+        try {
+            while ($pool) {
+                foreach ($this->client->stream($pool) as $response => $chunk) {
+                    $this->processChunk($pool, $response, $chunk, $mediaIds, $subtitlesVideoIds, $subtitlesMediaIds);
+                }
+            }
+        } catch (ExceptionInterface $e) {
+            if (null !== $response) {
+                throw new TransportException($e->getMessage(), $response, 0, $e);
+            }
+            throw new RuntimeException($e->getMessage(), 0, $e);
+        } finally {
+            foreach ($pool as $response) {
+                $response->cancel();
+            }
+        }
+
+        foreach (array_filter($subtitlesVideoIds) as $videoId => $subtitles) {
+            $name = pathinfo($subtitles->getFilename(), \PATHINFO_FILENAME);
+            $subtitlesVideoIds[$videoId] = $this->request('POST', '/1.1/media/subtitles/create.json', [
+                'json' => [
+                    'media_id' => $videoId,
+                    'media_category' => 'tweet_video',
+                    'subtitle_info' => [
+                        'subtitles' => [
+                            [
+                                'media_id' => array_search($subtitles, $subtitlesMediaIds, true),
+                                'language_code' => pathinfo($name, \PATHINFO_EXTENSION),
+                                'display_name' => pathinfo($name, \PATHINFO_FILENAME),
+                            ],
+                        ],
+                    ],
+                ],
+            ]);
+        }
+
+        return $mediaIds;
+    }
+
+    private function processChunk(array &$pool, ResponseInterface $response, ChunkInterface $chunk, array &$mediaIds, array &$subtitlesVideoIds, array &$subtitlesMediaIds): void
+    {
+        if ($chunk->isFirst()) {
+            $response->getStatusCode(); // skip non-2xx status codes
+        }
+
+        if (!$chunk->isLast()) {
+            return;
+        }
+
+        if (400 <= $response->getStatusCode()) {
+            $error = $response->toArray(false);
+
+            throw new TransportException($error['errors'][0]['message'] ?? ($error['request'].': '.$error['error']), $response, $error['errors'][0]['code'] ?? 0);
+        }
+
+        [$i, $mediaId, $seq, $h, $alt, $subtitles] = $response->getInfo('user_data');
+        unset($pool[$i]);
+
+        $method = 'POST';
+        $options = [];
+        $mediaId ??= $response->toArray()['media_id_string'];
+        $pause = 0;
+
+        if (0 <= $seq) {
+            $options['query'] = [
+                'command' => 'APPEND',
+                'media_id' => $mediaId,
+                'segment_index' => (string) $seq,
+            ];
+            $options['body'] = ['media' => new DataPart(fread($h, 1024 * 1024))];
+            $seq = feof($h) ? -1 : 1 + $seq;
+        } elseif (-1 === $seq) {
+            $options['query'] = ['command' => 'FINALIZE', 'media_id' => $mediaId];
+            $seq = -2;
+        } elseif (-2 !== $seq) {
+            return;
+        } elseif ('succeeded' === $state = $response->toArray()['processing_info']['state'] ?? 'succeeded') {
+            if ($alt) {
+                $pool[$i] = $this->request('POST', '/1.1/media/metadata/create.json', [
+                    'json' => [
+                        'media_id' => $mediaId,
+                        'alt_text' => ['text' => $alt],
+                    ],
+                    'user_data' => [$i, $mediaId, -3, null, null, null],
+                ]);
+            }
+            if (null !== $alt) {
+                $mediaIds[] = $mediaId;
+                $subtitlesVideoIds[$mediaId] = $subtitles;
+            } else {
+                $subtitlesMediaIds[$mediaId] = $subtitles;
+            }
+
+            return;
+        } elseif ('failed' === $state) {
+            $error = $response->toArray()['processing_info']['error'];
+
+            throw new TransportException($error['message'], $response, $error['code']);
+        } else {
+            $method = 'GET';
+            $options['query'] = ['command' => 'STATUS', 'media_id' => $mediaId];
+            $pause = $response->toArray()['processing_info']['check_after_secs'];
+        }
+
+        $pool[$i] = $this->request($method, '/1.1/media/upload.json', $options + [
+            'user_data' => [$i, $mediaId, $seq, $h, $alt, $subtitles],
+        ]);
+
+        if ($pause) {
+            ($pool[$i]->getInfo('pause_handler') ?? sleep(...))($pause);
+        }
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransportFactory.php
new file mode 100644
index 0000000000000..1d99076dac8e7
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransportFactory.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Twitter;
+
+use Symfony\Component\Notifier\Exception\IncompleteDsnException;
+use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
+use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
+use Symfony\Component\Notifier\Transport\Dsn;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class TwitterTransportFactory extends AbstractTransportFactory
+{
+    public function create(Dsn $dsn): TwitterTransport
+    {
+        $scheme = $dsn->getScheme();
+
+        if ('twitter' !== $scheme) {
+            throw new UnsupportedSchemeException($dsn, 'twitte
10000
r', $this->getSupportedSchemes());
+        }
+
+        $apiKey = $this->getUser($dsn);
+        [$apiSecret, $accessToken, $accessSecret] = explode(':', $this->getPassword($dsn)) + [1 => null, null, null];
+
+        foreach (['API Key' => $apiKey, 'API Key Secret' => $apiSecret, 'Access Token' => $accessToken, 'Access Token Secret' => $accessSecret] as $name => $key) {
+            if (!$key) {
+                throw new IncompleteDsnException($name.' is missing.', $dsn->getOriginalDsn());
+            }
+        }
+
+        return (new TwitterTransport($apiKey, $apiSecret, $accessToken, $accessSecret, $this->client, $this->dispatcher))
+            ->setHost('default' === $dsn->getHost() ? null : $dsn->getHost())
+            ->setPort($dsn->getPort());
+    }
+
+    protected function getSupportedSchemes(): array
+    {
+        return ['twitter'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json b/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json
new file mode 100644
index 0000000000000..83b1a91258a0b
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "symfony/twitter-notifier",
+    "type": "symfony-notifier-bridge",
+    "description": "Symfony Twitter Notifier Bridge",
+    "keywords": ["twitter", "notifier"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/notifier": "^6.2"
+    },
+    "require-dev": {
+        "symfony/mime": "^6.2"
+    },
+    "conflict": {
+        "symfony/mime": "<6.2"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Twitter\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Twitter/phpunit.xml.dist
new file mode 100644
index 0000000000000..f486d936888b9
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony Twitter Notifier Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory>./</directory>
+        </include>
+        <exclude>
+            <directory>./Resources</directory>
+            <directory>./Tests</directory>
+            <directory>./vendor</directory>
+        </exclude>
+    </coverage>
+</phpunit>
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index f5b51bf9bfaaf..ea8783ec95428 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -204,6 +204,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\Twilio\TwilioTransportFactory::class,
             'package' => 'symfony/twilio-notifier',
         ],
+        'twitter' => [
+            'class' => Bridge\Twitter\TwitterTransportFactory::class,
+            'package' => 'symfony/twitter-notifier',
+        ],
         'vonage' => [
             'class' => Bridge\Vonage\VonageTransportFactory::class,
             'package' => 'symfony/vonage-notifier',
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 8ffb0c1f79c4c..bcef4d5f11f13 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -56,6 +56,7 @@
 use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
 use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
+use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransportFactory;
 use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory;
 use Symfony\Component\Notifier\Bridge\Yunpian\YunpianTransportFactory;
 use Symfony\Component\Notifier\Bridge\Zendesk\ZendeskTransportFactory;
@@ -115,6 +116,7 @@ public static function setUpBeforeClass(): void
             TelnyxTransportFactory::class => false,
             TurboSmsTransportFactory::class => false,
             TwilioTransportFactory::class => false,
+            TwitterTransportFactory::class => false,
             VonageTransportFactory::class => false,
             YunpianTransportFactory::class => false,
             ZendeskTransportFactory::class => false,
@@ -179,6 +181,7 @@ public function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \Generat
         yield ['telnyx', 'symfony/telnyx-notifier'];
         yield ['turbosms', 'symfony/turbo-sms-notifier'];
         yield ['twilio', 'symfony/twilio-notifier'];
+        yield ['twitter', 'symfony/twitter-notifier'];
         yield ['zendesk', 'symfony/zendesk-notifier'];
         yield ['zulip', 'symfony/zulip-notifier'];
     }
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
index b9829b8ebdf68..7656194018c82 100644
--- a/src/Symfony/Component/Notifier/Transport.php
+++ b/src/Symfony/Component/Notifier/Transport.php
@@ -51,6 +51,7 @@
 use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
 use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
+use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransportFactory;
 use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory;
 use Symfony\Component\Notifier\Bridge\Yunpian\YunpianTransportFactory;
 use Symfony\Component\Notifier\Bridge\Zendesk\ZendeskTransportFactory;
@@ -112,6 +113,7 @@ final class Transport
         TelnyxTransportFactory::class,
         TurboSmsTransportFactory::class,
         TwilioTransportFactory::class,
+        TwitterTransportFactory::class,
         VonageTransportFactory::class,
         YunpianTransportFactory::class,
         ZendeskTransportFactory::class,

From 047029bccbce1617b7df9c72aad9141e3166e097 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 25 Nov 2022 10:27:18 +0100
Subject: [PATCH 007/475] Bump version to 6.3

---
 src/Symfony/Component/HttpKernel/Kernel.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 3661c216a2c4b..ba921fa3b31f6 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -75,15 +75,15 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     private static array $freshCache = [];
 
-    public const VERSION = '6.2.0-DEV';
-    public const VERSION_ID = 60200;
+    public const VERSION = '6.3.0-DEV';
+    public const VERSION_ID = 60300;
     public const MAJOR_VERSION = 6;
-    public const MINOR_VERSION = 2;
+    public const MINOR_VERSION = 3;
     public const RELEASE_VERSION = 0;
     public const EXTRA_VERSION = 'DEV';
 
-    public const END_OF_MAINTENANCE = '07/2023';
-    public const END_OF_LIFE = '07/2023';
+    public const END_OF_MAINTENANCE = '01/2024';
+    public const END_OF_LIFE = '01/2024';
 
     public function __construct(string $environment, bool $debug)
     {

From 1b0d16ff21844f36ab1242a447281118bfb2a36b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 25 Nov 2022 11:21:52 +0100
Subject: [PATCH 008/475] [Contracts] update branch alias

---
 composer.json                                       | 2 +-
 src/Symfony/Contracts/Cache/composer.json           | 2 +-
 src/Symfony/Contracts/Deprecation/composer.json     | 2 +-
 src/Symfony/Contracts/EventDispatcher/composer.json | 2 +-
 src/Symfony/Contracts/HttpClient/composer.json      | 2 +-
 src/Symfony/Contracts/Service/composer.json         | 2 +-
 src/Symfony/Contracts/Translation/composer.json     | 2 +-
 src/Symfony/Contracts/composer.json                 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index eda77e963e5ef..aef3fd1019a42 100644
--- a/composer.json
+++ b/composer.json
@@ -193,7 +193,7 @@
             "url": "src/Symfony/Contracts",
             "options": {
                 "versions": {
-                    "symfony/contracts": "3.2.x-dev"
+                    "symfony/contracts": "3.3.x-dev"
                 }
             }
         },
diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json
index 27b2c84f9d912..770e20eaa8e7b 100644
--- a/src/Symfony/Contracts/Cache/composer.json
+++ b/src/Symfony/Contracts/Cache/composer.json
@@ -28,7 +28,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "3.2-dev"
+            "dev-main": "3.3-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/src/Symfony/Contracts/Deprecation/composer.json b/src/Symfony/Contracts/Deprecation/composer.json
index be6c494b149a6..774200fdcdae8 100644
--- a/src/Symfony/Contracts/Deprecation/composer.json
+++ b/src/Symfony/Contracts/Deprecation/composer.json
@@ -25,7 +25,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "3.2-dev"
+            "dev-main": "3.3-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/src/Symfony/Contracts/EventDispatcher/composer.json b/src/Symfony/Contracts/EventDispatcher/composer.json
index eecac79ca57c2..89d7cec96c7ae 100644
--- a/src/Symfony/Contracts/EventDispatcher/composer.json
+++ b/src/Symfony/Contracts/EventDispatcher/composer.json
@@ -28,7 +28,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "3.2-dev"
+            "dev-main": "3.3-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/src/Symfony/Contracts/HttpClient/composer.json b/src/Symfony/Contracts/HttpClient/composer.json
index d4176ccef72ce..61eac1e2fae69 100644
--- a/src/Symfony/Contracts/HttpClient/composer.json
+++ b/src/Symfony/Contracts/HttpClient/composer.json
@@ -30,7 +30,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "3.2-dev"
+            "dev-main": "3.3-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json
index af3559ed4983d..36b0d95e77484 100644
--- a/src/Symfony/Contracts/Service/composer.json
+++ b/src/Symfony/Contracts/Service/composer.json
@@ -34,7 +34,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "3.2-dev"
+            "dev-main": "3.3-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/src/Symfony/Contracts/Translation/composer.json b/src/Symfony/Contracts/Translation/composer.json
index 15e4bc1b6441f..3454800a8e0bd 100644
--- a/src/Symfony/Contracts/Translation/composer.json
+++ b/src/Symfony/Contracts/Translation/composer.json
@@ -30,7 +30,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "3.2-dev"
+            "dev-main": "3.3-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json
index 63bba367386d7..031ad79a772ad 100644
--- a/src/Symfony/Contracts/composer.json
+++ b/src/Symfony/Contracts/composer.json
@@ -52,7 +52,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "3.2-dev"
+            "dev-main": "3.3-dev"
         }
     }
 }

From ed94fdc2e23c5e29641da6383093906aa297ea7a Mon Sep 17 00:00:00 2001
From: Aleksey Polyvanyi <alexndlm@gmail.com>
Date: Tue, 8 Nov 2022 10:20:36 +0100
Subject: [PATCH 009/475] [DependencyInjection] Add `env` and `param`
 parameters for Autowire attribute

---
 .../Attribute/Autowire.php                    | 16 ++++++----
 .../Tests/Attribute/AutowireTest.php          | 29 +++++++++++++++++--
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php b/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
index 0c34f9035160b..73e6f455d8a1b 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
@@ -28,17 +28,21 @@ class Autowire
     /**
      * Use only ONE of the following.
      *
-     * @param string|null $value      Parameter value (ie "%kernel.project_dir%/some/path")
-     * @param string|null $service    Service ID (ie "some.service")
-     * @param string|null $expression Expression (ie 'service("some.service").someMethod()')
+     * @param string|array|null $value      Parameter value (ie "%kernel.project_dir%/some/path")
+     * @param string|null       $service    Service ID (ie "some.service")
+     * @param string|null       $expression Expression (ie 'service("some.service").someMethod()')
+     * @param string|null       $env        Environment variable name (ie 'SOME_ENV_VARIABLE')
+     * @param string|null       $param      Parameter name (ie 'some.parameter.name')
      */
     public function __construct(
         string|array $value = null,
         string $service = null,
         string $expression = null,
+        string $env = null,
+        string $param = null,
     ) {
-        if (!($service xor $expression xor null !== $value)) {
-            throw new LogicException('#[Autowire] attribute must declare exactly one of $service, $expression, or $value.');
+        if (!(null !== $value xor null !== $service xor null !== $expression xor null !== $env xor null !== $param)) {
+            throw new LogicException('#[Autowire] attribute must declare exactly one of $service, $expression, $env, $param or $value.');
         }
 
         if (\is_string($value) && str_starts_with($value, '@')) {
@@ -52,6 +56,8 @@ public function __construct(
         $this->value = match (true) {
             null !== $service => new Reference($service),
             null !== $expression => class_exists(Expression::class) ? new Expression($expression) : throw new LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed. Try running "composer require symfony/expression-language".'),
+            null !== $env => "%env($env)%",
+            null !== $param => "%$param%",
             null !== $value => $value,
         };
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Attribute/AutowireTest.php b/src/Symfony/Component/DependencyInjection/Tests/Attribute/AutowireTest.php
index d45434a5817e0..fabbe3b7934c8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Attribute/AutowireTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Attribute/AutowireTest.php
@@ -19,11 +19,14 @@
 
 class AutowireTest extends TestCase
 {
-    public function testCanOnlySetOneParameter()
+    /**
+     * @dataProvider provideMultipleParameters
+     */
+    public function testCanOnlySetOneParameter(array $parameters)
     {
         $this->expectException(LogicException::class);
 
-        new Autowire(service: 'id', expression: 'expr');
+        new Autowire(...$parameters);
     }
 
     public function testMustSetOneParameter()
@@ -57,4 +60,26 @@ public function testCanUseValueWithAtAndEqualSign()
     {
         $this->assertInstanceOf(Expression::class, (new Autowire(value: '@=service'))->value);
     }
+
+    public function testCanUseEnv()
+    {
+        $this->assertSame('%env(SOME_ENV_VAR)%', (new Autowire(env: 'SOME_ENV_VAR'))->value);
+    }
+
+    public function testCanUseParam()
+    {
+        $this->assertSame('%some.param%', (new Autowire(param: 'some.param'))->value);
+    }
+
+    /**
+     * @see testCanOnlySetOneParameter
+     */
+    private function provideMultipleParameters(): iterable
+    {
+        yield [['service' => 'id', 'expression' => 'expr']];
+
+        yield [['env' => 'ENV', 'param' => 'param']];
+
+        yield [['value' => 'some-value', 'expression' => 'expr']];
+    }
 }

From ff76d2653d18353707ba327b21d547e9b142ab34 Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Sat, 29 Oct 2022 17:09:21 +0200
Subject: [PATCH 010/475] [SecurityBundle] Deprecate enabling bundle and not
 configuring it

---
 UPGRADE-6.3.md                                   |  7 +++++++
 src/Symfony/Bundle/SecurityBundle/CHANGELOG.md   |  5 +++++
 .../DependencyInjection/SecurityExtension.php    |  4 ++++
 .../SecurityExtensionTest.php                    | 16 ++++++++++++++++
 .../Functional/app/AliasedEvents/config.yml      |  8 ++++++++
 5 files changed, 40 insertions(+)
 create mode 100644 UPGRADE-6.3.md

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
new file mode 100644
index 0000000000000..e1655bfa81b62
--- /dev/null
+++ b/UPGRADE-6.3.md
@@ -0,0 +1,7 @@
+UPGRADE FROM 6.2 to 6.3
+=======================
+
+SecurityBundle
+--------------
+
+ * Deprecate enabling bundle and not configuring it
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index dcefe374dda4c..a1ffdb0349c3a 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Deprecate enabling bundle and not configuring it
+
 6.2
 ---
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index cd514bb44367d..6b91a65d14ae7 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -15,6 +15,7 @@
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AuthenticatorFactoryInterface;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\FirewallListenerFactoryInterface;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface;
+use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
@@ -88,6 +89,9 @@ public function prepend(ContainerBuilder $container)
     public function load(array $configs, ContainerBuilder $container)
     {
         if (!array_filter($configs)) {
+            trigger_deprecation('symfony/security-bundle', '6.3', 'Enabling bundle "%s" and not configuring it is deprecated.', SecurityBundle::class);
+            // uncomment the following line in 7.0
+            // throw new InvalidArgumentException(sprintf('Enabling bundle "%s" and not configuring it is not allowed.', SecurityBundle::class));
             return;
         }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
index bcfb169ea321d..227d126db33e2 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -848,6 +848,22 @@ public function testConfigureCustomFirewallListener()
         $this->assertContains('custom_firewall_listener_id', $firewallListeners);
     }
 
+    /**
+     * @group legacy
+     */
+    public function testNothingDoneWithEmptyConfiguration()
+    {
+        $container = $this->getRawContainer();
+
+        $container->loadFromExtension('security');
+
+        $this->expectDeprecation('Since symfony/security-bundle 6.3: Enabling bundle "Symfony\Bundle\SecurityBundle\SecurityBundle" and not configuring it is deprecated.');
+
+        $container->compile();
+
+        $this->assertFalse($container->has('security.authorization_checker'));
+    }
+
     protected function getRawContainer()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AliasedEvents/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AliasedEvents/config.yml
index bdd94fd0afaa7..290804e61cbe6 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AliasedEvents/config.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AliasedEvents/config.yml
@@ -1,2 +1,10 @@
 imports:
     - { resource: ./../config/framework.yml }
+
+security:
+    providers:
+        dummy:
+            memory: ~
+    firewalls:
+        dummy:
+            security: false

From d5f11e0bde21ae579e2d62488006aa13ff9e1d23 Mon Sep 17 00:00:00 2001
From: Jordane Vaspard <jordane.vaspard@laposte.net>
Date: Sat, 26 Nov 2022 15:28:56 +0100
Subject: [PATCH 011/475] [Form] Call getChoicesForValues() once, to prevent
 several SQL queries

---
 .../Component/Form/Extension/Core/Type/ChoiceType.php    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 2dde39e8af9ef..65692faeb48e8 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -144,11 +144,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         }
                     }
                 } else {
-                    foreach ($data as $value) {
-                        if ($choiceList->getChoicesForValues([$value])) {
-                            $knownValues[] = $value;
-                            unset($unknownValues[$value]);
-                        }
+                    foreach ($choiceList->getChoicesForValues($data) as $index => $choice) {
+                        $value = $data[$index];
+                        $knownValues[] = $value;
+                        unset($unknownValues[$value]);
                     }
                 }
 

From 717f668df20a3764d2341af7f33ccb648a558704 Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Sat, 26 Nov 2022 18:25:49 +0100
Subject: [PATCH 012/475] [Validator] Update ValidatorBuilder comment for
 enableAnnotationMapping

---
 src/Symfony/Component/Validator/ValidatorBuilder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php
index f6dc59976e77b..fc2a5e30cebbb 100644
--- a/src/Symfony/Component/Validator/ValidatorBuilder.php
+++ b/src/Symfony/Component/Validator/ValidatorBuilder.php
@@ -187,7 +187,7 @@ public function addMethodMappings(array $methodNames): static
     }
 
     /**
-     * Enables annotation based constraint mapping.
+     * Enables annotation and attribute based constraint mapping.
      *
      * @return $this
      */
@@ -203,7 +203,7 @@ public function enableAnnotationMapping(): static
     }
 
     /**
-     * Disables annotation based constraint mapping.
+     * Disables annotation and attribute based constraint mapping.
      *
      * @return $this
      */

From 69f46f231b16be1bce1e2ecfa7f9a1fb192cda22 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 28 Nov 2022 14:18:19 +0100
Subject: [PATCH 013/475] [ci] Fix scorecards

---
 .github/workflows/scorecards.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 7ee945d432674..349e215771725 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -6,7 +6,7 @@ on:
   schedule:
     - cron: '34 4 * * 6'
   push:
-    branches: [ "6.2" ]
+    branches: [ "6.3" ]
 
 # Declare default permissions as read only.
 permissions: read-all

From 8e2af95ac652aa5350b288adf47b6de05384f20f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 28 Nov 2022 14:30:22 +0100
Subject: [PATCH 014/475] [Clock] Add ClockAwareTrait to help write
 time-sensitive classes

---
 src/Symfony/Component/Clock/CHANGELOG.md      |  5 +++
 .../Component/Clock/ClockAwareTrait.php       | 36 +++++++++++++++++
 .../Clock/Tests/ClockAwareTraitTest.php       | 40 +++++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 src/Symfony/Component/Clock/ClockAwareTrait.php
 create mode 100644 src/Symfony/Component/Clock/Tests/ClockAwareTraitTest.php

diff --git a/src/Symfony/Component/Clock/CHANGELOG.md b/src/Symfony/Component/Clock/CHANGELOG.md
index 5ffa40eff75d9..9bb1c2d4148e1 100644
--- a/src/Symfony/Component/Clock/CHANGELOG.md
+++ b/src/Symfony/Component/Clock/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `ClockAwareTrait` to help write time-sensitive classes
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Clock/ClockAwareTrait.php b/src/Symfony/Component/Clock/ClockAwareTrait.php
new file mode 100644
index 0000000000000..22f5d4698a0aa
--- /dev/null
+++ b/src/Symfony/Component/Clock/ClockAwareTrait.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock;
+
+use Psr\Clock\ClockInterface;
+use Symfony\Contracts\Service\Attribute\Required;
+
+/**
+ * A trait to help write time-sensitive classes.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+trait ClockAwareTrait
+{
+    private readonly ClockInterface $clock;
+
+    #[Required]
+    public function setClock(ClockInterface $clock): void
+    {
+        $this->clock = $clock;
+    }
+
+    protected function now(): \DateTimeImmutable
+    {
+        return ($this->clock ??= new NativeClock())->now();
+    }
+}
diff --git a/src/Symfony/Component/Clock/Tests/ClockAwareTraitTest.php b/src/Symfony/Component/Clock/Tests/ClockAwareTraitTest.php
new file mode 100644
index 0000000000000..c472541c64934
--- /dev/null
+++ b/src/Symfony/Component/Clock/Tests/ClockAwareTraitTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Clock\ClockAwareTrait;
+use Symfony\Component\Clock\MockClock;
+
+class ClockAwareTraitTest extends TestCase
+{
+    public function testTrait()
+    {
+        $sut = new class() {
+            use ClockAwareTrait {
+                now as public;
+            }
+        };
+
+        $this->assertInstanceOf(\DateTimeImmutable::class, $sut->now());
+
+        $clock = new MockClock();
+        $sut = new $sut();
+        $sut->setClock($clock);
+
+        $ts = $sut->now()->getTimestamp();
+        $this->assertEquals($clock->now(), $sut->now());
+        $clock->sleep(1);
+        $this->assertEquals($clock->now(), $sut->now());
+        $this->assertSame(1.0, round($sut->now()->getTimestamp() - $ts, 1));
+    }
+}

From 269f4f168f8baac132f6926b2e2e28fd4b77f5c2 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Tue, 29 Nov 2022 08:47:20 +0100
Subject: [PATCH 015/475] [HttpKernel] Set a default file link format when none
 is provided to FileLinkFormatter

---
 src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php    | 2 +-
 .../Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
index 094465274181b..26b82715f9053 100644
--- a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
+++ b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
@@ -35,7 +35,7 @@ class FileLinkFormatter
      */
     public function __construct(string|array $fileLinkFormat = null, RequestStack $requestStack = null, string $baseDir = null, string|\Closure $urlFormat = null)
     {
-        $fileLinkFormat ??= $_SERVER['SYMFONY_IDE'] ?? '';
+        $fileLinkFormat ??= $_SERVER['SYMFONY_IDE'] ?? 'file://%f#L%l';
         if (!\is_array($fileLinkFormat) && $fileLinkFormat = (ErrorRendererInterface::IDE_LINK_FORMATS[$fileLinkFormat] ?? $fileLinkFormat) ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: false) {
             $i = strpos($f = $fileLinkFormat, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: \strlen($f);
             $fileLinkFormat = [substr($f, 0, $i)] + preg_split('/&([^>]++)>/', substr($f, $i), -1, \PREG_SPLIT_DELIM_CAPTURE);
diff --git a/src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php
index d24958c6c5de5..58ae1d9168c97 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php
@@ -29,7 +29,7 @@ public function testAfterUnserialize()
     {
         $sut = unserialize(serialize(new FileLinkFormatter()));
 
-        $this->assertFalse($sut->format('/kernel/root/src/my/very/best/file.php', 3));
+        $this->assertSame('file:///kernel/root/src/my/very/best/file.php#L3', $sut->format('/kernel/root/src/my/very/best/file.php', 3));
     }
 
     public function testWhenFileLinkFormatAndNoRequest()

From b8254be5814268693aab71b57352175a836918d8 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Tue, 29 Nov 2022 20:14:14 +0100
Subject: [PATCH 016/475] [Intl] Add a special locale to strip emojis easily
 with EmojiTransliterator

---
 src/Symfony/Component/Intl/CHANGELOG.md       |    5 +
 .../data/transliterator/emoji/emoji-strip.php | 4737 +++++++++++++++++
 .../Component/Intl/Resources/emoji/build.php  |   15 +-
 .../EmojiTransliteratorTest.php               |   17 +
 4 files changed, 4773 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-strip.php

diff --git a/src/Symfony/Component/Intl/CHANGELOG.md b/src/Symfony/Component/Intl/CHANGELOG.md
index 10fd1af30c0b4..3a84dd3d42d56 100644
--- a/src/Symfony/Component/Intl/CHANGELOG.md
+++ b/src/Symfony/Component/Intl/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add the special `strip` locale to `EmojiTransliterator` to strip all emojis from a string
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-strip.php b/src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-strip.php
new file mode 100644
index 0000000000000..a6d1d78ae9adf
--- /dev/null
+++ b/src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-strip.php
@@ -0,0 +1,4737 @@
+<?php
+
+return [
+    '🧑🏻‍❤️‍💋‍🧑🏼' => '',
+    '🧑🏻‍❤️‍💋‍🧑🏽' => '',
+    '🧑🏻‍❤️‍💋‍🧑🏾' => '',
+    '🧑🏻‍❤️‍💋‍🧑🏿' => '',
+    '🧑🏼‍❤️‍💋‍🧑🏻' => '',
+    '🧑🏼‍❤️‍💋‍🧑🏽' => '',
+    '🧑🏼‍❤️‍💋‍🧑🏾' => '',
+    '🧑🏼‍❤️‍💋‍🧑🏿' => '',
+    '🧑🏽‍❤️‍💋‍🧑🏻' => '',
+    '🧑🏽‍❤️‍💋‍🧑🏼' => '',
+    '🧑🏽‍❤️‍💋‍🧑🏾' => '',
+    '🧑🏽‍❤️‍💋‍🧑🏿' => '',
+    '🧑🏾‍❤️‍💋‍🧑🏻' => '',
+    '🧑🏾‍❤️‍💋‍🧑🏼' => '',
+    '🧑🏾‍❤️‍💋‍🧑🏽' => '',
+    '🧑🏾‍❤️‍💋‍🧑🏿' => '',
+    '🧑🏿‍❤️‍💋‍🧑🏻' => '',
+    '🧑🏿‍❤️‍💋‍🧑🏼' => '',
+    '🧑🏿‍❤️‍💋‍🧑🏽' => '',
+    '🧑🏿‍❤️‍💋‍🧑🏾' => '',
+    '👩🏻‍❤️‍💋‍👨🏻' => '',
+    '👩🏻‍❤️‍💋‍👨🏼' => '',
+    '👩🏻‍❤️‍💋‍👨🏽' => '',
+    '👩🏻‍❤️‍💋‍👨🏾' => '',
+    '👩🏻‍❤️‍💋‍👨🏿' => '',
+    '👩🏼‍❤️‍💋‍👨🏻' => '',
+    '👩🏼‍❤️‍💋‍👨🏼' => '',
+    '👩🏼‍❤️‍💋‍👨🏽' => '',
+    '👩🏼‍❤️‍💋‍👨🏾' => '',
+    '👩🏼‍❤️‍💋‍👨🏿' => '',
+    '👩🏽‍❤️‍💋‍👨🏻' => '',
+    '👩🏽‍❤️‍💋‍👨🏼' => '',
+    '👩🏽‍❤️‍💋‍👨🏽' => '',
+    '👩🏽‍❤️‍💋‍👨🏾' => '',
+    '👩🏽‍❤️‍💋‍👨🏿' => '',
+    '👩🏾‍❤️‍💋‍👨🏻' => '',
+    '👩🏾‍❤️‍💋‍👨🏼' => '',
+    '👩🏾‍❤️‍💋‍👨🏽' => '',
+    '👩🏾‍❤️‍💋‍👨🏾' => '',
+    '👩🏾‍❤️‍💋‍👨🏿' => '',
+    '👩🏿‍❤️‍💋‍👨🏻' => '',
+    '👩🏿‍❤️‍💋‍👨🏼' => '',
+    '👩🏿‍❤️‍💋‍👨🏽' => '',
+    '👩🏿‍❤️‍💋‍👨🏾' => '',
+    '👩🏿‍❤️‍💋‍👨🏿' => '',
+    '👨🏻‍❤️‍💋‍👨🏻' => '',
+    '👨🏻‍❤️‍💋‍👨🏼' => '',
+    '👨🏻‍❤️‍💋‍👨🏽' => '',
+    '👨🏻‍❤️‍💋‍👨🏾' => '',
+    '👨🏻‍❤️‍💋‍👨🏿' => '',
+    '👨🏼‍❤️‍💋‍👨🏻' => '',
+    '👨🏼‍❤️‍💋‍👨🏼' => '',
+    '👨🏼‍❤️‍💋‍👨🏽' => '',
+    '👨🏼‍❤️‍💋‍👨🏾' => '',
+    '👨🏼‍❤️‍💋‍👨🏿' => '',
+    '👨🏽‍❤️‍💋‍👨🏻' => '',
+    '👨🏽‍❤️‍💋‍👨🏼' => '',
+    '👨🏽‍❤️‍💋‍👨🏽' => '',
+    '👨🏽‍❤️‍💋‍👨🏾' => '',
+    '👨🏽‍❤️‍💋‍👨🏿' => '',
+    '👨🏾‍❤️‍💋‍👨🏻' => '',
+    '👨🏾‍❤️‍💋‍👨🏼' => '',
+    '👨🏾‍❤️‍💋‍👨🏽' => '',
+    '👨🏾‍❤️‍💋‍👨🏾' => '',
+    '👨🏾‍❤️‍💋‍👨🏿' => '',
+    '👨🏿‍❤️‍💋‍👨🏻' => '',
+    '👨🏿‍❤️‍💋‍👨🏼' => '',
+    '👨🏿‍❤️‍💋‍👨🏽' => '',
+    '👨🏿‍❤️‍💋‍👨🏾' => '',
+    '👨🏿‍❤️‍💋‍👨🏿' => '',
+    '👩🏻‍❤️‍💋‍👩🏻' => '',
+    '👩🏻‍❤️‍💋‍👩🏼' => '',
+    '👩🏻‍❤️‍💋‍👩🏽' => '',
+    '👩🏻‍❤️‍💋‍👩🏾' => '',
+    '👩🏻‍❤️‍💋‍👩🏿' => '',
+    '👩🏼‍❤️‍💋‍👩🏻' => '',
+    '👩🏼‍❤️‍💋‍👩🏼' => '',
+    '👩🏼‍❤️‍💋‍👩🏽' => '',
+    '👩🏼‍❤️‍💋‍👩🏾' => '',
+    '👩🏼‍❤️‍💋‍👩🏿' => '',
+    '👩🏽‍❤️‍💋‍👩🏻' => '',
+    '👩🏽‍❤️‍💋‍👩🏼' => '',
+    '👩🏽‍❤️‍💋‍👩🏽' => '',
+    '👩🏽‍❤️‍💋‍👩🏾' => '',
+    '👩🏽‍❤️‍💋‍👩🏿' => '',
+    '👩🏾‍❤️‍💋‍👩🏻' => '',
+    '👩🏾‍❤️‍💋‍👩🏼' => '',
+    '👩🏾‍❤️‍💋‍👩🏽' => '',
+    '👩🏾‍❤️‍💋‍👩🏾' => '',
+    '👩🏾‍❤️‍💋‍👩🏿' => '',
+    '👩🏿‍❤️‍💋‍👩🏻' => '',
+    '👩🏿‍❤️‍💋‍👩🏼' => '',
+    '👩🏿‍❤️‍💋‍👩🏽' => '',
+    '👩🏿‍❤️‍💋‍👩🏾' => '',
+    '👩🏿‍❤️‍💋‍👩🏿' => '',
+    '🧑🏻‍❤‍💋‍🧑🏼' => '',
+    '🧑🏻‍❤‍💋‍🧑🏽' => '',
+    '🧑🏻‍❤‍💋‍🧑🏾' => '',
+    '🧑🏻‍❤‍💋‍🧑🏿' => '',
+    '🧑🏼‍❤‍💋‍🧑🏻' => '',
+    '🧑🏼‍❤‍💋‍🧑🏽' => '',
+    '🧑🏼‍❤‍💋‍🧑🏾' => '',
+    '🧑🏼‍❤‍💋‍🧑🏿' => '',
+    '🧑🏽‍❤‍💋‍🧑🏻' => '',
+    '🧑🏽‍❤‍💋‍🧑🏼' => '',
+    '🧑🏽‍❤‍💋‍🧑🏾' => '',
+    '🧑🏽‍❤‍💋‍🧑🏿' => '',
+    '🧑🏾‍❤‍💋‍🧑🏻' => '',
+    '🧑🏾‍❤‍💋‍🧑🏼' => '',
+    '🧑🏾‍❤‍💋‍🧑🏽' => '',
+    '🧑🏾‍❤‍💋‍🧑🏿' => '',
+    '🧑🏿‍❤‍💋‍🧑🏻' => '',
+    '🧑🏿‍❤‍💋‍🧑🏼' => '',
+    '🧑🏿‍❤‍💋‍🧑🏽' => '',
+    '🧑🏿‍❤‍💋‍🧑🏾' => '',
+    '👩🏻‍❤‍💋‍👨🏻' => '',
+    '👩🏻‍❤‍💋‍👨🏼' => '',
+    '👩🏻‍❤‍💋‍👨🏽' => '',
+    '👩🏻‍❤‍💋‍👨🏾' => '',
+    '👩🏻‍❤‍💋‍👨🏿' => '',
+    '👩🏼‍❤‍💋‍👨🏻' => '',
+    '👩🏼‍❤‍💋‍👨🏼' => '',
+    '👩🏼‍❤‍💋‍👨🏽' => '',
+    '👩🏼‍❤‍💋‍👨🏾' => '',
+    '👩🏼‍❤‍💋‍👨🏿' => '',
+    '👩🏽‍❤‍💋‍👨🏻' => '',
+    '👩🏽‍❤‍💋‍👨🏼' => '',
+    '👩🏽‍❤‍💋‍👨🏽' => '',
+    '👩🏽‍❤‍💋‍👨🏾' => '',
+    '👩🏽‍❤‍💋‍👨🏿' => '',
+    '👩🏾‍❤‍💋‍👨🏻' => '',
+    '👩🏾‍❤‍💋‍👨🏼' => '',
+    '👩🏾‍❤‍💋‍👨🏽' => '',
+    '👩🏾‍❤‍💋‍👨🏾' => '',
+    '👩🏾‍❤‍💋‍👨🏿' => '',
+    '👩🏿‍❤‍💋‍👨🏻' => '',
+    '👩🏿‍❤‍💋‍👨🏼' => '',
+    '👩🏿‍❤‍💋‍👨🏽' => '',
+    '👩🏿‍❤‍💋‍👨🏾' => '',
+    '👩🏿‍❤‍💋‍👨🏿' => '',
+    '👨🏻‍❤‍💋‍👨🏻' => '',
+    '👨🏻‍❤‍💋‍👨🏼' => '',
+    '👨🏻‍❤‍💋‍👨🏽' => '',
+    '👨🏻‍❤‍💋‍👨🏾' => '',
+    '👨🏻‍❤‍💋‍👨🏿' => '',
+    '👨🏼‍❤‍💋‍👨🏻' => '',
+    '👨🏼‍❤‍💋‍👨🏼' => '',
+    '👨🏼‍❤‍💋‍👨🏽' => '',
+    '👨🏼‍❤‍💋‍👨🏾' => '',
+    '👨🏼‍❤‍💋‍👨🏿' => '',
+    '👨🏽‍❤‍💋‍👨🏻' => '',
+    '👨🏽‍❤‍💋‍👨🏼' => '',
+    '👨🏽‍❤‍💋‍👨🏽' => '',
+    '👨🏽‍❤‍💋‍👨🏾' => '',
+    '👨🏽‍❤‍💋‍👨🏿' => '',
+    '👨🏾‍❤‍💋‍👨🏻' => '',
+    '👨🏾‍❤‍💋‍👨🏼' => '',
+    '👨🏾‍❤‍💋‍👨🏽' => '',
+    '👨🏾‍❤‍💋‍👨🏾' => '',
+    '👨🏾‍❤‍💋‍👨🏿' => '',
+    '👨🏿‍❤‍💋‍👨🏻' => '',
+    '👨🏿‍❤‍💋‍👨🏼' => '',
+    '👨🏿‍❤‍💋‍👨🏽' => '',
+    '👨🏿‍❤‍💋‍👨🏾' => '',
+    '👨🏿‍❤‍💋‍👨🏿' => '',
+    '👩🏻‍❤‍💋‍👩🏻' => '',
+    '👩🏻‍❤‍💋‍👩🏼' => '',
+    '👩🏻‍❤‍💋‍👩🏽' => '',
+    '👩🏻‍❤‍💋‍👩🏾' => '',
+    '👩🏻‍❤‍💋‍👩🏿' => '',
+    '👩🏼‍❤‍💋‍👩🏻' => '',
+    '👩🏼‍❤‍💋‍👩🏼' => '',
+    '👩🏼‍❤‍💋‍👩🏽' => '',
+    '👩🏼‍❤‍💋‍👩🏾' => '',
+    '👩🏼‍❤‍💋‍👩🏿' => '',
+    '👩🏽‍❤‍💋‍👩🏻' => '',
+    '👩🏽‍❤‍💋‍👩🏼' => '',
+    '👩🏽‍❤‍💋‍👩🏽' => '',
+    '👩🏽‍❤‍💋‍👩🏾' => '',
+    '👩🏽‍❤‍💋‍👩🏿' => '',
+    '👩🏾‍❤‍💋‍👩🏻' => '',
+    '👩🏾‍❤‍💋‍👩🏼' => '',
+    '👩🏾‍❤‍💋‍👩🏽' => '',
+    '👩🏾‍❤‍💋‍👩🏾' => '',
+    '👩🏾‍❤‍💋‍👩🏿' => '',
+    '👩🏿‍❤‍💋‍👩🏻' => '',
+    '👩🏿‍❤‍💋‍👩🏼' => '',
+    '👩🏿‍❤‍💋‍👩🏽' => '',
+    '👩🏿‍❤‍💋‍👩🏾' => '',
+    '👩🏿‍❤‍💋‍👩🏿' => '',
+    '👩‍❤️‍💋‍👨' => '',
+    '👨‍❤️‍💋‍👨' => '',
+    '👩‍❤️‍💋‍👩' => '',
+    '🧑🏻‍❤️‍🧑🏼' => '',
+    '🧑🏻‍❤️‍🧑🏽' => '',
+    '🧑🏻‍❤️‍🧑🏾' => '',
+    '🧑🏻‍❤️‍🧑🏿' => '',
+    '🧑🏼‍❤️‍🧑🏻' => '',
+    '🧑🏼‍❤️‍🧑🏽' => '',
+    '🧑🏼‍❤️‍🧑🏾' => '',
+    '🧑🏼‍❤️‍🧑🏿' => '',
+    '🧑🏽‍❤️‍🧑🏻' => '',
+    '🧑🏽‍❤️‍🧑🏼' => '',
+    '🧑🏽‍❤️‍🧑🏾' => '',
+    '🧑🏽‍❤️‍🧑🏿' => '',
+    '🧑🏾‍❤️‍🧑🏻' => '',
+    '🧑🏾‍❤️‍🧑🏼' => '',
+    '🧑🏾‍❤️‍🧑🏽' => '',
+    '🧑🏾‍❤️‍🧑🏿' => '',
+    '🧑🏿‍❤️‍🧑🏻' => '',
+    '🧑🏿‍❤️‍🧑🏼' => '',
+    '🧑🏿‍❤️‍🧑🏽' => '',
+    '🧑🏿‍❤️‍🧑🏾' => '',
+    '👩🏻‍❤️‍👨🏻' => '',
+    '👩🏻‍❤️‍👨🏼' => '',
+    '👩🏻‍❤️‍👨🏽' => '',
+    '👩🏻‍❤️‍👨🏾' => '',
+    '👩🏻‍❤️‍👨🏿' => '',
+    '👩🏼‍❤️‍👨🏻' => '',
+    '👩🏼‍❤️‍👨🏼' => '',
+    '👩🏼‍❤️‍👨🏽' => '',
+    '👩🏼‍❤️‍👨🏾' => '',
+    '👩🏼‍❤️‍👨🏿' => '',
+    '👩🏽‍❤️‍👨🏻' => '',
+    '👩🏽‍❤️‍👨🏼' => '',
+    '👩🏽‍❤️‍👨🏽' => '',
+    '👩🏽‍❤️‍👨🏾' => '',
+    '👩🏽‍❤️‍👨🏿' => '',
+    '👩🏾‍❤️‍👨🏻' => '',
+    '👩🏾‍❤️‍👨🏼' => '',
+    '👩🏾‍❤️‍👨🏽' => '',
+    '👩🏾‍❤️‍👨🏾' => '',
+    '👩🏾‍❤️‍👨🏿' => '',
+    '👩🏿‍❤️‍👨🏻' => '',
+    '👩🏿‍❤️‍👨🏼' => '',
+    '👩🏿‍❤️‍👨🏽' => '',
+    '👩🏿‍❤️‍👨🏾' => '',
+    '👩🏿‍❤️‍👨🏿' => '',
+    '👨🏻‍❤️‍👨🏻' => '',
+    '👨🏻‍❤️‍👨🏼' => '',
+    '👨🏻‍❤️‍👨🏽' => '',
+    '👨🏻‍❤️‍👨🏾' => '',
+    '👨🏻‍❤️‍👨🏿' => '',
+    '👨🏼‍❤️‍👨🏻' => '',
+    '👨🏼‍❤️‍👨🏼' => '',
+    '👨🏼‍❤️‍👨🏽' => '',
+    '👨🏼‍❤️‍👨🏾' => '',
+    '👨🏼‍❤️‍👨🏿' => '',
+    '👨🏽‍❤️‍👨🏻' => '',
+    '👨🏽‍❤️‍👨🏼' => '',
+    '👨🏽‍❤️‍👨🏽' => '',
+    '👨🏽‍❤️‍👨🏾' => '',
+    '👨🏽‍❤️‍👨🏿' => '',
+    '👨🏾‍❤️‍👨🏻' => '',
+    '👨🏾‍❤️‍👨🏼' => '',
+    '👨🏾‍❤️‍👨🏽' => '',
+    '👨🏾‍❤️‍👨🏾' => '',
+    '👨🏾‍❤️‍👨🏿' => '',
+    '👨🏿‍❤️‍👨🏻' => '',
+    '👨🏿‍❤️‍👨🏼' => '',
+    '👨🏿‍❤️‍👨🏽' => '',
+    '👨🏿‍❤️‍👨🏾' => '',
+    '👨🏿‍❤️‍👨🏿' => '',
+    '👩🏻‍❤️‍👩🏻' => '',
+    '👩🏻‍❤️‍👩🏼' => '',
+    '👩🏻‍❤️‍👩🏽' => '',
+    '👩🏻‍❤️‍👩🏾' => '',
+    '👩🏻‍❤️‍👩🏿' => '',
+    '👩🏼‍❤️‍👩🏻' => '',
+    '👩🏼‍❤️‍👩🏼' => '',
+    '👩🏼‍❤️‍👩🏽' => '',
+    '👩🏼‍❤️‍👩🏾' => '',
+    '👩🏼‍❤️‍👩🏿' => '',
+    '👩🏽‍❤️‍👩🏻' => '',
+    '👩🏽‍❤️‍👩🏼' => '',
+    '👩🏽‍❤️‍👩🏽' => '',
+    '👩🏽‍❤️‍👩🏾' => '',
+    '👩🏽‍❤️‍👩🏿' => '',
+    '👩🏾‍❤️‍👩🏻' => '',
+    '👩🏾‍❤️‍👩🏼' => '',
+    '👩🏾‍❤️‍👩🏽' => '',
+    '👩🏾‍❤️‍👩🏾' => '',
+    '👩🏾‍❤️‍👩🏿' => '',
+    '👩🏿‍❤️‍👩🏻' => '',
+    '👩🏿‍❤️‍👩🏼' => '',
+    '👩🏿‍❤️‍👩🏽' => '',
+    '👩🏿‍❤️‍👩🏾' => '',
+    '👩🏿‍❤️‍👩🏿' => '',
+    '🧑🏻‍🤝‍🧑🏻' => '',
+    '🧑🏻‍🤝‍🧑🏼' => '',
+    '🧑🏻‍🤝‍🧑🏽' => '',
+    '🧑🏻‍🤝‍🧑🏾' => '',
+    '🧑🏻‍🤝‍🧑🏿' => '',
+    '🧑🏼‍🤝‍🧑🏻' => '',
+    '🧑🏼‍🤝‍🧑🏼' => '',
+    '🧑🏼‍🤝‍🧑🏽' => '',
+    '🧑🏼‍🤝‍🧑🏾' => '',
+    '🧑🏼‍🤝‍🧑🏿' => '',
+    '🧑🏽‍🤝‍🧑🏻' => '',
+    '🧑🏽‍🤝‍🧑🏼' => '',
+    '🧑🏽‍🤝‍🧑🏽' => '',
+    '🧑🏽‍🤝‍🧑🏾' => '',
+    '🧑🏽‍🤝‍🧑🏿' => '',
+    '🧑🏾‍🤝‍🧑🏻' => '',
+    '🧑🏾‍🤝‍🧑🏼' => '',
+    '🧑🏾‍🤝‍🧑🏽' => '',
+    '🧑🏾‍🤝‍🧑🏾' => '',
+    '🧑🏾‍🤝‍🧑🏿' => '',
+    '🧑🏿‍🤝‍🧑🏻' => '',
+    '🧑🏿‍🤝‍🧑🏼' => '',
+    '🧑🏿‍🤝‍🧑🏽' => '',
+    '🧑🏿‍🤝‍🧑🏾' => '',
+    '🧑🏿‍🤝‍🧑🏿' => '',
+    '👩🏻‍🤝‍👩🏼' => '',
+    '👩🏻‍🤝‍👩🏽' => '',
+    '👩🏻‍🤝‍👩🏾' => '',
+    '👩🏻‍🤝‍👩🏿' => '',
+    '👩🏼‍🤝‍👩🏻' => '',
+    '👩🏼‍🤝‍👩🏽' => '',
+    '👩🏼‍🤝‍👩🏾' => '',
+    '👩🏼‍🤝‍👩🏿' => '',
+    '👩🏽‍🤝‍👩🏻' => '',
+    '👩🏽‍🤝‍👩🏼' => '',
+    '👩🏽‍🤝‍👩🏾' => '',
+    '👩🏽‍🤝‍👩🏿' => '',
+    '👩🏾‍🤝‍👩🏻' => '',
+    '👩🏾‍🤝‍👩🏼' => '',
+    '👩🏾‍🤝‍👩🏽' => '',
+    '👩🏾‍🤝‍👩🏿' => '',
+    '👩🏿‍🤝‍👩🏻' => '',
+    '👩🏿‍🤝‍👩🏼' => '',
+    '👩🏿‍🤝‍👩🏽' => '',
+    '👩🏿‍🤝‍👩🏾' => '',
+    '👩🏻‍🤝‍👨🏼' => '',
+    '👩🏻‍🤝‍👨🏽' => '',
+    '👩🏻‍🤝‍👨🏾' => '',
+    '👩🏻‍🤝‍👨🏿' => '',
+    '👩🏼‍🤝‍👨🏻' => '',
+    '👩🏼‍🤝‍👨🏽' => '',
+    '👩🏼‍🤝‍👨🏾' => '',
+    '👩🏼‍🤝‍👨🏿' => '',
+    '👩🏽‍🤝‍👨🏻' => '',
+    '👩🏽‍🤝‍👨🏼' => '',
+    '👩🏽‍🤝‍👨🏾' => '',
+    '👩🏽‍🤝‍👨🏿' => '',
+    '👩🏾‍🤝‍👨🏻' => '',
+    '👩🏾‍🤝‍👨🏼' => '',
+    '👩🏾‍🤝‍👨🏽' => '',
+    '👩🏾‍🤝‍👨🏿' => '',
+    '👩🏿‍🤝‍👨🏻' => '',
+    '👩🏿‍🤝‍👨🏼' => '',
+    '👩🏿‍🤝‍👨🏽' => '',
+    '👩🏿‍🤝‍👨🏾' => '',
+    '👨🏻‍🤝‍👨🏼' => '',
+    '👨🏻‍🤝‍👨🏽' => '',
+    '👨🏻‍🤝‍👨🏾' => '',
+    '👨🏻‍🤝‍👨🏿' => '',
+    '👨🏼‍🤝‍👨🏻' => '',
+    '👨🏼‍🤝‍👨🏽' => '',
+    '👨🏼‍🤝‍👨🏾' => '',
+    '👨🏼‍🤝‍👨🏿' => '',
+    '👨🏽‍🤝‍👨🏻' => '',
+    '👨🏽‍🤝‍👨🏼' => '',
+    '👨🏽‍🤝‍👨🏾' => '',
+    '👨🏽‍🤝‍👨🏿' => '',
+    '👨🏾‍🤝‍👨🏻' => '',
+    '👨🏾‍🤝‍👨🏼' => '',
+    '👨🏾‍🤝‍👨🏽' => '',
+    '👨🏾‍🤝‍👨🏿' => '',
+    '👨🏿‍🤝‍👨🏻' => '',
+    '👨🏿‍🤝‍👨🏼' => '',
+    '👨🏿‍🤝‍👨🏽' => '',
+    '👨🏿‍🤝‍👨🏾' => '',
+    '👩‍❤‍💋‍👨' => '',
+    '👨‍❤‍💋‍👨' => '',
+    '👩‍❤‍💋‍👩' => '',
+    '🧑🏻‍❤‍🧑🏼' => '',
+    '🧑🏻‍❤‍🧑🏽' => '',
+    '🧑🏻‍❤‍🧑🏾' => '',
+    '🧑🏻‍❤‍🧑🏿' => '',
+    '🧑🏼‍❤‍🧑🏻' => '',
+    '🧑🏼‍❤‍🧑🏽' => '',
+    '🧑🏼‍❤‍🧑🏾' => '',
+    '🧑🏼‍❤‍🧑🏿' => '',
+    '🧑🏽‍❤‍🧑🏻' => '',
+    '🧑🏽‍❤‍🧑🏼' => '',
+    '🧑🏽‍❤‍🧑🏾' => '',
+    '🧑🏽‍❤‍🧑🏿' => '',
+    '🧑🏾‍❤‍🧑🏻' => '',
+    '🧑🏾‍❤‍🧑🏼' => '',
+    '🧑🏾‍❤‍🧑🏽' => '',
+    '🧑🏾‍❤‍🧑🏿' => '',
+    '🧑🏿‍❤‍🧑🏻' => '',
+    '🧑🏿‍❤‍🧑🏼' => '',
+    '🧑🏿‍❤‍🧑🏽' => '',
+    '🧑🏿‍❤‍🧑🏾' => '',
+    '👩🏻‍❤‍👨🏻' => '',
+    '👩🏻‍❤‍👨🏼' => '',
+    '👩🏻‍❤‍👨🏽' => '',
+    '👩🏻‍❤‍👨🏾' => '',
+    '👩🏻‍❤‍👨🏿' => '',
+    '👩🏼‍❤‍👨🏻' => '',
+    '👩🏼‍❤‍👨🏼' => '',
+    '👩🏼‍❤‍👨🏽' => '',
+    '👩🏼‍❤‍👨🏾' => '',
+    '👩🏼‍❤‍👨🏿' => '',
+    '👩🏽‍❤‍👨🏻' => '',
+    '👩🏽‍❤‍👨🏼' => '',
+    '👩🏽‍❤‍👨🏽' => '',
+    '👩🏽‍❤‍👨🏾' => '',
+    '👩🏽‍❤‍👨🏿' => '',
+    '👩🏾‍❤‍👨🏻' => '',
+    '👩🏾‍❤‍👨🏼' => '',
+    '👩🏾‍❤‍👨🏽' => '',
+    '👩🏾‍❤‍👨🏾' => '',
+    '👩🏾‍❤‍👨🏿' => '',
+    '👩🏿‍❤‍👨🏻' => '',
+    '👩🏿‍❤‍👨🏼' => '',
+    '👩🏿‍❤‍👨🏽' => '',
+    '👩🏿‍❤‍👨🏾' => '',
+    '👩🏿‍❤‍👨🏿' => '',
+    '👨🏻‍❤‍👨🏻' => '',
+    '👨🏻‍❤‍👨🏼' => '',
+    '👨🏻‍❤‍👨🏽' => '',
+    '👨🏻‍❤‍👨🏾' => '',
+    '👨🏻‍❤‍👨🏿' => '',
+    '👨🏼‍❤‍👨🏻' => '',
+    '👨🏼‍❤‍👨🏼' => '',
+    '👨🏼‍❤‍👨🏽' => '',
+    '👨🏼‍❤‍👨🏾' => '',
+    '👨🏼‍❤‍👨🏿' => '',
+    '👨🏽‍❤‍👨🏻' => '',
+    '👨🏽‍❤‍👨🏼' => '',
+    '👨🏽‍❤‍👨🏽' => '',
+    '👨🏽‍❤‍👨🏾' => '',
+    '👨🏽‍❤‍👨🏿' => '',
+    '👨🏾‍❤‍👨🏻' => '',
+    '👨🏾‍❤‍👨🏼' => '',
+    '👨🏾‍❤‍👨🏽' => '',
+    '👨🏾‍❤‍👨🏾' => '',
+    '👨🏾‍❤‍👨🏿' => '',
+    '👨🏿‍❤‍👨🏻' => '',
+    '👨🏿‍❤‍👨🏼' => '',
+    '👨🏿‍❤‍👨🏽' => '',
+    '👨🏿‍❤‍👨🏾' => '',
+    '👨🏿‍❤‍👨🏿' => '',
+    '👩🏻‍❤‍👩🏻' => '',
+    '👩🏻‍❤‍👩🏼' => '',
+    '👩🏻‍❤‍👩🏽' => '',
+    '👩🏻‍❤‍👩🏾' => '',
+    '👩🏻‍❤‍👩🏿' => '',
+    '👩🏼‍❤‍👩🏻' => '',
+    '👩🏼‍❤‍👩🏼' => '',
+    '👩🏼‍❤‍👩🏽' => '',
+    '👩🏼‍❤‍👩🏾' => '',
+    '👩🏼‍❤‍👩🏿' => '',
+    '👩🏽‍❤‍👩🏻' => '',
+    '👩🏽‍❤‍👩🏼' => '',
+    '👩🏽‍❤‍👩🏽' => '',
+    '👩🏽‍❤‍👩🏾' => '',
+    '👩🏽‍❤‍👩🏿' => '',
+    '👩🏾‍❤‍👩🏻' => '',
+    '👩🏾‍❤‍👩🏼' => '',
+    '👩🏾‍❤‍👩🏽' => '',
+    '👩🏾‍❤‍👩🏾' => '',
+    '👩🏾‍❤‍👩🏿' => '',
+    '👩🏿‍❤‍👩🏻' => '',
+    '👩🏿‍❤‍👩🏼' => '',
+    '👩🏿‍❤‍👩🏽' => '',
+    '👩🏿‍❤‍👩🏾' => '',
+    '👩🏿‍❤‍👩🏿' => '',
+    '👨‍👩‍👧‍👦' => '',
+    '👨‍👩‍👦‍👦' => '',
+    '👨‍👩‍👧‍👧' => '',
+    '👨‍👨‍👧‍👦' => '',
+    '👨‍👨‍👦‍👦' => '',
+    '👨‍👨‍👧‍👧' => '',
+    '👩‍👩‍👧‍👦' => '',
+    '👩‍👩‍👦‍👦' => '',
+    '👩‍👩‍👧‍👧' => '',
+    '🏴󠁧󠁢󠁥󠁮󠁧󠁿' => '',
+    '🏴󠁧󠁢󠁳󠁣󠁴󠁿' => '',
+    '🏴󠁧󠁢󠁷󠁬󠁳󠁿' => '',
+    '👩‍❤️‍👨' => '',
+    '👨‍❤️‍👨' => '',
+    '👩‍❤️‍👩' => '',
+    '👁️‍🗨️' => '',
+    '🫱🏻‍🫲🏼' => '',
+    '🫱🏻‍🫲🏽' => '',
+    '🫱🏻‍🫲🏾' => '',
+    '🫱🏻‍🫲🏿' => '',
+    '🫱🏼‍🫲🏻' => '',
+    '🫱🏼‍🫲🏽' => '',
+    '🫱🏼‍🫲🏾' => '',
+    '🫱🏼‍🫲🏿' => '',
+    '🫱🏽‍🫲🏻' => '',
+    '🫱🏽‍🫲🏼' => '',
+    '🫱🏽‍🫲🏾' => '',
+    '🫱🏽‍🫲🏿' => '',
+    '🫱🏾‍🫲🏻' => '',
+    '🫱🏾‍🫲🏼' => '',
+    '🫱🏾‍🫲🏽' => '',
+    '🫱🏾‍🫲🏿' => '',
+    '🫱🏿‍🫲🏻' => '',
+    '🫱🏿‍🫲🏼' => '',
+    '🫱🏿‍🫲🏽' => '',
+    '🫱🏿‍🫲🏾' => '',
+    '🧔🏻‍♂️' => '',
+    '🧔🏼‍♂️' => '',
+    '🧔🏽‍♂️' => '',
+    '🧔🏾‍♂️' => '',
+    '🧔🏿‍♂️' => '',
+    '🧔🏻‍♀️' => '',
+    '🧔🏼‍♀️' => '',
+    '🧔🏽‍♀️' => '',
+    '🧔🏾‍♀️' => '',
+    '🧔🏿‍♀️' => '',
+    '👱🏻‍♀️' => '',
+    '👱🏼‍♀️' => '',
+    '👱🏽‍♀️' => '',
+    '👱🏾‍♀️' => '',
+    '👱🏿‍♀️' => '',
+    '👱🏻‍♂️' => '',
+    '👱🏼‍♂️' => '',
+    '👱🏽‍♂️' => '',
+    '👱🏾‍♂️' => '',
+    '👱🏿‍♂️' => '',
+    '🙍🏻‍♂️' => '',
+    '🙍🏼‍♂️' => '',
+    '🙍🏽‍♂️' => '',
+    '🙍🏾‍♂️' => '',
+    '🙍🏿‍♂️' => '',
+    '🙍🏻‍♀️' => '',
+    '🙍🏼‍♀️' => '',
+    '🙍🏽‍♀️' => '',
+    '🙍🏾‍♀️' => '',
+    '🙍🏿‍♀️' => '',
+    '🙎🏻‍♂️' => '',
+    '🙎🏼‍♂️' => '',
+    '🙎🏽‍♂️' => '',
+    '🙎🏾‍♂️' => '',
+    '🙎🏿‍♂️' => '',
+    '🙎🏻‍♀️' => '',
+    '🙎🏼‍♀️' => '',
+    '🙎🏽‍♀️' => '',
+    '🙎🏾‍♀️' => '',
+    '🙎🏿‍♀️' => '',
+    '🙅🏻‍♂️' => '',
+    '🙅🏼‍♂️' => '',
+    '🙅🏽‍♂️' => '',
+    '🙅🏾‍♂️' => '',
+    '🙅🏿‍♂️' => '',
+    '🙅🏻‍♀️' => '',
+    '🙅🏼‍♀️' => '',
+    '🙅🏽‍♀️' => '',
+    '🙅🏾‍♀️' => '',
+    '🙅🏿‍♀️' => '',
+    '🙆🏻‍♂️' => '',
+    '🙆🏼‍♂️' => '',
+    '🙆🏽‍♂️' => '',
+    '🙆🏾‍♂️' => '',
+    '🙆🏿‍♂️' => '',
+    '🙆🏻‍♀️' => '',
+    '🙆🏼‍♀️' => '',
+    '🙆🏽‍♀️' => '',
+    '🙆🏾‍♀️' => '',
+    '🙆🏿‍♀️' => '',
+    '💁🏻‍♂️' => '',
+    '💁🏼‍♂️' => '',
+    '💁🏽‍♂️' => '',
+    '💁🏾‍♂️' => '',
+    '💁🏿‍♂️' => '',
+    '💁🏻‍♀️' => '',
+    '💁🏼‍♀️' => '',
+    '💁🏽‍♀️' => '',
+    '💁🏾‍♀️' => '',
+    '💁🏿‍♀️' => '',
+    '🙋🏻‍♂️' => '',
+    '🙋🏼‍♂️' => '',
+    '🙋🏽‍♂️' => '',
+    '🙋🏾‍♂️' => '',
+    '🙋🏿‍♂️' => '',
+    '🙋🏻‍♀️' => '',
+    '🙋🏼‍♀️' => '',
+    '🙋🏽‍♀️' => '',
+    '🙋🏾‍♀️' => '',
+    '🙋🏿‍♀️' => '',
+    '🧏🏻‍♂️' => '',
+    '🧏🏼‍♂️' => '',
+    '🧏🏽‍♂️' => '',
+    '🧏🏾‍♂️' => '',
+    '🧏🏿‍♂️' => '',
+    '🧏🏻‍♀️' => '',
+    '🧏🏼‍♀️' => '',
+    '🧏🏽‍♀️' => '',
+    '🧏🏾‍♀️' => '',
+    '🧏🏿‍♀️' => '',
+    '🙇🏻‍♂️' => '',
+    '🙇🏼‍♂️' => '',
+    '🙇🏽‍♂️' => '',
+    '🙇🏾‍♂️' => '',
+    '🙇🏿‍♂️' => '',
+    '🙇🏻‍♀️' => '',
+    '🙇🏼‍♀️' => '',
+    '🙇🏽‍♀️' => '',
+    '🙇🏾‍♀️' => '',
+    '🙇🏿‍♀️' => '',
+    '🤦🏻‍♂️' => '',
+    '🤦🏼‍♂️' => '',
+    '🤦🏽‍♂️' => '',
+    '🤦🏾‍♂️' => '',
+    '🤦🏿‍♂️' => '',
+    '🤦🏻‍♀️' => '',
+    '🤦🏼‍♀️' => '',
+    '🤦🏽‍♀️' => '',
+    '🤦🏾‍♀️' => '',
+    '🤦🏿‍♀️' => '',
+    '🤷🏻‍♂️' => '',
+    '🤷🏼‍♂️' => '',
+    '🤷🏽‍♂️' => '',
+    '🤷🏾‍♂️' => '',
+    '🤷🏿‍♂️' => '',
+    '🤷🏻‍♀️' => '',
+    '🤷🏼‍♀️' => '',
+    '🤷🏽‍♀️' => '',
+    '🤷🏾‍♀️' => '',
+    '🤷🏿‍♀️' => '',
+    '🧑🏻‍⚕️' => '',
+    '🧑🏼‍⚕️' => '',
+    '🧑🏽‍⚕️' => '',
+    '🧑🏾‍⚕️' => '',
+    '🧑🏿‍⚕️' => '',
+    '👨🏻‍⚕️' => '',
+    '👨🏼‍⚕️' => '',
+    '👨🏽‍⚕️' => '',
+    '👨🏾‍⚕️' => '',
+    '👨🏿‍⚕️' => '',
+    '👩🏻‍⚕️' => '',
+    '👩🏼‍⚕️' => '',
+    '👩🏽‍⚕️' => '',
+    '👩🏾‍⚕️' => '',
+    '👩🏿‍⚕️' => '',
+    '🧑🏻‍⚖️' => '',
+    '🧑🏼‍⚖️' => '',
+    '🧑🏽‍⚖️' => '',
+    '🧑🏾‍⚖️' => '',
+    '🧑🏿‍⚖️' => '',
+    '👨🏻‍⚖️' => '',
+    '👨🏼‍⚖️' => '',
+    '👨🏽‍⚖️' => '',
+    '👨🏾‍⚖️' => '',
+    '👨🏿‍⚖️' => '',
+    '👩🏻‍⚖️' => '',
+    '👩🏼‍⚖️' => '',
+    '👩🏽‍⚖️' => '',
+    '👩🏾‍⚖️' => '',
+    '👩🏿‍⚖️' => '',
+    '🧑🏻‍✈️' => '',
+    '🧑🏼‍✈️' => '',
+    '🧑🏽‍✈️' => '',
+    '🧑🏾‍✈️' => '',
+    '🧑🏿‍✈️' => '',
+    '👨🏻‍✈️' => '',
+    '👨🏼‍✈️' => '',
+    '👨🏽‍✈️' => '',
+    '👨🏾‍✈️' => '',
+    '👨🏿‍✈️' => '',
+    '👩🏻‍✈️' => '',
+    '👩🏼‍✈️' => '',
+    '👩🏽‍✈️' => '',
+    '👩🏾‍✈️' => '',
+    '👩🏿‍✈️' => '',
+    '👮🏻‍♂️' => '',
+    '👮🏼‍♂️' => '',
+    '👮🏽‍♂️' => '',
+    '👮🏾‍♂️' => '',
+    '👮🏿‍♂️' => '',
+    '👮🏻‍♀️' => '',
+    '👮🏼‍♀️' => '',
+    '👮🏽‍♀️' => '',
+    '👮🏾‍♀️' => '',
+    '👮🏿‍♀️' => '',
+    '🕵️‍♂️' => '',
+    '🕵🏻‍♂️' => '',
+    '🕵🏼‍♂️' => '',
+    '🕵🏽‍♂️' => '',
+    '🕵🏾‍♂️' => '',
+    '🕵🏿‍♂️' => '',
+    '🕵️‍♀️' => '',
+    '🕵🏻‍♀️' => '',
+    '🕵🏼‍♀️' => '',
+    '🕵🏽‍♀️' => '',
+    '🕵🏾‍♀️' => '',
+    '🕵🏿‍♀️' => '',
+    '💂🏻‍♂️' => '',
+    '💂🏼‍♂️' => '',
+    '💂🏽‍♂️' => '',
+    '💂🏾‍♂️' => '',
+    '💂🏿‍♂️' => '',
+    '💂🏻‍♀️' => '',
+    '💂🏼‍♀️' => '',
+    '💂🏽‍♀️' => '',
+    '💂🏾‍♀️' => '',
+    '💂🏿‍♀️' => '',
+    '👷🏻‍♂️' => '',
+    '👷🏼‍♂️' => '',
+    '👷🏽‍♂️' => '',
+    '👷🏾‍♂️' => '',
+    '👷🏿‍♂️' => '',
+    '👷🏻‍♀️' => '',
+    '👷🏼‍♀️' => '',
+    '👷🏽‍♀️' => '',
+    '👷🏾‍♀️' => '',
+    '👷🏿‍♀️' => '',
+    '👳🏻‍♂️' => '',
+    '👳🏼‍♂️' => '',
+    '👳🏽‍♂️' => '',
+    '👳🏾‍♂️' => '',
+    '👳🏿‍♂️' => '',
+    '👳🏻‍♀️' => '',
+    '👳🏼‍♀️' => '',
+    '👳🏽‍♀️' => '',
+    '👳🏾‍♀️' => '',
+    '👳🏿‍♀️' => '',
+    '🤵🏻‍♂️' => '',
+    '🤵🏼‍♂️' => '',
+    '🤵🏽‍♂️' => '',
+    '🤵🏾‍♂️' => '',
+    '🤵🏿‍♂️' => '',
+    '🤵🏻‍♀️' => '',
+    '🤵🏼‍♀️' => '',
+    '🤵🏽‍♀️' => '',
+    '🤵🏾‍♀️' => '',
+    '🤵🏿‍♀️' => '',
+    '👰🏻‍♂️' => '',
+    '👰🏼‍♂️' => '',
+    '👰🏽‍♂️' => '',
+    '👰🏾‍♂️' => '',
+    '👰🏿‍♂️' => '',
+    '👰🏻‍♀️' => '',
+    '👰🏼‍♀️' => '',
+    '👰🏽‍♀️' => '',
+    '👰🏾‍♀️' => '',
+    '👰🏿‍♀️' => '',
+    '🦸🏻‍♂️' => '',
+    '🦸🏼‍♂️' => '',
+    '🦸🏽‍♂️' => '',
+    '🦸🏾‍♂️' => '',
+    '🦸🏿‍♂️' => '',
+    '🦸🏻‍♀️' => '',
+    '🦸🏼‍♀️' => '',
+    '🦸🏽‍♀️' => '',
+    '🦸🏾‍♀️' => '',
+    '🦸🏿‍♀️' => '',
+    '🦹🏻‍♂️' => '',
+    '🦹🏼‍♂️' => '',
+    '🦹🏽‍♂️' => '',
+    '🦹🏾‍♂️' => '',
+    '🦹🏿‍♂️' => '',
+    '🦹🏻‍♀️' => '',
+    '🦹🏼‍♀️' => '',
+    '🦹🏽‍♀️' => '',
+    '🦹🏾‍♀️' => '',
+    '🦹🏿‍♀️' => '',
+    '🧙🏻‍♂️' => '',
+    '🧙🏼‍♂️' => '',
+    '🧙🏽‍♂️' => '',
+    '🧙🏾‍♂️' => '',
+    '🧙🏿‍♂️' => '',
+    '🧙🏻‍♀️' => '',
+    '🧙🏼‍♀️' => '',
+    '🧙🏽‍♀️' => '',
+    '🧙🏾‍♀️' => '',
+    '🧙🏿‍♀️' => '',
+    '🧚🏻‍♂️' => '',
+    '🧚🏼‍♂️' => '',
+    '🧚🏽‍♂️' => '',
+    '🧚🏾‍♂️' => '',
+    '🧚🏿‍♂️' => '',
+    '🧚🏻‍♀️' => '',
+    '🧚🏼‍♀️' => '',
+    '🧚🏽‍♀️' => '',
+    '🧚🏾‍♀️' => '',
+    '🧚🏿‍♀️' => '',
+    '🧛🏻‍♂️' => '',
+    '🧛🏼‍♂️' => '',
+    '🧛🏽‍♂️' => '',
+    '🧛🏾‍♂️' => '',
+    '🧛🏿‍♂️' => '',
+    '🧛🏻‍♀️' => '',
+    '🧛🏼‍♀️' => '',
+    '🧛🏽‍♀️' => '',
+    '🧛🏾‍♀️' => '',
+    '🧛🏿‍♀️' => '',
+    '🧜🏻‍♂️' => '',
+    '🧜🏼‍♂️' => '',
+    '🧜🏽‍♂️' => '',
+    '🧜🏾‍♂️' => '',
+    '🧜🏿‍♂️' => '',
+    '🧜🏻‍♀️' => '',
+    '🧜🏼‍♀️' => '',
+    '🧜🏽‍♀️' => '',
+    '🧜🏾‍♀️' => '',
+    '🧜🏿‍♀️' => '',
+    '🧝🏻‍♂️' => '',
+    '🧝🏼‍♂️' => '',
+    '🧝🏽‍♂️' => '',
+    '🧝🏾‍♂️' => '',
+    '🧝🏿‍♂️' => '',
+    '🧝🏻‍♀️' => '',
+    '🧝🏼‍♀️' => '',
+    '🧝🏽‍♀️' => '',
+    '🧝🏾‍♀️' => '',
+    '🧝🏿‍♀️' => '',
+    '💆🏻‍♂️' => '',
+    '💆🏼‍♂️' => '',
+    '💆🏽‍♂️' => '',
+    '💆🏾‍♂️' => '',
+    '💆🏿‍♂️' => '',
+    '💆🏻‍♀️' => '',
+    '💆🏼‍♀️' => '',
+    '💆🏽‍♀️' => '',
+    '💆🏾‍♀️' => '',
+    '💆🏿‍♀️' => '',
+    '💇🏻‍♂️' => '',
+    '💇🏼‍♂️' => '',
+    '💇🏽‍♂️' => '',
+    '💇🏾‍♂️' => '',
+    '💇🏿‍♂️' => '',
+    '💇🏻‍♀️' => '',
+    '💇🏼‍♀️' => '',
+    '💇🏽‍♀️' => '',
+    '💇🏾‍♀️' => '',
+    '💇🏿‍♀️' => '',
+    '🚶🏻‍♂️' => '',
+    '🚶🏼‍♂️' => '',
+    '🚶🏽‍♂️' => '',
+    '🚶🏾‍♂️' => '',
+    '🚶🏿‍♂️' => '',
+    '🚶🏻‍♀️' => '',
+    '🚶🏼‍♀️' => '',
+    '🚶🏽‍♀️' => '',
+    '🚶🏾‍♀️' => '',
+    '🚶🏿‍♀️' => '',
+    '🧍🏻‍♂️' => '
10000
',
+    '🧍🏼‍♂️' => '',
+    '🧍🏽‍♂️' => '',
+    '🧍🏾‍♂️' => '',
+    '🧍🏿‍♂️' => '',
+    '🧍🏻‍♀️' => '',
+    '🧍🏼‍♀️' => '',
+    '🧍🏽‍♀️' => '',
+    '🧍🏾‍♀️' => '',
+    '🧍🏿‍♀️' => '',
+    '🧎🏻‍♂️' => '',
+    '🧎🏼‍♂️' => '',
+    '🧎🏽‍♂️' => '',
+    '🧎🏾‍♂️' => '',
+    '🧎🏿‍♂️' => '',
+    '🧎🏻‍♀️' => '',
+    '🧎🏼‍♀️' => '',
+    '🧎🏽‍♀️' => '',
+    '🧎🏾‍♀️' => '',
+    '🧎🏿‍♀️' => '',
+    '🏃🏻‍♂️' => '',
+    '🏃🏼‍♂️' => '',
+    '🏃🏽‍♂️' => '',
+    '🏃🏾‍♂️' => '',
+    '🏃🏿‍♂️' => '',
+    '🏃🏻‍♀️' => '',
+    '🏃🏼‍♀️' => '',
+    '🏃🏽‍♀️' => '',
+    '🏃🏾‍♀️' => '',
+    '🏃🏿‍♀️' => '',
+    '🧖🏻‍♂️' => '',
+    '🧖🏼‍♂️' => '',
+    '🧖🏽‍♂️' => '',
+    '🧖🏾‍♂️' => '',
+    '🧖🏿‍♂️' => '',
+    '🧖🏻‍♀️' => '',
+    '🧖🏼‍♀️' => '',
+    '🧖🏽‍♀️' => '',
+    '🧖🏾‍♀️' => '',
+    '🧖🏿‍♀️' => '',
+    '🧗🏻‍♂️' => '',
+    '🧗🏼‍♂️' => '',
+    '🧗🏽‍♂️' => '',
+    '🧗🏾‍♂️' => '',
+    '🧗🏿‍♂️' => '',
+    '🧗🏻‍♀️' => '',
+    '🧗🏼‍♀️' => '',
+    '🧗🏽‍♀️' => '',
+    '🧗🏾‍♀️' => '',
+    '🧗🏿‍♀️' => '',
+    '🏌️‍♂️' => '',
+    '🏌🏻‍♂️' => '',
+    '🏌🏼‍♂️' => '',
+    '🏌🏽‍♂️' => '',
+    '🏌🏾‍♂️' => '',
+    '🏌🏿‍♂️' => '',
+    '🏌️‍♀️' => '',
+    '🏌🏻‍♀️' => '',
+    '🏌🏼‍♀️' => '',
+    '🏌🏽‍♀️' => '',
+    '🏌🏾‍♀️' => '',
+    '🏌🏿‍♀️' => '',
+    '🏄🏻‍♂️' => '',
+    '🏄🏼‍♂️' => '',
+    '🏄🏽‍♂️' => '',
+    '🏄🏾‍♂️' => '',
+    '🏄🏿‍♂️' => '',
+    '🏄🏻‍♀️' => '',
+    '🏄🏼‍♀️' => '',
+    '🏄🏽‍♀️' => '',
+    '🏄🏾‍♀️' => '',
+    '🏄🏿‍♀️' => '',
+    '🚣🏻‍♂️' => '',
+    '🚣🏼‍♂️' => '',
+    '🚣🏽‍♂️' => '',
+    '🚣🏾‍♂️' => '',
+    '🚣🏿‍♂️' => '',
+    '🚣🏻‍♀️' => '',
+    '🚣🏼‍♀️' => '',
+    '🚣🏽‍♀️' => '',
+    '🚣🏾‍♀️' => '',
+    '🚣🏿‍♀️' => '',
+    '🏊🏻‍♂️' => '',
+    '🏊🏼‍♂️' => '',
+    '🏊🏽‍♂️' => '',
+    '🏊🏾‍♂️' => '',
+    '🏊🏿‍♂️' => '',
+    '🏊🏻‍♀️' => '',
+    '🏊🏼‍♀️' => '',
+    '🏊🏽‍♀️' => '',
+    '🏊🏾‍♀️' => '',
+    '🏊🏿‍♀️' => '',
+    '⛹️‍♂️' => '',
+    '⛹🏻‍♂️' => '',
+    '⛹🏼‍♂️' => '',
+    '⛹🏽‍♂️' => '',
+    '⛹🏾‍♂️' => '',
+    '⛹🏿‍♂️' => '',
+    '⛹️‍♀️' => '',
+    '⛹🏻‍♀️' => '',
+    '⛹🏼‍♀️' => '',
+    '⛹🏽‍♀️' => '',
+    '⛹🏾‍♀️' => '',
+    '⛹🏿‍♀️' => '',
+    '🏋️‍♂️' => '',
+    '🏋🏻‍♂️' => '',
+    '🏋🏼‍♂️' => '',
+    '🏋🏽‍♂️' => '',
+    '🏋🏾‍♂️' => '',
+    '🏋🏿‍♂️' => '',
+    '🏋️‍♀️' => '',
+    '🏋🏻‍♀️' => '',
+    '🏋🏼‍♀️' => '',
+    '🏋🏽‍♀️' => '',
+    '🏋🏾‍♀️' => '',
+    '🏋🏿‍♀️' => '',
+    '🚴🏻‍♂️' => '',
+    '🚴🏼‍♂️' => '',
+    '🚴🏽‍♂️' => '',
+    '🚴🏾‍♂️' => '',
+    '🚴🏿‍♂️' => '',
+    '🚴🏻‍♀️' => '',
+    '🚴🏼‍♀️' => '',
+    '🚴🏽‍♀️' => '',
+    '🚴🏾‍♀️' => '',
+    '🚴🏿‍♀️' => '',
+    '🚵🏻‍♂️' => '',
+    '🚵🏼‍♂️' => '',
+    '🚵🏽‍♂️' => '',
+    '🚵🏾‍♂️' => '',
+    '🚵🏿‍♂️' => '',
+    '🚵🏻‍♀️' => '',
+    '🚵🏼‍♀️' => '',
+    '🚵🏽‍♀️' => '',
+    '🚵🏾‍♀️' => '',
+    '🚵🏿‍♀️' => '',
+    '🤸🏻‍♂️' => '',
+    '🤸🏼‍♂️' => '',
+    '🤸🏽‍♂️' => '',
+    '🤸🏾‍♂️' => '',
+    '🤸🏿‍♂️' => '',
+    '🤸🏻‍♀️' => '',
+    '🤸🏼‍♀️' => '',
+    '🤸🏽‍♀️' => '',
+    '🤸🏾‍♀️' => '',
+    '🤸🏿‍♀️' => '',
+    '🤽🏻‍♂️' => '',
+    '🤽🏼‍♂️' => '',
+    '🤽🏽‍♂️' => '',
+    '🤽🏾‍♂️' => '',
+    '🤽🏿‍♂️' => '',
+    '🤽🏻‍♀️' => '',
+    '🤽🏼‍♀️' => '',
+    '🤽🏽‍♀️' => '',
+    '🤽🏾‍♀️' => '',
+    '🤽🏿‍♀️' => '',
+    '🤾🏻‍♂️' => '',
+    '🤾🏼‍♂️' => '',
+    '🤾🏽‍♂️' => '',
+    '🤾🏾‍♂️' => '',
+    '🤾🏿‍♂️' => '',
+    '🤾🏻‍♀️' => '',
+    '🤾🏼‍♀️' => '',
+    '🤾🏽‍♀️' => '',
+    '🤾🏾‍♀️' => '',
+    '🤾🏿‍♀️' => '',
+    '🤹🏻‍♂️' => '',
+    '🤹🏼‍♂️' => '',
+    '🤹🏽‍♂️' => '',
+    '🤹🏾‍♂️' => '',
+    '🤹🏿‍♂️' => '',
+    '🤹🏻‍♀️' => '',
+    '🤹🏼‍♀️' => '',
+    '🤹🏽‍♀️' => '',
+    '🤹🏾‍♀️' => '',
+    '🤹🏿‍♀️' => '',
+    '🧘🏻‍♂️' => '',
+    '🧘🏼‍♂️' => '',
+    '🧘🏽‍♂️' => '',
+    '🧘🏾‍♂️' => '',
+    '🧘🏿‍♂️' => '',
+    '🧘🏻‍♀️' => '',
+    '🧘🏼‍♀️' => '',
+    '🧘🏽‍♀️' => '',
+    '🧘🏾‍♀️' => '',
+    '🧘🏿‍♀️' => '',
+    '🧑‍🤝‍🧑' => '',
+    '👩‍❤‍👨' => '',
+    '👨‍❤‍👨' => '',
+    '👩‍❤‍👩' => '',
+    '👨‍👩‍👦' => '',
+    '👨‍👩‍👧' => '',
+    '👨‍👨‍👦' => '',
+    '👨‍👨‍👧' => '',
+    '👩‍👩‍👦' => '',
+    '👩‍👩‍👧' => '',
+    '👨‍👦‍👦' => '',
+    '👨‍👧‍👦' => '',
+    '👨‍👧‍👧' => '',
+    '👩‍👦‍👦' => '',
+    '👩‍👧‍👦' => '',
+    '👩‍👧‍👧' => '',
+    '🏳️‍⚧️' => '',
+    '😶‍🌫️' => '',
+    '❤️‍🔥' => '',
+    '❤️‍🩹' => '',
+    '👁‍🗨️' => '',
+    '👁️‍🗨' => '',
+    '🧔‍♂️' => '',
+    '🧔🏻‍♂' => '',
+    '🧔🏼‍♂' => '',
+    '🧔🏽‍♂' => '',
+    '🧔🏾‍♂' => '',
+    '🧔🏿‍♂' => '',
+    '🧔‍♀️' => '',
+    '🧔🏻‍♀' => '',
+    '🧔🏼‍♀' => '',
+    '🧔🏽‍♀' => '',
+    '🧔🏾‍♀' => '',
+    '🧔🏿‍♀' => '',
+    '👨🏻‍🦰' => '',
+    '👨🏼‍🦰' => '',
+    '👨🏽‍🦰' => '',
+    '👨🏾‍🦰' => '',
+    '👨🏿‍🦰' => '',
+    '👨🏻‍🦱' => '',
+    '👨🏼‍🦱' => '',
+    '👨🏽‍🦱' => '',
+    '👨🏾‍🦱' => '',
+    '👨🏿‍🦱' => '',
+    '👨🏻‍🦳' => '',
+    '👨🏼‍🦳' => '',
+    '👨🏽‍🦳' => '',
+    '👨🏾‍🦳' => '',
+    '👨🏿‍🦳' => '',
+    '👨🏻‍🦲' => '',
+    '👨🏼‍🦲' => '',
+    '👨🏽‍🦲' => '',
+    '👨🏾‍🦲' => '',
+    '👨🏿‍🦲' => '',
+    '👩🏻‍🦰' => '',
+    '👩🏼‍🦰' => '',
+    '👩🏽‍🦰' => '',
+    '👩🏾‍🦰' => '',
+    '👩🏿‍🦰' => '',
+    '🧑🏻‍🦰' => '',
+    '🧑🏼‍🦰' => '',
+    '🧑🏽‍🦰' => '',
+    '🧑🏾‍🦰' => '',
+    '🧑🏿‍🦰' => '',
+    '👩🏻‍🦱' => '',
+    '👩🏼‍🦱' => '',
+    '👩🏽‍🦱' => '',
+    '👩🏾‍🦱' => '',
+    '👩🏿‍🦱' => '',
+    '🧑🏻‍🦱' => '',
+    '🧑🏼‍🦱' => '',
+    '🧑🏽‍🦱' => '',
+    '🧑🏾‍🦱' => '',
+    '🧑🏿‍🦱' => '',
+    '👩🏻‍🦳' => '',
+    '👩🏼‍🦳' => '',
+    '👩🏽‍🦳' => '',
+    '👩🏾‍🦳' => '',
+    '👩🏿‍🦳' => '',
+    '🧑🏻‍🦳' => '',
+    '🧑🏼‍🦳' => '',
+    '🧑🏽‍🦳' => '',
+    '🧑🏾‍🦳' => '',
+    '🧑🏿‍🦳' => '',
+    '👩🏻‍🦲' => '',
+    '👩🏼‍🦲' => '',
+    '👩🏽‍🦲' => '',
+    '👩🏾‍🦲' => '',
+    '👩🏿‍🦲' => '',
+    '🧑🏻‍🦲' => '',
+    '🧑🏼‍🦲' => '',
+    '🧑🏽‍🦲' => '',
+    '🧑🏾‍🦲' => '',
+    '🧑🏿‍🦲' => '',
+    '👱‍♀️' => '',
+    '👱🏻‍♀' => '',
+    '👱🏼‍♀' => '',
+    '👱🏽‍♀' => '',
+    '👱🏾‍♀' => '',
+    '👱🏿‍♀' => '',
+    '👱‍♂️' => '',
+    '👱🏻‍♂' => '',
+    '👱🏼‍♂' => '',
+    '👱🏽‍♂' => '',
+    '👱🏾‍♂' => '',
+    '👱🏿‍♂' => '',
+    '🙍‍♂️' => '',
+    '🙍🏻‍♂' => '',
+    '🙍🏼‍♂' => '',
+    '🙍🏽‍♂' => '',
+    '🙍🏾‍♂' => '',
+    '🙍🏿‍♂' => '',
+    '🙍‍♀️' => '',
+    '🙍🏻‍♀' => '',
+    '🙍🏼‍♀' => '',
+    '🙍🏽‍♀' => '',
+    '🙍🏾‍♀' => '',
+    '🙍🏿‍♀' => '',
+    '🙎‍♂️' => '',
+    '🙎🏻‍♂' => '',
+    '🙎🏼‍♂' => '',
+    '🙎🏽‍♂' => '',
+    '🙎🏾‍♂' => '',
+    '🙎🏿‍♂' => '',
+    '🙎‍♀️' => '',
+    '🙎🏻‍♀' => '',
+    '🙎🏼‍♀' => '',
+    '🙎🏽‍♀' => '',
+    '🙎🏾‍♀' => '',
+    '🙎🏿‍♀' => '',
+    '🙅‍♂️' => '',
+    '🙅🏻‍♂' => '',
+    '🙅🏼‍♂' => '',
+    '🙅🏽‍♂' => '',
+    '🙅🏾‍♂' => '',
+    '🙅🏿‍♂' => '',
+    '🙅‍♀️' => '',
+    '🙅🏻‍♀' => '',
+    '🙅🏼‍♀' => '',
+    '🙅🏽‍♀' => '',
+    '🙅🏾‍♀' => '',
+    '🙅🏿‍♀' => '',
+    '🙆‍♂️' => '',
+    '🙆🏻‍♂' => '',
+    '🙆🏼‍♂' => '',
+    '🙆🏽‍♂' => '',
+    '🙆🏾‍♂' => '',
+    '🙆🏿‍♂' => '',
+    '🙆‍♀️' => '',
+    '🙆🏻‍♀' => '',
+    '🙆🏼‍♀' => '',
+    '🙆🏽‍♀' => '',
+    '🙆🏾‍♀' => '',
+    '🙆🏿‍♀' => '',
+    '💁‍♂️' => '',
+    '💁🏻‍♂' => '',
+    '💁🏼‍♂' => '',
+    '💁🏽‍♂' => '',
+    '💁🏾‍♂' => '',
+    '💁🏿‍♂' => '',
+    '💁‍♀️' => '',
+    '💁🏻‍♀' => '',
+    '💁🏼‍♀' => '',
+    '💁🏽‍♀' => '',
+    '💁🏾‍♀' => '',
+    '💁🏿‍♀' => '',
+    '🙋‍♂️' => '',
+    '🙋🏻‍♂' => '',
+    '🙋🏼‍♂' => '',
+    '🙋🏽‍♂' => '',
+    '🙋🏾‍♂' => '',
+    '🙋🏿‍♂' => '',
+    '🙋‍♀️' => '',
+    '🙋🏻‍♀' => '',
+    '🙋🏼‍♀' => '',
+    '🙋🏽‍♀' => '',
+    '🙋🏾‍♀' => '',
+    '🙋🏿‍♀' => '',
+    '🧏‍♂️' => '',
+    '🧏🏻‍♂' => '',
+    '🧏🏼‍♂' => '',
+    '🧏🏽‍♂' => '',
+    '🧏🏾‍♂' => '',
+    '🧏🏿‍♂' => '',
+    '🧏‍♀️' => '',
+    '🧏🏻‍♀' => '',
+    '🧏🏼‍♀' => '',
+    '🧏🏽‍♀' => '',
+    '🧏🏾‍♀' => '',
+    '🧏🏿‍♀' => '',
+    '🙇‍♂️' => '',
+    '🙇🏻‍♂' => '',
+    '🙇🏼‍♂' => '',
+    '🙇🏽‍♂' => '',
+    '🙇🏾‍♂' => '',
+    '🙇🏿‍♂' => '',
+    '🙇‍♀️' => '',
+    '🙇🏻‍♀' => '',
+    '🙇🏼‍♀' => '',
+    '🙇🏽‍♀' => '',
+    '🙇🏾‍♀' => '',
+    '🙇🏿‍♀' => '',
+    '🤦‍♂️' => '',
+    '🤦🏻‍♂' => '',
+    '🤦🏼‍♂' => '',
+    '🤦🏽‍♂' => '',
+    '🤦🏾‍♂' => '',
+    '🤦🏿‍♂' => '',
+    '🤦‍♀️' => '',
+    '🤦🏻‍♀' => '',
+    '🤦🏼‍♀' => '',
+    '🤦🏽‍♀' => '',
+    '🤦🏾‍♀' => '',
+    '🤦🏿‍♀' => '',
+    '🤷‍♂️' => '',
+    '🤷🏻‍♂' => '',
+    '🤷🏼‍♂' => '',
+    '🤷🏽‍♂' => '',
+    '🤷🏾‍♂' => '',
+    '🤷🏿‍♂' => '',
+    '🤷‍♀️' => '',
+    '🤷🏻‍♀' => '',
+    '🤷🏼‍♀' => '',
+    '🤷🏽‍♀' => '',
+    '🤷🏾‍♀' => '',
+    '🤷🏿‍♀' => '',
+    '🧑‍⚕️' => '',
+    '🧑🏻‍⚕' => '',
+    '🧑🏼‍⚕' => '',
+    '🧑🏽‍⚕' => '',
+    '🧑🏾‍⚕' => '',
+    '🧑🏿‍⚕' => '',
+    '👨‍⚕️' => '',
+    '👨🏻‍⚕' => '',
+    '👨🏼‍⚕' => '',
+    '👨🏽‍⚕' => '',
+    '👨🏾‍⚕' => '',
+    '👨🏿‍⚕' => '',
+    '👩‍⚕️' => '',
+    '👩🏻‍⚕' => '',
+    '👩🏼‍⚕' => '',
+    '👩🏽‍⚕' => '',
+    '👩🏾‍⚕' => '',
+    '👩🏿‍⚕' => '',
+    '🧑🏻‍🎓' => '',
+    '🧑🏼‍🎓' => '',
+    '🧑🏽‍🎓' => '',
+    '🧑🏾‍🎓' => '',
+    '🧑🏿‍🎓' => '',
+    '👨🏻‍🎓' => '',
+    '👨🏼‍🎓' => '',
+    '👨🏽‍🎓' => '',
+    '👨🏾‍🎓' => '',
+    '👨🏿‍🎓' => '',
+    '👩🏻‍🎓' => '',
+    '👩🏼‍🎓' => '',
+    '👩🏽‍🎓' => '',
+    '👩🏾‍🎓' => '',
+    '👩🏿‍🎓' => '',
+    '🧑🏻‍🏫' => '',
+    '🧑🏼‍🏫' => '',
+    '🧑🏽‍🏫' => '',
+    '🧑🏾‍🏫' => '',
+    '🧑🏿‍🏫' => '',
+    '👨🏻‍🏫' => '',
+    '👨🏼‍🏫' => '',
+    '👨🏽‍🏫' => '',
+    '👨🏾‍🏫' => '',
+    '👨🏿‍🏫' => '',
+    '👩🏻‍🏫' => '',
+    '👩🏼‍🏫' => '',
+    '👩🏽‍🏫' => '',
+    '👩🏾‍🏫' => '',
+    '👩🏿‍🏫' => '',
+    '🧑‍⚖️' => '',
+    '🧑🏻‍⚖' => '',
+    '🧑🏼‍⚖' => '',
+    '🧑🏽‍⚖' => '',
+    '🧑🏾‍⚖' => '',
+    '🧑🏿‍⚖' => '',
+    '👨‍⚖️' => '',
+    '👨🏻‍⚖' => '',
+    '👨🏼‍⚖' => '',
+    '👨🏽‍⚖' => '',
+    '👨🏾‍⚖' => '',
+    '👨🏿‍⚖' => '',
+    '👩‍⚖️' => '',
+    '👩🏻‍⚖' => '',
+    '👩🏼‍⚖' => '',
+    '👩🏽‍⚖' => '',
+    '👩🏾‍⚖' => '',
+    '👩🏿‍⚖' => '',
+    '🧑🏻‍🌾' => '',
+    '🧑🏼‍🌾' => '',
+    '🧑🏽‍🌾' => '',
+    '🧑🏾‍🌾' => '',
+    '🧑🏿‍🌾' => '',
+    '👨🏻‍🌾' => '',
+    '👨🏼‍🌾' => '',
+    '👨🏽‍🌾' => '',
+    '👨🏾‍🌾' => '',
+    '👨🏿‍🌾' => '',
+    '👩🏻‍🌾' => '',
+    '👩🏼‍🌾' => '',
+    '👩🏽‍🌾' => '',
+    '👩🏾‍🌾' => '',
+    '👩🏿‍🌾' => '',
+    '🧑🏻‍🍳' => '',
+    '🧑🏼‍🍳' => '',
+    '🧑🏽‍🍳' => '',
+    '🧑🏾‍🍳' => '',
+    '🧑🏿‍🍳' => '',
+    '👨🏻‍🍳' => '',
+    '👨🏼‍🍳' => '',
+    '👨🏽‍🍳' => '',
+    '👨🏾‍🍳' => '',
+    '👨🏿‍🍳' => '',
+    '👩🏻‍🍳' => '',
+    '👩🏼‍🍳' => '',
+    '👩🏽‍🍳' => '',
+    '👩🏾‍🍳' => '',
+    '👩🏿‍🍳' => '',
+    '🧑🏻‍🔧' => '',
+    '🧑🏼‍🔧' => '',
+    '🧑🏽‍🔧' => '',
+    '🧑🏾‍🔧' => '',
+    '🧑🏿‍🔧' => '',
+    '👨🏻‍🔧' => '',
+    '👨🏼‍🔧' => '',
+    '👨🏽‍🔧' => '',
+    '👨🏾‍🔧' => '',
+    '👨🏿‍🔧' => '',
+    '👩🏻‍🔧' => '',
+    '👩🏼‍🔧' => '',
+    '👩🏽‍🔧' => '',
+    '👩🏾‍🔧' => '',
+    '👩🏿‍🔧' => '',
+    '🧑🏻‍🏭' => '',
+    '🧑🏼‍🏭' => '',
+    '🧑🏽‍🏭' => '',
+    '🧑🏾‍🏭' => '',
+    '🧑🏿‍🏭' => '',
+    '👨🏻‍🏭' => '',
+    '👨🏼‍🏭' => '',
+    '👨🏽‍🏭' => '',
+    '👨🏾‍🏭' => '',
+    '👨🏿‍🏭' => '',
+    '👩🏻‍🏭' => '',
+    '👩🏼‍🏭' => '',
+    '👩🏽‍🏭' => '',
+    '👩🏾‍🏭' => '',
+    '👩🏿‍🏭' => '',
+    '🧑🏻‍💼' => '',
+    '🧑🏼‍💼' => '',
+    '🧑🏽‍💼' => '',
+    '🧑🏾‍💼' => '',
+    '🧑🏿‍💼' => '',
+    '👨🏻‍💼' => '',
+    '👨🏼‍💼' => '',
+    '👨🏽‍💼' => '',
+    '👨🏾‍💼' => '',
+    '👨🏿‍💼' => '',
+    '👩🏻‍💼' => '',
+    '👩🏼‍💼' => '',
+    '👩🏽‍💼' => '',
+    '👩🏾‍💼' => '',
+    '👩🏿‍💼' => '',
+    '🧑🏻‍🔬' => '',
+    '🧑🏼‍🔬' => '',
+    '🧑🏽‍🔬' => '',
+    '🧑🏾‍🔬' => '',
+    '🧑🏿‍🔬' => '',
+    '👨🏻‍🔬' => '',
+    '👨🏼‍🔬' => '',
+    '👨🏽‍🔬' => '',
+    '👨🏾‍🔬' => '',
+    '👨🏿‍🔬' => '',
+    '👩🏻‍🔬' => '',
+    '👩🏼‍🔬' => '',
+    '👩🏽‍🔬' => '',
+    '👩🏾‍🔬' => '',
+    '👩🏿‍🔬' => '',
+    '🧑🏻‍💻' => '',
+    '🧑🏼‍💻' => '',
+    '🧑🏽‍💻' => '',
+    '🧑🏾‍💻' => '',
+    '🧑🏿‍💻' => '',
+    '👨🏻‍💻' => '',
+    '👨🏼‍💻' => '',
+    '👨🏽‍💻' => '',
+    '👨🏾‍💻' => '',
+    '👨🏿‍💻' => '',
+    '👩🏻‍💻' => '',
+    '👩🏼‍💻' => '',
+    '👩🏽‍💻' => '',
+    '👩🏾‍💻' => '',
+    '👩🏿‍💻' => '',
+    '🧑🏻‍🎤' => '',
+    '🧑🏼‍🎤' => '',
+    '🧑🏽‍🎤' => '',
+    '🧑🏾‍🎤' => '',
+    '🧑🏿‍🎤' => '',
+    '👨🏻‍🎤' => '',
+    '👨🏼‍🎤' => '',
+    '👨🏽‍🎤' => '',
+    '👨🏾‍🎤' => '',
+    '👨🏿‍🎤' => '',
+    '👩🏻‍🎤' => '',
+    '👩🏼‍🎤' => '',
+    '👩🏽‍🎤' => '',
+    '👩🏾‍🎤' => '',
+    '👩🏿‍🎤' => '',
+    '🧑🏻‍🎨' => '',
+    '🧑🏼‍🎨' => '',
+    '🧑🏽‍🎨' => '',
+    '🧑🏾‍🎨' => '',
+    '🧑🏿‍🎨' => '',
+    '👨🏻‍🎨' => '',
+    '👨🏼‍🎨' => '',
+    '👨🏽‍🎨' => '',
+    '👨🏾‍🎨' => '',
+    '👨🏿‍🎨' => '',
+    '👩🏻‍🎨' => '',
+    '👩🏼‍🎨' => '',
+    '👩🏽‍🎨' => '',
+    '👩🏾‍🎨' => '',
+    '👩🏿‍🎨' => '',
+    '🧑‍✈️' => '',
+    '🧑🏻‍✈' => '',
+    '🧑🏼‍✈' => '',
+    '🧑🏽‍✈' => '',
+    '🧑🏾‍✈' => '',
+    '🧑🏿‍✈' => '',
+    '👨‍✈️' => '',
+    '👨🏻‍✈' => '',
+    '👨🏼‍✈' => '',
+    '👨🏽‍✈' => '',
+    '👨🏾‍✈' => '',
+    '👨🏿‍✈' => '',
+    '👩‍✈️' => '',
+    '👩🏻‍✈' => '',
+    '👩🏼‍✈' => '',
+    '👩🏽‍✈' => '',
+    '👩🏾‍✈' => '',
+    '👩🏿‍✈' => '',
+    '🧑🏻‍🚀' => '',
+    '🧑🏼‍🚀' => '',
+    '🧑🏽‍🚀' => '',
+    '🧑🏾‍🚀' => '',
+    '🧑🏿‍🚀' => '',
+    '👨🏻‍🚀' => '',
+    '👨🏼‍🚀' => '',
+    '👨🏽‍🚀' => '',
+    '👨🏾‍🚀' => '',
+    '👨🏿‍🚀' => '',
+    '👩🏻‍🚀' => '',
+    '👩🏼‍🚀' => '',
+    '👩🏽‍🚀' => '',
+    '👩🏾‍🚀' => '',
+    '👩🏿‍🚀' => '',
+    '🧑🏻‍🚒' => '',
+    '🧑🏼‍🚒' => '',
+    '🧑🏽‍🚒' => '',
+    '🧑🏾‍🚒' => '',
+    '🧑🏿‍🚒' => '',
+    '👨🏻‍🚒' => '',
+    '👨🏼‍🚒' => '',
+    '👨🏽‍🚒' => '',
+    '👨🏾‍🚒' => '',
+    '👨🏿‍🚒' => '',
+    '👩🏻‍🚒' => '',
+    '👩🏼‍🚒' => '',
+    '👩🏽‍🚒' => '',
+    '👩🏾‍🚒' => '',
+    '👩🏿‍🚒' => '',
+    '👮‍♂️' => '',
+    '👮🏻‍♂' => '',
+    '👮🏼‍♂' => '',
+    '👮🏽‍♂' => '',
+    '👮🏾‍♂' => '',
+    '👮🏿‍♂' => '',
+    '👮‍♀️' => '',
+    '👮🏻‍♀' => '',
+    '👮🏼‍♀' => '',
+    '👮🏽‍♀' => '',
+    '👮🏾‍♀' => '',
+    '👮🏿‍♀' => '',
+    '🕵‍♂️' => '',
+    '🕵️‍♂' => '',
+    '🕵🏻‍♂' => '',
+    '🕵🏼‍♂' => '',
+    '🕵🏽‍♂' => '',
+    '🕵🏾‍♂' => '',
+    '🕵🏿‍♂' => '',
+    '🕵‍♀️' => '',
+    '🕵️‍♀' => '',
+    '🕵🏻‍♀' => '',
+    '🕵🏼‍♀' => '',
+    '🕵🏽‍♀' => '',
+    '🕵🏾‍♀' => '',
+    '🕵🏿‍♀' => '',
+    '💂‍♂️' => '',
+    '💂🏻‍♂' => '',
+    '💂🏼‍♂' => '',
+    '💂🏽‍♂' => '',
+    '💂🏾‍♂' => '',
+    '💂🏿‍♂' => '',
+    '💂‍♀️' => '',
+    '💂🏻‍♀' => '',
+    '💂🏼‍♀' => '',
+    '💂🏽‍♀' => '',
+    '💂🏾‍♀' => '',
+    '💂🏿‍♀' => '',
+    '👷‍♂️' => '',
+    '👷🏻‍♂' => '',
+    '👷🏼‍♂' => '',
+    '👷🏽‍♂' => '',
+    '👷🏾‍♂' => '',
+    '👷🏿‍♂' => '',
+    '👷‍♀️' => '',
+    '👷🏻‍♀' => '',
+    '👷🏼‍♀' => '',
+    '👷🏽‍♀' => '',
+    '👷🏾‍♀' => '',
+    '👷🏿‍♀' => '',
+    '👳‍♂️' => '',
+    '👳🏻‍♂' => '',
+    '👳🏼‍♂' => '',
+    '👳🏽‍♂' => '',
+    '👳🏾‍♂' => '',
+    '👳🏿‍♂' => '',
+    '👳‍♀️' => '',
+    '👳🏻‍♀' => '',
+    '👳🏼‍♀' => '',
+    '👳🏽‍♀' => '',
+    '👳🏾‍♀' => '',
+    '👳🏿‍♀' => '',
+    '🤵‍♂️' => '',
+    '🤵🏻‍♂' => '',
+    '🤵🏼‍♂' => '',
+    '🤵🏽‍♂' => '',
+    '🤵🏾‍♂' => '',
+    '🤵🏿‍♂' => '',
+    '🤵‍♀️' => '',
+    '🤵🏻‍♀' => '',
+    '🤵🏼‍♀' => '',
+    '🤵🏽‍♀' => '',
+    '🤵🏾‍♀' => '',
+    '🤵🏿‍♀' => '',
+    '👰‍♂️' => '',
+    '👰🏻‍♂' => '',
+    '👰🏼‍♂' => '',
+    '👰🏽‍♂' => '',
+    '👰🏾‍♂' => '',
+    '👰🏿‍♂' => '',
+    '👰‍♀️' => '',
+    '👰🏻‍♀' => '',
+    '👰🏼‍♀' => '',
+    '👰🏽‍♀' => '',
+    '👰🏾‍♀' => '',
+    '👰🏿‍♀' => '',
+    '👩🏻‍🍼' => '',
+    '👩🏼‍🍼' => '',
+    '👩🏽‍🍼' => '',
+    '👩🏾‍🍼' => '',
+    '👩🏿‍🍼' => '',
+    '👨🏻‍🍼' => '',
+    '👨🏼‍🍼' => '',
+    '👨🏽‍🍼' => '',
+    '👨🏾‍🍼' => '',
+    '👨🏿‍🍼' => '',
+    '🧑🏻‍🍼' => '',
+    '🧑🏼‍🍼' => '',
+    '🧑🏽‍🍼' => '',
+    '🧑🏾‍🍼' => '',
+    '🧑🏿‍🍼' => '',
+    '🧑🏻‍🎄' => '',
+    '🧑🏼‍🎄' => '',
+    '🧑🏽‍🎄' => '',
+    '🧑🏾‍🎄' => '',
+    '🧑🏿‍🎄' => '',
+    '🦸‍♂️' => '',
+    '🦸🏻‍♂' => '',
+    '🦸🏼‍♂' => '',
+    '🦸🏽‍♂' => '',
+    '🦸🏾‍♂' => '',
+    '🦸🏿‍♂' => '',
+    '🦸‍♀️' => '',
+    '🦸🏻‍♀' => '',
+    '🦸🏼‍♀' => '',
+    '🦸🏽‍♀' => '',
+    '🦸🏾‍♀' => '',
+    '🦸🏿‍♀' => '',
+    '🦹‍♂️' => '',
+    '🦹🏻‍♂' => '',
+    '🦹🏼‍♂' => '',
+    '🦹🏽‍♂' => '',
+    '🦹🏾‍♂' => '',
+    '🦹🏿‍♂' => '',
+    '🦹‍♀️' => '',
+    '🦹🏻‍♀' => '',
+    '🦹🏼‍♀' => '',
+    '🦹🏽‍♀' => '',
+    '🦹🏾‍♀' => '',
+    '🦹🏿‍♀' => '',
+    '🧙‍♂️' => '',
+    '🧙🏻‍♂' => '',
+    '🧙🏼‍♂' => '',
+    '🧙🏽‍♂' => '',
+    '🧙🏾‍♂' => '',
+    '🧙🏿‍♂' => '',
+    '🧙‍♀️' => '',
+    '🧙🏻‍♀' => '',
+    '🧙🏼‍♀' => '',
+    '🧙🏽‍♀' => '',
+    '🧙🏾‍♀' => '',
+    '🧙🏿‍♀' => '',
+    '🧚‍♂️' => '',
+    '🧚🏻‍♂' => '',
+    '🧚🏼‍♂' => '',
+    '🧚🏽‍♂' => '',
+    '🧚🏾‍♂' => '',
+    '🧚🏿‍♂' => '',
+    '🧚‍♀️' => '',
+    '🧚🏻‍♀' => '',
+    '🧚🏼‍♀' => '',
+    '🧚🏽‍♀' => '',
+    '🧚🏾‍♀' => '',
+    '🧚🏿‍♀' => '',
+    '🧛‍♂️' => '',
+    '🧛🏻‍♂' => '',
+    '🧛🏼‍♂' => '',
+    '🧛🏽‍♂' => '',
+    '🧛🏾‍♂' => '',
+    '🧛🏿‍♂' => '',
+    '🧛‍♀️' => '',
+    '🧛🏻‍♀' => '',
+    '🧛🏼‍♀' => '',
+    '🧛🏽‍♀' => '',
+    '🧛🏾‍♀' => '',
+    '🧛🏿‍♀' => '',
+    '🧜‍♂️' => '',
+    '🧜🏻‍♂' => '',
+    '🧜🏼‍♂' => '',
+    '🧜🏽‍♂' => '',
+    '🧜🏾‍♂' => '',
+    '🧜🏿‍♂' => '',
+    '🧜‍♀️' => '',
+    '🧜🏻‍♀' => '',
+    '🧜🏼‍♀' => '',
+    '🧜🏽‍♀' => '',
+    '🧜🏾‍♀' => '',
+    '🧜🏿‍♀' => '',
+    '🧝‍♂️' => '',
+    '🧝🏻‍♂' => '',
+    '🧝🏼‍♂' => '',
+    '🧝🏽‍♂' => '',
+    '🧝🏾‍♂' => '',
+    '🧝🏿‍♂' => '',
+    '🧝‍♀️' => '',
+    '🧝🏻‍♀' => '',
+    '🧝🏼‍♀' => '',
+    '🧝🏽‍♀' => '',
+    '🧝🏾‍♀' => '',
+    '🧝🏿‍♀' => '',
+    '🧞‍♂️' => '',
+    '🧞‍♀️' => '',
+    '🧟‍♂️' => '',
+    '🧟‍♀️' => '',
+    '💆‍♂️' => '',
+    '💆🏻‍♂' => '',
+    '💆🏼‍♂' => '',
+    '💆🏽‍♂' => '',
+    '💆🏾‍♂' => '',
+    '💆🏿‍♂' => '',
+    '💆‍♀️' => '',
+    '💆🏻‍♀' => '',
+    '💆🏼‍♀' => '',
+    '💆🏽‍♀' => '',
+    '💆🏾‍♀' => '',
+    '💆🏿‍♀' => '',
+    '💇‍♂️' => '',
+    '💇🏻‍♂' => '',
+    '💇🏼‍♂' => '',
+    '💇🏽‍♂' => '',
+    '💇🏾‍♂' => '',
+    '💇🏿‍♂' => '',
+    '💇‍♀️' => '',
+    '💇🏻‍♀' => '',
+    '💇🏼‍♀' => '',
+    '💇🏽‍♀' => '',
+    '💇🏾‍♀' => '',
+    '💇🏿‍♀' => '',
+    '🚶‍♂️' => '',
+    '🚶🏻‍♂' => '',
+    '🚶🏼‍♂' => '',
+    '🚶🏽‍♂' => '',
+    '🚶🏾‍♂' => '',
+    '🚶🏿‍♂' => '',
+    '🚶‍♀️' => '',
+    '🚶🏻‍♀' => '',
+    '🚶🏼‍♀' => '',
+    '🚶🏽‍♀' => '',
+    '🚶🏾‍♀' => '',
+    '🚶🏿‍♀' => '',
+    '🧍‍♂️' => '',
+    '🧍🏻‍♂' => '',
+    '🧍🏼‍♂' => '',
+    '🧍🏽‍♂' => '',
+    '🧍🏾‍♂' => '',
+    '🧍🏿‍♂' => '',
+    '🧍‍♀️' => '',
+    '🧍🏻‍♀' => '',
+    '🧍🏼‍♀' => '',
+    '🧍🏽‍♀' => '',
+    '🧍🏾‍♀' => '',
+    '🧍🏿‍♀' => '',
+    '🧎‍♂️' => '',
+    '🧎🏻‍♂' => '',
+    '🧎🏼‍♂' => '',
+    '🧎🏽‍♂' => '',
+    '🧎🏾‍♂' => '',
+    '🧎🏿‍♂' => '',
+    '🧎‍♀️' => '',
+    '🧎🏻‍♀' => '',
+    '🧎🏼‍♀' => '',
+    '🧎🏽‍♀' => '',
+    '🧎🏾‍♀' => '',
+    '🧎🏿‍♀' => '',
+    '🧑🏻‍🦯' => '',
+    '🧑🏼‍🦯' => '',
+    '🧑🏽‍🦯' => '',
+    '🧑🏾‍🦯' => '',
+    '🧑🏿‍🦯' => '',
+    '👨🏻‍🦯' => '',
+    '👨🏼‍🦯' => '',
+    '👨🏽‍🦯' => '',
+    '👨🏾‍🦯' => '',
+    '👨🏿‍🦯' => '',
+    '👩🏻‍🦯' => '',
+    '👩🏼‍🦯' => '',
+    '👩🏽‍🦯' => '',
+    '👩🏾‍🦯' => '',
+    '👩🏿‍🦯' => '',
+    '🧑🏻‍🦼' => '',
+    '🧑🏼‍🦼' => '',
+    '🧑🏽‍🦼' => '',
+    '🧑🏾‍🦼' => '',
+    '🧑🏿‍🦼' => '',
+    '👨🏻‍🦼' => '',
+    '👨🏼‍🦼' => '',
+    '👨🏽‍🦼' => '',
+    '👨🏾‍🦼' => '',
+    '👨🏿‍🦼' => '',
+    '👩🏻‍🦼' => '',
+    '👩🏼‍🦼' => '',
+    '👩🏽‍🦼' => '',
+    '👩🏾‍🦼' => '',
+    '👩🏿‍🦼' => '',
+    '🧑🏻‍🦽' => '',
+    '🧑🏼‍🦽' => '',
+    '🧑🏽‍🦽' => '',
+    '🧑🏾‍🦽' => '',
+    '🧑🏿‍🦽' => '',
+    '👨🏻‍🦽' => '',
+    '👨🏼‍🦽' => '',
+    '👨🏽‍🦽' => '',
+    '👨🏾‍🦽' => '',
+    '👨🏿‍🦽' => '',
+    '👩🏻‍🦽' => '',
+    '👩🏼‍🦽' => '',
+    '👩🏽‍🦽' => '',
+    '👩🏾‍🦽' => '',
+    '👩🏿‍🦽' => '',
+    '🏃‍♂️' => '',
+    '🏃🏻‍♂' => '',
+    '🏃🏼‍♂' => '',
+    '🏃🏽‍♂' => '',
+    '🏃🏾‍♂' => '',
+    '🏃🏿‍♂' => '',
+    '🏃‍♀️' => '',
+    '🏃🏻‍♀' => '',
+    '🏃🏼‍♀' => '',
+    '🏃🏽‍♀' => '',
+    '🏃🏾‍♀' => '',
+    '🏃🏿‍♀' => '',
+    '👯‍♂️' => '',
+    '👯‍♀️' => '',
+    '🧖‍♂️' => '',
+    '🧖🏻‍♂' => '',
+    '🧖🏼‍♂' => '',
+    '🧖🏽‍♂' => '',
+    '🧖🏾‍♂' => '',
+    '🧖🏿‍♂' => '',
+    '🧖‍♀️' => '',
+    '🧖🏻‍♀' => '',
+    '🧖🏼‍♀' => '',
+    '🧖🏽‍♀' => '',
+    '🧖🏾‍♀' => '',
+    '🧖🏿‍♀' => '',
+    '🧗‍♂️' => '',
+    '🧗🏻‍♂' => '',
+    '🧗🏼‍♂' => '',
+    '🧗🏽‍♂' => '',
+    '🧗🏾‍♂' => '',
+    '🧗🏿‍♂' => '',
+    '🧗‍♀️' => '',
+    '🧗🏻‍♀' => '',
+    '🧗🏼‍♀' => '',
+    '🧗🏽‍♀' => '',
+    '🧗🏾‍♀' => '',
+    '🧗🏿‍♀' => '',
+    '🏌‍♂️' => '',
+    '🏌️‍♂' => '',
+    '🏌🏻‍♂' => '',
+    '🏌🏼‍♂' => '',
+    '🏌🏽‍♂' => '',
+    '🏌🏾‍♂' => '',
+    '🏌🏿‍♂' => '',
+    '🏌‍♀️' => '',
+    '🏌️‍♀' => '',
+    '🏌🏻‍♀' => '',
+    '🏌🏼‍♀' => '',
+    '🏌🏽‍♀' => '',
+    '🏌🏾‍♀' => '',
+    '🏌🏿‍♀' => '',
+    '🏄‍♂️' => '',
+    '🏄🏻‍♂' => '',
+    '🏄🏼‍♂' => '',
+    '🏄🏽‍♂' => '',
+    '🏄🏾‍♂' => '',
+    '🏄🏿‍♂' => '',
+    '🏄‍♀️' => '',
+    '🏄🏻‍♀' => '',
+    '🏄🏼‍♀' => '',
+    '🏄🏽‍♀' => '',
+    '🏄🏾‍♀' => '',
+    '🏄🏿‍♀' => '',
+    '🚣‍♂️' => '',
+    '🚣🏻‍♂' => '',
+    '🚣🏼‍♂' => '',
+    '🚣🏽‍♂' => '',
+    '🚣🏾‍♂' => '',
+    '🚣🏿‍♂' => '',
+    '🚣‍♀️' => '',
+    '🚣🏻‍♀' => '',
+    '🚣🏼‍♀' => '',
+    '🚣🏽‍♀' => '',
+    '🚣🏾‍♀' => '',
+    '🚣🏿‍♀' => '',
+    '🏊‍♂️' => '',
+    '🏊🏻‍♂' => '',
+    '🏊🏼‍♂' => '',
+    '🏊🏽‍♂' => '',
+    '🏊🏾‍♂' => '',
+    '🏊🏿‍♂' => '',
+    '🏊‍♀️' => '',
+    '🏊🏻‍♀' => '',
+    '🏊🏼‍♀' => '',
+    '🏊🏽‍♀' => '',
+    '🏊🏾‍♀' => '',
+    '🏊🏿‍♀' => '',
+    '⛹‍♂️' => '',
+    '⛹️‍♂' => '',
+    '⛹🏻‍♂' => '',
+    '⛹🏼‍♂' => '',
+    '⛹🏽‍♂' => '',
+    '⛹🏾‍♂' => '',
+    '⛹🏿‍♂' => '',
+    '⛹‍♀️' => '',
+    '⛹️‍♀' => '',
+    '⛹🏻‍♀' => '',
+    '⛹🏼‍♀' => '',
+    '⛹🏽‍♀' => '',
+    '⛹🏾‍♀' => '',
+    '⛹🏿‍♀' => '',
+    '🏋‍♂️' => '',
+    '🏋️‍♂' => '',
+    '🏋🏻‍♂' => '',
+    '🏋🏼‍♂' => '',
+    '🏋🏽‍♂' => '',
+    '🏋🏾‍♂' => '',
+    '🏋🏿‍♂' => '',
+    '🏋‍♀️' => '',
+    '🏋️‍♀' => '',
+    '🏋🏻‍♀' => '',
+    '🏋🏼‍♀' => '',
+    '🏋🏽‍♀' => '',
+    '🏋🏾‍♀' => '',
+    '🏋🏿‍♀' => '',
+    '🚴‍♂️' => '',
+    '🚴🏻‍♂' => '',
+    '🚴🏼‍♂' => '',
+    '🚴🏽‍♂' => '',
+    '🚴🏾‍♂' => '',
+    '🚴🏿‍♂' => '',
+    '🚴‍♀️' => '',
+    '🚴🏻‍♀' => '',
+    '🚴🏼‍♀' => '',
+    '🚴🏽‍♀' => '',
+    '🚴🏾‍♀' => '',
+    '🚴🏿‍♀' => '',
+    '🚵‍♂️' => '',
+    '🚵🏻‍♂' => '',
+    '🚵🏼‍♂' => '',
+    '🚵🏽‍♂' => '',
+    '🚵🏾‍♂' => '',
+    '🚵🏿‍♂' => '',
+    '🚵‍♀️' => '',
+    '🚵🏻‍♀' => '',
+    '🚵🏼‍♀' => '',
+    '🚵🏽‍♀' => '',
+    '🚵🏾‍♀' => '',
+    '🚵🏿‍♀' => '',
+    '🤸‍♂️' => '',
+    '🤸🏻‍♂' => '',
+    '🤸🏼‍♂' => '',
+    '🤸🏽‍♂' => '',
+    '🤸🏾‍♂' => '',
+    '🤸🏿‍♂' => '',
+    '🤸‍♀️' => '',
+    '🤸🏻‍♀' => '',
+    '🤸🏼‍♀' => '',
+    '🤸🏽‍♀' => '',
+    '🤸🏾‍♀' => '',
+    '🤸🏿‍♀' => '',
+    '🤼‍♂️' => '',
+    '🤼‍♀️' => '',
+    '🤽‍♂️' => '',
+    '🤽🏻‍♂' => '',
+    '🤽🏼‍♂' => '',
+    '🤽🏽‍♂' => '',
+    '🤽🏾‍♂' => '',
+    '🤽🏿‍♂' => '',
+    '🤽‍♀️' => '',
+    '🤽🏻‍♀' => '',
+    '🤽🏼‍♀' => '',
+    '🤽🏽‍♀' => '',
+    '🤽🏾‍♀' => '',
+    '🤽🏿‍♀' => '',
+    '🤾‍♂️' => '',
+    '🤾🏻‍♂' => '',
+    '🤾🏼‍♂' => '',
+    '🤾🏽‍♂' => '',
+    '🤾🏾‍♂' => '',
+    '🤾🏿‍♂' => '',
+    '🤾‍♀️' => '',
+    '🤾🏻‍♀' => '',
+    '🤾🏼‍♀' => '',
+    '🤾🏽‍♀' => '',
+    '🤾🏾‍♀' => '',
+    '🤾🏿‍♀' => '',
+    '🤹‍♂️' => '',
+    '🤹🏻‍♂' => '',
+    '🤹🏼‍♂' => '',
+    '🤹🏽‍♂' => '',
+    '🤹🏾‍♂' => '',
+    '🤹🏿‍♂' => '',
+    '🤹‍♀️' => '',
+    '🤹🏻‍♀' => '',
+    '🤹🏼‍♀' => '',
+    '🤹🏽‍♀' => '',
+    '🤹🏾‍♀' => '',
+    '🤹🏿‍♀' => '',
+    '🧘‍♂️' => '',
+    '🧘🏻‍♂' => '',
+    '🧘🏼‍♂' => '',
+    '🧘🏽‍♂' => '',
+    '🧘🏾‍♂' => '',
+    '🧘🏿‍♂' => '',
+    '🧘‍♀️' => '',
+    '🧘🏻‍♀' => '',
+    '🧘🏼‍♀' => '',
+    '🧘🏽‍♀' => '',
+    '🧘🏾‍♀' => '',
+    '🧘🏿‍♀' => '',
+    '🐻‍❄️' => '',
+    '🏳️‍🌈' => '',
+    '🏳‍⚧️' => '',
+    '🏳️‍⚧' => '',
+    '🏴‍☠️' => '',
+    '😶‍🌫' => '',
+    '😮‍💨' => '',
+    '😵‍💫' => '',
+    '❤‍🔥' => '',
+    '❤‍🩹' => '',
+    '👁‍🗨' => '',
+    '🧔‍♂' => '',
+    '🧔‍♀' => '',
+    '👨‍🦰' => '',
+    '👨‍🦱' => '',
+    '👨‍🦳' => '',
+    '👨‍🦲' => '',
+    '👩‍🦰' => '',
+    '🧑‍🦰' => '',
+    '👩‍🦱' => '',
+    '🧑‍🦱' => '',
+    '👩‍🦳' => '',
+    '🧑‍🦳' => '',
+    '👩‍🦲' => '',
+    '🧑‍🦲' => '',
+    '👱‍♀' => '',
+    '👱‍♂' => '',
+    '🙍‍♂' => '',
+    '🙍‍♀' => '',
+    '🙎‍♂' => '',
+    '🙎‍♀' => '',
+    '🙅‍♂' => '',
+    '🙅‍♀' => '',
+    '🙆‍♂' => '',
+    '🙆‍♀' => '',
+    '💁‍♂' => '',
+    '💁‍♀' => '',
+    '🙋‍♂' => '',
+    '🙋‍♀' => '',
+    '🧏‍♂' => '',
+    '🧏‍♀' => '',
+    '🙇‍♂' => '',
+    '🙇‍♀' => '',
+    '🤦‍♂' => '',
+    '🤦‍♀' => '',
+    '🤷‍♂' => '',
+    '🤷‍♀' => '',
+    '🧑‍⚕' => '',
+    '👨‍⚕' => '',
+    '👩‍⚕' => '',
+    '🧑‍🎓' => '',
+    '👨‍🎓' => '',
+    '👩‍🎓' => '',
+    '🧑‍🏫' => '',
+    '👨‍🏫' => '',
+    '👩‍🏫' => '',
+    '🧑‍⚖' => '',
+    '👨‍⚖' => '',
+    '👩‍⚖' => '',
+    '🧑‍🌾' => '',
+    '👨‍🌾' => '',
+    '👩‍🌾' => '',
+    '🧑‍🍳' => '',
+    '👨‍🍳' => '',
+    '👩‍🍳' => '',
+    '🧑‍🔧' => '',
+    '👨‍🔧' => '',
+    '👩‍🔧' => '',
+    '🧑‍🏭' => '',
+    '👨‍🏭' => '',
+    '👩‍🏭' => '',
+    '🧑‍💼' => '',
+    '👨‍💼' => '',
+    '👩‍💼' => '',
+    '🧑‍🔬' => '',
+    '👨‍🔬' => '',
+    '👩‍🔬' => '',
+    '🧑‍💻' => '',
+    '👨‍💻' => '',
+    '👩‍💻' => '',
+    '🧑‍🎤' => '',
+    '👨‍🎤' => '',
+    '👩‍🎤' => '',
+    '🧑‍🎨' => '',
+    '👨‍🎨' => '',
+    '👩‍🎨' => '',
+    '🧑‍✈' => '',
+    '👨‍✈' => '',
+    '👩‍✈' => '',
+    '🧑‍🚀' => '',
+    '👨‍🚀' => '',
+    '👩‍🚀' => '',
+    '🧑‍🚒' => '',
+    '👨‍🚒' => '',
+    '👩‍🚒' => '',
+    '👮‍♂' => '',
+    '👮‍♀' => '',
+    '🕵‍♂' => '',
+    '🕵‍♀' => '',
+    '💂‍♂' => '',
+    '💂‍♀' => '',
+    '👷‍♂' => '',
+    '👷‍♀' => '',
+    '👳‍♂' => '',
+    '👳‍♀' => '',
+    '🤵‍♂' => '',
+    '🤵‍♀' => '',
+    '👰‍♂' => '',
+    '👰‍♀' => '',
+    '👩‍🍼' => '',
+    '👨‍🍼' => '',
+    '🧑‍🍼' => '',
+    '🧑‍🎄' => '',
+    '🦸‍♂' => '',
+    '🦸‍♀' => '',
+    '🦹‍♂' => '',
+    '🦹‍♀' => '',
+    '🧙‍♂' => '',
+    '🧙‍♀' => '',
+    '🧚‍♂' => '',
+    '🧚‍♀' => '',
+    '🧛‍♂' => '',
+    '🧛‍♀' => '',
+    '🧜‍♂' => '',
+    '🧜‍♀' => '',
+    '🧝‍♂' => '',
+    '🧝‍♀' => '',
+    '🧞‍♂' => '',
+    '🧞‍♀' => '',
+    '🧟‍♂' => '',
+    '🧟‍♀' => '',
+    '💆‍♂' => '',
+    '💆‍♀' => '',
+    '💇‍♂' => '',
+    '💇‍♀' => '',
+    '🚶‍♂' => '',
+    '🚶‍♀' => '',
+    '🧍‍♂' => '',
+    '🧍‍♀' => '',
+    '🧎‍♂' => '',
+    '🧎‍♀' => '',
+    '🧑‍🦯' => '',
+    '👨‍🦯' => '',
+    '👩‍🦯' => '',
+    '🧑‍🦼' => '',
+    '👨‍🦼' => '',
+    '👩‍🦼' => '',
+    '🧑‍🦽' => '',
+    '👨‍🦽' => '',
+    '👩‍🦽' => '',
+    '🏃‍♂' => '',
+    '🏃‍♀' => '',
+    '👯‍♂' => '',
+    '👯‍♀' => '',
+    '🧖‍♂' => '',
+    '🧖‍♀' => '',
+    '🧗‍♂' => '',
+    '🧗‍♀' => '',
+    '🏌‍♂' => '',
+    '🏌‍♀' => '',
+    '🏄‍♂' => '',
+    '🏄‍♀' => '',
+    '🚣‍♂' => '',
+    '🚣‍♀' => '',
+    '🏊‍♂' => '',
+    '🏊‍♀' => '',
+    '⛹‍♂' => '',
+    '⛹‍♀' => '',
+    '🏋‍♂' => '',
+    '🏋‍♀' => '',
+    '🚴‍♂' => '',
+    '🚴‍♀' => '',
+    '🚵‍♂' => '',
+    '🚵‍♀' => '',
+    '🤸‍♂' => '',
+    '🤸‍♀' => '',
+    '🤼‍♂' => '',
+    '🤼‍♀' => '',
+    '🤽‍♂' => '',
+    '🤽‍♀' => '',
+    '🤾‍♂' => '',
+    '🤾‍♀' => '',
+    '🤹‍♂' => '',
+    '🤹‍♀' => '',
+    '🧘‍♂' => '',
+    '🧘‍♀' => '',
+    '👨‍👦' => '',
+    '👨‍👧' => '',
+    '👩‍👦' => '',
+    '👩‍👧' => '',
+    '🐕‍🦺' => '',
+    '🐈‍⬛' => '',
+    '🐻‍❄' => '',
+    '🐦‍⬛' => '',
+    '#️⃣' => '',
+    '*️⃣' => '',
+    '0️⃣' => '',
+    '1️⃣' => '',
+    '2️⃣' => '',
+    '3️⃣' => '',
+    '4️⃣' => '',
+    '5️⃣' => '',
+    '6️⃣' => '',
+    '7️⃣' => '',
+    '8️⃣' => '',
+    '9️⃣' => '',
+    '🏳‍🌈' => '',
+    '🏳‍⚧' => '',
+    '🏴‍☠' => '',
+    '☺️' => '',
+    '☹️' => '',
+    '☠️' => '',
+    '❣️' => '',
+    '❤️' => '',
+    '🕳️' => '',
+    '🗨️' => '',
+    '🗯️' => '',
+    '👋🏻' => '',
+    '👋🏼' => '',
+    '👋🏽' => '',
+    '👋🏾' => '',
+    '👋🏿' => '',
+    '🤚🏻' => '',
+    '🤚🏼' => '',
+    '🤚🏽' => '',
+    '🤚🏾' => '',
+    '🤚🏿' => '',
+    '🖐️' => '',
+    '🖐🏻' => '',
+    '🖐🏼' => '',
+    '🖐🏽' => '',
+    '🖐🏾' => '',
+    '🖐🏿' => '',
+    '✋🏻' => '',
+    '✋🏼' => '',
+    '✋🏽' => '',
+    '✋🏾' => '',
+    '✋🏿' => '',
+    '🖖🏻' => '',
+    '🖖🏼' => '',
+    '🖖🏽' => '',
+    '🖖🏾' => '',
+    '🖖🏿' => '',
+    '🫱🏻' => '',
+    '🫱🏼' => '',
+    '🫱🏽' => '',
+    '🫱🏾' => '',
+    '🫱🏿' => '',
+    '🫲🏻' => '',
+    '🫲🏼' => '',
+    '🫲🏽' => '',
+    '🫲🏾' => '',
+    '🫲🏿' => '',
+    '🫳🏻' => '',
+    '🫳🏼' => '',
+    '🫳🏽' => '',
+    '🫳🏾' => '',
+    '🫳🏿' => '',
+    '🫴🏻' => '',
+    '🫴🏼' => '',
+    '🫴🏽' => '',
+    '🫴🏾' => '',
+    '🫴🏿' => '',
+    '👌🏻' => '',
+    '👌🏼' => '',
+    '👌🏽' => '',
+    '👌🏾' => '',
+    '👌🏿' => '',
+    '🤌🏻' => '',
+    '🤌🏼' => '',
+    '🤌🏽' => '',
+    '🤌🏾' => '',
+    '🤌🏿' => '',
+    '🤏🏻' => '',
+    '🤏🏼' => '',
+    '🤏🏽' => '',
+    '🤏🏾' => '',
+    '🤏🏿' => '',
+    '✌️' => '',
+    '✌🏻' => '',
+    '✌🏼' => '',
+    '✌🏽' => '',
+    '✌🏾' => '',
+    '✌🏿' => '',
+    '🤞🏻' => '',
+    '🤞🏼' => '',
+    '🤞🏽' => '',
+    '🤞🏾' => '',
+    '🤞🏿' => '',
+    '🫰🏻' => '',
+    '🫰🏼' => '',
+    '🫰🏽' => '',
+    '🫰🏾' => '',
+    '🫰🏿' => '',
+    '🤟🏻' => '',
+    '🤟🏼' => '',
+    '🤟🏽' => '',
+    '🤟🏾' => '',
+    '🤟🏿' => '',
+    '🤘🏻' => '',
+    '🤘🏼' => '',
+    '🤘🏽' => '',
+    '🤘🏾' => '',
+    '🤘🏿' => '',
+    '🤙🏻' => '',
+    '🤙🏼' => '',
+    '🤙🏽' => '',
+    '🤙🏾' => '',
+    '🤙🏿' => '',
+    '👈🏻' => '',
+    '👈🏼' => '',
+    '👈🏽' => '',
+    '👈🏾' => '',
+    '👈🏿' => '',
+    '👉🏻' => '',
+    '👉🏼' => '',
+    '👉🏽' => '',
+    '👉🏾' => '',
+    '👉🏿' => '',
+    '👆🏻' => '',
+    '👆🏼' => '',
+    '👆🏽' => '',
+    '👆🏾' => '',
+    '👆🏿' => '',
+    '🖕🏻' => '',
+    '🖕🏼' => '',
+    '🖕🏽' => '',
+    '🖕🏾' => '',
+    '🖕🏿' => '',
+    '👇🏻' => '',
+    '👇🏼' => '',
+    '👇🏽' => '',
+    '👇🏾' => '',
+    '👇🏿' => '',
+    '☝️' => '',
+    '☝🏻' => '',
+    '☝🏼' => '',
+    '☝🏽' => '',
+    '☝🏾' => '',
+    '☝🏿' => '',
+    '🫵🏻' => '',
+    '🫵🏼' => '',
+    '🫵🏽' => '',
+    '🫵🏾' => '',
+    '🫵🏿' => '',
+    '👍🏻' => '',
+    '👍🏼' => '',
+    '👍🏽' => '',
+    '👍🏾' => '',
+    '👍🏿' => '',
+    '👎🏻' => '',
+    '👎🏼' => '',
+    '👎🏽' => '',
+    '👎🏾' => '',
+    '👎🏿' => '',
+    '✊🏻' => '',
+    '✊🏼' => '',
+    '✊🏽' => '',
+    '✊🏾' => '',
+    '✊🏿' => '',
+    '👊🏻' => '',
+    '👊🏼' => '',
+    '👊🏽' => '',
+    '👊🏾' => '',
+    '👊🏿' => '',
+    '🤛🏻' => '',
+    '🤛🏼' => '',
+    '🤛🏽' => '',
+    '🤛🏾' => '',
+    '🤛🏿' => '',
+    '🤜🏻' => '',
+    '🤜🏼' => '',
+    '🤜🏽' => '',
+    '🤜🏾' => '',
+    '🤜🏿' => '',
+    '👏🏻' => '',
+    '👏🏼' => '',
+    '👏🏽' => '',
+    '👏🏾' => '',
+    '👏🏿' => '',
+    '🙌🏻' => '',
+    '🙌🏼' => '',
+    '🙌🏽' => '',
+    '🙌🏾' => '',
+    '🙌🏿' => '',
+    '🫶🏻' => '',
+    '🫶🏼' => '',
+    '🫶🏽' => '',
+    '🫶🏾' => '',
+    '🫶🏿' => '',
+    '👐🏻' => '',
+    '👐🏼' => '',
+    '👐🏽' => '',
+    '👐🏾' => '',
+    '👐🏿' => '',
+    '🤲🏻' => '',
+    '🤲🏼' => '',
+    '🤲🏽' => '',
+    '🤲🏾' => '',
+    '🤲🏿' => '',
+    '🤝🏻' => '',
+    '🤝🏼' => '',
+    '🤝🏽' => '',
+    '🤝🏾' => '',
+    '🤝🏿' => '',
+    '🙏🏻' => '',
+    '🙏🏼' => '',
+    '🙏🏽' => '',
+    '🙏🏾' => '',
+    '🙏🏿' => '',
+    '🫷🏻' => '',
+    '🫷🏼' => '',
+    '🫷🏽' => '',
+    '🫷🏾' => '',
+    '🫷🏿' => '',
+    '🫸🏻' => '',
+    '🫸🏼' => '',
+    '🫸🏽' => '',
+    '🫸🏾' => '',
+    '🫸🏿' => '',
+    '✍️' => '',
+    '✍🏻' => '',
+    '✍🏼' => '',
+    '✍🏽' => '',
+    '✍🏾' => '',
+    '✍🏿' => '',
+    '💅🏻' => '',
+    '💅🏼' => '',
+    '💅🏽' => '',
+    '💅🏾' => '',
+    '💅🏿' => '',
+    '🤳🏻' => '',
+    '🤳🏼' => '',
+    '🤳🏽' => '',
+    '🤳🏾' => '',
+    '🤳🏿' => '',
+    '💪🏻' => '',
+    '💪🏼' => '',
+    '💪🏽' => '',
+    '💪🏾' => '',
+    '💪🏿' => '',
+    '🦵🏻' => '',
+    '🦵🏼' => '',
+    '🦵🏽' => '',
+    '🦵🏾' => '',
+    '🦵🏿' => '',
+    '🦶🏻' => '',
+    '🦶🏼' => '',
+    '🦶🏽' => '',
+    '🦶🏾' => '',
+    '🦶🏿' => '',
+    '👂🏻' => '',
+    '👂🏼' => '',
+    '👂🏽' => '',
+    '👂🏾' => '',
+    '👂🏿' => '',
+    '🦻🏻' => '',
+    '🦻🏼' => '',
+    '🦻🏽' => '',
+    '🦻🏾' => '',
+    '🦻🏿' => '',
+    '👃🏻' => '',
+    '👃🏼' => '',
+    '👃🏽' => '',
+    '👃🏾' => '',
+    '👃🏿' => '',
+    '👁️' => '',
+    '👶🏻' => '',
+    '👶🏼' => '',
+    '👶🏽' => '',
+    '👶🏾' => '',
+    '👶🏿' => '',
+    '🧒🏻' => '',
+    '🧒🏼' => '',
+    '🧒🏽' => '',
+    '🧒🏾' => '',
+    '🧒🏿' => '',
+    '👦🏻' => '',
+    '👦🏼' => '',
+    '👦🏽' => '',
+    '👦🏾' => '',
+    '👦🏿' => '',
+    '👧🏻' => '',
+    '👧🏼' => '',
+    '👧🏽' => '',
+    '👧🏾' => '',
+    '👧🏿' => '',
+    '🧑🏻' => '',
+    '🧑🏼' => '',
+    '🧑🏽' => '',
+    '🧑🏾' => '',
+    '🧑🏿' => '',
+    '👱🏻' => '',
+    '👱🏼' => '',
+    '👱🏽' => '',
+    '👱🏾' => '',
+    '👱🏿' => '',
+    '👨🏻' => '',
+    '👨🏼' => '',
+    '👨🏽' => '',
+    '👨🏾' => '',
+    '👨🏿' => '',
+    '🧔🏻' => '',
+    '🧔🏼' => '',
+    '🧔🏽' => '',
+    '🧔🏾' => '',
+    '🧔🏿' => '',
+    '👩🏻' => '',
+    '👩🏼' => '',
+    '👩🏽' => '',
+    '👩🏾' => '',
+    '👩🏿' => '',
+    '🧓🏻' => '',
+    '🧓🏼' => '',
+    '🧓🏽' => '',
+    '🧓🏾' => '',
+    '🧓🏿' => '',
+    '👴🏻' => '',
+    '👴🏼' => '',
+    '👴🏽' => '',
+    '👴🏾' => '',
+    '👴🏿' => '',
+    '👵🏻' => '',
+    '👵🏼' => '',
+    '👵🏽' => '',
+    '👵🏾' => '',
+    '👵🏿' => '',
+    '🙍🏻' => '',
+    '🙍🏼' => '',
+    '🙍🏽' => '',
+    '🙍🏾' => '',
+    '🙍🏿' => '',
+    '🙎🏻' => '',
+    '🙎🏼' => '',
+    '🙎🏽' => '',
+    '🙎🏾' => '',
+    '🙎🏿' => '',
+    '🙅🏻' => '',
+    '🙅🏼' => '',
+    '🙅🏽' => '',
+    '🙅🏾' => '',
+    '🙅🏿' => '',
+    '🙆🏻' => '',
+    '🙆🏼' => '',
+    '🙆🏽' => '',
+    '🙆🏾' => '',
+    '🙆🏿' => '',
+    '💁🏻' => '',
+    '💁🏼' => '',
+    '💁🏽' => '',
+    '💁🏾' => '',
+    '💁🏿' => '',
+    '🙋🏻' => '',
+    '🙋🏼' => '',
+    '🙋🏽' => '',
+    '🙋🏾' => '',
+    '🙋🏿' => '',
+    '🧏🏻' => '',
+    '🧏🏼' => '',
+    '🧏🏽' => '',
+    '🧏🏾' => '',
+    '🧏🏿' => '',
+    '🙇🏻' => '',
+    '🙇🏼' => '',
+    '🙇🏽' => '',
+    '🙇🏾' => '',
+    '🙇🏿' => '',
+    '🤦🏻' => '',
+    '🤦🏼' => '',
+    '🤦🏽' => '',
+    '🤦🏾' => '',
+    '🤦🏿' => '',
+    '🤷🏻' => '',
+    '🤷🏼' => '',
+    '🤷🏽' => '',
+    '🤷🏾' => '',
+    '🤷🏿' => '',
+    '👮🏻' => '',
+    '👮🏼' => '',
+    '👮🏽' => '',
+    '👮🏾' => '',
+    '👮🏿' => '',
+    '🕵️' => '',
+    '🕵🏻' => '',
+    '🕵🏼' => '',
+    '🕵🏽' => '',
+    '🕵🏾' => '',
+    '🕵🏿' => '',
+    '💂🏻' => '',
+    '💂🏼' => '',
+    '💂🏽' => '',
+    '💂🏾' => '',
+    '💂🏿' => '',
+    '🥷🏻' => '',
+    '🥷🏼' => '',
+    '🥷🏽' => '',
+    '🥷🏾' => '',
+    '🥷🏿' => '',
+    '👷🏻' => '',
+    '👷🏼' => '',
+    '👷🏽' => '',
+    '👷🏾' => '',
+    '👷🏿' => '',
+    '🫅🏻' => '',
+    '🫅🏼' => '',
+    '🫅🏽' => '',
+    '🫅🏾' => '',
+    '🫅🏿' => '',
+    '🤴🏻' => '',
+    '🤴🏼' => '',
+    '🤴🏽' => '',
+    '🤴🏾' => '',
+    '🤴🏿' => '',
+    '👸🏻' => '',
+    '👸🏼' => '',
+    '👸🏽' => '',
+    '👸🏾' => '',
+    '👸🏿' => '',
+    '👳🏻' => '',
+    '👳🏼' => '',
+    '👳🏽' => '',
+    '👳🏾' => '',
+    '👳🏿' => '',
+    '👲🏻' => '',
+    '👲🏼' => '',
+    '👲🏽' => '',
+    '👲🏾' => '',
+    '👲🏿' => '',
+    '🧕🏻' => '',
+    '🧕🏼' => '',
+    '🧕🏽' => '',
+    '🧕🏾' => '',
+    '🧕🏿' => '',
+    '🤵🏻' => '',
+    '🤵🏼' => '',
+    '🤵🏽' => '',
+    '🤵🏾' => '',
+    '🤵🏿' => '',
+    '👰🏻' => '',
+    '👰🏼' => '',
+    '👰🏽' => '',
+    '👰🏾' => '',
+    '👰🏿' => '',
+    '🤰🏻' => '',
+    '🤰🏼' => '',
+    '🤰🏽' => '',
+    '🤰🏾' => '',
+    '🤰🏿' => '',
+    '🫃🏻' => '',
+    '🫃🏼' => '',
+    '🫃🏽' => '',
+    '🫃🏾' => '',
+    '🫃🏿' => '',
+    '🫄🏻' => '',
+    '🫄🏼' => '',
+    '🫄🏽' => '',
+    '🫄🏾' => '',
+    '🫄🏿' => '',
+    '🤱🏻' => '',
+    '🤱🏼' => '',
+    '🤱🏽' => '',
+    '🤱🏾' => '',
+    '🤱🏿' => '',
+    '👼🏻' => '',
+    '👼🏼' => '',
+    '👼🏽' => '',
+    '👼🏾' => '',
+    '👼🏿' => '',
+    '🎅🏻' => '',
+    '🎅🏼' => '',
+    '🎅🏽' => '',
+    '🎅🏾' => '',
+    '🎅🏿' => '',
+    '🤶🏻' => '',
+    '🤶🏼' => '',
+    '🤶🏽' => '',
+    '🤶🏾' => '',
+    '🤶🏿' => '',
+    '🦸🏻' => '',
+    '🦸🏼' => '',
+    '🦸🏽' => '',
+    '🦸🏾' => '',
+    '🦸🏿' => '',
+    '🦹🏻' => '',
+    '🦹🏼' => '',
+    '🦹🏽' => '',
+    '🦹🏾' => '',
+    '🦹🏿' => '',
+    '🧙🏻' => '',
+    '🧙🏼' => '',
+    '🧙🏽' => '',
+    '🧙🏾' => '',
+    '🧙🏿' => '',
+    '🧚🏻' => '',
+    '🧚🏼' => '',
+    '🧚🏽' => '',
+    '🧚🏾' => '',
+    '🧚🏿' => '',
+    '🧛🏻' => '',
+    '🧛🏼' => '',
+    '🧛🏽' => '',
+    '🧛🏾' => '',
+    '🧛🏿' => '',
+    '🧜🏻' => '',
+    '🧜🏼' => '',
+    '🧜🏽' => '',
+    '🧜🏾' => '',
+    '🧜🏿' => '',
+    '🧝🏻' => '',
+    '🧝🏼' => '',
+    '🧝🏽' => '',
+    '🧝🏾' => '',
+    '🧝🏿' => '',
+    '💆🏻' => '',
+    '💆🏼' => '',
+    '💆🏽' => '',
+    '💆🏾' => '',
+    '💆🏿' => '',
+    '💇🏻' => '',
+    '💇🏼' => '',
+    '💇🏽' => '',
+    '💇🏾' => '',
+    '💇🏿' => '',
+    '🚶🏻' => '',
+    '🚶🏼' => '',
+    '🚶🏽' => '',
+    '🚶🏾' => '',
+    '🚶🏿' => '',
+    '🧍🏻' => '',
+    '🧍🏼' => '',
+    '🧍🏽' => '',
+    '🧍🏾' => '',
+    '🧍🏿' => '',
+    '🧎🏻' => '',
+    '🧎🏼' => '',
+    '🧎🏽' => '',
+    '🧎🏾' => '',
+    '🧎🏿' => '',
+    '🏃🏻' => '',
+    '🏃🏼' => '',
+    '🏃🏽' => '',
+    '🏃🏾' => '',
+    '🏃🏿' => '',
+    '💃🏻' => '',
+    '💃🏼' => '',
+    '💃🏽' => '',
+    '💃🏾' => '',
+    '💃🏿' => '',
+    '🕺🏻' => '',
+    '🕺🏼' => '',
+    '🕺🏽' => '',
+    '🕺🏾' => '',
+    '🕺🏿' => '',
+    '🕴️' => '',
+    '🕴🏻' => '',
+    '🕴🏼' => '',
+    '🕴🏽' => '',
+    '🕴🏾' => '',
+    '🕴🏿' => '',
+    '🧖🏻' => '',
+    '🧖🏼' => '',
+    '🧖🏽' => '',
+    '🧖🏾' => '',
+    '🧖🏿' => '',
+    '🧗🏻' => '',
+    '🧗🏼' => '',
+    '🧗🏽' => '',
+    '🧗🏾' => '',
+    '🧗🏿' => '',
+    '🏇🏻' => '',
+    '🏇🏼' => '',
+    '🏇🏽' => '',
+    '🏇🏾' => '',
+    '🏇🏿' => '',
+    '⛷️' => '',
+    '🏂🏻' => '',
+    '🏂🏼' => '',
+    '🏂🏽' => '',
+    '🏂🏾' => '',
+    '🏂🏿' => '',
+    '🏌️' => '',
+    '🏌🏻' => '',
+    '🏌🏼' => '',
+    '🏌🏽' => '',
+    '🏌🏾' => '',
+    '🏌🏿' => '',
+    '🏄🏻' => '',
+    '🏄🏼' => '',
+    '🏄🏽' => '',
+    '🏄🏾' => '',
+    '🏄🏿' => '',
+    '🚣🏻' => '',
+    '🚣🏼' => '',
+    '🚣🏽' => '',
+    '🚣🏾' => '',
+    '🚣🏿' => '',
+    '🏊🏻' => '',
+    '🏊🏼' => '',
+    '🏊🏽' => '',
+    '🏊🏾' => '',
+    '🏊🏿' => '',
+    '⛹️' => '',
+    '⛹🏻' => '',
+    '⛹🏼' => '',
+    '⛹🏽' => '',
+    '⛹🏾' => '',
+    '⛹🏿' => '',
+    '🏋️' => '',
+    '🏋🏻' => '',
+    '🏋🏼' => '',
+    '🏋🏽' => '',
+    '🏋🏾' => '',
+    '🏋🏿' => '',
+    '🚴🏻' => '',
+    '🚴🏼' => '',
+    '🚴🏽' => '',
+    '🚴🏾' => '',
+    '🚴🏿' => '',
+    '🚵🏻' => '',
+    '🚵🏼' => '',
+    '🚵🏽' => '',
+    '🚵🏾' => '',
+    '🚵🏿' => '',
+    '🤸🏻' => '',
+    '🤸🏼' => '',
+    '🤸🏽' => '',
+    '🤸🏾' => '',
+    '🤸🏿' => '',
+    '🤽🏻' => '',
+    '🤽🏼' => '',
+    '🤽🏽' => '',
+    '🤽🏾' => '',
+    '🤽🏿' => '',
+    '🤾🏻' => '',
+    '🤾🏼' => '',
+    '🤾🏽' => '',
+    '🤾🏾' => '',
+    '🤾🏿' => '',
+    '🤹🏻' => '',
+    '🤹🏼' => '',
+    '🤹🏽' => '',
+    '🤹🏾' => '',
+    '🤹🏿' => '',
+    '🧘🏻' => '',
+    '🧘🏼' => '',
+    '🧘🏽' => '',
+    '🧘🏾' => '',
+    '🧘🏿' => '',
+    '🛀🏻' => '',
+    '🛀🏼' => '',
+    '🛀🏽' => '',
+    '🛀🏾' => '',
+    '🛀🏿' => '',
+    '🛌🏻' => '',
+    '🛌🏼' => '',
+    '🛌🏽' => '',
+    '🛌🏾' => '',
+    '🛌🏿' => '',
+    '👭🏻' => '',
+    '👭🏼' => '',
+    '👭🏽' => '',
+    '👭🏾' => '',
+    '👭🏿' => '',
+    '👫🏻' => '',
+    '👫🏼' => '',
+    '👫🏽' => '',
+    '👫🏾' => '',
+    '👫🏿' => '',
+    '👬🏻' => '',
+    '👬🏼' => '',
+    '👬🏽' => '',
+    '👬🏾' => '',
+    '👬🏿' => '',
+    '💏🏻' => '',
+    '💏🏼' => '',
+    '💏🏽' => '',
+    '💏🏾' => '',
+    '💏🏿' => '',
+    '💑🏻' => '',
+    '💑🏼' => '',
+    '💑🏽' => '',
+    '💑🏾' => '',
+    '💑🏿' => '',
+    '🗣️' => '',
+    '🐿️' => '',
+    '🕊️' => '',
+    '🕷️' => '',
+    '🕸️' => '',
+    '🏵️' => '',
+    '☘️' => '',
+    '🌶️' => '',
+    '🍽️' => '',
+    '🗺️' => '',
+    '🏔️' => '',
+    '⛰️' => '',
+    '🏕️' => '',
+    '🏖️' => '',
+    '🏜️' => '',
+    '🏝️' => '',
+    '🏞️' => '',
+    '🏟️' => '',
+    '🏛️' => '',
+    '🏗️' => '',
+    '🏘️' => '',
+    '🏚️' => '',
+    '⛩️' => '',
+    '🏙️' => '',
+    '♨️' => '',
+    '🏎️' => '',
+    '🏍️' => '',
+    '🛣️' => '',
+    '🛤️' => '',
+    '🛢️' => '',
+    '🛳️' => '',
+    '⛴️' => '',
+    '🛥️' => '',
+    '✈️' => '',
+    '🛩️' => '',
+    '🛰️' => '',
+    '🛎️' => '',
+    '⏱️' => '',
+    '⏲️' => '',
+    '🕰️' => '',
+    '🌡️' => '',
+    '☀️' => '',
+    '☁️' => '',
+    '⛈️' => '',
+    '🌤️' => '',
+    '🌥️' => '',
+    '🌦️' => '',
+    '🌧️' => '',
+    '🌨️' => '',
+    '🌩️' => '',
+    '🌪️' => '',
+    '🌫️' => '',
+    '🌬️' => '',
+    '☂️' => '',
+    '⛱️' => '',
+    '❄️' => '',
+    '☃️' => '',
+    '☄️' => '',
+    '🎗️' => '',
+    '🎟️' => '',
+    '🎖️' => '',
+    '⛸️' => '',
+    '🕹️' => '',
+    '♠️' => '',
+    '♥️' => '',
+    '♦️' => '',
+    '♣️' => '',
+    '♟️' => '',
+    '🖼️' => '',
+    '🕶️' => '',
+    '🛍️' => '',
+    '⛑️' => '',
+    '🎙️' => '',
+    '🎚️' => '',
+    '🎛️' => '',
+    '☎️' => '',
+    '🖥️' => '',
+    '🖨️' => '',
+    '⌨️' => '',
+    '🖱️' => '',
+    '🖲️' => '',
+    '🎞️' => '',
+    '📽️' => '',
+    '🕯️' => '',
+    '🗞️' => '',
+    '🏷️' => '',
+    '✉️' => '',
+    '🗳️' => '',
+    '✏️' => '',
+    '✒️' => '',
+    '🖋️' => '',
+    '🖊️' => '',
+    '🖌️' => '',
+    '🖍️' => '',
+    '🗂️' => '',
+    '🗒️' => '',
+    '🗓️' => '',
+    '🖇️' => '',
+    '✂️' => '',
+    '🗃️' => '',
+    '🗄️' => '',
+    '🗑️' => '',
+    '🗝️' => '',
+    '⛏️' => '',
+    '⚒️' => '',
+    '🛠️' => '',
+    '🗡️' => '',
+    '⚔️' => '',
+    '🛡️' => '',
+    '⚙️' => '',
+    '🗜️' => '',
+    '⚖️' => '',
+    '⛓️' => '',
+    '⚗️' => '',
+    '🛏️' => '',
+    '🛋️' => '',
+    '⚰️' => '',
+    '⚱️' => '',
+    '⚠️' => '',
+    '☢️' => '',
+    '☣️' => '',
+    '⬆️' => '',
+    '↗️' => '',
+    '➡️' => '',
+    '↘️' => '',
+    '⬇️' => '',
+    '↙️' => '',
+    '⬅️' => '',
+    '↖️' => '',
+    '↕️' => '',
+    '↔️' => '',
+    '↩️' => '',
+    '↪️' => '',
+    '⤴️' => '',
+    '⤵️' => '',
+    '⚛️' => '',
+    '🕉️' => '',
+    '✡️' => '',
+    '☸️' => '',
+    '☯️' => '',
+    '✝️' => '',
+    '☦️' => '',
+    '☪️' => '',
+    '☮️' => '',
+    '▶️' => '',
+    '⏭️' => '',
+    '⏯️' => '',
+    '◀️' => '',
+    '⏮️' => '',
+    '⏸️' => '',
+    '⏹️' => '',
+    '⏺️' => '',
+    '⏏️' => '',
+    '♀️' => '',
+    '♂️' => '',
+    '⚧️' => '',
+    '✖️' => '',
+    '♾️' => '',
+    '‼️' => '',
+    '⁉️' => '',
+    '〰️' => '',
+    '⚕️' => '',
+    '♻️' => '',
+    '⚜️' => '',
+    '☑️' => '',
+    '✔️' => '',
+    '〽️' => '',
+    '✳️' => '',
+    '✴️' => '',
+    '❇️' => '',
+    '©️' => '',
+    '®️' => '',
+    '™️' => '',
+    '#⃣' => '',
+    '*⃣' => '',
+    '0⃣' => '',
+    '1⃣' => '',
+    '2⃣' => '',
+    '3⃣' => '',
+    '4⃣' => '',
+    '5⃣' => '',
+    '6⃣' => '',
+    '7⃣' => '',
+    '8⃣' => '',
+    '9⃣' => '',
+    '🅰️' => '',
+    '🅱️' => '',
+    'ℹ️' => '',
+    'Ⓜ️' => '',
+    '🅾️' => '',
+    '🅿️' => '',
+    '🈂️' => '',
+    '🈷️' => '',
+    '㊗️' => '',
+    '㊙️' => '',
+    '◼️' => '',
+    '◻️' => '',
+    '▪️' => '',
+    '▫️' => '',
+    '🏳️' => '',
+    '🇦🇨' => '',
+    '🇦🇩' => '',
+    '🇦🇪' => '',
+    '🇦🇫' => '',
+    '🇦🇬' => '',
+    '🇦🇮' => '',
+    '🇦🇱' => '',
+    '🇦🇲' => '',
+    '🇦🇴' => '',
+    '🇦🇶' => '',
+    '🇦🇷' => '',
+    '🇦🇸' => '',
+    '🇦🇹' => '',
+    '🇦🇺' => '',
+    '🇦🇼' => '',
+    '🇦🇽' => '',
+    '🇦🇿' => '',
+    '🇧🇦' => '',
+    '🇧🇧' => '',
+    '🇧🇩' => '',
+    '🇧🇪' => '',
+    '🇧🇫' => '',
+    '🇧🇬' => '',
+    '🇧🇭' => '',
+    '🇧🇮' => '',
+    '🇧🇯' => '',
+    '🇧🇱' => '',
+    '🇧🇲' => '',
+    '🇧🇳' => '',
+    '🇧🇴' => '',
+    '🇧🇶' => '',
+    '🇧🇷' => '',
+    '🇧🇸' => '',
+    '🇧🇹' => '',
+    '🇧🇻' => '',
+    '🇧🇼' => '',
+    '🇧🇾' => '',
+    '🇧🇿' => '',
+    '🇨🇦' => '',
+    '🇨🇨' => '',
+    '🇨🇩' => '',
+    '🇨🇫' => '',
+    '🇨🇬' => '',
+    '🇨🇭' => '',
+    '🇨🇮' => '',
+    '🇨🇰' => '',
+    '🇨🇱' => '',
+    '🇨🇲' => '',
+    '🇨🇳' => '',
+    '🇨🇴' => '',
+    '🇨🇵' => '',
+    '🇨🇷' => '',
+    '🇨🇺' => '',
+    '🇨🇻' => '',
+    '🇨🇼' => '',
+    '🇨🇽' => '',
+    '🇨🇾' => '',
+    '🇨🇿' => '',
+    '🇩🇪' => '',
+    '🇩🇬' => '',
+    '🇩🇯' => '',
+    '🇩🇰' => '',
+    '🇩🇲' => '',
+    '🇩🇴' => '',
+    '🇩🇿' => '',
+    '🇪🇦' => '',
+    '🇪🇨' => '',
+    '🇪🇪' => '',
+    '🇪🇬' => '',
+    '🇪🇭' => '',
+    '🇪🇷' => '',
+    '🇪🇸' => '',
+    '🇪🇹' => '',
+    '🇪🇺' => '',
+    '🇫🇮' => '',
+    '🇫🇯' => '',
+    '🇫🇰' => '',
+    '🇫🇲' => '',
+    '🇫🇴' => '',
+    '🇫🇷' => '',
+    '🇬🇦' => '',
+    '🇬🇧' => '',
+    '🇬🇩' => '',
+    '🇬🇪' => '',
+    '🇬🇫' => '',
+    '🇬🇬' => '',
+    '🇬🇭' => '',
+    '🇬🇮' => '',
+    '🇬🇱' => '',
+    '🇬🇲' => '',
+    '🇬🇳' => '',
+    '🇬🇵' => '',
+    '🇬🇶' => '',
+    '🇬🇷' => '',
+    '🇬🇸' => '',
+    '🇬🇹' => '',
+    '🇬🇺' => '',
+    '🇬🇼' => '',
+    '🇬🇾' => '',
+    '🇭🇰' => '',
+    '🇭🇲' => '',
+    '🇭🇳' => '',
+    '🇭🇷' => '',
+    '🇭🇹' => '',
+    '🇭🇺' => '',
+    '🇮🇨' => '',
+    '🇮🇩' => '',
+    '🇮🇪' => '',
+    '🇮🇱' => '',
+    '🇮🇲' => '',
+    '🇮🇳' => '',
+    '🇮🇴' => '',
+    '🇮🇶' => '',
+    '🇮🇷' => '',
+    '🇮🇸' => '',
+    '🇮🇹' => '',
+    '🇯🇪' => '',
+    '🇯🇲' => '',
+    '🇯🇴' => '',
+    '🇯🇵' => '',
+    '🇰🇪' => '',
+    '🇰🇬' => '',
+    '🇰🇭' => '',
+    '🇰🇮' => '',
+    '🇰🇲' => '',
+    '🇰🇳' => '',
+    '🇰🇵' => '',
+    '🇰🇷' => '',
+    '🇰🇼' => '',
+    '🇰🇾' => '',
+    '🇰🇿' => '',
+    '🇱🇦' => '',
+    '🇱🇧' => '',
+    '🇱🇨' => '',
+    '🇱🇮' => '',
+    '🇱🇰' => '',
+    '🇱🇷' => '',
+    '🇱🇸' => '',
+    '🇱🇹' => '',
+    '🇱🇺' => '',
+    '🇱🇻' => '',
+    '🇱🇾' => '',
+    '🇲🇦' => '',
+    '🇲🇨' => '',
+    '🇲🇩' => '',
+    '🇲🇪' => '',
+    '🇲🇫' => '',
+    '🇲🇬' => '',
+    '🇲🇭' => '',
+    '🇲🇰' => '',
+    '🇲🇱' => '',
+    '🇲🇲' => '',
+    '🇲🇳' => '',
+    '🇲🇴' => '',
+    '🇲🇵' => '',
+    '🇲🇶' => '',
+    '🇲🇷' => '',
+    '🇲🇸' => '',
+    '🇲🇹' => '',
+    '🇲🇺' => '',
+    '🇲🇻' => '',
+    '🇲🇼' => '',
+    '🇲🇽' => '',
+    '🇲🇾' => '',
+    '🇲🇿' => '',
+    '🇳🇦' => '',
+    '🇳🇨' => '',
+    '🇳🇪' => '',
+    '🇳🇫' => '',
+    '🇳🇬' => '',
+    '🇳🇮' => '',
+    '🇳🇱' => '',
+    '🇳🇴' => '',
+    '🇳🇵' => '',
+    '🇳🇷' => '',
+    '🇳🇺' => '',
+    '🇳🇿' => '',
+    '🇴🇲' => '',
+    '🇵🇦' => '',
+    '🇵🇪' => '',
+    '🇵🇫' => '',
+    '🇵🇬' => '',
+    '🇵🇭' => '',
+    '🇵🇰' => '',
+    '🇵🇱' => '',
+    '🇵🇲' => '',
+    '🇵🇳' => '',
+    '🇵🇷' => '',
+    '🇵🇸' => '',
+    '🇵🇹' => '',
+    '🇵🇼' => '',
+    '🇵🇾' => '',
+    '🇶🇦' => '',
+    '🇷🇪' => '',
+    '🇷🇴' => '',
+    '🇷🇸' => '',
+    '🇷🇺' => '',
+    '🇷🇼' => '',
+    '🇸🇦' => '',
+    '🇸🇧' => '',
+    '🇸🇨' => '',
+    '🇸🇩' => '',
+    '🇸🇪' => '',
+    '🇸🇬' => '',
+    '🇸🇭' => '',
+    '🇸🇮' => '',
+    '🇸🇯' => '',
+    '🇸🇰' => '',
+    '🇸🇱' => '',
+    '🇸🇲' => '',
+    '🇸🇳' => '',
+    '🇸🇴' => '',
+    '🇸🇷' => '',
+    '🇸🇸' => '',
+    '🇸🇹' => '',
+    '🇸🇻' => '',
+    '🇸🇽' => '',
+    '🇸🇾' => '',
+    '🇸🇿' => '',
+    '🇹🇦' => '',
+    '🇹🇨' => '',
+    '🇹🇩' => '',
+    '🇹🇫' => '',
+    '🇹🇬' => '',
+    '🇹🇭' => '',
+    '🇹🇯' => '',
+    '🇹🇰' => '',
+    '🇹🇱' => '',
+    '🇹🇲' => '',
+    '🇹🇳' => '',
+    '🇹🇴' => '',
+    '🇹🇷' => '',
+    '🇹🇹' => '',
+    '🇹🇻' => '',
+    '🇹🇼' => '',
+    '🇹🇿' => '',
+    '🇺🇦' => '',
+    '🇺🇬' => '',
+    '🇺🇲' => '',
+    '🇺🇳' => '',
+    '🇺🇸' => '',
+    '🇺🇾' => '',
+    '🇺🇿' => '',
+    '🇻🇦' => '',
+    '🇻🇨' => '',
+    '🇻🇪' => '',
+    '🇻🇬' => '',
+    '🇻🇮' => '',
+    '🇻🇳' => '',
+    '🇻🇺' => '',
+    '🇼🇫' => '',
+    '🇼🇸' => '',
+    '🇽🇰' => '',
+    '🇾🇪' => '',
+    '🇾🇹' => '',
+    '🇿🇦' => '',
+    '🇿🇲' => '',
+    '🇿🇼' => '',
+    '😀' => '',
+    '😃' => '',
+    '😄' => '',
+    '😁' => '',
+    '😆' => '',
+    '😅' => '',
+    '🤣' => '',
+    '😂' => '',
+    '🙂'
10000
 => '',
+    '🙃' => '',
+    '🫠' => '',
+    '😉' => '',
+    '😊' => '',
+    '😇' => '',
+    '🥰' => '',
+    '😍' => '',
+    '🤩' => '',
+    '😘' => '',
+    '😗' => '',
+    '☺' => '',
+    '😚' => '',
+    '😙' => '',
+    '🥲' => '',
+    '😋' => '',
+    '😛' => '',
+    '😜' => '',
+    '🤪' => '',
+    '😝' => '',
+    '🤑' => '',
+    '🤗' => '',
+    '🤭' => '',
+    '🫢' => '',
+    '🫣' => '',
+    '🤫' => '',
+    '🤔' => '',
+    '🫡' => '',
+    '🤐' => '',
+    '🤨' => '',
+    '😐' => '',
+    '😑' => '',
+    '😶' => '',
+    '🫥' => '',
+    '😏' => '',
+    '😒' => '',
+    '🙄' => '',
+    '😬' => '',
+    '🤥' => '',
+    '🫨' => '',
+    '😌' => '',
+    '😔' => '',
+    '😪' => '',
+    '🤤' => '',
+    '😴' => '',
+    '😷' => '',
+    '🤒' => '',
+    '🤕' => '',
+    '🤢' => '',
+    '🤮' => '',
+    '🤧' => '',
+    '🥵' => '',
+    '🥶' => '',
+    '🥴' => '',
+    '😵' => '',
+    '🤯' => '',
+    '🤠' => '',
+    '🥳' => '',
+    '🥸' => '',
+    '😎' => '',
+    '🤓' => '',
+    '🧐' => '',
+    '😕' => '',
+    '🫤' => '',
+    '😟' => '',
+    '🙁' => '',
+    '☹' => '',
+    '😮' => '',
+    '😯' => '',
+    '😲' => '',
+    '😳' => '',
+    '🥺' => '',
+    '🥹' => '',
+    '😦' => '',
+    '😧' => '',
+    '😨' => '',
+    '😰' => '',
+    '😥' => '',
+    '😢' => '',
+    '😭' => '',
+    '😱' => '',
+    '😖' => '',
+    '😣' => '',
+    '😞' => '',
+    '😓' => '',
+    '😩' => '',
+    '😫' => '',
+    '🥱' => '',
+    '😤' => '',
+    '😡' => '',
+    '😠' => '',
+    '🤬' => '',
+    '😈' => '',
+    '👿' => '',
+    '💀' => '',
+    '☠' => '',
+    '💩' => '',
+    '🤡' => '',
+    '👹' => '',
+    '👺' => '',
+    '👻' => '',
+    '👽' => '',
+    '👾' => '',
+    '🤖' => '',
+    '😺' => '',
+    '😸' => '',
+    '😹' => '',
+    '😻' => '',
+    '😼' => '',
+    '😽' => '',
+    '🙀' => '',
+    '😿' => '',
+    '😾' => '',
+    '🙈' => '',
+    '🙉' => '',
+    '🙊' => '',
+    '💋' => '',
+    '💌' => '',
+    '💘' => '',
+    '💝' => '',
+    '💖' => '',
+    '💗' => '',
+    '💓' => '',
+    '💞' => '',
+    '💕' => '',
+    '💟' => '',
+    '❣' => '',
+    '💔' => '',
+    '❤' => '',
+    '🧡' => '',
+    '💛' => '',
+    '💚' => '',
+    '💙' => '',
+    '💜' => '',
+    '🩵' => '',
+    '🩶' => '',
+    '🩷' => '',
+    '🤎' => '',
+    '🖤' => '',
+    '🤍' => '',
+    '💯' => '',
+    '💢' => '',
+    '💥' => '',
+    '💫' => '',
+    '💦' => '',
+    '💨' => '',
+    '🕳' => '',
+    '💣' => '',
+    '💬' => '',
+    '🗨' => '',
+    '🗯' => '',
+    '💭' => '',
+    '💤' => '',
+    '👋' => '',
+    '🤚' => '',
+    '🖐' => '',
+    '✋' => '',
+    '🖖' => '',
+    '🫱' => '',
+    '🫲' => '',
+    '🫳' => '',
+    '🫴' => '',
+    '👌' => '',
+    '🤌' => '',
+    '🤏' => '',
+    '✌' => '',
+    '🤞' => '',
+    '🫰' => '',
+    '🤟' => '',
+    '🤘' => '',
+    '🤙' => '',
+    '👈' => '',
+    '👉' => '',
+    '👆' => '',
+    '🖕' => '',
+    '👇' => '',
+    '☝' => '',
+    '🫵' => '',
+    '👍' => '',
+    '👎' => '',
+    '✊' => '',
+    '👊' => '',
+    '🤛' => '',
+    '🤜' => '',
+    '👏' => '',
+    '🙌' => '',
+    '🫶' => '',
+    '👐' => '',
+    '🤲' => '',
+    '🤝' => '',
+    '🙏' => '',
+    '🫷' => '',
+    '🫸' => '',
+    '✍' => '',
+    '💅' => '',
+    '🤳' => '',
+    '💪' => '',
+    '🦾' => '',
+    '🦿' => '',
+    '🦵' => '',
+    '🦶' => '',
+    '👂' => '',
+    '🦻' => '',
+    '👃' => '',
+    '🧠' => '',
+    '🫀' => '',
+    '🫁' => '',
+    '🦷' => '',
+    '🦴' => '',
+    '👀' => '',
+    '👁' => '',
+    '👅' => '',
+    '👄' => '',
+    '🫦' => '',
+    '👶' => '',
+    '🧒' => '',
+    '👦' => '',
+    '👧' => '',
+    '🧑' => '',
+    '👱' => '',
+    '👨' => '',
+    '🧔' => '',
+    '👩' => '',
+    '🧓' => '',
+    '👴' => '',
+    '👵' => '',
+    '🙍' => '',
+    '🙎' => '',
+    '🙅' => '',
+    '🙆' => '',
+    '💁' => '',
+    '🙋' => '',
+    '🧏' => '',
+    '🙇' => '',
+    '🤦' => '',
+    '🤷' => '',
+    '👮' => '',
+    '🕵' => '',
+    '💂' => '',
+    '🥷' => '',
+    '👷' => '',
+    '🫅' => '',
+    '🤴' => '',
+    '👸' => '',
+    '👳' => '',
+    '👲' => '',
+    '🧕' => '',
+    '🤵' => '',
+    '👰' => '',
+    '🤰' => '',
+    '🫃' => '',
+    '🫄' => '',
+    '🤱' => '',
+    '👼' => '',
+    '🎅' => '',
+    '🤶' => '',
+    '🦸' => '',
+    '🦹' => '',
+    '🧙' => '',
+    '🧚' => '',
+    '🧛' => '',
+    '🧜' => '',
+    '🧝' => '',
+    '🧞' => '',
+    '🧟' => '',
+    '🧌' => '',
+    '💆' => '',
+    '💇' => '',
+    '🚶' => '',
+    '🧍' => '',
+    '🧎' => '',
+    '🏃' => '',
+    '💃' => '',
+    '🕺' => '',
+    '🕴' => '',
+    '👯' => '',
+    '🧖' => '',
+    '🧗' => '',
+    '🤺' => '',
+    '🏇' => '',
+    '⛷' => '',
+    '🏂' => '',
+    '🏌' => '',
+    '🏄' => '',
+    '🚣' => '',
+    '🏊' => '',
+    '⛹' => '',
+    '🏋' => '',
+    '🚴' => '',
+    '🚵' => '',
+    '🤸' => '',
+    '🤼' => '',
+    '🤽' => '',
+    '🤾' => '',
+    '🤹' => '',
+    '🧘' => '',
+    '🛀' => '',
+    '🛌' => '',
+    '👭' => '',
+    '👫' => '',
+    '👬' => '',
+    '💏' => '',
+    '💑' => '',
+    '👪' => '',
+    '🗣' => '',
+    '👤' => '',
+    '👥' => '',
+    '🫂' => '',
+    '👣' => '',
+    '🏻' => '',
+    '🏼' => '',
+    '🏽' => '',
+    '🏾' => '',
+    '🏿' => '',
+    '🦰' => '',
+    '🦱' => '',
+    '🦳' => '',
+    '🦲' => '',
+    '🐵' => '',
+    '🐒' => '',
+    '🦍' => '',
+    '🦧' => '',
+    '🐶' => '',
+    '🐕' => '',
+    '🦮' => '',
+    '🐩' => '',
+    '🐺' => '',
+    '🦊' => '',
+    '🦝' => '',
+    '🐱' => '',
+    '🐈' => '',
+    '🦁' => '',
+    '🐯' => '',
+    '🐅' => '',
+    '🐆' => '',
+    '🐴' => '',
+    '🫎' => '',
+    '🫏' => '',
+    '🐎' => '',
+    '🦄' => '',
+    '🦓' => '',
+    '🦌' => '',
+    '🦬' => '',
+    '🐮' => '',
+    '🐂' => '',
+    '🐃' => '',
+    '🐄' => '',
+    '🐷' => '',
+    '🐖' => '',
+    '🐗' => '',
+    '🐽' => '',
+    '🐏' => '',
+    '🐑' => '',
+    '🐐' => '',
+    '🐪' => '',
+    '🐫' => '',
+    '🦙' => '',
+    '🦒' => '',
+    '🐘' => '',
+    '🦣' => '',
+    '🦏' => '',
+    '🦛' => '',
+    '🐭' => '',
+    '🐁' => '',
+    '🐀' => '',
+    '🐹' => '',
+    '🐰' => '',
+    '🐇' => '',
+    '🐿' => '',
+    '🦫' => '',
+    '🦔' => '',
+    '🦇' => '',
+    '🐻' => '',
+    '🐨' => '',
+    '🐼' => '',
+    '🦥' => '',
+    '🦦' => '',
+    '🦨' => '',
+    '🦘' => '',
+    '🦡' => '',
+    '🐾' => '',
+    '🦃' => '',
+    '🐔' => '',
+    '🐓' => '',
+    '🐣' => '',
+    '🐤' => '',
+    '🐥' => '',
+    '🐦' => '',
+    '🐧' => '',
+    '🕊' => '',
+    '🦅' => '',
+    '🦆' => '',
+    '🦢' => '',
+    '🦉' => '',
+    '🦤' => '',
+    '🪶' => '',
+    '🦩' => '',
+    '🦚' => '',
+    '🦜' => '',
+    '🪽' => '',
+    '🪿' => '',
+    '🐸' => '',
+    '🐊' => '',
+    '🐢' => '',
+    '🦎' => '',
+    '🐍' => '',
+    '🐲' => '',
+    '🐉' => '',
+    '🦕' => '',
+    '🦖' => '',
+    '🐳' => '',
+    '🐋' => '',
+    '🐬' => '',
+    '🦭' => '',
+    '🐟' => '',
+    '🐠' => '',
+    '🐡' => '',
+    '🦈' => '',
+    '🐙' => '',
+    '🐚' => '',
+    '🪸' => '',
+    '🪼' => '',
+    '🐌' => '',
+    '🦋' => '',
+    '🐛' => '',
+    '🐜' => '',
+    '🐝' => '',
+    '🪲' => '',
+    '🐞' => '',
+    '🦗' => '',
+    '🪳' => '',
+    '🕷' => '',
+    '🕸' => '',
+    '🦂' => '',
+    '🦟' => '',
+    '🪰' => '',
+    '🪱' => '',
+    '🦠' => '',
+    '💐' => '',
+    '🌸' => '',
+    '💮' => '',
+    '🪷' => '',
+    '🏵' => '',
+    '🌹' => '',
+    '🥀' => '',
+    '🌺' => '',
+    '🌻' => '',
+    '🌼' => '',
+    '🌷' => '',
+    '🪻' => '',
+    '🌱' => '',
+    '🪴' => '',
+    '🌲' => '',
+    '🌳' => '',
+    '🌴' => '',
+    '🌵' => '',
+    '🌾' => '',
+    '🌿' => '',
+    '☘' => '',
+    '🍀' => '',
+    '🍁' => '',
+    '🍂' => '',
+    '🍃' => '',
+    '🪹' => '',
+    '🪺' => '',
+    '🍇' => '',
+    '🍈' => '',
+    '🍉' => '',
+    '🍊' => '',
+    '🍋' => '',
+    '🍌' => '',
+    '🍍' => '',
+    '🥭' => '',
+    '🍎' => '',
+    '🍏' => '',
+    '🍐' => '',
+    '🍑' => '',
+    '🍒' => '',
+    '🍓' => '',
+    '🫐' => '',
+    '🥝' => '',
+    '🍅' => '',
+    '🫒' => '',
+    '🥥' => '',
+    '🥑' => '',
+    '🍆' => '',
+    '🥔' => '',
+    '🥕' => '',
+    '🌽' => '',
+    '🌶' => '',
+    '🫑' => '',
+    '🥒' => '',
+    '🥬' => '',
+    '🥦' => '',
+    '🧄' => '',
+    '🧅' => '',
+    '🍄' => '',
+    '🥜' => '',
+    '🫘' => '',
+    '🌰' => '',
+    '🫚' => '',
+    '🫛' => '',
+    '🍞' => '',
+    '🥐' => '',
+    '🥖' => '',
+    '🫓' => '',
+    '🥨' => '',
+    '🥯' => '',
+    '🥞' => '',
+    '🧇' => '',
+    '🧀' => '',
+    '🍖' => '',
+    '🍗' => '',
+    '🥩' => '',
+    '🥓' => '',
+    '🍔' => '',
+    '🍟' => '',
+    '🍕' => '',
+    '🌭' => '',
+    '🥪' => '',
+    '🌮' => '',
+    '🌯' => '',
+    '🫔' => '',
+    '🥙' => '',
+    '🧆' => '',
+    '🥚' => '',
+    '🍳' => '',
+    '🥘' => '',
+    '🍲' => '',
+    '🫕' => '',
+    '🥣' => '',
+    '🥗' => '',
+    '🍿' => '',
+    '🧈' => '',
+    '🧂' => '',
+    '🥫' => '',
+    '🍱' => '',
+    '🍘' => '',
+    '🍙' => '',
+    '🍚' => '',
+    '🍛' => '',
+    '🍜' => '',
+    '🍝' => '',
+    '🍠' => '',
+    '🍢' => '',
+    '🍣' => '',
+    '🍤' => '',
+    '🍥' => '',
+    '🥮' => '',
+    '🍡' => '',
+    '🥟' => '',
+    '🥠' => '',
+    '🥡' => '',
+    '🦀' => '',
+    '🦞' => '',
+    '🦐' => '',
+    '🦑' => '',
+    '🦪' => '',
+    '🍦' => '',
+    '🍧' => '',
+    '🍨' => '',
+    '🍩' => '',
+    '🍪' => '',
+    '🎂' => '',
+    '🍰' => '',
+    '🧁' => '',
+    '🥧' => '',
+    '🍫' => '',
+    '🍬' => '',
+    '🍭' => '',
+    '🍮' => '',
+    '🍯' => '',
+    '🍼' => '',
+    '🥛' => '',
+    '☕' => '',
+    '🫖' => '',
+    '🍵' => '',
+    '🍶' => '',
+    '🍾' => '',
+    '🍷' => '',
+    '🍸' => '',
+    '🍹' => '',
+    '🍺' => '',
+    '🍻' => '',
+    '🥂' => '',
+    '🥃' => '',
+    '🫗' => '',
+    '🥤' => '',
+    '🧋' => '',
+    '🧃' => '',
+    '🧉' => '',
+    '🧊' => '',
+    '🥢' => '',
+    '🍽' => '',
+    '🍴' => '',
+    '🥄' => '',
+    '🔪' => '',
+    '🫙' => '',
+    '🏺' => '',
+    '🌍' => '',
+    '🌎' => '',
+    '🌏' => '',
+    '🌐' => '',
+    '🗺' => '',
+    '🗾' => '',
+    '🧭' => '',
+    '🏔' => '',
+    '⛰' => '',
+    '🌋' => '',
+    '🗻' => '',
+    '🏕' => '',
+    '🏖' => '',
+    '🏜' => '',
+    '🏝' => '',
+    '🏞' => '',
+    '🏟' => '',
+    '🏛' => '',
+    '🏗' => '',
+    '🧱' => '',
+    '🪨' => '',
+    '🪵' => '',
+    '🛖' => '',
+    '🏘' => '',
+    '🏚' => '',
+    '🏠' => '',
+    '🏡' => '',
+    '🏢' => '',
+    '🏣' => '',
+    '🏤' => '',
+    '🏥' => '',
+    '🏦' => '',
+    '🏨' => '',
+    '🏩' => '',
+    '🏪' => '',
+    '🏫' => '',
+    '🏬' => '',
+    '🏭' => '',
+    '🏯' => '',
+    '🏰' => '',
+    '💒' => '',
+    '🗼' => '',
+    '🗽' => '',
+    '⛪' => '',
+    '🕌' => '',
+    '🛕' => '',
+    '🕍' => '',
+    '⛩' => '',
+    '🕋' => '',
+    '⛲' => '',
+    '⛺' => '',
+    '🌁' => '',
+    '🌃' => '',
+    '🏙' => '',
+    '🌄' => '',
+    '🌅' => '',
+    '🌆' => '',
+    '🌇' => '',
+    '🌉' => '',
+    '♨' => '',
+    '🎠' => '',
+    '🛝' => '',
+    '🎡' => '',
+    '🎢' => '',
+    '💈' => '',
+    '🎪' => '',
+    '🚂' => '',
+    '🚃' => '',
+    '🚄' => '',
+    '🚅' => '',
+    '🚆' => '',
+    '🚇' => '',
+    '🚈' => '',
+    '🚉' => '',
+    '🚊' => '',
+    '🚝' => '',
+    '🚞' => '',
+    '🚋' => '',
+    '🚌' => '',
+    '🚍' => '',
+    '🚎' => '',
+    '🚐' => '',
+    '🚑' => '',
+    '🚒' => '',
+    '🚓' => '',
+    '🚔' => '',
+    '🚕' => '',
+    '🚖' => '',
+    '🚗' => '',
+    '🚘' => '',
+    '🚙' => '',
+    '🛻' => '',
+    '🚚' => '',
+    '🚛' => '',
+    '🚜' => '',
+    '🏎' => '',
+    '🏍' => '',
+    '🛵' => '',
+    '🦽' => '',
+    '🦼' => '',
+    '🛺' => '',
+    '🚲' => '',
+    '🛴' => '',
+    '🛹' => '',
+    '🛼' => '',
+    '🚏' => '',
+    '🛣' => '',
+    '🛤' => '',
+    '🛢' => '',
+    '⛽' => '',
+    '🛞' => '',
+    '🚨' => '',
+    '🚥' => '',
+    '🚦' => '',
+    '🛑' => '',
+    '🚧' => '',
+    '⚓' => '',
+    '🛟' => '',
+    '⛵' => '',
+    '🛶' => '',
+    '🚤' => '',
+    '🛳' => '',
+    '⛴' => '',
+    '🛥' => '',
+    '🚢' => '',
+    '✈' => '',
+    '🛩' => '',
+    '🛫' => '',
+    '🛬' => '',
+    '🪂' => '',
+    '💺' => '',
+    '🚁' => '',
+    '🚟' => '',
+    '🚠' => '',
+    '🚡' => '',
+    '🛰' => '',
+    '🚀' => '',
+    '🛸' => '',
+    '🛎' => '',
+    '🧳' => '',
+    '⌛' => '',
+    '⏳' => '',
+    '⌚' => '',
+    '⏰' => '',
+    '⏱' => '',
+    '⏲' => '',
+    '🕰' => '',
+    '🕛' => '',
+    '🕧' => '',
+    '🕐' => '',
+    '🕜' => '',
+    '🕑' => '',
+    '🕝' => '',
+    '🕒' => '',
+    '🕞' => '',
+    '🕓' => '',
+    '🕟' => '',
+    '🕔' => '',
+    '🕠' => '',
+    '🕕' => '',
+    '🕡' => '',
+    '🕖' => '',
+    '🕢' => '',
+    '🕗' => '',
+    '🕣' => '',
+    '🕘' => '',
+    '🕤' => '',
+    '🕙' => '',
+    '🕥' => '',
+    '🕚' => '',
+    '🕦' => '',
+    '🌑' => '',
+    '🌒' => '',
+    '🌓' => '',
+    '🌔' => '',
+    '🌕' => '',
+    '🌖' => '',
+    '🌗' => '',
+    '🌘' => '',
+    '🌙' => '',
+    '🌚' => '',
+    '🌛' => '',
+    '🌜' => '',
+    '🌡' => '',
+    '☀' => '',
+    '🌝' => '',
+    '🌞' => '',
+    '🪐' => '',
+    '⭐' => '',
+    '🌟' => '',
+    '🌠' => '',
+    '🌌' => '',
+    '☁' => '',
+    '⛅' => '',
+    '⛈' => '',
+    '🌤' => '',
+    '🌥' => '',
+    '🌦' => '',
+    '🌧' => '',
+    '🌨' => '',
+    '🌩' => '',
+    '🌪' => '',
+    '🌫' => '',
+    '🌬' => '',
+    '🌀' => '',
+    '🌈' => '',
+    '🌂' => '',
+    '☂' => '',
+    '☔' => '',
+    '⛱' => '',
+    '⚡' => '',
+    '❄' => '',
+    '☃' => '',
+    '⛄' => '',
+    '☄' => '',
+    '🔥' => '',
+    '💧' => '',
+    '🌊' => '',
+    '🎃' => '',
+    '🎄' => '',
+    '🎆' => '',
+    '🎇' => '',
+    '🧨' => '',
+    '✨' => '',
+    '🎈' => '',
+    '🎉' => '',
+    '🎊' => '',
+    '🎋' => '',
+    '🎍' => '',
+    '🎎' => '',
+    '🎏' => '',
+    '🎐' => '',
+    '🎑' => '',
+    '🧧' => '',
+    '🎀' => '',
+    '🎁' => '',
+    '🎗' => '',
+    '🎟' => '',
+    '🎫' => '',
+    '🎖' => '',
+    '🏆' => '',
+    '🏅' => '',
+    '🥇' => '',
+    '🥈' => '',
+    '🥉' => '',
+    '⚽' => '',
+    '⚾' => '',
+    '🥎' => '',
+    '🏀' => '',
+    '🏐' => '',
+    '🏈' => '',
+    '🏉' => '',
+    '🎾' => '',
+    '🥏' => '',
+    '🎳' => '',
+    '🏏' => '',
+    '🏑' => '',
+    '🏒' => '',
+    '🥍' => '',
+    '🏓' => '',
+    '🏸' => '',
+    '🥊' => '',
+    '🥋' => '',
+    '🥅' => '',
+    '⛳' => '',
+    '⛸' => '',
+    '🎣' => '',
+    '🤿' => '',
+    '🎽' => '',
+    '🎿' => '',
+    '🛷' => '',
+    '🥌' => '',
+    '🎯' => '',
+    '🪀' => '',
+    '🪁' => '',
+    '🎱' => '',
+    '🔮' => '',
+    '🪄' => '',
+    '🧿' => '',
+    '🪬' => '',
+    '🎮' => '',
+    '🕹' => '',
+    '🎰' => '',
+    '🎲' => '',
+    '🧩' => '',
+    '🧸' => '',
+    '🪅' => '',
+    '🪩' => '',
+    '🪆' => '',
+    '♠' => '',
+    '♥' => '',
+    '♦' => '',
+    '♣' => '',
+    '♟' => '',
+    '🃏' => '',
+    '🀄' => '',
+    '🎴' => '',
+    '🎭' => '',
+    '🖼' => '',
+    '🎨' => '',
+    '🧵' => '',
+    '🪡' => '',
+    '🧶' => '',
+    '🪢' => '',
+    '👓' => '',
+    '🕶' => '',
+    '🥽' => '',
+    '🥼' => '',
+    '🦺' => '',
+    '👔' => '',
+    '👕' => '',
+    '👖' => '',
+    '🧣' => '',
+    '🧤' => '',
+    '🧥' => '',
+    '🧦' => '',
+    '👗' => '',
+    '👘' => '',
+    '🥻' => '',
+    '🩱' => '',
+    '🩲' => '',
+    '🩳' => '',
+    '👙' => '',
+    '👚' => '',
+    '🪭' => '',
+    '🪮' => '',
+    '👛' => '',
+    '👜' => '',
+    '👝' => '',
+    '🛍' => '',
+    '🎒' => '',
+    '🩴' => '',
+    '👞' => '',
+    '👟' => '',
+    '🥾' => '',
+    '🥿' => '',
+    '👠' => '',
+    '👡' => '',
+    '🩰' => '',
+    '👢' => '',
+    '👑' => '',
+    '👒' => '',
+    '🎩' => '',
+    '🎓' => '',
+    '🧢' => '',
+    '🪖' => '',
+    '⛑' => '',
+    '📿' => '',
+    '💄' => '',
+    '💍' => '',
+    '💎' => '',
+    '🔇' => '',
+    '🔈' => '',
+    '🔉' => '',
+    '🔊' => '',
+    '📢' => '',
+    '📣' => '',
+    '📯' => '',
+    '🔔' => '',
+    '🔕' => '',
+    '🎼' => '',
+    '🎵' => '',
+    '🎶' => '',
+    '🎙' => '',
+    '🎚' => '',
+    '🎛' => '',
+    '🎤' => '',
+    '🎧' => '',
+    '📻' => '',
+    '🎷' => '',
+    '🪗' => '',
+    '🎸' => '',
+    '🎹' => '',
+    '🎺' => '',
+    '🎻' => '',
+    '🪕' => '',
+    '🥁' => '',
+    '🪘' => '',
+    '🪇' => '',
+    '🪈' => '',
+    '📱' => '',
+    '📲' => '',
+    '☎' => '',
+    '📞' => '',
+    '📟' => '',
+    '📠' => '',
+    '🔋' => '',
+    '🪫' => '',
+    '🔌' => '',
+    '💻' => '',
+    '🖥' => '',
+    '🖨' => '',
+    '⌨' => '',
+    '🖱' => '',
+    '🖲' => '',
+    '💽' => '',
+    '💾' => '',
+    '💿' => '',
+    '📀' => '',
+    '🧮' => '',
+    '🎥' => '',
+    '🎞' => '',
+    '📽' => '',
+    '🎬' => '',
+    '📺' => '',
+    '📷' => '',
+    '📸' => '',
+    '📹' => '',
+    '📼' => '',
+    '🔍' => '',
+    '🔎' => '',
+    '🕯' => '',
+    '💡' => '',
+    '🔦' => '',
+    '🏮' => '',
+    '🪔' => '',
+    '📔' => '',
+    '📕' => '',
+    '📖' => '',
+    '📗' => '',
+    '📘' => '',
+    '📙' => '',
+    '📚' => '',
+    '📓' => '',
+    '📒' => '',
+    '📃' => '',
+    '📜' => '',
+    '📄' => '',
+    '📰' => '',
+    '🗞' => '',
+    '📑' => '',
+    '🔖' => '',
+    '🏷' => '',
+    '💰' => '',
+    '🪙' => '',
+    '💴' => '',
+    '💵' => '',
+    '💶' => '',
+    '💷' => '',
+    '💸' => '',
+    '💳' => '',
+    '🧾' => '',
+    '💹' => '',
+    '✉' => '',
+    '📧' => '',
+    '📨' => '',
+    '📩' => '',
+    '📤' => '',
+    '📥' => '',
+    '📦' => '',
+    '📫' => '',
+    '📪' => '',
+    '📬' => '',
+    '📭' => '',
+    '📮' => '',
+    '🗳' => '',
+    '✏' => '',
+    '✒' => '',
+    '🖋' => '',
+    '🖊' => '',
+    '🖌' => '',
+    '🖍' => '',
+    '📝' => '',
+    '💼' => '',
+    '📁' => '',
+    '📂' => '',
+    '🗂' => '',
+    '📅' => '',
+    '📆' => '',
+    '🗒' => '',
+    '🗓' => '',
+    '📇' => '',
+    '📈' => '',
+    '📉' => '',
+    '📊' => '',
+    '📋' => '',
+    '📌' => '',
+    '📍' => '',
+    '📎' => '',
+    '🖇' => '',
+    '📏' => '',
+    '📐' => '',
+    '✂' => '',
+    '🗃' => '',
+    '🗄' => '',
+    '🗑' => '',
+    '🔒' => '',
+    '🔓' => '',
+    '🔏' => '',
+    '🔐' => '',
+    '🔑' => '',
+    '🗝' => '',
+    '🔨' => '',
+    '🪓' => '',
+    '⛏' => '',
+    '⚒' => '',
+    '🛠' => '',
+    '🗡' => '',
+    '⚔' => '',
+    '🔫' => '',
+    '🪃' => '',
+    '🏹' => '',
+    '🛡' => '',
+    '🪚' => '',
+    '🔧' => '',
+    '🪛' => '',
+    '🔩' => '',
+    '⚙' => '',
+    '🗜' => '',
+    '⚖' => '',
+    '🦯' => '',
+    '🔗' => '',
+    '⛓' => '',
+    '🪝' => '',
+    '🧰' => '',
+    '🧲' => '',
+    '🪜' => '',
+    '⚗' => '',
+    '🧪' => '',
+    '🧫' => '',
+    '🧬' => '',
+    '🔬' => '',
+    '🔭' => '',
+    '📡' => '',
+    '💉' => '',
+    '🩸' => '',
+    '💊' => '',
+    '🩹' => '',
+    '🩼' => '',
+    '🩺' => '',
+    '🩻' => '',
+    '🚪' => '',
+    '🛗' => '',
+    '🪞' => '',
+    '🪟' => '',
+    '🛏' => '',
+    '🛋' => '',
+    '🪑' => '',
+    '🚽' => '',
+    '🪠' => '',
+    '🚿' => '',
+    '🛁' => '',
+    '🪤' => '',
+    '🪒' => '',
+    '🧴' => '',
+    '🧷' => '',
+    '🧹' => '',
+    '🧺' => '',
+    '🧻' => '',
+    '🪣' => '',
+    '🧼' => '',
+    '🫧' => '',
+    '🪥' => '',
+    '🧽' => '',
+    '🧯' => '',
+    '🛒' => '',
+    '🚬' => '',
+    '⚰' => '',
+    '🪦' => '',
+    '⚱' => '',
+    '🗿' => '',
+    '🪧' => '',
+    '🪪' => '',
+    '🏧' => '',
+    '🚮' => '',
+    '🚰' => '',
+    '♿' => '',
+    '🚹' => '',
+    '🚺' => '',
+    '🚻' => '',
+    '🚼' => '',
+    '🚾' => '',
+    '🛂' => '',
+    '🛃' => '',
+    '🛄' => '',
+    '🛅' => '',
+    '⚠' => '',
+    '🚸' => '',
+    '⛔' => '',
+    '🚫' => '',
+    '🚳' => '',
+    '🚭' => '',
+    '🚯' => '',
+    '🚱' => '',
+    '🚷' => '',
+    '📵' => '',
+    '🔞' => '',
+    '☢' => '',
+    '☣' => '',
+    '⬆' => '',
+    '↗' => '',
+    '➡' => '',
+    '↘' => '',
+    '⬇' => '',
+    '↙' => '',
+    '⬅' => '',
+    '↖' => '',
+    '↕' => '',
+    '↔' => '',
+    '↩' => '',
+    '↪' => '',
+    '⤴' => '',
+    '⤵' => '',
+    '🔃' => '',
+    '🔄' => '',
+    '🔙' => '',
+    '🔚' => '',
+    '🔛' => '',
+    '🔜' => '',
+    '🔝' => '',
+    '🛐' => '',
+    '⚛' => '',
+    '🕉' => '',
+    '✡' => '',
+    '☸' => '',
+    '☯' => '',
+    '✝' => '',
+    '☦' => '',
+    '☪' => '',
+    '☮' => '',
+    '🕎' => '',
+    '🔯' => '',
+    '🪯' => '',
+    '♈' => '',
+    '♉' => '',
+    '♊' => '',
+    '♋' => '',
+    '♌' => '',
+    '♍' => '',
+    '♎' => '',
+    '♏' => '',
+    '♐' => '',
+    '♑' => '',
+    '♒' => '',
+    '♓' => '',
+    '⛎' => '',
+    '🔀' => '',
+    '🔁' => '',
+    '🔂' => '',
+    '▶' => '',
+    '⏩' => '',
+    '⏭' => '',
+    '⏯' => '',
+    '◀' => '',
+    '⏪' => '',
+    '⏮' => '',
+    '🔼' => '',
+    '⏫' => '',
+    '🔽' => '',
+    '⏬' => '',
+    '⏸' => '',
+    '⏹' => '',
+    '⏺' => '',
+    '⏏' => '',
+    '🎦' => '',
+    '🔅' => '',
+    '🔆' => '',
+    '📶' => '',
+    '📳' => '',
+    '📴' => '',
+    '🛜' => '',
+    '♀' => '',
+    '♂' => '',
+    '⚧' => '',
+    '✖' => '',
+    '➕' => '',
+    '➖' => '',
+    '➗' => '',
+    '🟰' => '',
+    '♾' => '',
+    '‼' => '',
+    '⁉' => '',
+    '❓' => '',
+    '❔' => '',
+    '❕' => '',
+    '❗' => '',
+    '〰' => '',
+    '💱' => '',
+    '💲' => '',
+    '⚕' => '',
+    '♻' => '',
+    '⚜' => '',
+    '🔱' => '',
+    '📛' => '',
+    '🔰' => '',
+    '⭕' => '',
+    '✅' => '',
+    '☑' => '',
+    '✔' => '',
+    '❌' => '',
+    '❎' => '',
+    '➰' => '',
+    '➿' => '',
+    '〽' => '',
+    '✳' => '',
+    '✴' => '',
+    '❇' => '',
+    '©' => '',
+    '®' => '',
+    '™' => '',
+    '🔟' => '',
+    '🔠' => '',
+    '🔡' => '',
+    '🔢' => '',
+    '🔣' => '',
+    '🔤' => '',
+    '🅰' => '',
+    '🆎' => '',
+    '🅱' => '',
+    '🆑' => '',
+    '🆒' => '',
+    '🆓' => '',
+    'ℹ' => '',
+    '🆔' => '',
+    'Ⓜ' => '',
+    '🆕' => '',
+    '🆖' => '',
+    '🅾' => '',
+    '🆗' => '',
+    '🅿' => '',
+    '🆘' => '',
+    '🆙' => '',
+    '🆚' => '',
+    '🈁' => '',
+    '🈂' => '',
+    '🈷' => '',
+    '🈶' => '',
+    '🈯' => '',
+    '🉐' => '',
+    '🈹' => '',
+    '🈚' => '',
+    '🈲' => '',
+    '🉑' => '',
+    '🈸' => '',
+    '🈴' => '',
+    '🈳' => '',
+    '㊗' => '',
+    '㊙' => '',
+    '🈺' => '',
+    '🈵' => '',
+    '🔴' => '',
+    '🟠' => '',
+    '🟡' => '',
+    '🟢' => '',
+    '🔵' => '',
+    '🟣' => '',
+    '🟤' => '',
+    '⚫' => '',
+    '⚪' => '',
+    '🟥' => '',
+    '🟧' => '',
+    '🟨' => '',
+    '🟩' => '',
+    '🟦' => '',
+    '🟪' => '',
+    '🟫' => '',
+    '⬛' => '',
+    '⬜' => '',
+    '◼' => '',
+    '◻' => '',
+    '◾' => '',
+    '◽' => '',
+    '▪' => '',
+    '▫' => '',
+    '🔶' => '',
+    '🔷' => '',
+    '🔸' => '',
+    '🔹' => '',
+    '🔺' => '',
+    '🔻' => '',
+    '💠' => '',
+    '🔘' => '',
+    '🔳' => '',
+    '🔲' => '',
+    '🏁' => '',
+    '🚩' => '',
+    '🎌' => '',
+    '🏴' => '',
+    '🏳' => '',
+];
diff --git a/src/Symfony/Component/Intl/Resources/emoji/build.php b/src/Symfony/Component/Intl/Resources/emoji/build.php
index cf34ea11baf2c..54e7fe10fde96 100755
--- a/src/Symfony/Component/Intl/Resources/emoji/build.php
+++ b/src/Symfony/Component/Intl/Resources/emoji/build.php
@@ -21,6 +21,7 @@
 Builder::saveRules(Builder::buildRules($emojisCodePoints));
 Builder::saveRules(Builder::buildGitHubRules($emojisCodePoints));
 Builder::saveRules(Builder::buildSlackRules($emojisCodePoints));
+Builder::saveRules(Builder::buildStripRules($emojisCodePoints));
 
 final class Builder
 {
@@ -159,6 +160,18 @@ public static function buildSlackRules(array $emojisCodePoints): iterable
         return ['slack' => self::createRules($maps)];
     }
 
+    public static function buildStripRules(array $emojisCodePoints): iterable
+    {
+        $maps = [];
+        foreach ($emojisCodePoints as $emoji) {
+            self::testEmoji($emoji, 'strip');
+            $codePointsCount = mb_strlen($emoji);
+            $maps[$codePointsCount][$emoji] = '';
+        }
+
+        return ['strip' => self::createRules($maps)];
+    }
+
     public static function cleanTarget(): void
     {
         $fs = new Filesystem();
@@ -181,7 +194,7 @@ public static function saveRules(iterable $rulesByLocale): void
                 $firstChars[$c] = $c;
             }
 
-            if (':' === $v[0]) {
+            if (':' === ($v[0] ?? null)) {
                 file_put_contents(self::TARGET_DIR."/$locale-emoji.php", "<?php\n\nreturn ".VarExporter::export(array_flip($rules)).";\n");
             }
         }
diff --git a/src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php b/src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php
index ee58af9f35f4c..b623807604f71 100644
--- a/src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php
+++ b/src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php
@@ -64,6 +64,22 @@ public function provideTransliterateTests(): iterable
             $specialArrowInput,
             '↔ - :left_right_arrow:',
         ];
+
+        yield [
+            'strip',
+            'un 😺, 🐈‍⬛, et a 🦁 vont au 🏞️ étoile',
+            'un , , et a  vont au  étoile',
+        ];
+        yield [
+            'strip',
+            'a 😺, 🐈‍⬛, and a 🦁 go to 🏞️... 😍 🎉 💛',
+            'a , , and a  go to ...   ',
+        ];
+        yield [
+            'strip',
+            $specialArrowInput,
+            ' - ',
+        ];
     }
 
     /**
@@ -81,6 +97,7 @@ public function provideLocaleTest(): iterable
         $file = (new Finder())
             ->in(__DIR__.'/../../Resources/data/transliterator/emoji')
             ->name('*.php')
+            ->notName('emoji-strip.php')
             ->files()
         ;
 

From 81c5c0c6683feb14663f3d26dc987346befeca71 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Tue, 29 Nov 2022 09:12:04 +0100
Subject: [PATCH 017/475] [Validator] Add `Uuid::TIME_BASED_VERSIONS` to match
 that a UUID being validated embeds a timestamp

---
 src/Symfony/Component/Validator/CHANGELOG.md  |  5 +++
 .../Component/Validator/Constraints/Uuid.php  |  7 ++++
 .../Validator/Constraints/UuidValidator.php   |  4 ++-
 .../Tests/Constraints/UuidValidatorTest.php   | 33 +++++++++++++++++++
 4 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
index 5d55f9cde0b31..88b152ed8dc31 100644
--- a/src/Symfony/Component/Validator/CHANGELOG.md
+++ b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `Uuid::TIME_BASED_VERSIONS` to match that a UUID being validated embeds a timestamp
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Validator/Constraints/Uuid.php b/src/Symfony/Component/Validator/Constraints/Uuid.php
index 4c9dedd8fe94a..4c385d5322ca6 100644
--- a/src/Symfony/Component/Validator/Constraints/Uuid.php
+++ b/src/Symfony/Component/Validator/Constraints/Uuid.php
@@ -28,6 +28,7 @@ class Uuid extends Constraint
     public const INVALID_CHARACTERS_ERROR = '51120b12-a2bc-41bf-aa53-cd73daf330d0';
     public const INVALID_HYPHEN_PLACEMENT_ERROR = '98469c83-0309-4f5d-bf95-a496dcaa869c';
     public const INVALID_VERSION_ERROR = '21ba13b4-b185-4882-ac6f-d147355987eb';
+    public const INVALID_TIME_BASED_VERSION_ERROR = '484081ca-6fbd-11ed-ade8-a3bdfd0fcf2f';
     public const INVALID_VARIANT_ERROR = '164ef693-2b9d-46de-ad7f-836201f0c2db';
 
     protected const ERROR_NAMES = [
@@ -65,6 +66,12 @@ class Uuid extends Constraint
         self::V8_CUSTOM,
     ];
 
+    public const TIME_BASED_VERSIONS = [
+        self::V1_MAC,
+        self::V6_SORTABLE,
+        self::V7_MONOTONIC,
+    ];
+
     /**
      * Message to display when validation fails.
      *
diff --git a/src/Symfony/Component/Validator/Constraints/UuidValidator.php b/src/Symfony/Component/Validator/Constraints/UuidValidator.php
index c4ccfb27dee9d..88f9e9674ad11 100644
--- a/src/Symfony/Component/Validator/Constraints/UuidValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/UuidValidator.php
@@ -235,9 +235,11 @@ private function validateStrict(string $value, Uuid $constraint)
 
         // Check version
         if (!\in_array($value[self::STRICT_VERSION_POSITION], $constraint->versions)) {
+            $code = Uuid::TIME_BASED_VERSIONS === $constraint->versions ? Uuid::INVALID_TIME_BASED_VERSION_ERROR : Uuid::INVALID_VERSION_ERROR;
+
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
-                ->setCode(Uuid::INVALID_VERSION_ERROR)
+                ->setCode($code)
                 ->addViolation();
         }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
index 2df1b276206cc..f003afa6e2461 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
@@ -263,4 +263,37 @@ public function testInvalidNonStrictUuidNamed()
             ->setCode(Uuid::INVALID_CHARACTERS_ERROR)
             ->assertRaised();
     }
+
+    /**
+     * @dataProvider getUuidForTimeBasedAssertions
+     */
+    public function testTimeBasedUuid(string $uid, bool $expectedTimeBased)
+    {
+        $constraint = new Uuid([
+            'versions' => Uuid::TIME_BASED_VERSIONS,
+        ]);
+
+        $this->validator->validate($uid, $constraint);
+
+        if ($expectedTimeBased) {
+            $this->assertNoViolation();
+        } else {
+            $this->buildViolation('This is not a valid UUID.')
+                ->setParameter('{{ value }}', '"'.$uid.'"')
+                ->setCode(Uuid::INVALID_TIME_BASED_VERSION_ERROR)
+                ->assertRaised();
+        }
+    }
+
+    public static function getUuidForTimeBasedAssertions(): \Generator
+    {
+        yield Uuid::V1_MAC => ['95ab107e-6fc2-11ed-9d6b-01bfd6e71dbd', true];
+        yield Uuid::V2_DCE => ['216fff40-98d9-21e3-a5e2-0800200c9a66', false];
+        yield Uuid::V3_MD5 => ['5d5b5ae1-5857-3531-9431-e8ac73c3e61d', false];
+        yield Uuid::V4_RANDOM => ['ba6479dd-a5ea-403c-96ae-5964d0582e81', false];
+        yield Uuid::V5_SHA1 => ['fc1cc19d-cb3c-5f6a-a0f6-706424f68e3a', false];
+        yield Uuid::V6_SORTABLE => ['1ed6fc29-5ab1-6b6e-8aad-cfa821180d14', true];
+        yield Uuid::V7_MONOTONIC => ['0184c292-b133-7e10-a3b4-d49c1ab49b2a', true];
+        yield Uuid::V8_CUSTOM => ['00112233-4455-8677-8899-aabbccddeeff', false];
+    }
 }

From 44c7c58f585865c6c1e1b9896e0cd88fef11659d Mon Sep 17 00:00:00 2001
From: tigitz <philippe.segatori@gmail.com>
Date: Fri, 30 Sep 2022 23:29:24 +0200
Subject: [PATCH 018/475] Leverage class name literal on object

---
 .../DoctrineExtensionTest.php                    |  8 ++++----
 .../Console/Descriptor/JsonDescriptor.php        |  2 +-
 .../Console/Descriptor/MarkdownDescriptor.php    |  2 +-
 .../Console/Descriptor/TextDescriptor.php        |  2 +-
 .../Console/Descriptor/XmlDescriptor.php         |  2 +-
 .../Command/DebugFirewallCommand.php             |  2 +-
 .../DataCollector/SecurityDataCollector.php      |  2 +-
 .../Console/Command/CompleteCommand.php          |  4 ++--
 .../Component/Console/Tests/ApplicationTest.php  |  4 ++--
 .../Dumper/GraphvizDumper.php                    |  2 +-
 .../DependencyInjection/ServiceLocator.php       |  2 +-
 .../Compiler/ResolveChildDefinitionsPassTest.php |  8 ++++----
 .../Tests/Compiler/ServiceLocatorTagPassTest.php | 16 ++++++++--------
 .../ErrorHandler/Tests/ErrorHandlerTest.php      |  4 ++--
 .../Tests/Exception/FlattenExceptionTest.php     |  8 ++++----
 .../EventDispatcher/Debug/WrappedListener.php    |  2 +-
 .../Component/Form/Command/DebugCommand.php      |  2 +-
 .../Form/Console/Descriptor/Descriptor.php       |  2 +-
 .../Form/Console/Descriptor/JsonDescriptor.php   |  2 +-
 .../Form/Console/Descriptor/TextDescriptor.php   |  4 ++--
 .../Form/Extension/Core/Type/FormType.php        |  2 +-
 .../Csrf/Type/FormTypeCsrfExtension.php          |  4 ++--
 .../DataCollector/FormDataCollector.php          |  2 +-
 .../DataCollector/FormDataExtractor.php          |  2 +-
 .../Form/Tests/Fixtures/TestExtension.php        |  2 +-
 .../Form/Tests/FormFactoryBuilderTest.php        |  2 +-
 .../Component/HttpClient/RetryableHttpClient.php |  4 ++--
 .../HttpClient/Tests/HttplugClientTest.php       |  2 +-
 .../HttpKernel/Controller/ArgumentResolver.php   |  2 +-
 .../ArgumentResolver/TraceableValueResolver.php  |  4 ++--
 src/Symfony/Component/HttpKernel/Kernel.php      |  4 ++--
 .../Component/HttpKernel/Profiler/Profiler.php   |  2 +-
 .../Component/HttpKernel/Tests/KernelTest.php    |  4 ++--
 .../Security/CheckLdapCredentialsListener.php    |  2 +-
 .../Lock/Store/DoctrineDbalPostgreSqlStore.php   |  2 +-
 .../Bridge/Amqp/Tests/Fixtures/long_receiver.php |  2 +-
 .../Command/AbstractFailedMessagesCommand.php    |  2 +-
 .../Command/FailedMessagesShowCommand.php        |  4 ++--
 ...ndFailedMessageToFailureTransportListener.php |  2 +-
 .../Exception/HandlerFailedException.php         |  2 +-
 .../Exception/ValidationFailedException.php      |  2 +-
 .../Messenger/Handler/HandlersLocator.php        |  2 +-
 .../Middleware/SendMessageMiddleware.php         |  2 +-
 .../Transport/Serialization/Serializer.php       |  2 +-
 .../SendFailedMessageToNotifierListener.php      |  2 +-
 .../Http/Authentication/AuthenticatorManager.php | 12 ++++++------
 .../Debug/TraceableAuthenticator.php             |  2 +-
 .../Http/EventListener/RememberMeListener.php    |  2 +-
 .../Serializer/Debug/TraceableEncoder.php        |  4 ++--
 .../Serializer/Debug/TraceableNormalizer.php     |  4 ++--
 .../Tests/Normalizer/CustomNormalizerTest.php    |  4 ++--
 .../Tests/Normalizer/ObjectNormalizerTest.php    |  4 ++--
 .../Component/Validator/ConstraintViolation.php  |  2 +-
 .../Validator/Constraints/CallbackValidator.php  |  2 +-
 .../DataCollector/ValidatorDataCollector.php     |  2 +-
 .../Tests/Constraints/FileValidatorTest.php      |  2 +-
 .../Tests/Fixtures/FakeMetadataFactory.php       |  4 ++--
 .../Tests/Caster/ExceptionCasterTest.php         |  4 ++--
 .../VarDumper/Tests/Caster/StubCasterTest.php    |  4 ++--
 .../EventListener/AuditTrailListener.php         |  6 +++---
 60 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
index b481ab9569c2c..8880455cd9077 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -77,7 +77,7 @@ public function testFixManagersAutoMappingsWithTwoAutomappings()
             'SecondBundle' => 'My\SecondBundle',
         ];
 
-        $reflection = new \ReflectionClass(\get_class($this->extension));
+        $reflection = new \ReflectionClass($this->extension);
         $method = $reflection->getMethod('fixManagersAutoMappings');
 
         $method->invoke($this->extension, $emConfigs, $bundles);
@@ -165,7 +165,7 @@ public function testFixManagersAutoMappings(array $originalEm1, array $originalE
             'SecondBundle' => 'My\SecondBundle',
         ];
 
-        $reflection = new \ReflectionClass(\get_class($this->extension));
+        $reflection = new \ReflectionClass($this->extension);
         $method = $reflection->getMethod('fixManagersAutoMappings');
 
         $newEmConfigs = $method->invoke($this->extension, $emConfigs, $bundles);
@@ -182,7 +182,7 @@ public function testMappingTypeDetection()
     {
         $container = $this->createContainer();
 
-        $reflection = new \ReflectionClass(\get_class($this->extension));
+        $reflection = new \ReflectionClass($this->extension);
         $method = $reflection->getMethod('detectMappingType');
 
         // The ordinary fixtures contain annotation
@@ -326,7 +326,7 @@ public function testBundleAutoMapping(string $bundle, string $expectedType, stri
 
         $container = $this->createContainer([], [$bundle => $bundleClassName]);
 
-        $reflection = new \ReflectionClass(\get_class($this->extension));
+        $reflection = new \ReflectionClass($this->extension);
         $method = $reflection->getMethod('getMappingDriverBundleConfigDefaults');
 
         $this->assertSame(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
index b47b37c7398fc..00828ed32fc44 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -328,7 +328,7 @@ private function getCallableData(mixed $callable): array
 
             if (\is_object($callable[0])) {
                 $data['name'] = $callable[1];
-                $data['class'] = \get_class($callable[0]);
+                $data['class'] = $callable[0]::class;
             } else {
                 if (!str_starts_with($callable[1], 'parent::')) {
                     $data['name'] = $callable[1];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
index 555911a761506..9a3c5791b519f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -345,7 +345,7 @@ protected function describeCallable(mixed $callable, array $options = [])
 
             if (\is_object($callable[0])) {
                 $string .= "\n".sprintf('- Name: `%s`', $callable[1]);
-                $string .= "\n".sprintf('- Class: `%s`', \get_class($callable[0]));
+                $string .= "\n".sprintf('- Class: `%s`', $callable[0]::class);
             } else {
                 if (!str_starts_with($callable[1], 'parent::')) {
                     $string .= "\n".sprintf('- Name: `%s`', $callable[1]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
index 1fb75fbbf6c35..366523c304d48 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -602,7 +602,7 @@ private function formatCallable(mixed $callable): string
     {
         if (\is_array($callable)) {
             if (\is_object($callable[0])) {
-                return sprintf('%s::%s()', \get_class($callable[0]), $callable[1]);
+                return sprintf('%s::%s()', $callable[0]::class, $callable[1]);
             }
 
             return sprintf('%s::%s()', $callable[0], $callable[1]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
index 955a278d86ebb..241ac9ff4debd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -523,7 +523,7 @@ private function getCallableDocument(mixed $callable): \DOMDocument
 
             if (\is_object($callable[0])) {
                 $callableXML->setAttribute('name', $callable[1]);
-                $callableXML->setAttribute('class', \get_class($callable[0]));
+                $callableXML->setAttribute('class', $callable[0]::class);
             } else {
                 if (!str_starts_with($callable[1], 'parent::')) {
                     $callableXML->setAttribute('name', $callable[1]);
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php
index 757f61629f6f5..e8f58a74b08e6 100644
--- a/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php
+++ b/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php
@@ -230,7 +230,7 @@ private function formatCallable(mixed $callable): string
     {
         if (\is_array($callable)) {
             if (\is_object($callable[0])) {
-                return sprintf('%s::%s()', \get_class($callable[0]), $callable[1]);
+                return sprintf('%s::%s()', $callable[0]::class, $callable[1]);
             }
 
             return sprintf('%s::%s()', $callable[0], $callable[1]);
diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
index 96730d041c5fc..6f0e496477702 100644
--- a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
+++ b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
@@ -145,7 +145,7 @@ public function collect(Request $request, Response $response, \Throwable $except
             foreach ($decisionLog as $key => $log) {
                 $decisionLog[$key]['voter_details'] = [];
                 foreach ($log['voterDetails'] as $voterDetail) {
-                    $voterClass = \get_class($voterDetail['voter']);
+                    $voterClass = $voterDetail['voter']::class;
                     $classData = $this->hasVarDumper ? new ClassStub($voterClass) : $voterClass;
                     $decisionLog[$key]['voter_details'][] = [
                         'class' => $classData,
diff --git a/src/Symfony/Component/Console/Command/CompleteCommand.php b/src/Symfony/Component/Console/Command/CompleteCommand.php
index e65b334ce89db..ba3042e786278 100644
--- a/src/Symfony/Component/Console/Command/CompleteCommand.php
+++ b/src/Symfony/Component/Console/Command/CompleteCommand.php
@@ -134,12 +134,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $completionInput->bind($command->getDefinition());
 
                 if (CompletionInput::TYPE_OPTION_NAME === $completionInput->getCompletionType()) {
-                    $this->log('  Completing option names for the <comment>'.\get_class($command instanceof LazyCommand ? $command->getCommand() : $command).'</> command.');
+                    $this->log('  Completing option names for the <comment>'.($command instanceof LazyCommand ? $command->getCommand() : $command)::class.'</> command.');
 
                     $suggestions->suggestOptions($command->getDefinition()->getOptions());
                 } else {
                     $this->log([
-                        '  Completing using the <comment>'.\get_class($command instanceof LazyCommand ? $command->getCommand() : $command).'</> class.',
+                        '  Completing using the <comment>'.($command instanceof LazyCommand ? $command->getCommand() : $command)::class.'</> class.',
                         '  Completing <comment>'.$completionInput->getCompletionType().'</> for <comment>'.$completionInput->getCompletionName().'</>',
                     ]);
                     if (null !== $compval = $completionInput->getCompletionValue()) {
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index c178151688928..03c60dbccd96a 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -922,7 +922,7 @@ public function testRenderAnonymousException()
         $application = new Application();
         $application->setAutoExit(false);
         $application->register('foo')->setCode(function () {
-            throw new \InvalidArgumentException(sprintf('Dummy type "%s" is invalid.', \get_class(new class() { })));
+            throw new \InvalidArgumentException(sprintf('Dummy type "%s" is invalid.', (new class() { })::class));
         });
         $tester = new ApplicationTester($application);
 
@@ -948,7 +948,7 @@ public function testRenderExceptionStackTraceContainsRootException()
         $application = new Application();
         $application->setAutoExit(false);
         $application->register('foo')->setCode(function () {
-            throw new \InvalidArgumentException(sprintf('Dummy type "%s" is invalid.', \get_class(new class() { })));
+            throw new \InvalidArgumentException(sprintf('Dummy type "%s" is invalid.', (new class() { })::class));
         });
         $tester = new ApplicationTester($application);
 
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
index 54b60631fc7c4..11342815fcdea 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
@@ -174,7 +174,7 @@ private function findNodes(): array
             }
 
             if (!$container->hasDefinition($id)) {
-                $nodes[$id] = ['class' => str_replace('\\', '\\\\', \get_class($container->get($id))), 'attributes' => $this->options['node.instance']];
+                $nodes[$id] = ['class' => str_replace('\\', '\\\\', $container->get($id)::class), 'attributes' => $this->options['node.instance']];
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/ServiceLocator.php b/src/Symfony/Component/DependencyInjection/ServiceLocator.php
index 94dbfd0ad9018..3560ce3ccdd0e 100644
--- a/src/Symfony/Component/DependencyInjection/ServiceLocator.php
+++ b/src/Symfony/Component/DependencyInjection/ServiceLocator.php
@@ -87,7 +87,7 @@ private function createNotFoundException(string $id): NotFoundExceptionInterface
         }
 
         $class = debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT | \DEBUG_BACKTRACE_IGNORE_ARGS, 4);
-        $class = isset($class[3]['object']) ? \get_class($class[3]['object']) : null;
+        $class = isset($class[3]['object']) ? $class[3]['object']::class : null;
         $externalId = $this->externalId ?: $class;
 
         $msg = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
index 0c137a39a03ba..f1ef5f38b9e15 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -285,11 +285,11 @@ public function testDeepDefinitionsResolving()
         $this->process($container);
 
         $configurator = $container->getDefinition('sibling')->getConfigurator();
-        $this->assertSame('Symfony\Component\DependencyInjection\Definition', \get_class($configurator[0]));
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', $configurator[0]::class);
         $this->assertSame('parentClass', $configurator[0]->getClass());
 
         $factory = $container->getDefinition('sibling')->getFactory();
-        $this->assertSame('Symfony\Component\DependencyInjection\Definition', \get_class($factory[0]));
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', $factory[0]::class);
         $this->assertSame('parentClass', $factory[0]->getClass());
 
         $argument = $container->getDefinition('sibling')->getArgument(0);
@@ -297,11 +297,11 @@ public function testDeepDefinitionsResolving()
         $this->assertSame('parentClass', $argument->getClass());
 
         $properties = $container->getDefinition('sibling')->getProperties();
-        $this->assertSame('Symfony\Component\DependencyInjection\Definition', \get_class($properties['prop']));
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', $properties['prop']::class);
         $this->assertSame('parentClass', $properties['prop']->getClass());
 
         $methodCalls = $container->getDefinition('sibling')->getMethodCalls();
-        $this->assertSame('Symfony\Component\DependencyInjection\Definition', \get_class($methodCalls[0][1][0]));
+        $this->assertSame('Symfony\Component\DependencyInjection\Definition', $methodCalls[0][1][0]::class);
         $this->assertSame('parentClass', $methodCalls[0][1][0]->getClass());
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php
index 4d248306a0b7d..7c787b0f5a263 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php
@@ -79,9 +79,9 @@ public function testProcessValue()
         /** @var ServiceLocator $locator */
         $locator = $container->get('foo');
 
-        $this->assertSame(CustomDefinition::class, \get_class($locator('bar')));
-        $this->assertSame(CustomDefinition::class, \get_class($locator('baz')));
-        $this->assertSame(CustomDefinition::class, \get_class($locator('some.service')));
+        $this->assertSame(CustomDefinition::class, $locator('bar')::class);
+        $this->assertSame(CustomDefinition::class, $locator('baz')::class);
+        $this->assertSame(CustomDefinition::class, $locator('some.service')::class);
     }
 
     public function testServiceWithKeyOverwritesPreviousInheritedKey()
@@ -104,7 +104,7 @@ public function testServiceWithKeyOverwritesPreviousInheritedKey()
         /** @var ServiceLocator $locator */
         $locator = $container->get('foo');
 
-        $this->assertSame(TestDefinition2::class, \get_class($locator('bar')));
+        $this->assertSame(TestDefinition2::class, $locator('bar')::class);
     }
 
     public function testInheritedKeyOverwritesPreviousServiceWithKey()
@@ -128,8 +128,8 @@ public function testInheritedKeyOverwritesPreviousServiceWithKey()
         /** @var ServiceLocator $locator */
         $locator = $container->get('foo');
 
-        $this->assertSame(TestDefinition1::class, \get_class($locator('bar')));
-        $this->assertSame(TestDefinition2::class, \get_class($locator(16)));
+        $this->assertSame(TestDefinition1::class, $locator('bar')::class);
+        $this->assertSame(TestDefinition2::class, $locator(16)::class);
     }
 
     public function testBindingsAreCopied()
@@ -164,8 +164,8 @@ public function testTaggedServices()
         /** @var ServiceLocator $locator */
         $locator = $container->get('foo');
 
-        $this->assertSame(TestDefinition1::class, \get_class($locator('bar')));
-        $this->assertSame(TestDefinition2::class, \get_class($locator('baz')));
+        $this->assertSame(TestDefinition1::class, $locator('bar')::class);
+        $this->assertSame(TestDefinition2::class, $locator('baz')::class);
     }
 
     public function testIndexedByServiceIdWithDecoration()
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
index a45e8e1c7887e..c2f1353ff73d5 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
@@ -408,8 +408,8 @@ public function handleExceptionProvider(): array
             ['Uncaught Exception: foo', new \Exception('foo')],
             ['Uncaught Exception: foo', new class('foo') extends \RuntimeException {
             }],
-            ['Uncaught Exception: foo stdClass@anonymous bar', new \RuntimeException('foo '.\get_class(new class() extends \stdClass {
-            }).' bar')],
+            ['Uncaught Exception: foo stdClass@anonymous bar', new \RuntimeException('foo '.(new class() extends \stdClass {
+            })::class.' bar')],
             ['Uncaught Error: bar', new \Error('bar')],
             ['Uncaught ccc', new \ErrorException('ccc')],
         ];
diff --git a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
index 298fb673d30aa..dce4658c35edf 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
@@ -249,13 +249,13 @@ public function testAnonymousClass()
 
         $this->assertSame('RuntimeException@anonymous', $flattened->getClass());
 
-        $flattened->setClass(\get_class(new class('Oops') extends NotFoundHttpException {
-        }));
+        $flattened->setClass((new class('Oops') extends NotFoundHttpException {
+        })::class);
 
         $this->assertSame('Symfony\Component\HttpKernel\Exception\NotFoundHttpException@anonymous', $flattened->getClass());
 
-        $flattened = FlattenException::createFromThrowable(new \Exception(sprintf('Class "%s" blah.', \get_class(new class() extends \RuntimeException {
-        }))));
+        $flattened = FlattenException::createFromThrowable(new \Exception(sprintf('Class "%s" blah.', (new class() extends \RuntimeException {
+        })::class)));
 
         $this->assertSame('Class "RuntimeException@anonymous" blah.', $flattened->getMessage());
     }
diff --git a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
index 91f8a3dc836bc..86468b1f70de8 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
@@ -134,7 +134,7 @@ private function parseListener(array $listener): array
         }
 
         if (\is_object($listener[0])) {
-            return [get_debug_type($listener[0]), \get_class($listener[0])];
+            return [get_debug_type($listener[0]), $listener[0]::class];
         }
 
         return [$listener[0], $listener[0]];
diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
index afa283bbd5f15..0aadd4347a8f9 100644
--- a/src/Symfony/Component/Form/Command/DebugCommand.php
+++ b/src/Symfony/Component/Form/Command/DebugCommand.php
@@ -122,7 +122,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $object = $resolvedType->getOptionsResolver();
 
                 if (!$object->isDefined($option)) {
-                    $message = sprintf('Option "%s" is not defined in "%s".', $option, \get_class($resolvedType->getInnerType()));
+                    $message = sprintf('Option "%s" is not defined in "%s".', $option, $resolvedType->getInnerType()::class);
 
                     if ($alternatives = $this->findAlternatives($option, $object->getDefinedOptions())) {
                         if (1 === \count($alternatives)) {
diff --git a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
index 3441d017b15dd..43edf13d35b3b 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
@@ -169,7 +169,7 @@ protected function filterOptionsByDeprecated(ResolvedFormTypeInterface $type)
 
     private function getParentOptionsResolver(ResolvedFormTypeInterface $type): OptionsResolver
     {
-        $this->parents[$class = \get_class($type->getInnerType())] = [];
+        $this->parents[$class = $type->getInnerType()::class] = [];
 
         if (null !== $type->getParent()) {
             $optionsResolver = clone $this->getParentOptionsResolver($type->getParent());
diff --git a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
index d40561e468eb3..92d600389fe08 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
@@ -51,7 +51,7 @@ protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedF
         $this->sortOptions($formOptions);
 
         $data = [
-            'class' => \get_class($resolvedFormType->getInnerType()),
+            'class' => $resolvedFormType->getInnerType()::class,
             'block_prefix' => $resolvedFormType->getInnerType()->getBlockPrefix(),
             'options' => $formOptions,
             'parent_types' => $this->parents,
diff --git a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
index 439526af75b35..53151574bdeb0 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
@@ -84,7 +84,7 @@ protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedF
             'extension' => 'Extension options',
         ], $formOptions);
 
-        $this->output->title(sprintf('%s (Block prefix: "%s")', \get_class($resolvedFormType->getInnerType()), $resolvedFormType->getInnerType()->getBlockPrefix()));
+        $this->output->title(sprintf('%s (Block prefix: "%s")', $resolvedFormType->getInnerType()::class, $resolvedFormType->getInnerType()->getBlockPrefix()));
 
         if ($formOptions) {
             $this->output->table($tableHeaders, $this->buildTableRows($tableHeaders, $formOptions));
@@ -135,7 +135,7 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio
         }
         array_pop($rows);
 
-        $this->output->title(sprintf('%s (%s)', \get_class($options['type']), $options['option']));
+        $this->output->title(sprintf('%s (%s)', $options['type']::class, $options['option']));
         $this->output->table([], $rows);
     }
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
index 7b5cffe821441..e7ae6373bad01 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -135,7 +135,7 @@ public function configureOptions(OptionsResolver $resolver)
 
         // Derive "data_class" option from passed "data" object
         $dataClass = function (Options $options) {
-            return isset($options['data']) && \is_object($options['data']) ? \get_class($options['data']) : null;
+            return isset($options['data']) && \is_object($options['data']) ? $options['data']::class : null;
         };
 
         // Derive "empty_data" closure from "data_class" option
diff --git a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
index ec96dc6aedfb7..bb0d04f509c1b 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
@@ -58,7 +58,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->addEventSubscriber(new CsrfValidationListener(
                 $options['csrf_field_name'],
                 $options['csrf_token_manager'],
-                $options['csrf_token_id'] ?: ($builder->getName() ?: \get_class($builder->getType()->getInnerType())),
+                $options['csrf_token_id'] ?: ($builder->getName() ?: $builder->getType()->getInnerType()::class),
                 $options['csrf_message'],
                 $this->translator,
                 $this->translationDomain,
@@ -74,7 +74,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
     {
         if ($options['csrf_protection'] && !$view->parent && $options['compound']) {
             $factory = $form->getConfig()->getFormFactory();
-            $tokenId = $options['csrf_token_id'] ?: ($form->getName() ?: \get_class($form->getConfig()->getType()->getInnerType()));
+            $tokenId = $options['csrf_token_id'] ?: ($form->getName() ?: $form->getConfig()->getType()->getInnerType()::class);
             $data = (string) $options['csrf_token_manager']->getToken($tokenId);
 
             $csrfForm = $factory->createNamed($options['csrf_field_name'], HiddenType::class, $data, [
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
index 0a9145c624e68..0fca88069b066 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -232,7 +232,7 @@ protected function getCasters(): array
             FormInterface::class => function (FormInterface $f, array $a) {
                 return [
                     Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
-                    Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub(\get_class($f->getConfig()->getType()->getInnerType())),
+                    Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub($f->getConfig()->getType()->getInnerType()::class),
                 ];
             },
             FormView::class => StubCaster::cutInternals(...),
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php
index 028e8c06d033b..158cf321092b3 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php
@@ -27,7 +27,7 @@ public function extractConfiguration(FormInterface $form): array
         $data = [
             'id' => $this->buildId($form),
             'name' => $form->getName(),
-            'type_class' => \get_class($form->getConfig()->getType()->getInnerType()),
+            'type_class' => $form->getConfig()->getType()->getInnerType()::class,
             'synchronized' => $form->isSynchronized(),
             'passed_options' => [],
             'resolved_options' => [],
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/TestExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/TestExtension.ph
8000
p
index 3f7c4005fe112..5f6556ca6ec6f 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/TestExtension.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/TestExtension.php
@@ -31,7 +31,7 @@ public function __construct(FormTypeGuesserInterface $guesser)
 
     public function addType(FormTypeInterface $type)
     {
-        $this->types[\get_class($type)] = $type;
+        $this->types[$type::class] = $type;
     }
 
     public function getType($name): FormTypeInterface
diff --git a/src/Symfony/Component/Form/Tests/FormFactoryBuilderTest.php b/src/Symfony/Component/Form/Tests/FormFactoryBuilderTest.php
index fd6ef52bd5f78..818ab1b2b12b0 100644
--- a/src/Symfony/Component/Form/Tests/FormFactoryBuilderTest.php
+++ b/src/Symfony/Component/Form/Tests/FormFactoryBuilderTest.php
@@ -40,7 +40,7 @@ public function testAddType()
         $extensions = $registry->getExtensions();
 
         $this->assertCount(1, $extensions);
-        $this->assertTrue($extensions[0]->hasType(\get_class($this->type)));
+        $this->assertTrue($extensions[0]->hasType($this->type::class));
         $this->assertNull($extensions[0]->getTypeGuesser());
     }
 
diff --git a/src/Symfony/Component/HttpClient/RetryableHttpClient.php b/src/Symfony/Component/HttpClient/RetryableHttpClient.php
index d0c13165be59e..4dc54727565cc 100644
--- a/src/Symfony/Component/HttpClient/RetryableHttpClient.php
+++ b/src/Symfony/Component/HttpClient/RetryableHttpClient.php
@@ -73,7 +73,7 @@ public function request(string $method, string $url, array $options = []): Respo
                 if ('' !== $context->getInfo('primary_ip')) {
                     $shouldRetry = $this->strategy->shouldRetry($context, null, $exception);
                     if (null === $shouldRetry) {
-                        throw new \LogicException(sprintf('The "%s::shouldRetry()" method must not return null when called with an exception.', \get_class($this->strategy)));
+                        throw new \LogicException(sprintf('The "%s::shouldRetry()" method must not return null when called with an exception.', $this->strategy::class));
                     }
 
                     if (false === $shouldRetry) {
@@ -104,7 +104,7 @@ public function request(string $method, string $url, array $options = []): Respo
                 }
 
                 if (null === $shouldRetry = $this->strategy->shouldRetry($context, $content, null)) {
-                    throw new \LogicException(sprintf('The "%s::shouldRetry()" method must not return null when called with a body.', \get_class($this->strategy)));
+                    throw new \LogicException(sprintf('The "%s::shouldRetry()" method must not return null when called with a body.', $this->strategy::class));
                 }
 
                 if (false === $shouldRetry) {
diff --git a/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php b/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php
index 23dc7b6d9f0b0..db3ce095d9df6 100644
--- a/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php
@@ -204,7 +204,7 @@ public function testRetryNetworkError()
                 return $response;
             }, function (\Exception $exception) use (&$failureCallableCalled, $client) {
                 $this->assertSame(NetworkException::class, $exception::class);
-                $this->assertSame(TransportException::class, \get_class($exception->getPrevious()));
+                $this->assertSame(TransportException::class, $exception->getPrevious()::class);
                 $failureCallableCalled = true;
 
                 return $client->sendAsyncRequest($client->createRequest('GET', 'http://localhost:8057'));
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
index 52ac242141af6..9930cc08bfb77 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
@@ -73,7 +73,7 @@ public function getArguments(Request $request, callable $controller, \Reflection
             $representative = $controller;
 
             if (\is_array($representative)) {
-                $representative = sprintf('%s::%s()', \get_class($representative[0]), $representative[1]);
+                $representative = sprintf('%s::%s()', $representative[0]::class, $representative[1]);
             } elseif (\is_object($representative)) {
                 $representative = get_debug_type($representative);
             }
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/TraceableValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/TraceableValueResolver.php
index edc30e1806c13..0cb4703b29a16 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/TraceableValueResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/TraceableValueResolver.php
@@ -42,7 +42,7 @@ public function supports(Request $request, ArgumentMetadata $argument): bool
             return true;
         }
 
-        $method = \get_class($this->inner).'::'.__FUNCTION__;
+        $method = $this->inner::class.'::'.__FUNCTION__;
         $this->stopwatch->start($method, 'controller.argument_value_resolver');
 
         $return = $this->inner->supports($request, $argument);
@@ -54,7 +54,7 @@ public function supports(Request $request, ArgumentMetadata $argument): bool
 
     public function resolve(Request $request, ArgumentMetadata $argument): iterable
     {
-        $method = \get_class($this->inner).'::'.__FUNCTION__;
+        $method = $this->inner::class.'::'.__FUNCTION__;
         $this->stopwatch->start($method, 'controller.argument_value_resolver');
 
         yield from $this->inner->resolve($request, $argument);
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index ba921fa3b31f6..20a47dce86719 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -414,7 +414,7 @@ protected function initializeContainer()
                     $lock = null;
                 } elseif (!is_file($cachePath) || !\is_object($this->container = include $cachePath)) {
                     $this->container = null;
-                } elseif (!$oldContainer || \get_class($this->container) !== $oldContainer->name) {
+                } elseif (!$oldContainer || $this->container::class !== $oldContainer->name) {
                     flock($lock, \LOCK_UN);
                     fclose($lock);
                     $this->container->set('kernel', $this);
@@ -504,7 +504,7 @@ protected function initializeContainer()
         $this->container = require $cachePath;
         $this->container->set('kernel', $this);
 
-        if ($oldContainer && \get_class($this->container) !== $oldContainer->name) {
+        if ($oldContainer && $this->container::class !== $oldContainer->name) {
             // Because concurrent requests might still be using them,
             // old container files are not removed immediately,
             // but on a next dump of the container.
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
index 8ee11e8e18178..884c926b834bc 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
@@ -98,7 +98,7 @@ public function saveProfile(Profile $profile): bool
         }
 
         if (!($ret = $this->storage->write($profile)) && null !== $this->logger) {
-            $this->logger->warning('Unable to store the profiler information.', ['configured_storage' => \get_class($this->storage)]);
+            $this->logger->warning('Unable to store the profiler information.', ['configured_storage' => $this->storage::class]);
         }
 
         return $ret;
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index fa127326ee839..690268c75fd3c 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -99,7 +99,7 @@ public function testInitializeContainerClearsOldContainers()
         $kernel = new CustomProjectDirKernel();
         $kernel->boot();
 
-        $containerDir = __DIR__.'/Fixtures/var/cache/custom/'.substr(\get_class($kernel->getContainer()), 0, 16);
+        $containerDir = __DIR__.'/Fixtures/var/cache/custom/'.substr($kernel->getContainer()::class, 0, 16);
         $this->assertTrue(unlink(__DIR__.'/Fixtures/var/cache/custom/Symfony_Component_HttpKernel_Tests_CustomProjectDirKernelCustomDebugContainer.php.meta'));
         $this->assertFileExists($containerDir);
         $this->assertFileDoesNotExist($containerDir.'.legacy');
@@ -489,7 +489,7 @@ public function testKernelReset()
         $kernel = new CustomProjectDirKernel();
         $kernel->boot();
 
-        $containerClass = \get_class($kernel->getContainer());
+        $containerClass = $kernel->getContainer()::class;
         $containerFile = (new \ReflectionClass($kernel->getContainer()))->getFileName();
         unlink(__DIR__.'/Fixtures/var/cache/custom/Symfony_Component_HttpKernel_Tests_CustomProjectDirKernelCustomDebugContainer.php.meta');
 
diff --git a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php b/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php
index 5cfed46007b5e..a1bcfd9546d69 100644
--- a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php
+++ b/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php
@@ -50,7 +50,7 @@ public function onCheckPassport(CheckPassportEvent $event)
         }
 
         if (!$passport->hasBadge(PasswordCredentials::class)) {
-            throw new \LogicException(sprintf('LDAP authentication requires a passport containing password credentials, authenticator "%s" does not fulfill these requirements.', \get_class($event->getAuthenticator())));
+            throw new \LogicException(sprintf('LDAP authentication requires a passport containing password credentials, authenticator "%s" does not fulfill these requirements.', $event->getAuthenticator()::class));
         }
 
         /** @var PasswordCredentials $passwordCredentials */
diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
index a5fc509528249..a3a179ed54893 100644
--- a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
+++ b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
@@ -42,7 +42,7 @@ public function __construct(Connection|string $connOrUrl)
     {
         if ($connOrUrl instanceof Connection) {
             if (!$connOrUrl->getDatabasePlatform() instanceof PostgreSQLPlatform) {
-                throw new InvalidArgumentException(sprintf('The adapter "%s" does not support the "%s" platform.', __CLASS__, \get_class($connOrUrl->getDatabasePlatform())));
+                throw new InvalidArgumentException(sprintf('The adapter "%s" does not support the "%s" platform.', __CLASS__, $connOrUrl->getDatabasePlatform()::class));
             }
             $this->conn = $connOrUrl;
         } else {
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php
index 441d45f503966..7a224a5c0b2c1 100644
--- a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php
+++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php
@@ -39,7 +39,7 @@
 $worker = new Worker(['the_receiver' => $receiver], new class() implements MessageBusInterface {
     public function dispatch($envelope, array $stamps = []): Envelope
     {
-        echo 'Get envelope with message: '.get_class($envelope->getMessage())."\n";
+        echo 'Get envelope with message: '.$envelope->getMessage()::class."\n";
         echo sprintf("with stamps: %s\n", json_encode(array_keys($envelope->all()), \JSON_PRETTY_PRINT));
 
         sleep(30);
diff --git a/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php b/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php
index 3f502e78b215e..29854786e3888 100644
--- a/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php
+++ b/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php
@@ -86,7 +86,7 @@ protected function displaySingleMessage(Envelope $envelope, SymfonyStyle $io)
         $lastMessageDecodingFailedStamp = $envelope->last(MessageDecodingFailedStamp::class);
 
         $rows = [
-            ['Class', \get_class($envelope->getMessage())],
+            ['Class', $envelope->getMessage()::class],
         ];
 
         if (null !== $id = $this->getMessageId($envelope)) {
diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php
index 5a6eb1fb930d6..f64547b8f958c 100644
--- a/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php
+++ b/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php
@@ -99,7 +99,7 @@ private function listMessages(?string $failedTransportName, SymfonyStyle $io, in
         $this->phpSerializer?->acceptPhpIncompleteClass();
         try {
             foreach ($envelopes as $envelope) {
-                $currentClassName = \get_class($envelope->getMessage());
+                $currentClassName = $envelope->getMessage()::class;
 
                 if ($classFilter && $classFilter !== $currentClassName) {
                     continue;
@@ -151,7 +151,7 @@ private function listMessagesPerClass(?string $failedTransportName, SymfonyStyle
         $this->phpSerializer?->acceptPhpIncompleteClass();
         try {
             foreach ($envelopes as $envelope) {
-                $c = \get_class($envelope->getMessage());
+                $c = $envelope->getMessage()::class;
 
                 if (!isset($countPerClass[$c])) {
                     $countPerClass[$c] = [$c, 0];
diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
index 4b6c6a2860a48..6a56f93006a02 100644
--- a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
+++ b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
@@ -61,7 +61,7 @@ public function onMessageFailed(WorkerMessageFailedEvent $event)
         );
 
         $this->logger?->info('Rejected message {class} will be sent to the failure transport {transport}.', [
-            'class' => \get_class($envelope->getMessage()),
+            'class' => $envelope->getMessage()::class,
             'transport' => $failureSender::class,
         ]);
 
diff --git a/src/Symfony/Component/Messenger/Exception/HandlerFailedException.php b/src/Symfony/Component/Messenger/Exception/HandlerFailedException.php
index ddb66f31eb673..293b1c26bc80e 100644
--- a/src/Symfony/Component/Messenger/Exception/HandlerFailedException.php
+++ b/src/Symfony/Component/Messenger/Exception/HandlerFailedException.php
@@ -25,7 +25,7 @@ public function __construct(Envelope $envelope, array $exceptions)
     {
         $firstFailure = current($exceptions);
 
-        $message = sprintf('Handling "%s" failed: ', \get_class($envelope->getMessage()));
+        $message = sprintf('Handling "%s" failed: ', $envelope->getMessage()::class);
 
         parent::__construct(
             $message.(1 === \count($exceptions)
diff --git a/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php b/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
index 3e159117b2102..782355d99cd25 100644
--- a/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
+++ b/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
@@ -26,7 +26,7 @@ public function __construct(object $violatingMessage, ConstraintViolationListInt
         $this->violatingMessage = $violatingMessage;
         $this->violations = $violations;
 
-        parent::__construct(sprintf('Message of type "%s" failed validation.', \get_class($this->violatingMessage)));
+        parent::__construct(sprintf('Message of type "%s" failed validation.', $this->violatingMessage::class));
     }
 
     public function getViolatingMessage()
diff --git a/src/Symfony/Component/Messenger/Handler/HandlersLocator.php b/src/Symfony/Component/Messenger/Handler/HandlersLocator.php
index 2bb944e0a7a29..daeacdfa82dcf 100644
--- a/src/Symfony/Component/Messenger/Handler/HandlersLocator.php
+++ b/src/Symfony/Component/Messenger/Handler/HandlersLocator.php
@@ -63,7 +63,7 @@ public function getHandlers(Envelope $envelope): iterable
      */
     public static function listTypes(Envelope $envelope): array
     {
-        $class = \get_class($envelope->getMessage());
+        $class = $envelope->getMessage()::class;
 
         return [$class => $class]
             + class_parents($class)
diff --git a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php
index b56499d245a2d..c69022f1ef2bf 100644
--- a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php
+++ b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php
@@ -44,7 +44,7 @@ public function __construct(SendersLocatorInterface $sendersLocator, EventDispat
     public function handle(Envelope $envelope, StackInterface $stack): Envelope
     {
         $context = [
-            'class' => \get_class($envelope->getMessage()),
+            'class' => $envelope->getMessage()::class,
         ];
 
         $sender = null;
diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php
index d44d99ca00b39..443da0a67c9e7 100644
--- a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php
+++ b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php
@@ -101,7 +101,7 @@ public function encode(Envelope $envelope): array
 
         $envelope = $envelope->withoutStampsOfType(NonSendableStampInterface::class);
 
-        $headers = ['type' => \get_class($envelope->getMessage())] + $this->encodeStamps($envelope) + $this->getContentTypeHeader();
+        $headers = ['type' => $envelope->getMessage()::class] + $this->encodeStamps($envelope) + $this->getContentTypeHeader();
 
         return [
             'body' => $serializedMessageStamp
diff --git a/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php b/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php
index 028472561cce0..25a6111a39e83 100644
--- a/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php
+++ b/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php
@@ -43,7 +43,7 @@ public function onMessageFailed(WorkerMessageFailedEvent $event)
         }
         $envelope = $event->getEnvelope();
         $notification = Notification::fromThrowable($throwable)->importance(Notification::IMPORTANCE_HIGH);
-        $notification->subject(sprintf('A "%s" message has just failed: %s.', \get_class($envelope->getMessage()), $notification->getSubject()));
+        $notification->subject(sprintf('A "%s" message has just failed: %s.', $envelope->getMessage()::class, $notification->getSubject()));
 
         $this->notifier->send($notification, ...$this->notifier->getAdminRecipients());
     }
diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php
index 4ab19b1da8bd1..963a0f9a08327 100644
--- a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php
+++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php
@@ -146,14 +146,14 @@ private function executeAuthenticators(array $authenticators, Request $request):
             // eagerly (before token storage is initialized), whereas authenticate() is called
             // lazily (after initialization).
             if (false === $authenticator->supports($request)) {
-                $this->logger?->debug('Skipping the "{authenticator}" authenticator as it did not support the request.', ['authenticator' => \get_class($authenticator instanceof TraceableAuthenticator ? $authenticator->getAuthenticator() : $authenticator)]);
+                $this->logger?->debug('Skipping the "{authenticator}" authenticator as it did not support the request.', ['authenticator' => ($authenticator instanceof TraceableAuthenticator ? $authenticator->getAuthenticator() : $authenticator)::class]);
 
                 continue;
             }
 
             $response = $this->executeAuthenticator($authenticator, $request);
             if (null !== $response) {
-                $this->logger?->debug('The "{authenticator}" authenticator set the response. Any later authenticator will not be called', ['authenticator' => \get_class($authenticator instanceof TraceableAuthenticator ? $authenticator->getAuthenticator() : $authenticator)]);
+                $this->logger?->debug('The "{authenticator}" authenticator set the response. Any later authenticator will not be called', ['authenticator' => ($authenticator instanceof TraceableAuthenticator ? $authenticator->getAuthenticator() : $authenticator)::class]);
 
                 return $response;
             }
@@ -201,7 +201,7 @@ private function executeAuthenticator(AuthenticatorInterface $authenticator, Req
 
             $this->eventDispatcher->dispatch(new AuthenticationSuccessEvent($authenticatedToken), AuthenticationEvents::AUTHENTICATION_SUCCESS);
 
-            $this->logger?->info('Authenticator successful!', ['token' => $authenticatedToken, 'authenticator' => \get_class($authenticator instanceof TraceableAuthenticator ? $authenticator->getAuthenticator() : $authenticator)]);
+            $this->logger?->info('Authenticator successful!', ['token' => $authenticatedToken, 'authenticator' => ($authenticator instanceof TraceableAuthenticator ? $authenticator->getAuthenticator() : $authenticator)::class]);
         } catch (AuthenticationException $e) {
             // oh no! Authentication failed!
             $response = $this->handleAuthenticationFailure($e, $request, $authenticator, $passport);
@@ -218,7 +218,7 @@ private function executeAuthenticator(AuthenticatorInterface $authenticator, Req
             return $response;
         }
 
-        $this->logger?->debug('Authenticator set no success response: request continues.', ['authenticator' => \get_class($authenticator instanceof TraceableAuthenticator ? $authenticator->getAuthenticator() : $authenticator)]);
+        $this->logger?->debug('Authenticator set no success response: request continues.', ['authenticator' => ($authenticator instanceof TraceableAuthenticator ? $authenticator->getAuthenticator() : $authenticator)::class]);
 
         return null;
     }
@@ -243,7 +243,7 @@ private function handleAuthenticationSuccess(TokenInterface $authenticatedToken,
      */
     private function handleAuthenticationFailure(AuthenticationException $authenticationException, Request $request, AuthenticatorInterface $authenticator, ?Passport $passport): ?Response
     {
-        $this->logger?->info('Authenticator failed.', ['exception' => $authenticationException, 'authenticator' => \get_class($authenticator instanceof TraceableAuthenticator ? $authenticator->getAuthenticator() : $authenticator)]);
+        $this->logger?->info('Authenticator failed.', ['exception' => $authenticationException, 'authenticator' => ($authenticator instanceof TraceableAuthenticator ? $authenticator->getAuthenticator() : $authenticator)::class]);
 
         // Avoid leaking error details in case of invalid user (e.g. user not found or invalid account status)
         // to prevent user enumeration via response content comparison
@@ -253,7 +253,7 @@ private function handleAuthenticationFailure(AuthenticationException $authentica
 
         $response = $authenticator->onAuthenticationFailure($request, $authenticationException);
         if (null !== $response && null !== $this->logger) {
-            $this->logger->debug('The "{authenticator}" authenticator set the failure response.', ['authenticator' => \get_class($authenticator instanceof TraceableAuthenticator ? $authenticator->getAuthenticator() : $authenticator)]);
+            $this->logger->debug('The "{authenticator}" authenticator set the failure response.', ['authenticator' => ($authenticator instanceof TraceableAuthenticator ? $authenticator->getAuthenticator() : $authenticator)::class]);
         }
 
         $this->eventDispatcher->dispatch($loginFailureEvent = new LoginFailureEvent($authenticationException, $authenticator, $request, $response, $this->firewallName, $passport));
diff --git a/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticator.php
index 1ac91ce350452..8cf865bb9e13d 100644
--- a/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticator.php
+++ b/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticator.php
@@ -45,7 +45,7 @@ public function getInfo(): array
             'supports' => true,
             'passport' => $this->passport,
             'duration' => $this->duration,
-            'stub' => $this->stub ??= class_exists(ClassStub::class) ? new ClassStub(\get_class($this->authenticator)) : \get_class($this->authenticator),
+            'stub' => $this->stub ??= class_exists(ClassStub::class) ? new ClassStub($this->authenticator::class) : $this->authenticator::class,
         ];
     }
 
diff --git a/src/Symfony/Component/Security/Http/EventListener/RememberMeListener.php b/src/Symfony/Component/Security/Http/EventListener/RememberMeListener.php
index 86ca8ca8a63d6..ea4d5d561c7e2 100644
--- a/src/Symfony/Component/Security/Http/EventListener/RememberMeListener.php
+++ b/src/Symfony/Component/Security/Http/EventListener/RememberMeListener.php
@@ -47,7 +47,7 @@ public function onSuccessfulLogin(LoginSuccessEvent $event): void
     {
         $passport = $event->getPassport();
         if (!$passport->hasBadge(RememberMeBadge::class)) {
-            $this->logger?->debug('Remember me skipped: your authenticator does not support it.', ['authenticator' => \get_class($event->getAuthenticator())]);
+            $this->logger?->debug('Remember me skipped: your authenticator does not support it.', ['authenticator' => $event->getAuthenticator()::class]);
 
             return;
         }
diff --git a/src/Symfony/Component/Serializer/Debug/TraceableEncoder.php b/src/Symfony/Component/Serializer/Debug/TraceableEncoder.php
index 73c645c6c9e42..35fc462d06990 100644
--- a/src/Symfony/Component/Serializer/Debug/TraceableEncoder.php
+++ b/src/Symfony/Component/Serializer/Debug/TraceableEncoder.php
@@ -44,7 +44,7 @@ public function encode(mixed $data, string $format, array $context = []): string
         $time = microtime(true) - $startTime;
 
         if ($traceId = ($context[TraceableSerializer::DEBUG_TRACE_ID] ?? null)) {
-            $this->dataCollector->collectEncoding($traceId, \get_class($this->encoder), $time);
+            $this->dataCollector->collectEncoding($traceId, $this->encoder::class, $time);
         }
 
         return $encoded;
@@ -70,7 +70,7 @@ public function decode(string $data, string $format, array $context = []): mixed
         $time = microtime(true) - $startTime;
 
         if ($traceId = ($context[TraceableSerializer::DEBUG_TRACE_ID] ?? null)) {
-            $this->dataCollector->collectDecoding($traceId, \get_class($this->encoder), $time);
+            $this->dataCollector->collectDecoding($traceId, $this->encoder::class, $time);
         }
 
         return $encoded;
diff --git a/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php b/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php
index be214ce695ae5..fc801ff8ad085 100644
--- a/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php
+++ b/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php
@@ -46,7 +46,7 @@ public function normalize(mixed $object, string $format = null, array $context =
         $time = microtime(true) - $startTime;
 
         if ($traceId = ($context[TraceableSerializer::DEBUG_TRACE_ID] ?? null)) {
-            $this->dataCollector->collectNormalization($traceId, \get_class($this->normalizer), $time);
+            $this->dataCollector->collectNormalization($traceId, $this->normalizer::class, $time);
         }
 
         return $normalized;
@@ -72,7 +72,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         $time = microtime(true) - $startTime;
 
         if ($traceId = ($context[TraceableSerializer::DEBUG_TRACE_ID] ?? null)) {
-            $this->dataCollector->collectDenormalization($traceId, \get_class($this->normalizer), $time);
+            $this->dataCollector->collectDenormalization($traceId, $this->normalizer::class, $time);
         }
 
         return $denormalized;
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
index e3f13fc1f9ddd..d69ee8e40fa9f 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
@@ -50,11 +50,11 @@ public function testSerialize()
 
     public function testDeserialize()
     {
-        $obj = $this->normalizer->denormalize('foo', \get_class(new ScalarDummy()), 'xml');
+        $obj = $this->normalizer->denormalize('foo', (new ScalarDummy())::class, 'xml');
         $this->assertEquals('foo', $obj->xmlFoo);
         $this->assertNull($obj->foo);
 
-        $obj = $this->normalizer->denormalize('foo', \get_class(new ScalarDummy()), 'json');
+        $obj = $this->normalizer->denormalize('foo', (new ScalarDummy())::class, 'json');
         $this->assertEquals('foo', $obj->foo);
         $this->assertNull($obj->xmlFoo);
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
index f7b5dc88d4108..396a2a04b497b 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -736,10 +736,10 @@ public function testDoesntHaveIssuesWithUnionConstTypes()
         $normalizer = new ObjectNormalizer(null, null, null, $extractor);
         $serializer = new Serializer([new ArrayDenormalizer(), new DateTimeNormalizer(), $normalizer]);
 
-        $this->assertSame('bar', $serializer->denormalize(['foo' => 'bar'], \get_class(new class() {
+        $this->assertSame('bar', $serializer->denormalize(['foo' => 'bar'], (new class() {
             /** @var self::*|null */
             public $foo;
-        }))->foo);
+        })::class)->foo);
     }
 
     public function testExtractAttributesRespectsFormat()
diff --git a/src/Symfony/Component/Validator/ConstraintViolation.php b/src/Symfony/Component/Validator/ConstraintViolation.php
index 776bad6dc7d16..43bab60aa87df 100644
--- a/src/Symfony/Component/Validator/ConstraintViolation.php
+++ b/src/Symfony/Component/Validator/ConstraintViolation.php
@@ -66,7 +66,7 @@ public function __construct(string|\Stringable $message, ?string $messageTemplat
     public function __toString(): string
     {
         if (\is_object($this->root)) {
-            $class = 'Object('.\get_class($this->root).')';
+            $class = 'Object('.$this->root::class.')';
         } elseif (\is_array($this->root)) {
             $class = 'Array';
         } else {
diff --git a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php
index 24cb121e2b109..6de2ce54c796a 100644
--- a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php
@@ -35,7 +35,7 @@ public function validate
10000
(mixed $object, Constraint $constraint)
         } elseif (\is_array($method)) {
             if (!\is_callable($method)) {
                 if (isset($method[0]) && \is_object($method[0])) {
-                    $method[0] = \get_class($method[0]);
+                    $method[0] = $method[0]::class;
                 }
                 throw new ConstraintDefinitionException(json_encode($method).' targeted by Callback constraint is not a valid callable.');
             }
diff --git a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
index 4b3f791692fb6..acad1a1cccbff 100644
--- a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
+++ b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
@@ -90,7 +90,7 @@ protected function getCasters(): array
             FormInterface::class => function (FormInterface $f, array $a) {
                 return [
                     Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
-                    Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub(\get_class($f->getConfig()->getType()->getInnerType())),
+                    Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub($f->getConfig()->getType()->getInnerType()::class),
                     Caster::PREFIX_VIRTUAL.'data' => $f->getData(),
                 ];
             },
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
index bb2b19eef204e..6ae373f37f323 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
@@ -501,7 +501,7 @@ public function uploadedFileErrorProvider()
             ], '1'];
 
             // access FileValidator::factorizeSizes() private method to format max file size
-            $reflection = new \ReflectionClass(\get_class(new FileValidator()));
+            $reflection = new \ReflectionClass((new FileValidator()));
             $method = $reflection->getMethod('factorizeSizes');
             [, $limit, $suffix] = $method->invokeArgs(new FileValidator(), [0, UploadedFile::getMaxFilesize(), false]);
 
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php b/src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php
index e161af75af1bd..6e673ee9fbe8d 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/FakeMetadataFactory.php
@@ -25,7 +25,7 @@ public function getMetadataFor($class): MetadataInterface
 
         if (\is_object($class)) {
             $hash = spl_object_hash($class);
-            $class = \get_class($class);
+            $class = $class::class;
         }
 
         if (!\is_string($class)) {
@@ -49,7 +49,7 @@ public function hasMetadataFor($class): bool
 
         if (\is_object($class)) {
             $hash = spl_object_hash($class);
-            $class = \get_class($class);
+            $class = $class::class;
         }
 
         if (!\is_string($class)) {
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
index 7de30f4f01610..735457013caa4 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
@@ -251,8 +251,8 @@ public function testExcludeVerbosity()
 
     public function testAnonymous()
     {
-        $e = new \Exception(sprintf('Boo "%s" ba.', \get_class(new class('Foo') extends \Exception {
-        })));
+        $e = new \Exception(sprintf('Boo "%s" ba.', (new class('Foo') extends \Exception {
+        })::class));
 
         $expectedDump = <<<'EODUMP'
 Exception {
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/StubCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/StubCasterTest.php
index cd6876cdff22f..6ca2dad3a48d3 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/StubCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/StubCasterTest.php
@@ -192,8 +192,8 @@ public function testClassStubWithNotExistingMethod()
 
     public function testClassStubWithAnonymousClass()
     {
-        $var = [new ClassStub(\get_class(new class() extends \Exception {
-        }))];
+        $var = [new ClassStub((new class() extends \Exception {
+        })::class)];
 
         $cloner = new VarCloner();
         $dumper = new HtmlDumper();
diff --git a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php b/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
index 8a7ea374c90aa..de89269e7d4a9 100644
--- a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
+++ b/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
@@ -30,19 +30,19 @@ public function __construct(LoggerInterface $logger)
     public function onLeave(Event $event)
     {
         foreach ($event->getTransition()->getFroms() as $place) {
-            $this->logger->info(sprintf('Leaving "%s" for subject of class "%s" in workflow "%s".', $place, \get_class($event->getSubject()), $event->getWorkflowName()));
+            $this->logger->info(sprintf('Leaving "%s" for subject of class "%s" in workflow "%s".', $place, $event->getSubject()::class, $event->getWorkflowName()));
         }
     }
 
     public function onTransition(Event $event)
     {
-        $this->logger->info(sprintf('Transition "%s" for subject of class "%s" in workflow "%s".', $event->getTransition()->getName(), \get_class($event->getSubject()), $event->getWorkflowName()));
+        $this->logger->info(sprintf('Transition "%s" for subject of class "%s" in workflow "%s".', $event->getTransition()->getName(), $event->getSubject()::class, $event->getWorkflowName()));
     }
 
     public function onEnter(Event $event)
     {
         foreach ($event->getTransition()->getTos() as $place) {
-            $this->logger->info(sprintf('Entering "%s" for subject of class "%s" in workflow "%s".', $place, \get_class($event->getSubject()), $event->getWorkflowName()));
+            $this->logger->info(sprintf('Entering "%s" for subject of class "%s" in workflow "%s".', $place, $event->getSubject()::class, $event->getWorkflowName()));
         }
     }
 

From 24b7cdeaa4dfb5abdd6ac57e3b01ff6587345fad Mon Sep 17 00:00:00 2001
From: Mo Ismailzai <mo@ismailzai.com>
Date: Wed, 30 Nov 2022 13:08:47 -0800
Subject: [PATCH 019/475] Update UPGRADE-6.2.md

edit incorrect class name
---
 UPGRADE-6.2.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UPGRADE-6.2.md b/UPGRADE-6.2.md
index 3879850dc0abc..34fb385798259 100644
--- a/UPGRADE-6.2.md
+++ b/UPGRADE-6.2.md
@@ -85,7 +85,7 @@ Security
 
  * Add maximum username length enforcement of 4096 characters in `UserBadge` to
    prevent [session storage flooding](https://symfony.com/blog/cve-2016-4423-large-username-storage-in-session)
- * Deprecate the `Symfony\Component\Security\Core\Security` class and service, use `Symfony\Bundle\SecurityBundle\Security\Security` instead
+ * Deprecate the `Symfony\Component\Security\Core\Security` class and service, use `Symfony\Bundle\SecurityBundle\Security` instead
  * Passing empty username or password parameter when using `JsonLoginAuthenticator` is not supported anymore
  * Add `$lifetime` parameter to `LoginLinkHandlerInterface::createLoginLink()`
  * Change the signature of `TokenStorageInterface::setToken()` to `setToken(?TokenInterface $token)`

From 695d5ebe8c523875e2f455c0142c4b7e99062391 Mon Sep 17 00:00:00 2001
From: Simon Leblanc <contact@leblanc-simon.eu>
Date: Sat, 19 Nov 2022 23:41:33 +0100
Subject: [PATCH 020/475] [Notifier] Add iSendPro bridge

---
 .../FrameworkExtension.php                    |   2 +
 .../Resources/config/notifier_transports.php  |   5 +
 .../Notifier/Bridge/Isendpro/.gitattributes   |   4 +
 .../Notifier/Bridge/Isendpro/.gitignore       |   3 +
 .../Notifier/Bridge/Isendpro/CHANGELOG.md     |   7 ++
 .../Bridge/Isendpro/IsendproTransport.php     | 115 ++++++++++++++++++
 .../Isendpro/IsendproTransportFactory.php     |  40 ++++++
 .../Notifier/Bridge/Isendpro/LICENSE          |  19 +++
 .../Notifier/Bridge/Isendpro/README.md        |  27 ++++
 .../Tests/IsendproTransportFactoryTest.php    |  85 +++++++++++++
 .../Isendpro/Tests/IsendproTransportTest.php  | 108 ++++++++++++++++
 .../Notifier/Bridge/Isendpro/composer.json    |  37 ++++++
 .../Notifier/Bridge/Isendpro/phpunit.xml.dist |  31 +++++
 .../Exception/UnsupportedSchemeException.php  |   4 +
 .../UnsupportedSchemeExceptionTest.php        |   3 +
 src/Symfony/Component/Notifier/Transport.php  |   2 +
 16 files changed, 492 insertions(+)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Isendpro/.gitattributes
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Isendpro/.gitignore
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Isendpro/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Isendpro/IsendproTransport.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Isendpro/IsendproTransportFactory.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Isendpro/README.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Isendpro/composer.json
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Isendpro/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 93d5de007ef9b..6f013e0d70820 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -144,6 +144,7 @@
 use Symfony\Component\Notifier\Bridge\GoogleChat\GoogleChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Infobip\InfobipTransportFactory;
 use Symfony\Component\Notifier\Bridge\Iqsms\IqsmsTransportFactory;
+use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
 use Symfony\Component\Notifier\Bridge\KazInfoTeh\KazInfoTehTransportFactory;
 use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory;
@@ -2565,6 +2566,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             GoogleChatTransportFactory::class => 'notifier.transport_factory.google-chat',
             InfobipTransportFactory::class => 'notifier.transport_factory.infobip',
             IqsmsTransportFactory::class => 'notifier.transport_factory.iqsms',
+            IsendproTransportFactory::class => 'notifier.transport_factory.isendpro',
             KazInfoTehTransportFactory::class => 'notifier.transport_factory.kaz-info-teh',
             LightSmsTransportFactory::class => 'notifier.transport_factory.light-sms',
             LinkedInTransportFactory::class => 'notifier.transport_factory.linked-in',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
index 237ae18a59eb7..69d0bb01bc7bb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -30,6 +30,7 @@
 use Symfony\Component\Notifier\Bridge\GoogleChat\GoogleChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Infobip\InfobipTransportFactory;
 use Symfony\Component\Notifier\Bridge\Iqsms\IqsmsTransportFactory;
+use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
 use Symfony\Component\Notifier\Bridge\KazInfoTeh\KazInfoTehTransportFactory;
 use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory;
@@ -149,6 +150,10 @@
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
+        ->set('notifier.transport_factory.isendpro', IsendproTransportFactory::class)
+            ->parent('notifier.transport_factory.abstract')
+            ->tag('texter.transport_factory')
+
         ->set('notifier.transport_factory.mobyt', MobytTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/.gitattributes b/src/Symfony/Component/Notifier/Bridge/Isendpro/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/.gitignore b/src/Symfony/Component/Notifier/Bridge/Isendpro/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Isendpro/CHANGELOG.md
new file mode 100644
index 0000000000000..1f2c8f86cde72
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+ * Add the bridge
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/IsendproTransport.php b/src/Symfony/Component/Notifier/Bridge/Isendpro/IsendproTransport.php
new file mode 100644
index 0000000000000..938c30a2e5562
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/IsendproTransport.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Isendpro;
+
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Transport\AbstractTransport;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+final class IsendproTransport extends AbstractTransport
+{
+    protected const HOST = 'apirest.isendpro.com';
+
+    public function __construct(
+        #[\SensitiveParameter] private string $keyid,
+        private ?string $from = null,
+        private bool $noStop = false,
+        private bool $sandbox = false,
+        HttpClientInterface $client = null,
+        EventDispatcherInterface $dispatcher = null
+    ) {
+        parent::__construct($client, $dispatcher);
+    }
+
+    public function __toString(): string
+    {
+        if (null === $this->from) {
+            return sprintf('isendpro://%s?no_stop=%d&sandbox=%d', $this->getEndpoint(), (int) $this->noStop, (int) $this->sandbox);
+        }
+
+        return sprintf('isendpro://%s?from=%s&no_stop=%d&sandbox=%d', $this->getEndpoint(), $this->from, (int) $this->noStop, (int) $this->sandbox);
+    }
+
+    public function supports(MessageInterface $message): bool
+    {
+        return $message instanceof SmsMessage;
+    }
+
+    protected function doSend(MessageInterface $message): SentMessage
+    {
+        if (!$message instanceof SmsMessage) {
+            throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
+        }
+
+        $messageId = bin2hex(random_bytes(7));
+
+        $messageData = [
+            'keyid' => $this->keyid,
+            'num' => $message->getPhone(),
+            'sms' => $message->getSubject(),
+            'sandbox' => (int) $this->sandbox,
+            'tracker' => $messageId,
+        ];
+
+        if ($this->noStop) {
+            $messageData['nostop'] = '1';
+        }
+
+        if ('' !== $message->getFrom()) {
+            $messageData['emetteur'] = $message->getFrom();
+        } elseif (null !== $this->from) {
+            $messageData['emetteur'] = $this->from;
+        }
+
+        $response = $this->client->request('POST', 'https://'.$this->getEndpoint().'/cgi-bin/sms', [
+            'headers' => [
+                'Accept' => 'application/json',
+                'Cache-Control' => 'no-cache',
+            ],
+            'json' => $messageData,
+        ]);
+
+        try {
+            $statusCode = $response->getStatusCode();
+            $result = $response->toArray(false);
+            $details = $result['etat']['etat'][0] ?? [];
+            $detailsCode = (int) ($details['code'] ?? -1); // -1 is not a valid error code on iSendPro. But if code doesn't exist, it's a very strange error (not possible normally)
+
+            if (200 === $statusCode && 0 === $detailsCode) {
+                $sentMessage = new SentMessage($message, (string) $this);
+                $sentMessage->setMessageId($messageId);
+
+                return $sentMessage;
+            }
+
+            $errorMessage = sprintf('Unable to send the SMS: error %d.', $statusCode);
+            $detailsMessage = $details['message'] ?? null;
+
+            if ($detailsMessage) {
+                $errorMessage .= sprintf(' Details from iSendPro: %s: "%s".', $detailsCode, $detailsMessage);
+            }
+        } catch (TransportExceptionInterface $e) {
+            throw new TransportException('Could not reach the remote iSendPro server.', $response, 0, $e);
+        } catch (DecodingExceptionInterface $e) {
+            $errorMessage = sprintf('Unable to send the SMS: error %d. %s', $statusCode, $e->getMessage());
+        }
+
+        throw new TransportException($errorMessage, $response);
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/IsendproTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Isendpro/IsendproTransportFactory.php
new file mode 100644
index 0000000000000..c91583c17e4d5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/IsendproTransportFactory.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Isendpro;
+
+use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
+use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
+use Symfony\Component\Notifier\Transport\Dsn;
+
+final class IsendproTransportFactory extends AbstractTransportFactory
+{
+    public function create(Dsn $dsn): IsendproTransport
+    {
+        if ('isendpro' !== $dsn->getScheme()) {
+            throw new UnsupportedSchemeException($dsn, 'isendpro', $this->getSupportedSchemes());
+        }
+
+        $keyid = $this->getUser($dsn);
+        $from = $dsn->getOption('from', null);
+        $noStop = filter_var($dsn->getOption('no_stop', false), \FILTER_VALIDATE_BOOLEAN);
+        $sandbox = filter_var($dsn->getOption('sandbox', false), \FILTER_VALIDATE_BOOLEAN);
+        $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
+        $port = $dsn->getPort();
+
+        return (new IsendproTransport($keyid, $from, $noStop, $sandbox, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
+    }
+
+    protected function getSupportedSchemes(): array
+    {
+        return ['isendpro'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE b/src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE
new file mode 100644
index 0000000000000..0ece8964f767d
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/README.md b/src/Symfony/Component/Notifier/Bridge/Isendpro/README.md
new file mode 100644
index 0000000000000..6cf8368a90362
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/README.md
@@ -0,0 +1,27 @@
+iSendPro Notifier
+=================
+
+Provides [iSendPro](https://www.isendpro.com/) integration for Symfony Notifier.
+
+DSN example
+-----------
+
+```
+ISENDPRO_DSN=isendpro://ACCOUNT_KEY_ID@default?from=FROM&no_stop=NO_STOP&sandbox=SANDBOX
+```
+
+where:
+ - `ACCOUNT_KEY_ID` is your iSendPro API Key ID
+ - `FROM` is the alphanumeric originator for the message to appear to originate from  (optional)
+ - `NO_STOP` setting this parameter to "1" (default "0") allows removing "STOP clause" at the end of the message for non-commercial use (optional)
+ - `SANDBOX` setting this parameter to "1" (default "0") allows to use the notifier in sandbox mode (optional)
+
+See iSendPro documentation at https://www.isendpro.com/docs/#prerequis
+
+Resources
+---------
+
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportFactoryTest.php
new file mode 100644
index 0000000000000..ceda78493ccd0
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportFactoryTest.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Isendpro\Tests;
+
+use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
+use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+
+final class IsendproTransportFactoryTest extends TransportFactoryTestCase
+{
+    public function createFactory(): IsendproTransportFactory
+    {
+        return new IsendproTransportFactory();
+    }
+
+    public function createProvider(): iterable
+    {
+        yield [
+            'isendpro://host.test?no_stop=0&sandbox=0',
+            'isendpro://account_key_id@host.test',
+        ];
+
+        yield [
+            'isendpro://host.test?from=FROM&no_stop=0&sandbox=0',
+            'isendpro://account_key_id@host.test?from=FROM',
+        ];
+
+        yield [
+            'isendpro://host.test?from=FROM&no_stop=0&sandbox=0',
+            'isendpro://account_key_id@host.test?from=FROM&no_stop=0&sandbox=0',
+        ];
+
+        yield [
+            'isendpro://host.test?from=FROM&no_stop=0&sandbox=0',
+            'isendpro://account_key_id@host.test?from=FROM&no_stop=false&sandbox=0',
+        ];
+
+        yield [
+            'isendpro://host.test?from=FROM&no_stop=1&sandbox=0',
+            'isendpro://account_key_id@host.test?from=FROM&no_stop=1&sandbox=0',
+        ];
+
+        yield [
+            'isendpro://host.test?from=FROM&no_stop=1&sandbox=1',
+            'isendpro://account_key_id@host.test?from=FROM&no_stop=1&sandbox=true',
+        ];
+    }
+
+    public function supportsProvider(): iterable
+    {
+        yield [true, 'isendpro://account_key_id@host?from=FROM'];
+        yield [false, 'somethingElse://account_key_id@default'];
+    }
+
+    public function incompleteDsnProvider(): iterable
+    {
+        yield 'missing credentials' => ['isendpro://host?from=FROM'];
+    }
+
+    public function missingRequiredOptionProvider(): iterable
+    {
+        yield 'missing option: account_key_id' => ['isendpro://default'];
+    }
+
+    public function unsupportedSchemeProvider(): iterable
+    {
+        yield ['somethingElse://account_key_id@default'];
+    }
+
+    /**
+     * @dataProvider missingRequiredOptionProvider
+     */
+    public function testMissingRequiredOptionException(string $dsn, string $message = null)
+    {
+        $this->markTestIncomplete('The only required option is account key id, matched by incompleteDsnProvider');
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportTest.php
new file mode 100644
index 0000000000000..bcafe34c5a263
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportTest.php
@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Isendpro\Tests;
+
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransport;
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+final class IsendproTransportTest extends TransportTestCase
+{
+    public function createTransport(HttpClientInterface $client = null): IsendproTransport
+    {
+        return (new IsendproTransport('accound_key_id', null, false, false, $client ?? $this->createMock(HttpClientInterface::class)))->setHost('host.test');
+    }
+
+    public function toStringProvider(): iterable
+    {
+        yield ['isendpro://host.test?no_stop=0&sandbox=0', $this->createTransport()];
+    }
+
+    public function supportedMessagesProvider(): iterable
+    {
+        yield [new SmsMessage('0611223344', 'Hello!')];
+    }
+
+    public function unsupportedMessagesProvider(): iterable
+    {
+        yield [new ChatMessage('Hello!')];
+        yield [$this->createMock(MessageInterface::class)];
+    }
+
+    public function testSendWithErrorResponseThrowsTransportException()
+    {
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects($this->exactly(2))
+            ->method('getStatusCode')
+            ->willReturn(500);
+
+        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
+            return $response;
+        });
+
+        $transport = $this->createTransport($client);
+
+        $this->expectException(TransportException::class);
+        $this->expectExceptionMessage('Unable to send the SMS: error 500.');
+
+        $transport->send(new SmsMessage('phone', 'testMessage'));
+    }
+
+    public function testSendWithErrorResponseContainingDetailsThrowsTransportException()
+    {
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects($this->exactly(2))
+            ->method('getStatusCode')
+            ->willReturn(400);
+        $response->expects($this->once())
+            ->method('getContent')
+            ->willReturn(json_encode(['etat' => ['etat' => [['code' => '3', 'message' => 'Your credentials are incorrect']]]]));
+
+        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
+            return $response;
+        });
+
+        $transport = $this->createTransport($client);
+
+        $this->expectException(TransportException::class);
+        $this->expectExceptionMessage('Unable to send the SMS: error 400. Details from iSendPro: 3: "Your credentials are incorrect".');
+
+        $transport->send(new SmsMessage('phone', 'testMessage'));
+    }
+
+    public function testSendWithSuccessfulResponseDispatchesMessageEvent()
+    {
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects($this->exactly(2))
+            ->method('getStatusCode')
+            ->willReturn(200);
+        $response->expects($this->once())
+            ->method('getContent')
+            ->willReturn(json_encode(['etat' => ['etat' => [['code' => 0]]]]));
+
+        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
+            return $response;
+        });
+
+        $transport = $this->createTransport($client);
+
+        $sentMessage = $transport->send(new SmsMessage('phone', 'testMessage'));
+
+        $this->assertNotNull($sentMessage->getMessageId());
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/composer.json b/src/Symfony/Component/Notifier/Bridge/Isendpro/composer.json
new file mode 100644
index 0000000000000..77b078b6dcee1
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/composer.json
@@ -0,0 +1,37 @@
+{
+    "name": "symfony/isendpro-notifier",
+    "type": "symfony-notifier-bridge",
+    "description": "Symfony iSendPro Notifier Bridge",
+    "keywords": ["sms", "isendpro", "notifier"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        },
+        {
+            "name": "Simon Leblanc",
+            "email": "contact@leblanc-simon.eu"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/notifier": "^6.3"
+    },
+    "require-dev": {
+        "symfony/event-dispatcher": "^5.4|^6.0"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Isendpro\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Isendpro/phpunit.xml.dist
new file mode 100644
index 0000000000000..11bcba3a27793
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony iSendPro Notifier Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory>./</directory>
+        </include>
+        <exclude>
+            <directory>./Resources</directory>
+            <directory>./Tests</directory>
+            <directory>./vendor</directory>
+        </exclude>
+    </coverage>
+</phpunit>
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index f5b51bf9bfaaf..24232be0062a1 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -88,6 +88,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\Iqsms\IqsmsTransportFactory::class,
             'package' => 'symfony/iqsms-notifier',
         ],
+        'isendpro' => [
+            'class' => Bridge\Isendpro\IsendproTransportFactory::class,
+            'package' => 'symfony/isendpro-notifier',
+        ],
         'lightsms' => [
             'class' => Bridge\LightSms\LightSmsTransportFactory::class,
             'package' => 'symfony/light-sms-notifier',
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 8ffb0c1f79c4c..fdf37912231fa 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -29,6 +29,7 @@
 use Symfony\Component\Notifier\Bridge\GoogleChat\GoogleChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Infobip\InfobipTransportFactory;
 use Symfony\Component\Notifier\Bridge\Iqsms\IqsmsTransportFactory;
+use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
 use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory;
@@ -88,6 +89,7 @@ public static function setUpBeforeClass(): void
             GoogleChatTransportFactory::class => false,
             InfobipTransportFactory::class => false,
             IqsmsTransportFactory::class => false,
+            IsendproTransportFactory::class => false,
             LightSmsTransportFactory::class => false,
             LinkedInTransportFactory::class => false,
             MailjetTransportFactory::class => false,
@@ -152,6 +154,7 @@ public function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \Generat
         yield ['googlechat', 'symfony/google-chat-notifier'];
         yield ['infobip', 'symfony/infobip-notifier'];
         yield ['iqsms', 'symfony/iqsms-notifier'];
+        yield ['isendpro', 'symfony/isendpro-notifier'];
         yield ['lightsms', 'symfony/light-sms-notifier'];
         yield ['linkedin', 'symfony/linked-in-notifier'];
         yield ['mailjet', 'symfony/mailjet-notifier'];
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
index b9829b8ebdf68..c46bcc59bf2f3 100644
--- a/src/Symfony/Component/Notifier/Transport.php
+++ b/src/Symfony/Component/Notifier/Transport.php
@@ -27,6 +27,7 @@
 use Symfony\Component\Notifier\Bridge\Gitter\GitterTransportFactory;
 use Symfony\Component\Notifier\Bridge\Infobip\InfobipTransportFactory;
 use Symfony\Component\Notifier\Bridge\Iqsms\IqsmsTransportFactory;
+use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
 use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
@@ -88,6 +89,7 @@ final class Transport
         GitterTransportFactory::class,
         InfobipTransportFactory::class,
         IqsmsTransportFactory::class,
+        IsendproTransportFactory::class,
         LightSmsTransportFactory::class,
         MailjetTransportFactory::class,
         MattermostTransportFactory::class,

From 5dbe1fee4c0000a0517d07151e1d794a52cb0f8f Mon Sep 17 00:00:00 2001
From: gnito-org <70450336+gnito-org@users.noreply.github.com>
Date: Tue, 29 Nov 2022 15:49:56 -0400
Subject: [PATCH 021/475] [Notifier] Add Termii bridge

---
 .../FrameworkExtension.php                    |   2 +
 .../Resources/config/notifier_transports.php  |   5 +
 .../Notifier/Bridge/Termii/.gitattributes     |   4 +
 .../Notifier/Bridge/Termii/.gitignore         |   3 +
 .../Notifier/Bridge/Termii/CHANGELOG.md       |   7 ++
 .../Component/Notifier/Bridge/Termii/LICENSE  |  19 +++
 .../Notifier/Bridge/Termii/README.md          |  25 ++++
 .../Notifier/Bridge/Termii/TermiiOptions.php  | 104 +++++++++++++++
 .../Bridge/Termii/TermiiTransport.php         | 102 +++++++++++++++
 .../Bridge/Termii/TermiiTransportFactory.php  |  46 +++++++
 .../Tests/TermiiTransportFactoryTest.php      |  51 ++++++++
 .../Termii/Tests/TermiiTransportTest.php      | 119 ++++++++++++++++++
 .../Notifier/Bridge/Termii/composer.json      |  36 ++++++
 .../Notifier/Bridge/Termii/phpunit.xml.dist   |  31 +++++
 .../Exception/UnsupportedSchemeException.php  |   4 +
 .../UnsupportedSchemeExceptionTest.php        |   1 +
 src/Symfony/Component/Notifier/Transport.php  |   2 +
 17 files changed, 561 insertions(+)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Termii/.gitattributes
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Termii/.gitignore
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Termii/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Termii/LICENSE
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Termii/README.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Termii/TermiiOptions.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Termii/TermiiTransport.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Termii/TermiiTransportFactory.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Termii/composer.json
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Termii/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 93d5de007ef9b..d2a78ae49b8f7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -171,6 +171,7 @@
 use Symfony\Component\Notifier\Bridge\SpotHit\SpotHitTransportFactory;
 use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransportFactory;
 use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
+use Symfony\Component\Notifier\Bridge\Termii\TermiiTransportFactory;
 use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransport;
 use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
 use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory;
@@ -2592,6 +2593,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             SpotHitTransportFactory::class => 'notifier.transport_factory.spot-hit',
             TelegramTransportFactory::class => 'notifier.transport_factory.telegram',
             TelnyxTransportFactory::class => 'notifier.transport_factory.telnyx',
+            TermiiTransportFactory::class => 'notifier.transport_factory.termii',
             TurboSmsTransport::class => 'notifier.transport_factory.turbo-sms',
             TwilioTransportFactory::class => 'notifier.transport_factory.twilio',
             VonageTransportFactory::class => 'notifier.transport_factory.vonage',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
index 237ae18a59eb7..e88e7c1a20300 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -57,6 +57,7 @@
 use Symfony\Component\Notifier\Bridge\SpotHit\SpotHitTransportFactory;
 use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransportFactory;
 use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
+use Symfony\Component\Notifier\Bridge\Termii\TermiiTransportFactory;
 use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
 use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory;
@@ -287,5 +288,9 @@
         ->parent('notifier.transport_factory.abstract')
         ->tag('chatter.transport_factory')
 
+        ->set('notifier.transport_factory.termii', TermiiTransportFactory::class)
+            ->parent('notifier.transport_factory.abstract')
+            ->tag('texter.transport_factory')
+
     ;
 };
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/.gitattributes b/src/Symfony/Component/Notifier/Bridge/Termii/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/.gitignore b/src/Symfony/Component/Notifier/Bridge/Termii/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Termii/CHANGELOG.md
new file mode 100644
index 0000000000000..75d6a403c1334
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+* Add the bridge
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/LICENSE b/src/Symfony/Component/Notifier/Bridge/Termii/LICENSE
new file mode 100644
index 0000000000000..0ece8964f767d
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/README.md b/src/Symfony/Component/Notifier/Bridge/Termii/README.md
new file mode 100644
index 0000000000000..96bb8b0988a7c
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/README.md
@@ -0,0 +1,25 @@
+Termii Notifier
+=============
+
+Provides [Termii](https://www.termii.com) integration for Symfony Notifier.
+
+DSN example
+-----------
+
+```
+TERMII_DSN=termii://API_KEY@default?from=FROM&channel=CHANNEL
+```
+
+where:
+
+ - `API_KEY` is your Termii API key
+ - `FROM` is your sender
+ - `CHANNEL` is your channel (generic, dnd, whatsapp)
+
+Resources
+---------
+
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/TermiiOptions.php b/src/Symfony/Component/Notifier/Bridge/Termii/TermiiOptions.php
new file mode 100644
index 0000000000000..1d63a2fba57ac
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/TermiiOptions.php
@@ -0,0 +1,104 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Termii;
+
+use Symfony\Component\Notifier\Message\MessageOptionsInterface;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class TermiiOptions implements MessageOptionsInterface
+{
+    private array $options;
+
+    public function __construct(array $options = [])
+    {
+        $this->options = $options;
+    }
+
+    public function getChannel(): ?string
+    {
+        return $this->options['channel'] ?? null;
+    }
+
+    public function getFrom(): ?string
+    {
+        return $this->options['from'] ?? null;
+    }
+
+    public function getMediaCaption(): ?string
+    {
+        return $this->options['media_caption'] ?? null;
+    }
+
+    public function getMediaUrl(): ?string
+    {
+        return $this->options['media_url'] ?? null;
+    }
+
+    public function getRecipientId(): ?string
+    {
+        return $this->options['recipient_id'] ?? null;
+    }
+
+    public function getType(): ?string
+    {
+        return $this->options['type'] ?? null;
+    }
+
+    public function setChannel(string $channel): self
+    {
+        $this->options['channel'] = $channel;
+
+        return $this;
+    }
+
+    public function setFrom(string $from): self
+    {
+        $this->options['from'] = $from;
+
+        return $this;
+    }
+
+    public function setMediaCaption(string $mediaCaption): self
+    {
+        $this->options['media_caption'] = $mediaCaption;
+
+        return $this;
+    }
+
+    public function setMediaUrl(string $mediaUrl): self
+    {
+        $this->options['media_url'] = $mediaUrl;
+
+        return $this;
+    }
+
+    public function setRecipientId(string $id): self
+    {
+        $this->options['recipient_id'] = $id;
+
+        return $this;
+    }
+
+    public function setType(string $type): self
+    {
+        $this->options['type'] = $type;
+
+        return $this;
+    }
+
+    public function toArray(): array
+    {
+        return $this->options;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/TermiiTransport.php b/src/Symfony/Component/Notifier/Bridge/Termii/TermiiTransport.php
new file mode 100644
index 0000000000000..ef9d4af5c06d6
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/TermiiTransport.php
@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Termii;
+
+use Symfony\Component\HttpClient\Exception\JsonException;
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Transport\AbstractTransport;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class TermiiTransport extends AbstractTransport
+{
+    protected const HOST = 'api.ng.termii.com';
+
+    public function __construct(
+        #[\SensitiveParameter] private readonly string $apiKey,
+        private readonly string $from,
+        private readonly string $channel,
+        HttpClientInterface $client = null,
+        EventDispatcherInterface $dispatcher = null
+    ) {
+        parent::__construct($client, $dispatcher);
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('termii://%s?from=%s&channel=%s', $this->getEndpoint(), $this->from, $this->channel);
+    }
+
+    public function supports(MessageInterface $message): bool
+    {
+        return $message instanceof SmsMessage;
+    }
+
+    protected function doSend(MessageInterface $message): SentMessage
+    {
+        if (!$message instanceof SmsMessage) {
+            throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
+        }
+
+        $opts = $message->getOptions();
+        $options = $opts ? $opts->toArray() : [];
+        $options['api_key'] = $this->apiKey;
+        $options['sms'] = $message->getSubject();
+        $options['from'] = $options['from'] ?? $this->from;
+        $options['to'] = $message->getPhone();
+        $options['channel'] = $options['channel'] ?? $this->channel;
+        $options['type'] = $options['type'] ?? 'plain';
+
+        if (isset($options['media_url'])) {
+            $options['media']['url'] = $options['media_url'] ?? null;
+            $options['media']['caption'] = $options['media_caption'] ?? null;
+            unset($options['media_url'], $options['media_caption']);
+        }
+
+        if (!preg_match('/^[a-zA-Z0-9\s]{3,11}$/', $options['from']) && !preg_match('/^\+?[1-9]\d{1,14}$/', $options['from'])) {
+            throw new InvalidArgumentException(sprintf('The "From" number "%s" is not a valid phone number, shortcode, or alphanumeric sender ID.', $this->from));
+        }
+
+        $endpoint = sprintf('https://%s/api/sms/send', $this->getEndpoint());
+        $response = $this->client->request('POST', $endpoint, ['json' => array_filter($options)]);
+
+        try {
+            $statusCode = $response->getStatusCode();
+        } catch (TransportExceptionInterface $e) {
+            throw new TransportException('Could not reach the remote Termii server.', $response, 0, $e);
+        }
+
+        if (200 !== $statusCode) {
+            try {
+                $error = $response->toArray(false);
+            } catch (JsonException) {
+                $error['message'] = $response->getContent(false);
+            }
+            throw new TransportException(sprintf('Unable to send the SMS - status code: "%s": "%s".', $statusCode, $error['message'] ?? 'unknown error'), $response);
+        }
+
+        $success = $response->toArray(false);
+        $sentMessage = new SentMessage($message, (string) $this);
+        $sentMessage->setMessageId($success['message_id']);
+
+        return $sentMessage;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/TermiiTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Termii/TermiiTransportFactory.php
new file mode 100644
index 0000000000000..e8026f87ddcfd
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/TermiiTransportFactory.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Termii;
+
+use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
+use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
+use Symfony\Component\Notifier\Transport\Dsn;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class TermiiTransportFactory extends AbstractTransportFactory
+{
+    private const TRANSPORT_SCHEME = 'termii';
+
+    public function create(Dsn $dsn): TermiiTransport
+    {
+        $scheme = $dsn->getScheme();
+
+        if (self::TRANSPORT_SCHEME !== $scheme) {
+            throw new UnsupportedSchemeException($dsn, self::TRANSPORT_SCHEME, $this->getSupportedSchemes());
+        }
+
+        $apiKey = $this->getUser($dsn);
+        $from = $dsn->getRequiredOption('from');
+        $channel = $dsn->getRequiredOption('channel');
+        $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
+        $port = $dsn->getPort();
+
+        return (new TermiiTransport($apiKey, $from, $channel, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
+    }
+
+    protected function getSupportedSchemes(): array
+    {
+        return [self::TRANSPORT_SCHEME];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportFactoryTest.php
new file mode 100644
index 0000000000000..d831141c88f85
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportFactoryTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Termii\Tests;
+
+use Symfony\Component\Notifier\Bridge\Termii\TermiiTransportFactory;
+use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+
+final class TermiiTransportFactoryTest extends TransportFactoryTestCase
+{
+    public function createFactory(): TermiiTransportFactory
+    {
+        return new TermiiTransportFactory();
+    }
+
+    public function createProvider(): iterable
+    {
+        yield ['termii://host.test?from=0611223344&channel=generic', 'termii://apiKey@host.test?from=0611223344&channel=generic'];
+    }
+
+    public function incompleteDsnProvider(): iterable
+    {
+        yield 'missing auth ID' => ['termii://@default?from=FROM'];
+    }
+
+    public function missingRequiredOptionProvider(): iterable
+    {
+        yield 'missing option: from' => ['termii://apiKey@default?channel=generic'];
+        yield 'missing option: channel' => ['termii://apiKey@default?from=0611223344'];
+    }
+
+    public function supportsProvider(): iterable
+    {
+        yield [true, 'termii://apiKey@default?from=0611223344&channel=generic'];
+        yield [false, 'somethingElse://apiKey@default?from=0611223344&channel=generic'];
+    }
+
+    public function unsupportedSchemeProvider(): iterable
+    {
+        yield ['somethingElse://apiKey@default?from=0611223344&channel=generic'];
+        yield ['somethingElse://apiKey@default']; // missing "from" option
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportTest.php
new file mode 100644
index 0000000000000..8d140f6637de7
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportTest.php
@@ -0,0 +1,119 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Termii\Tests;
+
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\Notifier\Bridge\Termii\TermiiTransport;
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+final class TermiiTransportTest extends TransportTestCase
+{
+    public function createTransport(HttpClientInterface $client = null, string $from = 'from'): TermiiTransport
+    {
+        return new TermiiTransport('apiKey', $from, 'generic', $client ?? $this->createMock(HttpClientInterface::class));
+    }
+
+    public function invalidFromProvider(): iterable
+    {
+        yield 'too short' => ['aa'];
+        yield 'too long' => ['abcdefghijkl'];
+        yield 'no zero at start if phone number' => ['+0'];
+        yield 'phone number too short' => ['+1'];
+    }
+
+    public function supportedMessagesProvider(): iterable
+    {
+        yield [new SmsMessage('0611223344', 'Hello!')];
+    }
+
+    /**
+     * @dataProvider invalidFromProvider
+     */
+    public function testInvalidArgumentExceptionIsThrownIfFromIsInvalid(string $from)
+    {
+        $transport = $this->createTransport(null, $from);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(sprintf('The "From" number "%s" is not a valid phone number, shortcode, or alphanumeric sender ID.', $from));
+
+        $transport->send(new SmsMessage('+33612345678', 'Hello!'));
+    }
+
+    /**
+     * @dataProvider validFromProvider
+     */
+    public function testNoInvalidArgumentExceptionIsThrownIfFromIsValid(string $from)
+    {
+        $message = new SmsMessage('+33612345678', 'Hello!');
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects(self::exactly(2))->method('getStatusCode')->willReturn(200);
+        $response->expects(self::once())->method('getContent')->willReturn(json_encode(['message' => 'Successfully sent', 'message_id' => 'foo', 'balance' => 9, 'user' => 'Foo Bar']));
+        $client = new MockHttpClient(function (string $method, string $url) use ($response): ResponseInterface {
+            self::assertSame('POST', $method);
+            self::assertSame('https://api.ng.termii.com/api/sms/send', $url);
+
+            return $response;
+        }
+        );
+        $transport = $this->createTransport($client, $from);
+        $sentMessage = $transport->send($message);
+
+        self::assertSame('foo', $sentMessage->getMessageId());
+    }
+
+    public function toStringProvider(): iterable
+    {
+        yield ['termii://api.ng.termii.com?from=from&channel=generic', $this->createTransport()];
+    }
+
+    public function unsupportedMessagesProvider(): iterable
+    {
+        yield [new ChatMessage('Hello!')];
+        yield [$this->createMock(MessageInterface::class)];
+    }
+
+    public function validFromProvider(): iterable
+    {
+        yield ['abc'];
+        yield ['abcd'];
+        yield ['abcde'];
+        yield ['abcdef'];
+        yield ['abcdefg'];
+        yield ['abcdefgh'];
+        yield ['abcdefghi'];
+        yield ['abcdefghij'];
+        yield ['abcdefghijk'];
+        yield ['abcdef ghij'];
+        yield [' abcdefghij'];
+        yield ['abcdefghij '];
+        yield ['+11'];
+        yield ['+112'];
+        yield ['+1123'];
+        yield ['+11234'];
+        yield ['+112345'];
+        yield ['+1123456'];
+        yield ['+11234567'];
+        yield ['+112345678'];
+        yield ['+1123456789'];
+        yield ['+11234567891'];
+        yield ['+112345678912'];
+        yield ['+1123456789123'];
+        yield ['+11234567891234'];
+        yield ['+112345678912345'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/composer.json b/src/Symfony/Component/Notifier/Bridge/Termii/composer.json
new file mode 100644
index 0000000000000..b09c504cfbf0a
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "symfony/termii-notifier",
+    "type": "symfony-notifier-bridge",
+    "description": "Symfony Termii Notifier Bridge",
+    "keywords": [
+        "termii",
+        "notifier"
+    ],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "gnito-org",
+            "homepage": "https://github.com/gnito-org"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/notifier": "^6.3"
+    },
+    "require-dev": {
+        "symfony/event-dispatcher": "^5.4|^6.0"
+    },
+    "autoload": {
+        "psr-4": {"Symfony\\Component\\Notifier\\Bridge\\Termii\\": ""},
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Termii/phpunit.xml.dist
new file mode 100644
index 0000000000000..33dc8c12fe5da
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony Termii Notifier Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index f5b51bf9bfaaf..7151c25870434 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -196,6 +196,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\Telnyx\TelnyxTransportFactory::class,
             'package' => 'symfony/telnyx-notifier',
         ],
+        'termii' => [
+            'class' => Bridge\Termii\TermiiTransportFactory::class,
+            'package' => 'symfony/termii-notifier',
+        ],
         'turbosms' => [
             'class' => Bridge\TurboSms\TurboSmsTransportFactory::class,
             'package' => 'symfony/turbo-sms-notifier',
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 8ffb0c1f79c4c..a66ef56887246 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -177,6 +177,7 @@ public function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \Generat
         yield ['spothit', 'symfony/spot-hit-notifier'];
         yield ['telegram', 'symfony/telegram-notifier'];
         yield ['telnyx', 'symfony/telnyx-notifier'];
+        yield ['termii', 'symfony/termii-notifier'];
         yield ['turbosms', 'symfony/turbo-sms-notifier'];
         yield ['twilio', 'symfony/twilio-notifier'];
         yield ['zendesk', 'symfony/zendesk-notifier'];
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
index b9829b8ebdf68..3141cb1cf2b02 100644
--- a/src/Symfony/Component/Notifier/Transport.php
+++ b/src/Symfony/Component/Notifier/Transport.php
@@ -49,6 +49,7 @@
 use Symfony\Component\Notifier\Bridge\SmsFactor\SmsFactorTransportFactory;
 use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransportFactory;
 use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
+use Symfony\Component\Notifier\Bridge\Termii\TermiiTr
10000
ansportFactory;
 use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
 use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory;
@@ -110,6 +111,7 @@ final class Transport
         SmsFactorTransportFactory::class,
         TelegramTransportFactory::class,
         TelnyxTransportFactory::class,
+        TermiiTransportFactory::class,
         TurboSmsTransportFactory::class,
         TwilioTransportFactory::class,
         VonageTransportFactory::class,

From c67274c0dcf08f8b455f1895b9259f9f93501782 Mon Sep 17 00:00:00 2001
From: gnito-org <70450336+gnito-org@users.noreply.github.com>
Date: Tue, 29 Nov 2022 15:18:16 -0400
Subject: [PATCH 022/475] [Notifier] Add RingCentral bridge

---
 .../FrameworkExtension.php                    |   2 +
 .../Resources/config/notifier_transports.php  |   9 +-
 .../Bridge/RingCentral/.gitattributes         |   4 +
 .../Notifier/Bridge/RingCentral/.gitignore    |   3 +
 .../Notifier/Bridge/RingCentral/CHANGELOG.md  |   7 ++
 .../Notifier/Bridge/RingCentral/LICENSE       |  19 +++
 .../Notifier/Bridge/RingCentral/README.md     |  24 ++++
 .../Bridge/RingCentral/RingCentralOptions.php | 116 ++++++++++++++++++
 .../RingCentral/RingCentralTransport.php      |  96 +++++++++++++++
 .../RingCentralTransportFactory.php           |  43 +++++++
 .../Tests/RingCentralTransportFactoryTest.php |  50 ++++++++
 .../Tests/RingCentralTransportTest.php        | 105 ++++++++++++++++
 .../Notifier/Bridge/RingCentral/composer.json |  36 ++++++
 .../Bridge/RingCentral/phpunit.xml.dist       |  31 +++++
 .../Exception/UnsupportedSchemeException.php  |   4 +
 .../UnsupportedSchemeExceptionTest.php        |   1 +
 src/Symfony/Component/Notifier/Transport.php  |   2 +
 17 files changed, 550 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/RingCentral/.gitattributes
 create mode 100644 src/Symfony/Component/Notifier/Bridge/RingCentral/.gitignore
 create mode 100644 src/Symfony/Component/Notifier/Bridge/RingCentral/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE
 create mode 100644 src/Symfony/Component/Notifier/Bridge/RingCentral/README.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/RingCentral/RingCentralOptions.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/RingCentral/RingCentralTransport.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/RingCentral/RingCentralTransportFactory.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/RingCentral/composer.json
 create mode 100644 src/Symfony/Component/Notifier/Bridge/RingCentral/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 7043ace6956d2..db3bfd0c101e3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -159,6 +159,7 @@
 use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
 use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
+use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory as SendinblueNotifierTransportFactory;
@@ -2583,6 +2584,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             OneSignalTransportFactory::class => 'notifier.transport_factory.one-signal',
             OrangeSmsTransportFactory::class => 'notifier.transport_factory.orange-sms',
             OvhCloudTransportFactory::class => 'notifier.transport_factory.ovh-cloud',
+            RingCentralTransportFactory::class => 'notifier.transport_factory.ring-central',
             RocketChatTransportFactory::class => 'notifier.transport_factory.rocket-chat',
             SendberryTransportFactory::class => 'notifier.transport_factory.sendberry',
             SendinblueNotifierTransportFactory::class => 'notifier.transport_factory.sendinblue',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
index 80fd112574b3e..2040d6dbc6dac 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -45,6 +45,7 @@
 use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
 use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
+use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory;
@@ -295,12 +296,16 @@
             ->tag('chatter.transport_factory')
 
         ->set('notifier.transport_factory.chatwork', ChatworkTransportFactory::class)
-        ->parent('notifier.transport_factory.abstract')
-        ->tag('chatter.transport_factory')
+            ->parent('notifier.transport_factory.abstract')
+            ->tag('chatter.transport_factory')
 
         ->set('notifier.transport_factory.termii', TermiiTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
+        ->set('notifier.transport_factory.ring-central', RingCentralTransportFactory::class)
+            ->parent('notifier.transport_factory.abstract')
+            ->tag('texter.transport_factory')
+
     ;
 };
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/.gitattributes b/src/Symfony/Component/Notifier/Bridge/RingCentral/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/.gitignore b/src/Symfony/Component/Notifier/Bridge/RingCentral/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/RingCentral/CHANGELOG.md
new file mode 100644
index 0000000000000..75d6a403c1334
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+* Add the bridge
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE b/src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE
new file mode 100644
index 0000000000000..0ece8964f767d
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/README.md b/src/Symfony/Component/Notifier/Bridge/RingCentral/README.md
new file mode 100644
index 0000000000000..c12cb0aa0e7fc
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/README.md
@@ -0,0 +1,24 @@
+Ring Central Notifier
+=====================
+
+Provides [Ring Central](https://www.ringcentral.com) integration for Symfony Notifier.
+
+DSN example
+-----------
+
+```
+RINGCENTRAL_DSN=ringcentral://API_TOKEN@default?from=FROM
+```
+
+where:
+
+ - `API_TOKEN` is your Ring Central OAuth 2 token
+ - `FROM` is your sender
+
+Resources
+---------
+
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/RingCentralOptions.php b/src/Symfony/Component/Notifier/Bridge/RingCentral/RingCentralOptions.php
new file mode 100644
index 0000000000000..f496feb9a9e59
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/RingCentralOptions.php
@@ -0,0 +1,116 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\RingCentral;
+
+use Symfony\Component\Notifier\Message\MessageOptionsInterface;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class RingCentralOptions implements MessageOptionsInterface
+{
+    private array $options;
+
+    public function __construct(array $options = [])
+    {
+        $this->options = $options;
+    }
+
+    public function getCountryCallingCode(): ?string
+    {
+        return $this->options['country_calling_code'] ?? null;
+    }
+
+    public function getCountryId(): ?string
+    {
+        return $this->options['country_id'] ?? null;
+    }
+
+    public function getCountryIsoCode(): ?string
+    {
+        return $this->options['country_iso_code'] ?? null;
+    }
+
+    public function getCountryName(): ?string
+    {
+        return $this->options['country_name'] ?? null;
+    }
+
+    public function getCountryUri(): ?string
+    {
+        return $this->options['country_uri'] ?? null;
+    }
+
+    public function getFrom(): ?string
+    {
+        return $this->options['from'] ?? null;
+    }
+
+    public function getRecipientId(): ?string
+    {
+        return $this->options['recipient_id'] ?? null;
+    }
+
+    public function setCountryCallingCode(string $countryCallingCode): self
+    {
+        $this->options['country_calling_code'] = $countryCallingCode;
+
+        return $this;
+    }
+
+    public function setCountryId(string $countryId): self
+    {
+        $this->options['country_id'] = $countryId;
+
+        return $this;
+    }
+
+    public function setCountryIsoCode(string $countryIsoCode): self
+    {
+        $this->options['country_iso_code'] = $countryIsoCode;
+
+        return $this;
+    }
+
+    public function setCountryName(string $countryName): self
+    {
+        $this->options['country_name'] = $countryName;
+
+        return $this;
+    }
+
+    public function setCountryUri(string $countryUri): self
+    {
+        $this->options['country_uri'] = $countryUri;
+
+        return $this;
+    }
+
+    public function setFrom(string $from): self
+    {
+        $this->options['from'] = $from;
+
+        return $this;
+    }
+
+    public function setRecipientId(string $id): self
+    {
+        $this->options['recipient_id'] = $id;
+
+        return $this;
+    }
+
+    public function toArray(): array
+    {
+        return $this->options;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/RingCentralTransport.php b/src/Symfony/Component/Notifier/Bridge/RingCentral/RingCentralTransport.php
new file mode 100644
index 0000000000000..add1a8b2a7ce2
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/RingCentralTransport.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\RingCentral;
+
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Transport\AbstractTransport;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class RingCentralTransport extends AbstractTransport
+{
+    protected const HOST = 'platform.ringcentral.com';
+
+    public function __construct(
+        #[\SensitiveParameter] private readonly string $apiToken,
+        private readonly string $from,
+        HttpClientInterface $client = null,
+        EventDispatcherInterface $dispatcher = null
+    ) {
+        parent::__construct($client, $dispatcher);
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('ringcentral://%s?from=%s', $this->getEndpoint(), $this->from);
+    }
+
+    public function supports(MessageInterface $message): bool
+    {
+        return $message instanceof SmsMessage;
+    }
+
+    protected function doSend(MessageInterface $message): SentMessage
+    {
+        if (!$message instanceof SmsMessage) {
+            throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
+        }
+
+        $opts = $message->getOptions();
+        $options = $opts ? $opts->toArray() : [];
+        $options['text'] = $message->getSubject();
+        $options['from']['phoneNumber'] = $options['from'] ?? $this->from;
+        $options['to'][]['phoneNumber'] = $message->getPhone();
+
+        if (isset($options['country_id'])) {
+            $options['country']['id'] = $options['country_id'] ?? null;
+            $options['country']['uri'] = $options['country_uri'] ?? null;
+            $options['country']['name'] = $options['country_name'] ?? null;
+            $options['country']['isoCode'] = $options['country_iso_code'] ?? null;
+            $options['country']['callingCode'] = $options['country_calling_code'] ?? null;
+            unset($options['country_id'], $options['country_uri'], $options['country_name'], $options['country_iso_code'], $options['country_calling_code']);
+        }
+
+        if (!preg_match('/^\+[1-9]\d{1,14}$/', $options['from']['phoneNumber'])) {
+            throw new InvalidArgumentException(sprintf('The "From" number "%s" is not a valid phone number. Phone number must be in E.164 format.', $this->from));
+        }
+
+        $endpoint = sprintf('https://%s/restapi/v1.0/account/~/extension/~/sms', $this->getEndpoint());
+        $response = $this->client->request('POST', $endpoint, ['auth_bearer' => $this->apiToken, 'json' => array_filter($options)]);
+
+        try {
+            $statusCode = $response->getStatusCode();
+        } catch (TransportExceptionInterface $e) {
+            throw new TransportException('Could not reach the remote Ring Central server.', $response, 0, $e);
+        }
+
+        if (200 !== $statusCode) {
+            $error = $response->toArray(false);
+            throw new TransportException(sprintf('Unable to send the SMS - "%s".', $error['message'] ?? $error['error_description'] ?? $error['description'] ?? 'unknown failure'), $response);
+        }
+
+        $success = $response->toArray(false);
+        $sentMessage = new SentMessage($message, (string) $this);
+        $sentMessage->setMessageId($success['id']);
+
+        return $sentMessage;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/RingCentralTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/RingCentral/RingCentralTransportFactory.php
new file mode 100644
index 0000000000000..3859db57b0471
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/RingCentralTransportFactory.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\RingCentral;
+
+use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
+use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
+use Symfony\Component\Notifier\Transport\Dsn;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class RingCentralTransportFactory extends AbstractTransportFactory
+{
+    private const TRANSPORT_SCHEME = 'ringcentral';
+
+    public function create(Dsn $dsn): RingCentralTransport
+    {
+        $scheme = $dsn->getScheme();
+        if (self::TRANSPORT_SCHEME !== $scheme) {
+            throw new UnsupportedSchemeException($dsn, self::TRANSPORT_SCHEME, $this->getSupportedSchemes());
+        }
+        $apiKey = $this->getUser($dsn);
+        $from = $dsn->getRequiredOption('from');
+        $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
+        $port = $dsn->getPort();
+
+        return (new RingCentralTransport($apiKey, $from, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
+    }
+
+    protected function getSupportedSchemes(): array
+    {
+        return [self::TRANSPORT_SCHEME];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportFactoryTest.php
new file mode 100644
index 0000000000000..636aed7e70fd8
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportFactoryTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\RingCentral\Tests;
+
+use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
+use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+
+final class RingCentralTransportFactoryTest extends TransportFactoryTestCase
+{
+    public function createFactory(): RingCentralTransportFactory
+    {
+        return new RingCentralTransportFactory();
+    }
+
+    public function createProvider(): iterable
+    {
+        yield ['ringcentral://host.test?from=0611223344', 'ringcentral://apiToken@host.test?from=0611223344'];
+    }
+
+    public function incompleteDsnProvider(): iterable
+    {
+        yield 'missing auth token' => ['ringcentral://@default?from=FROM'];
+    }
+
+    public function missingRequiredOptionProvider(): iterable
+    {
+        yield 'missing option: from' => ['ringcentral://apiToken@default'];
+    }
+
+    public function supportsProvider(): iterable
+    {
+        yield [true, 'ringcentral://apiToken@default?from=0611223344'];
+        yield [false, 'somethingElse://apiToken@default?from=0611223344'];
+    }
+
+    public function unsupportedSchemeProvider(): iterable
+    {
+        yield ['somethingElse://apiToken@default?from=0611223344'];
+        yield ['somethingElse://apiToken@default']; // missing "from" option
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportTest.php b/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportTest.php
new file mode 100644
index 0000000000000..0dbc4d8c1a7ee
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportTest.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\RingCentral\Tests;
+
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransport;
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+final class RingCentralTransportTest extends TransportTestCase
+{
+    public function createTransport(HttpClientInterface $client = null, string $from = 'from'): RingCentralTransport
+    {
+        return new RingCentralTransport('apiToken', $from, $client ?? $this->createMock(HttpClientInterface::class));
+    }
+
+    public function invalidFromProvider(): iterable
+    {
+        yield 'no zero at start if phone number' => ['+0'];
+        yield 'phone number too short' => ['+1'];
+    }
+
+    public function supportedMessagesProvider(): iterable
+    {
+        yield [new SmsMessage('0611223344', 'Hello!')];
+    }
+
+    /**
+     * @dataProvider invalidFromProvider
+     */
+    public function testInvalidArgumentExceptionIsThrownIfFromIsInvalid(string $from)
+    {
+        $transport = $this->createTransport(null, $from);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(sprintf('The "From" number "%s" is not a valid phone number.', $from));
+
+        $transport->send(new SmsMessage('+33612345678', 'Hello!'));
+    }
+
+    /**
+     * @dataProvider validFromProvider
+     */
+    public function testNoInvalidArgumentExceptionIsThrownIfFromIsValid(string $from)
+    {
+        $message = new SmsMessage('+33612345678', 'Hello!');
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects(self::exactly(2))->method('getStatusCode')->willReturn(200);
+        $response->expects(self::once())->method('getContent')->willReturn(json_encode(['id' => 'foo']));
+        $client = new MockHttpClient(function (string $method, string $url) use ($response): ResponseInterface {
+            self::assertSame('POST', $method);
+            self::assertSame('https://platform.ringcentral.com/restapi/v1.0/account/~/extension/~/sms', $url);
+
+            return $response;
+        }
+        );
+        $transport = $this->createTransport($client, $from);
+        $sentMessage = $transport->send($message);
+
+        self::assertSame('foo', $sentMessage->getMessageId());
+    }
+
+    public function toStringProvider(): iterable
+    {
+        yield ['ringcentral://platform.ringcentral.com?from=from', $this->createTransport()];
+    }
+
+    public function unsupportedMessagesProvider(): iterable
+    {
+        yield [new ChatMessage('Hello!')];
+        yield [$this->createMock(MessageInterface::class)];
+    }
+
+    public function validFromProvider(): iterable
+    {
+        yield ['+11'];
+        yield ['+112'];
+        yield ['+1123'];
+        yield ['+11234'];
+        yield ['+112345'];
+        yield ['+1123456'];
+        yield ['+11234567'];
+        yield ['+112345678'];
+        yield ['+1123456789'];
+        yield ['+11234567891'];
+        yield ['+112345678912'];
+        yield ['+1123456789123'];
+        yield ['+11234567891234'];
+        yield ['+112345678912345'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/composer.json b/src/Symfony/Component/Notifier/Bridge/RingCentral/composer.json
new file mode 100644
index 0000000000000..f7ddcd047ebe0
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "symfony/ring-central-notifier",
+    "type": "symfony-notifier-bridge",
+    "description": "Symfony RingCentral Notifier Bridge",
+    "keywords": [
+        "ring-central",
+        "notifier"
+    ],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "gnito-org",
+            "homepage": "https://github.com/gnito-org"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/notifier": "^6.3"
+    },
+    "require-dev": {
+        "symfony/event-dispatcher": "^5.4|^6.0"
+    },
+    "autoload": {
+        "psr-4": {"Symfony\\Component\\Notifier\\Bridge\\RingCentral\\": ""},
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/RingCentral/phpunit.xml.dist
new file mode 100644
index 0000000000000..b570792cc3937
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony RingCentral Notifier Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index 1a1329a1efcd8..a0fc0540ae937 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -144,6 +144,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\OvhCloud\OvhCloudTransportFactory::class,
             'package' => 'symfony/ovh-cloud-notifier',
         ],
+        'ringcentral' => [
+            'class' => Bridge\RingCentral\RingCentralTransportFactory::class,
+            'package' => 'symfony/ring-central-notifier',
+        ],
         'rocketchat' => [
             'class' => Bridge\RocketChat\RocketChatTransportFactory::class,
             'package' => 'symfony/rocket-chat-notifier',
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index ad64ec6e61e73..c4d89e096e794 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -169,6 +169,7 @@ public function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \Generat
         yield ['octopush', 'symfony/octopush-notifier'];
         yield ['onesignal', 'symfony/one-signal-notifier'];
         yield ['ovhcloud', 'symfony/ovh-cloud-notifier'];
+        yield ['ringcentral', 'symfony/ring-central-notifier'];
         yield ['rocketchat', 'symfony/rocket-chat-notifier'];
         yield ['sendberry', 'symfony/sendberry-notifier'];
         yield ['sendinblue', 'symfony/sendinblue-notifier'];
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
index 6b7dfa0eb8523..ca4201ef026ab 100644
--- a/src/Symfony/Component/Notifier/Transport.php
+++ b/src/Symfony/Component/Notifier/Transport.php
@@ -38,6 +38,7 @@
 use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
 use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
+use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory;
@@ -102,6 +103,7 @@ final class Transport
         OctopushTransportFactory::class,
         OrangeSmsTransportFactory::class,
         OvhCloudTransportFactory::class,
+        RingCentralTransportFactory::class,
         RocketChatTransportFactory::class,
         SendberryTransportFactory::class,
         SendinblueTransportFactory::class,

From 72e8416446a3e58b69c6321860407415ea1b6aca Mon Sep 17 00:00:00 2001
From: gnito-org <70450336+gnito-org@users.noreply.github.com>
Date: Tue, 29 Nov 2022 13:11:18 -0400
Subject: [PATCH 023/475] [Notifier] Add Plivo bridge

---
 .../FrameworkExtension.php                    |   2 +
 .../Resources/config/notifier_transports.php  |   5 +
 .../Notifier/Bridge/Plivo/.gitattributes      |   4 +
 .../Notifier/Bridge/Plivo/.gitignore          |   3 +
 .../Notifier/Bridge/Plivo/CHANGELOG.md        |   7 +
 .../Component/Notifier/Bridge/Plivo/LICENSE   |  19 +++
 .../Notifier/Bridge/Plivo/PlivoOptions.php    | 140 ++++++++++++++++++
 .../Notifier/Bridge/Plivo/PlivoTransport.php  |  93 ++++++++++++
 .../Bridge/Plivo/PlivoTransportFactory.php    |  46 ++++++
 .../Component/Notifier/Bridge/Plivo/README.md |  25 ++++
 .../Plivo/Tests/PlivoTransportFactoryTest.php |  50 +++++++
 .../Bridge/Plivo/Tests/PlivoTransportTest.php | 120 +++++++++++++++
 .../Notifier/Bridge/Plivo/composer.json       |  36 +++++
 .../Notifier/Bridge/Plivo/phpunit.xml.dist    |  31 ++++
 .../Exception/UnsupportedSchemeException.php  |   4 +
 .../UnsupportedSchemeExceptionTest.php        |   1 +
 src/Symfony/Component/Notifier/Transport.php  |   2 +
 17 files changed, 588 insertions(+)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Plivo/.gitattributes
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Plivo/.gitignore
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Plivo/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Plivo/PlivoOptions.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Plivo/PlivoTransport.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Plivo/PlivoTransportFactory.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Plivo/README.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Plivo/composer.json
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Plivo/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index db3bfd0c101e3..3fff07c8f03d6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -159,6 +159,7 @@
 use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
 use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
+use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
 use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
@@ -2584,6 +2585,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             OneSignalTransportFactory::class => 'notifier.transport_factory.one-signal',
             OrangeSmsTransportFactory::class => 'notifier.transport_factory.orange-sms',
             OvhCloudTransportFactory::class => 'notifier.transport_factory.ovh-cloud',
+            PlivoTransportFactory::class => 'notifier.transport_factory.plivo',
             RingCentralTransportFactory::class => 'notifier.transport_factory.ring-central',
             RocketChatTransportFactory::class => 'notifier.transport_factory.rocket-chat',
             SendberryTransportFactory::class => 'notifier.transport_factory.sendberry',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
index 2040d6dbc6dac..643e6cf4e58fb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -45,6 +45,7 @@
 use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
 use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
+use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
 use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
@@ -307,5 +308,9 @@
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
+        ->set('notifier.transport_factory.plivo', PlivoTransportFactory::class)
+            ->parent('notifier.transport_factory.abstract')
+            ->tag('texter.transport_factory')
+
     ;
 };
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/.gitattributes b/src/Symfony/Component/Notifier/Bridge/Plivo/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/.gitignore b/src/Symfony/Component/Notifier/Bridge/Plivo/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Plivo/CHANGELOG.md
new file mode 100644
index 0000000000000..75d6a403c1334
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+* Add the bridge
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE b/src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE
new file mode 100644
index 0000000000000..0ece8964f767d
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/PlivoOptions.php b/src/Symfony/Component/Notifier/Bridge/Plivo/PlivoOptions.php
new file mode 100644
index 0000000000000..50318a91928c0
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/PlivoOptions.php
@@ -0,0 +1,140 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Plivo;
+
+use Symfony\Component\Notifier\Message\MessageOptionsInterface;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class PlivoOptions implements MessageOptionsInterface
+{
+    private array $options;
+
+    public function __construct(array $options = [])
+    {
+        $this->options = $options;
+    }
+
+    public function getLog(): ?bool
+    {
+        return $this->options['log'] ?? null;
+    }
+
+    public function getMediaUrls(): ?string
+    {
+        return $this->options['media_urls'] ?? null;
+    }
+
+    public function getMethod(): ?string
+    {
+        return $this->options['method'] ?? null;
+    }
+
+    public function getPowerpackUuid(): ?string
+    {
+        return $this->options['powerpack_uuid'] ?? null;
+    }
+
+    public function getRecipientId(): ?string
+    {
+        return $this->options['recipient_id'] ?? null;
+    }
+
+    public function getSrc(): ?string
+    {
+        return $this->options['src'] ?? null;
+    }
+
+    public function getTrackable(): ?bool
+    {
+        return $this->options['trackable'] ?? null;
+    }
+
+    public function getType(): ?string
+    {
+        return $this->options['type'] ?? null;
+    }
+
+    public function getUrl(): ?string
+    {
+        return $this->options['url'] ?? null;
+    }
+
+    public function setLog(bool $log): self
+    {
+        $this->options['log'] = $log;
+
+        return $this;
+    }
+
+    public function setMediaUrls(string $mediaUrls): self
+    {
+        $this->options['media_urls'] = $mediaUrls;
+
+        return $this;
+    }
+
+    public function setMethod(string $method): self
+    {
+        $this->options['method'] = $method;
+
+        return $this;
+    }
+
+    public function setPowerpackUuid(string $powerpackUuid): self
+    {
+        $this->options['powerpack_uuid'] = $powerpackUuid;
+
+        return $this;
+    }
+
+    public function setRecipientId(string $id): self
+    {
+        $this->options['recipient_id'] = $id;
+
+        return $this;
+    }
+
+    public function setSrc(string $src): self
+    {
+        $this->options['src'] = $src;
+
+        return $this;
+    }
+
+    public function setTrackable(bool $trackable): self
+    {
+        $this->options['trackable'] = $trackable;
+
+        return $this;
+    }
+
+    public function setType(string $type): self
+    {
+        $this->options['type'] = $type;
+
+        return $this;
+    }
+
+    public function setUrl(string $url): self
+    {
+        $this->options['url'] = $url;
+
+        return $this;
+    }
+
+    public function toArray(): array
+    {
+        return $this->options;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/PlivoTransport.php b/src/Symfony/Component/Notifier/Bridge/Plivo/PlivoTransport.php
new file mode 100644
index 0000000000000..b5984cabfc377
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/PlivoTransport.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Plivo;
+
+use Symfony\Component\HttpClient\Exception\JsonException;
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Transport\AbstractTransport;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class PlivoTransport extends AbstractTransport
+{
+    protected const HOST = 'api.plivo.com';
+
+    public function __construct(
+        private readonly string $authId,
+        #[\SensitiveParameter] private readonly string $authToken,
+        private readonly string $from,
+        HttpClientInterface $client = null,
+        EventDispatcherInterface $dispatcher = null
+    ) {
+        parent::__construct($client, $dispatcher);
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('plivo://%s?from=%s', $this->getEndpoint(), $this->from);
+    }
+
+    public function supports(MessageInterface $message): bool
+    {
+        return $message instanceof SmsMessage;
+    }
+
+    protected function doSend(MessageInterface $message): SentMessage
+    {
+        if (!$message instanceof SmsMessage) {
+            throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
+        }
+
+        $opts = $message->getOptions();
+        $options = $opts ? $opts->toArray() : [];
+        $options['text'] = $message->getSubject();
+        $options['src'] = $options['src'] ?? $this->from;
+        $options['dst'] = $options['dst'] ?? $message->getPhone();
+
+        if (!preg_match('/^[a-zA-Z0-9\s]{2,11}$/', $options['src']) && !preg_match('/^\+?[1-9]\d{1,14}$/', $options['src'])) {
+            throw new InvalidArgumentException(sprintf('The "From" number "%s" is not a valid phone number, shortcode, or alphanumeric sender ID. Phone number must contain only numbers and optional + character.', $this->from));
+        }
+
+        $endpoint = sprintf('https://%s/v1/Account/%s/Message/', $this->getEndpoint(), $this->authId);
+        $response = $this->client->request('POST', $endpoint, ['auth_basic' => $this->authId.':'.$this->authToken, 'json' => array_filter($options)]);
+
+        try {
+            $statusCode = $response->getStatusCode();
+        } catch (TransportExceptionInterface $e) {
+            throw new TransportException('Could not reach the remote Plivo server.', $response, 0, $e);
+        }
+
+        if (202 !== $statusCode) {
+            try {
+                $error = $response->toArray(false);
+            } catch (JsonException) {
+                $error['error'] = $response->getContent(false);
+            }
+            throw new TransportException(sprintf('Unable to send the SMS - status code: "%s": "%s".', $statusCode, $error['error'] ?? 'unknown error'), $response);
+        }
+
+        $success = $response->toArray(false);
+        $sentMessage = new SentMessage($message, (string) $this);
+        $sentMessage->setMessageId($success['message_uuid'][0]);
+
+        return $sentMessage;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/PlivoTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Plivo/PlivoTransportFactory.php
new file mode 100644
index 0000000000000..7e389b0672867
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/PlivoTransportFactory.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Plivo;
+
+use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
+use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
+use Symfony\Component\Notifier\Transport\Dsn;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class PlivoTransportFactory extends AbstractTransportFactory
+{
+    private const TRANSPORT_SCHEME = 'plivo';
+
+    public function create(Dsn $dsn): PlivoTransport
+    {
+        $scheme = $dsn->getScheme();
+
+        if (self::TRANSPORT_SCHEME !== $scheme) {
+            throw new UnsupportedSchemeException($dsn, self::TRANSPORT_SCHEME, $this->getSupportedSchemes());
+        }
+
+        $authId = $this->getUser($dsn);
+        $authToken = $this->getPassword($dsn);
+        $from = $dsn->getRequiredOption('from');
+        $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
+        $port = $dsn->getPort();
+
+        return (new PlivoTransport($authId, $authToken, $from, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
+    }
+
+    protected function getSupportedSchemes(): array
+    {
+        return [self::TRANSPORT_SCHEME];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/README.md b/src/Symfony/Component/Notifier/Bridge/Plivo/README.md
new file mode 100644
index 0000000000000..ec6a5ee23f584
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/README.md
@@ -0,0 +1,25 @@
+Plivo Notifier
+==============
+
+Provides [Plivo](https://www.plivo.com) integration for Symfony Notifier.
+
+DSN example
+-----------
+
+```
+PLIVO_DSN=plivo://AUTH_ID:AUTH_TOKEN@default?from=FROM
+```
+
+where:
+
+- `AUTH_ID` is your Plivo Auth ID
+- `AUTH_TOKEN` is your Plivo Auth Token
+- `FROM` is your sender
+
+Resources
+---------
+
+* [Contributing](https://symfony.com/doc/current/contributing/index.html)
+* [Report issues](https://github.com/symfony/symfony/issues) and
+  [send Pull Requests](https://github.com/symfony/symfony/pulls)
+  in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportFactoryTest.php
new file mode 100644
index 0000000000000..fa5d29f5e3f83
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportFactoryTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Plivo\Tests;
+
+use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
+use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+
+final class PlivoTransportFactoryTest extends TransportFactoryTestCase
+{
+    public function createFactory(): PlivoTransportFactory
+    {
+        return new PlivoTransportFactory();
+    }
+
+    public function createProvider(): iterable
+    {
+        yield ['plivo://host.test?from=0611223344', 'plivo://authId:authToken@host.test?from=0611223344'];
+    }
+
+    public function incompleteDsnProvider(): iterable
+    {
+        yield 'missing auth token' => ['plivo://authId@default?from=FROM'];
+    }
+
+    public function missingRequiredOptionProvider(): iterable
+    {
+        yield 'missing option: from' => ['plivo://authId:authToken@default'];
+    }
+
+    public function supportsProvider(): iterable
+    {
+        yield [true, 'plivo://authId:authToken@default?from=0611223344'];
+        yield [false, 'somethingElse://authId:authToken@default?from=0611223344'];
+    }
+
+    public function unsupportedSchemeProvider(): iterable
+    {
+        yield ['somethingElse://authId:authToken@default?from=0611223344'];
+        yield ['somethingElse://authId:authToken@default']; // missing "from" option
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportTest.php
new file mode 100644
index 0000000000000..9dec4768842de
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportTest.php
@@ -0,0 +1,120 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Plivo\Tests;
+
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransport;
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+final class PlivoTransportTest extends TransportTestCase
+{
+    public function createTransport(HttpClientInterface $client = null, string $from = 'from'): PlivoTransport
+    {
+        return new PlivoTransport('authId', 'authToken', $from, $client ?? $this->createMock(HttpClientInterface::class));
+    }
+
+    public function invalidFromProvider(): iterable
+    {
+        yield 'too short' => ['a'];
+        yield 'too long' => ['abcdefghijkl'];
+        yield 'no zero at start if phone number' => ['+0'];
+        yield 'phone number too short' => ['+1'];
+    }
+
+    public function supportedMessagesProvider(): iterable
+    {
+        yield [new SmsMessage('0611223344', 'Hello!')];
+    }
+
+    /**
+     * @dataProvider invalidFromProvider
+     */
+    public function testInvalidArgumentExceptionIsThrownIfFromIsInvalid(string $from)
+    {
+        $transport = $this->createTransport(null, $from);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(sprintf('The "From" number "%s" is not a valid phone number, shortcode, or alphanumeric sender ID.', $from));
+
+        $transport->send(new SmsMessage('+33612345678', 'Hello!'));
+    }
+
+    /**
+     * @dataProvider validFromProvider
+     */
+    public function testNoInvalidArgumentExceptionIsThrownIfFromIsValid(string $from)
+    {
+        $message = new SmsMessage('+33612345678', 'Hello!');
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects(self::exactly(2))->method('getStatusCode')->willReturn(202);
+        $response->expects(self::once())->method('getContent')->willReturn(json_encode(['message' => 'message(s) queued', 'message_uuid' => ['foo'], 'api_id' => 'bar']));
+        $client = new MockHttpClient(function (string $method, string $url) use ($response): ResponseInterface {
+            self::assertSame('POST', $method);
+            self::assertSame('https://api.plivo.com/v1/Account/authId/Message/', $url);
+
+            return $response;
+        }
+        );
+        $transport = $this->createTransport($client, $from);
+        $sentMessage = $transport->send($message);
+
+        self::assertSame('foo', $sentMessage->getMessageId());
+    }
+
+    public function toStringProvider(): iterable
+    {
+        yield ['plivo://api.plivo.com?from=from', $this->createTransport()];
+    }
+
+    public function unsupportedMessagesProvider(): iterable
+    {
+        yield [new ChatMessage('Hello!')];
+        yield [$this->createMock(MessageInterface::class)];
+    }
+
+    public function validFromProvider(): iterable
+    {
+        yield ['ab'];
+        yield ['abc'];
+        yield ['abcd'];
+        yield ['abcde'];
+        yield ['abcdef'];
+        yield ['abcdefg'];
+        yield ['abcdefgh'];
+        yield ['abcdefghi'];
+        yield ['abcdefghij'];
+        yield ['abcdefghijk'];
+        yield ['abcdef ghij'];
+        yield [' abcdefghij'];
+        yield ['abcdefghij '];
+        yield ['+11'];
+        yield ['+112'];
+        yield ['+1123'];
+        yield ['+11234'];
+        yield ['+112345'];
+        yield ['+1123456'];
+        yield ['+11234567'];
+        yield ['+112345678'];
+        yield ['+1123456789'];
+        yield ['+11234567891'];
+        yield ['+112345678912'];
+        yield ['+1123456789123'];
+        yield ['+11234567891234'];
+        yield ['+112345678912345'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/composer.json b/src/Symfony/Component/Notifier/Bridge/Plivo/composer.json
new file mode 100644
index 0000000000000..d2b921a98f544
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "symfony/plivo-notifier",
+    "type": "symfony-notifier-bridge",
+    "description": "Symfony Plivo Notifier Bridge",
+    "keywords": [
+        "plivo",
+        "notifier"
+    ],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "gnito-org",
+            "homepage": "https://github.com/gnito-org"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/notifier": "^6.3"
+    },
+    "require-dev": {
+        "symfony/event-dispatcher": "^5.4|^6.0"
+    },
+    "autoload": {
+        "psr-4": {"Symfony\\Component\\Notifier\\Bridge\\Plivo\\": ""},
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Plivo/phpunit.xml.dist
new file mode 100644
index 0000000000000..cc84e156ea321
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony Plivo Notifier Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index a0fc0540ae937..b44a43f751172 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -144,6 +144,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\OvhCloud\OvhCloudTransportFactory::class,
             'package' => 'symfony/ovh-cloud-notifier',
         ],
+        'plivo' => [
+            'class' => Bridge\Plivo\PlivoTransportFactory::class,
+            'package' => 'symfony/plivo-notifier',
+        ],
         'ringcentral' => [
             'class' => Bridge\RingCentral\RingCentralTransportFactory::class,
             'package' => 'symfony/ring-central-notifier',
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index c4d89e096e794..91e47a967a1e0 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -169,6 +169,7 @@ public function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \Generat
         yield ['octopush', 'symfony/octopush-notifier'];
         yield ['onesignal', 'symfony/one-signal-notifier'];
         yield ['ovhcloud', 'symfony/ovh-cloud-notifier'];
+        yield ['plivo', 'symfony/plivo-notifier'];
         yield ['ringcentral', 'symfony/ring-central-notifier'];
         yield ['rocketchat', 'symfony/rocket-chat-notifier'];
         yield ['sendberry', 'symfony/sendberry-notifier'];
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
index ca4201ef026ab..f4e9bc61a4bcc 100644
--- a/src/Symfony/Component/Notifier/Transport.php
+++ b/src/Symfony/Component/Notifier/Transport.php
@@ -38,6 +38,7 @@
 use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
 use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
+use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
 use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
@@ -103,6 +104,7 @@ final class Transport
         OctopushTransportFactory::class,
         OrangeSmsTransportFactory::class,
         OvhCloudTransportFactory::class,
+        PlivoTransportFactory::class,
         RingCentralTransportFactory::class,
         RocketChatTransportFactory::class,
         SendberryTransportFactory::class,

From 604fd9f590b39d7f55c44146eb6be8d3a44c9a6d Mon Sep 17 00:00:00 2001
From: gnito-org <70450336+gnito-org@users.noreply.github.com>
Date: Tue, 29 Nov 2022 09:37:05 -0400
Subject: [PATCH 024/475] [Notifier] Add Bandwidth bridge

---
 .../FrameworkExtension.php                    |   2 +
 .../Resources/config/notifier_transports.php  |   5 +
 .../Notifier/Bridge/Bandwidth/.gitattributes  |   4 +
 .../Notifier/Bridge/Bandwidth/.gitignore      |   3 +
 .../Bridge/Bandwidth/BandwidthOptions.php     | 140 ++++++++++++++++++
 .../Bridge/Bandwidth/BandwidthTransport.php   | 108 ++++++++++++++
 .../Bandwidth/BandwidthTransportFactory.php   |  49 ++++++
 .../Notifier/Bridge/Bandwidth/CHANGELOG.md    |   7 +
 .../Notifier/Bridge/Bandwidth/LICENSE         |  19 +++
 .../Notifier/Bridge/Bandwidth/README.md       |  28 ++++
 .../Tests/BandwidthTransportFactoryTest.php   |  53 +++++++
 .../Tests/BandwidthTransportTest.php          | 103 +++++++++++++
 .../Notifier/Bridge/Bandwidth/composer.json   |  36 +++++
 .../Bridge/Bandwidth/phpunit.xml.dist         |  31 ++++
 .../Exception/UnsupportedSchemeException.php  |   4 +
 .../UnsupportedSchemeExceptionTest.php        |   3 +
 src/Symfony/Component/Notifier/Transport.php  |   2 +
 17 files changed, 597 insertions(+)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Bandwidth/.gitattributes
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Bandwidth/.gitignore
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Bandwidth/BandwidthOptions.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Bandwidth/BandwidthTransport.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Bandwidth/BandwidthTransportFactory.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Bandwidth/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Bandwidth/README.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Bandwidth/composer.json
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Bandwidth/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 93d5de007ef9b..d381ac1ac0a04 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -127,6 +127,7 @@
 use Symfony\Component\Mime\MimeTypes;
 use Symfony\Component\Notifier\Bridge\AllMySms\AllMySmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\AmazonSns\AmazonSnsTransportFactory;
+use Symfony\Component\Notifier\Bridge\Bandwidth\BandwidthTransportFactory;
 use Symfony\Component\Notifier\Bridge\Chatwork\ChatworkTransportFactory;
 use Symfony\Component\Notifier\Bridge\Clickatell\ClickatellTransportFactory;
 use Symfony\Component\Notifier\Bridge\ContactEveryone\ContactEveryoneTransportFactory;
@@ -2548,6 +2549,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
         $classToServices = [
             AllMySmsTransportFactory::class => 'notifier.transport_factory.all-my-sms',
             AmazonSnsTransportFactory::class => 'notifier.transport_factory.amazon-sns',
+            BandwidthTransportFactory::class => 'notifier.transport_factory.bandwidth',
             ChatworkTransportFactory::class => 'notifier.transport_factory.chatwork',
             ClickatellTransportFactory::class => 'notifier.transport_factory.clickatell',
             ContactEveryoneTransportFactory::class => 'notifier.transport_factory.contact-everyone',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
index 237ae18a59eb7..877725416d082 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Notifier\Bridge\AllMySms\AllMySmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\AmazonSns\AmazonSnsTransportFactory;
+use Symfony\Component\Notifier\Bridge\Bandwidth\BandwidthTransportFactory;
 use Symfony\Component\Notifier\Bridge\Chatwork\ChatworkTransportFactory;
 use Symfony\Component\Notifier\Bridge\Clickatell\ClickatellTransportFactory;
 use Symfony\Component\Notifier\Bridge\ContactEveryone\ContactEveryoneTransportFactory;
@@ -287,5 +288,9 @@
         ->parent('notifier.transport_factory.abstract')
         ->tag('chatter.transport_factory')
 
+        ->set('notifier.transport_factory.bandwidth', BandwidthTransportFactory::class)
+            ->parent('notifier.transport_factory.abstract')
+            ->tag('texter.transport_factory')
+
     ;
 };
diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/.gitattributes b/src/Symfony/Component/Notifier/Bridge/Bandwidth/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Notifier/Bridge/Ban
57AE
dwidth/.gitignore b/src/Symfony/Component/Notifier/Bridge/Bandwidth/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/BandwidthOptions.php b/src/Symfony/Component/Notifier/Bridge/Bandwidth/BandwidthOptions.php
new file mode 100644
index 0000000000000..86fc7103daded
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/BandwidthOptions.php
@@ -0,0 +1,140 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Bandwidth;
+
+use Symfony\Component\Notifier\Message\MessageOptionsInterface;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class BandwidthOptions implements MessageOptionsInterface
+{
+    private array $options;
+
+    public function __construct(array $options = [])
+    {
+        $this->options = $options;
+    }
+
+    public function getAccountId(): ?string
+    {
+        return $this->options['account_id'] ?? null;
+    }
+
+    public function getApplicationId(): ?string
+    {
+        return $this->options['application_id'] ?? null;
+    }
+
+    public function getExpiration(): ?string
+    {
+        return $this->options['expiration'] ?? null;
+    }
+
+    public function getFrom(): ?string
+    {
+        return $this->options['from'] ?? null;
+    }
+
+    public function getMedia(): ?array
+    {
+        return $this->options['media'] ?? null;
+    }
+
+    public function getPriority(): ?string
+    {
+        return $this->options['priority'] ?? null;
+    }
+
+    public function getRecipientId(): ?string
+    {
+        return $this->options['recipient_id'] ?? null;
+    }
+
+    public function getTag(): ?string
+    {
+        return $this->options['tag'] ?? null;
+    }
+
+    public function getTo(): ?array
+    {
+        return $this->options['to'] ?? null;
+    }
+
+    public function setAccountId(string $accountId): self
+    {
+        $this->options['account_id'] = $accountId;
+
+        return $this;
+    }
+
+    public function setApplicationId(string $applicationId): self
+    {
+        $this->options['application_id'] = $applicationId;
+
+        return $this;
+    }
+
+    public function setExpiration(string $expiration): self
+    {
+        $this->options['expiration'] = $expiration;
+
+        return $this;
+    }
+
+    public function setFrom(string $from): self
+    {
+        $this->options['from'] = $from;
+
+        return $this;
+    }
+
+    public function setMedia(array $media): self
+    {
+        $this->options['media'] = $media;
+
+        return $this;
+    }
+
+    public function setPriority(string $priority): self
+    {
+        $this->options['priority'] = $priority;
+
+        return $this;
+    }
+
+    public function setRecipientId(string $id): self
+    {
+        $this->options['recipient_id'] = $id;
+
+        return $this;
+    }
+
+    public function setTag(string $tag): self
+    {
+        $this->options['tag'] = $tag;
+
+        return $this;
+    }
+
+    public function setTo(array $to): self
+    {
+        $this->options['to'] = $to;
+
+        return $this;
+    }
+
+    public function toArray(): array
+    {
+        return $this->options;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/BandwidthTransport.php b/src/Symfony/Component/Notifier/Bridge/Bandwidth/BandwidthTransport.php
new file mode 100644
index 0000000000000..913c16099d4e2
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/BandwidthTransport.php
@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Bandwidth;
+
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Transport\AbstractTransport;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class BandwidthTransport extends AbstractTransport
+{
+    protected const HOST = 'messaging.bandwidth.com';
+
+    public function __construct(
+        private readonly string $username,
+        #[\SensitiveParameter] private readonly string $password,
+        private readonly string $from,
+        private readonly string $accountId,
+        private readonly string $applicationId,
+        private readonly ?string $priority,
+        HttpClientInterface $client = null,
+        EventDispatcherInterface $dispatcher = null
+    ) {
+        parent::__construct($client, $dispatcher);
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('bandwidth://%s?from=%s&account_id=%s&application_id=%s', $this->getEndpoint(), $this->from, $this->accountId, $this->applicationId).($this->priority ? sprintf('&priority=%s', $this->priority) : null);
+    }
+
+    public function supports(MessageInterface $message): bool
+    {
+        return $message instanceof SmsMessage;
+    }
+
+    /**
+     * https://dev.bandwidth.com/apis/messaging/#tag/Messages/operation/createMessage.
+     */
+    protected function doSend(MessageInterface $message): SentMessage
+    {
+        if (!$message instanceof SmsMessage) {
+            throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
+        }
+        $opts = $message->getOptions();
+        $options = $opts ? $opts->toArray() : [];
+        $options['text'] = $message->getSubject();
+        $options['from'] = $options['from'] ?? $this->from;
+        $options['to'] = $options['to'] ?? [$message->getPhone()];
+        $options['account_id'] = $options['account_id'] ?? $this->accountId;
+        $options['applicationId'] = $options['application_id'] ?? $this->applicationId;
+        unset($options['application_id']);
+
+        if (!isset($options['priority']) && $this->priority) {
+            $options['priority'] = $this->priority;
+        }
+
+        if (!preg_match('/^\+[1-9]\d{1,14}$/', $this->from)) {
+            throw new InvalidArgumentException(sprintf('The "From" number "%s" is not a valid phone number. The number must be in E.164 format.', $this->from));
+        }
+
+        if (!preg_match('/^\+[1-9]\d{1,14}$/', $message->getPhone())) {
+            throw new InvalidArgumentException(sprintf('The "To" number "%s" is not a valid phone number. The number must be in E.164 format.', $message->getPhone()));
+        }
+        $endpoint = sprintf('https://%s/api/v2/users/%s/messages', $this->getEndpoint(), $options['account_id']);
+        unset($options['accountId']);
+
+        $response = $this->client->request('POST', $endpoint, [
+            'auth_basic' => $this->username.':'.$this->password,
+            'json' => array_filter($options),
+        ]);
+
+        try {
+            $statusCode = $response->getStatusCode();
+        } catch (TransportExceptionInterface $e) {
+            throw new TransportException('Could not reach the remote Bandwidth server.', $response, 0, $e);
+        }
+
+        if (202 !== $statusCode) {
+            $error = $response->toArray(false);
+            throw new TransportException(sprintf('Unable to send the SMS - "%s" - "%s".', $error['type'], $error['description']), $response);
+        }
+
+        $success = $response->toArray(false);
+        $sentMessage = new SentMessage($message, (string) $this);
+        $sentMessage->setMessageId($success['id']);
+
+        return $sentMessage;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/BandwidthTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Bandwidth/BandwidthTransportFactory.php
new file mode 100644
index 0000000000000..030f3b20d8b53
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/BandwidthTransportFactory.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Bandwidth;
+
+use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
+use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
+use Symfony\Component\Notifier\Transport\Dsn;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class BandwidthTransportFactory extends AbstractTransportFactory
+{
+    private const TRANSPORT_SCHEME = 'bandwidth';
+
+    public function create(Dsn $dsn): BandwidthTransport
+    {
+        $scheme = $dsn->getScheme();
+
+        if (self::TRANSPORT_SCHEME !== $scheme) {
+            throw new UnsupportedSchemeException($dsn, self::TRANSPORT_SCHEME, $this->getSupportedSchemes());
+        }
+
+        $username = $this->getUser($dsn);
+        $password = $this->getPassword($dsn);
+        $from = $dsn->getRequiredOption('from');
+        $accountId = $dsn->getRequiredOption('account_id');
+        $applicationId = $dsn->getRequiredOption('application_id');
+        $priority = $dsn->getOption('priority');
+        $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
+        $port = $dsn->getPort();
+
+        return (new BandwidthTransport($username, $password, $from, $accountId, $applicationId, $priority, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
+    }
+
+    protected function getSupportedSchemes(): array
+    {
+        return [self::TRANSPORT_SCHEME];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Bandwidth/CHANGELOG.md
new file mode 100644
index 0000000000000..75d6a403c1334
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+* Add the bridge
diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE b/src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE
new file mode 100644
index 0000000000000..0ece8964f767d
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/README.md b/src/Symfony/Component/Notifier/Bridge/Bandwidth/README.md
new file mode 100644
index 0000000000000..40b2607aba895
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/README.md
@@ -0,0 +1,28 @@
+Bandwidth Notifier
+==================
+
+Provides [Bandwidth](https://www.bandwidth.com) integration for Symfony Notifier.
+
+DSN example
+-----------
+
+```
+BANDWIDTH_DSN=bandwidth://USERNAME:PASSWORD@default?from=FROM&account_id=ACCOUNT_ID&application_id=APPLICATION_ID&priority=PRIORITY
+```
+
+where:
+
+- `USERNAME` is your Bandwidth username
+- `PASSWORD` is your Bandwidth password
+- `FROM` is your sender
+- `ACCOUNT_ID` is your account ID
+- `APPLICATION_ID` is your application ID
+- `PRIORITY` is your priority (optional)
+
+Resources
+---------
+
+* [Contributing](https://symfony.com/doc/current/contributing/index.html)
+* [Report issues](https://github.com/symfony/symfony/issues) and
+  [send Pull Requests](https://github.com/symfony/symfony/pulls)
+  in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportFactoryTest.php
new file mode 100644
index 0000000000000..e9115f0887e51
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportFactoryTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Bandwidth\Tests;
+
+use Symfony\Component\Notifier\Bridge\Bandwidth\BandwidthTransportFactory;
+use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+
+final class BandwidthTransportFactoryTest extends TransportFactoryTestCase
+{
+    public function createFactory(): BandwidthTransportFactory
+    {
+        return new BandwidthTransportFactory();
+    }
+
+    public function createProvider(): iterable
+    {
+        yield ['bandwidth://host.test?from=0611223344&account_id=account_id&application_id=application_id&priority=priority', 'bandwidth://username:password@host.test?from=0611223344&account_id=account_id&application_id=application_id&priority=priority'];
+        yield ['bandwidth://host.test?from=0611223344&account_id=account_id&application_id=application_id', 'bandwidth://username:password@host.test?from=0611223344&account_id=account_id&application_id=application_id'];
+    }
+
+    public function incompleteDsnProvider(): iterable
+    {
+        yield 'missing password' => ['bandwidth://username@default?account_id=account_id&application_id=application_id&priority=priority'];
+    }
+
+    public function missingRequiredOptionProvider(): iterable
+    {
+        yield 'missing option: from' => ['bandwidth://username:password@default?account_id=account_id&application_id=application_id&priority=priority'];
+        yield 'missing option: account_id' => ['bandwidth://username:password@default?from=0611223344&application_id=application_id&priority=priority'];
+        yield 'missing option: application_id' => ['bandwidth://username:password@default?from=0611223344&account_id=account_id&priority=priority'];
+    }
+
+    public function supportsProvider(): iterable
+    {
+        yield [true, 'bandwidth://username:password@default?from=0611223344&account_id=account_id&application_id=application_id&priority=priority'];
+        yield [false, 'somethingElse://username:password@default?from=0611223344&account_id=account_id&application_id=application_id&priority=priority'];
+    }
+
+    public function unsupportedSchemeProvider(): iterable
+    {
+        yield ['somethingElse://username:password@default?from=0611223344&account_id=account_id&application_id=application_id&priority=priority'];
+        yield ['somethingElse://username:password@default?account_id=account_id&application_id=application_id&priority=priority']; // missing "from" option
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportTest.php
new file mode 100644
index 0000000000000..23533452ff695
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportTest.php
@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Bandwidth\Tests;
+
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\Notifier\Bridge\Bandwidth\BandwidthTransport;
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+final class BandwidthTransportTest extends TransportTestCase
+{
+    public function createTransport(HttpClientInterface $client = null, string $from = 'from'): BandwidthTransport
+    {
+        return new BandwidthTransport('username', 'password', $from, 'account_id', 'application_id', 'priority', $client ?? $this->createMock(HttpClientInterface::class));
+    }
+
+    public function invalidFromProvider(): iterable
+    {
+        yield 'no zero at start if phone number' => ['+0'];
+        yield 'phone number too short' => ['+1'];
+    }
+
+    public function supportedMessagesProvider(): iterable
+    {
+        yield [new SmsMessage('0611223344', 'Hello!')];
+    }
+
+    /**
+     * @dataProvider invalidFromProvider
+     */
+    public function testInvalidArgumentExceptionIsThrownIfFromIsInvalid(string $from)
+    {
+        $transport = $this->createTransport(null, $from);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(sprintf('The "From" number "%s" is not a valid phone number. The number must be in E.164 format.', $from));
+
+        $transport->send(new SmsMessage('+33612345678', 'Hello!'));
+    }
+
+    /**
+     * @dataProvider validFromProvider
+     */
+    public function testNoInvalidArgumentExceptionIsThrownIfFromIsValid(string $from)
+    {
+        $message = new SmsMessage('+33612345678', 'Hello!');
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects(self::exactly(2))->method('getStatusCode')->willReturn(202);
+        $response->expects(self::once())->method('getContent')->willReturn(json_encode(['id' => 'foo']));
+        $client = new MockHttpClient(function (string $method, string $url) use ($response): ResponseInterface {
+            self::assertSame('POST', $method);
+            self::assertSame('https://messaging.bandwidth.com/api/v2/users/account_id/messages', $url);
+
+            return $response;
+        });
+        $transport = $this->createTransport($client, $from);
+        $sentMessage = $transport->send($message);
+        self::assertSame('foo', $sentMessage->getMessageId());
+    }
+
+    public function toStringProvider(): iterable
+    {
+        yield ['bandwidth://messaging.bandwidth.com?from=from&account_id=account_id&application_id=application_id&priority=priority', $this->createTransport()];
+    }
+
+    public function unsupportedMessagesProvider(): iterable
+    {
+        yield [new ChatMessage('Hello!')];
+        yield [$this->createMock(MessageInterface::class)];
+    }
+
+    public function validFromProvider(): iterable
+    {
+        yield ['+11'];
+        yield ['+112'];
+        yield ['+1123'];
+        yield ['+11234'];
+        yield ['+112345'];
+        yield ['+1123456'];
+        yield ['+11234567'];
+        yield ['+112345678'];
+        yield ['+1123456789'];
+        yield ['+11234567891'];
+        yield ['+112345678912'];
+        yield ['+1123456789123'];
+        yield ['+11234567891234'];
+        yield ['+112345678912345'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/composer.json b/src/Symfony/Component/Notifier/Bridge/Bandwidth/composer.json
new file mode 100644
index 0000000000000..60ca552aa57b8
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "symfony/bandwidth-notifier",
+    "type": "symfony-notifier-bridge",
+    "description": "Symfony Bandwidth Notifier Bridge",
+    "keywords": [
+        "bandwidth",
+        "notifier"
+    ],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "gnito-org",
+            "homepage": "https://github.com/gnito-org"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/notifier": "^6.3"
+    },
+    "require-dev": {
+        "symfony/event-dispatcher": "^5.4|^6.0"
+    },
+    "autoload": {
+        "psr-4": {"Symfony\\Component\\Notifier\\Bridge\\Bandwidth\\": ""},
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Bandwidth/phpunit.xml.dist
new file mode 100644
index 0000000000000..1371b1f96f7ec
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+     
B41A
    failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony Bandwidth Notifier Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index f5b51bf9bfaaf..e86ef5dd7d18e 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -24,6 +24,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\AllMySms\AllMySmsTransportFactory::class,
             'package' => 'symfony/all-my-sms-notifier',
         ],
+        'bandwidth' => [
+            'class' => Bridge\Bandwidth\BandwidthTransportFactory::class,
+            'package' => 'symfony/bandwidth-notifier',
+        ],
         'clickatell' => [
             'class' => Bridge\Clickatell\ClickatellTransportFactory::class,
             'package' => 'symfony/clickatell-notifier',
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 8ffb0c1f79c4c..e9e5df4e02bc5 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -15,6 +15,7 @@
 use Symfony\Bridge\PhpUnit\ClassExistsMock;
 use Symfony\Component\Notifier\Bridge\AllMySms\AllMySmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\AmazonSns\AmazonSnsTransportFactory;
+use Symfony\Component\Notifier\Bridge\Bandwidth\BandwidthTransportFactory;
 use Symfony\Component\Notifier\Bridge\Clickatell\ClickatellTransportFactory;
 use Symfony\Component\Notifier\Bridge\ContactEveryone\ContactEveryoneTransportFactory;
 use Symfony\Component\Notifier\Bridge\Discord\DiscordTransportFactory;
@@ -74,6 +75,7 @@ public static function setUpBeforeClass(): void
         ClassExistsMock::withMockedClasses([
             AllMySmsTransportFactory::class => false,
             AmazonSnsTransportFactory::class => false,
+            BandwidthTransportFactory::class => false,
             ClickatellTransportFactory::class => false,
             ContactEveryoneTransportFactory::class => false,
             DiscordTransportFactory::class => false,
@@ -139,6 +141,7 @@ public function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \Generat
     {
         yield ['allmysms', 'symfony/all-my-sms-notifier'];
         yield ['sns', 'symfony/amazon-sns-notifier'];
+        yield ['bandwidth', 'symfony/bandwidth-notifier'];
         yield ['clickatell', 'symfony/clickatell-notifier'];
         yield ['contact-everyone', 'symfony/contact-everyone-notifier'];
         yield ['discord', 'symfony/discord-notifier'];
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
index b9829b8ebdf68..d1ee2bebc1f08 100644
--- a/src/Symfony/Component/Notifier/Transport.php
+++ b/src/Symfony/Component/Notifier/Transport.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Notifier\Bridge\AllMySms\AllMySmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\AmazonSns\AmazonSnsTransportFactory;
+use Symfony\Component\Notifier\Bridge\Bandwidth\BandwidthTransportFactory;
 use Symfony\Component\Notifier\Bridge\Chatwork\ChatworkTransportFactory;
 use Symfony\Component\Notifier\Bridge\Clickatell\ClickatellTransportFactory;
 use Symfony\Component\Notifier\Bridge\ContactEveryone\ContactEveryoneTransportFactory;
@@ -74,6 +75,7 @@ final class Transport
     private const FACTORY_CLASSES = [
         AllMySmsTransportFactory::class,
         AmazonSnsTransportFactory::class,
+        BandwidthTransportFactory::class,
         ChatworkTransportFactory::class,
         ClickatellTransportFactory::class,
         ContactEveryoneTransportFactory::class,

From 527d29cdc5ee4ddbb57046b777b07adc59c6ce1b Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Sat, 3 Dec 2022 14:59:45 +0100
Subject: [PATCH 025/475] [FrameworkBundle] Don't suggest deprecated
 sensio/generator-bundle

---
 .../EventListener/SuggestMissingPackageSubscriber.php          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/SuggestMissingPackageSubscriber.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/SuggestMissingPackageSubscriber.php
index 53cae12ebbcff..d7bdc8e6684f9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/EventListener/SuggestMissingPackageSubscriber.php
+++ b/src/Symfony/Bundle/FrameworkBundle/EventListener/SuggestMissingPackageSubscriber.php
@@ -32,9 +32,6 @@ final class SuggestMissingPackageSubscriber implements EventSubscriberInterface
             'mongodb' => ['DoctrineMongoDBBundle', 'doctrine/mongodb-odm-bundle'],
             '_default' => ['Doctrine ORM', 'symfony/orm-pack'],
         ],
-        'generate' => [
-            '_default' => ['SensioGeneratorBundle', 'sensio/generator-bundle'],
-        ],
         'make' => [
             '_default' => ['MakerBundle', 'symfony/maker-bundle --dev'],
         ],

From 3de59c9b8009116d7300e7de2274a014427c971e Mon Sep 17 00:00:00 2001
From: BASAK Semih <semihbasak25@gmail.com>
Date: Sat, 3 Dec 2022 14:11:00 +0100
Subject: [PATCH 026/475] feat: using coalescing operator in file function

---
 .../Bundle/FrameworkBundle/Controller/AbstractController.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
index a8857d52f3f58..cef10efcd1a29 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -166,7 +166,7 @@ protected function json(mixed $data, int $status = 200, array $headers = [], arr
     protected function file(\SplFileInfo|string $file, string $fileName = null, string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT): BinaryFileResponse
     {
         $response = new BinaryFileResponse($file);
-        $response->setContentDisposition($disposition, null === $fileName ? $response->getFile()->getFilename() : $fileName);
+        $response->setContentDisposition($disposition, $fileName ?? $response->getFile()->getFilename());
 
         return $response;
     }

From 79d406a06cd06107796bee6124cddd1cfd1efc83 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Sun, 4 Dec 2022 19:09:48 +0100
Subject: [PATCH 027/475] fix tests

---
 .../Tests/Exception/UnsupportedSchemeExceptionTest.php      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 0af7287f60b6a..2b33e41f95d11 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -43,6 +43,8 @@
 use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
 use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
+use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
+use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory;
@@ -56,6 +58,7 @@
 use Symfony\Component\Notifier\Bridge\SpotHit\SpotHitTransportFactory;
 use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransportFactory;
 use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
+use Symfony\Component\Notifier\Bridge\Termii\TermiiTransportFactory;
 use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
 use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransportFactory;
@@ -105,6 +108,8 @@ public static function setUpBeforeClass(): void
             OctopushTransportFactory::class => false,
             OneSignalTransportFactory::class => false,
             OvhCloudTransportFactory::class => false,
+            PlivoTransportFactory::class => false,
+            RingCentralTransportFactory::class => false,
             RocketChatTransportFactory::class => false,
             SendberryTransportFactory::class => false,
             SendinblueTransportFactory::class => false,
@@ -118,6 +123,7 @@ public static function setUpBeforeClass(): void
             SpotHitTransportFactory::class => false,
             TelegramTransportFactory::class => false,
             TelnyxTransportFactory::class => false,
+            TermiiTransportFactory::class => false,
             TurboSmsTransportFactory::class => false,
             TwilioTransportFactory::class => false,
             TwitterTransportFactory::class => false,

From e96524a2fdd3f5c365f150369d8ae5893c7501b7 Mon Sep 17 00:00:00 2001
From: kurozumi <info@a-zumi.net>
Date: Sun, 4 Dec 2022 11:11:43 +0900
Subject: [PATCH 028/475] [Notifier] Add Line bridge

---
 .../FrameworkExtension.php                    |  2 +
 .../Resources/config/notifier_transports.php  |  4 +
 .../Notifier/Bridge/LineNotify/.gitattributes |  4 +
 .../Notifier/Bridge/LineNotify/.gitignore     |  3 +
 .../Notifier/Bridge/LineNotify/CHANGELOG.md   |  7 ++
 .../Notifier/Bridge/LineNotify/LICENSE        | 19 +++++
 .../Bridge/LineNotify/LineNotifyTransport.php | 81 ++++++++++++++++++
 .../LineNotify/LineNotifyTransportFactory.php | 42 ++++++++++
 .../Notifier/Bridge/LineNotify/README.md      | 19 +++++
 .../Tests/LineNotifyTransportFactoryTest.php  | 48 +++++++++++
 .../Tests/LineNotifyTransportTest.php         | 82 +++++++++++++++++++
 .../Notifier/Bridge/LineNotify/composer.json  | 33 ++++++++
 .../Bridge/LineNotify/phpunit.xml.dist        | 31 +++++++
 .../Exception/UnsupportedSchemeException.php  |  4 +
 .../UnsupportedSchemeExceptionTest.php        |  3 +
 15 files changed, 382 insertions(+)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/LineNotify/.gitattributes
 create mode 100644 src/Symfony/Component/Notifier/Bridge/LineNotify/.gitignore
 create mode 100644 src/Symfony/Component/Notifier/Bridge/LineNotify/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE
 create mode 100644 src/Symfony/Component/Notifier/Bridge/LineNotify/LineNotifyTransport.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/LineNotify/LineNotifyTransportFactory.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/LineNotify/README.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json
 create mode 100644 src/Symfony/Component/Notifier/Bridge/LineNotify/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index bf09eea257c9a..b68c48dab4f2d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -149,6 +149,7 @@
 use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
 use Symfony\Component\Notifier\Bridge\KazInfoTeh\KazInfoTehTransportFactory;
 use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory;
+use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransportFactory;
 use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory as MailjetNotifierTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
@@ -2576,6 +2577,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             IsendproTransportFactory::class => 'notifier.transport_factory.isendpro',
             KazInfoTehTransportFactory::class => 'notifier.transport_factory.kaz-info-teh',
             LightSmsTransportFactory::class => 'notifier.transport_factory.light-sms',
+            LineNotifyTransportFactory::class => 'notifier.transport_factory.line-notify',
             LinkedInTransportFactory::class => 'notifier.transport_factory.linked-in',
             MailjetNotifierTransportFactory::class => 'notifier.transport_factory.mailjet',
             MattermostTransportFactory::class => 'notifier.transport_factory.mattermost',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
index cdcd05ac2aca0..0c7e55d56ee5a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -34,6 +34,7 @@
 use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
 use Symfony\Component\Notifier\Bridge\KazInfoTeh\KazInfoTehTransportFactory;
 use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory;
+use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransportFactory;
 use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
@@ -317,5 +318,8 @@
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
+        ->set('notifier.transport_factory.line-notify', LineNotifyTransportFactory::class)
+            ->parent('notifier.transport_factory.abstract')
+            ->tag('chatter.transport_factory')
     ;
 };
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/.gitattributes b/src/Symfony/Component/Notifier/Bridge/LineNotify/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/.gitignore b/src/Symfony/Component/Notifier/Bridge/LineNotify/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/LineNotify/CHANGELOG.md
new file mode 100644
index 0000000000000..75d6a403c1334
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+* Add the bridge
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE b/src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE
new file mode 100644
index 0000000000000..0ece8964f767d
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/LineNotifyTransport.php b/src/Symfony/Component/Notifier/Bridge/LineNotify/LineNotifyTransport.php
new file mode 100644
index 0000000000000..d4c14653d6e0d
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/LineNotifyTransport.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\LineNotify;
+
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Transport\AbstractTransport;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @author Akira Kurozumi <info@a-zumi.net>
+ */
+final class LineNotifyTransport extends AbstractTransport
+{
+    protected const HOST = 'notify-api.line.me';
+
+    private string $token;
+
+    public function __construct(#[\SensitiveParameter] string $token, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    {
+        $this->token = $token;
+        parent::__construct($client, $dispatcher);
+    }
+
+    protected function doSend(MessageInterface $message): SentMessage
+    {
+        if (!$message instanceof ChatMessage) {
+            throw new UnsupportedMessageTypeException(__CLASS__, ChatMessage::class, $message);
+        }
+
+        $content = $message->getSubject();
+
+        $endpoint = sprintf('https://%s/api/notify', $this->getEndpoint());
+        $response = $this->client->request('POST', $endpoint, [
+            'auth_bearer' => $this->token,
+            'query' => [
+                'message' => $content,
+            ],
+        ]);
+
+        try {
+            $statusCode = $response->getStatusCode();
+        } catch (TransportException $e) {
+            throw new TransportException('Could not reach the remote Line server.', $response, 0, $e);
+        }
+
+        if (200 !== $statusCode) {
+            $result = $response->toArray(false);
+
+            $originalContent = $message->getSubject();
+            $errorCode = $result['status'];
+            $errorMessage = trim($result['message']);
+            throw new TransportException(sprintf('Unable to post the Line message: "%s" (%d: "%s").', $originalContent, $errorCode, $errorMessage), $response);
+        }
+
+        return new SentMessage($message, (string) $this);
+    }
+
+    public function supports(MessageInterface $message): bool
+    {
+        return $message instanceof ChatMessage;
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('linenotify://%s', $this->getEndpoint());
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/LineNotifyTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/LineNotify/LineNotifyTransportFactory.php
new file mode 100644
index 0000000000000..bb0d89c321740
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/LineNotifyTransportFactory.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\LineNotify;
+
+use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
+use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
+use Symfony\Component\Notifier\Transport\Dsn;
+
+/**
+ * @author Akira Kurozumi <info@a-zumi.net>
+ */
+final class LineNotifyTransportFactory extends AbstractTransportFactory
+{
+    private const SCHEME = 'linenotify';
+
+    protected function getSupportedSchemes(): array
+    {
+        return [self::SCHEME];
+    }
+
+    public function create(Dsn $dsn): LineNotifyTransport
+    {
+        if (self::SCHEME !== $dsn->getScheme()) {
+            throw new UnsupportedSchemeException($dsn, self::SCHEME, $this->getSupportedSchemes());
+        }
+
+        $token = $this->getUser($dsn);
+        $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
+        $port = $dsn->getPort();
+
+        return (new LineNotifyTransport($token, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/README.md b/src/Symfony/Component/Notifier/Bridge/LineNotify/README.md
new file mode 100644
index 0000000000000..9209ea0e78f06
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/README.md
@@ -0,0 +1,19 @@
+LINE Notifier
+=============
+
+Provides [LINE Notify](https://notify-bot.line.me/) integration for Symfony Notifier.
+
+DSN example
+-----------
+
+```
+LINE_NOTIFY_DSN=linenotify://TOKEN@default
+```
+
+Resources
+---------
+
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportFactoryTest.php
new file mode 100644
index 0000000000000..703cfe15aa8ab
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportFactoryTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransportFactory;
+use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+
+/**
+ * @author Akira Kurozumi <info@a-zumi.net>
+ */
+final class LineNotifyTransportFactoryTest extends TransportFactoryTestCase
+{
+    public function createFactory(): LineNotifyTransportFactory
+    {
+        return new LineNotifyTransportFactory();
+    }
+
+    public function supportsProvider(): iterable
+    {
+        yield [true, 'linenotify://host'];
+        yield [false, 'somethingElse://host'];
+    }
+
+    public function createProvider(): iterable
+    {
+        yield [
+            'linenotify://host.test',
+            'linenotify://token@host.test',
+        ];
+    }
+
+    public function incompleteDsnProvider(): iterable
+    {
+        yield 'missing token' => ['linenotify://host.test'];
+    }
+
+    public function unsupportedSchemeProvider(): iterable
+    {
+        yield ['somethingElse://token@host'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php
new file mode 100644
index 0000000000000..d315e1b377533
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\LineNotify\Tests;
+
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransport;
+use Symfony\Component\Notifier\Exception\LengthException;
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+/**
+ * @author Akira Kurozumi <info@a-zumi.net>
+ */
+final class LineNotifyTransportTest extends TransportTestCase
+{
+    public function createTransport(HttpClientInterface $client = null): LineNotifyTransport
+    {
+        return (new LineNotifyTransport('testToken', $client ?? $this->createMock(HttpClientInterface::class)))->setHost('host.test');
+    }
+
+    public function toStringProvider(): iterable
+    {
+        yield ['linenotify://host.test', $this->createTransport()];
+    }
+
+    public function supportedMessagesProvider(): iterable
+    {
+        yield [new ChatMessage('Hello!')];
+    }
+
+    public function unsupportedMessagesProvider(): iterable
+    {
+        yield [new SmsMessage('0611223344', 'Hello!')];
+        yield [$this->createMock(MessageInterface::class)];
+    }
+
+    public function testSendChatMessageWithMoreThan2000CharsThrowsLogicException()
+    {
+        $transport = $this->createTransport();
+
+        $this->expectException(LengthException::class);
+        $this->expectExceptionMessage('The subject length of a Line message must not exceed 1000 characters.');
+
+        $transport->send(new ChatMessage(str_repeat('囍', 1001)));
+    }
+
+    public function testSendWithErrorResponseThrows()
+    {
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects($this->exactly(2))
+            ->method('getStatusCode')
+            ->willReturn(400);
+        $response->expects($this->once())
+            ->method('getContent')
+            ->willReturn(json_encode(['message' => 'testDescription', 'code' => 'testErrorCode']));
+
+        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
+            return $response;
+        });
+
+        $transport = $this->createTransport($client);
+
+        $this->expectException(TransportException::class);
+        $this->expectExceptionMessageMatches('/testDescription.+testErrorCode/');
+
+        $transport->send(new ChatMessage('testMessage'));
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json b/src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json
new file mode 100644
index 0000000000000..43a173bf48812
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "symfony/line-notifier",
+    "type": "symfony-notifier-bridge",
+    "description": "Provides LINE Notify integration for Symfony Notifier.",
+    "keywords": ["line", "notifier", "chat"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Akira Kurozumi",
+            "email": "info@a-zumi.net"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/notifier": "^6.3"
+    },
+    "require-dev": {
+        "symfony/event-dispatcher": "^5.4|^6.0"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\LineNotify\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/LineNotify/phpunit.xml.dist
new file mode 100644
index 0000000000000..6fb26783f338b
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony Line Notify Notifier Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index 4ccf388ebb766..28e7d971b1cd6 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -100,6 +100,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\LightSms\LightSmsTransportFactory::class,
             'package' => 'symfony/light-sms-notifier',
         ],
+        'linenotify' => [
+            'class' => Bridge\LineNotify\LineNotifyTransportFactory::class,
+            'package' => 'symfony/line-notify-notifier',
+        ],
         'linkedin' => [
             'class' => Bridge\LinkedIn\LinkedInTransportFactory::class,
             'package' => 'symfony/linked-in-notifier',
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 2b33e41f95d11..f97a2ca25a833 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -32,6 +32,7 @@
 use Symfony\Component\Notifier\Bridge\Iqsms\IqsmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
 use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory;
+use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransportFactory;
 use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
@@ -97,6 +98,7 @@ public static function setUpBeforeClass(): void
             IqsmsTransportFactory::class => false,
             IsendproTransportFactory::class => false,
             LightSmsTransportFactory::class => false,
+            LineNotifyTransportFactory::class => false,
             LinkedInTransportFactory::class => false,
             MailjetTransportFactory::class => false,
             MattermostTransportFactory::class => false,
@@ -167,6 +169,7 @@ public function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \Generat
         yield ['iqsms', 'symfony/iqsms-notifier'];
         yield ['isendpro', 'symfony/isendpro-notifier'];
         yield ['lightsms', 'symfony/light-sms-notifier'];
+        yield ['linenotify', 'symfony/line-notify-notifier'];
         yield ['linkedin', 'symfony/linked-in-notifier'];
         yield ['mailjet', 'symfony/mailjet-notifier'];
         yield ['mattermost', 'symfony/mattermost-notifier'];

From 77f19f510177910159456bc9764f9e11c231913c Mon Sep 17 00:00:00 2001
From: Alex Plekhanov <alex@plekhanov.io>
Date: Mon, 28 Nov 2022 21:21:26 +0100
Subject: [PATCH 029/475] [Notifier] [Telegram] Add support to answer callback
 queries

---
 .../Notifier/Bridge/Telegram/CHANGELOG.md     |  5 ++
 .../Bridge/Telegram/TelegramOptions.php       | 15 ++++
 .../Bridge/Telegram/TelegramTransport.php     | 27 ++++++-
 .../Telegram/Tests/TelegramOptionsTest.php    | 73 +++++++++++++++++++
 .../Telegram/Tests/TelegramTransportTest.php  | 31 ++++++++
 5 files changed, 147 insertions(+), 4 deletions(-)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramOptionsTest.php

diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Telegram/CHANGELOG.md
index d0d4723934749..ec7a2a9e8ba35 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/CHANGELOG.md
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+* Add support to answer callback queries
+
 5.3
 ---
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramOptions.php b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramOptions.php
index bbc2285b634aa..aa4604d378fb5 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramOptions.php
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramOptions.php
@@ -109,4 +109,19 @@ public function edit(int $messageId): static
 
         return $this;
     }
+
+    /**
+     * @return $this
+     */
+    public function answerCallbackQuery(string $callbackQueryId, bool $showAlert = false, int $cacheTime = 0): static
+    {
+        $this->options['callback_query_id'] = $callbackQueryId;
+        $this->options['show_alert'] = $showAlert;
+
+        if ($cacheTime > 0) {
+            $this->options['cache_time'] = $cacheTime;
+        }
+
+        return $this;
+    }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php
index 9a027b1ac2b32..a3f60009f30e9 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php
@@ -84,8 +84,7 @@ protected function doSend(MessageInterface $message): SentMessage
             $options['text'] = preg_replace('/([_*\[\]()~`>#+\-=|{}.!])/', '\\\\$1', $message->getSubject());
         }
 
-        $path = isset($options['message_id']) ? 'editMessageText' : 'sendMessage';
-        $endpoint = sprintf('https://%s/bot%s/%s', $this->getEndpoint(), $this->token, $path);
+        $endpoint = sprintf('https://%s/bot%s/%s', $this->getEndpoint(), $this->token, $this->getPath($options));
 
         $response = $this->client->request('POST', $endpoint, [
             'json' => array_filter($options),
@@ -100,14 +99,34 @@ protected function doSend(MessageInterface $message): SentMessage
         if (200 !== $statusCode) {
             $result = $response->toArray(false);
 
-            throw new TransportException('Unable to '.(isset($options['message_id']) ? 'edit' : 'post').' the Telegram message: '.$result['description'].sprintf(' (code %d).', $result['error_code']), $response);
+            throw new TransportException('Unable to '.$this->getAction($options).' the Telegram message: '.$result['description'].sprintf(' (code %d).', $result['error_code']), $response);
         }
 
         $success = $response->toArray(false);
 
         $sentMessage = new SentMessage($message, (string) $this);
-        $sentMessage->setMessageId($success['result']['message_id']);
+        if (isset($success['result']['message_id'])) {
+            $sentMessage->setMessageId($success['result']['message_id']);
+        }
 
         return $sentMessage;
     }
+
+    private function getPath(array $options): string
+    {
+        return match (true) {
+            isset($options['message_id']) => 'editMessageText',
+            isset($options['callback_query_id']) => 'answerCallbackQuery',
+            default => 'sendMessage',
+        };
+    }
+
+    private function getAction(array $options): string
+    {
+        return match (true) {
+            isset($options['message_id']) => 'edit',
+            isset($options['callback_query_id']) => 'answer callback query',
+            default => 'post',
+        };
+    }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramOptionsTest.php b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramOptionsTest.php
new file mode 100644
index 0000000000000..20183bd9af631
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramOptionsTest.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Telegram\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Notifier\Bridge\Telegram\TelegramOptions;
+
+final class TelegramOptionsTest extends TestCase
+{
+    /**
+     * @dataProvider validCacheTimeDataProvider
+     */
+    public function testAnswerCallbackQueryWithCacheTime(int $cacheTime)
+    {
+        $options = new TelegramOptions();
+
+        $returnedOptions = $options->answerCallbackQuery('123', true, $cacheTime);
+
+        $this->assertSame($options, $returnedOptions);
+        $this->assertEquals(
+            [
+                'callback_query_id' => '123',
+                'show_alert' => true,
+                'cache_time' => $cacheTime,
+            ],
+            $options->toArray(),
+        );
+    }
+
+    public function validCacheTimeDataProvider(): iterable
+    {
+        yield 'cache time equals 1' => [1];
+        yield 'cache time equals 2' => [2];
+        yield 'cache time equals 10' => [10];
+    }
+
+    /**
+     * @dataProvider invalidCacheTimeDataProvider
+     */
+    public function testAnswerCallbackQuery(int $cacheTime)
+    {
+        $options = new TelegramOptions();
+
+        $returnedOptions = $options->answerCallbackQuery('123', true, $cacheTime);
+
+        $this->assertSame($options, $returnedOptions);
+        $this->assertEquals(
+            [
+                'callback_query_id' => '123',
+                'show_alert' => true,
+            ],
+            $options->toArray(),
+        );
+    }
+
+    public function invalidCacheTimeDataProvider(): iterable
+    {
+        yield 'cache time equals 0' => [0];
+        yield 'cache time equals -1' => [-1];
+        yield 'cache time equals -10' => [-10];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php
index 3231617c126b9..87812731600ff 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php
@@ -193,6 +193,37 @@ public function testSendWithOptionForEditMessage()
         $transport->send(new ChatMessage('testMessage', $options));
     }
 
+    public function testSendWithOptionToAnswerCallbackQuery()
+    {
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects($this->exactly(2))
+            ->method('getStatusCode')
+            ->willReturn(200);
+
+        $content = <<<JSON
+            {
+                "ok": true,
+                "result": true
+            }
+JSON;
+
+        $response->expects($this->once())
+            ->method('getContent')
+            ->willReturn($content)
+        ;
+
+        $client = new MockHttpClient(function (string $method, string $url) use ($response): ResponseInterface {
+            $this->assertStringEndsWith('/answerCallbackQuery', $url);
+
+            return $response;
+        });
+
+        $transport = $this->createTransport($client, 'testChannel');
+        $options = (new TelegramOptions())->answerCallbackQuery('123', true, 1);
+
+        $transport->send(new ChatMessage('testMessage', $options));
+    }
+
     public function testSendWithChannelOverride()
     {
         $channelOverride = 'channelOverride';

From d097a63983c266f50558c01932ad7ab3e0156abb Mon Sep 17 00:00:00 2001
From: Quentin Dequippe <quentin@dequippe.tech>
Date: Thu, 3 Nov 2022 17:04:21 +0100
Subject: [PATCH 030/475] Add Mastodon Notifier

---
 .../FrameworkExtension.php                    |   2 +
 .../Resources/config/notifier_transports.php  |   5 +
 .../Notifier/Bridge/Mastodon/.gitattributes   |   4 +
 .../Notifier/Bridge/Mastodon/.gitignore       |   3 +
 .../Notifier/Bridge/Mastodon/CHANGELOG.md     |   7 +
 .../Notifier/Bridge/Mastodon/LICENSE          |  19 +++
 .../Bridge/Mastodon/MastodonOptions.php       |  58 +++++++
 .../Bridge/Mastodon/MastodonTransport.php     | 152 ++++++++++++++++++
 .../Mastodon/MastodonTransportFactory.php     |  42 +++++
 .../Notifier/Bridge/Mastodon/README.md        |  23 +++
 .../Tests/MastodonTransportFactoryTest.php    |  65 ++++++++
 .../Mastodon/Tests/MastodonTransportTest.php  | 112 +++++++++++++
 .../Bridge/Mastodon/Tests/fixtures.gif        | Bin 0 -> 185 bytes
 .../Notifier/Bridge/Mastodon/composer.json    |  33 ++++
 .../Notifier/Bridge/Mastodon/phpunit.xml.dist |  31 ++++
 .../Bridge/Twitter/TwitterOptions.php         |   1 -
 .../Exception/UnsupportedSchemeException.php  |   4 +
 .../UnsupportedSchemeExceptionTest.php        |   3 +
 src/Symfony/Component/Notifier/Transport.php  |   2 +
 19 files changed, 565 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/.gitattributes
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/.gitignore
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/MastodonOptions.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/MastodonTransport.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/MastodonTransportFactory.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/README.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/fixtures.gif
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Mastodon/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index b68c48dab4f2d..caf638ad588b7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -152,6 +152,7 @@
 use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransportFactory;
 use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory as MailjetNotifierTransportFactory;
+use Symfony\Component\Notifier\Bridge\Mastodon\MastodonTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mercure\MercureTransportFactory;
 use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransport;
@@ -2580,6 +2581,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             LineNotifyTransportFactory::class => 'notifier.transport_factory.line-notify',
             LinkedInTransportFactory::class => 'notifier.transport_factory.linked-in',
             MailjetNotifierTransportFactory::class => 'notifier.transport_factory.mailjet',
+            MastodonTransportFactory::class => 'notifier.transport_factory.mastodon',
             MattermostTransportFactory::class => 'notifier.transport_factory.mattermost',
             MercureTransportFactory::class => 'notifier.transport_factory.mercure',
             MessageBirdTransport::class => 'notifier.transport_factory.message-bird',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
index 0c7e55d56ee5a..0d38a65d05163 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -37,6 +37,7 @@
 use Symfony\Component\Notifier\Bridge\LineNotify
F438
\LineNotifyTransportFactory;
 use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory;
+use Symfony\Component\Notifier\Bridge\Mastodon\MastodonTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mercure\MercureTransportFactory;
 use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransportFactory;
@@ -321,5 +322,9 @@
         ->set('notifier.transport_factory.line-notify', LineNotifyTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
+
+        ->set('notifier.transport_factory.mastodon', MastodonTransportFactory::class)
+            ->parent('notifier.transport_factory.abstract')
+            ->tag('chatter.transport_factory')
     ;
 };
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/.gitattributes b/src/Symfony/Component/Notifier/Bridge/Mastodon/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/.gitignore b/src/Symfony/Component/Notifier/Bridge/Mastodon/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Mastodon/CHANGELOG.md
new file mode 100644
index 0000000000000..1f2c8f86cde72
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+ * Add the bridge
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE b/src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE
new file mode 100644
index 0000000000000..0ece8964f767d
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2022 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/MastodonOptions.php b/src/Symfony/Component/Notifier/Bridge/Mastodon/MastodonOptions.php
new file mode 100644
index 0000000000000..477cd2d0b0082
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/MastodonOptions.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Mastodon;
+
+use Symfony\Component\Mime\Part\File;
+use Symfony\Component\Notifier\Message\MessageOptionsInterface;
+
+final class MastodonOptions implements MessageOptionsInterface
+{
+    public function __construct(
+        private array $options = [],
+    ) {
+    }
+
+    public function toArray(): array
+    {
+        return $this->options;
+    }
+
+    public function getRecipientId(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * @param string[] $choices
+     */
+    public function poll(array $choices, int $expiresIn): self
+    {
+        $this->options['poll'] = [
+            'options' => $choices,
+            'expires_in' => $expiresIn,
+        ];
+
+        return $this;
+    }
+
+    public function attachMedia(File $file, File $thumbnail = null, string $description = null, string $focus = null): self
+    {
+        $this->options['attach'][] = [
+            'file' => $file,
+            'thumbnail' => $thumbnail,
+            'description' => $description,
+            'focus' => $focus,
+        ];
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/MastodonTransport.php b/src/Symfony/Component/Notifier/Bridge/Mastodon/MastodonTransport.php
new file mode 100644
index 0000000000000..57cc4fba9e0e4
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/MastodonTransport.php
@@ -0,0 +1,152 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Mastodon;
+
+use Symfony\Component\Mime\Part\DataPart;
+use Symfony\Component\Mime\Part\File;
+use Symfony\Component\Mime\Part\Multipart\FormDataPart;
+use Symfony\Component\Notifier\Exception\RuntimeException;
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Transport\AbstractTransport;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+/**
+ * @author Quentin Dequippe <quentin@dequippe.tech>
+ *
+ * @see https://docs.joinmastodon.org
+ */
+final class MastodonTransport extends AbstractTransport
+{
+    public function __construct(#[\SensitiveParameter] private readonly string $accessToken, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    {
+        parent::__construct($client, $dispatcher);
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('mastodon://%s', $this->getEndpoint());
+    }
+
+    public function supports(MessageInterface $message): bool
+    {
+        return $message instanceof ChatMessage && (null === $message->getOptions() || $message->getOptions() instanceof MastodonOptions);
+    }
+
+    public function request(string $method, string $url, array $options): ResponseInterface
+    {
+        $url = sprintf('https://%s%s', $this->getEndpoint(), $url);
+
+        $options['auth_bearer'] = $this->accessToken;
+
+        return $this->client->request($method, $url, $options);
+    }
+
+    /**
+     * @see https://docs.joinmastodon.org/methods/statuses/
+     */
+    protected function doSend(MessageInterface $message): SentMessage
+    {
+        if (!$message instanceof ChatMessage) {
+            throw new UnsupportedMessageTypeException(__CLASS__, ChatMessage::class, $message);
+        }
+
+        $options = $message->getOptions()?->toArray() ?? [];
+        $options['status'] = $message->getSubject();
+        $response = null;
+
+        try {
+            if (isset($options['attach'])) {
+                $options['media_ids'] = $this->uploadMedia($options['attach']);
+                unset($options['attach']);
+            }
+
+            $response = $this->request('POST', '/api/v1/statuses', ['json' => $options]);
+            $statusCode = $response->getStatusCode();
+            $result = $response->toArray(false);
+        } catch (ExceptionInterface $e) {
+            if (null !== $response) {
+                throw new TransportException($e->getMessage(), $response, 0, $e);
+            }
+
+            throw new RuntimeException($e->getMessage(), 0, $e);
+        }
+
+        if (200 !== $statusCode) {
+            throw new TransportException(sprintf('Unable to post the Mastodon message: "%s" (%s).', $result['error_description'], $result['error']), $response);
+        }
+
+        $sentMessage = new SentMessage($message, (string) $this);
+        $sentMessage->setMessageId($result['id']);
+
+        return $sentMessage;
+    }
+
+    /**
+     * @param array<array{file: File, thumbnail: File|null, description: string|null, focus: string}> $media
+     */
+    private function uploadMedia(array $media): array
+    {
+        $responses = [];
+
+        foreach ($media as [
+            'file' => $file,
+            'thumbnail' => $thumbnail,
+            'description' => $description,
+            'focus' => $focus,
+        ]) {
+            $formDataPart = new FormDataPart(array_filter([
+                'file' => new DataPart($file),
+                'thumbnail' => $thumbnail ? new DataPart($thumbnail) : null,
+                'description' => $description,
+                'focus' => $focus,
+            ]));
+
+            $headers = [];
+            foreach ($formDataPart->getPreparedHeaders()->all() as $header) {
+                $headers[] = $header->toString();
+            }
+
+            $responses[] = $this->request('POST', '/api/v2/media', [
+                'headers' => $headers,
+                'body' => $formDataPart->bodyToIterable(),
+            ]);
+        }
+
+        $mediaIds = [];
+
+        try {
+            foreach ($responses as $i => $response) {
+                unset($responses[$i]);
+                $result = $response->toArray(false);
+
+                if (300 <= $response->getStatusCode()) {
+                    throw new TransportException(sprintf('Unable to upload media as attachment: "%s" (%s).', $result['error_description'], $result['error']), $response);
+                }
+
+                $mediaIds[] = $result['id'];
+            }
+        } finally {
+            foreach ($responses as $response) {
+                $response->cancel();
+            }
+        }
+
+        return $mediaIds;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/MastodonTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Mastodon/MastodonTransportFactory.php
new file mode 100644
index 0000000000000..df8afd9a31d88
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/MastodonTransportFactory.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Mastodon;
+
+use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
+use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
+use Symfony\Component\Notifier\Transport\Dsn;
+
+/**
+ * @author Quentin Dequippe <quentin@dequippe.tech>
+ */
+final class MastodonTransportFactory extends AbstractTransportFactory
+{
+    public function create(Dsn $dsn): MastodonTransport
+    {
+        $scheme = $dsn->getScheme();
+
+        if ('mastodon' !== $scheme) {
+            throw new UnsupportedSchemeException($dsn, 'mastodon', $this->getSupportedSchemes());
+        }
+
+        $token = $this->getUser($dsn);
+        $host = $dsn->getHost();
+        $port = $dsn->getPort();
+
+        return (new MastodonTransport($token, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
+    }
+
+    protected function getSupportedSchemes(): array
+    {
+        return ['mastodon'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/README.md b/src/Symfony/Component/Notifier/Bridge/Mastodon/README.md
new file mode 100644
index 0000000000000..f8a680801628f
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/README.md
@@ -0,0 +1,23 @@
+Mastodon Notifier
+=================
+
+Provides Mastodon integration for Symfony Notifier.
+
+DSN example
+-----------
+
+```
+MASTODON_DSN=mastodon://ACCESS_TOKEN@HOST
+```
+
+where:
+ - `ACCESS_TOKEN` is your Mastodon access token
+ - `HOST` is your Mastodon host
+
+Resources
+---------
+
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportFactoryTest.php
new file mode 100644
index 0000000000000..08f87f7650497
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportFactoryTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Mastodon\Tests;
+
+use Symfony\Component\Notifier\Bridge\Mastodon\MastodonTransportFactory;
+use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+
+/**
+ * @author Quentin Dequippe <quentin@dequippe.tech>
+ */
+class MastodonTransportFactoryTest extends TransportFactoryTestCase
+{
+    public function createFactory(): MastodonTransportFactory
+    {
+        return new MastodonTransportFactory();
+    }
+
+    public function createProvider(): iterable
+    {
+        yield [
+            'mastodon://host.test',
+            'mastodon://accessToken@host.test',
+        ];
+
+        yield [
+            'mastodon://example.com',
+            'mastodon://accessToken@example.com',
+        ];
+
+        yield [
+            'mastodon://example.com',
+            'mastodon://accessToken@example.com',
+        ];
+
+        yield [
+            'mastodon://example.com',
+            'mastodon://accessToken@example.com',
+        ];
+    }
+
+    public function supportsProvider(): iterable
+    {
+        yield [true, 'mastodon://token@host'];
+        yield [false, 'somethingElse://token@host'];
+    }
+
+    public function incompleteDsnProvider(): iterable
+    {
+        yield 'missing token' => ['mastodon://host.test'];
+    }
+
+    public function unsupportedSchemeProvider(): iterable
+    {
+        yield ['somethingElse://token@host'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportTest.php
new file mode 100644
index 0000000000000..17f4fb6fa4d0e
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportTest.php
@@ -0,0 +1,112 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Mastodon\Tests;
+
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+use Symfony\Component\Mime\Part\File;
+use Symfony\Component\Notifier\Bridge\Mastodon\MastodonOptions;
+use Symfony\Component\Notifier\Bridge\Mastodon\MastodonTransport;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @author Quentin Dequippe <quentin@dequippe.tech>
+ */
+class MastodonTransportTest extends TransportTestCase
+{
+    public function createTransport(HttpClientInterface $client = null): MastodonTransport
+    {
+        return (new MastodonTransport('testAccessToken', $client ?? $this->createMock(HttpClientInterface::class)))->setHost('host.test');
+    }
+
+    public function toStringProvider(): iterable
+    {
+        yield ['mastodon://host.test', $this->createTransport()];
+    }
+
+    public function supportedMessagesProvider(): iterable
+    {
+        yield [new ChatMessage('Hello World!')];
+    }
+
+    public function unsupportedMessagesProvider(): iterable
+    {
+        yield [new SmsMessage('0611223344', 'Hello World!')];
+        yield [$this->createMock(MessageInterface::class)];
+    }
+
+    public function testBasicStatus()
+    {
+        $transport = $this->createTransport(new MockHttpClient(function (string $method, string $url, array $options) {
+            $this->assertSame('POST', $method);
+            $this->assertSame('https://host.test/api/v1/statuses', $url);
+            $this->assertSame('{"status":"Hello World!"}', $options['body']);
+            $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+            return new MockResponse('{"id":"103254962155278888"}');
+        }));
+
+        $result = $transport->send(new ChatMessage('Hello World!'));
+
+        $this->assertSame('103254962155278888', $result->getMessageId());
+    }
+
+    public function testStatusWithPoll()
+    {
+        $transport = $this->createTransport(new MockHttpClient(function (string $method, string $url, array $options) {
+            $this->assertSame('POST', $method);
+            $this->assertSame('https://host.test/api/v1/statuses', $url);
+            $this->assertSame('{"poll":{"options":["choice1","choice2"],"expires_in":3600},"status":"Hello World!"}', $options['body']);
+            $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+            return new MockResponse('{"id":"103254962155278888"}');
+        }));
+
+        $options = (new MastodonOptions())
+            ->poll(['choice1', 'choice2'], 3600);
+        $result = $transport->send(new ChatMessage('Hello World!', $options));
+
+        $this->assertSame('103254962155278888', $result->getMessageId());
+    }
+
+    public function testStatusWithMedia()
+    {
+        $transport = $this->createTransport(new MockHttpClient((function () {
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://host.test/api/v2/media', $url);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse('{"id":"256"}');
+            };
+
+            yield function (string $method, string $url, array $options) {
+                $this->assertSame('POST', $method);
+                $this->assertSame('https://host.test/api/v1/statuses', $url);
+                $this->assertSame('{"status":"Hello World!","media_ids":["256"]}', $options['body']);
+                $this->assertArrayHasKey('authorization', $options['normalized_headers']);
+
+                return new MockResponse('{"id":"103254962155278888"}');
+            };
+        })()));
+
+        $options = (new MastodonOptions())
+            ->attachMedia(new File(__DIR__.'/fixtures.gif'), new File(__DIR__.'/fixtures.gif'), 'A fixture', '1.0,0.75');
+        $result = $transport->send(new ChatMessage('Hello World!', $options));
+
+        $this->assertSame('103254962155278888', $result->getMessageId());
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/fixtures.gif b/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/fixtures.gif
new file mode 100644
index 0000000000000000000000000000000000000000..443aca422f7624b271903e5fbb577c7f99786c0e
GIT binary patch
literal 185
zcmZ?wbhEHb<YC}pXklRZ|Nr~fukT*Ie43V)#=yYv{Q2{^xVX=s-}d$OJ$Ue7{`~oq
zCr@6!eEGb2^D;9tlarGdFJ9cz((?b`Pa=`xKR(~YlvIWC%#sWRcTe8{1|6U^K)ZPu
z7+7@_6#5zs<~?>0d66k_<YE_x%=rdim8$pu4O$C!Y%omYl|ILKm{CqZU7?AKk--`O
DSo&ob

literal 0
HcmV?d00001

diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json b/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json
new file mode 100644
index 0000000000000..25b30dfc4edb5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "symfony/mastodon-notifier",
+    "type": "symfony-notifier-bridge",
+    "description": "Symfony Mastodon Notifier Bridge",
+    "keywords": ["mastodon", "notifier"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Quentin Dequippe",
+            "email": "quentin@dequippe.tech"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/notifier": "^6.2"
+    },
+    "require-dev": {
+        "symfony/mime": "^6.2"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Mastodon\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Mastodon/phpunit.xml.dist
new file mode 100644
index 0000000000000..096fbc3c43f9d
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony Mastodon Notifier Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory>./</directory>
+        </include>
+        <exclude>
+            <directory>./Resources</directory>
+            <directory>./Tests</directory>
+            <directory>./vendor</directory>
+        </exclude>
+    </coverage>
+</phpunit>
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterOptions.php b/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterOptions.php
index 6037cb22660e5..2fc331e1c8491 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterOptions.php
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterOptions.php
@@ -22,7 +22,6 @@ final class TwitterOptions implements MessageOptionsInterface
     public const REPLY_MENTIONED_USERS = 'mentionedUsers';
     public const REPLY_FOLLOWING = 'following';
 
-
     public function __construct(
         private array $options = [],
     ) {
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index 28e7d971b1cd6..bbbd56a4cd093 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -112,6 +112,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\Mailjet\MailjetTransportFactory::class,
             'package' => 'symfony/mailjet-notifier',
         ],
+        'mastodon' => [
+            'class' => Bridge\Mastodon\MastodonTransportFactory::class,
+            'package' => 'symfony/mastodon-notifier',
+        ],
         'mattermost' => [
             'class' => Bridge\Mattermost\MattermostTransportFactory::class,
             'package' => 'symfony/mattermost-notifier',
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index f97a2ca25a833..8dd5d8d92c1a7 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -35,6 +35,7 @@
 use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransportFactory;
 use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory;
+use Symfony\Component\Notifier\Bridge\Mastodon\MastodonTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mercure\MercureTransportFactory;
 use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransportFactory;
@@ -101,6 +102,7 @@ public static function setUpBeforeClass(): void
             LineNotifyTransportFactory::class => false,
             LinkedInTransportFactory::class => false,
             MailjetTransportFactory::class => false,
+            MastodonTransportFactory::class => false,
             MattermostTransportFactory::class => false,
             MercureTransportFactory::class => false,
             MessageBirdTransportFactory::class => false,
@@ -172,6 +174,7 @@ public function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \Generat
         yield ['linenotify', 'symfony/line-notify-notifier'];
         yield ['linkedin', 'symfony/linked-in-notifier'];
         yield ['mailjet', 'symfony/mailjet-notifier'];
+        yield ['mastodon', 'symfony/mastodon-notifier'];
         yield ['mattermost', 'symfony/mattermost-notifier'];
         yield ['mercure', 'symfony/mercure-notifier'];
         yield ['messagebird', 'symfony/message-bird-notifier'];
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
index 3d2bbe9075e4f..78ab723de4ab0 100644
--- a/src/Symfony/Component/Notifier/Transport.php
+++ b/src/Symfony/Component/Notifier/Transport.php
@@ -31,6 +31,7 @@
 use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
 use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory;
+use Symfony\Component\Notifier\Bridge\Mastodon\MastodonTransportFactory;
 use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
 use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransportFactory;
 use Symfony\Component\Notifier\Bridge\MessageMedia\MessageMediaTransportFactory;
@@ -98,6 +99,7 @@ final class Transport
         IsendproTransportFactory::class,
         LightSmsTransportFactory::class,
         MailjetTransportFactory::class,
+        MastodonTransportFactory::class,
         MattermostTransportFactory::class,
         MessageBirdTransportFactory::class,
         MessageMediaTransportFactory::class,

From bde17b7f519ba9166585fc1d428582375ffbce20 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 2 Dec 2022 22:43:20 +0100
Subject: [PATCH 031/475] [VarDumper] Add caster for WeakMap

---
 src/Symfony/Component/VarDumper/CHANGELOG.md  |  5 +++++
 .../Component/VarDumper/Caster/SplCaster.php  | 22 +++++++++++++++++--
 .../VarDumper/Cloner/AbstractCloner.php       |  1 +
 .../VarDumper/Tests/Caster/SplCasterTest.php  | 20 +++++++++++++++++
 4 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/VarDumper/CHANGELOG.md b/src/Symfony/Component/VarDumper/CHANGELOG.md
index ffa4daf2b5a91..97204fc67d042 100644
--- a/src/Symfony/Component/VarDumper/CHANGELOG.md
+++ b/src/Symfony/Component/VarDumper/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add caster for `WeakMap`
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/VarDumper/Caster/SplCaster.php b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
index 448afbad90a47..72ac5dce9d38c 100644
--- a/src/Symfony/Component/VarDumper/Caster/SplCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
@@ -184,10 +184,10 @@ public static function castObjectStorage(\SplObjectStorage $c, array $a, Stub $s
 
         $clone = clone $c;
         foreach ($clone as $obj) {
-            $storage[] = [
+            $storage[] = new EnumStub([
                 'object' => $obj,
                 'info' => $clone->getInfo(),
-             ];
+             ]);
         }
 
         $a += [
@@ -211,6 +211,24 @@ public static function castWeakReference(\WeakReference $c, array $a, Stub $stub
         return $a;
     }
 
+    public static function castWeakMap(\WeakMap $c, array $a, Stub $stub, bool $isNested)
+    {
+        $map = [];
+
+        foreach (clone $c as $obj => $data) {
+            $map[] = new EnumStub([
+                'object' => $obj,
+                'data' => $data,
+             ]);
+        }
+
+        $a += [
+            Caster::PREFIX_VIRTUAL.'map' => $map,
+        ];
+
+        return $a;
+    }
+
     private static function castSplArray(\ArrayObject|\ArrayIterator $c, array $a, Stub $stub, bool $isNested): array
     {
         $prefix = Caster::PREFIX_VIRTUAL;
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
index c722a8e905c2b..3b92fad0f3d3c 100644
--- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -124,6 +124,7 @@ abstract class AbstractCloner implements ClonerInterface
         'SplObjectStorage' => ['Symfony\Component\VarDumper\Caster\SplCaster', 'castObjectStorage'],
         'SplPriorityQueue' => ['Symfony\Component\VarDumper\Caster\SplCaster', 'castHeap'],
         'OuterIterator' => ['Symfony\Component\VarDumper\Caster\SplCaster', 'castOuterIterator'],
+        'WeakMap' => ['Symfony\Component\VarDumper\Caster\SplCaster', 'castWeakMap'],
         'WeakReference' => ['Symfony\Component\VarDumper\Caster\SplCaster', 'castWeakReference'],
 
         'Redis' => ['Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedis'],
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
index 26887b1362765..ed93bfc4afb4b 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
@@ -213,6 +213,26 @@ public function testBadSplFileInfo()
 EOTXT;
         $this->assertDumpEquals($expected, $var);
     }
+
+    public function testWeakMap()
+    {
+        $var = new \WeakMap();
+        $obj = new \stdClass();
+        $var[$obj] = 123;
+
+        $expected = <<<EOTXT
+            WeakMap {
+              map: array:1 [
+                0 => {
+                  object: {}
+                  data: 123
+                }
+              ]
+            }
+            EOTXT;
+
+        $this->assertDumpEquals($expected, $var);
+    }
 }
 
 class MyArrayIterator extends \ArrayIterator

From 9a878526d295b5400cc3a20c263483870632c627 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 5 Dec 2022 09:57:34 +0100
Subject: [PATCH 032/475] [Notifier][Line] Fix tests

---
 .../LineNotify/Tests/LineNotifyTransportTest.php  | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php
index d315e1b377533..b7b83aac7305d 100644
--- a/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransport;
-use Symfony\Component\Notifier\Exception\LengthException;
 use Symfony\Component\Notifier\Exception\TransportException;
 use Symfony\Component\Notifier\Message\ChatMessage;
 use Symfony\Component\Notifier\Message\MessageInterface;
@@ -48,16 +47,6 @@ public function unsupportedMessagesProvider(): iterable
         yield [$this->createMock(MessageInterface::class)];
     }
 
-    public function testSendChatMessageWithMoreThan2000CharsThrowsLogicException()
-    {
-        $transport = $this->createTransport();
-
-        $this->expectException(LengthException::class);
-        $this->expectExceptionMessage('The subject length of a Line message must not exceed 1000 characters.');
-
-        $transport->send(new ChatMessage(str_repeat('囍', 1001)));
-    }
-
     public function testSendWithErrorResponseThrows()
     {
         $response = $this->createMock(ResponseInterface::class);
@@ -66,7 +55,7 @@ public function testSendWithErrorResponseThrows()
             ->willReturn(400);
         $response->expects($this->once())
             ->method('getContent')
-            ->willReturn(json_encode(['message' => 'testDescription', 'code' => 'testErrorCode']));
+            ->willReturn(json_encode(['message' => 'testDescription', 'code' => 'testErrorCode', 'status' => 'testStatus']));
 
         $client = new MockHttpClient(static function () use ($response): ResponseInterface {
             return $response;
@@ -75,7 +64,7 @@ public function testSendWithErrorResponseThrows()
         $transport = $this->createTransport($client);
 
         $this->expectException(TransportException::class);
-        $this->expectExceptionMessageMatches('/testDescription.+testErrorCode/');
+        $this->expectExceptionMessageMatches('/testMessage.+testDescription/');
 
         $transport->send(new ChatMessage('testMessage'));
     }

From c75dbca8f0d0b24f5343f79b480d2bb62041df88 Mon Sep 17 00:00:00 2001
From: Jules Pietri <heahdude@yahoo.fr>
Date: Sat, 24 Sep 2022 19:18:41 +0200
Subject: [PATCH 033/475] [DependencyInjection][HttpKernel] Introduce build
 parameters

---
 UPGRADE-6.3.md                                | 10 ++++
 .../DependencyInjection/CHANGELOG.md          |  7 +++
 .../Compiler/PassConfig.php                   | 14 +++--
 .../Compiler/RemoveBuildParametersPass.php    | 45 ++++++++++++++++
 .../DependencyInjection/Dumper/PhpDumper.php  | 30 +++++++++--
 .../Exception/ParameterNotFoundException.php  |  2 +
 .../RemoveBuildParametersPassTest.php         | 33 ++++++++++++
 .../Tests/Dumper/PhpDumperTest.php            | 25 ++++-----
 .../php/services9_inlined_factories.txt       |  2 -
 .../php/services9_lazy_inlined_factories.txt  |  2 -
 .../Fixtures/php/services_inline_requires.php | 52 -------------------
 .../Tests/ParameterBag/ParameterBagTest.php   |  1 +
 src/Symfony/Component/HttpKernel/CHANGELOG.md |  5 ++
 src/Symfony/Component/HttpKernel/Kernel.php   | 26 ++++++++++
 14 files changed, 173 insertions(+), 81 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Compiler/RemoveBuildParametersPass.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveBuildParametersPassTest.php

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index e1655bfa81b62..17e9002f0882e 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -1,6 +1,16 @@
 UPGRADE FROM 6.2 to 6.3
 =======================
 
+DependencyInjection
+-------------------
+
+ * Deprecate `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`, use `inline_factories` and `inline_class_loader` instead
+
+HttpKernel
+----------
+
+ * Deprecate parameters `container.dumper.inline_factories` and `container.dumper.inline_class_loader`, use `.container.dumper.inline_factories` and `.container.dumper.inline_class_loader` instead
+
 SecurityBundle
 --------------
 
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index b3626d02cc107..0282cd57f2823 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add options `inline_factories` and `inline_class_loader` to `PhpDumper::dump()`
+ * Deprecate `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`
+ * Add `RemoveBuildParametersPass`, which removes parameters starting with a dot during compilation
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 3acbe26de0d3c..624a97db8ae0a 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -90,11 +90,15 @@ public function __construct()
             new DefinitionErrorExceptionPass(),
         ]];
 
-        $this->afterRemovingPasses = [[
-            new ResolveHotPathPass(),
-            new ResolveNoPreloadPass(),
-            new AliasDeprecatedPublicServicesPass(),
-        ]];
+        $this->afterRemovingPasses = [
+            0 => [
+                new ResolveHotPathPass(),
+                new ResolveNoPreloadPass(),
+                new AliasDeprecatedPublicServicesPass(),
+            ],
+            // Let build parameters be available as late as possible
+            -2048 => [new RemoveBuildParametersPass()],
+        ];
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveBuildParametersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveBuildParametersPass.php
new file mode 100644
index 0000000000000..44d9fa8c64225
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveBuildParametersPass.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class RemoveBuildParametersPass implements CompilerPassInterface
+{
+    /**
+     * @var array<string, mixed>
+     */
+    private array $removedParameters = [];
+
+    public function process(ContainerBuilder $container)
+    {
+        $parameterBag = $container->getParameterBag();
+        $this->removedParameters = [];
+
+        foreach ($parameterBag->all() as $name => $value) {
+            if ('.' === ($name[0] ?? '')) {
+                $this->removedParameters[$name] = $value;
+
+                $parameterBag->remove($name);
+                $container->log($this, sprintf('Removing build parameter "%s".', $name));
+            }
+        }
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getRemovedParameters(): array
+    {
+        return $this->removedParameters;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 4d827d53e28b7..0132446bda957 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -137,8 +137,10 @@ public function dump(array $options = []): string|array
             'debug' => true,
             'hot_path_tag' => 'container.hot_path',
             'preload_tags' => ['container.preload', 'container.no_preload'],
-            'inline_factories_parameter' => 'container.dumper.inline_factories',
-            'inline_class_loader_parameter' => 'container.dumper.inline_class_loader',
+            'inline_factories_parameter' => 'container.dumper.inline_factories', // @deprecated since Symfony 6.3
+            'inline_class_loader_parameter' => 'container.dumper.inline_class_loader', // @deprecated since Symfony 6.3
+            'inline_factories' => null,
+            'inline_class_loader' => null,
             'preload_classes' => [],
             'service_locator_tag' => 'container.service_locator',
             'build_time' => time(),
@@ -149,8 +151,28 @@ public function dump(array $options = []): string|array
         $this->asFiles = $options['as_files'];
         $this->hotPathTag = $options['hot_path_tag'];
         $this->preloadTags = $options['preload_tags'];
-        $this->inlineFactories = $this->asFiles && $options['inline_factories_parameter'] && $this->container->hasParameter($options['inline_factories_parameter']) && $this->container->getParameter($options['inline_factories_parameter']);
-        $this->inlineRequires = $options['inline_class_loader_parameter'] && ($this->container->hasParameter($options['inline_class_loader_parameter']) ? $this->container->getParameter($options['inline_class_loader_parameter']) : $options['debug']);
+
+        $this->inlineFactories = false;
+        if (isset($options['inline_factories'])) {
+            $this->inlineFactories = $this->asFiles && $options['inline_factories'];
+        } elseif (!$options['inline_factories_parameter']) {
+            trigger_deprecation('symfony/dependency-injection', '6.3', 'Option "inline_factories_parameter" passed to "%s()" is deprecated, use option "inline_factories" instead.', __METHOD__);
+        } elseif ($this->container->hasParameter($options['inline_factories_parameter'])) {
+            trigger_deprecation('symfony/dependency-injection', '6.3', 'Option "inline_factories_parameter" passed to "%s()" is deprecated, use option "inline_factories" instead.', __METHOD__);
+            $this->inlineFactories = $this->asFiles && $this->container->getParameter($options['inline_factories_parameter']);
+        }
+
+        $this->inlineRequires = $options['debug'];
+        if (isset($options['inline_class_loader'])) {
+            $this->inlineRequires = $options['inline_class_loader'];
+        } elseif (!$options['inline_class_loader_parameter']) {
+            trigger_deprecation('symfony/dependency-injection', '6.3', 'Option "inline_class_loader_parameter" passed to "%s()" is deprecated, use option "inline_class_loader" instead.', __METHOD__);
+            $this->inlineRequires = false;
+        } elseif ($this->container->hasParameter($options['inline_class_loader_parameter'])) {
+            trigger_deprecation('symfony/dependency-injection', '6.3', 'Option "inline_class_loader_parameter" passed to "%s()" is deprecated, use option "inline_class_loader" instead.', __METHOD__);
+            $this->inlineRequires = $this->container->getParameter($options['inline_class_loader_parameter']);
+        }
+
         $this->serviceLocatorTag = $options['service_locator_tag'];
         $this->class = $options['class'];
 
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
index 71c36f6866411..e8f593187e9a7 100644
--- a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
+++ b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
@@ -53,6 +53,8 @@ public function updateRepr()
             $this->message = sprintf('The service "%s" has a dependency on a non-existent parameter "%s".', $this->sourceId, $this->key);
         } elseif (null !== $this->sourceKey) {
             $this->message = sprintf('The parameter "%s" has a dependency on a non-existent parameter "%s".', $this->sourceKey, $this->key);
+        } elseif ('.' === ($this->key[0] ?? '')) {
+            $this->message = sprintf('Parameter "%s" not found. It was probably deleted during the compilation of the container.', $this->key);
         } else {
             $this->message = sprintf('You have requested a non-existent parameter "%s".', $this->key);
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveBuildParametersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveBuildParametersPassTest.php
new file mode 100644
index 0000000000000..4bc3b78ec0b1f
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveBuildParametersPassTest.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\RemoveBuildParametersPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class RemoveBuildParametersPassTest extends TestCase
+{
+    public function testBuildParametersShouldBeRemoved()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setParameter('foo', 'Foo');
+        $builder->setParameter('.bar', 'Bar');
+
+        $pass = new RemoveBuildParametersPass();
+        $pass->process($builder);
+
+        $this->assertSame('Foo', $builder->getParameter('foo'), '"foo" parameter must be defined.');
+        $this->assertFalse($builder->hasParameter('.bar'), '".bar" parameter must be removed.');
+        $this->assertSame(['.bar' => 'Bar'], $pass->getRemovedParameters(), '".baz" parameter must be returned with its value.');
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 12d5b80f8baf3..816787154a364 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -222,7 +222,7 @@ public function testDumpAsFiles()
             ->addError('No-no-no-no');
         $container->compile();
         $dumper = new PhpDumper($container);
-        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'inline_factories_parameter' => false, 'inline_class_loader_parameter' => false]), true);
+        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'inline_factories' => false, 'inline_class_loader' => false]), true);
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);
         }
@@ -241,7 +241,7 @@ public function testDumpAsFilesWithTypedReference()
             ->setPublic(true);
         $container->compile();
         $dumper = new PhpDumper($container);
-        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'inline_factories_parameter' => false, 'inline_class_loader_parameter' => false]), true);
+        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'inline_factories' => false, 'inline_class_loader' => false]), true);
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);
         }
@@ -252,8 +252,6 @@ public function testDumpAsFilesWithTypedReference()
     public function testDumpAsFilesWithFactoriesInlined()
     {
         $container = include self::$fixturesPath.'/containers/container9.php';
-        $container->setParameter('container.dumper.inline_factories', true);
-        $container->setParameter('container.dumper.inline_class_loader', true);
 
         $container->getDefinition('bar')->addTag('hot');
         $container->register('non_shared_foo', \Bar\FooClass::class)
@@ -268,7 +266,7 @@ public function testDumpAsFilesWithFactoriesInlined()
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'build_time' => 1563381341]), true);
+        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'build_time' => 1563381341, 'inline_factories' => true, 'inline_class_loader' => true]), true);
 
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);
@@ -279,8 +277,6 @@ public function testDumpAsFilesWithFactoriesInlined()
     public function testDumpAsFilesWithLazyFactoriesInlined()
     {
         $container = new ContainerBuilder();
-        $container->setParameter('container.dumper.inline_factories', true);
-        $container->setParameter('container.dumper.inline_class_loader', true);
         $container->setParameter('lazy_foo_class', \Bar\FooClass::class);
 
         $container->register('lazy_foo', '%lazy_foo_class%')
@@ -292,7 +288,7 @@ public function testDumpAsFilesWithLazyFactoriesInlined()
         $container->compile();
 
         $dumper = new PhpDumper($container);
-        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'build_time' => 1563381341]), true);
+        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'build_time' => 1563381341, 'inline_factories' => true, 'inline_class_loader' => true]), true);
 
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);
@@ -310,7 +306,7 @@ public function testNonSharedLazyDumpAsFiles()
             ->setLazy(true);
         $container->compile();
         $dumper = new PhpDumper($container);
-        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'inline_factories_parameter' => false, 'inline_class_loader_parameter' => false]), true);
+        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'inline_factories' => false, 'inline_class_loader' => false]), true);
 
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);
@@ -473,7 +469,7 @@ public function testEnvParameter()
         $container->compile();
         $dumper = new PhpDumper($container);
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services26.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_EnvParameters', 'file' => self::$fixturesPath.'/php/services26.php', 'inline_factories_parameter' => false, 'inline_class_loader_parameter' => false]));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services26.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_EnvParameters', 'file' => self::$fixturesPath.'/php/services26.php', 'inline_factories' => false, 'inline_class_loader' => false]));
 
         require self::$fixturesPath.'/php/services26.php';
         $container = new \Symfony_DI_PhpDumper_Test_EnvParameters();
@@ -994,7 +990,7 @@ public function testArrayParameters()
 
         $dumper = new PhpDumper($container);
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_array_params.php', str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dumper->dump(['file' => self::$fixturesPath.'/php/services_array_params.php', 'inline_factories_parameter' => false, 'inline_class_loader_parameter' => false])));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_array_params.php', str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dumper->dump(['file' => self::$fixturesPath.'/php/services_array_params.php', 'inline_factories' => false, 'inline_class_loader' => false])));
     }
 
     public function testExpressionReferencingPrivateService()
@@ -1162,11 +1158,10 @@ public function testInlineSelfRef()
     public function testHotPathOptimizations()
     {
         $container = include self::$fixturesPath.'/containers/container_inline_requires.php';
-        $container->setParameter('inline_requires', true);
         $container->compile();
         $dumper = new PhpDumper($container);
 
-        $dump = $dumper->dump(['hot_path_tag' => 'container.hot_path', 'inline_class_loader_parameter' => 'inline_requires', 'file' => self::$fixturesPath.'/php/services_inline_requires.php']);
+        $dump = $dumper->dump(['hot_path_tag' => 'container.hot_path', 'inline_class_loader' => true, 'file' => self::$fixturesPath.'/php/services_inline_requires.php']);
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $dump = str_replace("'.\\DIRECTORY_SEPARATOR.'", '/', $dump);
         }
@@ -1199,13 +1194,12 @@ public function testDumpHandlesObjectClassNames()
             new Reference('foo'),
         ]))->setPublic(true);
 
-        $container->setParameter('inline_requires', true);
         $container->compile();
 
         $dumper = new PhpDumper($container);
         eval('?>'.$dumper->dump([
             'class' => 'Symfony_DI_PhpDumper_Test_Object_Class_Name',
-            'inline_class_loader_parameter' => 'inline_requires',
+            'inline_class_loader' => true,
         ]));
 
         $container = new \Symfony_DI_PhpDumper_Test_Object_Class_Name();
@@ -1281,7 +1275,6 @@ public function testUninitializedSyntheticReference()
         $dumper = new PhpDumper($container);
         eval('?>'.$dumper->dump([
             'class' => 'Symfony_DI_PhpDumper_Test_UninitializedSyntheticReference',
-            'inline_class_loader_parameter' => 'inline_requires',
         ]));
 
         $container = new \Symfony_DI_PhpDumper_Test_UninitializedSyntheticReference();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
index 230bb357db000..137506abdf4b0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
@@ -557,8 +557,6 @@ class ProjectServiceContainer extends Container
             'baz_class' => 'BazClass',
             'foo_class' => 'Bar\\FooClass',
             'foo' => 'bar',
-            'container.dumper.inline_factories' => true,
-            'container.dumper.inline_class_loader' => true,
         ];
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
index 7af59984549ae..aa8c5da006f30 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -143,8 +143,6 @@ class ProjectServiceContainer extends Container
     protected function getDefaultParameters(): array
     {
         return [
-            'container.dumper.inline_factories' => true,
-            'container.dumper.inline_class_loader' => true,
             'lazy_foo_class' => 'Bar\\FooClass',
         ];
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
index 386e5a5d0d739..d0509ad594369 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
@@ -18,8 +18,6 @@ class ProjectServiceContainer extends Container
 
     public function __construct()
     {
-        $this->parameters = $this->getDefaultParameters();
-
         $this->services = $this->privates = [];
         $this->methodMap = [
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\ParentNotExists' => 'getParentNotExistsService',
@@ -86,54 +84,4 @@ protected function getC2Service()
 
         return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C2'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2(new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3());
     }
-
-    public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
-    {
-        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
-            throw new ParameterNotFoundException($name);
-        }
-        if (isset($this->loadedDynamicParameters[$name])) {
-            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
-        }
-
-        return $this->parameters[$name];
-    }
-
-    public function hasParameter(string $name): bool
-    {
-        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
-    }
-
-    public function setParameter(string $name, $value): void
-    {
-        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
-    }
-
-    public function getParameterBag(): ParameterBagInterface
-    {
-        if (null === $this->parameterBag) {
-            $parameters = $this->parameters;
-            foreach ($this->loadedDynamicParameters as $name => $loaded) {
-                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
-            }
-            $this->parameterBag = new FrozenParameterBag($parameters);
-        }
-
-        return $this->parameterBag;
-    }
-
-    private $loadedDynamicParameters = [];
-    private $dynamicParameters = [];
-
-    private function getDynamicParameter(string $name)
-    {
-        throw new ParameterNotFoundException($name);
-    }
-
-    protected function getDefaultParameters(): array
-    {
-        return [
-            'inline_requires' => true,
-        ];
-    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php
index 7539da5d2ae6b..e97ec063e52a8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php
@@ -121,6 +121,7 @@ public function provideGetThrowParameterNotFoundExceptionData()
             ['', 'You have requested a non-existent parameter "".'],
 
             ['fiz.bar.boo', 'You have requested a non-existent parameter "fiz.bar.boo". You cannot access nested array items, do you want to inject "fiz" instead?'],
+            ['.foo', 'Parameter ".foo" not found. It was probably deleted during the compilation of the container. Did you mean this: "foo"?'],
         ];
     }
 
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 2a5aad623bfeb..3122668e697cb 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Deprecate parameters `container.dumper.inline_factories` and `container.dumper.inline_class_loader`, use `.container.dumper.inline_factories` and `.container.dumper.inline_class_loader` instead
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 20a47dce86719..96bb3d6a9627c 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+use Symfony\Component\DependencyInjection\Compiler\RemoveBuildParametersPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
@@ -648,12 +649,37 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
         // cache the container
         $dumper = new PhpDumper($container);
 
+        $buildParameters = [];
+        foreach ($container->getCompilerPassConfig()->getPasses() as $pass) {
+            if ($pass instanceof RemoveBuildParametersPass) {
+                $buildParameters = array_merge($buildParameters, $pass->getRemovedParameters());
+            }
+        }
+
+        $inlineFactories = false;
+        if (isset($buildParameters['.container.dumper.inline_factories'])) {
+            $inlineFactories = $buildParameters['.container.dumper.inline_factories'];
+        } elseif ($container->hasParameter('container.dumper.inline_factories')) {
+            trigger_deprecation('symfony/http-kernel', '6.3', 'Parameter "%s" is deprecated, use ".%$1s" instead.', 'container.dumper.inline_factories');
+            $inlineFactories = $container->getParameter('container.dumper.inline_factories');
+        }
+
+        $inlineClassLoader = $this->debug;
+        if (isset($buildParameters['.container.dumper.inline_class_loader'])) {
+            $inlineClassLoader = $buildParameters['.container.dumper.inline_class_loader'];
+        } elseif ($container->hasParameter('container.dumper.inline_class_loader')) {
+            trigger_deprecation('symfony/http-kernel', '6.3', 'Parameter "%s" is deprecated, use ".%$1s" instead.', 'container.dumper.inline_class_loader');
+            $inlineClassLoader = $container->getParameter('container.dumper.inline_class_loader');
+        }
+
         $content = $dumper->dump([
             'class' => $class,
             'base_class'
10000
 => $baseClass,
             'file' => $cache->getPath(),
             'as_files' => true,
             'debug' => $this->debug,
+            'inline_factories' => $inlineFactories,
+            'inline_class_loader' => $inlineClassLoader,
             'build_time' => $container->hasParameter('kernel.container_build_time') ? $container->getParameter('kernel.container_build_time') : time(),
             'preload_classes' => array_map('get_class', $this->bundles),
         ]);

From a9f1250c1e40664e59d9f7ee76aa4e7e9783e52a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Mon, 5 Dec 2022 16:50:37 +0100
Subject: [PATCH 034/475] [Console] Do no preprend empty line if the buffer is
 empty

---
 src/Symfony/Component/Console/Style/SymfonyStyle.php  |  2 +-
 .../Style/SymfonyStyle/command/command_23.php         | 11 +++++++++++
 .../Fixtures/Style/SymfonyStyle/output/output_23.txt  |  1 +
 .../Fixtures/Style/SymfonyStyle/output/output_6.txt   |  1 -
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_23.php
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_23.txt

diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
index 997f86279d918..4dde785e86420 100644
--- a/src/Symfony/Component/Console/Style/SymfonyStyle.php
+++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -375,7 +375,7 @@ private function autoPrependText(): void
     {
         $fetched = $this->bufferedOutput->fetch();
         // Prepend new line if last char isn't EOL:
-        if (!str_ends_with($fetched, "\n")) {
+        if ($fetched && !str_ends_with($fetched, "\n")) {
             $this->newLine();
         }
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_23.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_23.php
new file mode 100644
index 0000000000000..ab32dcaf3e7bf
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_23.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+// ensure that nested tags have no effect on the color of the '//' prefix
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->text('Hello');
+};
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_23.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_23.txt
new file mode 100644
index 0000000000000..63105f17b862b
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_23.txt
@@ -0,0 +1 @@
+ Hello
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt
index 5f2d33c148a9e..7f1d478a325f7 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt
@@ -1,4 +1,3 @@
-
  * Lorem ipsum dolor sit amet
  * consectetur adipiscing elit
 

From 1e40f0faedcb30b01c0dfd1ad8bffc054d914345 Mon Sep 17 00:00:00 2001
From: gnito-org <70450336+gnito-org@users.noreply.github.com>
Date: Mon, 5 Dec 2022 13:22:50 -0400
Subject: [PATCH 035/475] [Notifier] Fix Termii bridge exception test

---
 .../Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 0af7287f60b6a..fa7c299d42674 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -56,6 +56,7 @@
 use Symfony\Component\Notifier\Bridge\SpotHit\SpotHitTransportFactory;
 use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransportFactory;
 use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
+use Symfony\Component\Notifier\Bridge\Termii\TermiiTransportFactory;
 use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
 use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransportFactory;
@@ -118,6 +119,7 @@ public static function setUpBeforeClass(): void
             SpotHitTransportFactory::class => false,
             TelegramTransportFactory::class => false,
             TelnyxTransportFactory::class => false,
+            TermiiTransportFactory::class => false,
             TurboSmsTransportFactory::class => false,
             TwilioTransportFactory::class => false,
             TwitterTransportFactory::class => false,

From 795afb1f45286fffdda2ab741808f0c08ed70d22 Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Mon, 5 Dec 2022 20:27:29 +0100
Subject: [PATCH 036/475] [DependencyInjection] Fix typo in
 RemoveBuildParametersPassTest

---
 .../Tests/Compiler/RemoveBuildParametersPassTest.php            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveBuildParametersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveBuildParametersPassTest.php
index 4bc3b78ec0b1f..4982f626968ca 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveBuildParametersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveBuildParametersPassTest.php
@@ -28,6 +28,6 @@ public function testBuildParametersShouldBeRemoved()
 
         $this->assertSame('Foo', $builder->getParameter('foo'), '"foo" parameter must be defined.');
         $this->assertFalse($builder->hasParameter('.bar'), '".bar" parameter must be removed.');
-        $this->assertSame(['.bar' => 'Bar'], $pass->getRemovedParameters(), '".baz" parameter must be returned with its value.');
+        $this->assertSame(['.bar' => 'Bar'], $pass->getRemovedParameters(), '".bar" parameter must be returned with its value.');
     }
 }

From b65b78b8c5576a6a1660d3e0b1cbccee271dc334 Mon Sep 17 00:00:00 2001
From: gnito-org <70450336+gnito-org@users.noreply.github.com>
Date: Mon, 5 Dec 2022 13:26:08 -0400
Subject: [PATCH 037/475] [Notifier] Fix RingCentral bridge exception test

---
 .../Tests/Exception/UnsupportedSchemeExceptionTest.php         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 8dd5d8d92c1a7..b3ea68a180aa5 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -45,7 +45,10 @@
 use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
 use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
+<<<<<<< HEAD
 use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
+=======
+>>>>>>> d8597449e5 ([Notifier] Fix RingCentral bridge exception test)
 use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;

From be77a1f4873650888ad9b36028ea3e9670e6097a Mon Sep 17 00:00:00 2001
From: gnito-org <70450336+gnito-org@users.noreply.github.com>
Date: Mon, 5 Dec 2022 16:57:06 -0400
Subject: [PATCH 038/475] [Notifier] Add options to SmsMessage

---
 .../Component/Notifier/Message/SmsMessage.php    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Message/SmsMessage.php b/src/Symfony/Component/Notifier/Message/SmsMessage.php
index b4369b4236565..7a0ef9ac6d096 100644
--- a/src/Symfony/Component/Notifier/Message/SmsMessage.php
+++ b/src/Symfony/Component/Notifier/Message/SmsMessage.php
@@ -24,8 +24,9 @@ class SmsMessage implements MessageInterface
     private string $subject;
     private string $phone;
     private string $from;
+    private ?MessageOptionsInterface $options;
 
-    public function __construct(string $phone, string $subject, string $from = '')
+    public function __construct(string $phone, string $subject, string $from = '', MessageOptionsInterface $options = null)
     {
         if ('' === $phone) {
             throw new InvalidArgumentException(sprintf('"%s" needs a phone number, it cannot be empty.', __CLASS__));
@@ -34,6 +35,7 @@ public function __construct(string $phone, string $subject, string $from = '')
         $this->subject = $subject;
         $this->phone = $phone;
         $this->from = $from;
+        $this->options = $options;
     }
 
     public static function fromNotification(Notification $notification, SmsRecipientInterface $recipient): self
@@ -110,8 +112,18 @@ public function getFrom(): string
         return $this->from;
     }
 
+    /**
+     * @return $this
+     */
+    public function options(MessageOptionsInterface $options): static
+    {
+        $this->options = $options;
+
+        return $this;
+    }
+
     public function getOptions(): ?MessageOptionsInterface
     {
-        return null;
+        return $this->options;
     }
 }

From 52b6fa74162e02db0c33387e4cc8187d5fb8208f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 5 Dec 2022 15:38:26 +0100
Subject: [PATCH 039/475] [ProxyManagerBridge] Deprecate the package

---
 .../Tests/LegacyManagerRegistryTest.php       | 136 ++++++++++++++++++
 .../Doctrine/Tests/ManagerRegistryTest.php    |  63 ++++----
 .../Doctrine/Tests/TestManagerRegistry.php    |  27 ++++
 src/Symfony/Bridge/Doctrine/composer.json     |   5 +-
 src/Symfony/Bridge/ProxyManager/CHANGELOG.md  |   5 +
 .../Instantiator/RuntimeInstantiator.php      |   4 +
 .../LazyProxy/PhpDumper/ProxyDumper.php       |   4 +
 .../Tests/LazyProxy/ContainerBuilderTest.php  |   2 +
 .../Tests/LazyProxy/Dumper/PhpDumperTest.php  |   2 +
 .../Instantiator/RuntimeInstantiatorTest.php  |   2 +
 .../LazyProxy/PhpDumper/ProxyDumperTest.php   |   2 +
 src/Symfony/Bridge/ProxyManager/composer.json |   3 +-
 12 files changed, 213 insertions(+), 42 deletions(-)
 create mode 100644 src/Symfony/Bridge/Doctrine/Tests/LegacyManagerRegistryTest.php
 create mode 100644 src/Symfony/Bridge/Doctrine/Tests/TestManagerRegistry.php

diff --git a/src/Symfony/Bridge/Doctrine/Tests/LegacyManagerRegistryTest.php b/src/Symfony/Bridge/Doctrine/Tests/LegacyManagerRegistryTest.php
new file mode 100644
index 0000000000000..2989d0b61f228
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Tests/LegacyManagerRegistryTest.php
@@ -0,0 +1,136 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests;
+
+use PHPUnit\Framework\TestCase;
+use ProxyManager\Proxy\LazyLoadingInterface;
+use ProxyManager\Proxy\ValueHolderInterface;
+use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
+use Symfony\Bridge\ProxyManager\Tests\LazyProxy\Dumper\PhpDumperTest;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\Filesystem\Filesystem;
+
+/**
+ * @group legacy
+ */
+class LegacyManagerRegistryTest extends TestCase
+{
+    public static function setUpBeforeClass(): void
+    {
+        $test = new PhpDumperTest();
+        $test->testDumpContainerWithProxyServiceWillShareProxies();
+    }
+
+    public function testResetService()
+    {
+        $container = new \LazyServiceProjectServiceContainer();
+
+        $registry = new TestManagerRegistry('name', [], ['defaultManager' => 'foo'], 'defaultConnection', 'defaultManager', 'proxyInterfaceName');
+        $registry->setTestContainer($container);
+
+        $foo = $container->get('foo');
+        $foo->bar = 123;
+        $this->assertTrue(isset($foo->bar));
+
+        $registry->resetManager();
+
+        $this->assertSame($foo, $container->get('foo'));
+        $this->assertObjectNotHasAttribute('bar', $foo);
+    }
+
+    /**
+     * When performing an entity manager lazy service reset, the reset operations may re-use the container
+     * to create a "fresh" service: when doing so, it can happen that the "fresh" service is itself a proxy.
+     *
+     * Because of that, the proxy will be populated with a wrapped value that is itself a proxy: repeating
+     * the reset operation keeps increasing this nesting until the application eventually runs into stack
+     * overflow or memory overflow operations, which can happen for long-running processes that rely on
+     * services that are reset very often.
+     */
+    public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()
+    {
+        // This test scenario only applies to containers composed as a set of generated sources
+        $this->dumpLazyServiceProjectAsFilesServiceContainer();
+
+        /** @var ContainerInterface $container */
+        $container = new \LazyServiceProjectAsFilesServiceContainer();
+
+        $registry = new TestManagerRegistry(
+            'irrelevant',
+            [],
+            ['defaultManager' => 'foo'],
+            'irrelevant',
+            'defaultManager',
+            'irrelevant'
+        );
+        $registry->setTestContainer($container);
+
+        $service = $container->get('foo');
+
+        self::assertInstanceOf(\stdClass::class, $service);
+        self::assertInstanceOf(LazyLoadingInterface::class, $service);
+        self::assertInstanceOf(ValueHolderInterface::class, $service);
+        self::assertFalse($service->isProxyInitialized());
+
+        $service->initializeProxy();
+
+        self::assertTrue($container->initialized('foo'));
+        self::assertTrue($service->isProxyInitialized());
+
+        $registry->resetManager();
+        $service->initializeProxy();
+
+        $wrappedValue = $service->getWrappedValueHolderValue();
+        self::assertInstanceOf(\stdClass::class, $wrappedValue);
+        self::assertNotInstanceOf(LazyLoadingInterface::class, $wrappedValue);
+        self::assertNotInstanceOf(ValueHolderInterface::class, $wrappedValue);
+    }
+
+    private function dumpLazyServiceProjectAsFilesServiceContainer()
+    {
+        if (class_exists(\LazyServiceProjectAsFilesServiceContainer::class, false)) {
+            return;
+        }
+
+        $container = new ContainerBuilder();
+
+        $container->register('foo', \stdClass::class)
+            ->setPublic(true)
+            ->setLazy(true);
+        $container->compile();
+
+        $fileSystem = new Filesystem();
+
+        $temporaryPath = $fileSystem->tempnam(sys_get_temp_dir(), 'symfonyManagerRegistryTest');
+        $fileSystem->remove($temporaryPath);
+        $fileSystem->mkdir($temporaryPath);
+
+        $dumper = new PhpDumper($container);
+
+        $dumper->setProxyDumper(new ProxyDumper());
+        $containerFiles = $dumper->dump([
+            'class' => 'LazyServiceProjectAsFilesServiceContainer',
+            'as_files' => true,
+        ]);
+
+        array_walk(
+            $containerFiles,
+            static function (string $containerSources, string $fileName) use ($temporaryPath): void {
+                (new Filesystem())->dumpFile($temporaryPath.'/'.$fileName, $containerSources);
+            }
+        );
+
+        require $temporaryPath.'/LazyServiceProjectAsFilesServiceContainer.php';
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
index dd7dabcc87db1..e1948356df648 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php
@@ -12,27 +12,29 @@
 namespace Symfony\Bridge\Doctrine\Tests;
 
 use PHPUnit\Framework\TestCase;
-use ProxyManager\Proxy\LazyLoadingInterface;
-use ProxyManager\Proxy\ValueHolderInterface;
-use Symfony\Bridge\Doctrine\ManagerRegistry;
-use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
-use Symfony\Bridge\ProxyManager\Tests\LazyProxy\Dumper\PhpDumperTest;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\VarExporter\LazyObjectInterface;
 
 class ManagerRegistryTest extends TestCase
 {
     public static function setUpBeforeClass(): void
     {
-        $test = new PhpDumperTest();
-        $test->testDumpContainerWithProxyServiceWillShareProxies();
+        $container = new ContainerBuilder();
+
+        $container->register('foo', \stdClass::class)->setPublic(true);
+        $container->getDefinition('foo')->setLazy(true)->addTag('proxy', ['interface' => \stdClass::class]);
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        eval('?>'.$dumper->dump(['class' => 'LazyServiceDoctrineBridgeContainer']));
     }
 
     public function testResetService()
     {
-        $container = new \LazyServiceProjectServiceContainer();
+        $container = new \LazyServiceDoctrineBridgeContainer();
 
         $registry = new TestManagerRegistry('name', [], ['defaultManager' => 'foo'], 'defaultConnection', 'defaultManager', 'proxyInterfaceName');
         $registry->setTestContainer($container);
@@ -59,10 +61,10 @@ public function testResetService()
     public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()
     {
         // This test scenario only applies to containers composed as a set of generated sources
-        $this->dumpLazyServiceProjectAsFilesServiceContainer();
+        $this->dumpLazyServiceDoctrineBridgeContainerAsFiles();
 
         /** @var ContainerInterface $container */
-        $container = new \LazyServiceProjectAsFilesServiceContainer();
+        $container = new \LazyServiceDoctrineBridgeContainerAsFiles();
 
         $registry = new TestManagerRegistry(
             'irrelevant',
@@ -77,27 +79,25 @@ public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()
         $service = $container->get('foo');
 
         self::assertInstanceOf(\stdClass::class, $service);
-        self::assertInstanceOf(LazyLoadingInterface::class, $service);
-        self::assertInstanceOf(ValueHolderInterface::class, $service);
-        self::assertFalse($service->isProxyInitialized());
+        self::assertInstanceOf(LazyObjectInterface::class, $service);
+        self::assertFalse($service->isLazyObjectInitialized());
 
-        $service->initializeProxy();
+        $service->initializeLazyObject();
 
         self::assertTrue($container->initialized('foo'));
-        self::assertTrue($service->isProxyInitialized());
+        self::assertTrue($service->isLazyObjectInitialized());
 
         $registry->resetManager();
-        $service->initializeProxy();
+        $service->initializeLazyObject();
 
-        $wrappedValue = $service->getWrappedValueHolderValue();
+        $wrappedValue = $service->initializeLazyObject();
         self::assertInstanceOf(\stdClass::class, $wrappedValue);
-        self::assertNotInstanceOf(LazyLoadingInterface::class, $wrappedValue);
-        self::assertNotInstanceOf(ValueHolderInterface::class, $wrappedValue);
+        self::assertNotInstanceOf(LazyObjectInterface::class, $wrappedValue);
     }
 
-    private function dumpLazyServiceProjectAsFilesServiceContainer()
+    private function dumpLazyServiceDoctrineBridgeContainerAsFiles()
     {
-        if (class_exists(\LazyServiceProjectAsFilesServiceContainer::class, false)) {
+        if (class_exists(\LazyServiceDoctrineBridgeContainerAsFiles::class, false)) {
             return;
         }
 
@@ -105,7 +105,8 @@ private function dumpLazyServiceProjectAsFilesServiceContainer()
 
         $container->register('foo', \stdClass::class)
             ->setPublic(true)
-            ->setLazy(true);
+            ->setLazy(true)
+            ->addTag('proxy', ['interface' => \stdClass::class]);
         $container->compile();
 
         $fileSystem = new Filesystem();
@@ -116,9 +117,8 @@ private function dumpLazyServiceProjectAsFilesServiceContainer()
 
         $dumper = new PhpDumper($container);
 
-        $dumper->setProxyDumper(new ProxyDumper());
         $containerFiles = $dumper->dump([
-            'class' => 'LazyServiceProjectAsFilesServiceContainer',
+            'class' => 'LazyServiceDoctrineBridgeContainerAsFiles',
             'as_files' => true,
         ]);
 
@@ -129,19 +129,6 @@ static function (string $containerSources, string $fileName) use ($temporaryPath
             }
         );
 
-        require $temporaryPath.'/LazyServiceProjectAsFilesServiceContainer.php';
-    }
-}
-
-class TestManagerRegistry extends ManagerRegistry
-{
-    public function setTestContainer($container)
-    {
-        $this->container = $container;
-    }
-
-    public function getAliasNamespace($alias): string
-    {
-        return 'Foo';
+        require $temporaryPath.'/LazyServiceDoctrineBridgeContainerAsFiles.php';
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/TestManagerRegistry.php b/src/Symfony/Bridge/Doctrine/Tests/TestManagerRegistry.php
new file mode 100644
index 0000000000000..aae7ca27df6b2
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Tests/TestManagerRegistry.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests;
+
+use Symfony\Bridge\Doctrine\ManagerRegistry;
+
+class TestManagerRegistry extends ManagerRegistry
+{
+    public function setTestContainer($container)
+    {
+        $this->container = $container;
+    }
+
+    public function getAliasNamespace($alias): string
+    {
+        return 'Foo';
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 5cc4a280a47b0..318fc379711e1 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -28,14 +28,13 @@
         "symfony/stopwatch": "^5.4|^6.0",
         "symfony/cache": "^5.4|^6.0",
         "symfony/config": "^5.4|^6.0",
-        "symfony/dependency-injection": "^5.4|^6.0",
+        "symfony/dependency-injection": "^6.2",
         "symfony/form": "^5.4.9|^6.0.9",
         "symfony/http-kernel": "^6.2",
         "symfony/messenger": "^5.4|^6.0",
         "symfony/doctrine-messenger": "^5.4|^6.0",
         "symfony/property-access": "^5.4|^6.0",
         "symfony/property-info": "^5.4|^6.0",
-        "symfony/proxy-manager-bridge": "^5.4|^6.0",
         "symfony/security-core": "^6.0",
         "symfony/expression-language": "^5.4|^6.0",
         "symfony/uid": "^5.4|^6.0",
@@ -55,7 +54,7 @@
         "doctrine/orm": "<2.7.4",
         "phpunit/phpunit": "<5.4.3",
         "symfony/cache": "<5.4",
-        "symfony/dependency-injection": "<5.4",
+        "symfony/dependency-injection": "<6.2",
         "symfony/form": "<5.4",
         "symfony/http-kernel": "<6.2",
         "symfony/messenger": "<5.4",
diff --git a/src/Symfony/Bridge/ProxyManager/CHANGELOG.md b/src/Symfony/Bridge/ProxyManager/CHANGELOG.md
index 3435a4a186494..5ba6cdaf730a1 100644
--- a/src/Symfony/Bridge/ProxyManager/CHANGELOG.md
+++ b/src/Symfony/Bridge/ProxyManager/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Deprecate the bridge
+
 4.2.0
 -----
 
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php
index 59fcdc022efce..590dc2108e372 100644
--- a/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php
+++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php
@@ -21,10 +21,14 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\InstantiatorInterface;
 
+trigger_deprecation('symfony/proxy-manager-bridge', '6.3', 'The "symfony/proxy-manager-bridge" package is deprecated and can be removed from your dependencies.');
+
 /**
  * Runtime lazy loading proxy generator.
  *
  * @author Marco Pivetta <ocramius@gmail.com>
+ *
+ * @deprecated since Symfony 6.3
  */
 class RuntimeInstantiator implements InstantiatorInterface
 {
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
index 82ff95dc4cc93..b5f3560a4f401 100644
--- a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
+++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -17,11 +17,15 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface;
 
+trigger_deprecation('symfony/proxy-manager-bridge', '6.3', 'The "symfony/proxy-manager-bridge" package is deprecated and can be removed from your dependencies.');
+
 /**
  * Generates dumped PHP code of proxies via reflection.
  *
  * @author Marco Pivetta <ocramius@gmail.com>
  *
+ * @deprecated since Symfony 6.3
+ *
  * @final
  */
 class ProxyDumper implements DumperInterface
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php
index 0967f1b1d5b23..b3a470ac0490a 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php
@@ -24,6 +24,8 @@
  * with the ProxyManager bridge.
  *
  * @author Marco Pivetta <ocramius@gmail.com>
+ *
+ * @group legacy
  */
 class ContainerBuilderTest extends TestCase
 {
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php
index aedfff33c56c5..32992796c0ebf 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php
@@ -22,6 +22,8 @@
  * with the ProxyManager bridge.
  *
  * @author Marco Pivetta <ocramius@gmail.com>
+ *
+ * @group legacy
  */
 class PhpDumperTest extends TestCase
 {
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php
index fc04526ced826..fe76f50c53284 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php
@@ -22,6 +22,8 @@
  * Tests for {@see \Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator}.
  *
  * @author Marco Pivetta <ocramius@gmail.com>
+ *
+ * @group legacy
  */
 class RuntimeInstantiatorTest extends TestCase
 {
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
index 2d7428fac8d4d..61630b3e46938 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -20,6 +20,8 @@
  * Tests for {@see \Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper}.
  *
  * @author Marco Pivetta <ocramius@gmail.com>
+ *
+ * @group legacy
  */
 class ProxyDumperTest extends TestCase
 {
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
index 1e4333d8ad96d..23218d85df43b 100644
--- a/src/Symfony/Bridge/ProxyManager/composer.json
+++ b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -18,7 +18,8 @@
     "require": {
         "php": ">=8.1",
         "friendsofphp/proxy-manager-lts": "^1.0.2",
-        "symfony/dependency-injection": "^6.2"
+        "symfony/dependency-injection": "^6.2",
+        "symfony/deprecation-contracts": "^2.1|^3"
     },
     "require-dev": {
         "symfony/config": "^6.1"

From f3a9a0e2f22bd67074b596493a7e94779eb356e3 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Thu, 8 Dec 2022 08:22:17 +0100
Subject: [PATCH 040/475] Fix Composer package name

---
 src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json b/src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json
index 43a173bf48812..cc0d90774fb73 100644
--- a/src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "symfony/line-notifier",
+    "name": "symfony/line-notify-notifier",
     "type": "symfony-notifier-bridge",
     "description": "Provides LINE Notify integration for Symfony Notifier.",
     "keywords": ["line", "notifier", "chat"],

From 87a7058f6513b4642dd97c2b24b7ca818b388e57 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Thu, 8 Dec 2022 14:58:23 +0100
Subject: [PATCH 041/475] [Notifier] Remove dependency `symfony/uid` on
 Notifier bridges

---
 .../ContactEveryone/Tests/ContactEveryoneTransportTest.php     | 3 +--
 .../Component/Notifier/Bridge/ContactEveryone/composer.json    | 3 ---
 .../Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php     | 3 +--
 src/Symfony/Component/Notifier/Bridge/Esendex/composer.json    | 3 ---
 src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json  | 3 ---
 .../Component/Notifier/Bridge/SmsFactor/SmsFactorTransport.php | 3 +--
 src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json  | 3 +--
 7 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportTest.php b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportTest.php
index fef60a4c1c0d9..97194efdd87be 100644
--- a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportTest.php
@@ -18,7 +18,6 @@
 use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
-use Symfony\Component\Uid\Uuid;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
@@ -47,7 +46,7 @@ public function unsupportedMessagesProvider(): iterable
 
     public function testSendSuccessfully()
     {
-        $messageId = Uuid::v4()->toRfc4122();
+        $messageId = bin2hex(random_bytes(7));
         $response = $this->createMock(ResponseInterface::class);
         $response->method('getStatusCode')->willReturn(200);
         $response->method('getContent')->willReturn($messageId);
diff --git a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/composer.json b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/composer.json
index 8f765ab71f1f8..f47e713dcc63f 100644
--- a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/composer.json
@@ -20,9 +20,6 @@
         "symfony/http-client": "^5.4|^6.0",
         "symfony/notifier": "^6.2"
     },
-    "require-dev": {
-        "symfony/uid": "^5.4|^6.0"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\ContactEveryone\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php
index 4d197428815d7..cde836ae55607 100644
--- a/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php
@@ -18,7 +18,6 @@
 use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
-use Symfony\Component\Uid\Uuid;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
@@ -88,7 +87,7 @@ public function testSendWithErrorResponseContainingDetailsThrowsTransportExcepti
 
     public function testSendWithSuccessfulResponseDispatchesMessageEvent()
     {
-        $messageId = Uuid::v4()->toRfc4122();
+        $messageId = bin2hex(random_bytes(7));
         $response = $this->createMock(ResponseInterface::class);
         $response->expects($this->exactly(2))
             ->method('getStatusCode')
diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json b/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json
index 63422b2d5d40c..e6ea519dcfa87 100644
--- a/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json
@@ -20,9 +20,6 @@
         "symfony/http-client": "^5.4|^6.0",
         "symfony/notifier": "^6.2"
     },
-    "require-dev": {
-        "symfony/uid": "^5.4|^6.0"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Esendex\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json b/src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json
index 72f9dffc56bac..ee2fd7443d254 100644
--- a/src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json
@@ -20,9 +20,6 @@
         "symfony/http-client": "^5.4|^6.0",
         "symfony/notifier": "^6.2"
     },
-    "require-dev": {
-        "symfony/uid": "^5.4|^6.0"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\OrangeSms\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Notifier/Bridge/SmsFactor/SmsFactorTransport.php b/src/Symfony/Component/Notifier/Bridge/SmsFactor/SmsFactorTransport.php
index 494ac96ad8f28..0032d3c9510f8 100644
--- a/src/Symfony/Component/Notifier/Bridge/SmsFactor/SmsFactorTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/SmsFactor/SmsFactorTransport.php
@@ -17,7 +17,6 @@
 use Symfony\Component\Notifier\Message\SentMessage;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Transport\AbstractTransport;
-use Symfony\Component\Uid\Uuid;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -67,7 +66,7 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
-        $messageId = Uuid::v4()->toRfc4122();
+        $messageId = bin2hex(random_bytes(7));;
         $query = [
             'to' => $message->getPhone(),
             'text' => $message->getSubject(),
diff --git a/src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json b/src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json
index 6a7b8d6d09490..04ae90a40d137 100644
--- a/src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json
@@ -18,8 +18,7 @@
     "require": {
         "php": ">=8.1",
         "symfony/http-client": "^5.4|^6.0",
-        "symfony/notifier": "^6.2",
-        "symfony/uid": "^5.4|^6.0"
+        "symfony/notifier": "^6.2"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\SmsFactor\\": "" },

From 88e6c3e922606a8f5023de7b0d919d0f89993fdd Mon Sep 17 00:00:00 2001
From: Benjamin Schoch <benjamin.schoch@mail.schwarz>
Date: Thu, 8 Dec 2022 12:55:49 +0100
Subject: [PATCH 042/475] [Notifier] [FakeSms] Allow missing optional
 dependency

---
 .../FakeSms/FakeSmsTransportFactory.php       | 20 ++++++-
 .../Tests/FakeSmsTransportFactoryTest.php     | 56 +++++++++++++++++++
 .../Notifier/Bridge/FakeSms/composer.json     |  7 ++-
 3 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php
index 9a2fa84d93075..b97ff34ef8f82 100644
--- a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php
+++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php
@@ -13,6 +13,7 @@
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Notifier\Exception\LogicException;
 use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
 use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
 use Symfony\Component\Notifier\Transport\Dsn;
@@ -24,10 +25,10 @@
  */
 final class FakeSmsTransportFactory extends AbstractTransportFactory
 {
-    private MailerInterface $mailer;
-    private LoggerInterface $logger;
+    private ?MailerInterface $mailer;
+    private ?LoggerInterface $logger;
 
-    public function __construct(MailerInterface $mailer, LoggerInterface $logger)
+    public function __construct(MailerInterface $mailer = null, LoggerInterface $logger = null)
     {
         parent::__construct();
 
@@ -40,6 +41,10 @@ public function create(Dsn $dsn): FakeSmsEmailTransport|FakeSmsLoggerTransport
         $scheme = $dsn->getScheme();
 
         if ('fakesms+email' === $scheme) {
+            if (null === $this->mailer) {
+                $this->throwMissingDependencyException($scheme, MailerInterface::class, 'symfony/mailer');
+            }
+
             $mailerTransport = $dsn->getHost();
             $to = $dsn->getRequiredOption('to');
             $from = $dsn->getRequiredOption('from');
@@ -48,6 +53,10 @@ public function create(Dsn $dsn): FakeSmsEmailTransport|FakeSmsLoggerTransport
         }
 
         if ('fakesms+logger' === $scheme) {
+            if (null === $this->logger) {
+                $this->throwMissingDependencyException($scheme, LoggerInterface::class, 'psr/log');
+            }
+
             return new FakeSmsLoggerTransport($this->logger);
         }
 
@@ -58,4 +67,9 @@ protected function getSupportedSchemes(): array
     {
         return ['fakesms+email', 'fakesms+logger'];
     }
+
+    private function throwMissingDependencyException(string $scheme, string $missingDependency, string $suggestedPackage): void
+    {
+        throw new LogicException(sprintf('Cannot create a transport for scheme "%s" without providing an implementation of "%s". Try running "composer require "%s"".', $scheme, $missingDependency, $suggestedPackage));
+    }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsTransportFactoryTest.php
index 0d18d51c5303d..7c017375cc098 100644
--- a/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsTransportFactoryTest.php
@@ -14,10 +14,35 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Notifier\Bridge\FakeSms\FakeSmsTransportFactory;
+use Symfony\Component\Notifier\Exception\LogicException;
 use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Transport\Dsn;
 
 final class FakeSmsTransportFactoryTest extends TransportFactoryTestCase
 {
+    /**
+     * @dataProvider missingRequiredDependencyProvider
+     */
+    public function testMissingRequiredDependency(?MailerInterface $mailer, ?LoggerInterface $logger, string $dsn, string $message)
+    {
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage($message);
+
+        $factory = new FakeSmsTransportFactory($mailer, $logger);
+        $factory->create(new Dsn($dsn));
+    }
+
+    /**
+     * @dataProvider missingOptionalDependencyProvider
+     */
+    public function testMissingOptionalDependency(?MailerInterface $mailer, ?LoggerInterface $logger, string $dsn)
+    {
+        $factory = new FakeSmsTransportFactory($mailer, $logger);
+        $transport = $factory->create(new Dsn($dsn));
+
+        $this->assertSame($dsn, (string) $transport);
+    }
+
     public function createFactory(): FakeSmsTransportFactory
     {
         return new FakeSmsTransportFactory($this->createMock(MailerInterface::class), $this->createMock(LoggerInterface::class));
@@ -63,4 +88,35 @@ public function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://default?to=recipient@email.net&from=sender@email.net'];
     }
+
+    public function missingRequiredDependencyProvider(): iterable
+    {
+        $exceptionMessage = 'Cannot create a transport for scheme "%s" without providing an implementation of "%s".';
+        yield 'missing mailer' => [
+            null,
+            $this->createMock(LoggerInterface::class),
+            'fakesms+email://default?to=recipient@email.net&from=sender@email.net',
+            sprintf($exceptionMessage, 'fakesms+email', MailerInterface::class),
+        ];
+        yield 'missing logger' => [
+            $this->createMock(MailerInterface::class),
+            null,
+            'fakesms+logger://default',
+            sprintf($exceptionMessage, 'fakesms+logger', LoggerInterface::class),
+        ];
+    }
+
+    public function missingOptionalDependencyProvider(): iterable
+    {
+        yield 'missing logger' => [
+            $this->createMock(MailerInterface::class),
+            null,
+            'fakesms+email://default?to=recipient@email.net&from=sender@email.net',
+        ];
+        yield 'missing mailer' => [
+            null,
+            $this->createMock(LoggerInterface::class),
+            'fakesms+logger://default',
+        ];
+    }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/composer.json b/src/Symfony/Component/Notifier/Bridge/FakeSms/composer.json
index 5ec84dd6dd401..1fd9205d2ccde 100644
--- a/src/Symfony/Component/Notifier/Bridge/FakeSms/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/composer.json
@@ -24,8 +24,11 @@
         "php": ">=8.1",
         "symfony/http-client": "^5.4|^6.0",
         "symfony/notifier": "^6.2",
-        "symfony/event-dispatcher-contracts": "^2|^3",
-        "symfony/mailer": "^5.4|^6.0"
+        "symfony/event-dispatcher-contracts": "^2|^3"
+    },
+    "require-dev": {
+        "symfony/mailer": "^5.4|^6.0",
+        "psr/log": "^1|^2|^3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\FakeSms\\": "" },

From 1d56613ecbe42eaeb900f79b2c5fc136159b4cc1 Mon Sep 17 00:00:00 2001
From: curlycarla2004 <curlycarla2004@hotmail.com>
Date: Mon, 21 Nov 2022 11:40:30 +0100
Subject: [PATCH 043/475] [DomCrawler][FrameworkBundle] Add
 `assertSelectorCount`

---
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  5 +++
 .../Test/DomCrawlerAssertionsTrait.php        |  5 +++
 .../Tests/Test/WebTestCaseTest.php            | 10 +++++
 .../Bundle/FrameworkBundle/composer.json      |  2 +-
 src/Symfony/Component/DomCrawler/CHANGELOG.md |  5 +++
 .../Test/Constraint/CrawlerSelectorCount.php  | 45 +++++++++++++++++++
 6 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorCount.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 1d43a095ed1c5..f6cfae42e6ac1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `DomCrawlerAssertionsTrait::assertSelectorCount(int $count, string $selector)`
+
 6.2
 ---
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/DomCrawlerAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/DomCrawlerAssertionsTrait.php
index 2a692d6f5a367..e61d1cd77c09f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/DomCrawlerAssertionsTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/DomCrawlerAssertionsTrait.php
@@ -35,6 +35,11 @@ public static function assertSelectorNotExists(string $selector, string $message
         self::assertThat(self::getCrawler(), new LogicalNot(new DomCrawlerConstraint\CrawlerSelectorExists($selector)), $message);
     }
 
+    public static function assertSelectorCount(int $expectedCount, string $selector, string $message = ''): void
+    {
+        self::assertThat(self::getCrawler(), new DomCrawlerConstraint\CrawlerSelectorCount($expectedCount, $selector), $message);
+    }
+
     public static function assertSelectorTextContains(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Test/WebTestCaseTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Test/WebTestCaseTest.php
index 8c43917df6f5e..ba3b404364342 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Test/WebTestCaseTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Test/WebTestCaseTest.php
@@ -190,6 +190,16 @@ public function testAssertSelectorNotExists()
         $this->getCrawlerTester(new Crawler('<html><body><h1>'))->assertSelectorNotExists('body > h1');
     }
 
+    public function testAssertSelectorCount()
+    {
+        $this->getCrawlerTester(new Crawler('<html><body><p>Hello</p></body></html>'))->assertSelectorCount(1, 'p');
+        $this->getCrawlerTester(new Crawler('<html><body><p>Hello</p><p>Foo</p></body></html>'))->assertSelectorCount(2, 'p');
+        $this->getCrawlerTester(new Crawler('<html><body><h1>This is not a paragraph.</h1></body></html>'))->assertSelectorCount(0, 'p');
+        $this->expectException(AssertionFailedError::class);
+        $this->expectExceptionMessage('Failed asserting that the Crawler selector "p" was expected to be found 0 time(s) but was found 1 time(s).');
+        $this->getCrawlerTester(new Crawler('<html><body><p>Hello</p></body></html>'))->assertSelectorCount(0, 'p');
+    }
+
     public function testAssertSelectorTextNotContains()
     {
         $this->getCrawlerTester(new Crawler('<html><body><h1>Foo'))->assertSelectorTextNotContains('body > h1', 'Bar');
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 4ab6b2e919e32..2c62c6e3baee5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -39,7 +39,7 @@
         "symfony/browser-kit": "^5.4|^6.0",
         "symfony/console": "^5.4.9|^6.0.9",
         "symfony/css-selector": "^5.4|^6.0",
-        "symfony/dom-crawler": "^5.4|^6.0",
+        "symfony/dom-crawler": "^6.3",
         "symfony/dotenv": "^5.4|^6.0",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/form": "^5.4|^6.0",
diff --git a/src/Symfony/Component/DomCrawler/CHANGELOG.md b/src/Symfony/Component/DomCrawler/CHANGELOG.md
index 1254296490e62..a05fb7f2ebec8 100644
--- a/src/Symfony/Component/DomCrawler/CHANGELOG.md
+++ b/src/Symfony/Component/DomCrawler/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `CrawlerSelectorCount` test constraint
+
 6.0
 ---
 
diff --git a/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorCount.php b/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorCount.php
new file mode 100644
index 0000000000000..22ee1db078a2e
--- /dev/null
+++ b/src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorCount.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DomCrawler\Test\Constraint;
+
+use PHPUnit\Framework\Constraint\Constraint;
+use Symfony\Component\DomCrawler\Crawler;
+
+final class CrawlerSelectorCount extends Constraint
+{
+    public function __construct(
+        private readonly int $count,
+        private readonly string $selector,
+    ) {
+    }
+
+    public function toString(): string
+    {
+        return sprintf('selector "%s" count is "%d"', $this->selector, $this->count);
+    }
+
+    /**
+     * @param Crawler $crawler
+     */
+    protected function matches($crawler): bool
+    {
+        return $this->count === \count($crawler->filter($this->selector));
+    }
+
+    /**
+     * @param Crawler $crawler
+     */
+    protected function failureDescription($crawler): string
+    {
+        return sprintf('the Crawler selector "%s" was expected to be found %d time(s) but was found %d time(s)', $this->selector, $this->count, \count($crawler->filter($this->selector)));
+    }
+}

From bb7779d2627e170cdb8433e7d4491d86967d0b74 Mon Sep 17 00:00:00 2001
From: Kuzia <kuzia@kuzia.space>
Date: Wed, 23 Nov 2022 16:16:04 +0300
Subject: [PATCH 044/475] [Console] #47809 remove exit() call in last
 SignalHandler

---
 src/Symfony/Component/Console/Application.php |  9 +----
 src/Symfony/Component/Console/CHANGELOG.md    |  5 +++
 .../Console/Tests/ApplicationTest.php         | 40 +++++++++++++++++--
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 99548faf858b8..0fed82c8f082a 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -998,15 +998,8 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
                 foreach ($this->signalsToDispatchEvent as $signal) {
                     $event = new ConsoleSignalEvent($command, $input, $output, $signal);
 
-                    $this->signalRegistry->register($signal, function ($signal, $hasNext) use ($event) {
+                    $this->signalRegistry->register($signal, function () use ($event) {
                         $this->dispatcher->dispatch($event, ConsoleEvents::SIGNAL);
-
-                        // No more handlers, we try to simulate PHP default behavior
-                        if (!$hasNext) {
-                            if (!\in_array($signal, [\SIGUSR1, \SIGUSR2], true)) {
-                                exit(0);
-                            }
-                        }
                     });
                 }
             }
diff --git a/src/Symfony/Component/Console/CHANGELOG.md b/src/Symfony/Component/Console/CHANGELOG.md
index 61c36b0e06ab7..66b30ccb9f6db 100644
--- a/src/Symfony/Component/Console/CHANGELOG.md
+++ b/src/Symfony/Component/Console/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Remove `exit` call in `Application` signal handlers. Commands will no longer be automatically interrupted after receiving signal other than `SIGUSR1` or `SIGUSR2`
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index c178151688928..da72496d1ee32 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -2014,6 +2014,19 @@ public function testSignalableCommandHandlerCalledAfterEventListener()
         $this->assertSame([SignalEventSubscriber::class, SignableCommand::class], $command->signalHandlers);
     }
 
+    public function testSignalableCommandDoesNotInterruptedOnTermSignals()
+    {
+        $command = new TerminatableCommand(true, \SIGINT);
+        $command->exitCode = 129;
+
+        $dispatcher = new EventDispatcher();
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setDispatcher($dispatcher);
+        $application->add($command);
+        $this->assertSame(129, $application->run(new ArrayInput(['signal'])));
+    }
+
     /**
      * @group tty
      */
@@ -2113,26 +2126,31 @@ public function isEnabled(): bool
 class BaseSignableCommand extends Command
 {
     public $signaled = false;
+    public $exitCode = 1;
     public $signalHandlers = [];
     public $loop = 1000;
     private $emitsSignal;
+    private $signal;
 
-    public function __construct(bool $emitsSignal = true)
+    protected static $defaultName = 'signal';
+
+    public function __construct(bool $emitsSignal = true, int $signal = \SIGUSR1)
     {
         parent::__construct();
         $this->emitsSignal = $emitsSignal;
+        $this->signal = $signal;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($this->emitsSignal) {
-            posix_kill(posix_getpid(), \SIGUSR1);
+            posix_kill(posix_getpid(), $this->signal);
         }
 
         for ($i = 0; $i < $this->loop; ++$i) {
             usleep(100);
             if ($this->signaled) {
-                return 1;
+                return $this->exitCode;
             }
         }
 
@@ -2155,6 +2173,22 @@ public function handleSignal(int $signal): void
     }
 }
 
+class TerminatableCommand extends BaseSignableCommand implements SignalableCommandInterface
+{
+    protected static $defaultName = 'signal';
+
+    public function getSubscribedSignals(): array
+    {
+        return SignalRegistry::isSupported() ? [\SIGINT] : [];
+    }
+
+    public function handleSignal(int $signal): void
+    {
+        $this->signaled = true;
+        $this->signalHandlers[] = __CLASS__;
+    }
+}
+
 class SignalEventSubscriber implements EventSubscriberInterface
 {
     public $signaled = false;

From 369b051e28f12e29212da8ea77ddb8bd6ed0f118 Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Thu, 17 Nov 2022 23:08:19 +0100
Subject: [PATCH 045/475] [Validator] Add pattern in Regex constraint
 violations

---
 src/Symfony/Component/Validator/CHANGELOG.md                    | 1 +
 src/Symfony/Component/Validator/Constraints/RegexValidator.php  | 1 +
 .../Validator/Tests/Constraints/RegexValidatorTest.php          | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
index 88b152ed8dc31..ca83f3af0a3f1 100644
--- a/src/Symfony/Component/Validator/CHANGELOG.md
+++ b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add `Uuid::TIME_BASED_VERSIONS` to match that a UUID being validated embeds a timestamp
+ * Add the `pattern` parameter in violations of the `Regex` constraint
 
 6.2
 ---
diff --git a/src/Symfony/Component/Validator/Constraints/RegexValidator.php b/src/Symfony/Component/Validator/Constraints/RegexValidator.php
index 177fcb69cd107..b31431bedd20d 100644
--- a/src/Symfony/Component/Validator/Constraints/RegexValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/RegexValidator.php
@@ -47,6 +47,7 @@ public function validate(mixed $value, Constraint $constraint)
         if ($constraint->match xor preg_match($constraint->pattern, $value)) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setParameter('{{ pattern }}', $constraint->pattern)
                 ->setCode(Regex::REGEX_FAILED_ERROR)
                 ->addViolation();
         }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
index 166de5aa95827..267edf0c1bcdd 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
@@ -118,6 +118,7 @@ public function testInvalidValues($value)
 
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'.$value.'"')
+            ->setParameter('{{ pattern }}', '/^[0-9]+$/')
             ->setCode(Regex::REGEX_FAILED_ERROR)
             ->assertRaised();
     }
@@ -133,6 +134,7 @@ public function testInvalidValuesNamed($value)
 
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'.$value.'"')
+            ->setParameter('{{ pattern }}', '/^[0-9]+$/')
             ->setCode(Regex::REGEX_FAILED_ERROR)
             ->assertRaised();
     }

From c5fdfbcc4a7dcd146ddb1d7257bae665daaf0d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= <jerome@tamarelle.net>
Date: Fri, 11 Nov 2022 23:37:29 +0100
Subject: [PATCH 046/475] Add placeholder formatters per ProgressBar instance

---
 src/Symfony/Component/Console/CHANGELOG.md    |  1 +
 .../Component/Console/Helper/ProgressBar.php  | 29 ++++++++++++++++---
 .../Console/Tests/Helper/ProgressBarTest.php  | 23 +++++++++++++++
 3 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Console/CHANGELOG.md b/src/Symfony/Component/Console/CHANGELOG.md
index 66b30ccb9f6db..0e010fae62ef0 100644
--- a/src/Symfony/Component/Console/CHANGELOG.md
+++ b/src/Symfony/Component/Console/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Remove `exit` call in `Application` signal handlers. Commands will no longer be automatically interrupted after receiving signal other than `SIGUSR1` or `SIGUSR2`
+ * Add `ProgressBar::setPlaceholderFormatter` to set a placeholder attached to a instance, instead of being global.
 
 6.2
 ---
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
index b65bba2267315..8dad297d5e855 100644
--- a/src/Symfony/Component/Console/Helper/ProgressBar.php
+++ b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -60,6 +60,7 @@ final class ProgressBar
     private Terminal $terminal;
     private ?string $previousMessage = null;
     private Cursor $cursor;
+    private array $placeholders = [];
 
     private static array $formatters;
     private static array $formats;
@@ -95,12 +96,12 @@ public function __construct(OutputInterface $output, int $max = 0, float $minSec
     }
 
     /**
-     * Sets a placeholder formatter for a given name.
+     * Sets a placeholder formatter for a given name, globally for all instances of ProgressBar.
      *
      * This method also allow you to override an existing placeholder.
      *
-     * @param string   $name     The placeholder name (including the delimiter char like %)
-     * @param callable $callable A PHP callable
+     * @param string                       $name     The placeholder name (including the delimiter char like %)
+     * @param callable(ProgressBar):string $callable A PHP callable
      */
     public static function setPlaceholderFormatterDefinition(string $name, callable $callable): void
     {
@@ -121,6 +122,26 @@ public static function getPlaceholderFormatterDefinition(string $name): ?callabl
         return self::$formatters[$name] ?? null;
     }
 
+    /**
+     * Sets a placeholder formatter for a given name, for this instance only.
+     *
+     * @param callable(ProgressBar):string $callable A PHP callable
+     */
+    public function setPlaceholderFormatter(string $name, callable $callable): void
+    {
+        $this->placeholders[$name] = $callable;
+    }
+
+    /**
+     * Gets the placeholder formatter for a given name.
+     *
+     * @param string $name The placeholder name (including the delimiter char like %)
+     */
+    public function getPlaceholderFormatter(string $name): ?callable
+    {
+        return $this->placeholders[$name] ?? $this::getPlaceholderFormatterDefinition($name);
+    }
+
     /**
      * Sets a format for a given name.
      *
@@ -573,7 +594,7 @@ private function buildLine(): string
 
         $regex = "{%([a-z\-_]+)(?:\:([^%]+))?%}i";
         $callback = function ($matches) {
-            if ($formatter = $this::getPlaceholderFormatterDefinition($matches[1])) {
+            if ($formatter = $this->getPlaceholderFormatter($matches[1])) {
                 $text = $formatter($this, $this->output);
             } elseif (isset($this->messages[$matches[1]])) {
                 $text = $this->messages[$matches[1]];
diff --git a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
index b8d29a1e8969e..3a44ba6626259 100644
--- a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
@@ -861,6 +861,29 @@ public function testAddingPlaceholderFormatter()
         );
     }
 
+    public function testAddingInstancePlaceholderFormatter()
+    {
+        $bar = new ProgressBar($output = $this->getOutputStream(), 3, 0);
+        $bar->setFormat(' %countdown% [%bar%]');
+        $bar->setPlaceholderFormatter('countdown', $function = function (ProgressBar $bar) {
+            return $bar->getMaxSteps() - $bar->getProgress();
+        });
+
+        $this->assertSame($function, $bar->getPlaceholderFormatter('countdown'));
+
+        $bar->start();
+        $bar->advance();
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            ' 3 [>---------------------------]'.
+            $this->generateOutput(' 2 [=========>------------------]').
+            $this->generateOutput(' 0 [============================]'),
+            stream_get_contents($output->getStream())
+        );
+    }
+
     public function testMultilineFormat()
     {
         $bar = new ProgressBar($output = $this->getOutputStream(), 3, 0);

From a3b7fca9828f0ca5f4aeccaa8b48b06c07968bd6 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sat, 3 Dec 2022 23:30:11 +0100
Subject: [PATCH 047/475] [DependencyInjection] Use WeakReference to break
 circular references in the container

---
 .../LazyProxy/PhpDumper/ProxyDumper.php       |   7 +-
 .../Fixtures/php/lazy_service_structure.txt   |  11 +-
 .../PhpDumper/Fixtures/proxy-factory.php      |  10 +-
 .../LazyProxy/PhpDumper/ProxyDumperTest.php   |  13 +-
 src/Symfony/Bridge/ProxyManager/composer.json |   2 +-
 .../DependencyInjection/Container.php         |  38 +-
 .../DependencyInjection/Dumper/PhpDumper.php  | 125 ++++---
 .../ExpressionLanguageProvider.php            |   6 +-
 .../LazyProxy/PhpDumper/LazyServiceDumper.php |  12 +-
 .../Tests/Dumper/PhpDumperTest.php            |   1 +
 .../Tests/Fixtures/php/closure.php            |   6 +-
 ...er_class_constructor_without_arguments.php |   2 +
 ...s_with_mandatory_constructor_arguments.php |   2 +
 ...ss_with_optional_constructor_arguments.php |   2 +
 ...om_container_class_without_constructor.php |   2 +
 .../Tests/Fixtures/php/services1-1.php        |   2 +
 .../Tests/Fixtures/php/services1.php          |   2 +
 .../Tests/Fixtures/php/services10.php         |   6 +-
 .../Fixtures/php/services10_as_files.txt      |  12 +-
 .../Tests/Fixtures/php/services12.php         |   6 +-
 .../Tests/Fixtures/php/services13.php         |   8 +-
 .../Tests/Fixtures/php/services19.php         |  13 +-
 .../Tests/Fixtures/php/services24.php         |   6 +-
 .../Tests/Fixtures/php/services26.php         |  19 +-
 .../Tests/Fixtures/php/services33.php         |  10 +-
 .../Tests/Fixtures/php/services8.php          |   2 +
 .../Tests/Fixtures/php/services9_as_files.txt |  42 ++-
 .../Tests/Fixtures/php/services9_compiled.php | 156 ++++----
 .../php/services9_inlined_factories.txt       | 180 +++++----
 .../php/services9_lazy_inlined_factories.txt  |  14 +-
 .../Tests/Fixtures/php/services_adawson.php   |  26 +-
 .../php/services_almost_circular_private.php  | 236 ++++++------
 .../php/services_almost_circular_public.php   | 354 +++++++++---------
 .../Fixtures/php/services_array_params.php    |   8 +-
 .../Fixtures/php/services_base64_env.php      |   5 +-
 .../services_closure_argument_compiled.php    |  24 +-
 .../Tests/Fixtures/php/services_csv_env.php   |   5 +-
 .../Fixtures/php/services_dedup_lazy.php 
E377
     |  26 +-
 .../Fixtures/php/services_deep_graph.php      |  18 +-
 .../Fixtures/php/services_default_env.php     |   9 +-
 .../Tests/Fixtures/php/services_env_in_id.php |  10 +-
 .../php/services_errored_definition.php       | 156 ++++----
 .../Fixtures/php/services_inline_requires.php |  16 +-
 .../Fixtures/php/services_inline_self_ref.php |   6 +-
 .../Tests/Fixtures/php/services_json_env.php  |   7 +-
 .../Tests/Fixtures/php/services_locator.php   |  72 ++--
 .../php/services_new_in_initializer.php       |   6 +-
 .../php/services_non_shared_duplicates.php    |  18 +-
 .../Fixtures/php/services_non_shared_lazy.php |  12 +-
 .../php/services_non_shared_lazy_as_files.txt |   8 +-
 .../php/services_non_shared_lazy_ghost.php    |  14 +-
 .../Fixtures/php/services_private_frozen.php  |  10 +-
 .../php/services_private_in_expression.php    |   6 +-
 .../php/services_query_string_env.php         |   5 +-
 .../Tests/Fixtures/php/services_rot13_env.php |  15 +-
 .../php/services_service_locator_argument.php |  26 +-
 .../Fixtures/php/services_subscriber.php      |  22 +-
 .../Tests/Fixtures/php/services_tsantos.php   |   6 +-
 .../php/services_uninitialized_ref.php        |  56 +--
 .../php/services_unsupported_characters.php   |  14 +-
 .../Tests/Fixtures/php/services_url_env.php   |   5 +-
 .../Tests/Fixtures/php/services_wither.php    |   6 +-
 .../Fixtures/php/services_wither_lazy.php     |   8 +-
 .../php/services_wither_staticreturntype.php  |   6 +-
 .../DependencyInjection/composer.json         |   2 +-
 65 files changed, 1097 insertions(+), 843 deletions(-)

diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
index b5f3560a4f401..fd610860f534f 100644
--- a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
+++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -53,7 +53,7 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $
         $instantiation = 'return';
 
         if ($definition->isShared()) {
-            $instantiation .= sprintf(' $this->%s[%s] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', var_export($id, true));
+            $instantiation .= sprintf(' $container->%s[%s] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', var_export($id, true));
         }
 
         $proxifiedClass = new \ReflectionClass($this->proxyGenerator->getProxifiedClass($definition));
@@ -61,8 +61,9 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $
 
         return <<<EOF
         if (true === \$lazyLoad) {
-            $instantiation \$this->createProxy('$proxyClass', function () {
-                return \\$proxyClass::staticProxyConstructor(function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy) {
+            $instantiation \$container->createProxy('$proxyClass', static function () use (\$containerRef) {
+                return \\$proxyClass::staticProxyConstructor(static function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy) use (\$containerRef) {
+                    \$container = \$containerRef->get();
                     \$wrappedInstance = $factoryCode;
 
                     \$proxy->setProxyInitializer(null);
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt
index 825c1051ca38f..84995384157b6 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt
@@ -3,12 +3,15 @@
 use %a
 class LazyServiceProjectServiceContainer extends Container
 {%a
-    protected function getFooService($lazyLoad = true)
+    protected static function getFooService($container, $lazyLoad = true)
     {
+        $containerRef = $container->ref;
+
         if (true === $lazyLoad) {
-            return $this->services['foo'] = $this->createProxy('stdClass_%s', function () {
-                return %S\stdClass_%s(function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) {
-                    $wrappedInstance = $this->getFooService(false);
+            return $container->services['foo'] = $container->createProxy('stdClass_%s', static function () use ($containerRef) {
+                return %S\stdClass_%s(static function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($containerRef) {
+                    $container = $containerRef->get();
+                    $wrappedInstance = self::getFooService($containerRef->get(), false);
 
                     $proxy->setProxyInitializer(null);
 
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-factory.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-factory.php
index c06cb534b6e79..12a7de3483761 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-factory.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-factory.php
@@ -7,10 +7,14 @@
 
     public function getFooService($lazyLoad = true)
     {
+        $container = $this;
+        $containerRef = \WeakReference::create($this);
+
         if (true === $lazyLoad) {
-            return $this->privates['foo'] = $this->createProxy('SunnyInterface_1eff735', function () {
-                return \SunnyInterface_1eff735::staticProxyConstructor(function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) {
-                    $wrappedInstance = $this->getFooService(false);
+            return $container->privates['foo'] = $container->createProxy('SunnyInterface_1eff735', static function () use ($containerRef) {
+                return \SunnyInterface_1eff735::staticProxyConstructor(static function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($containerRef) {
+                    $container = $containerRef->get();
+                    $wrappedInstance = $container->getFooService(false);
 
                     $proxy->setProxyInitializer(null);
 
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
index 61630b3e46938..7fd212c3f9d3e 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -72,10 +72,10 @@ public function testGetProxyFactoryCode()
 
         $definition->setLazy(true);
 
-        $code = $this->dumper->getProxyFactoryCode($definition, 'foo', '$this->getFoo2Service(false)');
+        $code = $this->dumper->getProxyFactoryCode($definition, 'foo', '$container->getFoo2Service(false)');
 
         $this->assertStringMatchesFormat(
-            '%A$wrappedInstance = $this->getFoo2Service(false);%w$proxy->setProxyInitializer(null);%A',
+            '%A$wrappedInstance = $container->getFoo2Service(false);%w$proxy->setProxyInitializer(null);%A',
             $code
         );
     }
@@ -87,9 +87,9 @@ public function testCorrectAssigning(Definition $definition, $access)
     {
         $definition->setLazy(true);
 
-        $code = $this->dumper->getProxyFactoryCode($definition, 'foo', '$this->getFoo2Service(false)');
+        $code = $this->dumper->getProxyFactoryCode($definition, 'foo', '$container->getFoo2Service(false)');
 
-        $this->assertStringMatchesFormat('%A$this->'.$access.'[\'foo\'] = %A', $code);
+        $this->assertStringMatchesFormat('%A$container->'.$access.'[\'foo\'] = %A', $code);
     }
 
     public function getPrivatePublicDefinitions()
@@ -118,7 +118,7 @@ public function testGetProxyFactoryCodeForInterface()
         $definition->addTag('proxy', ['interface' => SunnyInterface::class]);
 
         $implem = "<?php\n\n".$this->dumper->getProxyCode($definition);
-        $factory = $this->dumper->getProxyFactoryCode($definition, 'foo', '$this->getFooService(false)');
+        $factory = $this->dumper->getProxyFactoryCode($definition, 'foo', '$container->getFooService(false)');
         $factory = <<<EOPHP
 <?php
 
@@ -129,6 +129,9 @@ public function testGetProxyFactoryCodeForInterface()
 
     public function getFooService(\$lazyLoad = true)
     {
+        \$container = \$this;
+        \$containerRef = \\WeakReference::create(\$this);
+
 {$factory}        return new {$class}();
     }
 
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
index 23218d85df43b..b3e1e9a9b5e75 100644
--- a/src/Symfony/Bridge/ProxyManager/composer.json
+++ b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "friendsofphp/proxy-manager-lts": "^1.0.2",
-        "symfony/dependency-injection": "^6.2",
+        "symfony/dependency-injection": "^6.3",
         "symfony/deprecation-contracts": "^2.1|^3"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 9c830e77c8fe2..1cb5ca7403a76 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -63,6 +63,8 @@ class Container implements ContainerInterface, ResetInterface
     private bool $compiled = false;
     private \Closure $getEnv;
 
+    private static $make;
+
     public function __construct(ParameterBagInterface $parameterBag = null)
     {
         $this->parameterBag = $parameterBag ?? new EnvPlaceholderParameterBag();
@@ -135,7 +137,7 @@ public function set(string $id, ?object $service)
         if (isset($this->privates['service_container']) && $this->privates['service_container'] instanceof \Closure) {
             $initialize = $this->privates['service_container'];
             unset($this->privates['service_container']);
-            $initialize();
+            $initialize($this);
         }
 
         if ('service_container' === $id) {
@@ -195,7 +197,7 @@ public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALI
     {
         return $this->services[$id]
             ?? $this->services[$id = $this->aliases[$id] ?? $id]
-            ?? ('service_container' === $id ? $this : ($this->factories[$id] ?? $this->make(...))($id, $invalidBehavior));
+            ?? ('service_container' === $id ? $this : ($this->factories[$id] ?? self::$make ??= self::make(...))($this, $id, $invalidBehavior));
     }
 
     /**
@@ -203,41 +205,41 @@ public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALI
      *
      * As a separate method to allow "get()" to use the really fast `??` operator.
      */
-    private function make(string $id, int $invalidBehavior)
+    private static function make($container, string $id, int $invalidBehavior)
     {
-        if (isset($this->loading[$id])) {
-            throw new ServiceCircularReferenceException($id, array_merge(array_keys($this->loading), [$id]));
+        if (isset($container->loading[$id])) {
+            throw new ServiceCircularReferenceException($id, array_merge(array_keys($container->loading), [$id]));
         }
 
-        $this->loading[$id] = true;
+        $container->loading[$id] = true;
 
         try {
-            if (isset($this->fileMap[$id])) {
-                return /* self::IGNORE_ON_UNINITIALIZED_REFERENCE */ 4 === $invalidBehavior ? null : $this->load($this->fileMap[$id]);
-            } elseif (isset($this->methodMap[$id])) {
-                return /* self::IGNORE_ON_UNINITIALIZED_REFERENCE */ 4 === $invalidBehavior ? null : $this->{$this->methodMap[$id]}();
+            if (isset($container->fileMap[$id])) {
+                return /* self::IGNORE_ON_UNINITIALIZED_REFERENCE */ 4 === $invalidBehavior ? null : $container->load($container->fileMap[$id]);
+            } elseif (isset($container->methodMap[$id])) {
+                return /* self::IGNORE_ON_UNINITIALIZED_REFERENCE */ 4 === $invalidBehavior ? null : $container->{$container->methodMap[$id]}($container);
             }
         } catch (\Exception $e) {
-            unset($this->services[$id]);
+            unset($container->services[$id]);
 
             throw $e;
         } finally {
-            unset($this->loading[$id]);
+            unset($container->loading[$id]);
         }
 
         if (self::EXCEPTION_ON_INVALID_REFERENCE === $invalidBehavior) {
             if (!$id) {
                 throw new ServiceNotFoundException($id);
             }
-            if (isset($this->syntheticIds[$id])) {
+            if (isset($container->syntheticIds[$id])) {
                 throw new ServiceNotFoundException($id, null, null, [], sprintf('The "%s" service is synthetic, it needs to be set at boot time before it can be used.', $id));
             }
-            if (isset($this->getRemovedIds()[$id])) {
+            if (isset($container->getRemovedIds()[$id])) {
                 throw new ServiceNotFoundException($id, null, null, [], sprintf('The "%s" service or alias has been removed or inlined when the container was compiled. You should either make it public, or stop using the container directly and use dependency injection instead.', $id));
             }
 
             $alternatives = [];
-            foreach ($this->getServiceIds() as $knownId) {
+            foreach ($container->getServiceIds() as $knownId) {
                 if ('' === $knownId || '.' === $knownId[0]) {
                     continue;
                 }
@@ -378,13 +380,13 @@ final protected function getService(string|false $registry, string $id, ?string
             return false !== $registry ? $this->{$registry}[$id] ?? null : null;
         }
         if (false !== $registry) {
-            return $this->{$registry}[$id] ??= $load ? $this->load($method) : $this->{$method}();
+            return $this->{$registry}[$id] ??= $load ? $this->load($method) : $this->{$method}($this);
         }
         if (!$load) {
-            return $this->{$method}();
+            return $this->{$method}($this);
         }
 
-        return ($factory = $this->factories[$id] ?? $this->factories['service_container'][$id] ?? null) ? $factory() : $this->load($method);
+        return ($factory = $this->factories[$id] ?? $this->factories['service_container'][$id] ?? null) ? $factory($this) : $this->load($method);
     }
 
     private function __clone()
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index ad7b82c95e3db..0cd43d1504cc2 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -67,7 +67,7 @@ class PhpDumper extends Dumper
     private int $variableCount;
     private ?\SplObjectStorage $inlinedDefinitions = null;
     private ?array $serviceCalls = null;
-    private array $reservedVariables = ['instance', 'class', 'this', 'container'];
+    private array $reservedVariables = ['instance', 'class', 'this', 'container', 'containerRef'];
     private ExpressionLanguage $expressionLanguage;
     private ?string $targetDirRegex = null;
     private int $targetDirMaxMatches;
@@ -85,6 +85,7 @@ class PhpDumper extends Dumper
     private array $singleUsePrivateIds = [];
     private array $preload = [];
     private bool $addGetService = false;
+    private bool $addContainerRef = false;
     private array $locatedIds = [];
     private string $serviceLocatorTag;
     private array $exportedVariables = [];
@@ -237,8 +238,8 @@ public function dump(array $options = []): string|array
 
         if ($this->addGetService) {
             $code = preg_replace(
-                "/(\r?\n\r?\n    public function __construct.+?\\{\r?\n)/s",
-                "\n    protected \Closure \$getService;$1        \$this->getService = \$this->getService(...);\n",
+                "/(\r?\n\r?\n    public function __construct.+?\\{\r?\n) ++([^\r\n]++)/s",
+                "\n    protected \Closure \$getService;$1        \$containerRef = $2\n        \$this->getService = static function () use (\$containerRef) { return \$containerRef->get()->getService(...\\func_get_args()); };",
                 $code,
                 1
             );
@@ -679,7 +680,7 @@ private function addServiceInstance(string $id, Definition $definition, bool $is
         }
 
         if (!$isProxyCandidate && $definition->isShared() && !isset($this->singleUsePrivateIds[$id]) && null === $lastWitherIndex) {
-            $instantiation = sprintf('$this->%s[%s] = %s', $this->container->getDefinition($id)->isPublic() ? 'services' : 'privates', $this->doExport($id), $isSimpleInstance ? '' : '$instance');
+            $instantiation = sprintf('$container->%s[%s] = %s', $this->container->getDefinition($id)->isPublic() ? 'services' : 'privates', $this->doExport($id), $isSimpleInstance ? '' : '$instance');
         } elseif (!$isSimpleInstance) {
             $instantiation = '$instance';
         }
@@ -755,7 +756,7 @@ private function addServiceMethodCalls(Definition $definition, string $variableN
 
             if ($call[2] ?? false) {
                 if (null !== $sharedNonLazyId && $lastWitherIndex === $k) {
-                    $witherAssignation = sprintf('$this->%s[\'%s\'] = ', $definition->isPublic() ? 'services' : 'privates', $sharedNonLazyId);
+                    $witherAssignation = sprintf('$container->%s[\'%s\'] = ', $definition->isPublic() ? 'services' : 'privates', $sharedNonLazyId);
                 }
                 $witherAssignation .= sprintf('$%s = ', $variableName);
             }
@@ -847,10 +848,11 @@ private function addService(string $id, Definition $definition): array
         $methodName = $this->generateMethodName($id);
 
         if ($asFile || $definition->isLazy()) {
-            $lazyInitialization = '$lazyLoad = true';
+            $lazyInitialization = ', $lazyLoad = true';
         } else {
             $lazyInitialization = '';
         }
+        $this->addContainerRef = false;
 
         $code = <<<EOF
 
@@ -862,14 +864,14 @@ private function addService(string $id, Definition $definition): array
         $code = str_replace('*/', ' ', $code).<<<EOF
 
      */
-    protected function {$methodName}($lazyInitialization)
-    {
+    protected static function {$methodName}(\$container$lazyInitialization)
+    {%container_ref%
 
 EOF;
 
         if ($asFile) {
             $file = $methodName.'.php';
-            $code = str_replace("protected function {$methodName}(", 'public static function do($container, ', $code);
+            $code = str_replace("protected static function {$methodName}(", 'public static function do(', $code);
         } else {
             $file = null;
         }
@@ -892,7 +894,7 @@ protected function {$methodName}($lazyInitialization)
             }
 
             if (!$definition->isShared()) {
-                $factory = sprintf('$this->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));
+                $factory = sprintf('$container->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));
             }
 
             $asGhostObject = false;
@@ -903,16 +905,16 @@ protected function {$methodName}($lazyInitialization)
                     $code .= sprintf('        %s ??= ', $factory);
 
                     if ($asFile) {
-                        $code .= "fn () => self::do(\$container);\n\n";
+                        $code .= "self::do(...);\n\n";
                     } else {
-                        $code .= sprintf("\$this->%s(...);\n\n", $methodName);
+                        $code .= sprintf("self::%s(...);\n\n", $methodName);
                     }
                 }
                 $lazyLoad = $asGhostObject ? '$proxy' : 'false';
+                $this->addContainerRef = true;
 
-                $factoryCode = $asFile ? sprintf('self::do($container, %s)', $lazyLoad) : sprintf('$this->%s(%s)', $methodName, $lazyLoad);
-                $factoryCode = $this->getProxyDumper()->getProxyFactoryCode($definition, $id, $factoryCode);
-                $code .= $asFile ? preg_replace('/function \(([^)]*+)\)( {|:)/', 'function (\1) use ($container)\2', $factoryCode) : $factoryCode;
+                $factoryCode = $asFile ? sprintf('self::do($containerRef->get(), %s)', $lazyLoad) : sprintf('self::%s($containerRef->get(), %s)', $methodName, $lazyLoad);
+                $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, $factoryCode);
             }
 
             $c = $this->addServiceInclude($id, $definition, null !== $isProxyCandidate);
@@ -932,24 +934,21 @@ protected function {$methodName}($lazyInitialization)
 
             if (!$isProxyCandidate && !$definition->isShared()) {
                 $c = implode("\n", array_map(function ($line) { return $line ? '    '.$line : $line; }, explode("\n", $c)));
-                $lazyloadInitialization = $definition->isLazy() ? '$lazyLoad = true' : '';
+                $lazyloadInitialization = $definition->isLazy() ? ', $lazyLoad = true' : '';
 
-                $c = sprintf("        %s = function (%s) {\n%s        };\n\n        return %1\$s();\n", $factory, $lazyloadInitialization, $c);
+                $c = sprintf("        %s = static function (\$container%s) {\n%s        };\n\n        return %1\$s(\$container);\n", $factory, $lazyloadInitialization, $c);
             }
 
             $code .= $c;
         }
 
-        if ($asFile) {
-            $code = str_replace('$this', '$container', $code);
-            $code = preg_replace('/function \(([^)]*+)\)( {|:)/', 'function (\1) use ($container)\2', $code);
-        }
-
         $code .= "    }\n";
 
         $this->definitionVariables = $this->inlinedDefinitions = null;
         $this->referenceVariables = $this->serviceCalls = null;
 
+        $code = preg_replace('/%container_ref%/', $this->addContainerRef ? "\n        \$containerRef = \$container->ref;\n" : '', $code, 1);
+
         return [$file, $code];
     }
 
@@ -1014,8 +1013,8 @@ private function addInlineReference(string $id, Definition $definition, string $
 
         $code .= sprintf(<<<'EOTXT'
 
-        if (isset($this->%s[%s])) {
-            return $this->%1$s[%2$s];
+        if (isset($container->%s[%s])) {
+            return $container->%1$s[%2$s];
         }
 
 EOTXT
@@ -1190,7 +1189,7 @@ private function addNewInstance(Definition $definition, string $return = '', str
             if (\is_string($callable) && str_starts_with($callable, '@=')) {
                 return $return.sprintf('(($args = %s) ? (%s) : null)',
                     $this->dumpValue(new ServiceLocatorArgument($definition->getArguments())),
-                    $this->getExpressionLanguage()->compile(substr($callable, 2), ['this' => 'container', 'args' => 'args'])
+                    $this->getExpressionLanguage()->compile(substr($callable, 2), ['container' => 'container', 'args' => 'args'])
                 ).$tail;
             }
 
@@ -1234,9 +1233,11 @@ private function startClass(string $class, string $baseClass, bool $hasProxyClas
 class $class extends $baseClass
 {
     protected \$parameters = [];
+    protected readonly \WeakReference \$ref;
 
     public function __construct()
     {
+        \$this->ref = \WeakReference::create(\$this);
 
 EOF;
         if ($this->asFiles) {
@@ -1470,11 +1471,11 @@ private function addDeprecatedAliases(): string
      *
      * @return object The "$id" service.
      */
-    protected function {$methodNameAlias}()
+    protected static function {$methodNameAlias}(\$container)
     {
         trigger_deprecation($packageExported, $versionExported, $messageExported);
 
-        return \$this->get($idExported);
+        return \$container->get($idExported);
     }
 
 EOF;
@@ -1517,7 +1518,7 @@ private function addInlineRequires(bool $hasProxyClasses): string
             $code .= "\n            include_once __DIR__.'/proxy-classes.php';";
         }
 
-        return $code ? sprintf("\n        \$this->privates['service_container'] = function () {%s\n        };\n", $code) : '';
+        return $code ? sprintf("\n        \$this->privates['service_container'] = static function (\$container) {%s\n        };\n", $code) : '';
     }
 
     private function addDefaultParametersMethod(): string
@@ -1537,7 +1538,7 @@ private function addDefaultParametersMethod(): string
             $export = $this->exportParameters([$value], '', 12, $hasEnum);
             $export = explode('0 => ', substr(rtrim($export, " ]\n"), 2, -1), 2);
 
-            if ($hasEnum || preg_match("/\\\$this->(?:getEnv\('(?:[-.\w\\\\]*+:)*+\w++'\)|targetDir\.'')/", $export[1])) {
+            if ($hasEnum || preg_match("/\\\$container->(?:getEnv\('(?:[-.\w\\\\]*+:)*+\w++'\)|targetDir\.'')/", $export[1])) {
                 $dynamicPhp[$key] = sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
             } else {
                 $php[] = sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
@@ -1601,6 +1602,7 @@ public function getParameterBag(): ParameterBagInterface
         if ($dynamicPhp) {
             $loadedDynamicParameters = $this->exportParameters(array_combine(array_keys($dynamicPhp), array_fill(0, \count($dynamicPhp), false)), '', 8);
             $getDynamicParameter = <<<'EOF'
+        $container = $this;
         $value = match ($name) {
 %s
             default => throw new ParameterNotFoundException($name),
@@ -1694,14 +1696,14 @@ private function getServiceConditionals(mixed $value): string
             if (!$this->container->hasDefinition($service)) {
                 return 'false';
             }
-            $conditions[] = sprintf('isset($this->%s[%s])', $this->container->getDefinition($service)->isPublic() ? 'services' : 'privates', $this->doExport($service));
+            $conditions[] = sprintf('isset($container->%s[%s])', $this->container->getDefinition($service)->isPublic() ? 'services' : 'privates', $this->doExport($service));
         }
         foreach (ContainerBuilder::getServiceConditionals($value) as $service) {
             if ($this->container->hasDefinition($service) && !$this->container->getDefinition($service)->isPublic()) {
                 continue;
             }
 
-            $conditions[] = sprintf('$this->has(%s)', $this->doExport($service));
+            $conditions[] = sprintf('$container->has(%s)', $this->doExport($service));
         }
 
         if (!$conditions) {
@@ -1789,20 +1791,25 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
 
                         $attribute = sprintf('#[\Closure(%s)] ', $attribute);
                     }
+                    $this->addContainerRef = true;
 
-                    return sprintf("%sfunction ()%s {\n            %s\n        }", $attribute, $returnedType, $code);
+                    return sprintf("%sstatic function () use (\$containerRef)%s {\n            \$container = \$containerRef->get();\n\n            %s\n        }", $attribute, $returnedType, $code);
                 }
 
                 if ($value instanceof IteratorArgument) {
                     $operands = [0];
                     $code = [];
-                    $code[] = 'new RewindableGenerator(function () {';
 
                     if (!$values = $value->getValues()) {
+                        $code[] = 'new RewindableGenerator(static function () {';
                         $code[] = '            return new \EmptyIterator();';
                     } else {
+                        $this->addContainerRef = true;
+                        $code[] = 'new RewindableGenerator(static function () use ($containerRef) {';
+                        $code[] = '            $container = $containerRef->get();';
+                        $code[] = '';
                         $countCode = [];
-                        $countCode[] = 'function () {';
+                        $countCode[] = 'static function () use ($containerRef) {';
 
                         foreach ($values as $k => $v) {
                             ($c = $this->getServiceConditionals($v)) ? $operands[] = "(int) ($c)" : ++$operands[0];
@@ -1814,6 +1821,8 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
                             }
                         }
 
+                        $countCode[] = '            $container = $containerRef->get();';
+                        $countCode[] = '';
                         $countCode[] = sprintf('            return %s;', implode(' + ', $operands));
                         $countCode[] = '        }';
                     }
@@ -1850,7 +1859,7 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
                     }
                     $this->addGetService = true;
 
-                    return sprintf('new \%s($this->getService, [%s%s], [%s%s])', ServiceLocator::class, $serviceMap, $serviceMap ? "\n        " : '', $serviceTypes, $serviceTypes ? "\n        " : '');
+                    return sprintf('new \%s($container->getService, [%s%s], [%s%s])', ServiceLocator::class, $serviceMap, $serviceMap ? "\n        " : '', $serviceTypes, $serviceTypes ? "\n        " : '');
                 }
             } finally {
                 [$this->definitionVariables, $this->referenceVariables] = $scope;
@@ -1888,7 +1897,7 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
 
             return $this->getServiceCall($id, $value);
         } elseif ($value instanceof Expression) {
-            return $this->getExpressionLanguage()->compile((string) $value, ['this' => 'container']);
+            return $this->getExpressionLanguage()->compile((string) $value, ['container' => 'container']);
         } elseif ($value instanceof Parameter) {
             return $this->dumpParameter($value);
         } elseif (true === $interpolate && \is_string($value)) {
@@ -1945,12 +1954,12 @@ private function dumpParameter(string $name): string
                 return $dumpedValue;
             }
 
-            if (!preg_match("/\\\$this->(?:getEnv\('(?:[-.\w\\\\]*+:)*+\w++'\)|targetDir\.'')/", $dumpedValue)) {
-                return sprintf('$this->parameters[%s]', $this->doExport($name));
+            if (!preg_match("/\\\$container->(?:getEnv\('(?:[-.\w\\\\]*+:)*+\w++'\)|targetDir\.'')/", $dumpedValue)) {
+                return sprintf('$container->parameters[%s]', $this->doExport($name));
             }
         }
 
-        return sprintf('$this->getParameter(%s)', $this->doExport($name));
+        return sprintf('$container->getParameter(%s)', $this->doExport($name));
     }
 
     private function getServiceCall(string $id, Reference $reference = null): string
@@ -1960,12 +1969,12 @@ private function getServiceCall(string $id, Reference $reference = null): string
         }
 
         if ('service_container' === $id) {
-            return '$this';
+            return '$container';
         }
 
         if ($this->container->hasDefinition($id) && $definition = $this->container->getDefinition($id)) {
             if ($definition->isSynthetic()) {
-                $code = sprintf('$this->get(%s%s)', $this->doExport($id), null !== $reference ? ', '.$reference->getInvalidBehavior() : '');
+                $code = sprintf('$container->get(%s%s)', $this->doExport($id), null !== $reference ? ', '.$reference->getInvalidBehavior() : '');
             } elseif (null !== $reference && ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $reference->getInvalidBehavior()) {
                 $code = 'null';
                 if (!$definition->isShared()) {
@@ -1977,20 +1986,20 @@ private function getServiceCall(string $id, Reference $reference = null): string
                 }
                 $code = $this->addNewInstance($definition, '', $id);
                 if ($definition->isShared() && !isset($this->singleUsePrivateIds[$id])) {
-                    return sprintf('($this->%s[%s] ??= %s)', $definition->isPublic() ? 'services' : 'privates', $this->doExport($id), $code);
+                    return sprintf('($container->%s[%s] ??= %s)', $definition->isPublic() ? 'services' : 'privates', $this->doExport($id), $code);
                 }
                 $code = "($code)";
             } else {
-                $code = $this->asFiles && !$this->inlineFactories && !$this->isHotPath($definition) ? "\$this->load('%s')" : '$this->%s()';
+                $code = $this->asFiles && !$this->inlineFactories && !$this->isHotPath($definition) ? "\$container->load('%s')" : 'self::%s($container)';
                 $code = sprintf($code, $this->generateMethodName($id));
 
                 if (!$definition->isShared()) {
-                    $factory = sprintf('$this->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));
-                    $code = sprintf('(isset(%s) ? %1$s() : %s)', $factory, $code);
+                    $factory = sprintf('$container->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));
+                    $code = sprintf('(isset(%s) ? %1$s($container) : %s)', $factory, $code);
                 }
             }
             if ($definition->isShared() && !isset($this->singleUsePrivateIds[$id])) {
-                $code = sprintf('($this->%s[%s] ?? %s)', $definition->isPublic() ? 'services' : 'privates', $this->doExport($id), $code);
+                $code = sprintf('($container->%s[%s] ?? %s)', $definition->isPublic() ? 'services' : 'privates', $this->doExport($id), $code);
             }
 
             return $code;
@@ -1999,12 +2008,12 @@ private function getServiceCall(string $id, Reference $reference = null): string
             return 'null';
         }
         if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE < $reference->getInvalidBehavior()) {
-            $code = sprintf('$this->get(%s, ContainerInterface::NULL_ON_INVALID_REFERENCE)', $this->doExport($id));
+            $code = sprintf('$container->get(%s, ContainerInterface::NULL_ON_INVALID_REFERENCE)', $this->doExport($id));
         } else {
-            $code = sprintf('$this->get(%s)', $this->doExport($id));
+            $code = sprintf('$container->get(%s)', $this->doExport($id));
         }
 
-        return sprintf('($this->services[%s] ?? %s)', $this->doExport($id), $code);
+        return sprintf('($container->services[%s] ?? %s)', $this->doExport($id), $code);
     }
 
     /**
@@ -2095,7 +2104,7 @@ private function getExpressionLanguage(): ExpressionLanguage
                     return $this->getServiceCall($id);
                 }
 
-                return sprintf('$this->get(%s)', $arg);
+                return sprintf('$container->get(%s)', $arg);
             });
 
             if ($this->container->isTrackingResources()) {
@@ -2147,13 +2156,13 @@ private function export(mixed $value): mixed
                 $suffix = isset($value[$suffix]) ? '.'.$this->doExport(substr($value, $suffix), true) : '';
             }
 
-            $dirname = $this->asFiles ? '$this->containerDir' : '__DIR__';
+            $dirname = $this->asFiles ? '$container->containerDir' : '__DIR__';
             $offset = 2 + $this->targetDirMaxMatches - \count($matches);
 
             if (0 < $offset) {
                 $dirname = sprintf('\dirname(__DIR__, %d)', $offset + (int) $this->asFiles);
             } elseif ($this->asFiles) {
-                $dirname = "\$this->targetDir.''"; // empty string concatenation on purpose
+                $dirname = "\$container->targetDir.''"; // empty string concatenation on purpose
             }
 
             if ($prefix || $suffix) {
@@ -2179,21 +2188,13 @@ private function doExport(mixed $value, bool $resolveEnv = false): mixed
         } else {
             $export = var_export($value, true);
         }
-        if ($this->asFiles) {
-            if (str_contains($export, '$this')) {
-                $export = str_replace('$this', "$'.'this", $export);
-            }
-            if (str_contains($export, 'function () {')) {
-                $export = str_replace('function () {', "function ('.') {", $export);
-            }
-        }
 
-        if ($resolveEnv && "'" === $export[0] && $export !== $resolvedExport = $this->container->resolveEnvPlaceholders($export, "'.\$this->getEnv('string:%s').'")) {
+        if ($resolveEnv && "'" === $export[0] && $export !== $resolvedExport = $this->container->resolveEnvPlaceholders($export, "'.\$container->getEnv('string:%s').'")) {
             $export = $resolvedExport;
             if (str_ends_with($export, ".''")) {
                 $export = substr($export, 0, -3);
                 if ("'" === $export[1]) {
-                    $export = substr_replace($export, '', 18, 7);
+                    $export = substr_replace($export, '', 23, 7);
                 }
             }
             if ("'" === $export[1]) {
diff --git a/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php b/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php
index f476c5fe6e0d4..05028781a340d 100644
--- a/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php
+++ b/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php
@@ -40,19 +40,19 @@ public function getFunctions(): array
     {
         return [
             new ExpressionFunction('service', $this->serviceCompiler ?? function ($arg) {
-                return sprintf('$this->get(%s)', $arg);
+                return sprintf('$container->get(%s)', $arg);
             }, function (array $variables, $value) {
                 return $variables['container']->get($value);
             }),
 
             new ExpressionFunction('parameter', function ($arg) {
-                return sprintf('$this->getParameter(%s)', $arg);
+                return sprintf('$container->getParameter(%s)', $arg);
             }, function (array $variables, $value) {
                 return $variables['container']->getParameter($value);
             }),
 
             new ExpressionFunction('env', function ($arg) {
-                return sprintf('$this->getEnv(%s)', $arg);
+                return sprintf('$container->getEnv(%s)', $arg);
             }, function (array $variables, $value) {
                 if (!$this->getEnv) {
                     throw new LogicException('You need to pass a getEnv closure to the expression langage provider to use the "env" function.');
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
index eeef902b0f889..09426c7e4627e 100644
--- a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
+++ b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
@@ -69,7 +69,7 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $
         $instantiation = 'return';
 
         if ($definition->isShared()) {
-            $instantiation .= sprintf(' $this->%s[%s] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', var_export($id, true));
+            $instantiation .= sprintf(' $container->%s[%s] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', var_export($id, true));
         }
 
         $asGhostObject = str_contains($factoryCode, '$proxy');
@@ -78,22 +78,18 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $
         if (!$asGhostObject) {
             return <<<EOF
                     if (true === \$lazyLoad) {
-                        $instantiation \$this->createProxy('$proxyClass', fn () => \\$proxyClass::createLazyProxy(fn () => $factoryCode));
+                        $instantiation \$container->createProxy('$proxyClass', static fn () => \\$proxyClass::createLazyProxy(static fn () => $factoryCode));
                     }
 
 
             EOF;
         }
 
-        if (preg_match('/^\$this->\w++\(\$proxy\)$/', $factoryCode)) {
-            $factoryCode = substr_replace($factoryCode, '(...)', -8);
-        } else {
-            $factoryCode = sprintf('fn ($proxy) => %s', $factoryCode);
-        }
+        $factoryCode = sprintf('static fn ($proxy) => %s', $factoryCode);
 
         return <<<EOF
                 if (true === \$lazyLoad) {
-                    $instantiation \$this->createProxy('$proxyClass', fn () => \\$proxyClass::createLazyGhost($factoryCode));
+                    $instantiation \$container->createProxy('$proxyClass', static fn () => \\$proxyClass::createLazyGhost($factoryCode));
                 }
 
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 6be39f17e0a6d..b6cf6678fd5e5 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -1243,6 +1243,7 @@ public function testDumpHandlesEnumeration()
 %A
     private function getDynamicParameter(string $name)
     {
+        $container = $this;
         $value = match ($name) {
             'unit_enum' => \Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR,
             'enum_array' => [
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php
index cb9a3805400be..41cae53e5dcc4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'closure' => 'getClosureService',
@@ -48,8 +50,8 @@ public function getRemovedIds(): array
      *
      * @return \Closure
      */
-    protected function getClosureService()
+    protected static function getClosureService($container)
     {
-        return $this->services['closure'] = (new \stdClass())->__invoke(...);
+        return $container->services['closure'] = (new \stdClass())->__invoke(...);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
index 8bdda6b602b9b..3745b291db52f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_constructor_without_arguments.php
@@ -17,9 +17,11 @@
 class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithoutArgumentsContainer
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         parent::__construct();
         $this->parameterBag = null;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php
index 85b8bc6dae27d..482316c0ff1a0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_mandatory_constructor_arguments.php
@@ -17,9 +17,11 @@
 class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithMandatoryArgumentsContainer
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
 
         $this->aliases = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
index 6aeea149719b9..adb80f267dd0b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
@@ -17,9 +17,11 @@
 class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithOptionalArgumentsContainer
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         parent::__construct();
         $this->parameterBag = null;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_without_constructor.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_without_constructor.php
index ee47766101427..ff3750b0847cb 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_without_constructor.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_without_constructor.php
@@ -17,9 +17,11 @@
 class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\NoConstructorContainer
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
 
         $this->aliases = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
index da000bf8e41e3..98ea8c666ba36 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
@@ -17,9 +17,11 @@
 class Container extends \Symfony\Component\DependencyInjection\Dump\AbstractContainer
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
 
         $this->aliases = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
index 4cec1eb29b06e..a1398a57c976d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
 
         $this->aliases = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
index f391e0d81e6de..a98229eb58979 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -43,9 +45,9 @@ public function isCompiled(): bool
      *
      * @return \stdClass
      */
-    protected function getTestService()
+    protected static function getTestService($container)
     {
-        return $this->services['test'] = new \stdClass(['only dot' => '.', 'concatenation as value' => '.\'\'.', 'concatenation from the start value' => '\'\'.', '.' => 'dot as a key', '.\'\'.' => 'concatenation as a key', '\'\'.' => 'concatenation from the start key', 'optimize concatenation' => 'string1-string2', 'optimize concatenation with empty string' => 'string1string2', 'optimize concatenation from the start' => 'start', 'optimize concatenation at the end' => 'end', 'new line' => 'string with '."\n".'new line']);
+        return $container->services['test'] = new \stdClass(['only dot' => '.', 'concatenation as value' => '.\'\'.', 'concatenation from the start value' => '\'\'.', '.' => 'dot as a key', '.\'\'.' => 'concatenation as a key', '\'\'.' => 'concatenation from the start key', 'optimize concatenation' => 'string1-string2', 'optimize concatenation with empty string' => 'string1string2', 'optimize concatenation from the start' => 'start', 'optimize concatenation at the end' => 'end', 'new line' => 'string with '."\n".'new line']);
     }
 
     public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
index 60742f551a2e1..b7c31e8137aa4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
@@ -27,9 +27,13 @@ class getClosureService extends ProjectServiceContainer
      */
     public static function do($container, $lazyLoad = true)
     {
+        $containerRef = $container->ref;
+
         $container->services['closure'] = $instance = new \stdClass();
 
-        $instance->closures = [0 => #[\Closure(name: 'foo', class: 'FooClass')] function () use ($container): ?\stdClass {
+        $instance->closures = [0 => #[\Closure(name: 'foo', class: 'FooClass')] static function () use ($containerRef): ?\stdClass {
+            $container = $containerRef->get();
+
             return ($container->services['foo'] ?? null);
         }];
 
@@ -59,9 +63,11 @@ class ProjectServiceContainer extends Container
     protected $targetDir;
     protected $parameters = [];
     private $buildParameters;
+    protected readonly \WeakReference $ref;
 
     public function __construct(array $buildParameters = [], $containerDir = __DIR__)
     {
+        $this->ref = \WeakReference::create($this);
         $this->buildParameters = $buildParameters;
         $this->containerDir = $containerDir;
         $this->targetDir = \dirname($containerDir);
@@ -113,9 +119,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \FooClass
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
-        return $this->services['foo'] = new \FooClass(new \stdClass());
+        return $container->services['foo'] = new \FooClass(new \stdClass());
     }
 }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
index 18f89e9caf754..d2a31115d1187 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -43,9 +45,9 @@ public function isCompiled(): bool
      *
      * @return \stdClass
      */
-    protected function getTestService()
+    protected static function getTestService($container)
     {
-        return $this->services['test'] = new \stdClass(('file://'.\dirname(__DIR__, 1)), [('file://'.\dirname(__DIR__, 1)) => (\dirname(__DIR__, 2).'/')]);
+        return $container->services['test'] = new \stdClass(('file://'.\dirname(__DIR__, 1)), [('file://'.\dirname(__DIR__, 1)) => (\dirname(__DIR__, 2).'/')]);
     }
 
     public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
index 9af8e4cd09f71..de0550de9b79c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -48,11 +50,11 @@ public function getRemovedIds(): array
      *
      * @return \stdClass
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
         $a = new \stdClass();
-        $a->add($this);
+        $a->add($container);
 
-        return $this->services['bar'] = new \stdClass($a);
+        return $container->services['bar'] = new \stdClass($a);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
index cc56de79dfea3..328a9180ac5ab 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -44,9 +46,9 @@ public function isCompiled(): bool
      *
      * @return object A %env(FOO)% instance
      */
-    protected function getServiceFromAnonymousFactoryService()
+    protected static function getServiceFromAnonymousFactoryService($container)
     {
-        return $this->services['service_from_anonymous_factory'] = (new ${($_ = $this->getEnv('FOO')) && false ?: "_"}())->getInstance();
+        return $container->services['service_from_anonymous_factory'] = (new ${($_ = $container->getEnv('FOO')) && false ?: "_"}())->getInstance();
     }
 
     /**
@@ -54,9 +56,9 @@ protected function getServiceFromAnonymousFactoryService()
      *
      * @return \Bar\FooClass
      */
-    protected function getServiceWithMethodCallAndFactoryService()
+    protected static function getServiceWithMethodCallAndFactoryService($container)
     {
-        $this->services['service_with_method_call_and_factory'] = $instance = new \Bar\FooClass();
+        $container->services['service_with_method_call_and_factory'] = $instance = new \Bar\FooClass();
 
         $instance->setBar(\Bar\FooClass::getInstance());
 
@@ -105,8 +107,9 @@ public function getParameterBag(): ParameterBagInterface
 
     private function getDynamicParameter(string $name)
     {
+        $container = $this;
         $value = match ($name) {
-            'foo' => $this->getEnv('FOO'),
+            'foo' => $container->getEnv('FOO'),
             default => throw new ParameterNotFoundException($name),
         };
         $this->loadedDynamicParameters[$name] = true;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
index 320bdc3897c5f..b2bfd9e0865af 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'foo' => 'getFooService',
@@ -41,8 +43,8 @@ public function isCompiled(): bool
      *
      * @return \Foo
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
-        return $this->services['foo'] = new \Foo();
+        return $container->services['foo'] = new \Foo();
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php b/src/Symfony/Component
2851
/DependencyInjection/Tests/Fixtures/php/services26.php
index 29820767b8bf6..ad424a8e467a6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_EnvParameters extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -44,9 +46,9 @@ public function isCompiled(): bool
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\Bar
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
-        return $this->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\Bar($this->getEnv('QUZ'));
+        return $container->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\Bar($container->getEnv('QUZ'));
     }
 
     /**
@@ -54,9 +56,9 @@ protected function getBarService()
      *
      * @return object A %env(FOO)% instance
      */
-    protected function getTestService()
+    protected static function getTestService($container)
     {
-        return $this->services['test'] = new ${($_ = $this->getEnv('FOO')) && false ?: "_"}($this->getEnv('Bar'), 'foo'.$this->getEnv('string:FOO').'baz', $this->getEnv('int:Baz'));
+        return $container->services['test'] = new ${($_ = $container->getEnv('FOO')) && false ?: "_"}($container->getEnv('Bar'), 'foo'.$container->getEnv('string:FOO').'baz', $container->getEnv('int:Baz'));
     }
 
     public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
@@ -104,11 +106,12 @@ public function getParameterBag(): ParameterBagInterface
 
     private function getDynamicParameter(string $name)
     {
+        $container = $this;
         $value = match ($name) {
-            'bar' => $this->getEnv('FOO'),
-            'baz' => $this->getEnv('int:Baz'),
-            'json' => $this->getEnv('json:file:json_file'),
-            'db_dsn' => $this->getEnv('resolve:DB'),
+            'bar' => $container->getEnv('FOO'),
+            'baz' => $container->getEnv('int:Baz'),
+            'json' => $container->getEnv('json:file:json_file'),
+            'db_dsn' => $container->getEnv('resolve:DB'),
             default => throw new ParameterNotFoundException($name),
         };
         $this->loadedDynamicParameters[$name] = true;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
index 2e8c166d16ac4..eed5f3f6270dd 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'Bar\\Foo' => 'getFooService',
@@ -42,9 +44,9 @@ public function isCompiled(): bool
      *
      * @return \Bar\Foo
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
-        return $this->services['Bar\\Foo'] = new \Bar\Foo();
+        return $container->services['Bar\\Foo'] = new \Bar\Foo();
     }
 
     /**
@@ -52,8 +54,8 @@ protected function getFooService()
      *
      * @return \Foo\Foo
      */
-    protected function getFoo2Service()
+    protected static function getFoo2Service($container)
     {
-        return $this->services['Foo\\Foo'] = new \Foo\Foo();
+        return $container->services['Foo\\Foo'] = new \Foo\Foo();
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
index 88dcb00075cb5..b5d86ce86b753 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index d4ef329a1ad29..1321a66ec1bce 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -39,7 +39,7 @@ class getBAR2Service extends ProjectServiceContainer
     {
         $container->services['BAR'] = $instance = new \stdClass();
 
-        $instance->bar = ($container->services['bar'] ?? $container->getBarService());
+        $instance->bar = ($container->services['bar'] ?? self::getBarService($container));
 
         return $instance;
     }
@@ -281,7 +281,7 @@ class getFooService extends ProjectServiceContainer
         $instance->foo = 'bar';
         $instance->moo = $a;
         $instance->qux = ['bar' => 'foo is bar', 'foobar' => 'bar'];
-        $instance->setBar(($container->services['bar'] ?? $container->getBarService()));
+        $instance->setBar(($container->services['bar'] ?? self::getBarService($container)));
         $instance->initialize();
         sc_configure($instance);
 
@@ -319,11 +319,11 @@ class getFooBarService extends ProjectServiceContainer
      */
     public static function do($container, $lazyLoad = true)
     {
-        $container->factories['foo_bar'] = function () use ($container) {
+        $container->factories['foo_bar'] = static function ($container) {
             return new \Bar\FooClass(($container->services['deprecated_service'] ?? $container->load('getDeprecatedServiceService')));
         };
 
-        return $container->factories['foo_bar']();
+        return $container->factories['foo_bar']($container);
     }
 }
 
@@ -361,10 +361,14 @@ class getLazyContextService extends ProjectServiceContainer
      */
     public static function do($container, $lazyLoad = true)
     {
-        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($container) {
+        $containerRef = $container->ref;
+
+        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
             yield 'k1' => ($container->services['foo.baz'] ?? $container->load('getFoo_BazService'));
             yield 'k2' => $container;
-        }, 2), new RewindableGenerator(function () use ($container) {
+        }, 2), new RewindableGenerator(static function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -381,9 +385,13 @@ class getLazyContextIgnoreInvalidRefService extends ProjectServiceContainer
      */
     public static function do($container, $lazyLoad = true)
     {
-        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($container) {
+        $containerRef = $container->ref;
+
+        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
             yield 0 => ($container->services['foo.baz'] ?? $container->load('getFoo_BazService'));
-        }, 1), new RewindableGenerator(function () use ($container) {
+        }, 1), new RewindableGenerator(static function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -447,11 +455,11 @@ class getNonSharedFooService extends ProjectServiceContainer
     {
         include_once $container->targetDir.''.'/Fixtures/includes/foo.php';
 
-        $container->factories['non_shared_foo'] = function () use ($container) {
+        $container->factories['non_shared_foo'] = static function ($container) {
             return new \Bar\FooClass();
         };
 
-        return $container->factories['non_shared_foo']();
+        return $container->factories['non_shared_foo']($container);
     }
 }
 
@@ -511,7 +519,11 @@ class getTaggedIteratorService extends ProjectServiceContainer
      */
     public static function do($container, $lazyLoad = true)
     {
-        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($container) {
+        $containerRef = $container->ref;
+
+        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
             yield 0 => ($container->services['foo'] ?? $container->load('getFooService'));
             yield 1 => ($container->privates['tagged_iterator_foo'] ??= new \Bar());
         }, 2));
@@ -555,9 +567,11 @@ class ProjectServiceContainer extends Container
     protected $targetDir;
     protected $parameters = [];
     private $buildParameters;
+    protected readonly \WeakReference $ref;
 
     public function __construct(array $buildParameters = [], $containerDir = __DIR__)
     {
+        $this->ref = \WeakReference::create($this);
         $this->buildParameters = $buildParameters;
         $this->containerDir = $containerDir;
         $this->targetDir = \dirname($containerDir);
@@ -643,11 +657,11 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar\FooClass
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
-        $a = ($this->se
F438
rvices['foo.baz'] ?? $this->load('getFoo_BazService'));
+        $a = ($container->services['foo.baz'] ?? $container->load('getFoo_BazService'));
 
-        $this->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $this->getParameter('foo_bar'));
+        $container->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $container->getParameter('foo_bar'));
 
         $a->configure($instance);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index 4c4d4b2fbb06b..7b4c50ffb94d7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -90,11 +92,11 @@ public function getRemovedIds(): array
      *
      * @return \stdClass
      */
-    protected function getBARService()
+    protected static function getBARService($container)
     {
-        $this->services['BAR'] = $instance = new \stdClass();
+        $container->services['BAR'] = $instance = new \stdClass();
 
-        $instance->bar = ($this->services['bar'] ?? $this->getBar3Service());
+        $instance->bar = ($container->services['bar'] ?? self::getBar3Service($container));
 
         return $instance;
     }
@@ -104,9 +106,9 @@ protected function getBARService()
      *
      * @return \stdClass
      */
-    protected function getBAR2Service()
+    protected static function getBAR2Service($container)
     {
-        return $this->services['BAR2'] = new \stdClass();
+        return $container->services['BAR2'] = new \stdClass();
     }
 
     /**
@@ -114,9 +116,9 @@ protected function getBAR2Service()
      *
      * @return \Bar
      */
-    protected function getAServiceService()
+    protected static function getAServiceService($container)
     {
-        return $this->services['a_service'] = ($this->privates['a_factory'] ??= new \Bar())->getBar();
+        return $container->services['a_service'] = ($container->privates['a_factory'] ??= new \Bar())->getBar();
     }
 
     /**
@@ -124,9 +126,9 @@ protected function getAServiceService()
      *
      * @return \Bar
      */
-    protected function getBServiceService()
+    protected static function getBServiceService($container)
     {
-        return $this->services['b_service'] = ($this->privates['a_factory'] ??= new \Bar())->getBar();
+        return $container->services['b_service'] = ($container->privates['a_factory'] ??= new \Bar())->getBar();
     }
 
     /**
@@ -134,11 +136,11 @@ protected function getBServiceService()
      *
      * @return \Bar\FooClass
      */
-    protected function getBar3Service()
+    protected static function getBar3Service($container)
     {
-        $a = ($this->services['foo.baz'] ?? $this->getFoo_BazService());
+        $a = ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
 
-        $this->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $this->getParameter('foo_bar'));
+        $container->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $container->getParameter('foo_bar'));
 
         $a->configure($instance);
 
@@ -150,9 +152,9 @@ protected function getBar3Service()
      *
      * @return \stdClass
      */
-    protected function getBar22Service()
+    protected static function getBar22Service($container)
     {
-        return $this->services['bar2'] = new \stdClass();
+        return $container->services['bar2'] = new \stdClass();
     }
 
     /**
@@ -160,11 +162,11 @@ protected function getBar22Service()
      *
      * @return \Baz
      */
-    protected function getBazService()
+    protected static function getBazService($container)
     {
-        $this->services['baz'] = $instance = new \Baz();
+        $container->services['baz'] = $instance = new \Baz();
 
-        $instance->setFoo(($this->services['foo_with_inline'] ?? $this->getFooWithInlineService()));
+        $instance->setFoo(($container->services['foo_with_inline'] ?? self::getFooWithInlineService($container)));
 
         return $instance;
     }
@@ -174,12 +176,12 @@ protected function getBazService()
      *
      * @return \stdClass
      */
-    protected function getConfiguredServiceService()
+    protected static function getConfiguredServiceService($container)
     {
-        $this->services['configured_service'] = $instance = new \stdClass();
+        $container->services['configured_service'] = $instance = new \stdClass();
 
         $a = new \ConfClass();
-        $a->setFoo(($this->services['baz'] ?? $this->getBazService()));
+        $a->setFoo(($container->services['baz'] ?? self::getBazService($container)));
 
         $a->configureStdClass($instance);
 
@@ -191,9 +193,9 @@ protected function getConfiguredServiceService()
      *
      * @return \stdClass
      */
-    protected function getConfiguredServiceSimpleService()
+    protected static function getConfiguredServiceSimpleService($container)
     {
-        $this->services['configured_service_simple'] = $instance = new \stdClass();
+        $container->services['configured_service_simple'] = $instance = new \stdClass();
 
         (new \ConfClass('bar'))->configureStdClass($instance);
 
@@ -205,9 +207,9 @@ protected function getConfiguredServiceSimpleService()
      *
      * @return \stdClass
      */
-    protected function getDecoratorServiceService()
+    protected static function getDecoratorServiceService($container)
     {
-        return $this->services['decorator_service'] = new \stdClass();
+        return $container->services['decorator_service'] = new \stdClass();
     }
 
     /**
@@ -215,9 +217,9 @@ protected function getDecoratorServiceService()
      *
      * @return \stdClass
      */
-    protected function getDecoratorServiceWithNameService()
+    protected static function getDecoratorServiceWithNameService($container)
     {
-        return $this->services['decorator_service_with_name'] = new \stdClass();
+        return $container->services['decorator_service_with_name'] = new \stdClass();
     }
 
     /**
@@ -227,11 +229,11 @@ protected function getDecoratorServiceWithNameService()
      *
      * @deprecated Since vendor/package 1.1: The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.
      */
-    protected function getDeprecatedServiceService()
+    protected static function getDeprecatedServiceService($container)
     {
         trigger_deprecation('vendor/package', '1.1', 'The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.');
 
-        return $this->services['deprecated_service'] = new \stdClass();
+        return $container->services['deprecated_service'] = new \stdClass();
     }
 
     /**
@@ -239,9 +241,9 @@ protected function getDeprecatedServiceService()
      *
      * @return \Bar
      */
-    protected function getFactoryServiceService()
+    protected static function getFactoryServiceService($container)
     {
-        return $this->services['factory_service'] = ($this->services['foo.baz'] ?? $this->getFoo_BazService())->getInstance();
+        return $container->services['factory_service'] = ($container->services['foo.baz'] ?? self::getFoo_BazService($container))->getInstance();
     }
 
     /**
@@ -249,9 +251,9 @@ protected function getFactoryServiceService()
      *
      * @return \Bar
      */
-    protected function getFactoryServiceSimpleService()
+    protected static function getFactoryServiceSimpleService($container)
     {
-        return $this->services['factory_service_simple'] = $this->getFactorySimpleService()->getInstance();
+        return $container->services['factory_service_simple'] = self::getFactorySimpleService($container)->getInstance();
     }
 
     /**
@@ -259,16 +261,16 @@ protected function getFactoryServiceSimpleService()
      *
      * @return \Bar\FooClass
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
-        $a = ($this->services['foo.baz'] ?? $this->getFoo_BazService());
+        $a = ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
 
-        $this->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, ['bar' => 'foo is bar', 'foobar' => 'bar'], true, $this);
+        $container->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, ['bar' => 'foo is bar', 'foobar' => 'bar'], true, $container);
 
         $instance->foo = 'bar';
         $instance->moo = $a;
         $instance->qux = ['bar' => 'foo is bar', 'foobar' => 'bar'];
-        $instance->setBar(($this->services['bar'] ?? $this->getBar3Service()));
+        $instance->setBar(($container->services['bar'] ?? self::getBar3Service($container)));
         $instance->initialize();
         sc_configure($instance);
 
@@ -280,9 +282,9 @@ protected function getFooService()
      *
      * @return \BazClass
      */
-    protected function getFoo_BazService()
+    protected static function getFoo_BazService($container)
     {
-        $this->services['foo.baz'] = $instance = \BazClass::getInstance();
+        $container->services['foo.baz'] = $instance = \BazClass::getInstance();
 
         \BazClass::configureStatic1($instance);
 
@@ -294,13 +296,13 @@ protected function getFoo_BazService()
      *
      * @return \Bar\FooClass
      */
-    protected function getFooBarService()
+    protected static function getFooBarService($container)
     {
-        $this->factories['foo_bar'] = function () {
-            return new \Bar\FooClass(($this->services['deprecated_service'] ?? $this->getDeprecatedServiceService()));
+        $container->factories['foo_bar'] = static function ($container) {
+            return new \Bar\FooClass(($container->services['deprecated_service'] ?? self::getDeprecatedServiceService($container)));
         };
 
-        return $this->factories['foo_bar']();
+        return $container->factories['foo_bar']($container);
     }
 
     /**
@@ -308,13 +310,13 @@ protected function getFooBarService()
      *
      * @return \Foo
      */
-    protected function getFooWithInlineService()
+    protected static function getFooWithInlineService($container)
     {
-        $this->services['foo_with_inline'] = $instance = new \Foo();
+        $container->services['foo_with_inline'] = $instance = new \Foo();
 
         $a = new \Bar();
         $a->pub = 'pub';
-        $a->setBaz(($this->services['baz'] ?? $this->getBazService()));
+        $a->setBaz(($container->services['baz'] ?? self::getBazService($container)));
 
         $instance->setBar($a);
 
@@ -326,12 +328,16 @@ protected function getFooWithInlineService()
      *
      * @return \LazyContext
      */
-    protected function getLazyContextService()
+    protected static function getLazyContextService($container)
     {
-        return $this->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () {
-            yield 'k1' => ($this->services['foo.baz'] ?? $this->getFoo_BazService());
-            yield 'k2' => $this;
-        }, 2), new RewindableGenerator(function () {
+        $containerRef = $container->ref;
+
+        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 'k1' => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
+            yield 'k2' => $container;
+        }, 2), new RewindableGenerator(static function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -341,11 +347,15 @@ protected function getLazyContextService()
      *
      * @return \LazyContext
      */
-    protected function getLazyContextIgnoreInvalidRefService()
+    protected static function getLazyContextIgnoreInvalidRefService($container)
     {
-        return $this->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () {
-            yield 0 => ($this->services['foo.baz'] ?? $this->getFoo_BazService());
-        }, 1), new RewindableGenerator(function () {
+        $containerRef = $container->ref;
+
+        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 0 => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
+        }, 1), new RewindableGenerator(static function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -355,15 +365,15 @@ protected function getLazyContextIgnoreInvalidRefService()
      *
      * @return \Bar\FooClass
      */
-    protected function getMethodCall1Service()
+    protected static function getMethodCall1Service($container)
     {
         include_once '%path%foo.php';
 
-        $this->services['method_call1'] = $instance = new \Bar\FooClass();
+        $container->services['method_call1'] = $instance = new \Bar\FooClass();
 
-        $instance->setBar(($this->services['foo'] ?? $this->getFooService()));
+        $instance->setBar(($container->services['foo'] ?? self::getFooService($container)));
         $instance->setBar(NULL);
-        $instance->setBar((($this->services['foo'] ?? $this->getFooService())->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
+        $instance->setBar((($container->services['foo'] ?? self::getFooService($container))->foo() . (($container->hasParameter("foo")) ? ($container->getParameter("foo")) : ("default"))));
 
         return $instance;
     }
@@ -373,12 +383,12 @@ protected function getMethodCall1Service()
      *
      * @return \FooBarBaz
      */
-    protected function getNewFactoryServiceService()
+    protected static function getNewFactoryServiceService($container)
     {
         $a = new \FactoryClass();
         $a->foo = 'bar';
 
-        $this->services['new_factory_service'] = $instance = $a->getInstance();
+        $container->services['new_factory_service'] = $instance = $a->getInstance();
 
         $instance->foo = 'bar';
 
@@ -390,9 +400,9 @@ protected function getNewFactoryServiceService()
      *
      * @return \stdClass
      */
-    protected function getPreloadSidekickService()
+    protected static function getPreloadSidekickService($container)
     {
-        return $this->services['preload_sidekick'] = new \stdClass();
+        return $container->services['preload_sidekick'] = new \stdClass();
     }
 
     /**
@@ -400,9 +410,9 @@ protected function getPreloadSidekickService()
      *
      * @return \stdClass
      */
-    protected function getRuntimeErrorService()
+    protected static function getRuntimeErrorService($container)
     {
-        return $this->services['runtime_error'] = new \stdClass(throw new RuntimeException('Service "errored_definition" is broken.'));
+        return $container->services['runtime_error'] = new \stdClass(throw new RuntimeException('Service "errored_definition" is broken.'));
     }
 
     /**
@@ -410,9 +420,9 @@ protected function getRuntimeErrorService()
      *
      * @return \Bar\FooClass
      */
-    protected function getServiceFromStaticMethodService()
+    protected static function getServiceFromStaticMethodService($container)
     {
-        return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance();
+        return $container->services['service_from_static_method'] = \Bar\FooClass::getInstance();
     }
 
     /**
@@ -420,11 +430,15 @@ protected function getServiceFromStaticMethodService()
      *
      * @return \Bar
      */
-    protected function getTaggedIteratorService()
+    protected static function getTaggedIteratorService($container)
     {
-        return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
-            yield 0 => ($this->services['foo'] ?? $this->getFooService());
-            yield 1 => ($this->privates['tagged_iterator_foo'] ??= new \Bar());
+        $containerRef = $container->ref;
+
+        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 0 => ($container->services['foo'] ?? self::getFooService($container));
+            yield 1 => ($container->privates['tagged_iterator_foo'] ??= new \Bar());
         }, 2));
     }
 
@@ -435,7 +449,7 @@ protected function getTaggedIteratorService()
      *
      * @deprecated Since vendor/package 1.1: The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.
      */
-    protected function getFactorySimpleService()
+    protected static function getFactorySimpleService($container)
     {
         trigger_deprecation('vendor/package', '1.1', 'The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.');
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
index 137506abdf4b0..920e4036507a4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
@@ -40,9 +40,11 @@ class ProjectServiceContainer extends Container
     protected $targetDir;
     protected $parameters = [];
     private $buildParameters;
+    protected readonly \WeakReference $ref;
 
     public function __construct(array $buildParameters = [], $containerDir = __DIR__)
     {
+        $this->ref = \WeakReference::create($this);
         $this->buildParameters = $buildParameters;
         $this->containerDir = $containerDir;
         $this->targetDir = \dirname($containerDir);
@@ -88,8 +90,8 @@ class ProjectServiceContainer extends Container
             'decorated' => 'decorator_service_with_name',
         ];
 
-        $this->privates['service_container'] = function () {
-            include_once $this->targetDir.''.'/Fixtures/includes/foo.php';
+        $this->privates['service_container'] = static function ($container) {
+            include_once $container->targetDir.''.'/Fixtures/includes/foo.php';
         };
     }
 
@@ -113,11 +115,11 @@ class ProjectServiceContainer extends Container
      *
      * @return \stdClass
      */
-    protected function getBARService()
+    protected static function getBARService($container)
     {
-        $this->services['BAR'] = $instance = new \stdClass();
+        $container->services['BAR'] = $instance = new \stdClass();
 
-        $instance->bar = ($this->services['bar'] ?? $this->getBar3Service());
+        $instance->bar = ($container->services['bar'] ?? self::getBar3Service($container));
 
         return $instance;
     }
@@ -127,9 +129,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \stdClass
      */
-    protected function getBAR2Service()
+    protected static function getBAR2Service($container)
     {
-        return $this->services['BAR2'] = new \stdClass();
+        return $container->services['BAR2'] = new \stdClass();
     }
 
     /**
@@ -137,9 +139,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar
      */
-    protected function getAServiceService()
+    protected static function getAServiceService($container)
     {
-        return $this->services['a_service'] = ($this->privates['a_factory'] ??= new \Bar())->getBar();
+        return $container->services['a_service'] = ($container->privates['a_factory'] ??= new \Bar())->getBar();
     }
 
     /**
@@ -147,9 +149,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar
      */
-    protected function getBServiceService()
+    protected static function getBServiceService($container)
     {
-        return $this->services['b_service'] = ($this->privates['a_factory'] ??= new \Bar())->getBar();
+        return $container->services['b_service'] = ($container->privates['a_factory'] ??= new \Bar())->getBar();
     }
 
     /**
@@ -157,11 +159,11 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar\FooClass
      */
-    protected function getBar3Service()
+    protected static function getBar3Service($container)
     {
-        $a = ($this->services['foo.baz'] ?? $this->getFoo_BazService());
+        $a = ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
 
-        $this->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $this->getParameter('foo_bar'));
+        $container->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $container->getParameter('foo_bar'));
 
         $a->configure($instance);
 
@@ -173,9 +175,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \stdClass
      */
-    protected function getBar22Service()
+    protected static function getBar22Service($container)
     {
-        return $this->services['bar2'] = new \stdClass();
+        return $container->services['bar2'] = new \stdClass();
     }
 
     /**
@@ -183,11 +185,11 @@ class ProjectServiceContainer extends Container
      *
      * @return \Baz
      */
-    protected function getBazService()
+    protected static function getBazService($container)
     {
-        $this->services['baz'] = $instance = new \Baz();
+        $container->services['baz'] = $instance = new \Baz();
 
-        $instance->setFoo(($this->services['foo_with_inline'] ?? $this->getFooWithInlineService()));
+        $instance->setFoo(($container->services['foo_with_inline'] ?? self::getFooWithInlineService($container)));
 
         return $instance;
     }
@@ -197,12 +199,12 @@ class ProjectServiceContainer extends Container
      *
      * @return \stdClass
      */
-    protected function getConfiguredServiceService()
+    protected static function getConfiguredServiceService($container)
     {
-        $this->services['configured_service'] = $instance = new \stdClass();
+        $container->services['configured_service'] = $instance = new \stdClass();
 
         $a = new \ConfClass();
-        $a->setFoo(($this->services['baz'] ?? $this->getBazService()));
+        $a->setFoo(($container->services['baz'] ?? self::getBazService($container)));
 
         $a->configureStdClass($instance);
 
@@ -214,9 +216,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \stdClass
      */
-    protected function getConfiguredServiceSimpleService()
+    protected static function getConfiguredServiceSimpleService($container)
     {
-        $this->services['configured_service_simple'] = $instance = new \stdClass();
+        $container->services['configured_service_simple'] = $instance = new \stdClass();
 
         (new \ConfClass('bar'))->configureStdClass($instance);
 
@@ -228,9 +230,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \stdClass
      */
-    protected function getDecoratorServiceService()
+    protected static function getDecoratorServiceService($container)
     {
-        return $this->services['decorator_service'] = new \stdClass();
+        return $container->services['decorator_service'] = new \stdClass();
     }
 
     /**
@@ -238,9 +240,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \stdClass
      */
-    protected function getDecoratorServiceWithNameService()
+    protected static function getDecoratorServiceWithNameService($container)
     {
-        return $this->services['decorator_service_with_name'] = new \stdClass();
+        return $container->services['decorator_service_with_name'] = new \stdClass();
     }
 
     /**
@@ -250,11 +252,11 @@ class ProjectServiceContainer extends Container
      *
      * @deprecated Since vendor/package 1.1: The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.
      */
-    protected function getDeprecatedServiceService()
+    protected static function getDeprecatedServiceService($container)
     {
         trigger_deprecation('vendor/package', '1.1', 'The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.');
 
-        return $this->services['deprecated_service'] = new \stdClass();
+        return $container->services['deprecated_service'] = new \stdClass();
     }
 
     /**
@@ -262,9 +264,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar
      */
-    protected function getFactoryServiceService()
+    protected static function getFactoryServiceService($container)
     {
-        return $this->services['factory_service'] = ($this->services['foo.baz'] ?? $this->getFoo_BazService())->getInstance();
+        return $container->services['factory_service'] = ($container->services['foo.baz'] ?? self::getFoo_BazService($container))->getInstance();
     }
 
     /**
@@ -272,9 +274,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar
      */
-    protected function getFactoryServiceSimpleService()
+    protected static function getFactoryServiceSimpleService($container)
     {
-        return $this->services['factory_service_simple'] = $this->getFactorySimpleService()->getInstance();
+        return $container->services['factory_service_simple'] = self::getFactorySimpleService($container)->getInstance();
     }
 
     /**
@@ -282,16 +284,16 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar\FooClass
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
-        $a = ($this->services['foo.baz'] ?? $this->getFoo_BazService());
+        $a = ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
 
-        $this->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, ['bar' => 'foo is bar', 'foobar' => 'bar'], true, $this);
+        $container->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, ['bar' => 'foo is bar', 'foobar' => 'bar'], true, $container);
 
         $instance->foo = 'bar';
         $instance->moo = $a;
         $instance->qux = ['bar' => 'foo is bar', 'foobar' => 'bar'];
-        $instance->setBar(($this->services['bar'] ?? $this->getBar3Service()));
+        $instance->setBar(($container->services['bar'] ?? self::getBar3Service($container)));
         $instance->initialize();
         sc_configure($instance);
 
@@ -303,11 +305,11 @@ class ProjectServiceContainer extends Container
      *
      * @return \BazClass
      */
-    protected function getFoo_BazService()
+    protected static function getFoo_BazService($container)
     {
-        include_once $this->targetDir.''.'/Fixtures/includes/classes.php';
+        include_once $container->targetDir.''.'/Fixtures/includes/classes.php';
 
-        $this->services['foo.baz'] = $instance = \BazClass::getInstance();
+        $container->services['foo.baz'] = $instance = \BazClass::getInstance();
 
         \BazClass::configureStatic1($instance);
 
@@ -319,13 +321,13 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar\FooClass
      */
-    protected function getFooBarService()
+    protected static function getFooBarService($container)
     {
-        $this->factories['foo_bar'] = function () {
-            return new \Bar\FooClass(($this->services['deprecated_service'] ?? $this->getDeprecatedServiceService()));
+        $container->factories['foo_bar'] = static function ($container) {
+            return new \Bar\FooClass(($container->services['deprecated_service'] ?? self::getDeprecatedServiceService($container)));
         };
 
-        return $this->factories['foo_bar']();
+        return $container->factories['foo_bar']($container);
     }
 
     /**
@@ -333,13 +335,13 @@ class ProjectServiceContainer extends Container
      *
      * @return \Foo
      */
-    protected function getFooWithInlineService()
+    protected static function getFooWithInlineService($container)
     {
-        $this->services['foo_with_inline'] = $instance = new \Foo();
+        $container->services['foo_with_inline'] = $instance = new \Foo();
 
         $a = new \Bar();
         $a->pub = 'pub';
-        $a->setBaz(($this->services['baz'] ?? $this->getBazService()));
+        $a->setBaz(($container->services['baz'] ?? self::getBazService($container)));
 
         $instance->setBar($a);
 
@@ -351,14 +353,18 @@ class ProjectServiceContainer extends Container
      *
      * @return \LazyContext
      */
-    protected function getLazyContextService()
+    protected static function getLazyContextService($container)
     {
-        include_once $this->targetDir.''.'/Fixtures/includes/classes.php';
+        $containerRef = $container->ref;
 
-        return $this->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () {
-            yield 'k1' => ($this->services['foo.baz'] ?? $this->getFoo_BazService());
-            yield 'k2' => $this;
-        }, 2), new RewindableGenerator(function () {
+        include_once $container->targetDir.''.'/Fixtures/includes/classes.php';
+
+        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 'k1' => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
+            yield 'k2' => $container;
+        }, 2), new RewindableGenerator(static function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -368,13 +374,17 @@ class ProjectServiceContainer extends Container
      *
      * @return \LazyContext
      */
-    protected function getLazyContextIgnoreInvalidRefService()
+    protected static function getLazyContextIgnoreInvalidRefService($container)
     {
-        include_once $this->targetDir.''.'/Fixtures/includes/classes.php';
+        $containerRef = $container->ref;
+
+        include_once $container->targetDir.''.'/Fixtures/includes/classes.php';
 
-        return $this->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () {
-            yield 0 => ($this->services['foo.baz'] ?? $this->getFoo_BazService());
-        }, 1), new RewindableGenerator(function () {
+        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 0 => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
+        }, 1), new RewindableGenerator(static function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -384,15 +394,15 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar\FooClass
      */
-    protected function getMethodCall1Service()
+    protected static function getMethodCall1Service($container)
     {
-        include_once $this->targetDir.''.'/Fixtures/includes/foo.php';
+        include_once $container->targetDir.''.'/Fixtures/includes/foo.php';
 
-        $this->services['method_call1'] = $instance = new \Bar\FooClass();
+        $container->services['method_call1'] = $instance = new \Bar\FooClass();
 
-        $instance->setBar(($this->services['foo'] ?? $this->getFooService()));
+        $instance->setBar(($container->services['foo'] ?? self::getFooService($container)));
         $instance->setBar(NULL);
-        $instance->setBar((($this->services['foo'] ?? $this->getFooService())->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
+        $instance->setBar((($container->services['foo'] ?? self::getFooService($container))->foo() . (($container->hasParameter("foo")) ? ($container->getParameter("foo")) : ("default"))));
 
         return $instance;
     }
@@ -402,12 +412,12 @@ class ProjectServiceContainer extends Container
      *
      * @return \FooBarBaz
      */
-    protected function getNewFactoryServiceService()
+    protected static function getNewFactoryServiceService($container)
     {
         $a = new \FactoryClass();
         $a->foo = 'bar';
 
-        $this->services['new_factory_service'] = $instance = $a->getInstance();
+        $container->services['new_factory_service'] = $instance = $a->getInstance();
 
         $instance->foo = 'bar';
 
@@ -419,15 +429,15 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar\FooClass
      */
-    protected function getNonSharedFooService()
+    protected static function getNonSharedFooService($container)
     {
-        include_once $this->targetDir.''.'/Fixtures/includes/foo.php';
+        include_once $container->targetDir.''.'/Fixtures/includes/foo.php';
 
-        $this->factories['non_shared_foo'] = function () {
+        $container->factories['non_shared_foo'] = static function ($container) {
             return new \Bar\FooClass();
         };
 
-        return $this->factories['non_shared_foo']();
+        return $container->factories['non_shared_foo']($container);
     }
 
     /**
@@ -435,9 +445,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \stdClass
      */
-    protected function getPreloadSidekickService()
+    protected static function getPreloadSidekickService($container)
     {
-        return $this->services['preload_sidekick'] = new \stdClass();
+        return $container->services['preload_sidekick'] = new \stdClass();
     }
 
     /**
@@ -445,9 +455,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \stdClass
      */
-    protected function getRuntimeErrorService()
+    protected static function getRuntimeErrorService($container)
     {
-        return $this->services['runtime_error'] = new \stdClass(throw new RuntimeException('Service "errored_definition" is broken.'));
+        return $container->services['runtime_error'] = new \stdClass(throw new RuntimeException('Service "errored_definition" is broken.'));
     }
 
     /**
@@ -455,9 +465,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar\FooClass
      */
-    protected function getServiceFromStaticMethodService()
+    protected static function getServiceFromStaticMethodService($container)
     {
-        return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance();
+        return $container->services['service_from_static_method'] = \Bar\FooClass::getInstance();
     }
 
     /**
@@ -465,11 +475,15 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar
      */
-    protected function getTaggedIteratorService()
+    protected static function getTaggedIteratorService($container)
     {
-        return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
-            yield 0 => ($this->services['foo'] ?? $this->getFooService());
-            yield 1 => ($this->privates['tagged_iterator_foo'] ??= new \Bar());
+        $containerRef = $container->ref;
+
+        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 0 => ($container->services['foo'] ?? self::getFooService($container));
+            yield 1 => ($container->privates['tagged_iterator_foo'] ??= new \Bar());
         }, 2));
     }
 
@@ -478,9 +492,9 @@ class ProjectServiceContainer extends Container
      *
      * @return \Bar\FooClass
      */
-    protected function getThrowingOneService()
+    protected static function getThrowingOneService($container)
     {
-        return $this->services['throwing_one'] = new \Bar\FooClass(throw new RuntimeException('No-no-no-no'));
+        return $container->services['throwing_one'] = new \Bar\FooClass(throw new RuntimeException('No-no-no-no'));
     }
 
     /**
@@ -490,7 +504,7 @@ class ProjectServiceContainer extends Container
      *
      * @deprecated Since vendor/package 1.1: The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.
      */
-    protected function getFactorySimpleService()
+    protected static function getFactorySimpleService($container)
     {
         trigger_deprecation('vendor/package', '1.1', 'The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.');
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
index b1bf8826b43dd..31cf95ed38123 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -4,7 +4,7 @@ Array
 
 namespace Container%s;
 
-include_once $this->targetDir.''.'/Fixtures/includes/foo.php';
+include_once $container->targetDir.''.'/Fixtures/includes/foo.php';
 
 class FooClassGhost2b16075 extends \Bar\FooClass implements \Symfony\Component\VarExporter\LazyObjectInterface
 %A
@@ -35,9 +35,11 @@ class ProjectServiceContainer extends Container
     protected $targetDir;
     protected $parameters = [];
     private $buildParameters;
+    protected readonly \WeakReference $ref;
 
     public function __construct(array $buildParameters = [], $containerDir = __DIR__)
     {
+        $this->ref = \WeakReference::create($this);
         $this->buildParameters = $buildParameters;
         $this->containerDir = $containerDir;
         $this->targetDir = \dirname($containerDir);
@@ -50,7 +52,7 @@ class ProjectServiceContainer extends Container
 
         $this->aliases = [];
 
-        $this->privates['service_container'] = function () {
+        $this->privates['service_container'] = static function ($container) {
             include_once __DIR__.'/proxy-classes.php';
         };
     }
@@ -75,13 +77,15 @@ class ProjectServiceContainer extends Container
      *
      * @return object A %lazy_foo_class% instance
      */
-    protected function getLazyFooService($lazyLoad = true)
+    protected static function getLazyFooService($container, $lazyLoad = true)
     {
+        $containerRef = $container->ref;
+
         if (true === $lazyLoad) {
-            return $this->services['lazy_foo'] = $this->createProxy('FooClassGhost2b16075', fn () => \FooClassGhost2b16075::createLazyGhost($this->getLazyFooService(...)));
+            return $container->services['lazy_foo'] = $container->createProxy('FooClassGhost2b16075', static fn () => \FooClassGhost2b16075::createLazyGhost(static fn ($proxy) => self::getLazyFooService($containerRef->get(), $proxy)));
         }
 
-        include_once $this->targetDir.''.'/Fixtures/includes/foo_lazy.php';
+        include_once $container->targetDir.''.'/Fixtures/includes/foo_lazy.php';
 
         return ($lazyLoad->__construct(new \Bar\FooLazyClass()) && false ?: $lazyLoad);
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php
index b07280c763cb3..ff6b744a8fa9c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'App\\Bus' => 'getBusService',
@@ -53,13 +55,13 @@ public function getRemovedIds(): array
      *
      * @return \App\Bus
      */
-    protected function getBusService()
+    protected static function getBusService($container)
     {
-        $a = ($this->services['App\\Db'] ?? $this->getDbService());
+        $a = ($container->services['App\\Db'] ?? self::getDbService($container));
 
-        $this->services['App\\Bus'] = $instance = new \App\Bus($a);
+        $container->services['App\\Bus'] = $instance = new \App\Bus($a);
 
-        $b = ($this->privates['App\\Schema'] ?? $this->getSchemaService());
+        $b = ($container->privates['App\\Schema'] ?? self::getSchemaService($container));
         $c = new \App\Registry();
         $c->processor = [0 => $a, 1 => $instance];
 
@@ -76,11 +78,11 @@ protected function getBusService()
      *
      * @return \App\Db
      */
-    protected function getDbService()
+    protected static function getDbService($container)
     {
-        $this->services['App\\Db'] = $instance = new \App\Db();
+        $container->services['App\\Db'] = $instance = new \App\Db();
 
-        $instance->schema = ($this->privates['App\\Schema'] ?? $this->getSchemaService());
+        $instance->schema = ($container->privates['App\\Schema'] ?? self::getSchemaService($container));
 
         return $instance;
     }
@@ -90,14 +92,14 @@ protected function getDbService()
      *
      * @return \App\Schema
      */
-    protected function getSchemaService()
+    protected static function getSchemaService($container)
     {
-        $a = ($this->services['App\\Db'] ?? $this->getDbService());
+        $a = ($container->services['App\\Db'] ?? self::getDbService($container));
 
-        if (isset($this->privates['App\\Schema'])) {
-            return $this->privates['App\\Schema'];
+        if (isset($container->privates['App\\Schema'])) {
+            return $container->privates['App\\Schema'];
         }
 
-        return $this->privates['App\\Schema'] = new \App\Schema($a);
+        return $container->privates['App\\Schema'] = new \App\Schema($a);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
index 9762e7411df37..1f79a3e7dda55 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar2' => 'getBar2Service',
@@ -104,11 +106,11 @@ public function getRemovedIds(): array
      *
      * @return \BarCircular
      */
-    protected function getBar2Service()
+    protected static function getBar2Service($container)
     {
-        $this->services['bar2'] = $instance = new \BarCircular();
+        $container->services['bar2'] = $instance = new \BarCircular();
 
-        $instance->addFoobar(new \FoobarCircular(($this->services['foo2'] ?? $this->getFoo2Service())));
+        $instance->addFoobar(new \FoobarCircular(($container->services['foo2'] ?? self::getFoo2Service($container))));
 
         return $instance;
     }
@@ -118,9 +120,9 @@ protected function getBar2Service()
      *
      * @return \BarCircular
      */
-    protected function getBar3Service()
+    protected static function getBar3Service($container)
     {
-        $this->services['bar3'] = $instance = new \BarCircular();
+        $container->services['bar3'] = $instance = new \BarCircular();
 
         $a = new \FoobarCircular();
 
@@ -134,11 +136,11 @@ protected function getBar3Service()
      *
      * @return \stdClass
      */
-    protected function getBaz6Service()
+    protected static function getBaz6Service($container)
     {
-        $this->services['baz6'] = $instance = new \stdClass();
+        $container->services['baz6'] = $instance = new \stdClass();
 
-        $instance->bar6 = ($this->privates['bar6'] ?? $this->getBar6Service());
+        $instance->bar6 = ($container->privates['bar6'] ?? self::getBar6Service($container));
 
         return $instance;
     }
@@ -148,17 +150,17 @@ protected function getBaz6Service()
      *
      * @return \stdClass
      */
-    protected function getConnectionService()
+    protected static function getConnectionService($container)
     {
         $a = new \stdClass();
 
         $b = new \stdClass();
 
-        $this->services['connection'] = $instance = new \stdClass($a, $b);
+        $container->services['connection'] = $instance = new \stdClass($a, $b);
 
-        $b->logger = ($this->services['logger'] ?? $this->getLoggerService());
+        $b->logger = ($container->services['logger'] ?? self::getLoggerService($container));
 
-        $a->subscriber = ($this->services['subscriber'] ?? $this->getSubscriberService());
+        $a->subscriber = ($container->services['subscriber'] ?? self::getSubscriberService($container));
 
         return $instance;
     }
@@ -168,17 +170,17 @@ protected function getConnectionService()
      *
      * @return \stdClass
      */
-    protected function getConnection2Service()
+    protected static function getConnection2Service($container)
     {
         $a = new \stdClass();
 
         $b = new \stdClass();
 
-        $this->services['connection2'] = $instance = new \stdClass($a, $b);
+        $container->services['connection2'] = $instance = new \stdClass($a, $b);
 
         $c = new \stdClass($instance);
 
-        $d = ($this->services['manager2'] ?? $this->getManager2Service());
+        $d = ($container->services['manager2'] ?? self::getManager2Service($container));
 
         $c->handler2 = new \stdClass($d);
 
@@ -194,15 +196,19 @@ protected function getConnection2Service()
      *
      * @return \stdClass
      */
-    protected function getDoctrine_EntityManagerService()
+    protected static function getDoctrine_EntityManagerService($container)
     {
+        $containerRef = $container->ref;
+
         $a = new \stdClass();
-        $a->resolver = new \stdClass(new RewindableGenerator(function () {
-            yield 0 => ($this->privates['doctrine.listener'] ?? $this->getDoctrine_ListenerService());
+        $a->resolver = new \stdClass(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 0 => ($container->privates['doctrine.listener'] ?? self::getDoctrine_ListenerService($container));
         }, 1));
         $a->flag = 'ok';
 
-        return $this->services['doctrine.entity_manager'] = \FactoryChecker::create($a);
+        return $container->services['doctrine.entity_manager'] = \FactoryChecker::create($a);
     }
 
     /**
@@ -210,11 +216,11 @@ protected function getDoctrine_EntityManagerService()
      *
      * @return \FooCircular
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
         $a = new \BarCircular();
 
-        $this->services['foo'] = $instance = new \FooCircular($a);
+        $container->services['foo'] = $instance = new \FooCircular($a);
 
         $a->addFoobar(new \FoobarCircular($instance));
 
@@ -226,15 +232,15 @@ protected function getFooService()
      *
      * @return \FooCircular
      */
-    protected function getFoo2Service()
+    protected static function getFoo2Service($container)
     {
-        $a = ($this->services['bar2'] ?? $this->getBar2Service());
+        $a = ($container->services['bar2'] ?? self::getBar2Service($container));
 
-        if (isset($this->services['foo2'])) {
-            return $this->services['foo2'];
+        if (isset($container->services['foo2'])) {
+            return $container->services['foo2'];
         }
 
-        return $this->services['foo2'] = new \FooCircular($a);
+        return $container->services['foo2'] = new \FooCircular($a);
     }
 
     /**
@@ -242,9 +248,9 @@ protected function getFoo2Service()
      *
      * @return \stdClass
      */
-    protected function getFoo5Service()
+    protected static function getFoo5Service($container)
     {
-        $this->services['foo5'] = $instance = new \stdClass();
+        $container->services['foo5'] = $instance = new \stdClass();
 
         $a = new \stdClass($instance);
         $a->foo = $instance;
@@ -259,11 +265,11 @@ protected function getFoo5Service()
      *
      * @return \stdClass
      */
-    protected function getFoo6Service()
+    protected static function getFoo6Service($container)
     {
-        $this->services['foo6'] = $instance = new \stdClass();
+        $container->services['foo6'] = $instance = new \stdClass();
 
-        $instance->bar6 = ($this->privates['bar6'] ?? $this->getBar6Service());
+        $instance->bar6 = ($container->privates['bar6'] ?? self::getBar6Service($container));
 
         return $instance;
     }
@@ -273,11 +279,11 @@ protected function getFoo6Service()
      *
      * @return \stdClass
      */
-    protected function getFoobar4Service()
+    protected static function getFoobar4Service($container)
     {
         $a = new \stdClass();
 
-        $this->services['foobar4'] = $instance = new \stdClass($a);
+        $container->services['foobar4'] = $instance = new \stdClass($a);
 
         $a->foobar = $instance;
 
@@ -289,11 +295,11 @@ protected function getFoobar4Service()
      *
      * @return \stdClass
      */
-    protected function getListener3Service()
+    protected static function getListener3Service($container)
     {
-        $this->services['listener3'] = $instance = new \stdClass();
+        $container->services['listener3'] = $instance = new \stdClass();
 
-        $instance->manager = ($this->services['manager3'] ?? $this->getManager3Service());
+        $instance->manager = ($container->services['manager3'] ?? self::getManager3Service($container));
 
         return $instance;
     }
@@ -303,15 +309,15 @@ protected function getListener3Service()
      *
      * @return \stdClass
      */
-    protected function getListener4Service()
+    protected static function getListener4Service($container)
     {
-        $a = ($this->privates['manager4'] ?? $this->getManager4Service());
+        $a = ($container->privates['manager4'] ?? self::getManager4Service($container));
 
-        if (isset($this->services['listener4'])) {
-            return $this->services['listener4'];
+        if (isset($container->services['listener4'])) {
+            return $container->services['listener4'];
         }
 
-        return $this->services['listener4'] = new \stdClass($a);
+        return $container->services['listener4'] = new \stdClass($a);
     }
 
     /**
@@ -319,17 +325,17 @@ protected function getListener4Service()
      *
      * @return \stdClass
      */
-    protected function getLoggerService()
+    protected static function getLoggerService($container)
     {
-        $a = ($this->services['connection'] ?? $this->getConnectionService());
+        $a = ($container->services['connection'] ?? self::getConnectionService($container));
 
-        if (isset($this->services['logger'])) {
-            return $this->services['logger'];
+        if (isset($container->services['logger'])) {
+            return $container->services['logger'];
         }
 
-        $this->services['logger'] = $instance = new \stdClass($a);
+        $container->services['logger'] = $instance = new \stdClass($a);
 
-        $instance->handler = new \stdClass(($this->services['manager'] ?? $this->getManagerService()));
+        $instance->handler = new \stdClass(($container->services['manager'] ?? self::getManagerService($container)));
 
         return $instance;
     }
@@ -339,15 +345,15 @@ protected function getLoggerService()
      *
      * @return \stdClass
      */
-    protected function getManagerService()
+    protected static function getManagerService($container)
     {
-        $a = ($this->services['connection'] ?? $this->getConnectionService());
+        $a = ($container->services['connection'] ?? self::getConnectionService($container));
 
-        if (isset($this->services['manager'])) {
-            return $this->services['manager'];
+        if (isset($container->services['manager'])) {
+            return $container->services['manager'];
         }
 
-        return $this->services['manager'] = new \stdClass($a);
+        return $container->services['manager'] = new \stdClass($a);
     }
 
     /**
@@ -355,15 +361,15 @@ protected function getManagerService()
      *
      * @return \stdClass
      */
-    protected function getManager2Service()
+    protected static function getManager2Service($container)
     {
-        $a = ($this->services['connection2'] ?? $this->getConnection2Service());
+        $a = ($container->services['connection2'] ?? self::getConnection2Service($container));
 
-        if (isset($this->services['manager2'])) {
-            return $this->services['manager2'];
+        if (isset($container->services['manager2'])) {
+            return $container->services['manager2'];
         }
 
-        return $this->services['manager2'] = new \stdClass($a);
+        return $container->services['manager2'] = new \stdClass($a);
     }
 
     /**
@@ -371,17 +377,17 @@ protected function getManager2Service()
      *
      * @return \stdClass
      */
-    protected function getManager3Service($lazyLoad = true)
+    protected static function getManager3Service($container, $lazyLoad = true)
     {
-        $a = ($this->services['listener3'] ?? $this->getListener3Service());
+        $a = ($container->services['listener3'] ?? self::getListener3Service($container));
 
-        if (isset($this->services['manager3'])) {
-            return $this->services['manager3'];
+        if (isset($container->services['manager3'])) {
+            return $container->services['manager3'];
         }
         $b = new \stdClass();
         $b->listener = [0 => $a];
 
-        return $this->services['manager3'] = new \stdClass($b);
+        return $container->services['manager3'] = new \stdClass($b);
     }
 
     /**
@@ -389,11 +395,11 @@ protected function getManager3Service($lazyLoad = true)
      *
      * @return \stdClass
      */
-    protected function getMonolog_LoggerService()
+    protected static function getMonolog_LoggerService($container)
     {
-        $this->services['monolog.logger'] = $instance = new \stdClass();
+        $container->services['monolog.logger'] = $instance = new \stdClass();
 
-        $instance->handler = ($this->privates['mailer.transport'] ?? $this->getMailer_TransportService());
+        $instance->handler = ($container->privates['mailer.transport'] ?? self::getMailer_TransportService($container));
 
         return $instance;
     }
@@ -403,11 +409,11 @@ protected function getMonolog_LoggerService()
      *
      * @return \stdClass
      */
-    protected function getMonologInline_LoggerService()
+    protected static function getMonologInline_LoggerService($container)
     {
-        $this->services['monolog_inline.logger'] = $instance = new \stdClass();
+        $container->services['monolog_inline.logger'] = $instance = new \stdClass();
 
-        $instance->handler = ($this->privates['mailer_inline.mailer'] ?? $this->getMailerInline_MailerService());
+        $instance->handler = ($container->privates['mailer_inline.mailer'] ?? self::getMailerInline_MailerService($container));
 
         return $instance;
     }
@@ -417,19 +423,19 @@ protected function getMonologInline_LoggerService()
      *
      * @return \stdClass
      */
-    protected function getPAService()
+    protected static function getPAService($container)
     {
         $a = new \stdClass();
 
-        $b = ($this->privates['pC'] ?? $this->getPCService());
+        $b = ($container->privates['pC'] ?? self::getPCService($container));
 
-        if (isset($this->services['pA'])) {
-            return $this->services['pA'];
+        if (isset($container->services['pA'])) {
+            return $container->services['pA'];
         }
 
-        $this->services['pA'] = $instance = new \stdClass($a, $b);
+        $container->services['pA'] = $instance = new \stdClass($a, $b);
 
-        $a->d = ($this->privates['pD'] ?? $this->getPDService());
+        $a->d = ($container->privates['pD'] ?? self::getPDService($container));
 
         return $instance;
     }
@@ -439,15 +445,15 @@ protected function getPAService()
      *
      * @return \stdClass
      */
-    protected function getRootService()
+    protected static function getRootService($container)
     {
         $a = new \Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls();
 
         $b = new \stdClass();
 
-        $a->call(new \stdClass(new \stdClass($b, ($this->privates['level5'] ?? $this->getLevel5Service()))));
+        $a->call(new \stdClass(new \stdClass($b, ($container->privates['level5'] ?? self::getLevel5Service($container)))));
 
-        return $this->services['root'] = new \stdClass($a, $b);
+        return $container->services['root'] = new \stdClass($a, $b);
     }
 
     /**
@@ -455,15 +461,15 @@ protected function getRootService()
      *
      * @return \stdClass
      */
-    protected function getSubscriberService()
+    protected static function getSubscriberService($container)
     {
-        $a = ($this->services['manager'] ?? $this->getManagerService());
+        $a = ($container->services['manager'] ?? self::getManagerService($container));
 
-        if (isset($this->services['subscriber'])) {
-            return $this->services['subscriber'];
+        if (isset($container->services['subscriber'])) {
+            return $container->services['subscriber'];
         }
 
-        return $this->services['subscriber'] = new \stdClass($a);
+        return $container->services['subscriber'] = new \stdClass($a);
     }
 
     /**
@@ -471,15 +477,15 @@ protected function getSubscriberService()
      *
      * @return \stdClass
      */
-    protected function getBar6Service()
+    protected static function getBar6Service($container)
     {
-        $a = ($this->services['foo6'] ?? $this->getFoo6Service());
+        $a = ($container->services['foo6'] ?? self::getFoo6Service($container));
 
-        if (isset($this->privates['bar6'])) {
-            return $this->privates['bar6'];
+        if (isset($container->privates['bar6'])) {
+            return $container->privates['bar6'];
         }
 
-        return $this->privates['bar6'] = new \stdClass($a);
+        return $container->privates['bar6'] = new \stdClass($a);
     }
 
     /**
@@ -487,9 +493,9 @@ protected function getBar6Service()
      *
      * @return \stdClass
      */
-    protected function getDoctrine_ListenerService()
+    protected static function getDoctrine_ListenerService($container)
     {
-        return $this->privates['doctrine.listener'] = new \stdClass(($this->services['doctrine.entity_manager'] ?? $this->getDoctrine_EntityManagerService()));
+        return $container->privates['doctrine.listener'] = new \stdClass(($container->services['doctrine.entity_manager'] ?? self::getDoctrine_EntityManagerService($container)));
     }
 
     /**
@@ -497,11 +503,11 @@ protected function getDoctrine_ListenerService()
      *
      * @return \stdClass
      */
-    protected function getLevel5Service()
+    protected static function getLevel5Service($container)
     {
         $a = new \Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls();
 
-        $this->privates['level5'] = $instance = new \stdClass($a);
+        $container->privates['level5'] = $instance = new \stdClass($a);
 
         $a->call($instance);
 
@@ -513,11 +519,15 @@ protected function getLevel5Service()
      *
      * @return \stdClass
      */
-    protected function getMailer_TransportService()
+    protected static function getMailer_TransportService($container)
     {
-        return $this->privates['mailer.transport'] = (new \FactoryCircular(new RewindableGenerator(function () {
-            yield 0 => ($this->privates['mailer.transport_factory.amazon'] ?? $this->getMailer_TransportFactory_AmazonService());
-            yield 1 => $this->getMailerInline_TransportFactory_AmazonService();
+        $containerRef = $container->ref;
+
+        return $container->privates['mailer.transport'] = (new \FactoryCircular(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 0 => ($container->privates['mailer.transport_factory.amazon'] ?? self::getMailer_TransportFactory_AmazonService($container));
+            yield 1 => self::getMailerInline_TransportFactory_AmazonService($container);
         }, 2)))->create();
     }
 
@@ -526,13 +536,13 @@ protected function getMailer_TransportService()
      *
      * @return \stdClass
      */
-    protected function getMailer_TransportFactory_AmazonService()
+    protected static function getMailer_TransportFactory_AmazonService($container)
     {
         $a = new \stdClass();
 
-        $this->privates['mailer.transport_factory.amazon'] = $instance = new \stdClass($a);
+        $container->privates['mailer.transport_factory.amazon'] = $instance = new \stdClass($a);
 
-        $a->handler = ($this->privates['mailer.transport'] ?? $this->getMailer_TransportService());
+        $a->handler = ($container->privates['mailer.transport'] ?? self::getMailer_TransportService($container));
 
         return $instance;
     }
@@ -542,9 +552,9 @@ protected function getMailer_TransportFactory_AmazonService()
      *
 
10000
     * @return \stdClass
      */
-    protected function getMailerInline_MailerService()
+    protected static function getMailerInline_MailerService($container)
     {
-        return $this->privates['mailer_inline.mailer'] = new \stdClass((new \FactoryCircular(new RewindableGenerator(function () {
+        return $container->privates['mailer_inline.mailer'] = new \stdClass((new \FactoryCircular(new RewindableGenerator(static function () {
             return new \EmptyIterator();
         }, 0)))->create());
     }
@@ -554,10 +564,10 @@ protected function getMailerInline_MailerService()
      *
      * @return \stdClass
      */
-    protected function getMailerInline_TransportFactory_AmazonService()
+    protected static function getMailerInline_TransportFactory_AmazonService($container)
     {
         $a = new \stdClass();
-        $a->handler = ($this->privates['mailer_inline.mailer'] ?? $this->getMailerInline_MailerService());
+        $a->handler = ($container->privates['mailer_inline.mailer'] ?? self::getMailerInline_MailerService($container));
 
         return new \stdClass($a);
     }
@@ -567,13 +577,13 @@ protected function getMailerInline_TransportFactory_AmazonService()
      *
      * @return \stdClass
      */
-    protected function getManager4Service($lazyLoad = true)
+    protected static function getManager4Service($container, $lazyLoad = true)
     {
         $a = new \stdClass();
 
-        $this->privates['manager4'] = $instance = new \stdClass($a);
+        $container->privates['manager4'] = $instance = new \stdClass($a);
 
-        $a->listener = [0 => ($this->services['listener4'] ?? $this->getListener4Service())];
+        $a->listener = [0 => ($container->services['listener4'] ?? self::getListener4Service($container))];
 
         return $instance;
     }
@@ -583,11 +593,11 @@ protected function getManager4Service($lazyLoad = true)
      *
      * @return \stdClass
      */
-    protected function getPCService($lazyLoad = true)
+    protected static function getPCService($container, $lazyLoad = true)
     {
-        $this->privates['pC'] = $instance = new \stdClass();
+        $container->privates['pC'] = $instance = new \stdClass();
 
-        $instance->d = ($this->privates['pD'] ?? $this->getPDService());
+        $instance->d = ($container->privates['pD'] ?? self::getPDService($container));
 
         return $instance;
     }
@@ -597,14 +607,14 @@ protected function getPCService($lazyLoad = true)
      *
      * @return \stdClass
      */
-    protected function getPDService()
+    protected static function getPDService($container)
     {
-        $a = ($this->services['pA'] ?? $this->getPAService());
+        $a = ($container->services['pA'] ?? self::getPAService($container));
 
-        if (isset($this->privates['pD'])) {
-            return $this->privates['pD'];
+        if (isset($container->privates['pD'])) {
+            return $container->privates['pD'];
         }
 
-        return $this->privates['pD'] = new \stdClass($a);
+        return $container->privates['pD'] = new \stdClass($a);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
index bff47395118b4..f7dc4133f3d4a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -104,11 +106,11 @@ public function getRemovedIds(): array
      *
      * @return \BarCircular
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
-        $this->services['bar'] = $instance = new \BarCircular();
+        $container->services['bar'] = $instance = new \BarCircular();
 
-        $instance->addFoobar(($this->services['foobar'] ?? $this->getFoobarService()));
+        $instance->addFoobar(($container->services['foobar'] ?? self::getFoobarService($container)));
 
         return $instance;
     }
@@ -118,11 +120,11 @@ protected function getBarService()
      *
      * @return \BarCircular
      */
-    protected function getBar3Service()
+    protected static function getBar3Service($container)
     {
-        $this->services['bar3'] = $instance = new \BarCircular();
+        $container->services['bar3'] = $instance = new \BarCircular();
 
-        $a = ($this->services['foobar3'] ??= new \FoobarCircular());
+        $a = ($container->services['foobar3'] ??= new \FoobarCircular());
 
         $instance->addFoobar($a, $a);
 
@@ -134,15 +136,15 @@ protected function getBar3Service()
      *
      * @return \stdClass
      */
-    protected function getBar5Service()
+    protected static function getBar5Service($container)
     {
-        $a = ($this->services['foo5'] ?? $this->getFoo5Service());
+        $a = ($container->services['foo5'] ?? self::getFoo5Service($container));
 
-        if (isset($this->services['bar5'])) {
-            return $this->services['bar5'];
+        if (isset($container->services['bar5'])) {
+            return $container->services['bar5'];
         }
 
-        $this->services['bar5'] = $instance = new \stdClass($a);
+        $container->services['bar5'] = $instance = new \stdClass($a);
 
         $instance->foo = $a;
 
@@ -154,11 +156,11 @@ protected function getBar5Service()
      *
      * @return \stdClass
      */
-    protected function getBaz6Service()
+    protected static function getBaz6Service($container)
     {
-        $this->services['baz6'] = $instance = new \stdClass();
+        $container->services['baz6'] = $instance = new \stdClass();
 
-        $instance->bar6 = ($this->privates['bar6'] ?? $this->getBar6Service());
+        $instance->bar6 = ($container->privates['bar6'] ?? self::getBar6Service($container));
 
         return $instance;
     }
@@ -168,18 +170,18 @@ protected function getBaz6Service()
      *
      * @return \stdClass
      */
-    protected function getConnectionService()
+    protected static function getConnectionService($container)
     {
-        $a = ($this->services['dispatcher'] ?? $this->getDispatcherService());
+        $a = ($container->services['dispatcher'] ?? self::getDispatcherService($container));
 
-        if (isset($this->services['connection'])) {
-            return $this->services['connection'];
+        if (isset($container->services['connection'])) {
+            return $container->services['connection'];
         }
         $b = new \stdClass();
 
-        $this->services['connection'] = $instance = new \stdClass($a, $b);
+        $container->services['connection'] = $instance = new \stdClass($a, $b);
 
-        $b->logger = ($this->services['logger'] ?? $this->getLoggerService());
+        $b->logger = ($container->services['logger'] ?? self::getLoggerService($container));
 
         return $instance;
     }
@@ -189,19 +191,19 @@ protected function getConnectionService()
      *
      * @return \stdClass
      */
-    protected function getConnection2Service()
+    protected static function getConnection2Service($container)
     {
-        $a = ($this->services['dispatcher2'] ?? $this->getDispatcher2Service());
+        $a = ($container->services['dispatcher2'] ?? self::getDispatcher2Service($container));
 
-        if (isset($this->services['connection2'])) {
-            return $this->services['connection2'];
+        if (isset($container->services['connection2'])) {
+            return $container->services['connection2'];
         }
         $b = new \stdClass();
 
-        $this->services['connection2'] = $instance = new \stdClass($a, $b);
+        $container->services['connection2'] = $instance = new \stdClass($a, $b);
 
         $c = new \stdClass($instance);
-        $c->handler2 = new \stdClass(($this->services['manager2'] ?? $this->getManager2Service()));
+        $c->handler2 = new \stdClass(($container->services['manager2'] ?? self::getManager2Service($container)));
 
         $b->logger2 = $c;
 
@@ -213,11 +215,11 @@ protected function getConnection2Service()
      *
      * @return \stdClass
      */
-    protected function getConnection3Service()
+    protected static function getConnection3Service($container)
     {
-        $this->services['connection3'] = $instance = new \stdClass();
+        $container->services['connection3'] = $instance = new \stdClass();
 
-        $instance->listener = [0 => ($this->services['listener3'] ?? $this->getListener3Service())];
+        $instance->listener = [0 => ($container->services['listener3'] ?? self::getListener3Service($container))];
 
         return $instance;
     }
@@ -227,11 +229,11 @@ protected function getConnection3Service()
      *
      * @return \stdClass
      */
-    protected function getConnection4Service()
+    protected static function getConnection4Service($container)
     {
-        $this->services['connection4'] = $instance = new \stdClass();
+        $container->services['connection4'] = $instance = new \stdClass();
 
-        $instance->listener = [0 => ($this->services['listener4'] ?? $this->getListener4Service())];
+        $instance->listener = [0 => ($container->services['listener4'] ?? self::getListener4Service($container))];
 
         return $instance;
     }
@@ -241,11 +243,11 @@ protected function getConnection4Service()
      *
      * @return \stdClass
      */
-    protected function getDispatcherService($lazyLoad = true)
+    protected static function getDispatcherService($container, $lazyLoad = true)
     {
-        $this->services['dispatcher'] = $instance = new \stdClass();
+        $container->services['dispatcher'] = $instance = new \stdClass();
 
-        $instance->subscriber = ($this->services['subscriber'] ?? $this->getSubscriberService());
+        $instance->subscriber = ($container->services['subscriber'] ?? self::getSubscriberService($container));
 
         return $instance;
     }
@@ -255,11 +257,11 @@ protected function getDispatcherService($lazyLoad = true)
      *
      * @return \stdClass
      */
-    protected function getDispatcher2Service($lazyLoad = true)
+    protected static function getDispatcher2Service($container, $lazyLoad = true)
     {
-        $this->services['dispatcher2'] = $instance = new \stdClass();
+        $container->services['dispatcher2'] = $instance = new \stdClass();
 
-        $instance->subscriber2 = new \stdClass(($this->services['manager2'] ?? $this->getManager2Service()));
+        $instance->subscriber2 = new \stdClass(($container->services['manager2'] ?? self::getManager2Service($container)));
 
         return $instance;
     }
@@ -269,10 +271,14 @@ protected function getDispatcher2Service($lazyLoad = true)
      *
      * @return \stdClass
      */
-    protected function getDoctrine_EntityListenerResolverService()
+    protected static function getDoctrine_EntityListenerResolverService($container)
     {
-        return $this->services['doctrine.entity_listener_resolver'] = new \stdClass(new RewindableGenerator(function () {
-            yield 0 => ($this->services['doctrine.listener'] ?? $this->getDoctrine_ListenerService());
+        $containerRef = $container->ref;
+
+        return $container->services['doctrine.entity_listener_resolver'] = new \stdClass(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 0 => ($container->services['doctrine.listener'] ?? self::getDoctrine_ListenerService($container));
         }, 1));
     }
 
@@ -281,13 +287,13 @@ protected function getDoctrine_EntityListenerResolverService()
      *
      * @return \stdClass
      */
-    protected function getDoctrine_EntityManagerService()
+    protected static function getDoctrine_EntityManagerService($container)
     {
         $a = new \stdClass();
-        $a->resolver = ($this->services['doctrine.entity_listener_resolver'] ?? $this->getDoctrine_EntityListenerResolverService());
+        $a->resolver = ($container->services['doctrine.entity_listener_resolver'] ?? self::getDoctrine_EntityListenerResolverService($container));
         $a->flag = 'ok';
 
-        return $this->services['doctrine.entity_manager'] = \FactoryChecker::create($a);
+        return $container->services['doctrine.entity_manager'] = \FactoryChecker::create($a);
     }
 
     /**
@@ -295,9 +301,9 @@ protected function getDoctrine_EntityManagerService()
      *
      * @return \stdClass
      */
-    protected function getDoctrine_ListenerService()
+    protected static function getDoctrine_ListenerService($container)
     {
-        return $this->services['doctrine.listener'] = new \stdClass(($this->services['doctrine.entity_manager'] ?? $this->getDoctrine_EntityManagerService()));
+        return $container->services['doctrine.listener'] = new \stdClass(($container->services['doctrine.entity_manager'] ?? self::getDoctrine_EntityManagerService($container)));
     }
 
     /**
@@ -305,15 +311,15 @@ protected function getDoctrine_ListenerService()
      *
      * @return \FooCircular
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
-        $a = ($this->services['bar'] ?? $this->getBarService());
+        $a = ($container->services['bar'] ?? self::getBarService($container));
 
-        if (isset($this->services['foo'])) {
-            return $this->services['foo'];
+        if (isset($container->services['foo'])) {
+            return $container->services['foo'];
         }
 
-        return $this->services['foo'] = new \FooCircular($a);
+        return $container->services['foo'] = new \FooCircular($a);
     }
 
     /**
@@ -321,13 +327,13 @@ protected function getFooService()
      *
      * @return \FooCircular
      */
-    protected function getFoo2Service()
+    protected static function getFoo2Service($container)
     {
         $a = new \BarCircular();
 
-        $this->services['foo2'] = $instance = new \FooCircular($a);
+        $container->services['foo2'] = $instance = new \FooCircular($a);
 
-        $a->addFoobar(($this->services['foobar2'] ?? $this->getFoobar2Service()));
+        $a->addFoobar(($container->services['foobar2'] ?? self::getFoobar2Service($container)));
 
         return $instance;
     }
@@ -337,17 +343,17 @@ protected function getFoo2Service()
      *
      * @return \stdClass
      */
-    protected function getFoo4Service()
+    protected static function getFoo4Service($container)
     {
-        $this->factories['foo4'] = function () {
+        $container->factories['foo4'] = static function ($container) {
             $instance = new \stdClass();
 
-            $instance->foobar = ($this->services['foobar4'] ?? $this->getFoobar4Service());
+            $instance->foobar = ($container->services['foobar4'] ?? self::getFoobar4Service($container));
 
             return $instance;
         };
 
-        return $this->factories['foo4']();
+        return $container->factories['foo4']($container);
     }
 
     /**
@@ -355,11 +361,11 @@ protected function getFoo4Service()
      *
      * @return \stdClass
      */
-    protected function getFoo5Service()
+    protected static function getFoo5Service($container)
     {
-        $this->services['foo5'] = $instance = new \stdClass();
+        $container->services['foo5'] = $instance = new \stdClass();
 
-        $instance->bar = ($this->services['bar5'] ?? $this->getBar5Service());
+        $instance->bar = ($container->services['bar5'] ?? self::getBar5Service($container));
 
         return $instance;
     }
@@ -369,11 +375,11 @@ protected function getFoo5Service()
      *
      * @return \stdClass
      */
-    protected function getFoo6Service()
+    protected static function getFoo6Service($container)
     {
-        $this->services['foo6'] = $instance = new \stdClass();
+        $container->services['foo6'] = $instance = new \stdClass();
 
-        $instance->bar6 = ($this->privates['bar6'] ?? $this->getBar6Service());
+        $instance->bar6 = ($container->privates['bar6'] ?? self::getBar6Service($container));
 
         return $instance;
     }
@@ -383,15 +389,15 @@ protected function getFoo6Service()
      *
      * @return \FoobarCircular
      */
-    protected function getFoobarService()
+    protected static function getFoobarService($container)
     {
-        $a = ($this->services['foo'] ?? $this->getFooService());
+        $a = ($container->services['foo'] ?? self::getFooService($container));
 
-        if (isset($this->services['foobar'])) {
-            return $this->services['foobar'];
+        if (isset($container->services['foobar'])) {
+            return $container->services['foobar'];
         }
 
-        return $this->services['foobar'] = new \FoobarCircular($a);
+        return $container->services['foobar'] = new \FoobarCircular($a);
     }
 
     /**
@@ -399,15 +405,15 @@ protected function getFoobarService()
      *
      * @return \FoobarCircular
      */
-    protected function getFoobar2Service()
+    protected static function getFoobar2Service($container)
     {
-        $a = ($this->services['foo2'] ?? $this->getFoo2Service());
+        $a = ($container->services['foo2'] ?? self::getFoo2Service($container));
 
-        if (isset($this->services['foobar2'])) {
-            return $this->services['foobar2'];
+        if (isset($container->services['foobar2'])) {
+            return $container->services['foobar2'];
         }
 
-        return $this->services['foobar2'] = new \FoobarCircular($a);
+        return $container->services['foobar2'] = new \FoobarCircular($a);
     }
 
     /**
@@ -415,9 +421,9 @@ protected function getFoobar2Service()
      *
      * @return \FoobarCircular
      */
-    protected function getFoobar3Service()
+    protected static function getFoobar3Service($container)
     {
-        return $this->services['foobar3'] = new \FoobarCircular();
+        return $container->services['foobar3'] = new \FoobarCircular();
     }
 
     /**
@@ -425,11 +431,11 @@ protected function getFoobar3Service()
      *
      * @return \stdClass
      */
-    protected function getFoobar4Service()
+    protected static function getFoobar4Service($container)
     {
         $a = new \stdClass();
 
-        $this->services['foobar4'] = $instance = new \stdClass($a);
+        $container->services['foobar4'] = $instance = new \stdClass($a);
 
         $a->foobar = $instance;
 
@@ -441,11 +447,11 @@ protected function getFoobar4Service()
      *
      * @return \stdClass
      */
-    protected function getListener3Service()
+    protected static function getListener3Service($container)
     {
-        $this->services['listener3'] = $instance = new \stdClass();
+        $container->services['listener3'] = $instance = new \stdClass();
 
-        $instance->manager = ($this->services['manager3'] ?? $this->getManager3Service());
+        $instance->manager = ($container->services['manager3'] ?? self::getManager3Service($container));
 
         return $instance;
     }
@@ -455,15 +461,15 @@ protected function getListener3Service()
      *
      * @return \stdClass
      */
-    protected function getListener4Service()
+    protected static function getListener4Service($container)
     {
-        $a = ($this->privates['manager4'] ?? $this->getManager4Service());
+        $a = ($container->privates['manager4'] ?? self::getManager4Service($container));
 
-        if (isset($this->services['listener4'])) {
-            return $this->services['listener4'];
+        if (isset($container->services['listener4'])) {
+            return $container->services['listener4'];
         }
 
-        return $this->services['listener4'] = new \stdClass($a);
+        return $container->services['listener4'] = new \stdClass($a);
     }
 
     /**
@@ -471,17 +477,17 @@ protected function getListener4Service()
      *
      * @return \stdClass
      */
-    protected function getLoggerService()
+    protected static function getLoggerService($container)
     {
-        $a = ($this->services['connection'] ?? $this->getConnectionService());
+        $a = ($container->services['connection'] ?? self::getConnectionService($container));
 
-        if (isset($this->services['logger'])) {
-            return $this->services['logger'];
+        if (isset($container->services['logger'])) {
+            return $container->services['logger'];
         }
 
-        $this->services['logger'] = $instance = new \stdClass($a);
+        $container->services['logger'] = $instance = new \stdClass($a);
 
-        $instance->handler = new \stdClass(($this->services['manager'] ?? $this->getManagerService()));
+        $instance->handler = new \stdClass(($container->services['manager'] ?? self::getManagerService($container)));
 
         return $instance;
     }
@@ -491,9 +497,9 @@ protected function getLoggerService()
      *
      * @return \stdClass
      */
-    protected function getMailer_TransportService()
+    protected static function getMailer_TransportService($container)
     {
-        return $this->services['mailer.transport'] = ($this->services['mailer.transport_factory'] ?? $this->getMailer_TransportFactoryService())->create();
+        return $container->services['mailer.transport'] = ($container->services['mailer.transport_factory'] ?? self::getMailer_TransportFactoryService($container))->create();
     }
 
     /**
@@ -501,11 +507,15 @@ protected function getMailer_TransportService()
      *
      * @return \FactoryCircular
      */
-    protected function getMailer_TransportFactoryService()
+    protected static function getMailer_TransportFactoryService($container)
     {
-        return $this->services['mailer.transport_factory'] = new \FactoryCircular(new RewindableGenerator(function () {
-            yield 0 => ($this->services['mailer.transport_factory.amazon'] ?? $this->getMailer_TransportFactory_AmazonService());
-            yield 1 => ($this->services['mailer_inline.transport_factory.amazon'] ?? $this->getMailerInline_TransportFactory_AmazonService());
+        $containerRef = $container->ref;
+
+        return $container->services['mailer.transport_factory'] = new \FactoryCircular(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 0 => ($container->services['mailer.transport_factory.amazon'] ?? self::getMailer_TransportFactory_AmazonService($container));
+            yield 1 => ($container->services['mailer_inline.transport_factory.amazon'] ?? self::getMailerInline_TransportFactory_AmazonService($container));
         }, 2));
     }
 
@@ -514,9 +524,9 @@ protected function getMailer_TransportFactoryService()
      *
      * @return \stdClass
      */
-    protected function getMailer_TransportFactory_AmazonService()
+    protected static function getMailer_TransportFactory_AmazonService($container)
     {
-        return $this->services['mailer.transport_factory.amazon'] = new \stdClass(($this->services['monolog.logger_2'] ?? $this->getMonolog_Logger2Service()));
+        return $container->services['mailer.transport_factory.amazon'] = new \stdClass(($container->services['monolog.logger_2'] ?? self::getMonolog_Logger2Service($container)));
     }
 
     /**
@@ -524,9 +534,9 @@ protected function getMailer_TransportFactory_AmazonService()
      *
      * @return \FactoryCircular
      */
-    protected function getMailerInline_TransportFactoryService()
+    protected static function getMailerInline_TransportFactoryService($container)
     {
-        return $this->services['mailer_inline.transport_factory'] = new \FactoryCircular(new RewindableGenerator(function () {
+        return $container->services['mailer_inline.transport_factory'] = new \FactoryCircular(new RewindableGenerator(static function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -536,9 +546,9 @@ protected function getMailerInline_TransportFactoryService()
      *
      * @return \stdClass
      */
-    protected function getMailerInline_TransportFactory_AmazonService()
+    protected static function getMailerInline_TransportFactory_AmazonService($container)
     {
-        return $this->services['mailer_inline.transport_factory.amazon'] = new \stdClass(($this->services['monolog_inline.logger_2'] ?? $this->getMonologInline_Logger2Service()));
+        return $container->services['mailer_inline.transport_factory.amazon'] = new \stdClass(($container->services['monolog_inline.logger_2'] ?? self::getMonologInline_Logger2Service($container)));
     }
 
     /**
@@ -546,15 +556,15 @@ protected function getMailerInline_TransportFactory_AmazonService()
      *
      * @return \stdClass
      */
-    protected function getManagerService()
+    protected static function getManagerService($container)
     {
-        $a = ($this->services['connection'] ?? $this->getConnectionService());
+        $a = ($container->services['connection'] ?? self::getConnectionService($container));
 
-        if (isset($this->services['manager'])) {
-            return $this->services['manager'];
+        if (isset($container->services['manager'])) {
+            return $container->services['manager'];
         }
 
-        return $this->services['manager'] = new \stdClass($a);
+        return $container->services['manager'] = new \stdClass($a);
     }
 
     /**
@@ -562,15 +572,15 @@ protected function getManagerService()
      *
      * @return \stdClass
      */
-    protected function getManager2Service()
+    protected static function getManager2Service($container)
     {
-        $a = ($this->services['connection2'] ?? $this->getConnection2Service());
+        $a = ($container->services['connection2'] ?? self::getConnection2Service($container));
 
-        if (isset($this->services['manager2'])) {
-            return $this->services['manager2'];
+        if (isset($container->services['manager2'])) {
+            return $container->services['manager2'];
         }
 
-        return $this->services['manager2'] = new \stdClass($a);
+        return $container->services['manager2'] = new \stdClass($a);
     }
 
     /**
@@ -578,15 +588,15 @@ protected function getManager2Service()
      *
      * @return \stdClass
      */
-    protected function getManager3Service($lazyLoad = true)
+    protected static function getManager3Service($container, $lazyLoad = true)
     {
-        $a = ($this->services['connection3'] ?? $this->getConnection3Service());
+        $a = ($container->services['connection3'] ?? self::getConnection3Service($container));
 
-        if (isset($this->services['manager3'])) {
-            return $this->services['manager3'];
+        if (isset($container->services['manager3'])) {
+            return $container->services['manager3'];
         }
 
-        return $this->services['manager3'] = new \stdClass($a);
+        return $container->services['manager3'] = new \stdClass($a);
     }
 
     /**
@@ -594,11 +604,11 @@ protected function getManager3Service($lazyLoad = true)
      *
      * @return \stdClass
      */
-    protected function getMonolog_LoggerService()
+    protected static function getMonolog_LoggerService($container)
     {
-        $this->services['monolog.logger'] = $instance = new \stdClass();
+        $container->services['monolog.logger'] = $instance = new \stdClass();
 
-        $instance->handler = ($this->services['mailer.transport'] ?? $this->getMailer_TransportService());
+        $instance->handler = ($container->services['mailer.transport'] ?? self::getMailer_TransportService($container));
 
         return $instance;
     }
@@ -608,11 +618,11 @@ protected function getMonolog_LoggerService()
      *
      * @return \stdClass
      */
-    protected function getMonolog_Logger2Service()
+    protected static function getMonolog_Logger2Service($container)
     {
-        $this->services['monolog.logger_2'] = $instance = new \stdClass();
+        $container->services['monolog.logger_2'] = $instance = new \stdClass();
 
-        $instance->handler = ($this->services['mailer.transport'] ?? $this->getMailer_TransportService());
+        $instance->handler = ($container->services['mailer.transport'] ?? self::getMailer_TransportService($container));
 
         return $instance;
     }
@@ -622,11 +632,11 @@ protected function getMonolog_Logger2Service()
      *
      * @return \stdClass
      */
-    protected function getMonologInline_LoggerService()
+    protected static function getMonologInline_LoggerService($container)
     {
-        $this->services['monolog_inline.logger'] = $instance = new \stdClass();
+        $container->services['monolog_inline.logger'] = $instance = new \stdClass();
 
-        $instance->handler = ($this->privates['mailer_inline.mailer'] ?? $this->getMailerInline_MailerService());
+        $instance->handler = ($container->privates['mailer_inline.mailer'] ?? self::getMailerInline_MailerService($container));
 
         return $instance;
     }
@@ -636,11 +646,11 @@ protected function getMonologInline_LoggerService()
      *
      * @return \stdClass
      */
-    protected function getMonologInline_Logger2Service()
+    protected static function getMonologInline_Logger2Service($container)
     {
-        $this->services['monolog_inline.logger_2'] = $instance = new \stdClass();
+        $container->services['monolog_inline.logger_2'] = $instance = new \stdClass();
 
-        $instance->handler = ($this->privates['mailer_inline.mailer'] ?? $this->getMailerInline_MailerService());
+        $instance->handler = ($container->privates['mailer_inline.mailer'] ?? self::getMailerInline_MailerService($container));
 
         return $instance;
     }
@@ -650,20 +660,20 @@ protected function getMonologInline_Logger2Service()
      *
      * @return \stdClass
      */
-    protected function getPAService()
+    protected static function getPAService($container)
     {
-        $a = ($this->services['pB'] ?? $this->getPBService());
+        $a = ($container->services['pB'] ?? self::getPBService($container));
 
-        if (isset($this->services['pA'])) {
-            return $this->services['pA'];
+        if (isset($container->services['pA'])) {
+            return $container->services['pA'];
         }
-        $b = ($this->services['pC'] ?? $this->getPCService());
+        $b = ($container->services['pC'] ?? self::getPCService($container));
 
-        if (isset($this->services['pA'])) {
-            return $this->services['pA'];
+        if (isset($container->services['pA'])) {
+            return $container->services['pA'];
         }
 
-        return $this->services['pA'] = new \stdClass($a, $b);
+        return $container->services['pA'] = new \stdClass($a, $b);
     }
 
     /**
@@ -671,11 +681,11 @@ protected function getPAService()
      *
      * @return \stdClass
      */
-    protected function getPBService()
+    protected static function getPBService($container)
     {
-        $this->services['pB'] = $instance = new \stdClass();
+        $container->services['pB'] = $instance = new \stdClass();
 
-        $instance->d = ($this->services['pD'] ?? $this->getPDService());
+        $instance->d = ($container->services['pD'] ?? self::getPDService($container));
 
         return $instance;
     }
@@ -685,11 +695,11 @@ protected function getPBService()
      *
      * @return \stdClass
      */
-    protected function getPCService($lazyLoad = true)
+    protected static function getPCService($container, $lazyLoad = true)
     {
-        $this->services['pC'] = $instance = new \stdClass();
+        $container->services['pC'] = $instance = new \stdClass();
 
-        $instance->d = ($this->services['pD'] ?? $this->getPDService());
+        $instance->d = ($container->services['pD'] ?? self::getPDService($container));
 
         return $instance;
     }
@@ -699,15 +709,15 @@ protected function getPCService($lazyLoad = true)
      *
      * @return \stdClass
      */
-    protected function getPDService()
+    protected static function getPDService($container)
     {
-        $a = ($this->services['pA'] ?? $this->getPAService());
+        $a = ($container->services['pA'] ?? self::getPAService($container));
 
-        if (isset($this->services['pD'])) {
-            return $this->services['pD'];
+        if (isset($container->services['pD'])) {
+            return $container->services['pD'];
         }
 
-        return $this->services['pD'] = new \stdClass($a);
+        return $container->services['pD'] = new \stdClass($a);
     }
 
     /**
@@ -715,15 +725,15 @@ protected function getPDService()
      *
      * @return \stdClass
      */
-    protected function getRootService()
+    protected static function getRootService($container)
     {
         $a = new \Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls();
 
         $b = new \stdClass();
 
-        $a->call(new \stdClass(new \stdClass($b, ($this->privates['level5'] ?? $this->getLevel5Service()))));
+        $a->call(new \stdClass(new \stdClass($b, ($container->privates['level5'] ?? self::getLevel5Service($container)))));
 
-        return $this->services['root'] = new \stdClass($a, $b);
+        return $container->services['root'] = new \stdClass($a, $b);
     }
 
     /**
@@ -731,15 +741,15 @@ protected function getRootService()
      *
      * @return \stdClass
      */
-    protected function getSubscriberService()
+    protected static function getSubscriberService($container)
     {
-        $a = ($this->services['manager'] ?? $this->getManagerService());
+        $a = ($container->services['manager'] ?? self::getManagerService($container));
 
-        if (isset($this->services['subscriber'])) {
-            return $this->services['subscriber'];
+        if (isset($container->services['subscriber'])) {
+            return $container->services['subscriber'];
         }
 
-        return $this->services['subscriber'] = new \stdClass($a);
+        return $container->services['subscriber'] = new \stdClass($a);
     }
 
     /**
@@ -747,15 +757,15 @@ protected function getSubscriberService()
      *
      * @return \stdClass
      */
-    protected function getBar6Service()
+    protected static function getBar6Service($container)
     {
-        $a = ($this->services['foo6'] ?? $this->getFoo6Service());
+        $a = ($container->services['foo6'] ?? self::getFoo6Service($container));
 
-        if (isset($this->privates['bar6'])) {
-            return $this->privates['bar6'];
+        if (isset($container->privates['bar6'])) {
+            return $container->privates['bar6'];
         }
 
-        return $this->privates['bar6'] = new \stdClass($a);
+        return $container->privates['bar6'] = new \stdClass($a);
     }
 
     /**
@@ -763,11 +773,11 @@ protected function getBar6Service()
      *
      * @return \stdClass
      */
-    protected function getLevel5Service()
+    protected static function getLevel5Service($container)
     {
         $a = new \Symfony\Component\DependencyInjection\Tests\Fixtures\FooForCircularWithAddCalls();
 
-        $this->privates['level5'] = $instance = new \stdClass($a);
+        $container->privates['level5'] = $instance = new \stdClass($a);
 
         $a->call($instance);
 
@@ -779,9 +789,9 @@ protected function getLevel5Service()
      *
      * @return \stdClass
      */
-    protected function getMailerInline_MailerService()
+    protected static function getMailerInline_MailerService($container)
     {
-        return $this->privates['mailer_inline.mailer'] = new \stdClass(($this->services['mailer_inline.transport_factory'] ?? $this->getMailerInline_TransportFactoryService())->create());
+        return $container->privates['mailer_inline.mailer'] = new \stdClass(($container->services['mailer_inline.transport_factory'] ?? self::getMailerInline_TransportFactoryService($container))->create());
     }
 
     /**
@@ -789,14 +799,14 @@ protected function getMailerInline_MailerService()
      *
      * @return \stdClass
      */
-    protected function getManager4Service($lazyLoad = true)
+    protected static function getManager4Service($container, $lazyLoad = true)
     {
-        $a = ($this->services['connection4'] ?? $this->getConnection4Service());
+        $a = ($container->services['connection4'] ?? self::getConnection4Service($container));
 
-        if (isset($this->privates['manager4'])) {
-            return $this->privates['manager4'];
+        if (isset($container->privates['manager4'])) {
+            return $container->privates['manager4'];
         }
 
-        return $this->privates['manager4'] = new \stdClass($a);
+        return $container->privates['manager4'] = new \stdClass($a);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
index 740c006687a65..41e1be5a93b20 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -43,11 +45,11 @@ public function isCompiled(): bool
      *
      * @return \BarClass
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
-        $this->services['bar'] = $instance = new \BarClass();
+        $container->services['bar'] = $instance = new \BarClass();
 
-        $instance->setBaz($this->parameters['array_1'], $this->parameters['array_2'], '%array_1%', $this->parameters['array_1']);
+        $instance->setBaz($container->parameters['array_1'], $container->parameters['array_2'], '%array_1%', $container->parameters['array_1']);
 
         return $instance;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
index c7428f14f420b..8f64e9292ca0e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -77,8 +79,9 @@ public function getParameterBag(): ParameterBagInterface
 
     private function getDynamicParameter(string $name)
     {
+        $container = $this;
         $value = match ($name) {
-            'hello' => $this->getEnv('base64:foo'),
+            'hello' => $container->getEnv('base64:foo'),
             default => throw new ParameterNotFoundException($name),
         };
         $this->loadedDynamicParameters[$name] = true;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php
index ae06f37899d04..ca6262cb29d17 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'foo' => 'getFooService',
@@ -43,9 +45,9 @@ public function isCompiled(): bool
      *
      * @return \Foo
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
-        return $this->services['foo'] = new \Foo();
+        return $container->services['foo'] = new \Foo();
     }
 
     /**
@@ -53,10 +55,14 @@ protected function getFooService()
      *
      * @return \Bar
      */
-    protected function getServiceClosureService()
+    protected static function getServiceClosureService($container)
     {
-        return $this->services['service_closure'] = new \Bar(#[\Closure(name: 'foo', class: 'Foo')] function () {
-            return ($this->services['foo'] ??= new \Foo());
+        $containerRef = $container->ref;
+
+        return $container->services['service_closure'] = new \Bar(#[\Closure(name: 'foo', class: 'Foo')] static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            return ($container->services['foo'] ??= new \Foo());
         });
     }
 
@@ -65,9 +71,13 @@ protected function getServiceClosureService()
      *
      * @return \Bar
      */
-    protected function getServiceClosureInvalidService()
+    protected static function getServiceClosureInvalidService($container)
     {
-        return $this->services['service_closure_invalid'] = new \Bar(function () {
+        $containerRef = $container->ref;
+
+        return $container->services['service_closure_invalid'] = new \Bar(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
             return NULL;
         });
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php
index 103f1dc7cc22a..dc12622f95c41 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_CsvParameters extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -77,8 +79,9 @@ public function getParameterBag(): ParameterBagInterface
 
     private function getDynamicParameter(string $name)
     {
+        $container = $this;
         $value = match ($name) {
-            'hello' => $this->getEnv('csv:foo'),
+            'hello' => $container->getEnv('csv:foo'),
             default => throw new ParameterNotFoundException($name),
         };
         $this->loadedDynamicParameters[$name] = true;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dedup_lazy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dedup_lazy.php
index 867cda7e7a289..caf9b2f6c2310 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dedup_lazy.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dedup_lazy.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -49,10 +51,12 @@ protected function createProxy($class, \Closure $factory)
      *
      * @return \stdClass
      */
-    protected function getBarService($lazyLoad = true)
+    protected static function getBarService($container, $lazyLoad = true)
     {
+        $containerRef = $container->ref;
+
         if (true === $lazyLoad) {
-            return $this->services['bar'] = $this->createProxy('stdClassGhost5a8a5eb', fn () => \stdClassGhost5a8a5eb::createLazyGhost($this->getBarService(...)));
+            return $container->services['bar'] = $container->createProxy('stdClassGhost5a8a5eb', static fn () => \stdClassGhost5a8a5eb::createLazyGhost(static fn ($proxy) => self::getBarService($containerRef->get(), $proxy)));
         }
 
         return $lazyLoad;
@@ -63,10 +67,12 @@ protected function getBarService($lazyLoad = true)
      *
      * @return \stdClass
      */
-    protected function getBazService($lazyLoad = true)
+    protected static function getBazService($container, $lazyLoad = true)
     {
+        $containerRef = $container->ref;
+
         if (true === $lazyLoad) {
-            return $this->services['baz'] = $this->createProxy('stdClassProxy5a8a5eb', fn () => \stdClassProxy5a8a5eb::createLazyProxy(fn () => $this->getBazService(false)));
+            return $container->services['baz'] = $container->createProxy('stdClassProxy5a8a5eb', static fn () => \stdClassProxy5a8a5eb::createLazyProxy(static fn () => self::getBazService($containerRef->get(), false)));
         }
 
         return \foo_bar();
@@ -77,10 +83,12 @@ protected function getBazService($lazyLoad = true)
      *
      * @return \stdClass
      */
-    protected function getBuzService($lazyLoad = true)
+    protected static function getBuzService($container, $lazyLoad = true)
     {
+        $containerRef = $container->ref;
+
         if (true === $lazyLoad) {
-            return $this->services['buz'] = $this->createProxy('stdClassProxy5a8a5eb', fn () => \stdClassProxy5a8a5eb::createLazyProxy(fn () => $this->getBuzService(false)));
+            return $container->services['buz'] = $container->createProxy('stdClassProxy5a8a5eb', static fn () => \stdClassProxy5a8a5eb::createLazyProxy(static fn () => self::getBuzService($containerRef->get(), false)));
         }
 
         return \foo_bar();
@@ -91,10 +99,12 @@ protected function getBuzService($lazyLoad = true)
      *
      * @return \stdClass
      */
-    protected function getFooService($lazyLoad = true)
+    protected static function getFooService($container, $lazyLoad = true)
     {
+        $containerRef = $container->ref;
+
         if (true === $lazyLoad) {
-            return $this->services['foo'] = $this->createProxy('stdClassGhost5a8a5eb', fn () => \stdClassGhost5a8a5eb::createLazyGhost($this->getFooService(...)));
+            return $container->services['foo'] = $container->createProxy('stdClassGhost5a8a5eb', static fn () => \stdClassGhost5a8a5eb::createLazyGhost(static fn ($proxy) => self::getFooService($containerRef->get(), $proxy)));
         }
 
         return $lazyLoad;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deep_graph.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deep_graph.php
index 8c8cc1e30ce2d..4b6c1e3936440 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deep_graph.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deep_graph.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_Deep_Graph extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -48,11 +50,11 @@ public function getRemovedIds(): array
      *
      * @return \stdClass
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
-        $this->services['bar'] = $instance = new \stdClass();
+        $container->services['bar'] = $instance = new \stdClass();
 
-        $instance->p5 = new \stdClass(($this->services['foo'] ?? $this->getFooService()));
+        $instance->p5 = new \stdClass(($container->services['foo'] ?? self::getFooService($container)));
 
         return $instance;
     }
@@ -62,12 +64,12 @@ protected function getBarService()
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Dumper\FooForDeepGraph
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
-        $a = ($this->services['bar'] ?? $this->getBarService());
+        $a = ($container->services['bar'] ?? self::getBarService($container));
 
-        if (isset($this->services['foo'])) {
-            return $this->services['foo'];
+        if (isset($container->services['foo'])) {
+            return $container->services['foo'];
         }
         $b = new \stdClass();
 
@@ -76,6 +78,6 @@ protected function getFooService()
 
         $b->p2 = $c;
 
-        return $this->services['foo'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\FooForDeepGraph($a, $b);
+        return $container->services['foo'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\FooForDeepGraph($a, $b);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php
index 1f7f4967b4588..39e0c7f7570b1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_DefaultParameters extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -79,10 +81,11 @@ public function getParameterBag(): ParameterBagInterface
 
     private function getDynamicParameter(string $name)
     {
+        $container = $this;
         $value = match ($name) {
-            'fallback_env' => $this->getEnv('foobar'),
-            'hello' => $this->getEnv('default:fallback_param:bar'),
-            'hello-bar' => $this->getEnv('default:fallback_env:key:baz:json:foo'),
+            'fallback_env' => $container->getEnv('foobar'),
+            'hello' => $container->getEnv('default:fallback_param:bar'),
+            'hello-bar' => $container->getEnv('default:fallback_env:key:baz:json:foo'),
             default => throw new ParameterNotFoundException($name),
         };
         $this->loadedDynamicParameters[$name] = true;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
index 1fa0137e41cd3..3673a1cdfe1fe 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -52,9 +54,9 @@ public function getRemovedIds(): array
      *
      * @return \stdClass
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
-        return $this->services['bar'] = new \stdClass(($this->privates['bar_%env(BAR)%'] ??= new \stdClass()));
+        return $container->services['bar'] = new \stdClass(($container->privates['bar_%env(BAR)%'] ??= new \stdClass()));
     }
 
     /**
@@ -62,9 +64,9 @@ protected function getBarService()
      *
      * @return \stdClass
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
-        return $this->services['foo'] = new \stdClass(($this->privates['bar_%env(BAR)%'] ??= new \stdClass()), ['baz_'.$this->getEnv('string:BAR') => new \stdClass()]);
+        return $container->services['foo'] = new \stdClass(($container->privates['bar_%env(BAR)%'] ??= new \stdClass()), ['baz_'.$container->getEnv('string:BAR') => new \stdClass()]);
     }
 
     public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
index 861aecbbf92d9..82409d438413e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Errored_Definition extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -90,11 +92,11 @@ public function getRemovedIds(): array
      *
      * @return \stdClass
      */
-    protected function getBARService()
+    protected static function getBARService($container)
     {
-        $this->services['BAR'] = $instance = new \stdClass();
+        $container->services['BAR'] = $instance = new \stdClass();
 
-        $instance->bar = ($this->services['bar'] ?? $this->getBar3Service());
+        $instance->bar = ($container->services['bar'] ?? self::getBar3Service($container));
 
         return $instance;
     }
@@ -104,9 +106,9 @@ protected function getBARService()
      *
      * @return \stdClass
      */
-    protected function getBAR2Service()
+    protected static function getBAR2Service($container)
     {
-        return $this->services['BAR2'] = new \stdClass();
+        return $container->services['BAR2'] = new \stdClass();
     }
 
     /**
@@ -114,9 +116,9 @@ protected function getBAR2Service()
      *
      * @return \Bar
      */
-    protected function getAServiceService()
+    protected static function getAServiceService($container)
     {
-        return $this->services['a_service'] = ($this->privates['a_factory'] ??= new \Bar())->getBar();
+        return $container->services['a_service'] = ($container->privates['a_factory'] ??= new \Bar())->getBar();
     }
 
     /**
@@ -124,9 +126,9 @@ protected function getAServiceService()
      *
      * @return \Bar
      */
-    protected function getBServiceService()
+    protected static function getBServiceService($container)
     {
-        return $this->services['b_service'] = ($this->privates['a_factory'] ??= new \Bar())->getBar();
+        return $container->services['b_service'] = ($container->privates['a_factory'] ??= new \Bar())->getBar();
     }
 
     /**
@@ -134,11 +136,11 @@ protected function getBServiceService()
      *
      * @return \Bar\FooClass
      */
-    protected function getBar3Service()
+    protected static function getBar3Service($container)
     {
-        $a = ($this->services['foo.baz'] ?? $this->getFoo_BazService());
+        $a = ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
 
-        $this->services['bar'] = $instance = new \Bar\FooClass('foo', $a, 'foo_bar');
+        $container->services['bar'] = $instance = new \Bar\FooClass('foo', $a, 'foo_bar');
 
         $a->configure($instance);
 
@@ -150,9 +152,9 @@ protected function getBar3Service()
      *
      * @return \stdClass
      */
-    protected function getBar22Service()
+    protected static function getBar22Service($container)
     {
-        return $this->services['bar2'] = new \stdClass();
+        return $container->services['bar2'] = new \stdClass();
     }
 
     /**
@@ -160,11 +162,11 @@ protected function getBar22Service()
      *
      * @return \Baz
      */
-    protected function getBazService()
+    protected static function getBazService($container)
     {
-        $this->services['baz'] = $instance = new \Baz();
+        $container->services['baz'] = $instance = new \Baz();
 
-        $instance->setFoo(($this->services['foo_with_inline'] ?? $this->getFooWithInlineService()));
+        $instance->setFoo(($container->services['foo_with_inline'] ?? self::getFooWithInlineService($container)));
 
         return $instance;
     }
@@ -174,12 +176,12 @@ protected function getBazService()
      *
      * @return \stdClass
      */
-    protected function getConfiguredServiceService()
+    protected static function getConfiguredServiceService($container)
     {
-        $this->services['configured_service'] = $instance = new \stdClass();
+        $container->services['configured_service'] = $instance = new \stdClass();
 
         $a = new \ConfClass();
-        $a->setFoo(($this->services['baz'] ?? $this->getBazService()));
+        $a->setFoo(($container->services['baz'] ?? self::getBazService($container)));
 
         $a->configureStdClass($instance);
 
@@ -191,9 +193,9 @@ protected function getConfiguredServiceService()
      *
      * @return \stdClass
      */
-    protected function getConfiguredServiceSimpleService()
+    protected static function getConfiguredServiceSimpleService($container)
     {
-        $this->services['configured_service_simple'] = $instance = new \stdClass();
+        $container->services['configured_service_simple'] = $instance = new \stdClass();
 
         (new \ConfClass('bar'))->configureStdClass($instance);
 
@@ -205,9 +207,9 @@ protected function getConfiguredServiceSimpleService()
      *
      * @return \stdClass
      */
-    protected function getDecoratorServiceService()
+    protected static function getDecoratorServiceService($container)
     {
-        return $this->services['decorator_service'] = new \stdClass();
+        return $container->services['decorator_service'] = new \stdClass();
     }
 
     /**
@@ -215,9 +217,9 @@ protected function getDecoratorServiceService()
      *
      * @return \stdClass
      */
-    protected function getDecoratorServiceWithNameService()
+    protected static function getDecoratorServiceWithNameService($container)
     {
-        return $this->services['decorator_service_with_name'] = new \stdClass();
+        return $container->services['decorator_service_with_name'] = new \stdClass();
     }
 
     /**
@@ -227,11 +229,11 @@ protected function getDecoratorServiceWithNameService()
      *
      * @deprecated Since vendor/package 1.1: The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.
      */
-    protected function getDeprecatedServiceService()
+    protected static function getDeprecatedServiceService($container)
     {
         trigger_deprecation('vendor/package', '1.1', 'The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.');
 
-        return $this->services['deprecated_service'] = new \stdClass();
+        return $container->services['deprecated_service'] = new \stdClass();
     }
 
     /**
@@ -239,9 +241,9 @@ protected function getDeprecatedServiceService()
      *
      * @return \Bar
      */
-    protected function getFactoryServiceService()
+    protected static function getFactoryServiceService($container)
     {
-        return $this->services['factory_service'] = ($this->services['foo.baz'] ?? $this->getFoo_BazService())->getInstance();
+        return $container->services['factory_service'] = ($container->services['foo.baz'] ?? self::getFoo_BazService($container))->getInstance();
     }
 
     /**
@@ -249,9 +251,9 @@ protected function getFactoryServiceService()
      *
      * @return \Bar
      */
-    protected function getFactoryServiceSimpleService()
+    protected static function getFactoryServiceSimpleService($container)
     {
-        return $this->services['factory_service_simple'] = $this->getFactorySimpleService()->getInstance();
+        return $container->services['factory_service_simple'] = self::getFactorySimpleService($container)->getInstance();
     }
 
     /**
@@ -259,16 +261,16 @@ protected function getFactoryServiceSimpleService()
      *
      * @return \Bar\FooClass
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
-        $a = ($this->services['foo.baz'] ?? $this->getFoo_BazService());
+        $a = ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
 
-        $this->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, ['bar' => 'foo is bar', 'foobar' => 'bar'], true, $this);
+        $container->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, ['bar' => 'foo is bar', 'foobar' => 'bar'], true, $container);
 
         $instance->foo = 'bar';
         $instance->moo = $a;
         $instance->qux = ['bar' => 'foo is bar', 'foobar' => 'bar'];
-        $instance->setBar(($this->services['bar'] ?? $this->getBar3Service()));
+        $instance->setBar(($container->services['bar'] ?? self::getBar3Service($container)));
         $instance->initialize();
         sc_configure($instance);
 
@@ -280,9 +282,9 @@ protected function getFooService()
      *
      * @return \BazClass
      */
-    protected function getFoo_BazService()
+    protected static function getFoo_BazService($container)
     {
-        $this->services['foo.baz'] = $instance = \BazClass::getInstance();
+        $container->services['foo.baz'] = $instance = \BazClass::getInstance();
 
         \BazClass::configureStatic1($instance);
 
@@ -294,13 +296,13 @@ protected function getFoo_BazService()
      *
      * @return \Bar\FooClass
      */
-    protected function getFooBarService()
+    protected static function getFooBarService($container)
     {
-        $this->factories['foo_bar'] = function () {
-            return new \Bar\FooClass(($this->services['deprecated_service'] ?? $this->getDeprecatedServiceService()));
+        $container->factories['foo_bar'] = static function ($container) {
+            return new \Bar\FooClass(($container->services['deprecated_service'] ?? self::getDeprecatedServiceService($container)));
         };
 
-        return $this->factories['foo_bar']();
+        return $container->factories['foo_bar']($container);
     }
 
     /**
@@ -308,13 +310,13 @@ protected function getFooBarService()
      *
      * @return \Foo
      */
-    protected function getFooWithInlineService()
+    protected static function getFooWithInlineService($container)
     {
-        $this->services['foo_with_inline'] = $instance = new \Foo();
+        $container->services['foo_with_inline'] = $instance = new \Foo();
 
         $a = new \Bar();
         $a->pub = 'pub';
-        $a->setBaz(($this->services['baz'] ?? $this->getBazService()));
+        $a->setBaz(($container->services['baz'] ?? self::getBazService($container)));
 
         $instance->setBar($a);
 
@@ -326,12 +328,16 @@ protected function getFooWithInlineService()
      *
      * @return \LazyContext
      */
-    protected function getLazyContextService()
+    protected static function getLazyContextService($container)
     {
-        return $this->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () {
-            yield 'k1' => ($this->services['foo.baz'] ?? $this->getFoo_BazService());
-            yield 'k2' => $this;
-        }, 2), new RewindableGenerator(function () {
+        $containerRef = $container->ref;
+
+        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 'k1' => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
+            yield 'k2' => $container;
+        }, 2), new RewindableGenerator(static function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -341,11 +347,15 @@ protected function getLazyContextService()
      *
      * @return \LazyContext
      */
-    protected function getLazyContextIgnoreInvalidRefService()
+    protected static function getLazyContextIgnoreInvalidRefService($container)
     {
-        return $this->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () {
-            yield 0 => ($this->services['foo.baz'] ?? $this->getFoo_BazService());
-        }, 1), new RewindableGenerator(function () {
+        $containerRef = $container->ref;
+
+        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new R
10000
ewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 0 => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
+        }, 1), new RewindableGenerator(static function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -355,15 +365,15 @@ protected function getLazyContextIgnoreInvalidRefService()
      *
      * @return \Bar\FooClass
      */
-    protected function getMethodCall1Service()
+    protected static function getMethodCall1Service($container)
     {
         include_once '%path%foo.php';
 
-        $this->services['method_call1'] = $instance = new \Bar\FooClass();
+        $container->services['method_call1'] = $instance = new \Bar\FooClass();
 
-        $instance->setBar(($this->services['foo'] ?? $this->getFooService()));
+        $instance->setBar(($container->services['foo'] ?? self::getFooService($container)));
         $instance->setBar(NULL);
-        $instance->setBar((($this->services['foo'] ?? $this->getFooService())->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
+        $instance->setBar((($container->services['foo'] ?? self::getFooService($container))->foo() . (($container->hasParameter("foo")) ? ($container->getParameter("foo")) : ("default"))));
 
         return $instance;
     }
@@ -373,12 +383,12 @@ protected function getMethodCall1Service()
      *
      * @return \FooBarBaz
      */
-    protected function getNewFactoryServiceService()
+    protected static function getNewFactoryServiceService($container)
     {
         $a = new \FactoryClass();
         $a->foo = 'bar';
 
-        $this->services['new_factory_service'] = $instance = $a->getInstance();
+        $container->services['new_factory_service'] = $instance = $a->getInstance();
 
         $instance->foo = 'bar';
 
@@ -390,9 +400,9 @@ protected function getNewFactoryServiceService()
      *
      * @return \stdClass
      */
-    protected function getPreloadSidekickService()
+    protected static function getPreloadSidekickService($container)
     {
-        return $this->services['preload_sidekick'] = new \stdClass();
+        return $container->services['preload_sidekick'] = new \stdClass();
     }
 
     /**
@@ -400,9 +410,9 @@ protected function getPreloadSidekickService()
      *
      * @return \stdClass
      */
-    protected function getRuntimeErrorService()
+    protected static function getRuntimeErrorService($container)
     {
-        return $this->services['runtime_error'] = new \stdClass(throw new RuntimeException('Service "errored_definition" is broken.'));
+        return $container->services['runtime_error'] = new \stdClass(throw new RuntimeException('Service "errored_definition" is broken.'));
     }
 
     /**
@@ -410,9 +420,9 @@ protected function getRuntimeErrorService()
      *
      * @return \Bar\FooClass
      */
-    protected function getServiceFromStaticMethodService()
+    protected static function getServiceFromStaticMethodService($container)
     {
-        return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance();
+        return $container->services['service_from_static_method'] = \Bar\FooClass::getInstance();
     }
 
     /**
@@ -420,11 +430,15 @@ protected function getServiceFromStaticMethodService()
      *
      * @return \Bar
      */
-    protected function getTaggedIteratorService()
+    protected static function getTaggedIteratorService($container)
     {
-        return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
-            yield 0 => ($this->services['foo'] ?? $this->getFooService());
-            yield 1 => ($this->privates['tagged_iterator_foo'] ??= new \Bar());
+        $containerRef = $container->ref;
+
+        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            yield 0 => ($container->services['foo'] ?? self::getFooService($container));
+            yield 1 => ($container->privates['tagged_iterator_foo'] ??= new \Bar());
         }, 2));
     }
 
@@ -435,7 +449,7 @@ protected function getTaggedIteratorService()
      *
      * @deprecated Since vendor/package 1.1: The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.
      */
-    protected function getFactorySimpleService()
+    protected static function getFactorySimpleService($container)
     {
         trigger_deprecation('vendor/package', '1.1', 'The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.');
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
index d0509ad594369..f184f64dca43a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\ParentNotExists' => 'getParentNotExistsService',
@@ -27,7 +29,7 @@ public function __construct()
 
         $this->aliases = [];
 
-        $this->privates['service_container'] = function () {
+        $this->privates['service_container'] = static function ($container) {
             include_once \dirname(__DIR__, 1).'/includes/HotPath/I1.php';
             include_once \dirname(__DIR__, 1).'/includes/HotPath/P1.php';
             include_once \dirname(__DIR__, 1).'/includes/HotPath/T1.php';
@@ -57,9 +59,9 @@ public function getRemovedIds(): array
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists
      */
-    protected function getParentNotExistsService()
+    protected static function getParentNotExistsService($container)
     {
-        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\ParentNotExists'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists();
+        return $container->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\ParentNotExists'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists();
     }
 
     /**
@@ -67,9 +69,9 @@ protected function getParentNotExistsService()
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C1
      */
-    protected function getC1Service()
+    protected static function getC1Service($container)
     {
-        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C1();
+        return $container->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C1();
     }
 
     /**
@@ -77,11 +79,11 @@ protected function getC1Service()
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2
      */
-    protected function getC2Service()
+    protected static function getC2Service($container)
     {
         include_once \dirname(__DIR__, 1).'/includes/HotPath/C2.php';
         include_once \dirname(__DIR__, 1).'/includes/HotPath/C3.php';
 
-        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C2'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2(new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3());
+        return $container->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C2'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2(new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3());
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_self_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_self_ref.php
index ed8c7c17e9fcc..4ccee1b0c2bc4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_self_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_self_ref.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_Inline_Self_Ref extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'App\\Foo' => 'getFooService',
@@ -41,14 +43,14 @@ public function isCompiled(): bool
      *
      * @return \App\Foo
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
         $a = new \App\Bar();
 
         $b = new \App\Baz($a);
         $b->bar = $a;
 
-        $this->services['App\\Foo'] = $instance = new \App\Foo($b);
+        $container->services['App\\Foo'] = $instance = new \App\Foo($b);
 
         $a->foo = $instance;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php
index 0b4337e2dfc06..35aa89cd07e72 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_JsonParameters extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -78,9 +80,10 @@ public function getParameterBag(): ParameterBagInterface
 
     private function getDynamicParameter(string $name)
     {
+        $container = $this;
         $value = match ($name) {
-            'hello' => $this->getEnv('json:foo'),
-            'hello-bar' => $this->getEnv('json:bar'),
+            'hello' => $container->getEnv('json:foo'),
+            'hello-bar' => $container->getEnv('json:bar'),
             default => throw new ParameterNotFoundException($name),
         };
         $this->loadedDynamicParameters[$name] = true;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
index cf3abe06e3f00..4239d82f1e721 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar_service' => 'getBarServiceService',
@@ -58,9 +60,9 @@ public function getRemovedIds(): array
      *
      * @return \stdClass
      */
-    protected function getBarServiceService()
+    protected static function getBarServiceService($container)
     {
-        return $this->services['bar_service'] = new \stdClass(($this->privates['baz_service'] ??= new \stdClass()));
+        return $container->services['bar_service'] = new \stdClass(($container->privates['baz_service'] ??= new \stdClass()));
     }
 
     /**
@@ -68,13 +70,21 @@ protected function getBarServiceService()
      *
      * @return \Symfony\Component\DependencyInjection\ServiceLocator
      */
-    protected function getFooServiceService()
+    protected static function getFooServiceService($container)
     {
-        return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\ServiceLocator(['bar' => #[\Closure(name: 'bar_service', class: 'stdClass')] function () {
-            return ($this->services['bar_service'] ?? $this->getBarServiceService());
-        }, 'baz' => #[\Closure(name: 'baz_service', class: 'stdClass')] function (): \stdClass {
-            return ($this->privates['baz_service'] ??= new \stdClass());
-        }, 'nil' => function () {
+        $containerRef = $container->ref;
+
+        return $container->services['foo_service'] = new \Symfony\Component\DependencyInjection\ServiceLocator(['bar' => #[\Closure(name: 'bar_service', class: 'stdClass')] static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            return ($container->services['bar_service'] ?? self::getBarServiceService($container));
+        }, 'baz' => #[\Closure(name: 'baz_service', class: 'stdClass')] static function () use ($containerRef): \stdClass {
+            $container = $containerRef->get();
+
+            return ($container->privates['baz_service'] ??= new \stdClass());
+        }, 'nil' => static function () use ($containerRef) {
+            $container = $containerRef->get();
+
             return NULL;
         }]);
     }
@@ -84,9 +94,9 @@ protected function getFooServiceService()
      *
      * @return \stdClass
      */
-    protected function getTranslator_Loader1Service()
+    protected static function getTranslator_Loader1Service($container)
     {
-        return $this->services['translator.loader_1'] = new \stdClass();
+        return $container->services['translator.loader_1'] = new \stdClass();
     }
 
     /**
@@ -94,9 +104,9 @@ protected function getTranslator_Loader1Service()
      *
      * @return \stdClass
      */
-    protected function getTranslator_Loader2Service()
+    protected static function getTranslator_Loader2Service($container)
     {
-        return $this->services['translator.loader_2'] = new \stdClass();
+        return $container->services['translator.loader_2'] = new \stdClass();
     }
 
     /**
@@ -104,9 +114,9 @@ protected function getTranslator_Loader2Service()
      *
      * @return \stdClass
      */
-    protected function getTranslator_Loader3Service()
+    protected static function getTranslator_Loader3Service($container)
     {
-        return $this->services['translator.loader_3'] = new \stdClass();
+        return $container->services['translator.loader_3'] = new \stdClass();
     }
 
     /**
@@ -114,10 +124,14 @@ protected function getTranslator_Loader3Service()
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator
      */
-    protected function getTranslator1Service()
+    protected static function getTranslator1Service($container)
     {
-        return $this->services['translator_1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_1' => #[\Closure(name: 'translator.loader_1', class: 'stdClass')] function () {
-            return ($this->services['translator.loader_1'] ??= new \stdClass());
+        $containerRef = $container->ref;
+
+        return $container->services['translator_1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_1' => #[\Closure(name: 'translator.loader_1', class: 'stdClass')] static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            return ($container->services['translator.loader_1'] ??= new \stdClass());
         }]));
     }
 
@@ -126,13 +140,17 @@ protected function getTranslator1Service()
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator
      */
-    protected function getTranslator2Service()
+    protected static function getTranslator2Service($container)
     {
-        $this->services['translator_2'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_2' => #[\Closure(name: 'translator.loader_2', class: 'stdClass')] function () {
-            return ($this->services['translator.loader_2'] ??= new \stdClass());
+        $containerRef = $container->ref;
+
+        $container->services['translator_2'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_2' => #[\Closure(name: 'translator.loader_2', class: 'stdClass')] static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            return ($container->services['translator.loader_2'] ??= new \stdClass());
         }]));
 
-        $instance->addResource('db', ($this->services['translator.loader_2'] ??= new \stdClass()), 'nl');
+        $instance->addResource('db', ($container->services['translator.loader_2'] ??= new \stdClass()), 'nl');
 
         return $instance;
     }
@@ -142,13 +160,17 @@ protected function getTranslator2Service()
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator
      */
-    protected function getTranslator3Service()
+    protected static function getTranslator3Service($container)
     {
-        $this->services['translator_3'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_3' => #[\Closure(name: 'translator.loader_3', class: 'stdClass')] function () {
-            return ($this->services['translator.loader_3'] ??= new \stdClass());
+        $containerRef = $container->ref;
+
+        $container->services['translator_3'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_3' => #[\Closure(name: 'translator.loader_3', class: 'stdClass')] static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            return ($container->services['translator.loader_3'] ??= new \stdClass());
         }]));
 
-        $a = ($this->services['translator.loader_3'] ??= new \stdClass());
+        $a = ($container->services['translator.loader_3'] ??= new \stdClass());
 
         $instance->addResource('db', $a, 'nl');
         $instance->addResource('db', $a, 'en');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_new_in_initializer.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_new_in_initializer.php
index 0928b5c6f2c1c..238fabbae8c6f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_new_in_initializer.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_new_in_initializer.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'foo' => 'getFooService',
@@ -41,8 +43,8 @@ public function isCompiled(): bool
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\NewInInitializer
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
-        return $this->services['foo'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\NewInInitializer(bar: 234);
+        return $container->services['foo'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\NewInInitializer(bar: 234);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php
index 3802fc28ffc1b..4ce242bb265d8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php
@@ -15,11 +15,13 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
     protected \Closure $getService;
 
     public function __construct()
     {
-        $this->getService = $this->getService(...);
+        $containerRef = $this->ref = \WeakReference::create($this);
+        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -52,9 +54,9 @@ public function getRemovedIds(): array
      *
      * @return \stdClass
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
-        return $this->services['bar'] = new \stdClass((new \stdClass()), (new \stdClass()));
+        return $container->services['bar'] = new \stdClass((new \stdClass()), (new \stdClass()));
     }
 
     /**
@@ -62,9 +64,9 @@ protected function getBarService()
      *
      * @return \stdClass
      */
-    protected function getBazService()
+    protected static function getBazService($container)
     {
-        return $this->services['baz'] = new \stdClass(new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($this->getService, [
+        return $container->services['baz'] = new \stdClass(new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService, [
             'foo' => [false, 'foo', 'getFooService', false],
         ], [
             'foo' => '?',
@@ -76,12 +78,12 @@ protected function getBazService()
      *
      * @return \stdClass
      */
-    protected function getFooService()
+    protected static function getFooService($container)
     {
-        $this->factories['service_container']['foo'] = function () {
+        $container->factories['service_container']['foo'] = static function ($container) {
             return new \stdClass();
         };
 
-        return $this->factories['service_container']['foo']();
+        return $container->factories['service_container']['foo']($container);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy.php
index 001d7746da3bb..d00f210156e34 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -53,9 +55,9 @@ protected function createProxy($class, \Closure $factory)
      *
      * @return \stdClass
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
-        return $this->services['bar'] = new \stdClass((isset($this->factories['service_container']['foo']) ? $this->factories['service_container']['foo']() : $this->getFooService()));
+        return $container->services['bar'] = new \stdClass((isset($container->factories['service_container']['foo']) ? $container->factories['service_container']['foo']($container) : self::getFooService($container)));
     }
 
     /**
@@ -63,9 +65,11 @@ protected function getBarService()
      *
      * @return \stdClass
      */
-    protected function getFooService($lazyLoad = true)
+    protected static function getFooService($container, $lazyLoad = true)
     {
-        $this->factories['service_container']['foo'] ??= $this->getFooService(...);
+        $containerRef = $container->ref;
+
+        $container->factories['service_container']['foo'] ??= self::getFooService(...);
 
         // lazy factory for stdClass
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
index a4e8807c71039..0594c76789555 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
@@ -19,10 +19,12 @@ class getNonSharedFooService extends ProjectServiceContainer
      */
     public static function do($container, $lazyLoad = true)
     {
-        $container->factories['non_shared_foo'] ??= fn () => self::do($container);
+        $containerRef = $container->ref;
+
+        $container->factories['non_shared_foo'] ??= self::do(...);
 
         if (true === $lazyLoad) {
-            return $container->createProxy('FooLazyClassGhostF814e3a', fn () => \FooLazyClassGhostF814e3a::createLazyGhost(fn ($proxy) => self::do($container, $proxy)));
+            return $container->createProxy('FooLazyClassGhostF814e3a', static fn () => \FooLazyClassGhostF814e3a::createLazyGhost(static fn ($proxy) => self::do($containerRef->get(), $proxy)));
         }
 
         static $include = true;
@@ -79,9 +81,11 @@ class ProjectServiceContainer extends Container
     protected $targetDir;
     protected $parameters = [];
     private $buildParameters;
+    protected readonly \WeakReference $ref;
 
     public function __construct(array $buildParameters = [], $containerDir = __DIR__)
     {
+        $this->ref = \WeakReference::create($this);
         $this->buildParameters = $buildParameters;
         $this->containerDir = $containerDir;
         $this->targetDir = \dirname($containerDir);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_ghost.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_ghost.php
index 7d584eef41063..b318bb5cfec61 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_ghost.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_ghost.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -53,9 +55,9 @@ protected function createProxy($class, \Closure $factory)
      *
      * @return \stdClass
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
-        return $this->services['bar'] = new \stdClass((isset($this->factories['service_container']['foo']) ? $this->factories['service_container']['foo']() : $this->getFooService()));
+        return $container->services['bar'] = new \stdClass((isset($container->factories['service_container']['foo']) ? $container->factories['service_container']['foo']($container) : self::getFooService($container)));
     }
 
     /**
@@ -63,12 +65,14 @@ protected function getBarService()
      *
      * @return \stdClass
      */
-    protected function getFooService($lazyLoad = true)
+    protected static function getFooService($container, $lazyLoad = true)
     {
-        $this->factories['service_container']['foo'] ??= $this->getFooService(...);
+        $containerRef = $container->ref;
+
+        $container->factories['service_container']['foo'] ??= self::getFooService(...);
 
         if (true === $lazyLoad) {
-            return $this->createProxy('stdClassGhost5a8a5eb', fn () => \stdClassGhost5a8a5eb::createLazyGhost($this->getFooService(...)));
+            return $container->createProxy('stdClassGhost5a8a5eb', static fn () => \stdClassGhost5a8a5eb::createLazyGhost(static fn ($proxy) => self::getFooService($containerRef->get(), $proxy)));
         }
 
         return $lazyLoad;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
index 3f3470a7b85db..5d627cb89f0db 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar_service' => 'getBarServiceService',
@@ -49,9 +51,9 @@ public function getRemovedIds(): array
      *
      * @return \stdClass
      */
-    protected function getBarServiceService()
+    protected static function getBarServiceService($container)
     {
-        return $this->services['bar_service'] = new \stdClass(($this->privates['baz_service'] ??= new \stdClass()));
+        return $container->services['bar_service'] = new \stdClass(($container->privates['baz_service'] ??= new \stdClass()));
     }
 
     /**
@@ -59,8 +61,8 @@ protected function getBarServiceService()
      *
      * @return \stdClass
      */
-    protected function getFooServiceService()
+    protected static function getFooServiceService($container)
     {
-        return $this->services['foo_service'] = new \stdClass(($this->privates['baz_service'] ??= new \stdClass()));
+        return $container->services['foo_service'] = new \stdClass(($container->privates['baz_service'] ??= new \stdClass()));
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
index 0bd20277b273d..6badcf4d0a48a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'public_foo' => 'getPublicFooService',
@@ -49,8 +51,8 @@ public function getRemovedIds(): array
      *
      * @return \stdClass
      */
-    protected function getPublicFooService()
+    protected static function getPublicFooService($container)
     {
-        return $this->services['public_foo'] = new \stdClass((new \stdClass())->bar);
+        return $container->services['public_foo'] = new \stdClass((new \stdClass())->bar);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php
index 738722b7549b3..d3dc84d68c7c4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_QueryStringParameters extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -77,8 +79,9 @@ public function getParameterBag(): ParameterBagInterface
 
     private function getDynamicParameter(string $name)
     {
+        $container = $this;
         $value = match ($name) {
-            'hello' => $this->getEnv('query_string:foo'),
+            'hello' => $container->getEnv('query_string:foo'),
             default => throw new ParameterNotFoundException($name),
         };
         $this->loadedDynamicParameters[$name] = true;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
index 31b003e2eb08b..60700526ead94 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -15,11 +15,13 @@
 class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
     protected \Closure $getService;
 
     public function __construct()
     {
-        $this->getService = $this->getService(...);
+        $containerRef = $this->ref = \WeakReference::create($this);
+        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -53,9 +55,9 @@ public function getRemovedIds(): array
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor
      */
-    protected function getRot13EnvVarProcessorService()
+    protected static function getRot13EnvVarProcessorService($container)
     {
-        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor();
+        return $container->services['Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\Rot13EnvVarProcessor();
     }
 
     /**
@@ -63,9 +65,9 @@ protected function getRot13EnvVarProcessorService()
      *
      * @return \Symfony\Component\DependencyInjection\ServiceLocator
      */
-    protected function getContainer_EnvVarProcessorsLocatorService()
+    protected static function getContainer_EnvVarProcessorsLocatorService($container)
     {
-        return $this->services['container.env_var_processors_locator'] = new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($this->getService, [
+        return $container->services['container.env_var_processors_locator'] = new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService, [
             'rot13' => ['services', 'Symfony\\Component\\DependencyInjection\\Tests\\Dumper\\Rot13EnvVarProcessor', 'getRot13EnvVarProcessorService', false],
         ], [
             'rot13' => '?',
@@ -114,8 +116,9 @@ public function getParameterBag(): ParameterBagInterface
 
     private function getDynamicParameter(string $name)
     {
+        $container = $this;
         $value = match ($name) {
-            'hello' => $this->getEnv('rot13:foo'),
+            'hello' => $container->getEnv('rot13:foo'),
             default => throw new ParameterNotFoundException($name),
         };
         $this->loadedDynamicParameters[$name] = true;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php
index c8125acfb0cba..d28800abf0540 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php
@@ -15,11 +15,13 @@
 class Symfony_DI_PhpDumper_Service_Locator_Argument extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
     protected \Closure $getService;
 
     public function __construct()
     {
-        $this->getService = $this->getService(...);
+        $containerRef = $this->ref = \WeakReference::create($this);
+        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->services = $this->privates = [];
         $this->syntheticIds = [
             'foo5' => true,
@@ -57,11 +59,11 @@ public function getRemovedIds(): array
      *
      * @return \stdClass
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
-        $this->services['bar'] = $instance = new \stdClass();
+        $container->services['bar'] = $instance = new \stdClass();
 
-        $instance->locator = new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($this->getService, [
+        $instance->locator = new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService, [
             'foo1' => ['services', 'foo1', 'getFoo1Service', false],
             'foo2' => ['privates', 'foo2', 'getFoo2Service', false],
             'foo3' => [false, 'foo3', 'getFoo3Service', false],
@@ -83,9 +85,9 @@ protected function getBarService()
      *
      * @return \stdClass
      */
-    protected function getFoo1Service()
+    protected static function getFoo1Service($container)
     {
-        return $this->services['foo1'] = new \stdClass();
+        return $container->services['foo1'] = new \stdClass();
     }
 
     /**
@@ -93,9 +95,9 @@ protected function getFoo1Service()
      *
      * @return \stdClass
      */
-    protected function getFoo2Service()
+    protected static function getFoo2Service($container)
     {
-        return $this->privates['foo2'] = new \stdClass();
+        return $container->privates['foo2'] = new \stdClass();
     }
 
     /**
@@ -103,13 +105,13 @@ protected function getFoo2Service()
      *
      * @return \stdClass
      */
-    protected function getFoo3Service()
+    protected static function getFoo3Service($container)
     {
-        $this->factories['service_container']['foo3'] = function () {
+        $container->factories['service_container']['foo3'] = static function ($container) {
             return new \stdClass();
         };
 
-        return $this->factories['service_container']['foo3']();
+        return $container->factories['service_container']['foo3']($container);
     }
 
     /**
@@ -117,7 +119,7 @@ protected function getFoo3Service()
      *
      * @return \stdClass
      */
-    protected function getFoo4Service()
+    protected static function getFoo4Service($container)
     {
         throw new RuntimeException('BOOM');
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
index 1928f94a41110..77ed9e02882a4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
@@ -15,11 +15,13 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
     protected \Closure $getService;
 
     public function __construct()
     {
-        $this->getService = $this->getService(...);
+        $containerRef = $this->ref = \WeakReference::create($this);
+        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->services = $this->privates = [];
         $this->methodMap = [
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => 'getTestServiceSubscriberService',
@@ -57,9 +59,9 @@ public function getRemovedIds(): array
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber
      */
-    protected function getTestServiceSubscriberService()
+    protected static function getTestServiceSubscriberService($container)
     {
-        return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber();
+        return $container->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber();
     }
 
     /**
@@ -67,9 +69,9 @@ protected function getTestServiceSubscriberService()
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber
      */
-    protected function getFooServiceService()
+    protected static function getFooServiceService($container)
     {
-        return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber((new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($this->getService, [
+        return $container->services['foo_service'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber((new \Symfony\Component\DependencyInjection\Argument\ServiceLocator($container->getService, [
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => ['privates', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition', 'getCustomDefinitionService', false],
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => ['services', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber', 'getTestServiceSubscriberService', false],
             'bar' => ['services', 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber', 'getTestServiceSubscriberService', false],
@@ -81,7 +83,7 @@ protected function getFooServiceService()
             'bar' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
             'baz' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition',
             'late_alias' => 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestDefinition1',
-        ]))->withContext('foo_service', $this));
+        ]))->withContext('foo_service', $container));
     }
 
     /**
@@ -89,9 +91,9 @@ protected function getFooServiceService()
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition1
      */
-    protected function getLateAliasService()
+    protected static function getLateAliasService($container)
     {
-        return $this->services['late_alias'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition1();
+        return $container->services['late_alias'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition1();
     }
 
     /**
@@ -99,8 +101,8 @@ protected function getLateAliasService()
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition
      */
-    protected function getCustomDefinitionService()
+    protected static function getCustomDefinitionService($container)
     {
-        return $this->privates['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition();
+        return $container->privates['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition();
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php
index 2cf21ad94dbd2..00dab8c875eee 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_tsantos.php
@@ -15,9 +15,11 @@
 class ProjectServiceContainer extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'tsantos_serializer' => 'getTsantosSerializerService',
@@ -48,7 +50,7 @@ public function getRemovedIds(): array
      *
      * @return \TSantos\Serializer\EventEmitterSerializer
      */
-    protected function getTsantosSerializerService()
+    protected static function getTsantosSerializerService($container)
     {
         $a = new \TSantos\Serializer\NormalizerRegistry();
 
@@ -57,7 +59,7 @@ protected function getTsantosSerializerService()
         $c = new \TSantos\Serializer\EventDispatcher\EventDispatcher();
         $c->addSubscriber(new \TSantos\SerializerBundle\EventListener\StopwatchListener(new \Symfony\Component\Stopwatch\Stopwatch(true)));
 
-        $this->services['tsantos_serializer'] = $instance = new \TSantos\Serializer\EventEmitterSerializer(new \TSantos\Serializer\Encoder\JsonEncoder(), $a, $c);
+        $container->services['tsantos_serializer'] = $instance = new \TSantos\Serializer\EventEmitterSerializer(new \TSantos\Serializer\Encoder\JsonEncoder(), $a, $c);
 
         $b->setSerializer($instance);
         $d = new \TSantos\Serializer\Normalizer\JsonNormalizer();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
index d528f0d9f092d..35b5a3260f008 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_Uninitialized_Reference extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -51,32 +53,44 @@ public function getRemovedIds(): array
      *
      * @return \stdClass
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
-        $this->services['bar'] = $instance = new \stdClass();
+        $containerRef = $container->ref;
 
-        $instance->foo1 = ($this->services['foo1'] ?? null);
+        $container->services['bar'] = $instance = new \stdClass();
+
+        $instance->foo1 = ($container->services['foo1'] ?? null);
         $instance->foo2 = null;
-        $instance->foo3 = ($this->privates['foo3'] ?? null);
-        $instance->closures = [0 => #[\Closure(name: 'foo1', class: 'stdClass')] function () {
-            return ($this->services['foo1'] ?? null);
-        }, 1 => #[\Closure(name: 'foo2')] function () {
+        $instance->foo3 = ($container->privates['foo3'] ?? null);
+        $instance->closures = [0 => #[\Closure(name: 'foo1', class: 'stdClass')] static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            return ($container->services['foo1'] ?? null);
+        }, 1 => #[\Closure(name: 'foo2')] static function () use ($containerRef) {
+            $container = $containerRef->get();
+
             return null;
-        }, 2 => #[\Closure(name: 'foo3', class: 'stdClass')] function () {
-            return ($this->privates['foo3'] ?? null);
+        }, 2 => #[\Closure(name: 'foo3', class: 'stdClass')] static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            return ($container->privates['foo3'] ?? null);
         }];
-        $instance->iter = new RewindableGenerator(function () {
-            if (isset($this->services['foo1'])) {
-                yield 'foo1' => ($this->services['foo1'] ?? null);
+        $instance->iter = new RewindableGenerator(static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            if (isset($container->services['foo1'])) {
+                yield 'foo1' => ($container->services['foo1'] ?? null);
             }
             if (false) {
                 yield 'foo2' => null;
             }
-            if (isset($this->privates['foo3'])) {
-                yield 'foo3' => ($this->privates['foo3'] ?? null);
+            if (isset($container->privates['foo3'])) {
+                yield 'foo3' => ($container->privates['foo3'] ?? null);
             }
-        }, function () {
-            return 0 + (int) (isset($this->services['foo1'])) + (int) (false) + (int) (isset($this->privates['foo3']));
+        }, static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            return 0 + (int) (isset($container->services['foo1'])) + (int) (false) + (int) (isset($container->privates['foo3']));
         });
 
         return $instance;
@@ -87,11 +101,11 @@ protected function getBarService()
      *
      * @return \stdClass
      */
-    protected function getBazService()
+    protected static function getBazService($container)
     {
-        $this->services['baz'] = $instance = new \stdClass();
+        $container->services['baz'] = $instance = new \stdClass();
 
-        $instance->foo3 = ($this->privates['foo3'] ??= new \stdClass());
+        $instance->foo3 = ($container->privates['foo3'] ??= new \stdClass());
 
         return $instance;
     }
@@ -101,8 +115,8 @@ protected function getBazService()
      *
      * @return \stdClass
      */
-    protected function getFoo1Service()
+    protected static function getFoo1Service($container)
     {
-        return $this->services['foo1'] = new \stdClass();
+        return $container->services['foo1'] = new \stdClass();
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php
index 3a0f8d7539e94..3473edb993327 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_Unsupported_Characters extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -45,9 +47,9 @@ public function isCompiled(): bool
      *
      * @return \FooClass
      */
-    protected function getBarService()
+    protected static function getBarService($container)
     {
-        return $this->services['bar$'] = new \FooClass();
+        return $container->services['bar$'] = new \FooClass();
     }
 
     /**
@@ -55,9 +57,9 @@ protected function getBarService()
      *
      * @return \FooClass
      */
-    protected function getBar2Service()
+    protected static function getBar2Service($container)
     {
-        return $this->services['bar$!'] = new \FooClass();
+        return $container->services['bar$!'] = new \FooClass();
     }
 
     /**
@@ -65,9 +67,9 @@ protected function getBar2Service()
      *
      * @return \FooClass
      */
-    protected function getFooohnoService()
+    protected static function getFooohnoService($container)
     {
-        return $this->services['foo*/oh-no'] = new \FooClass();
+        return $container->services['foo*/oh-no'] = new \FooClass();
     }
 
     public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php
index 6a899ee42b9e9..154080cdbf257 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Test_UrlParameters extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
@@ -77,8 +79,9 @@ public function getParameterBag(): ParameterBagInterface
 
     private function getDynamicParameter(string $name)
     {
+        $container = $this;
         $value = match ($name) {
-            'hello' => $this->getEnv('url:foo'),
+            'hello' => $container->getEnv('url:foo'),
             default => throw new ParameterNotFoundException($name),
         };
         $this->loadedDynamicParameters[$name] = true;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither.php
index 3be9833ea75ea..5493b8bc719a4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Service_Wither extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'wither' => 'getWitherService',
@@ -48,14 +50,14 @@ public function getRemovedIds(): array
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Compiler\Wither
      */
-    protected function getWitherService()
+    protected static function getWitherService($container)
     {
         $instance = new \Symfony\Component\DependencyInjection\Tests\Compiler\Wither();
 
         $a = new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo();
 
         $instance = $instance->withFoo1($a);
-        $this->services['wither'] = $instance = $instance->withFoo2($a);
+        $container->services['wither'] = $instance = $instance->withFoo2($a);
         $instance->setFoo($a);
 
         return $instance;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php
index b0bbc7b640be8..e1f9a5caf605e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Service_Wither_Lazy extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'wither' => 'getWitherService',
@@ -53,10 +55,12 @@ protected function createProxy($class, \Closure $factory)
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Compiler\Wither
      */
-    protected function getWitherService($lazyLoad = true)
+    protected static function getWitherService($container, $lazyLoad = true)
     {
+        $containerRef = $container->ref;
+
         if (true === $lazyLoad) {
-            return $this->services['wither'] = $this->createProxy('WitherProxy94fa281', fn () => \WitherProxy94fa281::createLazyProxy(fn () => $this->getWitherService(false)));
+            return $container->services['wither'] = $container->createProxy('WitherProxy94fa281', static fn () => \WitherProxy94fa281::createLazyProxy(static fn () => self::getWitherService($containerRef->get(), false)));
         }
 
         $instance = new \Symfony\Component\DependencyInjection\Tests\Compiler\Wither();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_staticreturntype.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_staticreturntype.php
index ea71c2796a54c..61de4e02dcadf 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_staticreturntype.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_staticreturntype.php
@@ -15,9 +15,11 @@
 class Symfony_DI_PhpDumper_Service_WitherStaticReturnType extends Container
 {
     protected $parameters = [];
+    protected readonly \WeakReference $ref;
 
     public function __construct()
     {
+        $this->ref = \WeakReference::create($this);
         $this->services = $this->privates = [];
         $this->methodMap = [
             'wither' => 'getWitherService',
@@ -48,13 +50,13 @@ public function getRemovedIds(): array
      *
      * @return \Symfony\Component\DependencyInjection\Tests\Fixtures\WitherStaticReturnType
      */
-    protected function getWitherService()
+    protected static function getWitherService($container)
     {
         $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\WitherStaticReturnType();
 
         $a = new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo();
 
-        $this->services['wither'] = $instance = $instance->withFoo($a);
+        $container->services['wither'] = $instance = $instance->withFoo($a);
         $instance->setFoo($a);
 
         return $instance;
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index baaef5da89b33..307a78fa1c33e 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -37,7 +37,7 @@
         "ext-psr": "<1.1|>=2",
         "symfony/config": "<6.1",
         "symfony/finder": "<5.4",
-        "symfony/proxy-manager-bridge": "<6.2",
+        "symfony/proxy-manager-bridge": "<6.3",
         "symfony/yaml": "<5.4"
     },
     "provide": {

From 89d0f5d3a6fd4f197cfc41dbabbfc6068b83bb7a Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Fri, 9 Dec 2022 10:00:31 +0100
Subject: [PATCH 048/475] [Notifier] Remove `ext-json` from `require` section

`ext-json` is always available in PHP 8
---
 src/Symfony/Component/Notifier/Bridge/Gitter/composer.json     | 1 -
 src/Symfony/Component/Notifier/Bridge/Mercure/composer.json    | 1 -
 src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json      | 1 -
 src/Symfony/Component/Notifier/Bridge/Sendinblue/composer.json | 1 -
 src/Symfony/Component/Notifier/Bridge/Sinch/composer.json      | 1 -
 src/Symfony/Component/Notifier/Bridge/TurboSms/composer.json   | 1 -
 6 files changed, 6 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/Gitter/composer.json b/src/Symfony/Component/Notifier/Bridge/Gitter/composer.json
index 0cf0943ec0960..8e5434f09985a 100644
--- a/src/Symfony/Component/Notifier/Bridge/Gitter/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Gitter/composer.json
@@ -17,7 +17,6 @@
     ],
     "require": {
         "php": ">=8.1",
-        "ext-json": "*",
         "symfony/http-client": "^5.4|^6.0",
         "symfony/notifier": "^6.2"
     },
diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json b/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json
index 05ae5933c1c5c..60997223e03c8 100644
--- a/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json
@@ -17,7 +17,6 @@
     ],
     "require": {
         "php": ">=8.1",
-        "ext-json": "*",
         "symfony/mercure": "^0.5.2|^0.6",
         "symfony/notifier": "^6.2",
         "symfony/service-contracts": "^1.10|^2|^3"
diff --git a/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json b/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json
index 032c4437d035b..f66c1982e07cb 100644
--- a/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Mobyt/composer.json
@@ -17,7 +17,6 @@
     ],
     "require": {
         "php": ">=8.1",
-        "ext-json": "*",
         "symfony/http-client": "^5.4|^6.0",
         "symfony/notifier": "^6.2"
     },
diff --git a/src/Symfony/Component/Notifier/Bridge/Sendinblue/composer.json b/src/Symfony/Component/Notifier/Bridge/Sendinblue/composer.json
index 95633479f41db..065f6ff0d49b2 100644
--- a/src/Symfony/Component/Notifier/Bridge/Sendinblue/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Sendinblue/composer.json
@@ -17,7 +17,6 @@
     ],
     "require": {
         "php": ">=8.1",
-        "ext-json": "*",
         "symfony/http-client": "^5.4|^6.0",
         "symfony/notifier": "^6.2"
     },
diff --git a/src/Symfony/Component/Notifier/Bridge/Sinch/composer.json b/src/Symfony/Component/Notifier/Bridge/Sinch/composer.json
index 296eff9922507..e56fba8cc5350 100644
--- a/src/Symfony/Component/Notifier/Bridge/Sinch/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Sinch/composer.json
@@ -17,7 +17,6 @@
     ],
     "require": {
         "php": ">=8.1",
-        "ext-json": "*",
         "symfony/http-client": "^5.4|^6.0",
         "symfony/notifier": "^6.2"
     },
diff --git a/src/Symfony/Component/Notifier/Bridge/TurboSms/composer.json b/src/Symfony/Component/Notifier/Bridge/TurboSms/composer.json
index edf0d509bd9ae..05210a985a3fb 100644
--- a/src/Symfony/Component/Notifier/Bridge/TurboSms/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/TurboSms/composer.json
@@ -17,7 +17,6 @@
     ],
     "require": {
         "php": ">=8.1",
-        "ext-json": "*",
         "symfony/http-client": "^5.4|^6.0",
         "symfony/notifier": "^6.2",
         "symfony/polyfill-mbstring": "^1.0"

From 3f312b835ae1ca181e8a5a2715cfcf5d3cc2f671 Mon Sep 17 00:00:00 2001
From: Benjamin Schoch <benjamin.schoch@mail.schwarz>
Date: Fri, 9 Dec 2022 11:36:21 +0100
Subject: [PATCH 049/475] [Notifier] [FakeChat] Allow missing optional
 dependency

---
 .../FakeChat/FakeChatTransportFactory.php     | 20 ++++++-
 .../Tests/FakeChatTransportFactoryTest.php    | 56 +++++++++++++++++++
 .../Notifier/Bridge/FakeChat/composer.json    |  9 ++-
 3 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php
index ae74ee689b9af..e5bc2c2096061 100644
--- a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php
+++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php
@@ -13,6 +13,7 @@
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Notifier\Exception\LogicException;
 use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
 use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
 use Symfony\Component\Notifier\Transport\Dsn;
@@ -23,10 +24,10 @@
  */
 final class FakeChatTransportFactory extends AbstractTransportFactory
 {
-    private MailerInterface $mailer;
-    private LoggerInterface $logger;
+    private ?MailerInterface $mailer;
+    private ?LoggerInterface $logger;
 
-    public function __construct(MailerInterface $mailer, LoggerInterface $logger)
+    public function __construct(MailerInterface $mailer = null, LoggerInterface $logger = null)
     {
         parent::__construct();
 
@@ -39,6 +40,10 @@ public function create(Dsn $dsn): FakeChatEmailTransport|FakeChatLoggerTransport
         $scheme = $dsn->getScheme();
 
         if ('fakechat+email' === $scheme) {
+            if (null === $this->mailer) {
+                $this->throwMissingDependencyException($scheme, MailerInterface::class, 'symfony/mailer');
+            }
+
             $mailerTransport = $dsn->getHost();
      
10000
       $to = $dsn->getRequiredOption('to');
             $from = $dsn->getRequiredOption('from');
@@ -47,6 +52,10 @@ public function create(Dsn $dsn): FakeChatEmailTransport|FakeChatLoggerTransport
         }
 
         if ('fakechat+logger' === $scheme) {
+            if (null === $this->logger) {
+                $this->throwMissingDependencyException($scheme, LoggerInterface::class, 'psr/log');
+            }
+
             return new FakeChatLoggerTransport($this->logger);
         }
 
@@ -57,4 +66,9 @@ protected function getSupportedSchemes(): array
     {
         return ['fakechat+email', 'fakechat+logger'];
     }
+
+    private function throwMissingDependencyException(string $scheme, string $missingDependency, string $suggestedPackage): void
+    {
+        throw new LogicException(sprintf('Cannot create a transport for scheme "%s" without providing an implementation of "%s". Try running "composer require "%s"".', $scheme, $missingDependency, $suggestedPackage));
+    }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatTransportFactoryTest.php
index e6821ba92c769..0e595054c015c 100644
--- a/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/Tests/FakeChatTransportFactoryTest.php
@@ -14,10 +14,35 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Notifier\Bridge\FakeChat\FakeChatTransportFactory;
+use Symfony\Component\Notifier\Exception\LogicException;
 use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+use Symfony\Component\Notifier\Transport\Dsn;
 
 final class FakeChatTransportFactoryTest extends TransportFactoryTestCase
 {
+    /**
+     * @dataProvider missingRequiredDependencyProvider
+     */
+    public function testMissingRequiredDependency(?MailerInterface $mailer, ?LoggerInterface $logger, string $dsn, string $message)
+    {
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage($message);
+
+        $factory = new FakeChatTransportFactory($mailer, $logger);
+        $factory->create(new Dsn($dsn));
+    }
+
+    /**
+     * @dataProvider missingOptionalDependencyProvider
+     */
+    public function testMissingOptionalDependency(?MailerInterface $mailer, ?LoggerInterface $logger, string $dsn)
+    {
+        $factory = new FakeChatTransportFactory($mailer, $logger);
+        $transport = $factory->create(new Dsn($dsn));
+
+        $this->assertSame($dsn, (string) $transport);
+    }
+
     public function createFactory(): FakeChatTransportFactory
     {
         return new FakeChatTransportFactory($this->createMock(MailerInterface::class), $this->createMock(LoggerInterface::class));
@@ -63,4 +88,35 @@ public function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://default?to=recipient@email.net&from=sender@email.net'];
     }
+
+    public function missingRequiredDependencyProvider(): iterable
+    {
+        $exceptionMessage = 'Cannot create a transport for scheme "%s" without providing an implementation of "%s".';
+        yield 'missing mailer' => [
+            null,
+            $this->createMock(LoggerInterface::class),
+            'fakechat+email://default?to=recipient@email.net&from=sender@email.net',
+            sprintf($exceptionMessage, 'fakechat+email', MailerInterface::class),
+        ];
+        yield 'missing logger' => [
+            $this->createMock(MailerInterface::class),
+            null,
+            'fakechat+logger://default',
+            sprintf($exceptionMessage, 'fakechat+logger', LoggerInterface::class),
+        ];
+    }
+
+    public function missingOptionalDependencyProvider(): iterable
+    {
+        yield 'missing logger' => [
+            $this->createMock(MailerInterface::class),
+            null,
+            'fakechat+email://default?to=recipient@email.net&from=sender@email.net',
+        ];
+        yield 'missing mailer' => [
+            null,
+            $this->createMock(LoggerInterface::class),
+            'fakechat+logger://default',
+        ];
+    }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/composer.json b/src/Symfony/Component/Notifier/Bridge/FakeChat/composer.json
index 6518b750a70fd..94b4bff1dafa9 100644
--- a/src/Symfony/Component/Notifier/Bridge/FakeChat/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/composer.json
@@ -23,9 +23,12 @@
     "require": {
         "php": ">=8.1",
         "symfony/http-client": "^5.4|^6.0",
-        "symfony/notifier": "^6.2",
-        "symfony/event-dispatcher-contracts": "^2|^3",
-        "symfony/mailer": "^5.4|^6.0"
+        "symfony/notifier": "^6.2"
+    },
+    "require-dev": {
+        "symfony/mailer": "^5.4|^6.0",
+        "symfony/event-dispatcher": "^5.4|^6.0",
+        "psr/log": "^1|^2|^3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\FakeChat\\": "" },

From 02613dd455a28f1925b922ca5b050851e863be06 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 9 Dec 2022 13:49:26 +0100
Subject: [PATCH 050/475] [DI] add missing type to Container::make()

---
 src/Symfony/Component/DependencyInjection/Container.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 1cb5ca7403a76..7b4c8ccf88ae5 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -205,7 +205,7 @@ public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALI
      *
      * As a separate method to allow "get()" to use the really fast `??` operator.
      */
-    private static function make($container, string $id, int $invalidBehavior)
+    private static function make(self $container, string $id, int $invalidBehavior)
     {
         if (isset($container->loading[$id])) {
             throw new ServiceCircularReferenceException($id, array_merge(array_keys($container->loading), [$id]));

From 82d79b4548eba3df75a1d0c180494c2c8cad14b7 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Fri, 9 Dec 2022 14:55:05 +0100
Subject: [PATCH 051/475] =?UTF-8?q?[Console]=C2=A0Fix=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Symfony/Component/Console/Tests/ApplicationTest.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index dd964e75b597e..6ff88101f32f9 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -2132,8 +2132,6 @@ class BaseSignableCommand extends Command
     private $emitsSignal;
     private $signal;
 
-    protected static $defaultName = 'signal';
-
     public function __construct(bool $emitsSignal = true, int $signal = \SIGUSR1)
     {
         parent::__construct();
@@ -2173,10 +2171,9 @@ public function handleSignal(int $signal): void
     }
 }
 
+#[AsCommand(name: 'signal')]
 class TerminatableCommand extends BaseSignableCommand implements SignalableCommandInterface
 {
-    protected static $defaultName = 'signal';
-
     public function getSubscribedSignals(): array
     {
         return SignalRegistry::isSupported() ? [\SIGINT] : [];

From f7e469376594556b50b9d01dc045676e00b7e82d Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sun, 11 Dec 2022 11:50:52 +0100
Subject: [PATCH 052/475] Update types for dd()

---
 src/Symfony/Component/VarDumper/Resources/functions/dump.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Symfony/Component/VarDumper/Resources/functions/dump.php b/src/Symfony/Component/VarDumper/Resources/functions/dump.php
index 6221a4d182f0f..978a012fce9d0 100644
--- a/src/Symfony/Component/VarDumper/Resources/functions/dump.php
+++ b/src/Symfony/Component/VarDumper/Resources/functions/dump.php
@@ -32,10 +32,7 @@ function dump(mixed $var, mixed ...$moreVars): mixed
 }
 
 if (!function_exists('dd')) {
-    /**
-     * @return never
-     */
-    function dd(...$vars): void
+    function dd(mixed ...$vars): never
     {
         if (!in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && !headers_sent()) {
             header('HTTP/1.1 500 Internal Server Error');

From 9a248c48629e9dea12d3805b4b185216416134a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Mon, 12 Dec 2022 15:17:55 +0100
Subject: [PATCH 053/475] [Console] Fixed typo

---
 .../Tests/Fixtures/Style/SymfonyStyle/command/command_23.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_23.php b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_23.php
index ab32dcaf3e7bf..e6228fe0ba423 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_23.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_23.php
@@ -4,7 +4,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
-// ensure that nested tags have no effect on the color of the '//' prefix
 return function (InputInterface $input, OutputInterface $output) {
     $output = new SymfonyStyle($input, $output);
     $output->text('Hello');

From 6bfc18dfa75357b04cb243aeca1d600bc1e528f2 Mon Sep 17 00:00:00 2001
From: soyuka <soyuka@users.noreply.github.com>
Date: Mon, 12 Dec 2022 12:36:38 +0100
Subject: [PATCH 054/475] [HttpKernel] fix wrong deprecation message

---
 src/Symfony/Component/HttpKernel/Kernel.php   |  4 +-
 .../Component/HttpKernel/Tests/KernelTest.php | 45 +++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 96bb3d6a9627c..3ee733f54fd67 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -660,7 +660,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
         if (isset($buildParameters['.container.dumper.inline_factories'])) {
             $inlineFactories = $buildParameters['.container.dumper.inline_factories'];
         } elseif ($container->hasParameter('container.dumper.inline_factories')) {
-            trigger_deprecation('symfony/http-kernel', '6.3', 'Parameter "%s" is deprecated, use ".%$1s" instead.', 'container.dumper.inline_factories');
+            trigger_deprecation('symfony/http-kernel', '6.3', 'Parameter "%s" is deprecated, use ".%1$s" instead.', 'container.dumper.inline_factories');
             $inlineFactories = $container->getParameter('container.dumper.inline_factories');
         }
 
@@ -668,7 +668,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
         if (isset($buildParameters['.container.dumper.inline_class_loader'])) {
             $inlineClassLoader = $buildParameters['.container.dumper.inline_class_loader'];
         } elseif ($container->hasParameter('container.dumper.inline_class_loader')) {
-            trigger_deprecation('symfony/http-kernel', '6.3', 'Parameter "%s" is deprecated, use ".%$1s" instead.', 'container.dumper.inline_class_loader');
+            trigger_deprecation('symfony/http-kernel', '6.3', 'Parameter "%s" is deprecated, use ".%1$s" instead.', 'container.dumper.inline_class_loader');
             $inlineClassLoader = $container->getParameter('container.dumper.inline_class_loader');
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index 690268c75fd3c..d875ccd55313d 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -12,11 +12,15 @@
 namespace Symfony\Component\HttpKernel\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
+use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Request;
@@ -35,6 +39,8 @@
 
 class KernelTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     protected function tearDown(): void
     {
         try {
@@ -620,6 +626,45 @@ public function getContainerClass(): string
         $this->assertMatchesRegularExpression('/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*TestDebugContainer$/', $kernel->getContainerClass());
     }
 
+    /**
+     * @group legacy
+     */
+    public function testKernelWithParameterDeprecation()
+    {
+        $kernel = new class('test', true) extends Kernel {
+            public function __construct(string $env, bool $debug)
+            {
+                $this->container = new ContainerBuilder(new ParameterBag(['container.dumper.inline_factories' => true, 'container.dumper.inline_class_loader' => true]));
+                parent::__construct($env, $debug);
+            }
+
+            public function registerBundles(): iterable
+            {
+                return [];
+            }
+
+            public function registerContainerConfiguration(LoaderInterface $loader): void
+            {
+            }
+
+            public function boot()
+            {
+                $this->container->compile();
+                parent::dumpContainer(new ConfigCache(tempnam('/tmp', 'symfony-kernel-deprecated-parameter'), true), $this->container, Container::class, $this->getContainerBaseClass());
+            }
+
+            public function getContainerClass(): string
+            {
+                return parent::getContainerClass();
+            }
+        };
+
+        $this->expectDeprecation('Since symfony/http-kernel 6.3: "container.dumper.inline_factories" is deprecated, use ".container.dumper.inline_factories" instead.');
+        $this->expectDeprecation('Since symfony/http-kernel 6.3: "container.dumper.inline_class_loader" is deprecated, use ".container.dumper.inline_class_loader" instead.');
+
+        $kernel->boot();
+    }
+
     /**
      * Returns a mock for the BundleInterface.
      */

From 7d22c79ec39a58418f32eac85b719ef8769788f3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 13 Dec 2022 10:11:19 +0100
Subject: [PATCH 055/475] fix tests

---
 src/Symfony/Bridge/Doctrine/composer.json             | 1 +
 src/Symfony/Component/HttpKernel/Tests/KernelTest.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 318fc379711e1..8a852db5c10cb 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -35,6 +35,7 @@
         "symfony/doctrine-messenger": "^5.4|^6.0",
         "symfony/property-access": "^5.4|^6.0",
         "symfony/property-info": "^5.4|^6.0",
+        "symfony/proxy-manager-bridge": "^5.4|^6.0",
         "symfony/security-core": "^6.0",
         "symfony/expression-language": "^5.4|^6.0",
         "symfony/uid": "^5.4|^6.0",
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index d875ccd55313d..036b5992802e8 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -659,8 +659,8 @@ public function getContainerClass(): string
             }
         };
 
-        $this->expectDeprecation('Since symfony/http-kernel 6.3: "container.dumper.inline_factories" is deprecated, use ".container.dumper.inline_factories" instead.');
-        $this->expectDeprecation('Since symfony/http-kernel 6.3: "container.dumper.inline_class_loader" is deprecated, use ".container.dumper.inline_class_loader" instead.');
+        $this->expectDeprecation('Since symfony/http-kernel 6.3: Parameter "container.dumper.inline_factories" is deprecated, use ".container.dumper.inline_factories" instead.');
+        $this->expectDeprecation('Since symfony/http-kernel 6.3: Parameter "container.dumper.inline_class_loader" is deprecated, use ".container.dumper.inline_class_loader" instead.');
 
         $kernel->boot();
     }

From cd02eacdbb9884b1eef3df9ec986e445fc3cbe10 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Mon, 21 Nov 2022 19:36:57 +0100
Subject: [PATCH 056/475] [FrameworkBundle][DX] Allow to avoid `limit`
 definition in a RateLimiter configuration when using the `no_limit` policy

---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md              | 1 +
 .../FrameworkBundle/DependencyInjection/Configuration.php    | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index f6cfae42e6ac1..1ecd16712ab2f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add `DomCrawlerAssertionsTrait::assertSelectorCount(int $count, string $selector)`
+ * Allow to avoid `limit` definition in a RateLimiter configuration when using the `no_limit` policy
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 7b063b614d4ba..d3d01bec9ec7f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -2104,7 +2104,6 @@ private function addRateLimiterSection(ArrayNodeDefinition $rootNode, callable $
                                     ->end()
                                     ->integerNode('limit')
                                         ->info('The maximum allowed hits in a fixed interval or burst')
-                                        ->isRequired()
                                     ->end()
                                     ->scalarNode('interval')
                                         ->info('Configures the fixed interval if "policy" is set to "fixed_window" or "sliding_window". The value must be a number followed by "second", "minute", "hour", "day", "week" or "month" (or their plural equivalent).')
@@ -2119,6 +2118,10 @@ private function addRateLimiterSection(ArrayNodeDefinition $rootNode, callable $
                                         ->end()
                                     ->end()
                                 ->end()
+                                ->validate()
+                                    ->ifTrue(function ($v) { return 'no_limit' !== $v['policy'] && !isset($v['limit']); })
+                                    ->thenInvalid('A limit must be provided when using a policy different than "no_limit".')
+                                ->end()
                             ->end()
                         ->end()
                     ->end()

From eed0ae4ffe6dce426c2756570d6f0b7f008084e7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 14 Dec 2022 18:04:21 +0100
Subject: [PATCH 057/475] Fix tests

---
 .../Fixtures/php/notifier_with_disabled_message_bus.php         | 1 +
 .../Fixtures/php/notifier_with_specific_message_bus.php         | 1 +
 .../Fixtures/xml/notifier_with_disabled_message_bus.xml         | 2 +-
 .../Fixtures/xml/notifier_with_specific_message_bus.xml         | 2 +-
 .../Fixtures/yml/notifier_with_disabled_message_bus.yml         | 1 +
 .../Fixtures/yml/notifier_with_specific_message_bus.yml         | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_disabled_message_bus.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_disabled_message_bus.php
index 014b54b94a5dd..88bc913c9d9b6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_disabled_message_bus.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_disabled_message_bus.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'messenger' => [
         'enabled' => true,
     ],
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_specific_message_bus.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_specific_message_bus.php
index 75074e073ce29..2413edc1aeab1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_specific_message_bus.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_with_specific_message_bus.php
@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'messenger' => [
         'enabled' => true,
     ],
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_disabled_message_bus.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_disabled_message_bus.xml
index 599bd23cb8f43..3b8d00b146519 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_disabled_message_bus.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_disabled_message_bus.xml
@@ -6,7 +6,7 @@
            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:config http-method-override="false">
         <framework:messenger enabled="true" />
         <framework:mailer dsn="smtp://example.com" />
         <framework:notifier enabled="true" message-bus="false">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_specific_message_bus.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_specific_message_bus.xml
index 62373497056ac..abe55d16ad50c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_specific_message_bus.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_with_specific_message_bus.xml
@@ -6,7 +6,7 @@
            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:config http-method-override="false">
         <framework:messenger enabled="true" />
         <framework:mailer dsn="smtp://example.com" />
         <framework:notifier enabled="true" message-bus="app.another_bus">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_disabled_message_bus.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_disabled_message_bus.yml
index 08b3d6ad6e759..7790875c66f93 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_disabled_message_bus.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_disabled_message_bus.yml
@@ -1,4 +1,5 @@
 framework:
+    http_method_override: false
     messenger:
         enabled: true
     mailer:
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_specific_message_bus.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_specific_message_bus.yml
index 1851717bd9627..adf4133857b06 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_specific_message_bus.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_with_specific_message_bus.yml
@@ -1,4 +1,5 @@
 framework:
+    http_method_override: false
     messenger:
         enabled: true
     mailer:

From 2519c5c8303782be71649bbd72408d32ed0a9b21 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Thu, 1 Dec 2022 18:32:26 +0100
Subject: [PATCH 058/475] [VarDumper] Add support of named arguments to `dd()`
 and `dump()` to display the argument name

---
 src/Symfony/Component/VarDumper/CHANGELOG.md  |  1 +
 .../Component/VarDumper/Caster/ScalarStub.php | 27 ++++++++++++
 .../Component/VarDumper/Caster/StubCaster.php |  8 ++++
 .../VarDumper/Cloner/AbstractCloner.php       |  1 +
 .../Component/VarDumper/Cloner/Data.php       | 12 +++++-
 .../Component/VarDumper/Cloner/Stub.php       |  1 +
 .../VarDumper/Dumper/ContextualizedDumper.php |  2 +-
 .../VarDumper/Resources/functions/dump.php    | 33 ++++++++++----
 .../VarDumper/Tests/Caster/StubCasterTest.php | 16 ++++++-
 .../VarDumper/Tests/Dumper/FunctionsTest.php  | 43 ++++++++++++++++++-
 src/Symfony/Component/VarDumper/VarDumper.php | 18 ++++++--
 11 files changed, 144 insertions(+), 18 deletions(-)
 create mode 100644 src/Symfony/Component/VarDumper/Caster/ScalarStub.php

diff --git a/src/Symfony/Component/VarDumper/CHANGELOG.md b/src/Symfony/Component/VarDumper/CHANGELOG.md
index 97204fc67d042..c5abeee346a06 100644
--- a/src/Symfony/Component/VarDumper/CHANGELOG.md
+++ b/src/Symfony/Component/VarDumper/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add caster for `WeakMap`
+ * Add support of named arguments to `dd()` and `dump()` to display the argument name
 
 6.2
 ---
diff --git a/src/Symfony/Component/VarDumper/Caster/ScalarStub.php b/src/Symfony/Component/VarDumper/Caster/ScalarStub.php
new file mode 100644
index 0000000000000..3bb1935b88195
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Caster/ScalarStub.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Represents any arbitrary value.
+ *
+ * @author Alexandre Daubois <alex.daubois@gmail.com>
+ */
+class ScalarStub extends Stub
+{
+    public function __construct(mixed $value)
+    {
+        $this->value = $value;
+    }
+}
diff --git a/src/Symfony/Component/VarDumper/Caster/StubCaster.php b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
index 32ead7c277722..9318ad1f59e2f 100644
--- a/src/Symfony/Component/VarDumper/Caster/StubCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
@@ -81,4 +81,12 @@ public static function castEnum(EnumStub $c, array $a, Stub $stub, bool $isNeste
 
         return $a;
     }
+
+    public static function castScalar(ScalarStub $scalarStub, array $a, Stub $stub)
+    {
+        $stub->type = Stub::TYPE_SCALAR;
+        $stub->attr['value'] = $scalarStub->value;
+
+        return $a;
+    }
 }
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
index b72202587148c..bcd3013716e9e 100644
--- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -28,6 +28,7 @@ abstract class AbstractCloner implements ClonerInterface
         'Symfony\Component\VarDumper\Caster\CutArrayStub' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'castCutArray'],
         'Symfony\Component\VarDumper\Caster\ConstStub' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'castStub'],
         'Symfony\Component\VarDumper\Caster\EnumStub' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'castEnum'],
+        'Symfony\Component\VarDumper\Caster\ScalarStub' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'castScalar'],
 
         'Fiber' => ['Symfony\Component\VarDumper\Caster\FiberCaster', 'castFiber'],
 
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
index 6ecb883e83ad8..d87d56906e6eb 100644
--- a/src/Symfony/Component/VarDumper/Cloner/Data.php
+++ b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -211,6 +211,11 @@ public function withContext(array $context): static
         return $data;
     }
 
+    public function getContext(): array
+    {
+        return $this->context;
+    }
+
     /**
      * Seeks to a specific key in nested data structures.
      */
@@ -262,11 +267,12 @@ public function dump(DumperInterface $dumper)
     {
         $refs = [0];
         $cursor = new Cursor();
+        $label = $this->context['label'] ?? '';
 
         if ($cursor->attr = $this->context[SourceContextProvider::class] ?? []) {
             $cursor->attr['if_links'] = true;
             $cursor->hashType = -1;
-            $dumper->dumpScalar($cursor, 'default', '^');
+            $dumper->dumpScalar($cursor, 'default', $label.'^');
             $cursor->attr = ['if_links' => true];
             $dumper->dumpScalar($cursor, 'default', ' ');
             $cursor->hashType = 0;
@@ -362,6 +368,10 @@ private function dumpItem(DumperInterface $dumper, Cursor $cursor, array &$refs,
                     $dumper->leaveHash($cursor, $item->type, $item->class, $withChildren, $cut);
                     break;
 
+                case Stub::TYPE_SCALAR:
+                    $dumper->dumpScalar($cursor, 'default', $item->attr['value']);
+                    break;
+
                 default:
                     throw new \RuntimeException(sprintf('Unexpected Stub type: "%s".', $item->type));
             }
diff --git a/src/Symfony/Component/VarDumper/Cloner/Stub.php b/src/Symfony/Component/VarDumper/Cloner/Stub.php
index 1c5b887120f53..0c2a4b9d0a5cf 100644
--- a/src/Symfony/Component/VarDumper/Cloner/Stub.php
+++ b/src/Symfony/Component/VarDumper/Cloner/Stub.php
@@ -23,6 +23,7 @@ class Stub
     public const TYPE_ARRAY = 3;
     public const TYPE_OBJECT = 4;
     public const TYPE_RESOURCE = 5;
+    public const TYPE_SCALAR = 6;
 
     public const STRING_BINARY = 1;
     public const STRING_UTF8 = 2;
diff --git a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
index 1ba803d813894..c10cd4442f6f6 100644
--- a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
@@ -33,7 +33,7 @@ public function __construct(DataDumperInterface $wrappedDumper, array $contextPr
 
     public function dump(Data $data)
     {
-        $context = [];
+        $context = $data->getContext();
         foreach ($this->contextProviders as $contextProvider) {
             $context[$contextProvider::class] = $contextProvider->getContext();
         }
diff --git a/src/Symfony/Component/VarDumper/Resources/functions/dump.php b/src/Symfony/Component/VarDumper/Resources/functions/dump.php
index 6221a4d182f0f..4e7652c4f7be8 100644
--- a/src/Symfony/Component/VarDumper/Resources/functions/dump.php
+++ b/src/Symfony/Component/VarDumper/Resources/functions/dump.php
@@ -9,25 +9,36 @@
  * file that was distributed with this source code.
  */
 
+use Symfony\Component\VarDumper\Caster\ScalarStub;
 use Symfony\Component\VarDumper\VarDumper;
 
 if (!function_exists('dump')) {
     /**
      * @author Nicolas Grekas <p@tchwork.com>
+     * @author Alexandre Daubois <alex.daubois@gmail.com>
      */
-    function dump(mixed $var, mixed ...$moreVars): mixed
+    function dump(mixed ...$vars): mixed
     {
-        VarDumper::dump($var);
+        if (!$vars) {
+            VarDumper::dump(new ScalarStub('🐛'));
 
-        foreach ($moreVars as $v) {
-            VarDumper::dump($v);
+            return null;
         }
 
-        if (1 < func_num_args()) {
-            return func_get_args();
+        if (isset($vars[0]) && 1 === count($vars)) {
+            VarDumper::dump($vars[0]);
+            $k = 0;
+        } else {
+            foreach ($vars as $k => $v) {
+                VarDumper::dump($v, is_int($k) ? 1 + $k : $k);
+            }
         }
 
-        return $var;
+        if (1 < count($vars)) {
+            return $vars;
+        }
+
+        return $vars[$k];
     }
 }
 
@@ -41,8 +52,12 @@ function dd(...$vars): void
             header('HTTP/1.1 500 Internal Server Error');
         }
 
-        foreach ($vars as $v) {
-            VarDumper::dump($v);
+        if (isset($vars[0]) && 1 === count($vars)) {
+            VarDumper::dump($vars[0]);
+        } else {
+            foreach ($vars as $k => $v) {
+                VarDumper::dump($v, is_int($k) ? 1 + $k : $k);
+            }
         }
 
         exit(1);
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/StubCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/StubCasterTest.php
index 6ca2dad3a48d3..8b3e12b5c1d72 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/StubCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/StubCasterTest.php
@@ -15,6 +15,7 @@
 use Symfony\Component\VarDumper\Caster\ArgsStub;
 use Symfony\Component\VarDumper\Caster\ClassStub;
 use Symfony\Component\VarDumper\Caster\LinkStub;
+use Symfony\Component\VarDumper\Caster\ScalarStub;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\Dumper\HtmlDumper;
 use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
@@ -87,6 +88,19 @@ public function testArgsStubWithClosure()
         $this->assertDumpMatchesFormat($expectedDump, $args);
     }
 
+    public function testEmptyStub()
+    {
+        $args = [new ScalarStub('🐛')];
+
+        $expectedDump = <<<'EODUMP'
+array:1 [
+  0 => 🐛
+]
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $args);
+    }
+
     public function testLinkStub()
     {
         $var = [new LinkStub(__CLASS__, 0, __FILE__)];
@@ -203,7 +217,7 @@ public function testClassStubWithAnonymousClass()
 
         $expectedDump = <<<'EODUMP'
 <foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp data-depth=1 class=sf-dump-expanded>
-  <span class=sf-dump-index>0</span> => "<a href="%sStubCasterTest.php:195" rel="noopener noreferrer"><span class=sf-dump-str title="19 characters">Exception@anonymous</span></a>"
+  <span class=sf-dump-index>0</span> => "<a href="%sStubCasterTest.php:209" rel="noopener noreferrer"><span class=sf-dump-str title="19 characters">Exception@anonymous</span></a>"
 </samp>]
 </bar>
 EODUMP;
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/FunctionsTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/FunctionsTest.php
index 7444d4bf58425..d158d7eb930aa 100644
--- a/src/Symfony/Component/VarDumper/Tests/Dumper/FunctionsTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/FunctionsTest.php
@@ -18,6 +18,17 @@
 
 class FunctionsTest extends TestCase
 {
+    public function testDumpWithoutArg()
+    {
+        $this->setupVarDumper();
+
+        ob_start();
+        $return = dump();
+        ob_end_clean();
+
+        $this->assertNull($return);
+    }
+
     public function testDumpReturnsFirstArg()
     {
         $this->setupVarDumper();
@@ -28,7 +39,20 @@ public function testDumpReturnsFirstArg()
         $return = dump($var1);
         ob_end_clean();
 
-        $this->assertEquals($var1, $return);
+        $this->assertSame($var1, $return);
+    }
+
+    public function testDumpReturnsFirstNamedArgWithoutSectionName()
+    {
+        $this->setupVarDumper();
+
+        $var1 = 'a';
+
+        ob_start();
+        $return = dump(first: $var1);
+        ob_end_clean();
+
+        $this->assertSame($var1, $return);
     }
 
     public function testDumpReturnsAllArgsInArray()
@@ -43,7 +67,22 @@ public function testDumpReturnsAllArgsInArray()
         $return = dump($var1, $var2, $var3);
         ob_end_clean();
 
-        $this->assertEquals([$var1, $var2, $var3], $return);
+        $this->assertSame([$var1, $var2, $var3], $return);
+    }
+
+    public function testDumpReturnsAllNamedArgsInArray()
+    {
+        $this->setupVarDumper();
+
+        $var1 = 'a';
+        $var2 = 'b';
+        $var3 = 'c';
+
+        ob_start();
+        $return = dump($var1, second: $var2, third: $var3);
+        ob_end_clean();
+
+        $this->assertSame([$var1, 'second' => $var2, 'third' => $var3], $return);
     }
 
     protected function setupVarDumper()
diff --git a/src/Symfony/Component/VarDumper/VarDumper.php b/src/Symfony/Component/VarDumper/VarDumper.php
index 840bfd6496817..7c160166a9788 100644
--- a/src/Symfony/Component/VarDumper/VarDumper.php
+++ b/src/Symfony/Component/VarDumper/VarDumper.php
@@ -37,13 +37,17 @@ class VarDumper
      */
     private static $handler;
 
-    public static function dump(mixed $var)
+    /**
+     * @param string|null $label
+     */
+    public static function dump(mixed $var/* , string $label = null */)
     {
+        $label = 2 <= \func_num_args() ? func_get_arg(1) : null;
         if (null === self::$handler) {
             self::register();
         }
 
-        return (self::$handler)($var);
+        return (self::$handler)($var, $label);
     }
 
     public static function setHandler(callable $callable = null): ?callable
@@ -90,8 +94,14 @@ private static function register(): void
             $dumper = new ContextualizedDumper($dumper, [new SourceContextProvider()]);
         }
 
-        self::$handler = function ($var) use ($cloner, $dumper) {
-            $dumper->dump($cloner->cloneVar($var));
+        self::$handler = function ($var, string $label = null) use ($cloner, $dumper) {
+            $var = $cloner->cloneVar($var);
+
+            if (null !== $label) {
+                $var = $var->withContext(['label' => $label]);
+            }
+
+            $dumper->dump($var);
         };
     }
 

From e41090927405bb35b03fddfe1cf7ffc9fcae2520 Mon Sep 17 00:00:00 2001
From: Maxim Dovydenok <ext-maxim.dovydenok@busuu.com>
Date: Sat, 20 Aug 2022 16:41:06 +0300
Subject: [PATCH 059/475] [Notifier] Allow to update Slack messages

Update existing SlackTransport to allow message updates. Because chat.update API method only allows channel ids, this PR also includes updates to SentMessage
---
 .../Notifier/Bridge/Slack/CHANGELOG.md        |  5 +++
 .../Notifier/Bridge/Slack/SlackOptions.php    |  2 +-
 .../Bridge/Slack/SlackSentMessage.php         | 41 +++++++++++++++++
 .../Notifier/Bridge/Slack/SlackTransport.php  | 12 +++--
 .../Bridge/Slack/Tests/SlackTransportTest.php | 44 +++++++++++++++++--
 .../Slack/UpdateMessageSlackOptions.php       | 26 +++++++++++
 6 files changed, 119 insertions(+), 11 deletions(-)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Slack/SlackSentMessage.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Slack/UpdateMessageSlackOptions.php

diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Slack/CHANGELOG.md
index 77b83cf9ee14d..05fecc49d9c2c 100644
--- a/src/Symfony/Component/Notifier/Bridge/Slack/CHANGELOG.md
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Allow to update Slack messages
+
 6.0
 ---
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/SlackOptions.php b/src/Symfony/Component/Notifier/Bridge/Slack/SlackOptions.php
index fdded36c9b923..f6fe5d5411e18 100644
--- a/src/Symfony/Component/Notifier/Bridge/Slack/SlackOptions.php
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/SlackOptions.php
@@ -21,7 +21,7 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
-final class SlackOptions implements MessageOptionsInterface
+class SlackOptions implements MessageOptionsInterface
 {
     private const MAX_BLOCKS = 50;
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/SlackSentMessage.php b/src/Symfony/Component/Notifier/Bridge/Slack/SlackSentMessage.php
new file mode 100644
index 0000000000000..558eb5b57f8b9
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/SlackSentMessage.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Slack;
+
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+
+/**
+ * @author Maxim Dovydenok <dovydenok.maxim@gmail.com>
+ */
+final class SlackSentMessage extends SentMessage
+{
+    private string $channelId;
+
+    public function __construct(MessageInterface $original, string $transport, string $channelId, string $messageId)
+    {
+        parent::__construct($original, $transport);
+        $this->channelId = $channelId;
+        $this->setMessageId($messageId);
+    }
+
+    public function getChannelId(): string
+    {
+        return $this->channelId;
+    }
+
+    public function getUpdateMessage(string $subject, array $options = []): ChatMessage
+    {
+        return new ChatMessage($subject, new UpdateMessageSlackOptions($this->channelId, $this->getMessageId(), $options));
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php b/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php
index f253e90ebb9be..1f30d8a0fd74f 100644
--- a/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php
@@ -17,7 +17,6 @@
 use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
 use Symfony\Component\Notifier\Message\ChatMessage;
 use Symfony\Component\Notifier\Message\MessageInterface;
-use Symfony\Component\Notifier\Message\SentMessage;
 use Symfony\Component\Notifier\Transport\AbstractTransport;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
@@ -63,7 +62,7 @@ public function supports(MessageInterface $message): bool
     /**
      * @see https://api.slack.com/methods/chat.postMessage
      */
-    protected function doSend(MessageInterface $message): SentMessage
+    protected function doSend(MessageInterface $message): SlackSentMessage
     {
         if (!$message instanceof ChatMessage) {
             throw new UnsupportedMessageTypeException(__CLASS__, ChatMessage::class, $message);
@@ -82,7 +81,9 @@ protected function doSend(MessageInterface $message): SentMessage
             $options['channel'] = $message->getRecipientId() ?: $this->chatChannel;
         }
         $options['text'] = $message->getSubject();
-        $response = $this->client->request('POST', 'https://'.$this->getEndpoint().'/api/chat.postMessage', [
+
+        $apiMethod = $opts instanceof UpdateMessageSlackOptions ? 'chat.update' : 'chat.postMessage';
+        $response = $this->client->request('POST', 'https://'.$this->getEndpoint().'/api/'.$apiMethod, [
             'json' => array_filter($options),
             'auth_bearer' => $this->accessToken,
             'headers' => [
@@ -107,9 +108,6 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new TransportException(sprintf('Unable to post the Slack message: "%s"%s.', $result['error'], $errors), $response);
         }
 
-        $sentMessage = new SentMessage($message, (string) $this);
-        $sentMessage->setMessageId($result['ts']);
-
-        return $sentMessage;
+        return new SlackSentMessage($message, (string) $this, $result['channel'], $result['ts']);
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
index 38a6931127797..56a7e93a9a9b5 100644
--- a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Notifier\Bridge\Slack\SlackOptions;
+use Symfony\Component\Notifier\Bridge\Slack\SlackSentMessage;
 use Symfony\Component\Notifier\Bridge\Slack\SlackTransport;
 use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Exception\LogicException;
@@ -115,7 +116,7 @@ public function testSendWithOptions()
 
         $response->expects($this->once())
             ->method('getContent')
-            ->willReturn(json_encode(['ok' => true, 'ts' => '1503435956.000247']));
+            ->willReturn(json_encode(['ok' => true, 'ts' => '1503435956.000247', 'channel' => 'C123456']));
 
         $expectedBody = json_encode(['channel' => $channel, 'text' => $message]);
 
@@ -130,6 +131,8 @@ public function testSendWithOptions()
         $sentMessage = $transport->send(new ChatMessage('testMessage'));
 
         $this->assertSame('1503435956.000247', $sentMessage->getMessageId());
+        $this->assertInstanceOf(SlackSentMessage::class, $sentMessage);
+        $this->assertSame('C123456', $sentMessage->getChannelId());
     }
 
     public function testSendWithNotification()
@@ -145,7 +148,7 @@ public function testSendWithNotification()
 
         $response->expects($this->once())
             ->method('getContent')
-            ->willReturn(json_encode(['ok' => true, 'ts' => '1503435956.000247']));
+            ->willReturn(json_encode(['ok' => true, 'ts' => '1503435956.000247', 'channel' => 'C123456']));
 
         $notification = new Notification($message);
         $chatMessage = ChatMessage::fromNotification($notification);
@@ -223,7 +226,7 @@ public function testSendIncludesContentTypeWithCharset()
 
         $response->expects($this->once())
             ->method('getContent')
-            ->willReturn(json_encode(['ok' => true, 'ts' => '1503435956.000247']));
+            ->willReturn(json_encode(['ok' => true, 'ts' => '1503435956.000247', 'channel' => 'C123456']));
 
         $client = new MockHttpClient(function (string $method, string $url, array $options = []) use ($response): ResponseInterface {
             $this->assertContains('Content-Type: application/json; charset=utf-8', $options['headers']);
@@ -263,4 +266,39 @@ public function testSendWithErrorsIncluded()
 
         $transport->send(new ChatMessage('testMessage'));
     }
+
+    public function testUpdateMessage()
+    {
+        $response = $this->createMock(ResponseInterface::class);
+
+        $response->expects($this->exactly(2))
+            ->method('getStatusCode')
+            ->willReturn(200);
+
+        $response->expects($this->once())
+            ->method('getContent')
+            ->willReturn(json_encode(['ok' => true, 'ts' => '1503435956.000247', 'channel' => 'C123456']));
+
+        $sentMessage = new SlackSentMessage(new ChatMessage('Hello'), 'slack', 'C123456', '1503435956.000247');
+        $chatMessage = $sentMessage->getUpdateMessage('Hello World');
+
+        $expectedBody = json_encode([
+            'channel' => 'C123456',
+            'ts' => '1503435956.000247',
+            'text' => 'Hello World',
+        ]);
+
+        $client = new MockHttpClient(function (string $method, string $url, array $options = []) use ($response, $expectedBody): ResponseInterface {
+            $this->assertJsonStringEqualsJsonString($expectedBody, $options['body']);
+            $this->assertStringEndsWith('chat.update', $url);
+
+            return $response;
+        });
+
+        $transport = $this->createTransport($client, 'another-channel');
+
+        $sentMessage = $transport->send($chatMessage);
+
+        $this->assertSame('1503435956.000247', $sentMessage->getMessageId());
+    }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/UpdateMessageSlackOptions.php b/src/Symfony/Component/Notifier/Bridge/Slack/UpdateMessageSlackOptions.php
new file mode 100644
index 0000000000000..886ac09e3c4c5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/UpdateMessageSlackOptions.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Slack;
+
+/**
+ * @author Maxim Dovydenok <dovydenok.maxim@gmail.com>
+ */
+final class UpdateMessageSlackOptions extends SlackOptions
+{
+    public function __construct(string $channelId, string $messageId, array $options = [])
+    {
+        $options['channel'] = $channelId;
+        $options['ts'] = $messageId;
+
+        parent::__construct($options);
+    }
+}

From aebdc581fa2351319af4d13f57dbdfff924270f7 Mon Sep 17 00:00:00 2001
From: Allison Guilhem <allison.guilhem@gmail.com>
Date: Mon, 31 Oct 2022 12:45:42 +0100
Subject: [PATCH 060/475] [HttpFoundation] Create migration for session table
 when pdo handler is used

---
 .../AbstractSchemaSubscriber.php              | 56 +++++++++++++++++++
 ...ctrineDbalCacheAdapterSchemaSubscriber.php | 20 ++-----
 ...engerTransportDoctrineSchemaSubscriber.php | 15 ++---
 .../PdoSessionHandlerSchemaSubscriber.php     | 37 ++++++++++++
 ...eTokenProviderDoctrineSchemaSubscriber.php | 19 +------
 .../RememberMe/DoctrineTokenProvider.php      | 11 ++--
 .../PdoSessionHandlerSchemaSubscriberTest.php | 42 ++++++++++++++
 src/Symfony/Bridge/Doctrine/composer.json     |  1 +
 .../Cache/Adapter/DoctrineDbalAdapter.php     | 12 ++--
 .../Component/HttpFoundation/CHANGELOG.md     |  5 ++
 .../Handler/MigratingSessionHandler.php       | 11 +---
 .../Storage/Handler/PdoSessionHandler.php     | 53 +++++++++++++++++-
 .../Storage/Handler/PdoSessionHandlerTest.php | 31 ++++++++++
 .../Component/HttpFoundation/composer.json    |  1 +
 .../Tests/Transport/ConnectionTest.php        |  6 +-
 .../Bridge/Doctrine/Transport/Connection.php  |  7 +--
 .../Doctrine/Transport/DoctrineTransport.php  |  8 ++-
 17 files changed, 265 insertions(+), 70 deletions(-)
 create mode 100644 src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaSubscriber.php
 create mode 100644 src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php
 create mode 100644 src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php

diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaSubscriber.php
new file mode 100644
index 0000000000000..52b81d6b98c58
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaSubscriber.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\SchemaListener;
+
+use Doctrine\Common\EventSubscriber;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception\TableNotFoundException;
+use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+use Doctrine\ORM\Tools\ToolEvents;
+
+abstract class AbstractSchemaSubscriber implements EventSubscriber
+{
+    abstract public function postGenerateSchema(GenerateSchemaEventArgs $event): void;
+
+    public function getSubscribedEvents(): array
+    {
+        if (!class_exists(ToolEvents::class)) {
+            return [];
+        }
+
+        return [
+            ToolEvents::postGenerateSchema,
+        ];
+    }
+
+    protected function getIsSameDatabaseChecker(Connection $connection): \Closure
+    {
+        return static function (\Closure $exec) use ($connection): bool {
+            $checkTable = 'schema_subscriber_check_'.bin2hex(random_bytes(7));
+            $connection->executeStatement(sprintf('CREATE TABLE %s (id INTEGER NOT NULL)', $checkTable));
+
+            try {
+                $exec(sprintf('DROP TABLE %s', $checkTable));
+            } catch (\Exception) {
+                // ignore
+            }
+
+            try {
+                $connection->executeStatement(sprintf('DROP TABLE %s', $checkTable));
+
+                return false;
+            } catch (TableNotFoundException) {
+                return true;
+            }
+        };
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php
index bf9b793175f3f..5df11249f92df 100644
--- a/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php
@@ -11,9 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\SchemaListener;
 
-use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
-use Doctrine\ORM\Tools\ToolEvents;
 use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter;
 
 /**
@@ -22,7 +20,7 @@
  *
  * @author Ryan Weaver <ryan@symfonycasts.com>
  */
-final class DoctrineDbalCacheAdapterSchemaSubscriber implements EventSubscriber
+final class DoctrineDbalCacheAdapterSchemaSubscriber extends AbstractSchemaSubscriber
 {
     private $dbalAdapters;
 
@@ -36,20 +34,10 @@ public function __construct(iterable $dbalAdapters)
 
     public function postGenerateSchema(GenerateSchemaEventArgs $event): void
     {
-        $dbalConnection = $event->getEntityManager()->getConnection();
-        foreach ($this->dbalAdapters as $dbalAdapter) {
-            $dbalAdapter->configureSchema($event->getSchema(), $dbalConnection);
-        }
-    }
+        $connection = $event->getEntityManager()->getConnection();
 
-    public function getSubscribedEvents(): array
-    {
-        if (!class_exists(ToolEvents::class)) {
-            return [];
+        foreach ($this->dbalAdapters as $dbalAdapter) {
+            $dbalAdapter->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection));
         }
-
-        return [
-            ToolEvents::postGenerateSchema,
-        ];
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php
index 3cf100615a51c..155c5e9602515 100644
--- a/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php
@@ -11,11 +11,9 @@
 
 namespace Symfony\Bridge\Doctrine\SchemaListener;
 
-use Doctrine\Common\EventSubscriber;
 use Doctrine\DBAL\Event\SchemaCreateTableEventArgs;
 use Doctrine\DBAL\Events;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
-use Doctrine\ORM\Tools\ToolEvents;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransport;
 use Symfony\Component\Messenger\Transport\TransportInterface;
 
@@ -24,7 +22,7 @@
  *
  * @author Ryan Weaver <ryan@symfonycasts.com>
  */
-final class MessengerTransportDoctrineSchemaSubscriber implements EventSubscriber
+final class MessengerTransportDoctrineSchemaSubscriber extends AbstractSchemaSubscriber
 {
     private const PROCESSING_TABLE_FLAG = self::class.':processing';
 
@@ -40,13 +38,14 @@ public function __construct(iterable $transports)
 
     public function postGenerateSchema(GenerateSchemaEventArgs $event): void
     {
-        $dbalConnection = $event->getEntityManager()->getConnection();
+        $connection = $event->getEntityManager()->getConnection();
+
         foreach ($this->transports as $transport) {
             if (!$transport instanceof DoctrineTransport) {
                 continue;
             }
 
-            $transport->configureSchema($event->getSchema(), $dbalConnection);
+            $transport->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection));
         }
     }
 
@@ -89,11 +88,7 @@ public function onSchemaCreateTable(SchemaCreateTableEventArgs $event): void
 
     public function getSubscribedEvents(): array
     {
-        $subscribedEvents = [];
-
-        if (class_exists(ToolEvents::class)) {
-            $subscribedEvents[] = ToolEvents::postGenerateSchema;
-        }
+        $subscribedEvents = parent::getSubscribedEvents();
 
         if (class_exists(Events::class)) {
             $subscribedEvents[] = Events::onSchemaCreateTable;
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php
new file mode 100644
index 0000000000000..a14a800cbb260
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\SchemaListener;
+
+use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
+
+final class PdoSessionHandlerSchemaSubscriber extends AbstractSchemaSubscriber
+{
+    private iterable $pdoSessionHandlers;
+
+    /**
+     * @param iterable<mixed, PdoSessionHandler> $pdoSessionHandlers
+     */
+    public function __construct(iterable $pdoSessionHandlers)
+    {
+        $this->pdoSessionHandlers = $pdoSessionHandlers;
+    }
+
+    public function postGenerateSchema(GenerateSchemaEventArgs $event): void
+    {
+        $connection = $event->getEntityManager()->getConnection();
+
+        foreach ($this->pdoSessionHandlers as $pdoSessionHandler) {
+            $pdoSessionHandler->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));
+        }
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php
index 2eba94ff23c06..bd7540f1bbe44 100644
--- a/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php
@@ -11,9 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\SchemaListener;
 
-use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
-use Doctrine\ORM\Tools\ToolEvents;
 use Symfony\Bridge\Doctrine\Security\RememberMe\DoctrineTokenProvider;
 use Symfony\Component\Security\Http\RememberMe\PersistentRememberMeHandler;
 use Symfony\Component\Security\Http\RememberMe\RememberMeHandlerInterface;
@@ -23,7 +21,7 @@
  *
  * @author Wouter de Jong <wouter@wouterj.nl>
  */
-final class RememberMeTokenProviderDoctrineSchemaSubscriber implements EventSubscriber
+final class RememberMeTokenProviderDoctrineSchemaSubscriber extends AbstractSchemaSubscriber
 {
     private iterable $rememberMeHandlers;
 
@@ -37,26 +35,15 @@ public function __construct(iterable $rememberMeHandlers)
 
     public function postGenerateSchema(GenerateSchemaEventArgs $event): void
     {
-        $dbalConnection = $event->getEntityManager()->getConnection();
+        $connection = $event->getEntityManager()->getConnection();
 
         foreach ($this->rememberMeHandlers as $rememberMeHandler) {
             if (
                 $rememberMeHandler instanceof PersistentRememberMeHandler
                 && ($tokenProvider = $rememberMeHandler->getTokenProvider()) instanceof DoctrineTokenProvider
             ) {
-                $tokenProvider->configureSchema($event->getSchema(), $dbalConnection);
+                $tokenProvider->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection));
             }
         }
     }
-
-    public function getSubscribedEvents(): array
-    {
-        if (!class_exists(ToolEvents::class)) {
-            return [];
-        }
-
-        return [
-            ToolEvents::postGenerateSchema,
-        ];
-    }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
index 60f883a0e465f..bc2e7d915a7aa 100644
--- a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
+++ b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
@@ -188,15 +188,18 @@ public function updateExistingToken(PersistentTokenInterface $token, #[\Sensitiv
 
     /**
      * Adds the Table to the Schema if "remember me" uses this Connection.
+     *
+     * @param \Closure $isSameDatabase
      */
-    public function configureSchema(Schema $schema, Connection $forConnection): void
+    public function configureSchema(Schema $schema, Connection $forConnection/* , \Closure $isSameDatabase */): void
     {
-        // only update the schema for this connection
-        if ($forConnection !== $this->conn) {
+        if ($schema->hasTable('rememberme_token')) {
             return;
         }
 
-        if ($schema->hasTable('rememberme_token')) {
+        $isSameDatabase = 2 < \func_num_args() ? func_get_arg(2) : static fn () => false;
+
+        if ($forConnection !== $this->conn && !$isSameDatabase($this->conn->executeStatement(...))) {
             return;
         }
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php
new file mode 100644
index 0000000000000..092d8be07e892
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\SchemaListener;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Doctrine\SchemaListener\PdoSessionHandlerSchemaSubscriber;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
+
+class PdoSessionHandlerSchemaSubscriberTest extends TestCase
+{
+    public function testPostGenerateSchemaPdo()
+    {
+        $schema = new Schema();
+        $dbalConnection = $this->createMock(Connection::class);
+        $entityManager = $this->createMock(EntityManagerInterface::class);
+        $entityManager->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($dbalConnection);
+        $event = new GenerateSchemaEventArgs($entityManager, $schema);
+
+        $pdoSessionHandler = $this->createMock(PdoSessionHandler::class);
+        $pdoSessionHandler->expects($this->once())
+            ->method('configureSchema')
+            ->with($schema, fn() => true);
+
+        $subscriber = new PdoSessionHandlerSchemaSubscriber([$pdoSessionHandler]);
+        $subscriber->postGenerateSchema($event);
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 318fc379711e1..4925762f5f5f1 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -56,6 +56,7 @@
         "symfony/cache": "<5.4",
         "symfony/dependency-injection": "<6.2",
         "symfony/form": "<5.4",
+        "symfony/http-foundation": "<6.3",
         "symfony/http-kernel": "<6.2",
         "symfony/messenger": "<5.4",
         "symfony/property-info": "<5.4",
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter
D7AE
.php
index 806eba40da8ca..2615e29429f50 100644
--- a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
@@ -98,14 +98,18 @@ public function createTable(): void
         }
     }
 
-    public function configureSchema(Schema $schema, Connection $forConnection): void
+    /**
+     * @param \Closure $isSameDatabase
+     */
+    public function configureSchema(Schema $schema, Connection $forConnection/* , \Closure $isSameDatabase */): void
     {
-        // only update the schema for this connection
-        if ($forConnection !== $this->conn) {
+        if ($schema->hasTable($this->table)) {
             return;
         }
 
-        if ($schema->hasTable($this->table)) {
+        $isSameDatabase = 2 < \func_num_args() ? func_get_arg(2) : static fn () => false;
+
+        if ($forConnection !== $this->conn && !$isSameDatabase($this->conn->executeStatement(...))) {
             return;
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index fdea3d67e1b19..ae0902547f8f0 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Create migration for session table when pdo handler is used
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php
index 1d425523681a1..46fbeb006f453 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php
@@ -22,15 +22,8 @@
  */
 class MigratingSessionHandler implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface
 {
-    /**
-     * @var \SessionHandlerInterface&\SessionUpdateTimestampHandlerInterface
-     */
-    private \SessionHandlerInterface $currentHandler;
-
-    /**
-     * @var \SessionHandlerInterface&\SessionUpdateTimestampHandlerInterface
-     */
-    private \SessionHandlerInterface $writeOnlyHandler;
+    private \SessionHandlerInterface&\SessionUpdateTimestampHandlerInterface $currentHandler;
+    private \SessionHandlerInterface&\SessionUpdateTimestampHandlerInterface $writeOnlyHandler;
 
     public function __construct(\SessionHandlerInterface $currentHandler, \SessionHandlerInterface $writeOnlyHandler)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
index 302372627ddb5..a046aef95b08c 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\Types;
+
 /**
  * Session handler using a PDO connection to read and write data.
  *
@@ -175,6 +178,52 @@ public function __construct(\PDO|string $pdoOrDsn = null, array $options = [])
         $this->ttl = $options['ttl'] ?? null;
     }
 
+    public function configureSchema(Schema $schema, \Closure $isSameDatabase): void
+    {
+        if ($schema->hasTable($this->table) || !$isSameDatabase($this->getConnection()->exec(...))) {
+            return;
+        }
+
+        $table = $schema->createTable($this->table);
+        switch ($this->driver) {
+            case 'mysql':
+                $table->addColumn($this->idCol, Types::BINARY)->setLength(128)->setNotnull(true);
+                $table->addColumn($this->dataCol, Types::BLOB)->setNotnull(true);
+                $table->addColumn($this->lifetimeCol, Types::INTEGER)->setUnsigned(true)->setNotnull(true);
+                $table->addColumn($this->timeCol, Types::INTEGER)->setUnsigned(true)->setNotnull(true);
+                $table->addOption('collate', 'utf8mb4_bin');
+                $table->addOption('engine', 'InnoDB');
+                break;
+            case 'sqlite':
+                $table->addColumn($this->idCol, Types::TEXT)->setNotnull(true);
+                $table->addColumn($this->dataCol, Types::BLOB)->setNotnull(true);
+                $table->addColumn($this->lifetimeCol, Types::INTEGER)->setNotnull(true);
+                $table->addColumn($this->timeCol, Types::INTEGER)->setNotnull(true);
+                break;
+            case 'pgsql':
+                $table->addColumn($this->idCol, Types::STRING)->setLength(128)->setNotnull(true);
+                $table->addColumn($this->dataCol, Types::BINARY)->setNotnull(true);
+                $table->addColumn($this->lifetimeCol, Types::INTEGER)->setNotnull(true);
+                $table->addColumn($this->timeCol, Types::INTEGER)->setNotnull(true);
+                break;
+            case 'oci':
+                $table->addColumn($this->idCol, Types::STRING)->setLength(128)->setNotnull(true);
+                $table->addColumn($this->dataCol, Types::BLOB)->setNotnull(true);
+                $table->addColumn($this->lifetimeCol, Types::INTEGER)->setNotnull(true);
+                $table->addColumn($this->timeCol, Types::INTEGER)->setNotnull(true);
+                break;
+            case 'sqlsrv':
+                $table->addColumn($this->idCol, Types::TEXT)->setLength(128)->setNotnull(true);
+                $table->addColumn($this->dataCol, Types::BLOB)->setNotnull(true);
+                $table->addColumn($this->lifetimeCol, Types::INTEGER)->setUnsigned(true)->setNotnull(true);
+                $table->addColumn($this->timeCol, Types::INTEGER)->setUnsigned(true)->setNotnull(true);
+                break;
+            default:
+                throw new \DomainException(sprintf('Creating the session table is currently not implemented for PDO driver "%s".', $this->driver));
+        }
+        $table->setPrimaryKey([$this->idCol]);
+    }
+
     /**
      * Creates the table to store sessions which can be called once for setup.
      *
@@ -441,8 +490,8 @@ private function buildDsnFromUrl(string $dsnOrUrl): string
                         return $dsn;
                     }
                 }
-            // If "unix_socket" is not in the query, we continue with the same process as pgsql
-            // no break
+                // If "unix_socket" is not in the query, we continue with the same process as pgsql
+                // no break
             case 'pgsql':
                 $dsn ??= 'pgsql:';
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
index 34dad9685d5f6..07a82d09a57a5 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -11,11 +11,13 @@
 
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
+use Doctrine\DBAL\Schema\Schema;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
 
 /**
  * @requires extension pdo_sqlite
+ *
  * @group time-sensitive
  */
 class PdoSessionHandlerTest extends TestCase
@@ -326,6 +328,35 @@ public function testUrlDsn($url, $expectedDsn, $expectedUser = null, $expectedPa
         }
     }
 
+    public function testConfigureSchemaDifferentDatabase()
+    {
+        $schema = new Schema();
+
+        $pdoSessionHandler = new PdoSessionHandler($this->getMemorySqlitePdo());
+        $pdoSessionHandler->configureSchema($schema, fn() => false);
+        $this->assertFalse($schema->hasTable('sessions'));
+    }
+
+    public function testConfigureSchemaSameDatabase()
+    {
+        $schema = new Schema();
+
+        $pdoSessionHandler = new PdoSessionHandler($this->getMemorySqlitePdo());
+        $pdoSessionHandler->configureSchema($schema, fn() => true);
+        $this->assertTrue($schema->hasTable('sessions'));
+    }
+
+    public function testConfigureSchemaTableExistsPdo()
+    {
+        $schema = new Schema();
+        $schema->createTable('sessions');
+
+        $pdoSessionHandler = new PdoSessionHandler($this->getMemorySqlitePdo());
+        $pdoSessionHandler->configureSchema($schema, fn() => true);
+        $table = $schema->getTable('sessions');
+        $this->assertEmpty($table->getColumns(), 'The table was not overwritten');
+    }
+
     public function provideUrlDsnPairs()
     {
         yield ['mysql://localhost/test', 'mysql:host=localhost;dbname=test;'];
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
index ddcb502515b74..2023300b8cc2d 100644
--- a/src/Symfony/Component/HttpFoundation/composer.json
+++ b/src/Symfony/Component/HttpFoundation/composer.json
@@ -22,6 +22,7 @@
         "symfony/polyfill-php83": "^1.27"
     },
     "require-dev": {
+        "doctrine/dbal": "^2.13.1|^3.0",
         "predis/predis": "~1.0",
         "symfony/cache": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
index 7e576a5580dff..5795237bf207c 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
@@ -411,7 +411,7 @@ public function testConfigureSchema()
         $schema = new Schema();
 
         $connection = new Connection(['table_name' => 'queue_table'], $driverConnection);
-        $connection->configureSchema($schema, $driverConnection);
+        $connection->configureSchema($schema, $driverConnection, fn() => true);
         $this->assertTrue($schema->hasTable('queue_table'));
     }
 
@@ -422,7 +422,7 @@ public function testConfigureSchemaDifferentDbalConnection()
         $schema = new Schema();
 
         $connection = new Connection([], $driverConnection);
-        $connection->configureSchema($schema, $driverConnection2);
+        $connection->configureSchema($schema, $driverConnection2, fn() => true);
         $this->assertFalse($schema->hasTable('messenger_messages'));
     }
 
@@ -433,7 +433,7 @@ public function testConfigureSchemaTableExists()
         $schema->createTable('messenger_messages');
 
         $connection = new Connection([], $driverConnection);
-        $connection->configureSchema($schema, $driverConnection);
+        $connection->configureSchema($schema, $driverConnection, fn() => true);
         $table = $schema->getTable('messenger_messages');
         $this->assertEmpty($table->getColumns(), 'The table was not overwritten');
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
index 45113221fbb03..2c4e6a4746ae5 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -324,14 +324,13 @@ public function find(mixed $id): ?array
     /**
      * @internal
      */
-    public function configureSchema(Schema $schema, DBALConnection $forConnection): void
+    public function configureSchema(Schema $schema, DBALConnection $forConnection, \Closure $isSameDatabase): void
     {
-        // only update the schema for this connection
-        if ($forConnection !== $this->driverConnection) {
+        if ($schema->hasTable($this->configuration['table_name'])) {
             return;
         }
 
-        if ($schema->hasTable($this->configuration['table_name'])) {
+        if ($forConnection !== $this->driverConnection && !$isSameDatabase($this->executeStatement(...))) {
             return;
         }
 
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php
index aeb689a8d0b4d..dac4dd538b731 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php
@@ -79,10 +79,14 @@ public function setup(): void
 
     /**
      * Adds the Table to the Schema if this transport uses this connection.
+     *
+     * @param \Closure $isSameDatabase
      */
-    public function configureSchema(Schema $schema, DbalConnection $forConnection): void
+    public function configureSchema(Schema $schema, DbalConnection $forConnection/* , \Closure $isSameDatabase */): void
     {
-        $this->connection->configureSchema($schema, $forConnection);
+        $isSameDatabase = 2 < \func_num_args() ? func_get_arg(2) : static fn () => false;
+
+        $this->connection->configureSchema($schema, $forConnection, $isSameDatabase);
     }
 
     /**

From 02f05bf63df9b50db0779b3e22b13fcda57b1d39 Mon Sep 17 00:00:00 2001
From: BASAK Semih <semihbasak25@gmail.com>
Date: Thu, 15 Dec 2022 19:14:46 +0100
Subject: [PATCH 061/475] Use `::class` for Full Qualified Class Names

---
 .../Compiler/DumpDataCollectorPassTest.php    |  9 +++++----
 .../DebugExtensionTest.php                    |  3 ++-
 .../EventDispatcherDebugCommandTest.php       |  5 +++--
 ...AddExpressionLanguageProvidersPassTest.php |  8 ++++----
 .../DataCollectorTranslatorPassTest.php       | 11 +++++++----
 .../Compiler/LoggingTranslatorPassTest.php    |  3 ++-
 .../TestServiceContainerRefPassesTest.php     |  3 ++-
 .../Fixtures/php/messenger_routing.php        |  7 +++++--
 .../messenger_routing_invalid_transport.php   |  4 +++-
 .../Fixtures/php/messenger_routing_single.php |  4 +++-
 .../php/workflows_explicitly_enabled.php      |  4 +++-
 ...ows_explicitly_enabled_named_workflows.php |  4 +++-
 .../FrameworkExtensionTest.php                |  8 +++++---
 .../AbstractAttributeRoutingTest.php          |  4 +++-
 .../Tests/Functional/AbstractWebTestCase.php  |  3 ++-
 .../Functional/ContainerDebugCommandTest.php  |  3 ++-
 .../Functional/DebugAutowiringCommandTest.php | 16 ++++++++++------
 .../Functional/SluggerLocaleAwareTest.php     |  4 +++-
 .../SecurityDataCollectorTest.php             |  2 +-
 ...AddExpressionLanguageProvidersPassTest.php |  8 ++++----
 .../CompleteConfigurationTest.php             |  7 ++++---
 .../Tests/Functional/AbstractWebTestCase.php  |  3 ++-
 .../Controller/LoginController.php            |  3 ++-
 .../Form/UserLoginType.php                    |  9 ++++++---
 .../FormLoginExtension.php                    |  3 ++-
 .../DependencyInjection/TwigExtensionTest.php | 13 ++++++++-----
 .../WebProfilerExtensionTest.php              | 19 ++++++++++++-------
 27 files changed, 108 insertions(+), 62 deletions(-)

diff --git a/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/Compiler/DumpDataCollectorPassTest.php b/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/Compiler/DumpDataCollectorPassTest.php
index 0b518ee00f71a..769a1421d9c7f 100644
--- a/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/Compiler/DumpDataCollectorPassTest.php
+++ b/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/Compiler/DumpDataCollectorPassTest.php
@@ -17,6 +17,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
 
 class DumpDataCollectorPassTest extends TestCase
 {
@@ -25,7 +26,7 @@ public function testProcessWithoutFileLinkFormatParameter()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new DumpDataCollectorPass());
 
-        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', [null, null, null, null]);
+        $definition = new Definition(DumpDataCollector::class, [null, null, null, null]);
         $container->setDefinition('data_collector.dump', $definition);
 
         $container->compile();
@@ -39,7 +40,7 @@ public function testProcessWithToolbarEnabled()
         $container->addCompilerPass(new DumpDataCollectorPass());
         $requestStack = new RequestStack();
 
-        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', [null, null, null, $requestStack]);
+        $definition = new Definition(DumpDataCollector::class, [null, null, null, $requestStack]);
         $container->setDefinition('data_collector.dump', $definition);
         $container->setParameter('web_profiler.debug_toolbar.mode', WebDebugToolbarListener::ENABLED);
 
@@ -53,7 +54,7 @@ public function testProcessWithToolbarDisabled()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new DumpDataCollectorPass());
 
-        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', [null, null, null, new RequestStack()]);
+        $definition = new Definition(DumpDataCollector::class, [null, null, null, new RequestStack()]);
         $container->setDefinition('data_collector.dump', $definition);
         $container->setParameter('web_profiler.debug_toolbar.mode', WebDebugToolbarListener::DISABLED);
 
@@ -67,7 +68,7 @@ public function testProcessWithoutToolbar()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new DumpDataCollectorPass());
 
-        $definition = new Definition('Symfony\Component\HttpKernel\DataCollector\DumpDataCollector', [null, null, null, new RequestStack()]);
+        $definition = new Definition(DumpDataCollector::class, [null, null, null, new RequestStack()]);
         $container->setDefinition('data_collector.dump', $definition);
 
         $container->compile();
diff --git a/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php b/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php
index f026d4d188232..7cdab627afd99 100644
--- a/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php
+++ b/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\DebugBundle\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\DebugBundle\DebugBundle;
 use Symfony\Bundle\DebugBundle\DependencyInjection\DebugExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -114,7 +115,7 @@ private function createContainer()
             'kernel.charset' => 'UTF-8',
             'kernel.debug' => true,
             'kernel.project_dir' => __DIR__,
-            'kernel.bundles' => ['DebugBundle' => 'Symfony\\Bundle\\DebugBundle\\DebugBundle'],
+            'kernel.bundles' => ['DebugBundle' => DebugBundle::class],
         ]));
 
         return $container;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/EventDispatcherDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/EventDispatcherDebugCommandTest.php
index a506ac2d2915f..c2057282e06b8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/EventDispatcherDebugCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/EventDispatcherDebugCommandTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Console\Tester\CommandCompletionTester;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\Mailer\Event\MessageEvent;
 
 class EventDispatcherDebugCommandTest extends TestCase
 {
@@ -33,7 +34,7 @@ public function testComplete(array $input, array $expectedSuggestions)
 
     public function provideCompletionSuggestions()
     {
-        yield 'event' => [[''], ['Symfony\Component\Mailer\Event\MessageEvent', 'console.command']];
+        yield 'event' => [[''], [MessageEvent::class, 'console.command']];
         yield 'event for other dispatcher' => [['--dispatcher', 'other_event_dispatcher', ''], ['other_event', 'App\OtherEvent']];
         yield 'dispatcher' => [['--dispatcher='], ['event_dispatcher', 'other_event_dispatcher']];
         yield 'format' => [['--format='], ['txt', 'xml', 'json', 'md']];
@@ -44,7 +45,7 @@ private function createCommandCompletionTester(): CommandCompletionTester
         $dispatchers = new ServiceLocator([
             'event_dispatcher' => function () {
                 $dispatcher = new EventDispatcher();
-                $dispatcher->addListener('Symfony\Component\Mailer\Event\MessageEvent', 'var_dump');
+                $dispatcher->addListener(MessageEvent::class, 'var_dump');
                 $dispatcher->addListener('console.command', 'var_dump');
 
                 return $dispatcher;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
index 1207a4820d103..aaba736255f1d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
@@ -24,11 +24,11 @@ public function testProcessForRouter()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
 
-        $definition = new Definition('\stdClass');
+        $definition = new Definition(\stdClass::class);
         $definition->addTag('routing.expression_language_provider');
         $container->setDefinition('some_routing_provider', $definition->setPublic(true));
 
-        $container->register('router.default', '\stdClass')->setPublic(true);
+        $container->register('router.default', \stdClass::class)->setPublic(true);
         $container->compile();
 
         $router = $container->getDefinition('router.default');
@@ -43,11 +43,11 @@ public function testProcessForRouterAlias()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
 
-        $definition = new Definition('\stdClass');
+        $definition = new Definition(\stdClass::class);
         $definition->addTag('routing.expression_language_provider');
         $container->setDefinition('some_routing_provider', $definition->setPublic(true));
 
-        $container->register('my_router', '\stdClass')->setPublic(true);
+        $container->register('my_router', \stdClass::class)->setPublic(true);
         $container->setAlias('router.default', 'my_router');
         $container->compile();
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
index 0167f55101b7b..769a59ba5200e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
@@ -15,6 +15,9 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\DataCollectorTranslatorPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Translation\DataCollector\TranslationDataCollector;
+use Symfony\Component\Translation\DataCollectorTranslator;
+use Symfony\Component\Translation\Translator;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class DataCollectorTranslatorPassTest extends TestCase
@@ -27,16 +30,16 @@ protected function setUp(): void
         $this->container = new ContainerBuilder();
         $this->dataCollectorTranslatorPass = new DataCollectorTranslatorPass();
 
-        $this->container->setParameter('translator_implementing_bag', 'Symfony\Component\Translation\Translator');
+        $this->container->setParameter('translator_implementing_bag', Translator::class);
         $this->container->setParameter('translator_not_implementing_bag', 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag');
 
-        $this->container->register('translator.data_collector', 'Symfony\Component\Translation\DataCollectorTranslator')
+        $this->container->register('translator.data_collector', DataCollectorTranslator::class)
             ->setPublic(false)
             ->setDecoratedService('translator')
             ->setArguments([new Reference('translator.data_collector.inner')])
         ;
 
-        $this->container->register('data_collector.translation', 'Symfony\Component\Translation\DataCollector\TranslationDataCollector')
+        $this->container->register('data_collector.translation', TranslationDataCollector::class)
             ->setArguments([new Reference('translator.data_collector')])
         ;
     }
@@ -68,7 +71,7 @@ public function testProcessKeepsDataCollectorIfTranslatorImplementsTranslatorBag
     public function getImplementingTranslatorBagInterfaceTranslatorClassNames()
     {
         return [
-            ['Symfony\Component\Translation\Translator'],
+            [Translator::class],
             ['%translator_implementing_bag%'],
         ];
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
index 6838d47883d77..9204212169a46 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
@@ -15,6 +15,7 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\LoggingTranslatorPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Translation\Translator;
 
 class LoggingTranslatorPassTest extends TestCase
 {
@@ -22,7 +23,7 @@ public function testProcess()
     {
         $container = new ContainerBuilder();
         $container->setParameter('translator.logging', true);
-        $container->setParameter('translator.class', 'Symfony\Component\Translation\Translator');
+        $container->setParameter('translator.class', Translator::class);
         $container->register('monolog.logger');
         $container->setAlias('logger', 'monolog.logger');
         $container->register('translator.default', '%translator.class%');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TestServiceContainerRefPassesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TestServiceContainerRefPassesTest.php
index 7dc9e6f59ec99..d43605b8284bf 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TestServiceContainerRefPassesTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TestServiceContainerRefPassesTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TestServiceContainerRealRefPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TestServiceContainerWeakRefPass;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
@@ -58,7 +59,7 @@ public function testProcess()
         ];
 
         $privateServices = $container->getDefinition('test.private_services_locator')->getArgument(0);
-        unset($privateServices['Symfony\Component\DependencyInjection\ContainerInterface'], $privateServices['Psr\Container\ContainerInterface']);
+        unset($privateServices[\Symfony\Component\DependencyInjection\ContainerInterface::class], $privateServices[ContainerInterface::class]);
 
         $this->assertEquals($expected, $privateServices);
         $this->assertFalse($container->getDefinition('Test\private_used_non_shared_service')->isShared());
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php
index 77f4d5b93bebc..c045cace2589a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php
@@ -1,5 +1,8 @@
 <?php
 
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\SecondMessage;
+
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
     'serializer' => true,
@@ -8,8 +11,8 @@
             'default_serializer' => 'messenger.transport.symfony_serializer',
         ],
         'routing' => [
-            'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage' => ['amqp', 'messenger.transport.audit'],
-            'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\SecondMessage' => [
+            DummyMessage::class => ['amqp', 'messenger.transport.audit'],
+            SecondMessage::class => [
                 'senders' => ['amqp', 'audit'],
             ],
             '*' => 'amqp',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_invalid_transport.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_invalid_transport.php
index b552a3ebe5d5b..9bf91fd303d3a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_invalid_transport.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_invalid_transport.php
@@ -1,5 +1,7 @@
 <?php
 
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage;
+
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
     'serializer' => true,
@@ -8,7 +10,7 @@
             'default_serializer' => 'messenger.transport.symfony_serializer',
         ],
         'routing' => [
-            'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage' => 'invalid',
+            DummyMessage::class => 'invalid',
         ],
         'transports' => [
             'amqp' => 'amqp://localhost/%2f/messages',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_single.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_single.php
index f487a0f8f90d9..a40347006646e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_single.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_single.php
@@ -1,10 +1,12 @@
 <?php
 
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage;
+
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
     'messenger' => [
         'routing' => [
-            'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage' => ['amqp'],
+            DummyMessage::class => ['amqp'],
         ],
         'transports' => [
             'amqp' => 'amqp://localhost/%2f/messages',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php
index ad71b2729853f..624389dd9ceac 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php
@@ -1,12 +1,14 @@
 <?php
 
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
     'workflows' => [
         'enabled' => true,
         'foo' => [
             'type' => 'workflow',
-            'supports' => ['Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest'],
+            'supports' => [FrameworkExtensionTest::class],
             'initial_marking' => ['bar'],
             'places' => ['bar', 'baz'],
             'transitions' => [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php
index 49ab48914e1ba..21ad8f6f42413 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php
@@ -1,12 +1,14 @@
 <?php
 
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
     'workflows' => [
         'enabled' => true,
         'workflows' => [
             'type' => 'workflow',
-            'supports' => ['Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest'],
+            'supports' => [FrameworkExtensionTest::class],
             'initial_marking' => ['bar'],
             'places' => ['bar', 'baz'],
             'transitions' => [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 286586553493c..90228e9052723 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -17,6 +17,7 @@
 use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FullStack;
@@ -70,6 +71,7 @@
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 use Symfony\Component\Serializer\Normalizer\FormErrorNormalizer;
 use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Translation\DependencyInjection\TranslatorPass;
 use Symfony\Component\Translation\LocaleSwitcher;
@@ -1409,7 +1411,7 @@ public function testSerializerEnabled()
         $argument = $container->getDefinition('serializer.mapping.chain_loader')->getArgument(0);
 
         $this->assertCount(2, $argument);
-        $this->assertEquals('Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader', $argument[0]->getClass());
+        $this->assertEquals(AnnotationLoader::class, $argument[0]->getClass());
         $this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.name_converter.metadata_aware')->getArgument(1));
         $this->assertEquals(new Reference('property_info', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), $container->getDefinition('serializer.normalizer.object')->getArgument(3));
         $this->assertArrayHasKey('circular_reference_handler', $container->getDefinition('serializer.normalizer.object')->getArgument(6));
@@ -1491,7 +1493,7 @@ public function testObjectNormalizerRegistered()
         $definition = $container->getDefinition('serializer.normalizer.object');
         $tag = $definition->getTag('serializer.normalizer');
 
-        $this->assertEquals('Symfony\Component\Serializer\Normalizer\ObjectNormalizer', $definition->getClass());
+        $this->assertEquals(ObjectNormalizer::class, $definition->getClass());
         $this->assertEquals(-1000, $tag[0]['priority']);
     }
 
@@ -2217,7 +2219,7 @@ public function testNotifierWithSpecificMessageBus()
     protected function createContainer(array $data = [])
     {
         return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([
-            'kernel.bundles' => ['FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'],
+            'kernel.bundles' => ['FrameworkBundle' => FrameworkBundle::class],
             'kernel.bundles_metadata' => ['FrameworkBundle' => ['namespace' => 'Symfony\\Bundle\\FrameworkBundle', 'path' => __DIR__.'/../..']],
             'kernel.cache_dir' => __DIR__,
             'kernel.build_dir' => __DIR__,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractAttributeRoutingTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractAttributeRoutingTest.php
index cf971d0d60dc3..8f8747bfff495 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractAttributeRoutingTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractAttributeRoutingTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
+use Symfony\Component\HttpFoundation\Request;
+
 abstract class AbstractAttributeRoutingTest extends AbstractWebTestCase
 {
     /**
@@ -32,7 +34,7 @@ public function testAnnotatedController(string $path, string $expectedValue)
     public function getRoutes(): array
     {
         return [
-            ['/null_request', 'Symfony\Component\HttpFoundation\Request'],
+            ['/null_request', Request::class],
             ['/null_argument', ''],
             ['/null_argument_with_route_param', ''],
             ['/null_argument_with_route_param/value', 'value'],
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractWebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractWebTestCase.php
index bce53b8668251..085cb812eba69 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractWebTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractWebTestCase.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\app\AppKernel;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\KernelInterface;
 
@@ -47,7 +48,7 @@ protected static function getKernelClass(): string
     {
         require_once __DIR__.'/app/AppKernel.php';
 
-        return 'Symfony\Bundle\FrameworkBundle\Tests\Functional\app\AppKernel';
+        return AppKernel::class;
     }
 
     protected static function createKernel(array $options = []): KernelInterface
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
index 949c6191a1252..32d8aa0a67073 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
@@ -15,6 +15,7 @@
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BackslashClass;
 use Symfony\Component\Console\Tester\ApplicationTester;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * @group functional
@@ -273,7 +274,7 @@ public function provideCompletionSuggestions()
     {
         $serviceId = 'console.command.container_debug';
         $hiddenServiceId = '.console.command.container_debug.lazy';
-        $interfaceServiceId = 'Symfony\Component\HttpKernel\HttpKernelInterface';
+        $interfaceServiceId = HttpKernelInterface::class;
 
         yield 'name' => [
             [''],
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
index c3110cc71dcbb..650d2174d2096 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
@@ -11,10 +11,14 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
+use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Command\DebugAutowiringCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ClassAliasExampleClass;
 use Symfony\Component\Console\Tester\ApplicationTester;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\Routing\RouterInterface;
 
 /**
  * @group functional
@@ -31,7 +35,7 @@ public function testBasicFunctionality()
         $tester = new ApplicationTester($application);
         $tester->run(['command' => 'debug:autowiring']);
 
-        $this->assertStringContainsString('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
+        $this->assertStringContainsString(HttpKernelInterface::class, $tester->getDisplay());
         $this->assertStringContainsString('(http_kernel)', $tester->getDisplay());
     }
 
@@ -45,8 +49,8 @@ public function testSearchArgument()
         $tester = new ApplicationTester($application);
         $tester->run(['command' => 'debug:autowiring', 'search' => 'kern']);
 
-        $this->assertStringContainsString('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
-        $this->assertStringNotContainsString('Symfony\Component\Routing\RouterInterface', $tester->getDisplay());
+        $this->assertStringContainsString(HttpKernelInterface::class, $tester->getDisplay());
+        $this->assertStringNotContainsString(RouterInterface::class, $tester->getDisplay());
     }
 
     public function testSearchIgnoreBackslashWhenFindingService()
@@ -58,7 +62,7 @@ public function testSearchIgnoreBackslashWhenFindingService()
 
         $tester = new ApplicationTester($application);
         $tester->run(['command' => 'debug:autowiring', 'search' => 'HttpKernelHttpKernelInterface']);
-        $this->assertStringContainsString('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
+        $this->assertStringContainsString(HttpKernelInterface::class, $tester->getDisplay());
     }
 
     public function testSearchNoResults()
@@ -109,7 +113,7 @@ public function testNotConfusedByClassAliases()
 
         $tester = new ApplicationTester($application);
         $tester->run(['command' => 'debug:autowiring', 'search' => 'ClassAlias']);
-        $this->assertStringContainsString('Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ClassAliasExampleClass', $tester->getDisplay());
+        $this->assertStringContainsString(ClassAliasExampleClass::class, $tester->getDisplay());
     }
 
     /**
@@ -131,6 +135,6 @@ public function testComplete(array $input, array $expectedSuggestions)
 
     public function provideCompletionSuggestions(): \Generator
     {
-        yield 'search' => [[''], ['SessionHandlerInterface', 'Psr\\Log\\LoggerInterface', 'Psr\\Container\\ContainerInterface $parameterBag']];
+        yield 'search' => [[''], ['SessionHandlerInterface', LoggerInterface::class, 'Psr\\Container\\ContainerInterface $parameterBag']];
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SluggerLocaleAwareTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SluggerLocaleAwareTest.php
index d8552977c0835..76901246138b6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SluggerLocaleAwareTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SluggerLocaleAwareTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Slugger\SlugConstructArgService;
+
 /**
  * @group functional
  */
@@ -24,7 +26,7 @@ public function testLocalizedSlugger()
         $kernel = static::createKernel(['test_case' => 'Slugger', 'root_config' => 'config.yml']);
         $kernel->boot();
 
-        $service = $kernel->getContainer()->get('Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Slugger\SlugConstructArgService');
+        $service = $kernel->getContainer()->get(SlugConstructArgService::class);
 
         $this->assertSame('Stoinostta-tryabva-da-bude-luzha', $service->hello());
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
index b5178dcde56a1..9b5afb0b8b20a 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
@@ -89,7 +89,7 @@ public function testCollectAuthenticationTokenAndRoles(array $roles, array $norm
         $this->assertFalse($collector->isImpersonated());
         $this->assertNull($collector->getImpersonatorUser());
         $this->assertNull($collector->getImpersonationExitPath());
-        $this->assertSame('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', $collector->getTokenClass()->getValue());
+        $this->assertSame(UsernamePasswordToken::class, $collector->getTokenClass()->getValue());
         $this->assertTrue($collector->supportsRoleHierarchy());
         $this->assertSame($normalizedRoles, $collector->getRoles()->getValue(true));
         $this->assertSame($inheritedRoles, $collector->getInheritedRoles()->getValue(true));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
index 6e79f8fc644d1..34dc4039d5655 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
@@ -24,11 +24,11 @@ public function testProcessForSecurity()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
 
-        $definition = new Definition('\stdClass');
+        $definition = new Definition(\stdClass::class);
         $definition->addTag('security.expression_language_provider');
         $container->setDefinition('some_security_provider', $definition->setPublic(true));
 
-        $container->register('security.expression_language', '\stdClass')->setPublic(true);
+        $container->register('security.expression_language', \stdClass::class)->setPublic(true);
         $container->compile();
 
         $calls = $container->getDefinition('security.expression_language')->getMethodCalls();
@@ -42,11 +42,11 @@ public function testProcessForSecurityAlias()
         $container = new ContainerBuilder();
         $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
 
-        $definition = new Definition('\stdClass');
+        $definition = new Definition(\stdClass::class);
         $definition->addTag('security.expression_language_provider');
         $container->setDefinition('some_security_provider', $definition->setPublic(true));
 
-        $container->register('my_security.expression_language', '\stdClass')->setPublic(true);
+        $container->register('my_security.expression_language', \stdClass::class)->setPublic(true);
         $container->setAlias('security.expression_language', 'my_security.expression_language');
         $container->compile();
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index 2909627f2ce35..acf5de337fc6b 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -30,6 +30,7 @@
 use Symfony\Component\PasswordHasher\Hasher\SodiumPasswordHasher;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
 use Symfony\Component\Security\Core\Authorization\Strategy\AffirmativeStrategy;
+use Symfony\Component\Security\Core\User\UserCheckerInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticatorManager;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\CsrfTokenBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge;
@@ -240,7 +241,7 @@ public function testFirewalls()
             ],
         ], $listeners);
 
-        $this->assertFalse($container->hasAlias('Symfony\Component\Security\Core\User\UserCheckerInterface', 'No user checker alias is registered when custom user checker services are registered'));
+        $this->assertFalse($container->hasAlias(UserCheckerInterface::class, 'No user checker alias is registered when custom user checker services are registered'));
     }
 
     public function testFirewallRequestMatchers()
@@ -280,8 +281,8 @@ public function testUserCheckerAliasIsRegistered()
     {
         $container = $this->getContainer('no_custom_user_checker');
 
-        $this->assertTrue($container->hasAlias('Symfony\Component\Security\Core\User\UserCheckerInterface', 'Alias for user checker is registered when no custom user checker service is registered'));
-        $this->assertFalse($container->getAlias('Symfony\Component\Security\Core\User\UserCheckerInterface')->isPublic());
+        $this->assertTrue($container->hasAlias(UserCheckerInterface::class, 'Alias for user checker is registered when no custom user checker service is registered'));
+        $this->assertFalse($container->getAlias(UserCheckerInterface::class)->isPublic());
     }
 
     public function testAccess()
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AbstractWebTestCase.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AbstractWebTestCase.php
index 9b79a4cd7a9e9..00c81bc380b2d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AbstractWebTestCase.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AbstractWebTestCase.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
+use Symfony\Bundle\SecurityBundle\Tests\Functional\app\AppKernel;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\KernelInterface;
 
@@ -47,7 +48,7 @@ protected static function getKernelClass(): string
     {
         require_once __DIR__.'/app/AppKernel.php';
 
-        return 'Symfony\Bundle\SecurityBundle\Tests\Functional\app\AppKernel';
+        return AppKernel::class;
     }
 
     protected static function createKernel(array $options = []): KernelInterface
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php
index 22f7de69b208c..42a87a1235937 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Controller;
 
 use Psr\Container\ContainerInterface;
+use Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Form\UserLoginType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
@@ -29,7 +30,7 @@ public function __construct(ContainerInterface $container)
 
     public function loginAction()
     {
-        $form = $this->container->get('form.factory')->create('Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Form\UserLoginType');
+        $form = $this->container->get('form.factory')->create(UserLoginType::class);
 
         return new Response($this->container->get('twig')->render('@CsrfFormLogin/Login/login.html.twig', [
             'form' => $form->createView(),
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
index 0f89b3c1b4fc8..80adb49a8892e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
@@ -12,6 +12,9 @@
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
@@ -39,9 +42,9 @@ public function __construct(RequestStack $requestStack)
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('username', 'Symfony\Component\Form\Extension\Core\Type\TextType')
-            ->add('password', 'Symfony\Component\Form\Extension\Core\Type\PasswordType')
-            ->add('_target_path', 'Symfony\Component\Form\Extension\Core\Type\HiddenType')
+            ->add('username', TextType::class)
+            ->add('password', PasswordType::class)
+            ->add('_target_path', HiddenType::class)
         ;
 
         $request = $this->requestStack->getCurrentRequest();
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functio
341A
nal/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php
index 7cd7ad446f255..2c81ca6416171 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\DependencyInjection;
 
+use Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Security\LocalizedFormFailureHandler;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Reference;
@@ -20,7 +21,7 @@ class FormLoginExtension extends Extension
     public function load(array $configs, ContainerBuilder $container)
     {
         $container
-            ->register('localized_form_failure_handler', 'Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\Security\LocalizedFormFailureHandler')
+            ->register('localized_form_failure_handler', LocalizedFormFailureHandler::class)
             ->addArgument(new Reference('router'))
         ;
     }
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
index bfb215b488715..5bc4e6cff02cb 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -24,7 +24,10 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
+use Symfony\Component\Form\FormRenderer;
 use Symfony\Component\Mailer\Mailer;
+use Symfony\Component\Stopwatch\Stopwatch;
+use Twig\Environment;
 
 class TwigExtensionTest extends TestCase
 {
@@ -35,7 +38,7 @@ public function testLoadEmptyConfiguration()
         $container->loadFromExtension('twig');
         $this->compileContainer($container);
 
-        $this->assertEquals('Twig\Environment', $container->getDefinition('twig')->getClass(), '->load() loads the twig.xml file');
+        $this->assertEquals(Environment::class, $container->getDefinition('twig')->getClass(), '->load() loads the twig.xml file');
 
         $this->assertContains('form_div_layout.html.twig', $container->getParameter('twig.form.resources'), '->load() includes default template for form resources');
 
@@ -60,7 +63,7 @@ public function testLoadFullConfiguration($format)
         $this->loadFromFile($container, 'full', $format);
         $this->compileContainer($container);
 
-        $this->assertEquals('Twig\Environment', $container->getDefinition('twig')->getClass(), '->load() loads the twig.xml file');
+        $this->assertEquals(Environment::class, $container->getDefinition('twig')->getClass(), '->load() loads the twig.xml file');
 
         // Form resources
         $resources = $container->getParameter('twig.form.resources');
@@ -221,7 +224,7 @@ public function testStopwatchExtensionAvailability($debug, $stopwatchEnabled, $e
         $container = $this->createContainer();
         $container->setParameter('kernel.debug', $debug);
         if ($stopwatchEnabled) {
-            $container->register('debug.stopwatch', 'Symfony\Component\Stopwatch\Stopwatch');
+            $container->register('debug.stopwatch', Stopwatch::class);
         }
         $container->registerExtension(new TwigExtension());
         $container->loadFromExtension('twig');
@@ -262,9 +265,9 @@ public function testRuntimeLoader()
 
         $loader = $container->getDefinition('twig.runtime_loader');
         $args = $container->getDefinition((string) $loader->getArgument(0))->getArgument(0);
-        $this->assertArrayHasKey('Symfony\Component\Form\FormRenderer', $args);
+        $this->assertArrayHasKey(FormRenderer::class, $args);
         $this->assertArrayHasKey('FooClass', $args);
-        $this->assertEquals('twig.form.renderer', $args['Symfony\Component\Form\FormRenderer']->getValues()[0]);
+        $this->assertEquals('twig.form.renderer', $args[FormRenderer::class]->getValues()[0]);
         $this->assertEquals('foo', $args['FooClass']->getValues()[0]);
     }
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
index 0038736820388..fa0c9baf63d55 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -22,6 +22,11 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\HttpKernel\Profiler\Profiler;
+use Symfony\Component\HttpKernel\Profiler\ProfilerStorageInterface;
+use Symfony\Component\Routing\RouterInterface;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
 
 class WebProfilerExtensionTest extends TestCase
 {
@@ -55,10 +60,10 @@ protected function setUp(): void
         $this->container->register('data_collector.dump', DumpDataCollector::class)->setPublic(true);
         $this->container->register('error_handler.error_renderer.html', HtmlErrorRenderer::class)->setPublic(true);
         $this->container->register('event_dispatcher', EventDispatcher::class)->setPublic(true);
-        $this->container->register('router', $this->getMockClass('Symfony\\Component\\Routing\\RouterInterface'))->setPublic(true);
-        $this->container->register('twig', 'Twig\Environment')->setPublic(true);
-        $this->container->register('twig_loader', 'Twig\Loader\ArrayLoader')->addArgument([])->setPublic(true);
-        $this->container->register('twig', 'Twig\Environment')->addArgument(new Reference('twig_loader'))->setPublic(true);
+        $this->container->register('router', $this->getMockClass(RouterInterface::class))->setPublic(true);
+        $this->container->register('twig', Environment::class)->setPublic(true);
+        $this->container->register('twig_loader', ArrayLoader::class)->addArgument([])->setPublic(true);
+        $this->container->register('twig', Environment::class)->addArgument(new Reference('twig_loader'))->setPublic(true);
         $this->container->setParameter('kernel.bundles', []);
         $this->container->setParameter('kernel.cache_dir', __DIR__);
         $this->container->setParameter('kernel.build_dir', __DIR__);
@@ -66,10 +71,10 @@ protected function setUp(): void
         $this->container->setParameter('kernel.project_dir', __DIR__);
         $this->container->setParameter('kernel.charset', 'UTF-8');
         $this->container->setParameter('debug.file_link_format', null);
-        $this->container->setParameter('profiler.class', ['Symfony\\Component\\HttpKernel\\Profiler\\Profiler']);
-        $this->container->register('profiler', $this->getMockClass('Symfony\\Component\\HttpKernel\\Profiler\\Profiler'))
+        $this->container->setParameter('profiler.class', [Profiler::class]);
+        $this->container->register('profiler', $this->getMockClass(Profiler::class))
             ->setPublic(true)
-            ->addArgument(new Definition($this->getMockClass('Symfony\\Component\\HttpKernel\\Profiler\\ProfilerStorageInterface')));
+            ->addArgument(new Definition($this->getMockClass(ProfilerStorageInterface::class)));
         $this->container->setParameter('data_collector.templates', []);
         $this->container->set('kernel', $this->kernel);
         $this->container->addCompilerPass(new RegisterListenersPass());

From a7926b2d83f35fe53c41a28d8055490cc1955928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Mon, 12 Dec 2022 15:43:44 +0100
Subject: [PATCH 062/475] [Messenger] Move Transport/InMemoryTransport to
 Transport/InMemory/InMemoryTransport

---
 UPGRADE-6.3.md                                |   8 +
 UPGRADE-7.0.md                                |   8 +
 .../Resources/config/messenger.php            |   2 +-
 .../Bundle/FrameworkBundle/composer.json      |   4 +-
 src/Symfony/Component/Messenger/CHANGELOG.md  |   8 +
 .../InMemoryTransportFactoryTest.php          |   6 +-
 .../{ => InMemory}/InMemoryTransportTest.php  |   4 +-
 .../Transport/InMemory/InMemoryTransport.php  | 145 ++++++++++++++++++
 .../InMemory/InMemoryTransportFactory.php     |  59 +++++++
 .../Messenger/Transport/InMemoryTransport.php | 131 +---------------
 .../Transport/InMemoryTransportFactory.php    |  44 +-----
 11 files changed, 246 insertions(+), 173 deletions(-)
 rename src/Symfony/Component/Messenger/Tests/Transport/{ => InMemory}/InMemoryTransportFactoryTest.php (93%)
 rename src/Symfony/Component/Messenger/Tests/Transport/{ => InMemory}/InMemoryTransportTest.php (97%)
 create mode 100644 src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
 create mode 100644 src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransportFactory.php

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 17e9002f0882e..77c7858198d80 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -11,6 +11,14 @@ HttpKernel
 
  * Deprecate parameters `container.dumper.inline_factories` and `container.dumper.inline_class_loader`, use `.container.dumper.inline_factories` and `.container.dumper.inline_class_loader` instead
 
+Messenger
+---------
+
+ * Deprecate `Symfony\Component\Messenger\Transport\InMemoryTransport` and
+   `Symfony\Component\Messenger\Transport\InMemoryTransportFactory` in favor of
+   `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport` and
+   `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransportFactory`
+
 SecurityBundle
 --------------
 
diff --git a/UPGRADE-7.0.md b/UPGRADE-7.0.md
index 587796bbb6e9f..42279c090c308 100644
--- a/UPGRADE-7.0.md
+++ b/UPGRADE-7.0.md
@@ -1,6 +1,14 @@
 UPGRADE FROM 6.4 to 7.0
 =======================
 
+Messenger
+---------
+
+ * Remove `Symfony\Component\Messenger\Transport\InMemoryTransport` and
+   `Symfony\Component\Messenger\Transport\InMemoryTransportFactory` in favor of
+   `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport` and
+   `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransportFactory`
+
 Workflow
 --------
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
index 13e8dad627835..39030ce51132e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
@@ -35,7 +35,7 @@
 use Symfony\Component\Messenger\Middleware\ValidationMiddleware;
 use Symfony\Component\Messenger\Retry\MultiplierRetryStrategy;
 use Symfony\Component\Messenger\RoutableMessageBus;
-use Symfony\Component\Messenger\Transport\InMemoryTransportFactory;
+use Symfony\Component\Messenger\Transport\InMemory\InMemoryTransportFactory;
 use Symfony\Component\Messenger\Transport\Sender\SendersLocator;
 use Symfony\Component\Messenger\Transport\Serialization\Normalizer\FlattenExceptionNormalizer;
 use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 509d4278daca6..0f0645331f774 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -48,7 +48,7 @@
         "symfony/http-client": "^5.4|^6.0",
         "symfony/lock": "^5.4|^6.0",
         "symfony/mailer": "^5.4|^6.0",
-        "symfony/messenger": "^6.2",
+        "symfony/messenger": "^6.3",
         "symfony/mime": "^6.2",
         "symfony/notifier": "^5.4|^6.0",
         "symfony/process": "^5.4|^6.0",
@@ -83,7 +83,7 @@
         "symfony/form": "<5.4",
         "symfony/lock": "<5.4",
         "symfony/mailer": "<5.4",
-        "symfony/messenger": "<6.2",
+        "symfony/messenger": "<6.3",
         "symfony/mime": "<6.2",
         "symfony/property-info": "<5.4",
         "symfony/property-access": "<5.4",
diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
index 650e2ff0ac44f..4e2f52ebf2ff3 100644
--- a/src/Symfony/Component/Messenger/CHANGELOG.md
+++ b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -1,6 +1,14 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Deprecate `Symfony\Component\Messenger\Transport\InMemoryTransport` and
+   `Symfony\Component\Messenger\Transport\InMemoryTransportFactory` in favor of
+   `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport` and
+   `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransportFactory`
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/InMemoryTransportFactoryTest.php b/src/Symfony/Component/Messenger/Tests/Transport/InMemory/InMemor
F438
yTransportFactoryTest.php
similarity index 93%
rename from src/Symfony/Component/Messenger/Tests/Transport/InMemoryTransportFactoryTest.php
rename to src/Symfony/Component/Messenger/Tests/Transport/InMemory/InMemoryTransportFactoryTest.php
index d29ab10639da2..2be1ee57a0bd9 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/InMemoryTransportFactoryTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/InMemory/InMemoryTransportFactoryTest.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Tests\Transport;
+namespace Symfony\Component\Messenger\Tests\Transport\InMemory;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
-use Symfony\Component\Messenger\Transport\InMemoryTransport;
-use Symfony\Component\Messenger\Transport\InMemoryTransportFactory;
+use Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport;
+use Symfony\Component\Messenger\Transport\InMemory\InMemoryTransportFactory;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 
 /**
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/InMemoryTransportTest.php b/src/Symfony/Component/Messenger/Tests/Transport/InMemory/InMemoryTransportTest.php
similarity index 97%
rename from src/Symfony/Component/Messenger/Tests/Transport/InMemoryTransportTest.php
rename to src/Symfony/Component/Messenger/Tests/Transport/InMemory/InMemoryTransportTest.php
index 1b10a6165823a..97e7f227a50e1 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/InMemoryTransportTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/InMemory/InMemoryTransportTest.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Tests\Transport;
+namespace Symfony\Component\Messenger\Tests\Transport\InMemory;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\AnEnvelopeStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
-use Symfony\Component\Messenger\Transport\InMemoryTransport;
+use Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 
 /**
diff --git a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
new file mode 100644
index 0000000000000..40132068aecae
--- /dev/null
+++ b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
@@ -0,0 +1,145 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Messenger\Transport\InMemory;
+
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Exception\LogicException;
+use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
+use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
+use Symfony\Component\Messenger\Transport\TransportInterface;
+use Symfony\Contracts\Service\ResetInterface;
+
+/**
+ * Transport that stays in memory. Useful for testing purpose.
+ *
+ * @author Gary PEGEOT <garypegeot@gmail.com>
+ */
+class InMemoryTransport implements TransportInterface, ResetInterface
+{
+    /**
+     * @var Envelope[]
+     */
+    private array $sent = [];
+
+    /**
+     * @var Envelope[]
+     */
+    private array $acknowledged = [];
+
+    /**
+     * @var Envelope[]
+     */
+    private array $rejected = [];
+
+    /**
+     * @var Envelope[]
+     */
+    private array $queue = [];
+
+    private int $nextId = 1;
+    private ?SerializerInterface $serializer;
+
+    public function __construct(SerializerInterface $serializer = null)
+    {
+        $this->serializer = $serializer;
+    }
+
+    public function get(): iterable
+    {
+        return array_values($this->decode($this->queue));
+    }
+
+    public function ack(Envelope $envelope): void
+    {
+        $this->acknowledged[] = $this->encode($envelope);
+
+        if (!$transportMessageIdStamp = $envelope->last(TransportMessageIdStamp::class)) {
+            throw new LogicException('No TransportMessageIdStamp found on the Envelope.');
+        }
+
+        unset($this->queue[$transportMessageIdStamp->getId()]);
+    }
+
+    public function reject(Envelope $envelope): void
+    {
+        $this->rejected[] = $this->encode($envelope);
+
+        if (!$transportMessageIdStamp = $envelope->last(TransportMessageIdStamp::class)) {
+            throw new LogicException('No TransportMessageIdStamp found on the Envelope.');
+        }
+
+        unset($this->queue[$transportMessageIdStamp->getId()]);
+    }
+
+    public function send(Envelope $envelope): Envelope
+    {
+        $id = $this->nextId++;
+        $envelope = $envelope->with(new TransportMessageIdStamp($id));
+        $encodedEnvelope = $this->encode($envelope);
+        $this->sent[] = $encodedEnvelope;
+        $this->queue[$id] = $encodedEnvelope;
+
+        return $envelope;
+    }
+
+    public function reset()
+    {
+        $this->sent = $this->queue = $this->rejected = $this->acknowledged = [];
+    }
+
+    /**
+     * @return Envelope[]
+     */
+    public function getAcknowledged(): array
+    {
+        return $this->decode($this->acknowledged);
+    }
+
+    /**
+     * @return Envelope[]
+     */
+    public function getRejected(): array
+    {
+        return $this->decode($this->rejected);
+    }
+
+    /**
+     * @return Envelope[]
+     */
+    public function getSent(): array
+    {
+        return $this->decode($this->sent);
+    }
+
+    private function encode(Envelope $envelope): Envelope|array
+    {
+        if (null === $this->serializer) {
+            return $envelope;
+        }
+
+        return $this->serializer->encode($envelope);
+    }
+
+    /**
+     * @param array<mixed> $messagesEncoded
+     *
+     * @return Envelope[]
+     */
+    private function decode(array $messagesEncoded): array
+    {
+        if (null === $this->serializer) {
+            return $messagesEncoded;
+        }
+
+        return array_map($this->serializer->decode(...), $messagesEncoded);
+    }
+}
diff --git a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransportFactory.php b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransportFactory.php
new file mode 100644
index 0000000000000..3e704b1bb3528
--- /dev/null
+++ b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransportFactory.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Messenger\Transport\InMemory;
+
+use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
+use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
+use Symfony\Component\Messenger\Transport\TransportInterface;
+use Symfony\Contracts\Service\ResetInterface;
+
+/**
+ * @author Gary PEGEOT <garypegeot@gmail.com>
+ */
+class InMemoryTransportFactory implements TransportFactoryInterface, ResetInterface
+{
+    /**
+     * @var InMemoryTransport[]
+     */
+    private array $createdTransports = [];
+
+    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
+    {
+        ['serialize' => $serialize] = $this->parseDsn($dsn);
+
+        return $this->createdTransports[] = new InMemoryTransport($serialize ? $serializer : null);
+    }
+
+    public function supports(string $dsn, array $options): bool
+    {
+        return str_starts_with($dsn, 'in-memory://');
+    }
+
+    public function reset()
+    {
+        foreach ($this->createdTransports as $transport) {
+            $transport->reset();
+        }
+    }
+
+    private function parseDsn(string $dsn): array
+    {
+        $query = [];
+        if ($queryAsString = strstr($dsn, '?')) {
+            parse_str(ltrim($queryAsString, '?'), $query);
+        }
+
+        return [
+            'serialize' => filter_var($query['serialize'] ?? false, \FILTER_VALIDATE_BOOL),
+        ];
+    }
+}
diff --git a/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php b/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php
index 68ec8b619eb77..a8941b00b67ad 100644
--- a/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php
+++ b/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php
@@ -11,134 +11,13 @@
 
 namespace Symfony\Component\Messenger\Transport;
 
-use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Exception\LogicException;
-use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
-use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
-use Symfony\Contracts\Service\ResetInterface;
+use Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport as BaseInMemoryTransport;
+
+trigger_deprecation('symfony/messenger', '6.3', 'The "%s" class is deprecated, use "%s" instead. ', InMemoryTransport::class, BaseInMemoryTransport::class);
 
 /**
- * Transport that stays in memory. Useful for testing purpose.
- *
- * @author Gary PEGEOT <garypegeot@gmail.com>
+ * @deprecated since Symfony 6.3, use {@link BaseInMemoryTransport} instead
  */
-class InMemoryTransport implements TransportInterface, ResetInterface
+class InMemoryTransport extends BaseInMemoryTransport
 {
-    /**
-     * @var Envelope[]
-     */
-    private array $sent = [];
-
-    /**
-     * @var Envelope[]
-     */
-    private array $acknowledged = [];
-
-    /**
-     * @var Envelope[]
-     */
-    private array $rejected = [];
-
-    /**
-     * @var Envelope[]
-     */
-    private array $queue = [];
-
-    private int $nextId = 1;
-    private ?SerializerInterface $serializer;
-
-    public function __construct(SerializerInterface $serializer = null)
-    {
-        $this->serializer = $serializer;
-    }
-
-    public function get(): iterable
-    {
-        return array_values($this->decode($this->queue));
-    }
-
-    public function ack(Envelope $envelope): void
-    {
-        $this->acknowledged[] = $this->encode($envelope);
-
-        if (!$transportMessageIdStamp = $envelope->last(TransportMessageIdStamp::class)) {
-            throw new LogicException('No TransportMessageIdStamp found on the Envelope.');
-        }
-
-        unset($this->queue[$transportMessageIdStamp->getId()]);
-    }
-
-    public function reject(Envelope $envelope): void
-    {
-        $this->rejected[] = $this->encode($envelope);
-
-        if (!$transportMessageIdStamp = $envelope->last(TransportMessageIdStamp::class)) {
-            throw new LogicException('No TransportMessageIdStamp found on the Envelope.');
-        }
-
-        unset($this->queue[$transportMessageIdStamp->getId()]);
-    }
-
-    public function send(Envelope $envelope): Envelope
-    {
-        $id = $this->nextId++;
-        $envelope = $envelope->with(new TransportMessageIdStamp($id));
-        $encodedEnvelope = $this->encode($envelope);
-        $this->sent[] = $encodedEnvelope;
-        $this->queue[$id] = $encodedEnvelope;
-
-        return $envelope;
-    }
-
-    public function reset()
-    {
-        $this->sent = $this->queue = $this->rejected = $this->acknowledged = [];
-    }
-
-    /**
-     * @return Envelope[]
-     */
-    public function getAcknowledged(): array
-    {
-        return $this->decode($this->acknowledged);
-    }
-
-    /**
-     * @return Envelope[]
-     */
-    public function getRejected(): array
-    {
-        return $this->decode($this->rejected);
-    }
-
-    /**
-     * @return Envelope[]
-     */
-    public function getSent(): array
-    {
-        return $this->decode($this->sent);
-    }
-
-    private function encode(Envelope $envelope): Envelope|array
-    {
-        if (null === $this->serializer) {
-            return $envelope;
-        }
-
-        return $this->serializer->encode($envelope);
-    }
-
-    /**
-     * @param array<mixed> $messagesEncoded
-     *
-     * @return Envelope[]
-     */
-    private function decode(array $messagesEncoded): array
-    {
-        if (null === $this->serializer) {
-            return $messagesEncoded;
-        }
-
-        return array_map($this->serializer->decode(...), $messagesEncoded);
-    }
 }
diff --git a/src/Symfony/Component/Messenger/Transport/InMemoryTransportFactory.php b/src/Symfony/Component/Messenger/Transport/InMemoryTransportFactory.php
index 232b941c2970c..bdd4817d6a600 100644
--- a/src/Symfony/Component/Messenger/Transport/InMemoryTransportFactory.php
+++ b/src/Symfony/Component/Messenger/Transport/InMemoryTransportFactory.php
@@ -11,47 +11,13 @@
 
 namespace Symfony\Component\Messenger\Transport;
 
-use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
-use Symfony\Contracts\Service\ResetInterface;
+use Symfony\Component\Messenger\Transport\InMemory\InMemoryTransportFactory as BaseInMemoryTransportFactory;
+
+trigger_deprecation('symfony/messenger', '6.3', 'The "%s" class is deprecated, use "%s" instead. ', InMemoryTransportFactory::class, BaseInMemoryTransportFactory::class);
 
 /**
- * @author Gary PEGEOT <garypegeot@gmail.com>
+ * @deprecated since Symfony 6.3, use {@link BaseInMemoryTransportFactory} instead
  */
-class InMemoryTransportFactory implements TransportFactoryInterface, ResetInterface
+class InMemoryTransportFactory extends BaseInMemoryTransportFactory
 {
-    /**
-     * @var InMemoryTransport[]
-     */
-    private array $createdTransports = [];
-
-    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
-    {
-        ['serialize' => $serialize] = $this->parseDsn($dsn);
-
-        return $this->createdTransports[] = new InMemoryTransport($serialize ? $serializer : null);
-    }
-
-    public function supports(string $dsn, array $options): bool
-    {
-        return str_starts_with($dsn, 'in-memory://');
-    }
-
-    public function reset()
-    {
-        foreach ($this->createdTransports as $transport) {
-            $transport->reset();
-        }
-    }
-
-    private function parseDsn(string $dsn): array
-    {
-        $query = [];
-        if ($queryAsString = strstr($dsn, '?')) {
-            parse_str(ltrim($queryAsString, '?'), $query);
-        }
-
-        return [
-            'serialize' => filter_var($query['serialize'] ?? false, \FILTER_VALIDATE_BOOL),
-        ];
-    }
 }

From bb6e4da210a89cc4f7be16cb307d48452a84f63f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 16 Dec 2022 17:04:38 +0100
Subject: [PATCH 063/475] Fix merge

---
 .../Cache/Tests/Adapter/DoctrineDbalAdapterTest.php         | 6 +++---
 .../Bridge/Doctrine/Tests/Transport/ConnectionTest.php      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php
index 67f14fd66b51a..e289d039f3f36 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php
@@ -79,7 +79,7 @@ public function testConfigureSchema()
         $schema = new Schema();
 
         $adapter = new DoctrineDbalAdapter($connection);
-        $adapter->configureSchema($schema, $connection);
+        $adapter->configureSchema($schema, $connection, fn() => true);
         $this->assertTrue($schema->hasTable('cache_items'));
     }
 
@@ -89,7 +89,7 @@ public function testConfigureSchemaDifferentDbalConnection()
         $schema = new Schema();
 
         $adapter = $this->createCachePool();
-        $adapter->configureSchema($schema, $otherConnection);
+        $adapter->configureSchema($schema, $otherConnection, fn () => false);
         $this->assertFalse($schema->hasTable('cache_items'));
     }
 
@@ -100,7 +100,7 @@ public function testConfigureSchemaTableExists()
         $schema->createTable('cache_items');
 
         $adapter = new DoctrineDbalAdapter($connection);
-        $adapter->configureSchema($schema, $connection);
+        $adapter->configureSchema($schema, $connection, fn() => true);
         $table = $schema->getTable('cache_items');
         $this->assertEmpty($table->getColumns(), 'The table was not overwritten');
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
index 5795237bf207c..7e79c32d22248 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
@@ -422,7 +422,7 @@ public function testConfigureSchemaDifferentDbalConnection()
         $schema = new Schema();
 
         $connection = new Connection([], $driverConnection);
-        $connection->configureSchema($schema, $driverConnection2, fn() => true);
+        $connection->configureSchema($schema, $driverConnection2, fn() => false);
         $this->assertFalse($schema->hasTable('messenger_messages'));
     }
 

From 2ad8bb1020be39bd0007023b844b85a69931bf0e Mon Sep 17 00:00:00 2001
From: Jules Pietri <heahdude@yahoo.fr>
Date: Sat, 17 Dec 2022 12:53:41 +0100
Subject: [PATCH 064/475] [Console] Fix a test when pcntl is not available

---
 src/Symfony/Component/Console/Tests/ApplicationTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index d56492d84ee1c..7d24dec8b8478 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -2036,6 +2036,10 @@ public function testSignalableCommandHandlerCalledAfterEventListener()
 
     public function testSignalableCommandDoesNotInterruptedOnTermSignals()
     {
+        if (!\defined('SIGINT')) {
+            $this->markTestSkipped('SIGINT not available');
+        }
+
         $command = new TerminatableCommand(true, \SIGINT);
         $command->exitCode = 129;
 

From 58d0662720ce12e36b43bc72e10e58e691122e8b Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Sun, 21 Aug 2022 16:43:13 +0200
Subject: [PATCH 065/475] [HttpKernel] FileProfilerStorage remove expired
 profiles mechanism

---
 src/Symfony/Component/HttpKernel/CHANGELOG.md |  1 +
 .../Profiler/FileProfilerStorage.php          | 31 ++++++++++-
 .../Profiler/FileProfilerStorageTest.php      | 51 +++++++++++++++++++
 3 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 3122668e697cb..f409a6f13c06c 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Deprecate parameters `container.dumper.inline_factories` and `container.dumper.inline_class_loader`, use `.container.dumper.inline_factories` and `.container.dumper.inline_class_loader` instead
+ * `FileProfilerStorage` removes profiles automatically after two days
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
index d3c801de5b017..0870b6a241d1e 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
@@ -165,11 +165,15 @@ public function write(Profile $profile): bool
                 $profile->getIp(),
                 $profile->getMethod(),
                 $profile->getUrl(),
-                $profile->getTime(),
+                $profile->getTime() ?: time(),
                 $profile->getParentToken(),
                 $profile->getStatusCode(),
             ]);
             fclose($file);
+
+            if (1 === mt_rand(1, 10)) {
+                $this->removeExpiredProfiles();
+            }
         }
 
         return true;
@@ -289,4 +293,29 @@ private function doRead($token, Profile $profile = null): ?Profile
 
         return $this->createProfileFromData($token, $data, $profile);
     }
+
+    private function removeExpiredProfiles()
+    {
+        $minimalProfileTimestamp = time() - 2 * 86400;
+        $file = $this->getIndexFilename();
+        $handle = fopen($file, 'r');
+
+        if ($offset = is_file($file.'.offset') ? (int) file_get_contents($file.'.offset') : 0) {
+            fseek($handle, $offset);
+        }
+
+        while ($line = fgets($handle)) {
+            [$csvToken, , , , $csvTime] = str_getcsv($line);
+
+            if ($csvTime >= $minimalProfileTimestamp) {
+                break;
+            }
+
+            @unlink($this->getFilename($csvToken));
+            $offset += \strlen($line);
+        }
+        fclose($handle);
+
+        file_put_contents($file.'.offset', $offset);
+    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
index 4eedd907de327..004b4d61f1f3e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
@@ -344,6 +344,57 @@ public function testMultiRowIndexFile()
         $this->assertFalse(fgetcsv($handle));
     }
 
+    /**
+     * @dataProvider provideExpiredProfiles
+     */
+    public function testRemoveExpiredProfiles(string $index, string $expectedOffset)
+    {
+        $file = $this->tmpDir.'/index.csv';
+        file_put_contents($file, $index);
+
+        $r = new \ReflectionMethod($this->storage, 'removeExpiredProfiles');
+        $r->invoke($this->storage);
+
+        $this->assertSame($expectedOffset, file_get_contents($this->tmpDir.'/index.csv.offset'));
+    }
+
+    public static function provideExpiredProfiles()
+    {
+        $oneHourAgo = new \DateTimeImmutable('-1 hour');
+
+        yield 'One unexpired profile' => [
+            <<<CSV
+            token0,127.0.0.0,,http://foo.bar/0,{$oneHourAgo->getTimestamp()},,
+
+            CSV,
+            '0',
+        ];
+
+        $threeDaysAgo = new \DateTimeImmutable('-3 days');
+
+        yield 'One expired profile' => [
+            <<<CSV
+            token0,127.0.0.0,,http://foo.bar/0,{$threeDaysAgo->getTimestamp()},,
+
+            CSV,
+            '48',
+        ];
+
+        $fourDaysAgo = new \DateTimeImmutable('-4 days');
+        $threeDaysAgo = new \DateTimeImmutable('-3 days');
+        $oneHourAgo = new \DateTimeImmutable('-1 hour');
+
+        yield 'Multiple expired profiles' => [
+            <<<CSV
+            token0,127.0.0.0,,http://foo.bar/0,{$fourDaysAgo->getTimestamp()},,
+            token1,127.0.0.1,,http://foo.bar/1,{$threeDaysAgo->getTimestamp()},,
+            token2,127.0.0.2,,http://foo.bar/2,{$oneHourAgo->getTimestamp()},,
+
+            CSV,
+            '96',
+        ];
+    }
+
     public function testReadLineFromFile()
     {
         $r = new \ReflectionMethod($this->storage, 'readLineFromFile');

From 6479653e7e283e4b00b24073867086d492b254e2 Mon Sep 17 00:00:00 2001
From: Florent Morselli <florent@morselli.fr>
Date: Fri, 11 Nov 2022 18:56:59 +0100
Subject: [PATCH 066/475] [Security] Allow custom user identifier for X509
 authenticator

---
 .../Security/Factory/X509Factory.php          |  2 ++
 .../config/security_authenticator.php         |  1 +
 .../Http/Authenticator/X509Authenticator.php  | 10 ++++---
 .../Authenticator/X509AuthenticatorTest.php   | 29 +++++++++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php
index f59783defd11c..77840005c5fc9 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php
@@ -36,6 +36,7 @@ public function createAuthenticator(ContainerBuilder $container, string $firewal
             ->replaceArgument(2, $firewallName)
             ->replaceArgument(3, $config['user'])
             ->replaceArgument(4, $config['credentials'])
+            ->replaceArgument(6, $config['user_identifier'])
         ;
 
         return $authenticatorId;
@@ -58,6 +59,7 @@ public function addConfiguration(NodeDefinition $node)
                 ->scalarNode('provider')->end()
                 ->scalarNode('user')->defaultValue('SSL_CLIENT_S_DN_Email')->end()
                 ->scalarNode('credentials')->defaultValue('SSL_CLIENT_S_DN')->end()
+                ->scalarNode('user_identifier')->defaultValue('emailAddress')->end()
             ->end()
         ;
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator.php
index 58be697595d42..92c91e989779c 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator.php
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator.php
@@ -149,6 +149,7 @@
                 abstract_arg('user key'),
                 abstract_arg('credentials key'),
                 service('logger')->nullOnInvalid(),
+                abstract_arg('credentials user identifier'),
             ])
             ->tag('monolog.logger', ['channel' => 'security'])
 
diff --git a/src/Symfony/Component/Security/Http/Authenticator/X509Authenticator.php b/src/Symfony/Component/Security/Http/Authenticator/X509Authenticator.php
index 5620d3921b0d0..227d4701190be 100644
--- a/src/Symfony/Component/Security/Http/Authenticator/X509Authenticator.php
+++ b/src/Symfony/Component/Security/Http/Authenticator/X509Authenticator.php
@@ -30,13 +30,15 @@ class X509Authenticator extends AbstractPreAuthenticatedAuthenticator
 {
     private string $userKey;
     private string $credentialsKey;
+    private string $credentialUserIdentifier;
 
-    public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, string $userKey = 'SSL_CLIENT_S_DN_Email', string $credentialsKey = 'SSL_CLIENT_S_DN', LoggerInterface $logger = null)
+    public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, string $userKey = 'SSL_CLIENT_S_DN_Email', string $credentialsKey = 'SSL_CLIENT_S_DN', LoggerInterface $logger = null, string $credentialUserIdentifier = 'emailAddress')
     {
         parent::__construct($userProvider, $tokenStorage, $firewallName, $logger);
 
         $this->userKey = $userKey;
         $this->credentialsKey = $credentialsKey;
+        $this->credentialUserIdentifier = $credentialUserIdentifier;
     }
 
     protected function extractUsername(Request $request): string
@@ -46,13 +48,13 @@ protected function extractUsername(Request $request): string
             $username = $request->server->get($this->userKey);
         } elseif (
             $request->server->has($this->credentialsKey)
-            && preg_match('#emailAddress=([^,/@]++@[^,/]++)#', $request->server->get($this->credentialsKey), $matches)
+            && preg_match('#'.preg_quote($this->credentialUserIdentifier, '#').'=([^,/]++)#', $request->server->get($this->credentialsKey), $matches)
         ) {
-            $username = $matches[1];
+            $username = trim($matches[1]);
         }
 
         if (null === $username) {
-            throw new BadCredentialsException(sprintf('SSL credentials not found: %s, %s', $this->userKey, $this->credentialsKey));
+            throw new BadCredentialsException(sprintf('SSL credentials not found: "%s", "%s".', $this->userKey, $this->credentialsKey));
         }
 
         return $username;
diff --git a/src/Symfony/Component/Security/Http/Tests/Authenticator/X509AuthenticatorTest.php b/src/Symfony/Component/Security/Http/Tests/Authenticator/X509AuthenticatorTest.php
index 7ee6aaa973894..9b764d3750a63 100644
--- a/src/Symfony/Component/Security/Http/Tests/Authenticator/X509AuthenticatorTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Authenticator/X509AuthenticatorTest.php
@@ -120,6 +120,35 @@ public function testAuthenticationCustomCredentialsKey()
         $this->assertEquals('cert@example.com', $passport->getUser()->getUserIdentifier());
     }
 
+    /**
+     * @dataProvider provideServerVarsUserIdentifier
+     */
+    public function testAuthenticationCustomCredentialsUserIdentifier($username, $credentials)
+    {
+        $authenticator = new X509Authenticator($this->userProvider, new TokenStorage(), 'main', 'SSL_CLIENT_S_DN_Email', 'SSL_CLIENT_S_DN', null, 'CN');
+
+        $request = $this->createRequest([
+            'SSL_CLIENT_S_DN' => $credentials,
+        ]);
+        $this->assertTrue($authenticator->supports($request));
+
+        $this->userProvider->createUser(new InMemoryUser($username, null));
+
+        $passport = $authenticator->authenticate($request);
+        $this->assertEquals($username, $passport->getUser()->getUserIdentifier());
+    }
+
+    public static function provideServerVarsUserIdentifier()
+    {
+        yield ['Sample certificate DN', 'CN=Sample certificate DN/emailAddress=cert@example.com'];
+        yield ['Sample certificate DN', 'CN=Sample certificate DN/emailAddress=cert+something@example.com'];
+        yield ['Sample certificate DN', 'CN=Sample certificate DN,emailAddress=cert@example.com'];
+        yield ['Sample certificate DN', 'CN=Sample certificate DN,emailAddress=cert+something@example.com'];
+        yield ['Sample certificate DN', 'emailAddress=cert+something@example.com,CN=Sample certificate DN'];
+        yield ['Firstname.Lastname', 'emailAddress=firstname.lastname@mycompany.co.uk,CN=Firstname.Lastname,OU=london,OU=company design and engineering,OU=Issuer London,OU=Roaming,OU=Interactive,OU=Users,OU=Standard,OU=Business,DC=england,DC=core,DC=company,DC=co,DC=uk'];
+        yield ['user1', 'C=FR, O=My Organization, CN=user1, emailAddress=user1@myorg.fr'];
+    }
+
     private function createRequest(array $server)
     {
         return new Request([], [], [], [], [], $server);

From ce458c6b59f68d8aaab0fdb65386a6e8152c7fac Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Sat, 29 Oct 2022 17:57:17 +0200
Subject: [PATCH 067/475] [SecurityBundle] Set request stateless when firewall
 is stateless

---
 src/Symfony/Bundle/SecurityBundle/CHANGELOG.md           | 1 +
 .../Bundle/SecurityBundle/Security/FirewallMap.php       | 9 ++++++++-
 .../SecurityBundle/Tests/Security/FirewallMapTest.php    | 6 ++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index a1ffdb0349c3a..9deb248e1365f 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Deprecate enabling bundle and not configuring it
+ * Add `_stateless` attribute to the request when firewall is stateless
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
index 21e5b8aa68279..d0151d10f9a28 100644
--- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
+++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -72,7 +72,14 @@ private function getFirewallContext(Request $request): ?FirewallContext
             if (null === $requestMatcher || $requestMatcher->matches($request)) {
                 $request->attributes->set('_firewall_context', $contextId);
 
-                return $this->container->get($contextId);
+                /** @var FirewallContext $context */
+                $context = $this->container->get($contextId);
+
+                if ($context->getConfig()?->isStateless()) {
+                    $request->attributes->set('_stateless', true);
+                }
+
+                return $context;
             }
         }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
index d174e13b5cff8..4acad02e65225 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
@@ -54,6 +54,7 @@ public function testGetListenersWithInvalidParameter()
         $this->assertEquals([[], null, null], $firewallMap->getListeners($request));
         $this->assertNull($firewallMap->getFirewallConfig($request));
         $this->assertFalse($request->attributes->has(self::ATTRIBUTE_FIREWALL_CONTEXT));
+        $this->assertFalse($request->attributes->has('_stateless'));
     }
 
     public function testGetListeners()
@@ -62,8 +63,8 @@ public function testGetListeners()
 
         $firewallContext = $this->createMock(FirewallContext::class);
 
-        $firewallConfig = new FirewallConfig('main', 'user_checker');
-        $firewallContext->expects($this->once())->method('getConfig')->willReturn($firewallConfig);
+        $firewallConfig = new FirewallConfig('main', 'user_checker', null, true, true);
+        $firewallContext->expects($this->exactly(2))->method('getConfig')->willReturn($firewallConfig);
 
         $listener = function () {};
         $firewallContext->expects($this->once())->method('getListeners')->willReturn([$listener]);
@@ -88,5 +89,6 @@ public function testGetListeners()
         $this->assertEquals([[$listener], $exceptionListener, $logoutListener], $firewallMap->getListeners($request));
         $this->assertEquals($firewallConfig, $firewallMap->getFirewallConfig($request));
         $this->assertEquals('security.firewall.map.context.foo', $request->attributes->get(self::ATTRIBUTE_FIREWALL_CONTEXT));
+        $this->assertTrue($request->attributes->get('_stateless'));
     }
 }

From 5464c5732ce090bacd33a106ed457ddbca47fc5a Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Sat, 10 Dec 2022 17:47:26 +0100
Subject: [PATCH 068/475] [SecurityBundle] Improve support for authenticators
 that don't need a user provider

Ref https://github.com/symfony/symfony/pull/48285
---
 .../Bundle/SecurityBundle/CHANGELOG.md        |  1 +
 .../Security/Factory/AccessTokenFactory.php   |  6 ++--
 ...StatelessAuthenticatorFactoryInterface.php | 28 +++++++++++++++++++
 .../DependencyInjection/SecurityExtension.php | 28 ++++++++++++++-----
 .../Tests/Functional/AccessTokenTest.php      | 12 ++++++++
 .../Security/Handler/AccessTokenHandler.php   |  6 ++--
 .../config_self_contained_token.yml           | 26 +++++++++++++++++
 7 files changed, 93 insertions(+), 14 deletions(-)
 create mode 100644 src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/StatelessAuthenticatorFactoryInterface.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AccessToken/config_self_contained_token.yml

diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index 9deb248e1365f..ecf3804fa5253 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Deprecate enabling bundle and not configuring it
  * Add `_stateless` attribute to the request when firewall is stateless
+ * Add `StatelessAuthenticatorFactoryInterface` for authenticators targeting `stateless` firewalls only and that don't require a user provider
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
index 2fbf3b2f8b567..a3ed0e3ee0839 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
@@ -23,7 +23,7 @@
  *
  * @internal
  */
-final class AccessTokenFactory extends AbstractFactory
+final class AccessTokenFactory extends AbstractFactory implements StatelessAuthenticatorFactoryInterface
 {
     private const PRIORITY = -40;
 
@@ -67,7 +67,7 @@ public function getKey(): string
         return 'access_token';
     }
 
-    public function createAuthenticator(ContainerBuilder $container, string $firewallName, array $config, string $userProviderId): string
+    public function createAuthenticator(ContainerBuilder $container, string $firewallName, array $config, ?string $userProviderId): string
     {
         $successHandler = isset($config['success_handler']) ? new Reference($this->createAuthenticationSuccessHandler($container, $firewallName, $config)) : null;
         $failureHandler = isset($config['failure_handler']) ? new Reference($this->createAuthenticationFailureHandler($container, $firewallName, $config)) : null;
@@ -78,7 +78,7 @@ public function createAuthenticator(ContainerBuilder $container, string $firewal
             ->setDefinition($authenticatorId, new ChildDefinition('security.authenticator.access_token'))
             ->replaceArgument(0, new Reference($config['token_handler']))
             ->replaceArgument(1, new Reference($extractorId))
-            ->replaceArgument(2, new Reference($userProviderId))
+            ->replaceArgument(2, $userProviderId ? new Reference($userProviderId) : null)
             ->replaceArgument(3, $successHandler)
             ->replaceArgument(4, $failureHandler)
             ->replaceArgument(5, $config['realm'])
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/StatelessAuthenticatorFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/StatelessAuthenticatorFactoryInterface.php
new file mode 100644
index 0000000000000..4d536019b36e7
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/StatelessAuthenticatorFactoryInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Stateless authenticators are authenticators that can work without a user provider.
+ *
+ * This situation can only occur in stateless firewalls, as statefull firewalls
+ * need the user provider to refresh the user in each subsequent request. A
+ * stateless authenticator can be used on both stateless and statefull authenticators.
+ *
+ * @author Wouter de Jong <wouter@wouterj.nl>
+ */
+interface StatelessAuthenticatorFactoryInterface extends AuthenticatorFactoryInterface
+{
+    public function createAuthenticator(ContainerBuilder $container, string $firewallName, array $config, ?string $userProviderId): string|array;
+}
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 6b91a65d14ae7..9aa0293651b37 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -14,6 +14,7 @@
 use Symfony\Bridge\Twig\Extension\LogoutUrlExtension;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AuthenticatorFactoryInterface;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\FirewallListenerFactoryInterface;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\StatelessAuthenticatorFactoryInterface;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -615,6 +616,10 @@ private function createAuthenticationListeners(ContainerBuilder $container, stri
                     throw new InvalidConfigurationException(sprintf('Authenticator factory "%s" ("%s") must implement "%s".', get_debug_type($factory), $key, AuthenticatorFactoryInterface::class));
                 }
 
+                if (null === $userProvider && !$factory instanceof StatelessAuthenticatorFactoryInterface) {
+                    $userProvider = $this->createMissingUserProvider($container, $id, $key);
+                }
+
                 $authenticators = $factory->createAuthenticator($container, $id, $firewall[$key], $userProvider);
                 if (\is_array($authenticators)) {
                     foreach ($authenticators as $authenticator) {
@@ -641,7 +646,7 @@ private function createAuthenticationListeners(ContainerBuilder $container, stri
         return [$listeners, $defaultEntryPoint];
     }
 
-    private function getUserProvider(ContainerBuilder $container, string $id, array $firewall, string $factoryKey, ?string $defaultProvider, array $providerIds, ?string $contextListenerId): string
+    private function getUserProvider(ContainerBuilder $container, string $id, array $firewall, string $factoryKey, ?string $defaultProvider, array $providerIds, ?string $contextListenerId): ?string
     {
         if (isset($firewall[$factoryKey]['provider'])) {
             if (!isset($providerIds[$normalizedName = str_replace('-', '_', $firewall[$factoryKey]['provider'])])) {
@@ -660,13 +665,11 @@ private function getUserProvider(ContainerBuilder $container, string $id, array
         }
 
         if (!$providerIds) {
-            $userProvider = sprintf('security.user.provider.missing.%s', $factoryKey);
-            $container->setDefinition(
-                $userProvider,
-                (new ChildDefinition('security.user.provider.missing'))->replaceArgument(0, $id)
-            );
+            if ($firewall['stateless'] ?? false) {
+                return null;
+            }
 
-            return $userProvider;
+            return $this->createMissingUserProvider($container, $id, $factoryKey);
         }
 
         if ('remember_me' === $factoryKey || 'anonymous' === $factoryKey || 'custom_authenticators' === $factoryKey) {
@@ -680,6 +683,17 @@ private function getUserProvider(ContainerBuilder $container, string $id, array
         throw new InvalidConfigurationException(sprintf('Not configuring explicitly the provider for the "%s" authenticator on "%s" firewall is ambiguous as there is more than one registered provider.', $factoryKey, $id));
     }
 
+    private function createMissingUserProvider(ContainerBuilder $container, string $id, string $factoryKey): string
+    {
+        $userProvider = sprintf('security.user.provider.missing.%s', $factoryKey);
+        $container->setDefinition(
+            $userProvider,
+            (new ChildDefinition('security.user.provider.missing'))->replaceArgument(0, $id)
+        );
+
+        return $userProvider;
+    }
+
     private function createHashers(array $hashers, ContainerBuilder $container)
     {
         $hasherMap = [];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AccessTokenTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AccessTokenTest.php
index 01b205737dd59..d07b5ed3e8eb7 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AccessTokenTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AccessTokenTest.php
@@ -315,4 +315,16 @@ public function customQueryAccessTokenFailure(): iterable
     {
         yield ['/foo?protection_token=INVALID_ACCESS_TOKEN'];
     }
+
+    public function testSelfContainedTokens()
+    {
+        $client = $this->createClient(['test_case' => 'AccessToken', 'root_config' => 'config_self_contained_token.yml']);
+        $client->catchExceptions(false);
+        $client->request('GET', '/foo', [], [], ['HTTP_AUTHORIZATION' => 'Bearer SELF_CONTAINED_ACCESS_TOKEN']);
+        $response = $client->getResponse();
+
+        $this->assertInstanceOf(Response::class, $response);
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame(['message' => 'Welcome @dunglas!'], json_decode($response->getContent(), true));
+    }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AccessTokenBundle/Security/Handler/AccessTokenHandler.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AccessTokenBundle/Security/Handler/AccessTokenHandler.php
index 4f94cc6936a05..8e6c7b6dd44d0 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AccessTokenBundle/Security/Handler/AccessTokenHandler.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AccessTokenBundle/Security/Handler/AccessTokenHandler.php
@@ -12,19 +12,17 @@
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AccessTokenBundle\Security\Handler;
 
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
+use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Http\AccessToken\AccessTokenHandlerInterface;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
 
 class AccessTokenHandler implements AccessTokenHandlerInterface
 {
-    public function __construct()
-    {
-    }
-
     public function getUserBadgeFrom(string $accessToken): UserBadge
     {
         return match ($accessToken) {
             'VALID_ACCESS_TOKEN' => new UserBadge('dunglas'),
+            'SELF_CONTAINED_ACCESS_TOKEN' => new UserBadge('dunglas', fn () => new InMemoryUser('dunglas', null, ['ROLE_USER'])),
             default => throw new BadCredentialsException('Invalid credentials.'),
         };
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AccessToken/config_self_contained_token.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AccessToken/config_self_contained_token.yml
new file mode 100644
index 0000000000000..8143698fdec1a
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AccessToken/config_self_contained_token.yml
@@ -0,0 +1,26 @@
+imports:
+    - { resource: ./../config/framework.yml }
+
+framework:
+    http_method_override: false
+    serializer: ~
+
+security:
+    password_hashers:
+        Symfony\Component\Security\Core\User\InMemoryUser: plaintext
+
+    firewalls:
+        main:
+            pattern: ^/
+            stateless: true
+            access_token:
+                token_handler: access_token.access_token_handler
+                token_extractors: 'header'
+                realm: 'My API'
+
+    access_control:
+        - { path: ^/foo, roles: ROLE_USER }
+
+services:
+    access_token.access_token_handler:
+        class: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AccessTokenBundle\Security\Handler\AccessTokenHandler

From b20fce5001d620aa90ed1e2696a8401c734eb357 Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Sat, 3 Dec 2022 18:55:48 +0100
Subject: [PATCH 069/475] [FrameworkBundle] Improve UX ConfigDebugCommand has
 not yaml component

---
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  1 +
 .../Command/ConfigDebugCommand.php            | 42 +++++++++++++++++--
 .../Functional/ConfigDebugCommandTest.php     | 16 +++++++
 3 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 1ecd16712ab2f..ff147727d45a3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Add `DomCrawlerAssertionsTrait::assertSelectorCount(int $count, string $selector)`
  * Allow to avoid `limit` definition in a RateLimiter configuration when using the `no_limit` policy
+ * Add `--format` option to the `debug:config` command
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
index c5078d1b5b401..b80bf4d0b0319 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Completion\CompletionInput;
 use Symfony\Component\Console\Completion\CompletionSuggestions;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -40,13 +41,17 @@ class ConfigDebugCommand extends AbstractConfigCommand
 {
     protected function configure()
     {
+        $commentedHelpFormats = array_map(static fn (string $format): string => sprintf('<comment>%s</comment>', $format), $this->getAvailableFormatOptions());
+        $helpFormats = implode('", "', $commentedHelpFormats);
+
         $this
             ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'The bundle name or the extension alias'),
                 new InputArgument('path', InputArgument::OPTIONAL, 'The configuration option path'),
                 new InputOption('resolve-env', null, InputOption::VALUE_NONE, 'Display resolved environment variable values instead of placeholders'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), class_exists(Yaml::class) ? 'yaml' : 'json'),
             ])
-            ->setHelp(<<<'EOF'
+            ->setHelp(<<<EOF
 The <info>%command.name%</info> command dumps the current configuration for an
 extension/bundle.
 
@@ -55,6 +60,11 @@ protected function configure()
   <info>php %command.full_name% framework</info>
   <info>php %command.full_name% FrameworkBundle</info>
 
+The <info>--format</info> option specifies the format of the configuration,
+this is either "{$helpFormats}".
+
+  <info>php %command.full_name% framework --format=json</info>
+
 For dumping a specific option, add its path as second argument:
 
   <info>php %command.full_name% framework serializer.enabled</info>
@@ -92,12 +102,20 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $config = $this->getConfig($extension, $container, $input->getOption('resolve-env'));
 
+        $format = $input->getOption('format');
+
+        if ('yaml' === $format && !class_exists(Yaml::class)) {
+            $errorIo->error('Setting the "format" option to "yaml" requires the Symfony Yaml component. Try running "composer install symfony/yaml" or use "--format=json" instead.');
+
+            return 1;
+        }
+
         if (null === $path = $input->getArgument('path')) {
             $io->title(
                 sprintf('Current configuration for %s', $name === $extensionAlias ? sprintf('extension with alias "%s"', $extensionAlias) : sprintf('"%s"', $name))
             );
 
-            $io->writeln(Yaml::dump([$extensionAlias => $config], 10));
+            $io->writeln($this->convertToFormat([$extensionAlias => $config], $format));
 
             return 0;
         }
@@ -112,11 +130,20 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $io->title(sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));
 
-        $io->writeln(Yaml::dump($config, 10));
+        $io->writeln($this->convertToFormat($config, $format));
 
         return 0;
     }
 
+    private function convertToFormat(mixed $config, string $format): string
+    {
+        return match ($format) {
+            'yaml' => Yaml::dump($config, 10),
+            'json' => json_encode($config, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE),
+            default => throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
+        };
+    }
+
     private function compileContainer(): ContainerBuilder
     {
         $kernel = clone $this->getApplication()->getKernel();
@@ -194,6 +221,10 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
             } catch (LogicException) {
             }
         }
+
+        if ($input->mustSuggestOptionValuesFor('format')) {
+            $suggestions->suggestValues($this->getAvailableFormatOptions());
+        }
     }
 
     private function getAvailableBundles(bool $alias): array
@@ -228,4 +259,9 @@ private static function buildPathsCompletion(array $paths, string $prefix = ''):
 
         return $completionPaths;
     }
+
+    private function getAvailableFormatOptions(): array
+    {
+        return ['yaml', 'json'];
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
index 09b99f82f7c64..ce4764be765ec 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
@@ -13,6 +13,7 @@
 
 use Symfony\Bundle\FrameworkBundle\Command\ConfigDebugCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
@@ -50,6 +51,19 @@ public function testDumpBundleOption()
         $this->assertStringContainsString('foo', $tester->getDisplay());
     }
 
+    public function testDumpWithUnsupportedFormat()
+    {
+        $tester = $this->createCommandTester();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Supported formats are "yaml", "json"');
+
+        $tester->execute([
+            'name' => 'test',
+            '--format' => 'xml',
+        ]);
+    }
+
     public function testParametersValuesAreResolved()
     {
         $tester = $this->createCommandTester();
@@ -157,6 +171,8 @@ public function provideCompletionSuggestions(): \Generator
         yield 'name (started CamelCase)' => [['Fra'], ['DefaultConfigTestBundle', 'ExtensionWithoutConfigTestBundle', 'FrameworkBundle', 'TestBundle']];
 
         yield 'name with existing path' => [['framework', ''], ['secret', 'router.resource', 'router.utf8', 'router.enabled', 'validation.enabled', 'default_locale']];
+
+        yield 'option --format' => [['--format', ''], ['yaml', 'json']];
     }
 
     private function createCommandTester(): CommandTester

From ef6a18297b2eb3b8cf0b7c2bed49b00f282ffb24 Mon Sep 17 00:00:00 2001
From: Monet Emilien <emilien.monet@etudiant.univ-reims.fr>
Date: Sat, 17 Dec 2022 13:06:52 +0100
Subject: [PATCH 070/475] [WebProfilerBundle] Add a title and img role to svg
 of the web debug toolbar

---
 src/Symfony/Bundle/SecurityBundle/CHANGELOG.md              | 1 +
 .../SecurityBundle/Resources/views/Collector/icon.svg       | 3 ++-
 src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md           | 6 ++++++
 .../Bundle/WebProfilerBundle/Resources/views/Icon/cache.svg | 3 ++-
 .../WebProfilerBundle/Resources/views/Icon/config.svg       | 3 ++-
 .../WebProfilerBundle/Resources/views/Icon/exception.svg    | 3 ++-
 .../Bundle/WebProfilerBundle/Resources/views/Icon/form.svg  | 3 ++-
 .../WebProfilerBundle/Resources/views/Icon/logger.svg       | 3 ++-
 .../WebProfilerBundle/Resources/views/Icon/memory.svg       | 3 ++-
 .../Bundle/WebProfilerBundle/Resources/views/Icon/menu.svg  | 3 ++-
 .../WebProfilerBundle/Resources/views/Icon/redirect.svg     | 3 ++-
 .../Bundle/WebProfilerBundle/Resources/views/Icon/time.svg  | 3 ++-
 .../Bundle/WebProfilerBundle/Resources/views/Icon/twig.svg  | 3 ++-
 13 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index ecf3804fa5253..5f0b7d42d7fb1 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * Deprecate enabling bundle and not configuring it
  * Add `_stateless` attribute to the request when firewall is stateless
  * Add `StatelessAuthenticatorFactoryInterface` for authenticators targeting `stateless` firewalls only and that don't require a user provider
+ * Modify "icon.svg" to improve accessibility for blind/low vision users
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/icon.svg b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/icon.svg
index b11d1a4637476..10cc2434c2f87 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/icon.svg
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/icon.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-user" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-user" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"  role="img">
+    <title>Security</title>
     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
     <circle cx="12" cy="7" r="4"></circle>
     <path d="M6 21v-2a4 4 0 0 1 4 -4h4a4 4 0 0 1 4 4v2"></path>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
index 7b4a3d7362852..c78fffefd8a15 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add a "role=img" and an explicit title in the .svg file used by the web debug toolbar
+   to improve accessibility with screen readers for blind users
+
 6.1
 ---
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/cache.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/cache.svg
index f357a626a0281..be85557836b5e 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/cache.svg
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/cache.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-stack-2" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-stack-2" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Cache</title>
     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
     <polyline points="12 4 4 8 12 12 20 8 12 4"></polyline>
     <polyline points="4 12 12 16 20 12"></polyline>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/config.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/config.svg
index e28a1c6aa8c15..8f76cf1791bf4 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/config.svg
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/config.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-adjustments" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-adjustments" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Config</title>
     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
     <circle cx="6" cy="10" r="2"></circle>
     <line x1="6" y1="4" x2="6" y2="8"></line>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/exception.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/exception.svg
index a7a79696dfc63..571aed9c56385 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/exception.svg
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/exception.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-ghost" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-ghost" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Exception</title>
     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
     <path d="M5 11a7 7 0 0 1 14 0v7a1.78 1.78 0 0 1 -3.1 1.4a1.65 1.65 0 0 0 -2.6 0a1.65 1.65 0 0 1 -2.6 0a1.65 1.65 0 0 0 -2.6 0a1.78 1.78 0 0 1 -3.1 -1.4v-7"></path>
     <line x1="10" y1="10" x2="10.01" y2="10"></line>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/form.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/form.svg
index 5a5ce
10000
e29486e0..55dd62b6fb5a0 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/form.svg
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/form.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-forms" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-forms" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Cache</title>
     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
     <path d="M12 3a3 3 0 0 0 -3 3v12a3 3 0 0 0 3 3"></path>
     <path d="M6 3a3 3 0 0 1 3 3v12a3 3 0 0 1 -3 3"></path>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/logger.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/logger.svg
index ee72a2c5f329d..39a3adffd53b6 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/logger.svg
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/logger.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-file-alert" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-file-alert" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Logger</title>
     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
     <path d="M14 3v4a1 1 0 0 0 1 1h4"></path>
     <path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z"></path>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/memory.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/memory.svg
index e489e1122a819..8e05e6ef6866e 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/memory.svg
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/memory.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-cpu" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-cpu" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Memory</title>
     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
     <rect x="5" y="5" width="14" height="14" rx="1"></rect>
     <path d="M9 9h6v6h-6z"></path>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/menu.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/menu.svg
index 838deca87a298..4805aed725ba8 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/menu.svg
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/menu.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-menu-2" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-menu-2" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Menu</title>
     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
     <line x1="4" y1="6" x2="20" y2="6"></line>
     <line x1="4" y1="12" x2="20" y2="12"></line>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/redirect.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/redirect.svg
index ebf9b6479b32d..a23a9710ffd0a 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/redirect.svg
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/redirect.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-corner-down-right" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-corner-down-right" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Redirect</title>
     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
     <path d="M6 6v6a3 3 0 0 0 3 3h10l-4 -4m0 8l4 -4"></path>
 </svg>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/time.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/time.svg
index 64bdeac785005..3c8c65fbe0acb 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/time.svg
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/time.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-chart-infographic" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-chart-infographic" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Time</title>
     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
     <circle cx="7" cy="7" r="4"></circle>
     <path d="M7 3v4h4"></path>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/twig.svg b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/twig.svg
index 1211c61066b18..027cb2f11f88e 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/twig.svg
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Icon/twig.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-seeding" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+<svg xmlns="http://www.w3.org/2000/svg" data-icon-name="icon-tabler-seeding" width="24" height="24" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round" role="img">
+    <title>Twig</title>
     <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
     <path d="M12 10a6 6 0 0 0 -6 -6h-3v2a6 6 0 0 0 6 6h3"></path>
     <path d="M12 14a6 6 0 0 1 6 -6h3v1a6 6 0 0 1 -6 6h-3"></path>

From 35890e1ca999cb92d7b20c81bc07cdc2f17b7bb4 Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Sun, 6 Nov 2022 22:16:38 +0100
Subject: [PATCH 071/475] [Yaml] Add flag to dump numeric key as string

---
 src/Symfony/Component/Yaml/CHANGELOG.md       |  5 +
 src/Symfony/Component/Yaml/Dumper.php         |  4 +
 src/Symfony/Component/Yaml/Inline.php         |  4 +
 .../Component/Yaml/Tests/DumperTest.php       | 90 ++++++++++++++++++
 .../Component/Yaml/Tests/InlineTest.php       | 92 +++++++++++++++++++
 src/Symfony/Component/Yaml/Yaml.php           |  1 +
 6 files changed, 196 insertions(+)

diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
index aeb416958928f..2a5c119df0266 100644
--- a/src/Symfony/Component/Yaml/CHANGELOG.md
+++ b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add support to dump int keys as strings by using the `Yaml::DUMP_NUMERIC_KEY_AS_STRING` flag.
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php
index c5024ff4e32bf..6259b16f9f251 100644
--- a/src/Symfony/Component/Yaml/Dumper.php
+++ b/src/Symfony/Component/Yaml/Dumper.php
@@ -64,6 +64,10 @@ public function dump(mixed $input, int $inline = 0, int $indent = 0, int $flags
                     $output .= "\n";
                 }
 
+                if (\is_int($key) && Yaml::DUMP_NUMERIC_KEY_AS_STRING & $flags) {
+                    $key = (string) $key;
+                }
+
                 if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value) && str_contains($value, "\n") && !str_contains($value, "\r")) {
                     // If the first line starts with a space character, the spec requires a blockIndicationIndicator
                     // http://www.yaml.org/spec/1.2/spec.html#id2793979
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index b9e1add2c9450..e326fdab67ec5 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -239,6 +239,10 @@ private static function dumpHashArray(array|\ArrayObject|\stdClass $value, int $
     {
         $output = [];
         foreach ($value as $key => $val) {
+            if (\is_int($key) && Yaml::DUMP_NUMERIC_KEY_AS_STRING & $flags) {
+                $key = (string) $key;
+            }
+
             $output[] = sprintf('%s: %s', self::dump($key, $flags), self::dump($val, $flags));
         }
 
diff --git a/src/Symfony/Component/Yaml/Tests/DumperTest.php b/src/Symfony/Component/Yaml/Tests/DumperTest.php
index d6516d7dd9ec3..96d7bccf09cdb 100644
--- a/src/Symfony/Component/Yaml/Tests/DumperTest.php
+++ b/src/Symfony/Component/Yaml/Tests/DumperTest.php
@@ -804,6 +804,96 @@ public function testDumpNullAsTilde()
         $this->assertSame('{ foo: ~ }', $this->dumper->dump(['foo' => null], 0, 0, Yaml::DUMP_NULL_AS_TILDE));
     }
 
+    /**
+     * @dataProvider getNumericKeyData
+     */
+    public function testDumpInlineNumericKeyAsString(array $input, bool $inline, int $flags, string $expected)
+    {
+        $this->assertSame($expected, $this->dumper->dump($input, $inline ? 0 : 4, 0, $flags));
+    }
+
+    public function getNumericKeyData()
+    {
+        yield 'Int key with flag inline' => [
+            [200 => 'foo'],
+            true,
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            "{ '200': foo }",
+        ];
+
+        yield 'Int key without flag inline' => [
+            [200 => 'foo'],
+            true,
+            0,
+            '{ 200: foo }',
+        ];
+
+        $expected = <<<'YAML'
+        '200': foo
+
+        YAML;
+
+        yield 'Int key with flag' => [
+            [200 => 'foo'],
+            false,
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            $expected,
+        ];
+
+        $expected = <<<'YAML'
+        200: foo
+
+        YAML;
+
+        yield 'Int key without flag' => [
+            [200 => 'foo'],
+            false,
+            0,
+            $expected,
+        ];
+
+        $expected = <<<'YAML'
+        - 200
+        - foo
+
+        YAML;
+
+        yield 'List array with flag' => [
+            [200, 'foo'],
+            false,
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            $expected,
+        ];
+
+        $expected = <<<'YAML'
+        '200': !number 5
+
+        YAML;
+
+        yield 'Int tagged value with flag' => [
+            [
+                200 => new TaggedValue('number', 5),
+            ],
+            false,
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            $expected,
+        ];
+
+        $expected = <<<'YAML'
+        200: !number 5
+
+        YAML;
+
+        yield 'Int tagged value without flag' => [
+            [
+                200 => new TaggedValue('number', 5),
+            ],
+            false,
+            0,
+            $expected,
+        ];
+    }
+
     public function testDumpIdeographicSpaces()
     {
         $expected = <<<YAML
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
index 347c6f06b1669..ee4a9c9b35ec0 100644
--- a/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -617,6 +617,98 @@ public function testDumpDateTime($dateTime, $expected)
         $this->assertSame($expected, Inline::dump($dateTime));
     }
 
+    /**
+     * @dataProvider getNumericKeyData
+     */
+    public function testDumpNumericKeyAsString(array|int $input, int $flags, string $expected)
+    {
+        $this->assertSame($expected, Inline::dump($input, $flags));
+    }
+
+    public function getNumericKeyData()
+    {
+        yield 'Int with flag' => [
+            200,
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            '200',
+        ];
+
+        yield 'Int key with flag' => [
+            [200 => 'foo'],
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            "{ '200': foo }",
+        ];
+
+        yield 'Int value with flag' => [
+            [200 => 200],
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            "{ '200': 200 }",
+        ];
+
+        yield 'String key with flag' => [
+            ['200' => 'foo'],
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            "{ '200': foo }",
+        ];
+
+        yield 'Mixed with flag' => [
+            [42 => 'a', 'b' => 'c', 'd' => 43],
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            "{ '42': a, b: c, d: 43 }",
+        ];
+
+        yield 'Auto-index with flag' => [
+            ['a', 'b', 42],
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            '[a, b, 42]',
+        ];
+
+        yield 'Complex mixed array with flag' => [
+            [
+                42 => [
+                    'foo' => 43,
+                    44 => 'bar',
+                ],
+                45 => 'baz',
+                46,
+            ],
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            "{ '42': { foo: 43, '44': bar }, '45': baz, '46': 46 }",
+        ];
+
+        yield 'Int tagged value with flag' => [
+            [
+                'count' => new TaggedValue('number', 5),
+            ],
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            '{ count: !number 5 }',
+        ];
+
+        yield 'Array tagged value with flag' => [
+            [
+                'user' => new TaggedValue('metadata', [
+                    'john',
+                    42,
+                ]),
+            ],
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING,
+            '{ user: !metadata [john, 42] }',
+        ];
+
+        $arrayObject = new \ArrayObject();
+        $arrayObject['foo'] = 'bar';
+        $arrayObject[42] = 'baz';
+        $arrayObject['baz'] = 43;
+
+        yield 'Object value with flag' => [
+            [
+                'user' => $arrayObject,
+            ],
+            Yaml::DUMP_NUMERIC_KEY_AS_STRING | Yaml::DUMP_OBJECT_AS_MAP,
+            "{ user: { foo: bar, '42': baz, baz: 43 } }",
+        ];
+    }
+
     public function testDumpUnitEnum()
     {
         $this->assertSame("!php/const Symfony\Component\Yaml\Tests\Fixtures\FooUnitEnum::BAR", Inline::dump(FooUnitEnum::BAR));
diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php
index 49784216e96e9..e2d2af731083d 100644
--- a/src/Symfony/Component/Yaml/Yaml.php
+++ b/src/Symfony/Component/Yaml/Yaml.php
@@ -34,6 +34,7 @@ class Yaml
     public const PARSE_CUSTOM_TAGS = 512;
     public const DUMP_EMPTY_ARRAY_AS_SEQUENCE = 1024;
     public const DUMP_NULL_AS_TILDE = 2048;
+    public const DUMP_NUMERIC_KEY_AS_STRING = 4096;
 
     /**
      * Parses a YAML file into a PHP value.

From 55c7ce44a8d72c3ce56d4f20f100585986c46153 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 20 Dec 2022 09:36:11 +0100
Subject: [PATCH 072/475] [DependencyInjection] Add support for nesting
 autowiring-related attributes into `#[Autowire(...)]`

---
 .../DependencyInjection/CHANGELOG.md          |  1 +
 .../Compiler/AutowirePass.php                 | 34 +++++++++++++------
 .../Tests/Compiler/AutowirePassTest.php       | 23 +++++++++++++
 .../includes/autowiring_classes_80.php        | 16 +++++++++
 4 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 0282cd57f2823..6f0f9c1056b83 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * Add options `inline_factories` and `inline_class_loader` to `PhpDumper::dump()`
  * Deprecate `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`
  * Add `RemoveBuildParametersPass`, which removes parameters starting with a dot during compilation
+ * Add support for nesting autowiring-related attributes into `#[Autowire(...)]`
 
 6.2
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index cf0bd9ae244a0..09b0490adf4c8 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -83,6 +83,24 @@ public function process(ContainerBuilder $container)
 
     protected function processValue(mixed $value, bool $isRoot = false): mixed
     {
+        if ($value instanceof Autowire) {
+            return $this->processValue($this->container->getParameterBag()->resolveValue($value->value));
+        }
+
+        if ($value instanceof TaggedIterator) {
+            return new TaggedIteratorArgument($value->tag, $value->indexAttribute, $value->defaultIndexMethod, false, $value->defaultPriorityMethod, (array) $value->exclude);
+        }
+
+        if ($value instanceof TaggedLocator) {
+            return new ServiceLocatorArgument(new TaggedIteratorArgument($value->tag, $value->indexAttribute, $value->defaultIndexMethod, true, $value->defaultPriorityMethod, (array) $value->exclude));
+        }
+
+        if ($value instanceof MapDecorated) {
+            $definition = $this->container->getDefinition($this->currentId);
+
+            return new Reference($definition->innerServiceId ?? $this->currentId.'.inner', $definition->decorationOnInvalid ?? ContainerInterface::NULL_ON_INVALID_REFERENCE);
+        }
+
         try {
             return $this->doProcessValue($value, $isRoot);
         } catch (AutowiringFailedException $e) {
@@ -170,20 +188,14 @@ private function processAttribute(object $attribute, bool $isOptional = false):
     {
         switch (true) {
             case $attribute instanceof Autowire:
-                $value = $this->container->getParameterBag()->resolveValue($attribute->value);
-
-                return $value instanceof Reference && $isOptional ? new Reference($value, ContainerInterface::NULL_ON_INVALID_REFERENCE) : $value;
-
+                if ($isOptional && $attribute->value instanceof Reference) {
+                    return new Reference($attribute->value, ContainerInterface::NULL_ON_INVALID_REFERENCE);
+                }
+                // no break
             case $attribute instanceof TaggedIterator:
-                return new TaggedIteratorArgument($attribute->tag, $attribute->indexAttribute, $attribute->defaultIndexMethod, false, $attribute->defaultPriorityMethod, (array) $attribute->exclude);
-
             case $attribute instanceof TaggedLocator:
-                return new ServiceLocatorArgument(new TaggedIteratorArgument($attribute->tag, $attribute->indexAttribute, $attribute->defaultIndexMethod, true, $attribute->defaultPriorityMethod, (array) $attribute->exclude));
-
             case $attribute instanceof MapDecorated:
-                $definition = $this->container->getDefinition($this->currentId);
-
-                return new Reference($definition->innerServiceId ?? $this->currentId.'.inner', $definition->decorationOnInvalid ?? ContainerInterface::NULL_ON_INVALID_REFERENCE);
+                return $this->processValue($attribute);
         }
 
         throw new AutowiringFailedException($this->currentId, sprintf('"%s" is an unsupported attribute.', $attribute::class));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index 958c01ebec4ff..c766bed6aefa4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -15,6 +15,8 @@
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\Compiler\AutowireAsDecoratorPass;
 use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
 use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
@@ -1254,4 +1256,25 @@ public function testTypeNamespaceExcluded()
             $this->assertSame('Cannot autowire service "a": argument "$k" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotGuessableArgument::__construct()" needs an instance of "Symfony\Component\DependencyInjection\Tests\Compiler\Foo" but this type has been excluded from autowiring.', (string) $e->getMessage());
         }
     }
+
+    public function testNestedAttributes()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(AsDecoratorFoo::class);
+        $container->register(AutowireNestedAttributes::class)->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireAsDecoratorPass())->process($container);
+        (new DecoratorServicePass())->process($container);
+        (new AutowirePass())->process($container);
+
+        $expected = [
+            'decorated' => new Reference(AutowireNestedAttributes::class.'.inner'),
+            'iterator' => new TaggedIteratorArgument('foo'),
+            'locator' => new ServiceLocatorArgument(new TaggedIteratorArgument('foo', needsIndexes: true)),
+            'service' => new Reference('bar'),
+        ];
+        $this->assertEquals($expected, $container->getDefinition(AutowireNestedAttributes::class)->getArgument(0));
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
index c1c772b684a48..dfbaba206bf42 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
@@ -5,6 +5,8 @@
 use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\DependencyInjection\Attribute\MapDecorated;
+use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
+use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Contracts\Service\Attribute\Required;
 
@@ -85,3 +87,17 @@ public function __construct(#[MapDecorated] AsDecoratorInterface $inner = null)
     {
     }
 }
+
+#[AsDecorator(decorates: AsDecoratorFoo::class)]
+class AutowireNestedAttributes implements AsDecoratorInterface
+{
+    public function __construct(
+        #[Autowire([
+            'decorated' => new MapDecorated(),
+            'iterator' => new TaggedIterator('foo'),
+            'locator' => new TaggedLocator('foo'),
+            'service' => new Autowire(service: 'bar')
+        ])] array $options)
+    {
+    }
+}

From acae5cada21b4c0505a9d49d7ed4d99804831a2f Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Sat, 5 Nov 2022 18:20:29 +0100
Subject: [PATCH 073/475] [Messenger] Do not return fallback senders when other
 senders were already found

---
 .../Transport/Sender/SendersLocatorTest.php     | 17 +++++++++++++++++
 .../Transport/Sender/SendersLocator.php         |  6 ++++++
 2 files changed, 23 insertions(+)

diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php
index d58a4d63d50aa..3faab44d0696a 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php
@@ -52,6 +52,23 @@ public function testItReturnsTheSenderBasedOnTransportNamesStamp()
         $this->assertSame([], iterator_to_array($locator->getSenders(new Envelope(new SecondMessage()))));
     }
 
+    public function testSendersMapWithFallback()
+    {
+        $firstSender = $this->createMock(SenderInterface::class);
+        $secondSender = $this->createMock(SenderInterface::class);
+        $sendersLocator = $this->createContainer([
+            'first' => $firstSender,
+            'second' => $secondSender,
+        ]);
+        $locator = new SendersLocator([
+            DummyMessage::class => ['first'],
+            '*' => ['second'],
+        ], $sendersLocator);
+
+        $this->assertSame(['first' => $firstSender], iterator_to_array($locator->getSenders(new Envelope(new DummyMessage('a')))), 'Unexpected senders for configured message');
+        $this->assertSame(['second' => $secondSender], iterator_to_array($locator->getSenders(new Envelope(new SecondMessage()))), 'Unexpected senders for unconfigured message');
+    }
+
     private function createContainer(array $senders): ContainerInterface
     {
         $container = $this->createMock(ContainerInterface::class);
diff --git a/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php b/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php
index 5de6936d591f7..3420a6cc6043a 100644
--- a/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php
+++ b/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php
@@ -51,6 +51,12 @@ public function getSenders(Envelope $envelope): iterable
 
         foreach (HandlersLocator::listTypes($envelope) as $type) {
             foreach ($this->sendersMap[$type] ?? [] as $senderAlias) {
+                if (str_ends_with($type, '*') && $seen) {
+                    // the '*' acts as a fallback, if other senders already matched
+                    // with previous types, skip the senders bound to the fallback
+                    continue;
+                }
+
                 if (!\in_array($senderAlias, $seen, true)) {
                     $seen[] = $senderAlias;
 

From d1cbcca6a5f9f1f8c4ba814abc54d0509f828b36 Mon Sep 17 00:00:00 2001
From: Dejan Angelov <angelovdejan92@gmail.com>
Date: Sun, 27 Nov 2022 19:26:53 +0100
Subject: [PATCH 074/475] [HttpKernel] Allow using `#[HttpStatus]` for setting
 status code and headers for HTTP exceptions

---
 .../HttpKernel/Attribute/HttpStatus.php       | 28 ++++++++
 src/Symfony/Component/HttpKernel/CHANGELOG.md |  1 +
 .../EventListener/ErrorListener.php           | 15 +++++
 .../Tests/EventListener/ErrorListenerTest.php | 66 +++++++++++++++++++
 4 files changed, 110 insertions(+)
 create mode 100644 src/Symfony/Component/HttpKernel/Attribute/HttpStatus.php

diff --git a/src/Symfony/Component/HttpKernel/Attribute/HttpStatus.php b/src/Symfony/Component/HttpKernel/Attribute/HttpStatus.php
new file mode 100644
index 0000000000000..a2811150e07e7
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Attribute/HttpStatus.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Attribute;
+
+/**
+ * @author Dejan Angelov <angelovdejan@protonmail.com>
+ */
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class HttpStatus
+{
+    /**
+     * @param array<string, string> $headers
+     */
+    public function __construct(
+        public readonly int $statusCode,
+        public readonly array $headers = [],
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index f409a6f13c06c..02c9da3d12b0e 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Deprecate parameters `container.dumper.inline_factories` and `container.dumper.inline_class_loader`, use `.container.dumper.inline_factories` and `.container.dumper.inline_class_loader` instead
  * `FileProfilerStorage` removes profiles automatically after two days
+ * Add `#[HttpStatus]` for defining status codes for exceptions
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
index dd6105052028a..11a060903addb 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
@@ -15,6 +15,7 @@
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Attribute\HttpStatus;
 use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
@@ -72,6 +73,20 @@ public function logKernelException(ExceptionEvent $event)
             break;
         }
 
+        // There's no specific status code defined in the configuration for this exception
+        if (!$throwable instanceof HttpExceptionInterface) {
+            $class = new \ReflectionClass($throwable);
+            $attributes = $class->getAttributes(HttpStatus::class, \ReflectionAttribute::IS_INSTANCEOF);
+
+            if ($attributes) {
+                /** @var HttpStatus $instance */
+                $instance = $attributes[0]->newInstance();
+
+                $throwable = new HttpException($instance->statusCode, $throwable->getMessage(), $throwable, $instance->headers);
+                $event->setThrowable($throwable);
+            }
+        }
+
         $e = FlattenException::createFromThrowable($throwable);
 
         $this->logException($throwable, sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), $e->getFile(), $e->getLine()), $logLevel);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
index e988fe6914956..5090eb11cbb79 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
@@ -17,6 +17,7 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Attribute\HttpStatus;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
@@ -117,6 +118,36 @@ public function testHandleWithLoggerAndCustomConfiguration()
         $this->assertCount(1, $logger->getLogs('warning'));
     }
 
+    /**
+     * @dataProvider exceptionWithAttributeProvider
+     */
+    public function testHandleHttpAttribute(\Throwable $exception, int $expectedStatusCode, array $expectedHeaders)
+    {
+        $request = new Request();
+        $event = new ExceptionEvent(new TestKernel(), $request, HttpKernelInterface::MAIN_REQUEST, $exception);
+        $l = new ErrorListener('not used');
+        $l->logKernelException($event);
+        $l->onKernelException($event);
+
+        $this->assertEquals(new Response('foo', $expectedStatusCode, $expectedHeaders), $event->getResponse());
+    }
+
+    public function testHandleCustomConfigurationAndHttpAttribute()
+    {
+        $request = new Request();
+        $event = new ExceptionEvent(new TestKernel(), $request, HttpKernelInterface::MAIN_REQUEST, new WithGeneralAttribute());
+        $l = new ErrorListener('not used', null, false, [
+            WithGeneralAttribute::class => [
+                'log_level' => 'warning',
+                'status_code' => 401,
+            ],
+        ]);
+        $l->logKernelException($event);
+        $l->onKernelException($event);
+
+        $this->assertEquals(new Response('foo', 401), $event->getResponse());
+    }
+
     public function provider()
     {
         if (!class_exists(Request::class)) {
@@ -216,6 +247,12 @@ public function controllerProvider()
             return new Response('OK: '.$exception->getMessage());
         }];
     }
+
+    public static function exceptionWithAttributeProvider()
+    {
+        yield [new WithCustomUserProvidedAttribute(), 208, ['name' => 'value']];
+        yield [new WithGeneralAttribute(), 412, ['some' => 'thing']];
+    }
 }
 
 class TestLogger extends Logger implements DebugLoggerInterface
@@ -246,3 +283,32 @@ public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = tr
         throw new \RuntimeException('bar');
     }
 }
+
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class UserProvidedHttpStatusCodeAttribute extends HttpStatus
+{
+    public function __construct(array $headers = [])
+    {
+        parent::__construct(
+            Response::HTTP_ALREADY_REPORTED,
+            $headers
+        );
+    }
+}
+
+#[UserProvidedHttpStatusCodeAttribute(headers: [
+    'name' => 'value',
+])]
+class WithCustomUserProvidedAttribute extends \Exception
+{
+}
+
+#[HttpStatus(
+    statusCode: Response::HTTP_PRECONDITION_FAILED,
+    headers: [
+        'some' => 'thing',
+    ]
+)]
+class WithGeneralAttribute extends \Exception
+{
+}

From 54b3008a7f2000e97789a1a7106e5b3c0314f7cb Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Wed, 21 Dec 2022 19:25:36 +0100
Subject: [PATCH 075/475] Add generics to PasswordUpgraderInterface

---
 .../Security/Core/User/PasswordUpgraderInterface.php          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/User/PasswordUpgraderInterface.php b/src/Symfony/Component/Security/Core/User/PasswordUpgraderInterface.php
index fd21f14a81285..6bf18c7fbccdc 100644
--- a/src/Symfony/Component/Security/Core/User/PasswordUpgraderInterface.php
+++ b/src/Symfony/Component/Security/Core/User/PasswordUpgraderInterface.php
@@ -13,6 +13,8 @@
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @template TUser of PasswordAuthenticatedUserInterface
  */
 interface PasswordUpgraderInterface
 {
@@ -22,6 +24,8 @@ interface PasswordUpgraderInterface
      * This method should persist the new password in the user storage and update the $user object accordingly.
      * Because you don't want your users not being able to log in, this method should be opportunistic:
      * it's fine if it does nothing or if it fails without throwing any exception.
+     *
+     * @param TUser $user
      */
     public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void;
 }

From 568191f284ab84e98b44e464901fefd8dcc15ba7 Mon Sep 17 00:00:00 2001
From: Nicolas Sauveur <nicolas.sauveur@gmail.com>
Date: Fri, 9 Dec 2022 15:27:41 -0100
Subject: [PATCH 076/475] [Security] Make login redirection logic available to
 programmatic login

---
 .../Bundle/SecurityBundle/CHANGELOG.md        |  1 +
 .../Bundle/SecurityBundle/Security.php        |  7 ++-
 .../SecurityBundle/Tests/SecurityTest.php     | 51 +++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index 5f0b7d42d7fb1..4ab9103275bb4 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Add `_stateless` attribute to the request when firewall is stateless
  * Add `StatelessAuthenticatorFactoryInterface` for authenticators targeting `stateless` firewalls only and that don't require a user provider
  * Modify "icon.svg" to improve accessibility for blind/low vision users
+ * Make `Security::login()` return the authenticator response
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/SecurityBundle/Security.php b/src/Symfony/Bundle/SecurityBundle/Security.php
index d78cfc0edd02f..1ef5a50008c9c 100644
--- a/src/Symfony/Bundle/SecurityBundle/Security.php
+++ b/src/Symfony/Bundle/SecurityBundle/Security.php
@@ -56,8 +56,10 @@ public function getFirewallConfig(Request $request): ?FirewallConfig
      * @param UserInterface $user              The user to authenticate
      * @param string|null   $authenticatorName The authenticator name (e.g. "form_login") or service id (e.g. SomeApiKeyAuthenticator::class) - required only if multiple authenticators are configured
      * @param string|null   $firewallName      The firewall name - required only if multiple firewalls are configured
+     *
+     * @return Response|null The authenticator success response if any
      */
-    public function login(UserInterface $user, string $authenticatorName = null, string $firewallName = null): void
+    public function login(UserInterface $user, string $authenticatorName = null, string $firewallName = null): ?Response
     {
         $request = $this->container->get('request_stack')->getCurrentRequest();
         $firewallName ??= $this->getFirewallConfig($request)?->getName();
@@ -69,7 +71,8 @@ public function login(UserInterface $user, string $authenticatorName = null, str
         $authenticator = $this->getAuthenticator($authenticatorName, $firewallName);
 
         $this->container->get('security.user_checker')->checkPreAuth($user);
-        $this->container->get('security.user_authenticator')->authenticateUser($user, $authenticator, $request);
+
+        return $this->container->get('security.user_authenticator')->authenticateUser($user, $authenticator, $request);
     }
 
     /**
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/SecurityTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/SecurityTest.php
index b69467cb95cf3..9b5fcf3b51ddf 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/SecurityTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/SecurityTest.php
@@ -169,6 +169,57 @@ public function testLogin()
         $security->login($user);
     }
 
+    public function testLoginReturnsAuthenticatorResponse()
+    {
+        $request = new Request();
+        $authenticator = $this->createMock(AuthenticatorInterface::class);
+        $requestStack = $this->createMock(RequestStack::class);
+        $firewallMap = $this->createMock(FirewallMap::class);
+        $firewall = new FirewallConfig('main', 'main');
+        $user = $this->createMock(UserInterface::class);
+        $userChecker = $this->createMock(UserCheckerInterface::class);
+        $userAuthenticator = $this->createMock(UserAuthenticatorInterface::class);
+
+        $container = $this->createMock(ContainerInterface::class);
+        $container
+            ->expects($this->atLeastOnce())
+            ->method('get')
+            ->willReturnMap([
+                ['request_stack', $requestStack],
+                ['security.firewall.map', $firewallMap],
+                ['security.user_authenticator', $userAuthenticator],
+                ['security.user_checker', $userChecker],
+            ])
+        ;
+
+        $requestStack->expects($this->once())->method('getCurrentRequest')->willReturn($request);
+        $firewallMap->expects($this->once())->method('getFirewallConfig')->willReturn($firewall);
+        $userChecker->expects($this->once())->method('checkPreAuth')->with($user);
+        $userAuthenticator->expects($this->once())->method('authenticateUser')
+            ->with($user, $authenticator, $request)
+            ->willReturn(new Response('authenticator response'));
+
+        $firewallAuthenticatorLocator = $this->createMock(ServiceProviderInterface::class);
+        $firewallAuthenticatorLocator
+            ->expects($this->once())
+            ->method('getProvidedServices')
+            ->willReturn(['security.authenticator.custom.dev' => $authenticator])
+        ;
+        $firewallAuthenticatorLocator
+            ->expects($this->once())
+            ->method('get')
+            ->with('security.authenticator.custom.dev')
+            ->willReturn($authenticator)
+        ;
+
+        $security = new Security($container, ['main' => $firewallAuthenticatorLocator]);
+
+        $response = $security->login($user);
+
+        $this->assertInstanceOf(Response::class, $response);
+        $this->assertEquals('authenticator response', $response->getContent());
+    }
+
     public function testLoginWithoutAuthenticatorThrows()
     {
         $request = new Request();

From c352f5323463b379757e3ecccb758fe1e41b5292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Brzuchalski?= <michal.brzuchalski@gmail.com>
Date: Wed, 7 Dec 2022 11:12:31 +0100
Subject: [PATCH 077/475] [FrameworkBundle][Messenger] Add support for
 namespace wildcard in Messenger routing

---
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  1 +
 .../FrameworkExtension.php                    |  6 ++++-
 .../Fixtures/php/messenger_routing.php        |  1 +
 .../messenger_routing_invalid_wildcard.php    | 17 ++++++++++++++
 .../Fixtures/xml/messenger_routing.xml        |  3 +++
 .../messenger_routing_invalid_wildcard.xml    | 18 +++++++++++++++
 .../Fixtures/yml/messenger_routing.yml        |  2 ++
 .../messenger_routing_invalid_wildcard.yml    | 10 ++++++++
 .../FrameworkExtensionTest.php                |  7 ++++++
 src/Symfony/Component/Messenger/CHANGELOG.md  |  1 +
 .../Messenger/Handler/HandlersLocator.php     | 13 +++++++++++
 .../Tests/Handler/HandlersLocatorTest.php     | 23 +++++++++++++++++++
 12 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_invalid_wildcard.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing_invalid_wildcard.xml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing_invalid_wildcard.yml

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index ff147727d45a3..2967592e00109 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * Add `DomCrawlerAssertionsTrait::assertSelectorCount(int $count, string $selector)`
  * Allow to avoid `limit` definition in a RateLimiter configuration when using the `no_limit` policy
  * Add `--format` option to the `debug:config` command
+ * Add support to pass namespace wildcard in `framework.messenger.routing`
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index a75bd61f0511c..2e43e6a2fb00d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2159,7 +2159,11 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
 
         $messageToSendersMapping = [];
         foreach ($config['routing'] as $message => $messageConfiguration) {
-            if ('*' !== $message && !class_exists($message) && !interface_exists($message, false)) {
+            if ('*' !== $message && !class_exists($message) && !interface_exists($message, false) && !preg_match('/^(?:[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+\\\\)++\*$/', $message)) {
+                if (str_contains($message, '*')) {
+                    throw new LogicException(sprintf('Invalid Messenger routing configuration: invalid namespace "%s" wildcard.', $message));
+                }
+
                 throw new LogicException(sprintf('Invalid Messenger routing configuration: class or interface "%s" not found.', $message));
             }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php
index c045cace2589a..ef1d09e893194 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php
@@ -15,6 +15,7 @@
             SecondMessage::class => [
                 'senders' => ['amqp', 'audit'],
             ],
+            'Symfony\*' => 'amqp',
             '*' => 'amqp',
         ],
         'transports' => [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_invalid_wildcard.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_invalid_wildcard.php
new file mode 100644
index 0000000000000..c8e046ef64ca4
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_invalid_wildcard.php
@@ -0,0 +1,17 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'http_method_override' => false,
+    'serializer' => true,
+    'messenger' => [
+        'serializer' => [
+            'default_serializer' => 'messenger.transport.symfony_serializer',
+        ],
+        'routing' => [
+            'Symfony\*\DummyMessage' => ['audit'],
+        ],
+        'transports' => [
+            'audit' => 'null://',
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml
index 30b249b415c31..960939ad3916f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml
@@ -20,6 +20,9 @@
             <framework:routing message-class="*">
                 <framework:sender service="amqp" />
             </framework:routing>
+            <framework:routing message-class="Symfony\*">
+                <framework:sender service="amqp" />
+            </framework:routing>
             <framework:transport name="amqp" dsn="amqp://localhost/%2f/messages" />
             <framework:transport name="audit" dsn="null://" />
         </framework:messenger>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing_invalid_wildcard.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing_invalid_wildcard.xml
new file mode 100644
index 0000000000000..d6a07d6bad74e
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing_invalid_wildcard.xml
@@ -0,0 +1,18 @@
+<?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 http-method-override="false">
+        <framework:serializer enabled="true" />
+        <framework:messenger>
+            <framework:serializer default-serializer="messenger.transport.symfony_serializer" />
+            <framework:routing message-class="Symfony\*\DummyMessage">
+                <framework:sender service="audit" />
+            </framework:routing>
+            <framework:transport name="audit" dsn="null://" />
+        </framework:messenger>
+    </framework:config>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml
index bfd682c706fbe..c064c8c5ba2b7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml
@@ -8,6 +8,8 @@ framework:
             'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage': [amqp, messenger.transport.audit]
             'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\SecondMessage':
                 senders: [amqp, audit]
+            'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\*': [amqp]
+            'Symfony\*': [amqp]
             '*': amqp
         transports:
             amqp: 'amqp://localhost/%2f/messages'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing_invalid_wildcard.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing_invalid_wildcard.yml
new file mode 100644
index 0000000000000..af5a0d22218a7
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing_invalid_wildcard.yml
@@ -0,0 +1,10 @@
+framework:
+    http_method_override: false
+    serializer: true
+    messenger:
+        serializer:
+            default_serializer: messenger.transport.symfony_serializer
+        routing:
+            'Symfony\*\DummyMessage': [audit]
+        transports:
+            audit: 'null://'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 90228e9052723..d3c24f28dcadc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1059,6 +1059,13 @@ public function testMessengerMiddlewareFactoryErroneousFormat()
     }
 
     public function testMessengerInvalidTransportRouting()
+    {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Invalid Messenger routing configuration: invalid namespace "Symfony\*\DummyMessage" wildcard.');
+        $this->createContainerFromFile('messenger_routing_invalid_wildcard');
+    }
+
+    public function testMessengerInvalidWildcardRouting()
     {
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Invalid Messenger routing configuration: the "Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage" class is being routed to a sender called "invalid". This is not a valid transport or service id.');
diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
index 4e2f52ebf2ff3..e0aa2610d33d2 100644
--- a/src/Symfony/Component/Messenger/CHANGELOG.md
+++ b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 6.3
 ---
 
+ * Add support for namespace wildcards in the HandlersLocator to allow routing multiple messages within the same namespace
  * Deprecate `Symfony\Component\Messenger\Transport\InMemoryTransport` and
    `Symfony\Component\Messenger\Transport\InMemoryTransportFactory` in favor of
    `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport` and
diff --git a/src/Symfony/Component/Messenger/Handler/HandlersLocator.php b/src/Symfony/Component/Messenger/Handler/HandlersLocator.php
index daeacdfa82dcf..6c5daf3a718af 100644
--- a/src/Symfony/Component/Messenger/Handler/HandlersLocator.php
+++ b/src/Symfony/Component/Messenger/Handler/HandlersLocator.php
@@ -68,9 +68,22 @@ public static function listTypes(Envelope $envelope): array
         return [$class => $class]
             + class_parents($class)
             + class_implements($class)
+            + self::listWildcards($class)
             + ['*' => '*'];
     }
 
+    private static function listWildcards(string $type): array
+    {
+        $type .= '\*';
+        $wildcards = [];
+        while ($i = strrpos($type, '\\', -3)) {
+            $type = substr_replace($type, '\*', $i);
+            $wildcards[$type] = $type;
+        }
+
+        return $wildcards;
+    }
+
     private function shouldHandle(Envelope $envelope, HandlerDescriptor $handlerDescriptor): bool
     {
         if (null === $received = $envelope->last(ReceivedStamp::class)) {
diff --git a/src/Symfony/Component/Messenger/Tests/Handler/HandlersLocatorTest.php b/src/Symfony/Component/Messenger/Tests/Handler/HandlersLocatorTest.php
index 7bb7347877b6c..fe6782672e2d0 100644
--- a/src/Symfony/Component/Messenger/Tests/Handler/HandlersLocatorTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Handler/HandlersLocatorTest.php
@@ -56,6 +56,29 @@ public function testItReturnsOnlyHandlersMatchingTransport()
             new Envelope(new DummyMessage('Body'), [new ReceivedStamp('transportName')])
         )));
     }
+
+    public function testItReturnsOnlyHandlersMatchingMessageNamespace()
+    {
+        $firstHandler = $this->createPartialMock(HandlersLocatorTestCallable::class, ['__invoke']);
+        $secondHandler = $this->createPartialMock(HandlersLocatorTestCallable::class, ['__invoke']);
+
+        $locator = new HandlersLocator([
+            str_replace('DummyMessage', '*', DummyMessage::class) => [
+                $first = new HandlerDescriptor($firstHandler, ['alias' => 'one']),
+            ],
+            str_replace('Fixtures\\DummyMessage', '*', DummyMessage::class) => [
+                $second = new HandlerDescriptor($secondHandler, ['alias' => 'two']),
+            ],
+        ]);
+
+        $first->getName();
+        $second->getName();
+
+        $this->assertEquals([
+            $first,
+            $second,
+        ], iterator_to_array($locator->getHandlers(new Envelope(new DummyMessage('Body')))));
+    }
 }
 
 class HandlersLocatorTestCallable

From aaad65cc9321aaf4b20da597b16fadff4b1ce1b4 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 14 Dec 2022 13:28:32 +0100
Subject: [PATCH 078/475] [Clock] Add `Clock` class and `now()` function

---
 composer.json                                 |  1 +
 .../Resources/config/services.php             |  4 +-
 .../Bundle/FrameworkBundle/composer.json      |  1 +
 src/Symfony/Component/Clock/CHANGELOG.md      |  1 +
 src/Symfony/Component/Clock/Clock.php         | 72 ++++++++++++++++
 src/Symfony/Component/Clock/MockClock.php     |  2 +
 src/Symfony/Component/Clock/Resources/now.php | 23 ++++++
 .../Clock/Test/ClockSensitiveTrait.php        | 65 +++++++++++++++
 .../Component/Clock/Tests/ClockTest.php       | 82 +++++++++++++++++++
 src/Symfony/Component/Clock/composer.json     |  1 +
 10 files changed, 250 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Component/Clock/Clock.php
 create mode 100644 src/Symfony/Component/Clock/Resources/now.php
 create mode 100644 src/Symfony/Component/Clock/Test/ClockSensitiveTrait.php
 create mode 100644 src/Symfony/Component/Clock/Tests/ClockTest.php

diff --git a/composer.json b/composer.json
index 7503cccb8e26c..919136a0a2438 100644
--- a/composer.json
+++ b/composer.json
@@ -187,6 +187,7 @@
     },
     "autoload-dev": {
         "files": [
+            "src/Symfony/Component/Clock/Resources/now.php",
             "src/Symfony/Component/VarDumper/Resources/functions/dump.php"
         ]
     },
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php
index 9facc09c783f8..6d805bfbc7dd1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php
@@ -15,8 +15,8 @@
 use Psr\EventDispatcher\EventDispatcherInterface as PsrEventDispatcherInterface;
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\ConfigBuilderCacheWarmer;
 use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
+use Symfony\Component\Clock\Clock;
 use Symfony\Component\Clock\ClockInterface;
-use Symfony\Component\Clock\NativeClock;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\Resource\SelfCheckingResourceChecker;
 use Symfony\Component\Config\ResourceCheckerConfigCacheFactory;
@@ -229,7 +229,7 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
             ->args([service(KernelInterface::class), service('logger')->nullOnInvalid()])
             ->tag('kernel.cache_warmer')
 
-        ->set('clock', NativeClock::class)
+        ->set('clock', Clock::class)
         ->alias(ClockInterface::class, 'clock')
         ->alias(PsrClockInterface::class, 'clock')
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 509d4278daca6..b9531d60f972f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -76,6 +76,7 @@
         "phpdocumentor/type-resolver": "<1.4.0",
         "phpunit/phpunit": "<5.4.3",
         "symfony/asset": "<5.4",
+        "symfony/clock": "<6.3",
         "symfony/console": "<5.4",
         "symfony/dotenv": "<5.4",
         "symfony/dom-crawler": "<5.4",
diff --git a/src/Symfony/Component/Clock/CHANGELOG.md b/src/Symfony/Component/Clock/CHANGELOG.md
index 9bb1c2d4148e1..e59500a9efea0 100644
--- a/src/Symfony/Component/Clock/CHANGELOG.md
+++ b/src/Symfony/Component/Clock/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add `ClockAwareTrait` to help write time-sensitive classes
+ * Add `Clock` class and `now()` function
 
 6.2
 ---
diff --git a/src/Symfony/Component/Clock/Clock.php b/src/Symfony/Component/Clock/Clock.php
new file mode 100644
index 0000000000000..8d72b8de99f1b
--- /dev/null
+++ b/src/Symfony/Component/Clock/Clock.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock;
+
+use Psr\Clock\ClockInterface as PsrClockInterface;
+
+/**
+ * A global clock.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class Clock implements ClockInterface
+{
+    private static ClockInterface $globalClock;
+
+    public function __construct(
+        private readonly ?PsrClockInterface $clock = null,
+        private ?\DateTimeZone $timezone = null,
+    ) {
+    }
+
+    /**
+     * Returns the current global clock.
+     *
+     * Note that you should prefer injecting a ClockInterface or using
+     * ClockAwareTrait when possible instead of using this method.
+     */
+    public static function get(): ClockInterface
+    {
+        return self::$globalClock ??= new NativeClock();
+    }
+
+    public static function set(PsrClockInterface $clock): void
+    {
+        self::$globalClock = $clock instanceof ClockInterface ? $clock : new self($clock);
+    }
+
+    public function now(): \DateTimeImmutable
+    {
+        $now = ($this->clock ?? self::$globalClock)->now();
+
+        return isset($this->timezone) ? $now->setTimezone($this->timezone) : $now;
+    }
+
+    public function sleep(float|int $seconds): void
+    {
+        $clock = $this->clock ?? self::$globalClock;
+
+        if ($clock instanceof ClockInterface) {
+            $clock->sleep($seconds);
+        } else {
+            (new NativeClock())->sleep($seconds);
+        }
+    }
+
+    public function withTimeZone(\DateTimeZone|string $timezone): static
+    {
+        $clone = clone $this;
+        $clone->timezone = \is_string($timezone) ? new \DateTimeZone($timezone) : $timezone;
+
+        return $clone;
+    }
+}
diff --git a/src/Symfony/Component/Clock/MockClock.php b/src/Symfony/Component/Clock/MockClock.php
index a189ff54c4dc9..5a3a207217ba9 100644
--- a/src/Symfony/Component/Clock/MockClock.php
+++ b/src/Symfony/Component/Clock/MockClock.php
@@ -14,6 +14,8 @@
 /**
  * A clock that always returns the same date, suitable for testing time-sensitive logic.
  *
+ * Consider using ClockSensitiveTrait in your test cases instead of using this class directly.
+ *
  * @author Nicolas Grekas <p@tchwork.com>
  */
 final class MockClock implements ClockInterface
diff --git a/src/Symfony/Component/Clock/Resources/now.php b/src/Symfony/Component/Clock/Resources/now.php
new file mode 100644
index 0000000000000..7da0142b1c8bc
--- /dev/null
+++ b/src/Symfony/Component/Clock/Resources/now.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock;
+
+/**
+ * Returns the current time as a DateTimeImmutable.
+ *
+ * Note that you should prefer injecting a ClockInterface or using
+ * ClockAwareTrait when possible instead of using this function.
+ */
+function now(): \DateTimeImmutable
+{
+    return Clock::get()->now();
+}
diff --git a/src/Symfony/Component/Clock/Test/ClockSensitiveTrait.php b/src/Symfony/Component/Clock/Test/ClockSensitiveTrait.php
new file mode 100644
index 0000000000000..68c69e398acd5
--- /dev/null
+++ b/src/Symfony/Component/Clock/Test/ClockSensitiveTrait.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock\Test;
+
+use Psr\Clock\ClockInterface;
+use Symfony\Component\Clock\Clock;
+use Symfony\Component\Clock\MockClock;
+
+use function Symfony\Component\Clock\now;
+
+/**
+ * Helps with mocking the time in your test cases.
+ *
+ * This trait provides one self::mockTime() method that freezes the time.
+ * It restores the global clock after each test case.
+ * self::mockTime() accepts either a string (eg '+1 days' or '2022-12-22'),
+ * a DateTimeImmutable, or a boolean (to freeze/restore the global clock).
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+trait ClockSensitiveTrait
+{
+    public static function mockTime(string|\DateTimeImmutable|bool $when = true): ClockInterface
+    {
+        Clock::set(match (true) {
+            false === $when => self::saveClockBeforeTest(false),
+            true === $when => new MockClock(),
+            $when instanceof \DateTimeImmutable => new MockClock($when),
+            default => new MockClock(now()->modify($when)),
+        });
+
+        return Clock::get();
+    }
+
+    /**
+     * @before
+     *
+     * @internal
+     */
+    protected static function saveClockBeforeTest(bool $save = true): ClockInterface
+    {
+        static $originalClock;
+
+        return $save ? $originalClock = Clock::get() : $originalClock;
+    }
+
+    /**
+     * @after
+     *
+     * @internal
+     */
+    protected static function restoreClockAfterTest(): void
+    {
+        Clock::set(self::saveClockBeforeTest(false));
+    }
+}
diff --git a/src/Symfony/Component/Clock/Tests/ClockTest.php b/src/Symfony/Component/Clock/Tests/ClockTest.php
new file mode 100644
index 0000000000000..e88ade2558777
--- /dev/null
+++ b/src/Symfony/Component/Clock/Tests/ClockTest.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Clock\ClockInterface;
+use Symfony\Component\Clock\Clock;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\Clock\NativeClock;
+use Symfony\Component\Clock\Test\ClockSensitiveTrait;
+
+use function Symfony\Component\Clock\now;
+
+class ClockTest extends TestCase
+{
+    use ClockSensitiveTrait;
+
+    public function testMockClock()
+    {
+        $this->assertInstanceOf(NativeClock::class, Clock::get());
+
+        $clock = self::mockTime();
+        $this->assertInstanceOf(MockClock::class, Clock::get());
+        $this->assertSame(Clock::get(), $clock);
+    }
+
+    public function testNativeClock()
+    {
+        $this->assertInstanceOf(\DateTimeImmutable::class, now());
+        $this->assertInstanceOf(NativeClock::class, Clock::get())
10000
;
+    }
+
+    public function testMockClockDisable()
+    {
+        $this->assertInstanceOf(NativeClock::class, Clock::get());
+
+        $this->assertInstanceOf(MockClock::class, self::mockTime(true));
+        $this->assertInstanceOf(NativeClock::class, self::mockTime(false));
+    }
+
+    public function testMockClockFreeze()
+    {
+        self::mockTime(new \DateTimeImmutable('2021-12-19'));
+
+        $this->assertSame('2021-12-19', now()->format('Y-m-d'));
+
+        self::mockTime('+1 days');
+        $this->assertSame('2021-12-20', now()->format('Y-m-d'));
+    }
+
+    public function testPsrClock()
+    {
+        $psrClock = new class() implements ClockInterface {
+            public function now(): \DateTimeImmutable
+            {
+                return new \DateTimeImmutable('@1234567');
+            }
+        };
+
+        Clock::set($psrClock);
+
+        $this->assertInstanceOf(Clock::class, Clock::get());
+
+        $this->assertSame(1234567, now()->getTimestamp());
+
+        $this->assertSame('UTC', Clock::get()->withTimeZone('UTC')->now()->getTimezone()->getName());
+        $this->assertSame('Europe/Paris', Clock::get()->withTimeZone('Europe/Paris')->now()->getTimezone()->getName());
+
+        Clock::get()->sleep(0.1);
+
+        $this->assertSame(1234567, now()->getTimestamp());
+    }
+}
diff --git a/src/Symfony/Component/Clock/composer.json b/src/Symfony/Component/Clock/composer.json
index 2ff68a82227fb..2c796b0fda9cf 100644
--- a/src/Symfony/Component/Clock/composer.json
+++ b/src/Symfony/Component/Clock/composer.json
@@ -23,6 +23,7 @@
         "psr/clock": "^1.0"
     },
     "autoload": {
+        "files": [ "Resources/now.php" ],
         "psr-4": { "Symfony\\Component\\Clock\\": "" },
         "exclude-from-classmap": [
             "/Tests/"

From c0e9ee16eba3913ce90842a7e7356d0107283251 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Tue, 20 Dec 2022 20:08:50 +0100
Subject: [PATCH 079/475] Remove calls to AnnotationRegistry::registerLoader()

---
 composer.json                                          |  2 +-
 .../Tests/PropertyInfo/DoctrineExtractorTest.php       |  5 +----
 src/Symfony/Bridge/Doctrine/composer.json              |  7 ++++---
 .../PhpUnit/Legacy/SymfonyTestsListenerTrait.php       |  9 ---------
 src/Symfony/Bridge/PhpUnit/bootstrap.php               |  9 ---------
 src/Symfony/Bridge/PhpUnit/composer.json               |  1 +
 .../DependencyInjection/FrameworkExtension.php         | 10 ----------
 .../FrameworkBundle/Resources/config/annotations.php   |  9 +--------
 .../AnnotationClassLoaderWithAnnotationsTest.php       |  4 ----
 9 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/composer.json b/composer.json
index 0d08ed1443508..5a8056a82067c 100644
--- a/composer.json
+++ b/composer.json
@@ -128,7 +128,7 @@
         "doctrine/collections": "^1.0|^2.0",
         "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "^2.13.1|^3.0",
-        "doctrine/orm": "^2.7.4",
+        "doctrine/orm": "^2.12",
         "egulias/email-validator": "^2.1.10|^3.1",
         "guzzlehttp/promises": "^1.4",
         "league/html-to-markdown": "^5.0",
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
index 3771e772afc49..f0740610e4b6d 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -16,7 +16,6 @@
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\ORMSetup;
-use Doctrine\ORM\Tools\Setup;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor;
 use Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineDummy;
@@ -34,9 +33,7 @@ class DoctrineExtractorTest extends TestCase
 {
     private function createExtractor()
     {
-        $config = class_exists(ORMSetup::class)
-            ? ORMSetup::createAnnotationMetadataConfiguration([__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'], true)
-            : Setup::createAnnotationMetadataConfiguration([__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'], true);
+        $config = ORMSetup::createAnnotationMetadataConfiguration([__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'], true);
         $entityManager = EntityManager::create(['driver' => 'pdo_sqlite'], $config);
 
         if (!DBALType::hasType('foo')) {
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 49931c02bac5a..bee7d29c5b1b6 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -42,17 +42,18 @@
         "symfony/validator": "^5.4|^6.0",
         "symfony/translation": "^5.4|^6.0",
         "symfony/var-dumper": "^5.4|^6.0",
-        "doctrine/annotations": "^1.10.4|^2",
+        "doctrine/annotations": "^1.13.1|^2",
         "doctrine/collections": "^1.0|^2.0",
         "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "^2.13.1|^3.0",
-        "doctrine/orm": "^2.7.4",
+        "doctrine/orm": "^2.12",
         "psr/log": "^1|^2|^3"
     },
     "conflict": {
+        "doctrine/annotations": "<1.13.1",
         "doctrine/dbal": "<2.13.1",
         "doctrine/lexer": "<1.1",
-        "doctrine/orm": "<2.7.4",
+        "doctrine/orm": "<2.12",
         "phpunit/phpunit": "<5.4.3",
         "symfony/cache": "<5.4",
         "symfony/dependency-injection": "<6.2",
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
index 015bc881ae573..b97a11d614929 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\PhpUnit\Legacy;
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\RiskyTestError;
 use PHPUnit\Framework\TestCase;
@@ -130,14 +129,6 @@ public function startTestSuite($suite)
             echo "Testing $suiteName\n";
             $this->state = 0;
 
-            if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
-                if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
-                    AnnotationRegistry::registerUniqueLoader('class_exists');
-                } elseif (method_exists(AnnotationRegistry::class, 'registerLoader')) {
-                    AnnotationRegistry::registerLoader('class_exists');
-                }
-            }
-
             if ($this->skippedFile = getenv('SYMFONY_PHPUNIT_SKIPPED_TESTS')) {
                 $this->state = 1;
 
diff --git a/src/Symfony/Bridge/PhpUnit/bootstrap.php b/src/Symfony/Bridge/PhpUnit/bootstrap.php
index f2064368f41a3..c81c828770dbc 100644
--- a/src/Symfony/Bridge/PhpUnit/bootstrap.php
+++ b/src/Symfony/Bridge/PhpUnit/bootstrap.php
@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
 
 // Detect if we need to serialize deprecations to a file.
@@ -27,14 +26,6 @@
 // Enforce a consistent locale
 setlocale(\LC_ALL, 'C');
 
-if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
-    if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
-        AnnotationRegistry::registerUniqueLoader('class_exists');
-    } elseif (method_exists(AnnotationRegistry::class, 'registerLoader')) {
-        AnnotationRegistry::registerLoader('class_exists');
-    }
-}
-
 if ('disabled' !== getenv('SYMFONY_DEPRECATIONS_HELPER')) {
     DeprecationErrorHandler::register(getenv('SYMFONY_DEPRECATIONS_HELPER'));
 }
diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
index b0ccda04315f1..d576fb99986ff 100644
--- a/src/Symfony/Bridge/PhpUnit/composer.json
+++ b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -28,6 +28,7 @@
         "symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
     },
     "conflict": {
+        "doctrine/annotations": "<1.10",
         "phpunit/phpunit": "<7.5|9.1.2"
     },
     "autoload": {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index a75bd61f0511c..d42f817514ecb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;
 
 use Composer\InstalledVersions;
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\Common\Annotations\Reader;
 use Http\Client\HttpClient;
 use phpDocumentor\Reflection\DocBlockFactoryInterface;
@@ -1643,15 +1642,6 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
         $loader->load('annotations.php');
 
-        if (!method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
-            if (method_exists(AnnotationRegistry::class, 'registerLoader')) {
-                $container->getDefinition('annotations.dummy_registry')
-                    ->setMethodCalls([['registerLoader', ['class_exists']]]);
-            } else {
-                $container->removeDefinition('annotations.dummy_registry');
-            }
-        }
-
         if ('none' === $config['cache']) {
             $container->removeDefinition('annotations.cached_reader');
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php
index 65a3f4e8ffd90..0f561d9d3a571 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\Common\Annotations\PsrCachedReader;
 use Doctrine\Common\Annotations\Reader;
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer;
@@ -23,13 +22,7 @@
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set('annotations.reader', AnnotationReader::class)
-            ->call('addGlobalIgnoredName', [
-                'required',
-                service('annotations.dummy_registry')->ignoreOnInvalid(), // dummy arg to register class_exists as annotation loader only when required
-            ])
-
-        ->set('annotations.dummy_registry', AnnotationRegistry::class)
-            ->call('registerUniqueLoader', ['class_exists'])
+            ->call('addGlobalIgnoredName', ['required'])
 
         ->set('annotations.cached_reader', PsrCachedReader::class)
             ->args([
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php
index e2843a0a39843..2af4032ad28ef 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Routing\Tests\Loader;
 
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use Symfony\Component\Routing\Loader\AnnotationClassLoader;
 use Symfony\Component\Routing\Route;
 
@@ -26,9 +25,6 @@ protected function configureRoute(Route $route, \ReflectionClass $class, \Reflec
             {
             }
         };
-        if (method_exists(AnnotationRegistry::class, 'registerLoader')) {
-            AnnotationRegistry::registerLoader('class_exists');
-        }
     }
 
     public function testDefaultRouteName()

From 4917528d9ada1b3676a8bd7920e35622d73b78ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= <jerome@tamarelle.net>
Date: Thu, 3 Nov 2022 13:03:23 +0100
Subject: [PATCH 080/475] Resolve DateTime value using the clock

---
 .../FrameworkBundle/Resources/config/web.php  |  3 +
 src/Symfony/Component/HttpKernel/CHANGELOG.md |  1 +
 .../DateTimeValueResolver.php                 | 22 +++++--
 .../DateTimeValueResolverTest.php             | 61 ++++++++++++++-----
 .../Component/HttpKernel/composer.json        |  1 +
 5 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
index 82ceb2e077da4..cd4cdffa10ade 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
@@ -55,6 +55,9 @@
             ->tag('controller.argument_value_resolver', ['priority' => 100])
 
         ->set('argument_resolver.datetime', DateTimeValueResolver::class)
+            ->args([
+                service('clock')->nullOnInvalid(),
+            ])
             ->tag('controller.argument_value_resolver', ['priority' => 100])
 
         ->set('argument_resolver.request_attribute', RequestAttributeValueResolver::class)
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 02c9da3d12b0e..c823fbd0cb5c4 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * Deprecate parameters `container.dumper.inline_factories` and `container.dumper.inline_class_loader`, use `.container.dumper.inline_factories` and `.container.dumper.inline_class_loader` instead
  * `FileProfilerStorage` removes profiles automatically after two days
  * Add `#[HttpStatus]` for defining status codes for exceptions
+ * Use an instance of `Psr\Clock\ClockInterface` to generate the current date time in `DateTimeValueResolver`
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
index 8fd7015ad041d..a73a7e1b47a27 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
+use Psr\Clock\ClockInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\MapDateTime;
 use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
@@ -26,6 +27,11 @@
  */
 final class DateTimeValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface
 {
+    public function __construct(
+        private readonly ?ClockInterface $clock = null,
+    ) {
+    }
+
     /**
      * @deprecated since Symfony 6.2, use resolve() instead
      */
@@ -45,12 +51,18 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
         $value = $request->attributes->get($argument->getName());
         $class = \DateTimeInterface::class === $argument->getType() ? \DateTimeImmutable::class : $argument->getType();
 
-        if ($value instanceof \DateTimeInterface) {
-            return [$value instanceof $class ? $value : $class::createFromInterface($value)];
+        if (!$value) {
+            if ($argument->isNullable()) {
+                return [null];
+            }
+            if (!$this->clock) {
+                return [new $class()];
+            }
+            $value = $this->clock->now();
         }
 
-        if ($argument->isNullable() && !$value) {
-            return [null];
+        if ($value instanceof \DateTimeInterface) {
+            return [$value instanceof $class ? $value : $class::createFromInterface($value)];
         }
 
         $format = null;
@@ -71,7 +83,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
                 $value = '@'.$value;
             }
             try {
-                $date = new $class($value ?? 'now');
+                $date = new $class($value);
             } catch (\Exception) {
                 $date = false;
             }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php
index 770324d59b7e0..4e43cfd11b083 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Clock\MockClock;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\MapDateTime;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DateTimeValueResolver;
@@ -34,9 +35,12 @@ protected function tearDown(): void
 
     public static function getTimeZones()
     {
-        yield ['UTC'];
-        yield ['Etc/GMT+9'];
-        yield ['Etc/GMT-14'];
+        yield ['UTC', false];
+        yield ['Etc/GMT+9', false];
+        yield ['Etc/GMT-14', false];
+        yield ['UTC', true];
+        yield ['Etc/GMT+9', true];
+        yield ['Etc/GMT-14', true];
     }
 
     public static function getClasses()
@@ -78,10 +82,10 @@ public function testUnsupportedArgument()
     /**
      * @dataProvider getTimeZones
      */
-    public function testFullDate(string $timezone)
+    public function testFullDate(string $timezone, bool $withClock)
     {
         date_default_timezone_set($timezone);
-        $resolver = new DateTimeValueResolver();
+        $resolver = new DateTimeValueResolver($withClock ? new MockClock() : null);
 
         $argument = new ArgumentMetadata('dummy', \DateTimeImmutable::class, false, false, null);
         $request = self::requestWithAttributes(['dummy' => '2012-07-21 00:00:00']);
@@ -97,10 +101,10 @@ public function testFullDate(string $timezone)
     /**
      * @dataProvider getTimeZones
      */
-    public function testUnixTimestamp(string $timezone)
+    public function testUnixTimestamp(string $timezone, bool $withClock)
     {
         date_default_timezone_set($timezone);
-        $resolver = new DateTimeValueResolver();
+        $resolver = new DateTimeValueResolver($withClock ? new MockClock('now', $timezone) : null);
 
         $argument = new ArgumentMetadata('dummy', \DateTimeImmutable::class, false, false, null);
         $request = self::requestWithAttributes(['dummy' => '989541720']);
@@ -127,21 +131,46 @@ public function testNullableWithEmptyAttribute()
     }
 
     /**
-     * @dataProvider getTimeZones
+     * @param class-string<\DateTimeInterface> $class
+     *
+     * @dataProvider getClasses
      */
-    public function testNow(string $timezone)
+    public function testNow(string $class)
     {
-        date_default_timezone_set($timezone);
+        date_default_timezone_set($timezone = 'Etc/GMT+9');
         $resolver = new DateTimeValueResolver();
 
-        $argument = new ArgumentMetadata('dummy', \DateTime::class, false, false, null, false);
+        $argument = new ArgumentMetadata('dummy', $class, false, false, null, false);
         $request = self::requestWithAttributes(['dummy' => null]);
 
         $results = $resolver->resolve($request, $argument);
 
         $this->assertCount(1, $results);
-        $this->assertEquals('0', $results[0]->diff(new \DateTimeImmutable())->format('%s'));
+        $this->assertInstanceOf($class, $results[0]);
         $this->assertSame($timezone, $results[0]->getTimezone()->getName(), 'Default timezone');
+        $this->assertEquals('0', $results[0]->diff(new \DateTimeImmutable())->format('%s'));
+    }
+
+    /**
+     * @param class-string<\DateTimeInterface> $class
+     *
+     * @dataProvider getClasses
+     */
+    public function testNowWithClock(string $class)
+    {
+        date_default_timezone_set('Etc/GMT+9');
+        $clock = new MockClock('2022-02-20 22:20:02');
+        $resolver = new DateTimeValueResolver($clock);
+
+        $argument = new ArgumentMetadata('dummy', $class, false, false, null, false);
+        $request = self::requestWithAttributes(['dummy' => null]);
+
+        $results = $resolver->resolve($request, $argument);
+
+        $this->assertCount(1, $results);
+        $this->assertInstanceOf($class, $results[0]);
+        $this->assertSame('UTC', $results[0]->getTimezone()->getName(), 'Default timezone');
+        $this->assertEquals($clock->now(), $results[0]);
     }
 
     /**
@@ -181,10 +210,10 @@ public function testCustomClass()
     /**
      * @dataProvider getTimeZones
      */
-    public function testDateTimeImmutable(string $timezone)
+    public function testDateTimeImmutable(string $timezone, bool $withClock)
     {
         date_default_timezone_set($timezone);
-        $resolver = new DateTimeValueResolver();
+        $resolver = new DateTimeValueResolver($withClock ? new MockClock('now', $timezone) : null);
 
         $argument = new ArgumentMetadata('dummy', \DateTimeImmutable::class, false, false, null);
         $request = self::requestWithAttributes(['dummy' => '2016-09-08 00:00:00 +05:00']);
@@ -200,10 +229,10 @@ public function testDateTimeImmutable(string $timezone)
     /**
      * @dataProvider getTimeZones
      */
-    public function testWithFormat(string $timezone)
+    public function testWithFormat(string $timezone, bool $withClock)
     {
         date_default_timezone_set($timezone);
-        $resolver = new DateTimeValueResolver();
+        $resolver = new DateTimeValueResolver($withClock ? new MockClock('now', $timezone) : null);
 
         $argument = new ArgumentMetadata('dummy', \DateTimeInterface::class, false, false, null, false, [
             MapDateTime::class => new MapDateTime('m-d-y H:i:s'),
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 2c92557cbb6fb..41ef39d3ae749 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -26,6 +26,7 @@
     },
     "require-dev": {
         "symfony/browser-kit": "^5.4|^6.0",
+        "symfony/clock": "^6.2",
         "symfony/config": "^6.1",
         "symfony/console": "^5.4|^6.0",
         "symfony/css-selector": "^5.4|^6.0",

From 86db5052deb312c2ae9ca3d46de562c8d6b64fb2 Mon Sep 17 00:00:00 2001
From: Daif <daif.abderrahman@gmail.com>
Date: Mon, 12 Dec 2022 17:16:30 +0100
Subject: [PATCH 081/475] CardsV1 is deprecated we must use cardsV2 instead.

Based on google developers api documentation.
https://developers.google.com/chat/api/reference/rest/v1/cards-v1
CardsV1 is deprecated we must use cardsV2 instead.
---
 .../Notifier/Bridge/GoogleChat/CHANGELOG.md   |  5 +++
 .../Bridge/GoogleChat/GoogleChatOptions.php   | 14 ++++++
 .../Tests/GoogleChatOptionsTest.php           | 44 +++++++++++++++++++
 3 files changed, 63 insertions(+)

diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/GoogleChat/CHANGELOG.md
index 5759f578770fe..c01ece62d544a 100644
--- a/src/Symfony/Component/Notifier/Bridge/GoogleChat/CHANGELOG.md
+++ b/src/Symfony/Component/Notifier/Bridge/GoogleChat/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Deprecate `GoogleChatOptions::card()` in favor of `cardV2()`
+
 5.3
 ---
 
diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatOptions.php b/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatOptions.php
index da479d1311a93..0550d725a0d6c 100644
--- a/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatOptions.php
+++ b/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatOptions.php
@@ -62,15 +62,29 @@ public function toArray(): array
     }
 
     /**
+     * @deprecated since Symfony 6.3, use "cardV2()" instead
+     *
      * @return $this
      */
     public function card(array $card): static
     {
+        trigger_deprecation('symfony/google-chat-notifier', '6.3', '"%s()" is deprecated, use "cardV2()" instead.', __METHOD__);
+
         $this->options['cards'][] = $card;
 
         return $this;
     }
 
+    /**
+     * @return $this
+     */
+    public function cardV2(array $card): static
+    {
+        $this->options['cardsV2'][] = $card;
+
+        return $this;
+    }
+
     /**
      * @return $this
      */
diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatOptionsTest.php b/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatOptionsTest.php
index 691958c46a079..00984a60044c9 100644
--- a/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatOptionsTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatOptionsTest.php
@@ -16,6 +16,9 @@
 
 final class GoogleChatOptionsTest extends TestCase
 {
+    /**
+     * @group legacy
+     */
     public function testToArray()
     {
         $options = new GoogleChatOptions();
@@ -34,6 +37,47 @@ public function testToArray()
         $this->assertSame($expected, $options->toArray());
     }
 
+    public function testToArrayWithCardV2()
+    {
+        $options = new GoogleChatOptions();
+
+        $cardV2 = [
+            'header' => [
+                'title' => 'Sasha',
+                'subtitle' => 'Software Engineer',
+                'imageUrl' => 'https://developers.google.com/chat/images/quickstart-app-avatar.png',
+                'imageType' => 'CIRCLE',
+                'imageAltText' => 'Avatar for Sasha',
+            ],
+            'sections' => [
+                [
+                    'header' => 'Contact Info',
+                    'collapsible' => true,
+                    'widgets' => [
+                        'decoratedText' => [
+                            'startIcon' => ['knownIcon' => 'EMAIL'],
+                            'text' => 'sasha@example.com',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $options
+            ->text('Hello Bot')
+            ->cardV2($cardV2)
+        ;
+
+        $expected = [
+            'text' => 'Hello Bot',
+            'cardsV2' => [
+                $cardV2,
+            ],
+        ];
+
+        $this->assertSame($expected, $options->toArray());
+    }
+
     public function testOptionsWithThread()
     {
         $thread = 'fgh.ijk';

From 57c2365ea4003c74744eef8c3dfe5273c3ba001c Mon Sep 17 00:00:00 2001
From: Sergey Rabochiy <upyx.00@gmail.com>
Date: Sat, 17 Dec 2022 01:23:10 +0700
Subject: [PATCH 082/475] [DependencyInjection] Deprecate integers keys in
 "service_locator" config

---
 UPGRADE-6.3.md                                |  1 +
 .../DependencyInjection/CHANGELOG.md          |  1 +
 .../Configurator/ContainerConfigurator.php    |  8 ++++-
 .../Loader/XmlFileLoader.php                  |  5 ++++
 .../Loader/YamlFileLoader.php                 |  4 +++
 ...services_with_service_locator_argument.php | 29 +++++++++++++++++++
 ...services_with_service_locator_argument.xml | 29 +++++++++++++++++++
 ...services_with_service_locator_argument.yml | 28 ++++++++++++++++++
 .../Tests/Loader/PhpFileLoaderTest.php        | 26 +++++++++++++++++
 .../Tests/Loader/XmlFileLoaderTest.php        | 24 +++++++++++++++
 .../Tests/Loader/YamlFileLoaderTest.php       | 24 +++++++++++++++
 11 files changed, 178 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services_with_service_locator_argument.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_service_locator_argument.xml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_service_locator_argument.yml

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 77c7858198d80..58949b88e408d 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -5,6 +5,7 @@ DependencyInjection
 -------------------
 
  * Deprecate `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`, use `inline_factories` and `inline_class_loader` instead
+ * Deprecate undefined and numeric keys with `service_locator` config, use string aliases instead
 
 HttpKernel
 ----------
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 6f0f9c1056b83..e1d0dda20d6ff 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Deprecate `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`
  * Add `RemoveBuildParametersPass`, which removes parameters starting with a dot during compilation
  * Add support for nesting autowiring-related attributes into `#[Autowire(...)]`
+ * Deprecate undefined and numeric keys with `service_locator` config
 
 6.2
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
index 3065a94b3bff0..91acd9a10ea7d 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
@@ -123,7 +123,13 @@ function inline_service(string $class = null): InlineServiceConfigurator
  */
 function service_locator(array $values): ServiceLocatorArgument
 {
-    return new ServiceLocatorArgument(AbstractConfigurator::processValue($values, true));
+    $values = AbstractConfigurator::processValue($values, true);
+
+    if (isset($values[0])) {
+        trigger_deprecation('symfony/dependency-injection', '6.3', 'Using integers as keys in a "service_locator()" argument is deprecated. The keys will default to the IDs of the original services in 7.0.');
+    }
+
+    return new ServiceLocatorArgument($values);
 }
 
 /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index ab76eb9e0df08..7c0ea3261300b 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -526,6 +526,11 @@ private function getArgumentsAsPhp(\DOMElement $node, string $name, string $file
                     break;
                 case 'service_locator':
                     $arg = $this->getArgumentsAsPhp($arg, $name, $file);
+
+                    if (isset($arg[0])) {
+                        trigger_deprecation('symfony/dependency-injection', '6.3', 'Skipping "key" argument or using integers as values in a "service_locator" tag is deprecated. The keys will default to the IDs of the original services in 7.0.');
+                    }
+
                     $arguments[$key] = new ServiceLocatorArgument($arg);
                     break;
                 case 'tagged':
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 80a58d39f4f6b..ad61c14437d1a 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -814,6 +814,10 @@ private function resolveServices(mixed $value, string $file, bool $isParameter =
 
                 $argument = $this->resolveServices($argument, $file, $isParameter);
 
+                if (isset($argument[0])) {
+                    trigger_deprecation('symfony/dependency-injection', '6.3', 'Using integers as keys in a "!service_locator" tag is deprecated. The keys will default to the IDs of the original services in 7.0.');
+                }
+
                 return new ServiceLocatorArgument($argument);
             }
             if (\in_array($value->getTag(), ['tagged', 'tagged_iterator', 'tagged_locator'], true)) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services_with_service_locator_argument.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services_with_service_locator_argument.php
new file mode 100644
index 0000000000000..58757abc4b326
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/services_with_service_locator_argument.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return function (ContainerConfigurator $configurator) {
+    $services = $configurator->services()->defaults()->public();
+
+    $services->set('foo_service', \stdClass::class);
+
+    $services->set('bar_service', \stdClass::class);
+
+    $services->set('locator_dependent_service_indexed', \ArrayObject::class)
+        ->args([service_locator([
+            'foo' => service('foo_service'),
+            'bar' => service('bar_service'),
+        ])]);
+
+    $services->set('locator_dependent_service_not_indexed', \ArrayObject::class)
+        ->args([service_locator([
+            service('foo_service'),
+            service('bar_service'),
+        ])]);
+
+    $services->set('locator_dependent_service_mixed', \ArrayObject::class)
+        ->args([service_locator([
+            'foo' => service('foo_service'),
+            service('bar_service'),
+        ])]);
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_service_locator_argument.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_service_locator_argument.xml
new file mode 100644
index 0000000000000..f98ca9e5a01d9
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_service_locator_argument.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo_service" class="stdClass"/>
+
+    <service id="bar_service" class="stdClass"/>
+
+    <service id="locator_dependent_service_indexed" class="ArrayObject">
+      <argument type="service_locator">
+        <argument key="foo" type="service" id="foo_service"/>
+        <argument key="bar" type="service" id="bar_service"/>
+      </argument>
+    </service>
+
+    <service id="locator_dependent_service_not_indexed" class="ArrayObject">
+      <argument type="service_locator">
+        <argument type="service" id="foo_service"/>
+        <argument type="service" id="bar_service"/>
+      </argument>
+    </service>
+
+    <service id="locator_dependent_service_mixed" class="ArrayObject">
+      <argument type="service_locator">
+        <argument key="foo" type="service" id="foo_service"/>
+        <argument type="service" id="bar_service"/>
+      </argument>
+    </service>
+  </services>
+</container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_service_locator_argument.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_service_locator_argument.yml
new file mode 100644
index 0000000000000..b0309d3eeab9a
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_service_locator_argument.yml
@@ -0,0 +1,28 @@
+
+services:
+    foo_service:
+        class: stdClass
+
+    bar_service:
+        class: stdClass
+
+    locator_dependent_service_indexed:
+        class: ArrayObject
+        arguments:
+            - !service_locator
+                'foo': '@foo_service'
+                'bar': '@bar_service'
+
+    locator_dependent_service_not_indexed:
+        class: ArrayObject
+        arguments:
+            - !service_locator
+                - '@foo_service'
+                - '@bar_service'
+
+    locator_dependent_service_mixed:
+        class: ArrayObject
+        arguments:
+            - !service_locator
+                'foo': '@foo_service'
+                '0': '@bar_service'
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
index ef153e178bc03..15f88324dccfa 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -14,18 +14,23 @@
 require_once __DIR__.'/../Fixtures/includes/AcmeExtension.php';
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Config\Builder\ConfigBuilderGenerator;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
 use Symfony\Component\DependencyInjection\Dumper\YamlDumper;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum;
 
 class PhpFileLoaderTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     public function testSupports()
     {
         $loader = new PhpFileLoader(new ContainerBuilder(), new FileLocator());
@@ -200,4 +205,25 @@ public function testWhenEnv()
 
         $loader->load($fixtures.'/config/when_env.php');
     }
+
+    /**
+     * @group legacy
+     */
+    public function testServiceWithServiceLocatorArgument()
+    {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Using integers as keys in a "service_locator()" argument is deprecated. The keys will default to the IDs of the original services in 7.0.');
+
+        $fixtures = realpath(__DIR__.'/../Fixtures');
+        $loader = new PhpFileLoader($container = new ContainerBuilder(), new FileLocator());
+        $loader->load($fixtures.'/config/services_with_service_locator_argument.php');
+
+        $values = ['foo' => new Reference('foo_service'), 'bar' => new Reference('bar_service')];
+        $this->assertEquals([new ServiceLocatorArgument($values)], $container->getDefinition('locator_dependent_service_indexed')->getArguments());
+
+        $values = [new Reference('foo_service'), new Reference('bar_service')];
+        $this->assertEquals([new ServiceLocatorArgument($values)], $container->getDefinition('locator_dependent_service_not_indexed')->getArguments());
+
+        $values = ['foo' => new Reference('foo_service'), 0 => new Reference('bar_service')];
+        $this->assertEquals([new ServiceLocatorArgument($values)], $container->getDefinition('locator_dependent_service_mixed')->getArguments());
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
index 9207742bc25f1..56a5fe0be4871 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException;
 use Symfony\Component\Config\Exception\LoaderLoadException;
 use Symfony\Component\Config\FileLocator;
@@ -47,6 +48,8 @@
 
 class XmlFileLoaderTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     protected static $fixturesPath;
 
     public static function setUpBeforeClass(): void
@@ -421,6 +424,27 @@ public function testParseTaggedArgumentsWithIndexBy()
         $this->assertEquals(new ServiceLocatorArgument($taggedIterator3), $container->getDefinition('foo3_tagged_locator')->getArgument(0));
     }
 
+    /**
+     * @group legacy
+     */
+    public function testServiceWithServiceLocatorArgument()
+    {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Skipping "key" argument or using integers as values in a "service_locator" tag is deprecated. The keys will default to the IDs of the original services in 7.0.');
+
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_with_service_locator_argument.xml');
+
+        $values = ['foo' => new Reference('foo_service'), 'bar' => new Reference('bar_service')];
+        $this->assertEquals([new ServiceLocatorArgument($values)], $container->getDefinition('locator_dependent_service_indexed')->getArguments());
+
+        $values = [new Reference('foo_service'), new Reference('bar_service')];
+        $this->assertEquals([new ServiceLocatorArgument($values)], $container->getDefinition('locator_dependent_service_not_indexed')->getArguments());
+
+        $values = ['foo' => new Reference('foo_service'), 0 => new Reference('bar_service')];
+        $this->assertEquals([new ServiceLocatorArgument($values)], $container->getDefinition('locator_dependent_service_mixed')->getArguments());
+    }
+
     public function testParseServiceClosure()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
index 952b2dc3fbb2c..9515bfee92099 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException;
 use Symfony\Component\Config\Exception\LoaderLoadException;
 use Symfony\Component\Config\FileLocator;
@@ -45,6 +46,8 @@
 
 class YamlFileLoaderTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     protected static $fixturesPath;
 
     public static function setUpBeforeClass(): void
@@ -408,6 +411,27 @@ public function testTaggedArgumentsWithIndex()
         $this->assertEquals(new ServiceLocatorArgument($taggedIterator), $container->getDefinition('bar_service_tagged_locator')->getArgument(0));
     }
 
+    /**
+     * @group legacy
+     */
+    public function testServiceWithServiceLocatorArgument()
+    {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Using integers as keys in a "!service_locator" tag is deprecated. The keys will default to the IDs of the original services in 7.0.');
+
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services_with_service_locator_argument.yml');
+
+        $values = ['foo' => new Reference('foo_service'), 'bar' => new Reference('bar_service')];
+        $this->assertEquals([new ServiceLocatorArgument($values)], $container->getDefinition('locator_dependent_service_indexed')->getArguments());
+
+        $values = [new Reference('foo_service'), new Reference('bar_service')];
+        $this->assertEquals([new ServiceLocatorArgument($values)], $container->getDefinition('locator_dependent_service_not_indexed')->getArguments());
+
+        $values = ['foo' => new Reference('foo_service'), 0 => new Reference('bar_service')];
+        $this->assertEquals([new ServiceLocatorArgument($values)], $container->getDefinition('locator_dependent_service_mixed')->getArguments());
+    }
+
     public function testParseServiceClosure()
     {
         $container = new ContainerBuilder();

From b5eda47d913b5bfcc5a383da32fc92ac124ab880 Mon Sep 17 00:00:00 2001
From: Mathieu <math.lechat@gmail.com>
Date: Thu, 15 Dec 2022 16:14:57 +0100
Subject: [PATCH 083/475] [FrameworkBundle] Deprecate `framework:exceptions`
 XML tag

---
 UPGRADE-6.3.md                                | 31 +++++++++++++++++++
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  1 +
 .../DependencyInjection/Configuration.php     |  2 ++
 3 files changed, 34 insertions(+)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 58949b88e408d..d3c51e2acc394 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -7,6 +7,37 @@ DependencyInjection
  * Deprecate `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`, use `inline_factories` and `inline_class_loader` instead
  * Deprecate undefined and numeric keys with `service_locator` config, use string aliases instead
 
+FrameworkBundle
+---------------
+
+ * Deprecate `framework:exceptions` tag, unwrap it and replace `framework:exception` tags' `name` attribute by `class`
+
+   Before:
+   ```xml
+   <!-- config/packages/framework.xml -->
+   <framework:config>
+       <framework:exceptions>
+           <framework:exception
+               name="Symfony\Component\HttpKernel\Exception\BadRequestHttpException"
+               log-level="info"
+               status-code="422"
+           />
+       </framework:exceptions>
+   </framework:config>
+   ```
+
+   After:
+   ```xml
+   <!-- config/packages/framework.xml -->
+   <framework:config>
+       <framework:exception
+           class="Symfony\Component\HttpKernel\Exception\BadRequestHttpException"
+           log-level="info"
+           status-code="422"
+       />
+   </framework:config>
+   ```
+
 HttpKernel
 ----------
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 2967592e00109..443b2e2792371 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Allow to avoid `limit` definition in a RateLimiter configuration when using the `no_limit` policy
  * Add `--format` option to the `debug:config` command
  * Add support to pass namespace wildcard in `framework.messenger.routing`
+ * Deprecate `framework:exceptions` tag, unwrap it and replace `framework:exception` tags' `name` attribute by `class`
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index f83969ea48d6b..44e812e735538 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1202,6 +1202,8 @@ private function addExceptionsSection(ArrayNodeDefinition $rootNode)
                                 return $v;
                             }
 
+                            trigger_deprecation('symfony/framework-bundle', '6.3', '"framework:exceptions" tag is deprecated. Unwrap it and replace your "framework:exception" tags\' "name" attribute by "class".');
+
                             $v = $v['exception'];
                             unset($v['exception']);
 

From f0aa02ac53fd0d52e3410e681d95ad56e0d240c4 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Thu, 22 Dec 2022 13:47:53 +0100
Subject: [PATCH 084/475] [WebProfilerBundle] Misc code updates in controller
 and templates

---
 .../Controller/ProfilerController.php         | 38 +++++--------------
 .../views/Collector/events.html.twig          |  6 +--
 .../Resources/views/Collector/form.html.twig  | 12 ++----
 .../views/Collector/logger.html.twig          | 10 +----
 .../views/Collector/mailer.html.twig          |  2 +-
 .../views/Collector/messenger.html.twig       | 10 ++---
 .../views/Collector/serializer.html.twig      | 14 +++----
 .../Resources/views/Collector/time.html.twig  | 23 ++++-------
 .../views/Collector/translation.html.twig     |  8 ++--
 .../views/Profiler/results.html.twig          |  8 ++--
 10 files changed, 40 insertions(+), 91 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
index 83257e26f8c3a..be5b7883285ec 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -172,38 +172,18 @@ public function searchBarAction(Request $request): Response
 
         $this->cspHandler?->disableCsp();
 
-        if (!$request->hasSession()) {
-            $ip =
-            $method =
-            $statusCode =
-            $url =
-            $start =
-            $end =
-            $limit =
-            $token = null;
-        } else {
-            $session = $request->getSession();
-
-            $ip = $request->query->get('ip', $session->get('_profiler_search_ip'));
-            $method = $request->query->get('method', $session->get('_profiler_search_method'));
-            $statusCode = $request->query->get('status_code', $session->get('_profiler_search_status_code'));
-            $url = $request->query->get('url', $session->get('_profiler_search_url'));
-            $start = $request->query->get('start', $session->get('_profiler_search_start'));
-            $end = $request->query->get('end', $session->get('_profiler_search_end'));
-            $limit = $request->query->get('limit', $session->get('_profiler_search_limit'));
-            $token = $request->query->get('token', $session->get('_profiler_search_token'));
-        }
+        $session = $request->hasSession() ? $request->getSession() : null;
 
         return new Response(
             $this->twig->render('@WebProfiler/Profiler/search.html.twig', [
-                'token' => $token,
-                'ip' => $ip,
-                'method' => $method,
-                'status_code' => $statusCode,
-                'url' => $url,
-                'start' => $start,
-                'end' => $end,
-                'limit' => $limit,
+                'token' => $request->query->get('token', $session?->get('_profiler_search_token')),
+                'ip' => $request->query->get('ip', $session?->get('_profiler_search_ip')),
+                'method' => $request->query->get('method', $session?->get('_profiler_search_method')),
+                'status_code' => $request->query->get('status_code', $session?->get('_profiler_search_status_code')),
+                'url' => $request->query->get('url', $session?->get('_profiler_search_url')),
+                'start' => $request->query->get('start', $session?->get('_profiler_search_start')),
+                'end' => $request->query->get('end', $session?->get('_profiler_search_end')),
+                'limit' => $request->query->get('limit', $session?->get('_profiler_search_limit')),
                 'request' => $request,
                 'render_hidden_by_default' => false,
             ]),
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig
index 33f33b235963a..8dadefa661745 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig
@@ -1,7 +1,5 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
-{% import _self as helper %}
-
 {% block menu %}
 <span class="label">
     <span class="icon">{{ source('@WebProfiler/Icon/event.svg') }}</span>
@@ -22,7 +20,7 @@
                 <h3 class="tab-title">Called Listeners <span class="badge">{{ collector.calledlisteners|length }}</span></h3>
 
                 <div class="tab-content">
-                    {{ helper.render_table(collector.calledlisteners) }}
+                    {{ _self.render_table(collector.calledlisteners) }}
                 </div>
             </div>
 
@@ -41,7 +39,7 @@
                             </p>
                         </div>
                     {% else %}
-                        {{ helper.render_table(collector.notcalledlisteners) }}
+                        {{ _self.render_table(collector.notcalledlisteners) }}
                     {% endif %}
                 </div>
             </div>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
index 81973186f563b..3dcd475dcd7ea 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -1,7 +1,5 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
-{% from _self import form_tree_entry, form_tree_details %}
-
 {% block toolbar %}
     {% if collector.data.nb_errors > 0 or collector.data.forms|length %}
         {% set status_color = collector.data.nb_errors ? 'red' %}
@@ -180,14 +178,14 @@
         <div id="tree-menu" class="tree">
             <ul>
             {% for formName, formData in collector.data.forms %}
-                {{ form_tree_entry(formName, formData, true) }}
+                {{ _self.form_tree_entry(formName, formData, true) }}
             {% endfor %}
             </ul>
         </div>
 
         <div id="tree-details-container">
             {% for formName, formData in collector.data.forms %}
-                {{ form_tree_details(formName, formData, collector.data.forms_by_hash, loop.first) }}
+                {{ _self.form_tree_details(formName, formData, collector.data.forms_by_hash, loop.first) }}
             {% endfor %}
         </div>
     {% else %}
@@ -416,7 +414,6 @@
 {% endblock %}
 
 {% macro form_tree_entry(name, data, is_root) %}
-    {% import _self as tree %}
     {% set has_error = data.errors is defined and data.errors|length > 0 %}
     <li>
         <div class="tree-inner" data-tab-target-id="{{ data.id }}-details" title="{{ name|default('(no name)') }}">
@@ -438,7 +435,7 @@
         {% if data.children is not empty %}
             <ul id="{{ data.id }}-children" {% if not is_root and not data.has_children_error|default(false) %}class="hidden"{% endif %}>
                 {% for childName, childData in data.children %}
-                    {{ tree.form_tree_entry(childName, childData, false) }}
+                    {{ _self.form_tree_entry(childName, childData, false) }}
                 {% endfor %}
             </ul>
         {% endif %}
@@ -446,7 +443,6 @@
 {% endmacro %}
 
 {% macro form_tree_details(name, data, forms_by_hash, show) %}
-    {% import _self as tree %}
     <div class="tree-details{% if not show|default(false) %} hidden{% endif %}" {% if data.id is defined %}id="{{ data.id }}-details"{% endif %}>
         <h2>{{ name|default('(no name)') }}</h2>
         {% if data.type_class is defined %}
@@ -509,7 +505,7 @@
     </div>
 
     {% for childName, childData in data.children %}
-        {{ tree.form_tree_details(childName, childData, forms_by_hash) }}
+        {{ _self.form_tree_details(childName, childData, forms_by_hash) }}
     {% endfor %}
 {% endmacro %}
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
index dc9abc3e00cb4..385c80795fdd9 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -1,7 +1,5 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
-{% import _self as helper %}
-
 {% block toolbar %}
     {% if collector.counterrors or collector.countdeprecations or collector.countwarnings %}
         {% set icon %}
@@ -163,7 +161,7 @@
                         </td>
 
                         <td class="font-normal">
-                            {{ helper.render_log_message('debug', loop.index, log) }}
+                            {{ _self.render_log_message('debug', loop.index, log) }}
                         </td>
                     </tr>
                 {% endfor %}
@@ -177,11 +175,7 @@
         <script>Sfjs.initializeLogsTable();</script>
     {% endif %}
 
-    {% set compilerLogTotal = 0 %}
-    {% for logs in collector.compilerLogs %}
-        {% set compilerLogTotal = compilerLogTotal + logs|length %}
-    {% endfor %}
-
+    {% set compilerLogTotal = collector.compilerLogs|reduce((total, logs) => total + logs|length, 0) %}
     <details class="container-compilation-logs">
         <summary>
             <h4>Container Compilation Logs <span class="text-muted">({{ compilerLogTotal }})</span></h4>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
index 651c2a1626198..6435cf99e102a 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
@@ -151,7 +151,7 @@
                         {% if message.attachments %}
                             <div class="card-block">
                                 {% set num_of_attachments = message.attachments|length %}
-                                {% set total_attachments_size_in_bytes = message.attachments|reduce((total_size, attachment) => total_size + attachment.body|length) %}
+                                {% set total_attachments_size_in_bytes = message.attachments|reduce((total_size, attachment) => total_size + attachment.body|length, 0) %}
                                 <p class="mailer-message-attachments-title">
                                     {{ source('@WebProfiler/Icon/attachment.svg') }}
                                     Attachments <span>({{ num_of_attachments }} file{{ num_of_attachments > 1 ? 's' }} / {{ _self.render_file_size_humanized(total_attachments_size_in_bytes) }})</span>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
index 1dc5accf1c3a4..cd1b9ece321ed 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
@@ -1,7 +1,5 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
-{% import _self as helper %}
-
 {% block toolbar %}
     {% if collector.messages|length > 0 %}
         {% set status_color = collector.exceptionsCount ? 'red' %}
@@ -61,8 +59,6 @@
 {% endblock %}
 
 {% block panel %}
-    {% import _self as helper %}
-
     <h2>Messages</h2>
 
     {% if collector.messages is empty %}
@@ -71,7 +67,7 @@
         </div>
     {% elseif 1 == collector.buses|length %}
         <p class="text-muted">Ordered list of dispatched messages across all your buses</p>
-        {{ helper.render_bus_messages(collector.messages, true) }}
+        {{ _self.render_bus_messages(collector.messages, true) }}
     {% else %}
         <div class="sf-tabs message-bus">
             <div class="tab">
@@ -81,7 +77,7 @@
 
                 <div class="tab-content">
                     <p class="text-muted">Ordered list of dispatched messages across all your buses</p>
-                    {{ helper.render_bus_messages(messages, true) }}
+                    {{ _self.render_bus_messages(messages, true) }}
                 </div>
             </div>
 
@@ -93,7 +89,7 @@
 
                     <div class="tab-content">
                         <p class="text-muted">Ordered list of messages dispatched on the <code>{{ bus }}</code> bus</p>
-                        {{ helper.render_bus_messages(messages) }}
+                        {{ _self.render_bus_messages(messages) }}
                     </div>
                 </div>
             {% endfor %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/serializer.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/serializer.html.twig
index 455c49839d296..238444a0052ef 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/serializer.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/serializer.html.twig
@@ -1,7 +1,5 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
-{% import _self as helper %}
-
 {% block toolbar %}
     {% if collector.handledCount > 0 %}
         {% set icon %}
@@ -89,14 +87,14 @@
             </div>
 
             <div class="sf-tabs">
-                {{ helper.render_serialize_tab(collector.data, true) }}
-                {{ helper.render_serialize_tab(collector.data, false) }}
+                {{ _self.render_serialize_tab(collector.data, true) }}
+                {{ _self.render_serialize_tab(collector.data, false) }}
 
-                {{ helper.render_normalize_tab(collector.data, true) }}
-                {{ helper.render_normalize_tab(collector.data, false) }}
+                {{ _self.render_normalize_tab(collector.data, true) }}
+                {{ _self.render_normalize_tab(collector.data, false) }}
 
-                {{ helper.render_encode_tab(collector.data, true) }}
-                {{ helper.render_encode_tab(collector.data, false) }}
+                {{ _self.render_encode_tab(collector.data, true) }}
+                {{ _self.render_encode_tab(collector.data, false) }}
             </div>
         {% endif %}
     </div>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
index 9db62e5b439a7..57f85cdfe9ec3 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
@@ -1,7 +1,5 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
-{% import _self as helper %}
-
 {% block toolbar %}
     {% set has_time_events = collector.events|length > 0 %}
     {% set total_time = has_time_events ? '%.0f'|format(collector.duration) : 'n/a' %}
@@ -70,14 +68,9 @@
                     <span class="label">Sub-Request{{ profile.children|length > 1 ? 's' }}</span>
                 </div>
 
-                {% if has_time_events %}
-                    {% set subrequests_time = 0 %}
-                    {% for child in profile.children %}
-                        {% set subrequests_time = subrequests_time + child.getcollector('time').events.__section__.duration %}
-                    {% endfor %}
-                {% else %}
-                    {% set subrequests_time = 'n/a' %}
-                {% endif %}
+                {% set subrequests_time = has_time_events
+                    ? profile.children|reduce((total, child) => total + child.getcollector('time').events.__section__.duration, 0)
+                    : 'n/a' %}
 
                 <div class="metric">
                     <span class="value">{{ subrequests_time }} <span class="unit">ms</span></span>
@@ -124,7 +117,7 @@
         </h3>
     {% endif %}
 
-    {{ helper.display_timeline(token, collector.events, collector.events.__section__.origin) }}
+    {{ _self.display_timeline(token, collector.events, collector.events.__section__.origin) }}
 
     {% if profile.children|length %}
         <p class="help">Note: sections with a striped background correspond to sub-requests.</p>
@@ -138,7 +131,7 @@
                 <small>{{ events.__section__.duration }} ms</small>
             </h4>
 
-            {{ helper.display_timeline(child.token, events, collector.events.__section__.origin) }}
+            {{ _self.display_timeline(child.token, events, collector.events.__section__.origin) }}
         {% endfor %}
     {% endif %}
 
@@ -159,12 +152,11 @@
 
 {% macro dump_request_data(token, events, origin) %}
 {% autoescape 'js' %}
-{% from _self import dump_events %}
 {
     id: "{{ token }}",
     left: {{ "%F"|format(events.__section__.origin - origin) }},
     end: "{{ '%F'|format(events.__section__.endtime) }}",
-    events: [ {{ dump_events(events) }} ],
+    events: [ {{ _self.dump_events(events) }} ],
 }
 {% endautoescape %}
 {% endmacro %}
@@ -199,7 +191,6 @@
 {% endmacro %}
 
 {% macro display_timeline(token, events, origin) %}
-{% import _self as helper %}
     <div class="sf-profiler-timeline">
         <div id="legend-{{ token }}" class="legends"></div>
         <svg id="timeline-{{ token }}" class="timeline-graph"></s
10000
vg>
@@ -212,7 +203,7 @@
                     new SvgRenderer(document.getElementById('timeline-{{ token }}')),
                     new Legend(document.getElementById('legend-{{ token }}'), theme),
                     document.getElementById('threshold'),
-                    {{ helper.dump_request_data(token, events, origin) }}
+                    {{ _self.dump_request_data(token, events, origin) }}
                 );
             });
         {% endautoescape %}</script>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
index 13503feeb4c05..c8190f5bfec66 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/translation.html.twig
@@ -1,7 +1,5 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
-{% import _self as helper %}
-
 {% block toolbar %}
     {% if collector.messages|length %}
         {% set icon %}
@@ -105,7 +103,7 @@
                         </div>
                     {% else %}
                         {% block defined_messages %}
-                            {{ helper.render_table(messages_defined) }}
+                            {{ _self.render_table(messages_defined) }}
                         {% endblock %}
                     {% endif %}
                 </div>
@@ -126,7 +124,7 @@
                         </div>
                     {% else %}
                         {% block fallback_messages %}
-                            {{ helper.render_table(messages_fallback, true) }}
+                            {{ _self.render_table(messages_fallback, true) }}
                         {% endblock %}
                     {% endif %}
                 </div>
@@ -148,7 +146,7 @@
                         </div>
                     {% else %}
                         {% block missing_messages %}
-                            {{ helper.render_table(messages_missing) }}
+                            {{ _self.render_table(messages_missing) }}
                         {% endblock %}
                     {% endif %}
                 </div>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig
index 0705b1e7270c0..ae18451444218 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig
@@ -6,8 +6,6 @@
     {%- endif -%}
 {% endmacro %}
 
-{% import _self as helper %}
-
 {% block summary %}
     <div class="status">
         <h2>Profile Search</h2>
@@ -41,14 +39,14 @@
                             <span class="label {{ css_class }}">{{ result.status_code|default('n/a') }}</span>
                         </td>
                         <td>
-                            <span class="nowrap">{{ result.ip }} {{ helper.profile_search_filter(request, result, 'ip') }}</span>
+                            <span class="nowrap">{{ result.ip }} {{ _self.profile_search_filter(request, result, 'ip') }}</span>
                         </td>
                         <td>
-                            <span class="nowrap">{{ result.method }} {{ helper.profile_search_filter(request, result, 'method') }}</span>
+                            <span class="nowrap">{{ result.method }} {{ _self.profile_search_filter(request, result, 'method') }}</span>
                         </td>
                         <td class="break-long-words">
                             {{ result.url }}
-                            {{ helper.profile_search_filter(request, result, 'url') }}
+                            {{ _self.profile_search_filter(request, result, 'url') }}
                         </td>
                         <td class="text-small">
                             <span class="nowrap">{{ result.time|date('d-M-Y') }}</span>

From 01183483de5242320a5fe610a7f595bce2af9e25 Mon Sep 17 00:00:00 2001
From: Sylvain BEISSIER <sylvain.beissier@gmail.com>
Date: Thu, 15 Dec 2022 20:33:02 +0100
Subject: [PATCH 085/475] [Validator] Add `getConstraint()` method to
 `ConstraintViolationInterface`

---
 UPGRADE-6.3.md                                              | 6 ++++++
 src/Symfony/Component/Validator/CHANGELOG.md                | 1 +
 .../Component/Validator/ConstraintViolationInterface.php    | 5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 77c7858198d80..f3b440e38b4b6 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -23,3 +23,9 @@ SecurityBundle
 --------------
 
  * Deprecate enabling bundle and not configuring it
+
+
+Validator
+--------------
+
+* Implementing the `ConstraintViolationInterface` without implementing the `getConstraint()` method is deprecated
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
index ca83f3af0a3f1..fbd40a2077ebb 100644
--- a/src/Symfony/Component/Validator/CHANGELOG.md
+++ b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 6.3
 ---
 
+ * Add method `getConstraint()` to `ConstraintViolationInterface`
  * Add `Uuid::TIME_BASED_VERSIONS` to match that a UUID being validated embeds a timestamp
  * Add the `pattern` parameter in violations of the `Regex` constraint
 
diff --git a/src/Symfony/Component/Validator/ConstraintViolationInterface.php b/src/Symfony/Component/Validator/ConstraintViolationInterface.php
index 6000a7aa6aaab..6eb27974061d2 100644
--- a/src/Symfony/Component/Validator/ConstraintViolationInterface.php
+++ b/src/Symfony/Component/Validator/ConstraintViolationInterface.php
@@ -31,8 +31,9 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @method mixed  getCause()   Returns the cause of the violation. Not implementing it is deprecated since Symfony 6.2.
- * @method string __toString() Converts the violation into a string for debugging purposes. Not implementing it is deprecated since Symfony 6.1.
+ * @method Constraint|null getConstraint() Returns the constraint whose validation caused the violation. Not implementing it is deprecated since Symfony 6.3.
+ * @method mixed           getCause()      Returns the cause of the violation. Not implementing it is deprecated since Symfony 6.2.
+ * @method string          __toString()    Converts the violation into a string for debugging purposes. Not implementing it is deprecated since Symfony 6.1.
  */
 interface ConstraintViolationInterface
 {

From 0a0a98aebbeca7008d2c30e97b49570b64c9bb27 Mon Sep 17 00:00:00 2001
From: MatTheCat <math.lechat@gmail.com>
Date: Tue, 29 Nov 2022 13:06:44 +0100
Subject: [PATCH 086/475] [SecurityBundle] Rename
 `firewalls.logout.csrf_token_generator` to
 `firewalls.logout.csrf_token_manager`

---
 UPGRADE-6.3.md                                |  3 ++-
 .../Bundle/SecurityBundle/CHANGELOG.md        |  1 +
 .../DependencyInjection/MainConfiguration.php | 23 ++++++++++++++----
 .../DependencyInjection/SecurityExtension.php |  4 ++--
 .../MainConfigurationTest.php                 | 24 +++++++++----------
 .../app/CsrfFormLogin/base_config.yml         |  2 +-
 6 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index f7b956e5dbc69..3b664018a9111 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -60,4 +60,5 @@ SecurityBundle
 Validator
 --------------
 
-* Implementing the `ConstraintViolationInterface` without implementing the `getConstraint()` method is deprecated
+ * Implementing the `ConstraintViolationInterface` without implementing the `getConstraint()` method is deprecated
+ * Deprecate the `security.firewalls.logout.csrf_token_generator` config option, use `security.firewalls.logout.csrf_token_manager` instead
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index 4ab9103275bb4..def296d23df5e 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * Add `StatelessAuthenticatorFactoryInterface` for authenticators targeting `stateless` firewalls only and that don't require a user provider
  * Modify "icon.svg" to improve accessibility for blind/low vision users
  * Make `Security::login()` return the authenticator response
+ * Deprecate the `security.firewalls.logout.csrf_token_generator` config option, use `security.firewalls.logout.csrf_token_manager` instead
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index 25778ea851dd7..44d925c1f1c0b 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -217,12 +217,20 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                 ->treatTrueLike([])
                 ->canBeUnset()
                 ->beforeNormalization()
-                    ->ifTrue(fn ($v): bool => \is_array($v) && (isset($v['csrf_token_generator']) xor isset($v['enable_csrf'])))
+                    ->ifTrue(fn ($v): bool => isset($v['csrf_token_generator']) && !isset($v['csrf_token_manager']))
                     ->then(function (array $v): array {
-                        if (isset($v['csrf_token_generator'])) {
+                        $v['csrf_token_manager'] = $v['csrf_token_generator'];
+
+                        return $v;
+                    })
+                ->end()
+                ->beforeNormalization()
+                    ->ifTrue(fn ($v): bool => \is_array($v) && (isset($v['csrf_token_manager']) xor isset($v['enable_csrf'])))
+                    ->then(function (array $v): array {
+                        if (isset($v['csrf_token_manager'])) {
                             $v['enable_csrf'] = true;
                         } elseif ($v['enable_csrf']) {
-                            $v['csrf_token_generator'] = 'security.csrf.token_manager';
+                            $v['csrf_token_manager'] = 'security.csrf.token_manager';
                         }
 
                         return $v;
@@ -232,7 +240,14 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                     ->booleanNode('enable_csrf')->defaultNull()->end()
                     ->scalarNode('csrf_token_id')->defaultValue('logout')->end()
                     ->scalarNode('csrf_parameter')->defaultValue('_csrf_token')->end()
-                    ->scalarNode('csrf_token_generator')->end()
+                    ->scalarNode('csrf_token_generator')
+                        ->setDeprecated(
+                            'symfony/security-bundle',
+                            '6.3',
+                            'The "%node%" option is deprecated. Use "csrf_token_manager" instead.'
+                        )
+                    ->end()
+                    ->scalarNode('csrf_token_manager')->end()
                     ->scalarNode('path')->defaultValue('/logout')->end()
                     ->scalarNode('target')->defaultValue('/')->end()
                     ->booleanNode('invalidate_session')->defaultTrue()->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 9aa0293651b37..d1724dd81b621 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -458,7 +458,7 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
 
             // add CSRF provider
             if ($firewall['logout']['enable_csrf']) {
-                $logoutListener->addArgument(new Reference($firewall['logout']['csrf_token_generator']));
+                $logoutListener->addArgument(new Reference($firewall['logout']['csrf_token_manager']));
             }
 
             // add session logout listener
@@ -482,7 +482,7 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
                     $firewall['logout']['path'],
                     $firewall['logout']['csrf_token_id'],
                     $firewall['logout']['csrf_parameter'],
-                    isset($firewall['logout']['csrf_token_generator']) ? new Reference($firewall['logout']['csrf_token_generator']) : null,
+                    isset($firewall['logout']['csrf_token_manager']) ? new Reference($firewall['logout']['csrf_token_manager']) : null,
                     false === $firewall['stateless'] && isset($firewall['context']) ? $firewall['context'] : null,
                 ])
             ;
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php
index 20bc11269fa6f..9765ff28338f1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php
@@ -71,7 +71,7 @@ public function testCsrfAliases()
             'firewalls' => [
                 'stub' => [
                     'logout' => [
-                        'csrf_token_generator' => 'a_token_generator',
+                        'csrf_token_manager' => 'a_token_manager',
                         'csrf_token_id' => 'a_token_id',
                     ],
                 ],
@@ -82,8 +82,8 @@ public function testCsrfAliases()
         $processor = new Processor();
         $configuration = new MainConfiguration([], []);
         $processedConfig = $processor->processConfiguration($configuration, [$config]);
-        $this->assertArrayHasKey('csrf_token_generator', $processedConfig['firewalls']['stub']['logout']);
-        $this->assertEquals('a_token_generator', $processedConfig['firewalls']['stub']['logout']['csrf_token_generator']);
+        $this->assertArrayHasKey('csrf_token_manager', $processedConfig['firewalls']['stub']['logout']);
+        $this->assertEquals('a_token_manager', $processedConfig['firewalls']['stub']['logout']['csrf_token_manager']);
         $this->assertArrayHasKey('csrf_token_id', $processedConfig['firewalls']['stub']['logout']);
         $this->assertEquals('a_token_id', $processedConfig['firewalls']['stub']['logout']['csrf_token_id']);
     }
@@ -92,13 +92,13 @@ public function testLogoutCsrf()
     {
         $config = [
             'firewalls' => [
-                'custom_token_generator' => [
+                'custom_token_manager' => [
                     'logout' => [
-                        'csrf_token_generator' => 'a_token_generator',
+                        'csrf_token_manager' => 'a_token_manager',
                         'csrf_token_id' => 'a_token_id',
                     ],
                 ],
-                'default_token_generator' => [
+                'default_token_manager' => [
                     'logout' => [
                         'enable_csrf' => true,
                         'csrf_token_id' => 'a_token_id',
@@ -121,18 +121,18 @@ public function testLogoutCsrf()
         $processedConfig = $processor->processConfiguration($configuration, [$config]);
 
         $assertions = [
-            'custom_token_generator' => [true, 'a_token_generator'],
-            'default_token_generator' => [true, 'security.csrf.token_manager'],
+            'custom_token_manager' => [true, 'a_token_manager'],
+            'default_token_manager' => [true, 'security.csrf.token_manager'],
             'disabled_csrf' => [false, null],
             'empty' => [false, null],
         ];
-        foreach ($assertions as $firewallName => [$enabled, $tokenGenerator]) {
+        foreach ($assertions as $firewallName => [$enabled, $tokenManager]) {
             $this->assertEquals($enabled, $processedConfig['firewalls'][$firewallName]['logout']['enable_csrf']);
-            if ($tokenGenerator) {
-                $this->assertEquals($tokenGenerator, $processedConfig['firewalls'][$firewallName]['logout']['csrf_token_generator']);
+            if ($tokenManager) {
+                $this->assertEquals($tokenManager, $processedConfig['firewalls'][$firewallName]['logout']['csrf_token_manager']);
                 $this->assertEquals('a_token_id', $processedConfig['firewalls'][$firewallName]['logout']['csrf_token_id']);
             } else {
-                $this->assertArrayNotHasKey('csrf_token_generator', $processedConfig['firewalls'][$firewallName]['logout']);
+                $this->assertArrayNotHasKey('csrf_token_manager', $processedConfig['firewalls'][$firewallName]['logout']);
             }
         }
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/base_config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/base_config.yml
index 069fece61756f..9f84b66ee67c1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/base_config.yml
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/base_config.yml
@@ -43,7 +43,7 @@ security:
             logout:
                 path: /logout_path
                 target: /
-                csrf_token_generator: security.csrf.token_manager
+                csrf_token_manager: security.csrf.token_manager
 
     access_control:
         - { path: .*, roles: IS_AUTHENTICATED_FULLY }

From 377982f285cf021ce55ef7018dfc520d610fdaed Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 22 Dec 2022 18:12:21 +0100
Subject: [PATCH 087/475] Fix typo

---
 UPGRADE-6.3.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 3b664018a9111..b626a000b508f 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -55,10 +55,9 @@ SecurityBundle
 --------------
 
  * Deprecate enabling bundle and not configuring it
-
+ * Deprecate the `security.firewalls.logout.csrf_token_generator` config option, use `security.firewalls.logout.csrf_token_manager` instead
 
 Validator
---------------
+---------
 
  * Implementing the `ConstraintViolationInterface` without implementing the `getConstraint()` method is deprecated
- * Deprecate the `security.firewalls.logout.csrf_token_generator` config option, use `security.firewalls.logout.csrf_token_manager` instead

From 5308c7c845fbd92770eda82f918813da75be1c29 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 22 Dec 2022 16:57:59 +0100
Subject: [PATCH 088/475] [HttpClient] Remove dead code

---
 src/Symfony/Component/HttpClient/Response/MockResponse.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php
index e75a6ead8be38..59e73ba1ba176 100644
--- a/src/Symfony/Component/HttpClient/Response/MockResponse.php
+++ b/src/Symfony/Component/HttpClient/Response/MockResponse.php
@@ -186,11 +186,6 @@ protected static function perform(ClientState $multi, array &$responses): void
                     $chunk[1]->getHeaders(false);
                     self::readResponse($response, $chunk[0], $chunk[1], $offset);
                     $multi->handlesActivity[$id][] = new FirstChunk();
-                    $buffer = $response->requestOptions['buffer'] ?? null;
-
-                    if ($buffer instanceof \Closure && $response->content = $buffer($response->headers) ?: null) {
-                        $response->content = \is_resource($response->content) ? $response->content : fopen('php://temp', 'w+');
-                    }
                 } catch (\Throwable $e) {
                     $multi->handlesActivity[$id][] = null;
                     $multi->handlesActivity[$id][] = $e;

From 983cd082d0cf698d5355a74ae27c74b2dc1fee40 Mon Sep 17 00:00:00 2001
From: rodmen <rodmen@gmail.com>
Date: Mon, 19 Dec 2022 12:25:51 -0300
Subject: [PATCH 089/475] [DependencyInjection] Target Attribute must fail if
 the target does not exist

---
 .../DependencyInjection/Attribute/Target.php      |  6 ++++--
 .../Component/DependencyInjection/CHANGELOG.md    |  1 +
 .../DependencyInjection/Compiler/AutowirePass.php | 12 ++++++++++--
 .../Tests/Compiler/AutowirePassTest.php           | 15 +++++++++++++++
 .../RegisterServiceSubscribersPassTest.php        |  2 +-
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Attribute/Target.php b/src/Symfony/Component/DependencyInjection/Attribute/Target.php
index 7751b3813bada..b935500e9737d 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/Target.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/Target.php
@@ -28,13 +28,15 @@ public function __construct(string $name)
         $this->name = lcfirst(str_replace(' ', '', ucwords(preg_replace('/[^a-zA-Z0-9\x7f-\xff]++/', ' ', $name))));
     }
 
-    public static function parseName(\ReflectionParameter $parameter): string
+    public static function parseName(\ReflectionParameter $parameter, self &$attribute = null): string
     {
+        $attribute = null;
         if (!$target = $parameter->getAttributes(self::class)[0] ?? null) {
             return $parameter->name;
         }
 
-        $name = $target->newInstance()->name;
+        $attribute = $target->newInstance();
+        $name = $attribute->name;
 
         if (!preg_match('/^[a-zA-Z_\x7f-\xff]/', $name)) {
             if (($function = $parameter->getDeclaringFunction()) instanceof \ReflectionMethod) {
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index e1d0dda20d6ff..81dec56e681f3 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * Add `RemoveBuildParametersPass`, which removes parameters starting with a dot during compilation
  * Add support for nesting autowiring-related attributes into `#[Autowire(...)]`
  * Deprecate undefined and numeric keys with `service_locator` config
+ * Fail if Target attribute does not exist during compilation
 
 6.2
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 09b0490adf4c8..66a175d76c267 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -128,7 +128,7 @@ private function doProcessValue(mixed $value, bool $isRoot = false): mixed
                     return $this->processAttribute($attribute, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $value->getInvalidBehavior());
                 }
 
-                $value = new TypedReference($value->getType(), $value->getType(), $value->getInvalidBehavior(), $attribute->name);
+                $value = new TypedReference($value->getType(), $value->getType(), $value->getInvalidBehavior(), $attribute->name, [$attribute]);
             }
             if ($ref = $this->getAutowiredReference($value, true)) {
                 return $ref;
@@ -332,7 +332,8 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
             }
 
             $getValue = function () use ($type, $parameter, $class, $method) {
-                if (!$value = $this->getAutowiredReference($ref = new TypedReference($type, $type, ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE, Target::parseName($parameter)), false)) {
+                $name = Target::parseName($parameter, $target);
+                if (!$value = $this->getAutowiredReference($ref = new TypedReference($type, $type, ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE, $name, $target ? [$target] : []), false)) {
                     $failureMessage = $this->createTypeNotFoundMessageCallback($ref, sprintf('argument "$%s" of method "%s()"', $parameter->name, $class !== $this->currentId ? $class.'::'.$method : $method));
 
                     if ($parameter->isDefaultValueAvailable()) {
@@ -420,6 +421,10 @@ private function getAutowiredReference(TypedReference $reference, bool $filterTy
                     }
                 }
             }
+
+            if ($reference->getAttributes()) {
+                return null;
+            }
         }
 
         if ($this->container->has($type) && !$this->container->findDefinition($type)->isAbstract()) {
@@ -544,6 +549,9 @@ private function createTypeNotFoundMessage(TypedReference $reference, string $la
             }
 
             $message = sprintf('has type "%s" but this class %s.', $type, $parentMsg ? sprintf('is missing a parent class (%s)', $parentMsg) : 'was not found');
+        } elseif ($reference->getAttributes()) {
+            $message = $label;
+            $label = sprintf('"#[Target(\'%s\')" on', $reference->getName());
         } else {
             $alternatives = $this->createTypeAlternatives($this->container, $reference);
             $message = $this->container->has($type) ? 'this service is abstract' : 'no such service exists';
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index c766bed6aefa4..8224150357dda 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -1142,6 +1142,21 @@ public function testArgumentWithTarget()
         $this->assertSame(BarInterface::class.' $imageStorage', (string) $container->getDefinition('with_target')->getArgument(0));
     }
 
+    public function testArgumentWithTypoTarget()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(BarInterface::class, BarInterface::class);
+        $container->register(BarInterface::class.' $iamgeStorage', BarInterface::class);
+        $container->register('with_target', WithTarget::class)
+            ->setAutowired(true);
+
+        $this->expectException(AutowiringFailedException::class);
+        $this->expectExceptionMessage('Cannot autowire service "with_target": "#[Target(\'imageStorage\')" on argument "$bar" of method "Symfony\Component\DependencyInjection\Tests\Fixtures\WithTarget::__construct()"');
+
+        (new AutowirePass())->process($container);
+    }
+
     public function testDecorationWithServiceAndAliasedInterface()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
index 0f8fff4eed26f..ba979be80bc04 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
@@ -463,7 +463,7 @@ public static function getSubscribedServices(): array
             'autowired.nullable' => new ServiceClosureArgument(new Reference('service.id', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
             'autowired.parameter' => new ServiceClosureArgument('foobar'),
             'map.decorated' => new ServiceClosureArgument(new Reference('.service_locator.oZHAdom.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
-            'target' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'someTarget')),
+            'target' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'someTarget', [new Target('someTarget')])),
         ];
         $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
     }

From 87cf70a712dddadf3b081e00e297edc4a5bb668e Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 28 Dec 2022 11:53:18 +0100
Subject: [PATCH 090/475] [DependencyInjection] Cut compilation time

---
 .../Compiler/InlineServiceDefinitionsPass.php | 14 +++++++++-----
 .../DependencyInjection/ContainerBuilder.php  | 19 +++++++++++++++++--
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
index 0fff617508791..951f2542304b2 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -51,6 +51,7 @@ public function process(ContainerBuilder $container)
             $analyzedContainer = $container;
         }
         try {
+            $notInlinableIds = [];
             $remainingInlinedIds = [];
             $this->connectedIds = $this->notInlinedIds = $container->getDefinitions();
             do {
@@ -60,7 +61,8 @@ public function process(ContainerBuilder $container)
                 }
                 $this->graph = $analyzedContainer->getCompiler()->getServiceReferenceGraph();
                 $notInlinedIds = $this->notInlinedIds;
-                $this->connectedIds = $this->notInlinedIds = $this->inlinedIds = [];
+                $notInlinableIds += $this->notInlinableIds;
+                $this->connectedIds = $this->notInlinedIds = $this->inlinedIds = $this->notInlinableIds = [];
 
                 foreach ($analyzedContainer->getDefinitions() as $id => $definition) {
                     if (!$this->graph->hasNode($id)) {
@@ -86,7 +88,7 @@ public function process(ContainerBuilder $container)
             } while ($this->inlinedIds && $this->analyzingPass);
 
             foreach ($remainingInlinedIds as $id) {
-                if (isset($this->notInlinableIds[$id])) {
+                if (isset($notInlinableIds[$id])) {
                     continue;
                 }
 
@@ -126,8 +128,10 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
 
         $definition = $this->container->getDefinition($id);
 
-        if (!$this->isInlineableDefinition($id, $definition)) {
-            $this->notInlinableIds[$id] = true;
+        if (isset($this->notInlinableIds[$id]) || !$this->isInlineableDefinition($id, $definition)) {
+            if ($this->currentId !== $id) {
+                $this->notInlinableIds[$id] = true;
+            }
 
             return $value;
         }
@@ -188,7 +192,7 @@ private function isInlineableDefinition(string $id, Definition $definition): boo
             return true;
         }
 
-        if ($this->currentId == $id) {
+        if ($this->currentId === $id) {
             return false;
         }
         $this->connectedIds[$id] = true;
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index ae7ca22ee5035..63e288adc63b3 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -114,6 +114,11 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      */
     private array $vendors;
 
+    /**
+     * @var string[] the list of paths in vendor directories
+     */
+    private array $pathsInVendor = [];
+
     /**
      * @var array<string, ChildDefinition>
      */
@@ -1610,17 +1615,27 @@ private function getExpressionLanguage(): ExpressionLanguage
 
     private function inVendors(string $path): bool
     {
+        $path = is_file($path) ? \dirname($path) : $path;
+
+        if (isset($this->pathsInVendor[$path])) {
+            return $this->pathsInVendor[$path];
+        }
+
         $this->vendors ??= (new ComposerResource())->getVendors();
         $path = realpath($path) ?: $path;
 
+        if (isset($this->pathsInVendor[$path])) {
+            return $this->pathsInVendor[$path];
+        }
+
         foreach ($this->vendors as $vendor) {
             if (str_starts_with($path, $vendor) && false !== strpbrk(substr($path, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {
                 $this->addResource(new FileResource($vendor.'/composer/installed.json'));
 
-                return true;
+                return $this->pathsInVendor[$path] = true;
             }
         }
 
-        return false;
+        return $this->pathsInVendor[$path] = false;
     }
 }

From a8f8903a94b2ea8f29915eafd324ea0da5a4f79c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 19 Dec 2022 16:20:10 +0100
Subject: [PATCH 091/475] [DependencyInjection] Stop considering empty env vars
 as populated

---
 .../DependencyInjection/EnvVarProcessor.php    | 18 ++++++++----------
 .../Tests/EnvVarProcessorTest.php              |  9 +++++++++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
index c1787edfd7d57..44b8a312e2994 100644
--- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -145,18 +145,16 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
 
         if (false !== $i || 'string' !== $prefix) {
             $env = $getEnv($name);
-        } elseif (isset($_ENV[$name])) {
-            $env = $_ENV[$name];
-        } elseif (isset($_SERVER[$name]) && !str_starts_with($name, 'HTTP_')) {
-            $env = $_SERVER[$name];
-        } elseif (false === ($env = getenv($name)) || null === $env) { // null is a possible value because of thread safety issues
+        } elseif ('' === ($env = $_ENV[$name] ?? (str_starts_with($name, 'HTTP_') ? null : ($_SERVER[$name] ?? null)))
+            || false === ($env = $env ?? getenv($name) ?? false) // null is a possible value because of thread safety issues
+        ) {
             foreach ($this->loadedVars as $vars) {
-                if (false !== $env = ($vars[$name] ?? false)) {
+                if (false !== ($env = ($vars[$name] ?? false)) && '' !== $env) {
                     break;
                 }
             }
 
-            if (false === $env || null === $env) {
+            if (false === $env || '' === $env) {
                 $loaders = $this->loaders;
                 $this->loaders = new \ArrayIterator();
 
@@ -169,7 +167,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
                             continue;
                         }
                         $this->loadedVars[] = $vars = $loader->loadEnvVars();
-                        if (false !== $env = $vars[$name] ?? false) {
+                        if (false !== ($env = ($vars[$name] ?? false)) && '' !== $env) {
                             $ended = false;
                             break;
                         }
@@ -184,7 +182,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
                 }
             }
 
-            if (false === $env || null === $env) {
+            if (false === $env) {
                 if (!$this->container->hasParameter("env($name)")) {
                     throw new EnvNotFoundException(sprintf('Environment variable not found: "%s".', $name));
                 }
@@ -218,7 +216,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
         if (\in_array($prefix, ['bool', 'not'], true)) {
             $env = (bool) (filter_var($env, \FILTER_VALIDATE_BOOL) ?: filter_var($env, \FILTER_VALIDATE_INT) ?: filter_var($env, \FILTER_VALIDATE_FLOAT));
 
-            return 'not' === $prefix ? !$env : $env;
+            return 'not' === $prefix xor $env;
         }
 
         if ('int' === $prefix) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
index 0ea6aa5679096..3b663e6594934 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -744,12 +744,15 @@ public function validCsv()
 
     public function testEnvLoader()
     {
+        $_ENV['BAZ_ENV_LOADER'] = '';
+
         $loaders = function () {
             yield new class() implements EnvVarLoaderInterface {
                 public function loadEnvVars(): array
                 {
                     return [
                         'FOO_ENV_LOADER' => '123',
+                        'BAZ_ENV_LOADER' => '',
                     ];
                 }
             };
@@ -760,6 +763,7 @@ public function loadEnvVars(): array
                     return [
                         'FOO_ENV_LOADER' => '234',
                         'BAR_ENV_LOADER' => '456',
+                        'BAZ_ENV_LOADER' => '567',
                     ];
                 }
             };
@@ -773,8 +777,13 @@ public function loadEnvVars(): array
         $result = $processor->getEnv('string', 'BAR_ENV_LOADER', function () {});
         $this->assertSame('456', $result);
 
+        $result = $processor->getEnv('string', 'BAZ_ENV_LOADER', function () {});
+        $this->assertSame('567', $result);
+
         $result = $processor->getEnv('string', 'FOO_ENV_LOADER', function () {});
         $this->assertSame('123', $result); // check twice
+
+        unset($_ENV['BAZ_ENV_LOADER']);
     }
 
     public function testCircularEnvLoader()

From 9f5c00567537d2b6ba7265a9c74af85aecd44329 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 28 Dec 2022 14:45:14 +0100
Subject: [PATCH 092/475] [PhpUnitBridge] Revert "minor #48725 Remove calls to
 `AnnotationRegistry::registerLoader()`"

---
 composer.json                                            | 2 +-
 .../Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php  | 9 +++++++++
 src/Symfony/Bridge/PhpUnit/bootstrap.php                 | 9 +++++++++
 src/Symfony/Bridge/PhpUnit/composer.json                 | 1 -
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index f789f4458df03..48111c1e0839a 100644
--- a/composer.json
+++ b/composer.json
@@ -128,7 +128,7 @@
         "doctrine/collections": "^1.0|^2.0",
         "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "^2.13.1|^3.0",
-        "doctrine/orm": "^2.12",
+        "doctrine/orm": "^2.7.4",
         "egulias/email-validator": "^2.1.10|^3.1",
         "guzzlehttp/promises": "^1.4",
         "league/html-to-markdown": "^5.0",
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
index b97a11d614929..015bc881ae573 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\PhpUnit\Legacy;
 
+use Doctrine\Common\Annotations\AnnotationRegistry;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\RiskyTestError;
 use PHPUnit\Framework\TestCase;
@@ -129,6 +130,14 @@ public function startTestSuite($suite)
             echo "Testing $suiteName\n";
             $this->state = 0;
 
+            if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
+                if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
+                    AnnotationRegistry::registerUniqueLoader('class_exists');
+                } elseif (method_exists(AnnotationRegistry::class, 'registerLoader')) {
+                    AnnotationRegistry::registerLoader('class_exists');
+                }
+            }
+
             if ($this->skippedFile = getenv('SYMFONY_PHPUNIT_SKIPPED_TESTS')) {
                 $this->state = 1;
 
diff --git a/src/Symfony/Bridge/PhpUnit/bootstrap.php b/src/Symfony/Bridge/PhpUnit/bootstrap.php
index c81c828770dbc..f2064368f41a3 100644
--- a/src/Symfony/Bridge/PhpUnit/bootstrap.php
+++ b/src/Symfony/Bridge/PhpUnit/bootstrap.php
@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  */
 
+use Doctrine\Common\Annotations\AnnotationRegistry;
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
 
 // Detect if we need to serialize deprecations to a file.
@@ -26,6 +27,14 @@
 // Enforce a consistent locale
 setlocale(\LC_ALL, 'C');
 
+if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
+    if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
+        AnnotationRegistry::registerUniqueLoader('class_exists');
+    } elseif (method_exists(AnnotationRegistry::class, 'registerLoader')) {
+        AnnotationRegistry::registerLoader('class_exists');
+    }
+}
+
 if ('disabled' !== getenv('SYMFONY_DEPRECATIONS_HELPER')) {
     DeprecationErrorHandler::register(getenv('SYMFONY_DEPRECATIONS_HELPER'));
 }
diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
index d576fb99986ff..b0ccda04315f1 100644
--- a/src/Symfony/Bridge/PhpUnit/composer.json
+++ b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -28,7 +28,6 @@
         "symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
     },
     "conflict": {
-        "doctrine/annotations": "<1.10",
         "phpunit/phpunit": "<7.5|9.1.2"
     },
     "autoload": {

From a8bbf632df06b26bbd8a62f22203054bbff34d32 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 28 Dec 2022 15:32:23 +0100
Subject: [PATCH 093/475] Fix merge

---
 .../Fixtures/php/services_almost_circular_private.php     | 2 +-
 .../Fixtures/php/services_almost_circular_public.php      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
index 317d153cb601b..d9cd489a02b60 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -495,7 +495,7 @@ protected static function getBar6Service($container)
      */
     protected static function getDoctrine_ListenerService($container)
     {
-        $a = ($container->services['doctrine.entity_manager'] ?? $container->getDoctrine_EntityManagerService());
+        $a = ($container->services['doctrine.entity_manager'] ?? self::getDoctrine_EntityManagerService());
 
         if (isset($container->privates['doctrine.listener'])) {
             return $container->privates['doctrine.listener'];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
index 529d5263f9407..385bcb3684491 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
@@ -289,7 +289,7 @@ protected static function getDoctrine_EntityListenerResolverService($container)
      */
     protected static function getDoctrine_EntityManagerService($container)
     {
-        $a = ($container->services['doctrine.entity_listener_resolver'] ?? $container->getDoctrine_EntityListenerResolverService());
+        $a = ($container->services['doctrine.entity_listener_resolver'] ?? self::getDoctrine_EntityListenerResolverService());
 
         if (isset($container->services['doctrine.entity_manager'])) {
             return $container->services['doctrine.entity_manager'];
@@ -308,7 +308,7 @@ protected static function getDoctrine_EntityManagerService($container)
      */
     protected static function getDoctrine_ListenerService($container)
     {
-        $a = ($container->services['doctrine.entity_manager'] ?? $container->getDoctrine_EntityManagerService());
+        $a = ($container->services['doctrine.entity_manager'] ?? self::getDoctrine_EntityManagerService());
 
         if (isset($container->services['doctrine.listener'])) {
             return $container->services['doctrine.listener'];
@@ -510,7 +510,7 @@ protected static function getLoggerService($container)
      */
     protected static function getMailer_TransportService($container)
     {
-        $a = ($container->services['mailer.transport_factory'] ?? $container->getMailer_TransportFactoryService());
+        $a = ($container->services['mailer.transport_factory'] ?? self::getMailer_TransportFactoryService());
 
         if (isset($container->services['mailer.transport'])) {
             return $container->services['mailer.transport'];
@@ -543,7 +543,7 @@ protected static function getMailer_TransportFactoryService($container)
      */
     protected static function getMailer_TransportFactory_AmazonService($container)
     {
-        $a = ($container->services['monolog.logger_2'] ?? $container->getMonolog_Logger2Service());
+        $a = ($container->services['monolog.logger_2'] ?? self::getMonolog_Logger2Service());
 
         if (isset($container->services['mailer.transport_factory.amazon'])) {
             return $container->services['mailer.transport_factory.amazon'];

From 8671ad52f1ec24baa4b96aabed2bf0d54e74db81 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Wed, 28 Dec 2022 15:47:09 +0100
Subject: [PATCH 094/475] Drop v1 contracts packages everywhere

---
 src/Symfony/Bridge/Doctrine/composer.json                | 4 ++--
 src/Symfony/Bridge/Monolog/composer.json                 | 2 +-
 src/Symfony/Bridge/PhpUnit/composer.json                 | 2 +-
 src/Symfony/Bridge/ProxyManager/composer.json            | 2 +-
 src/Symfony/Bridge/Twig/composer.json                    | 2 +-
 src/Symfony/Bundle/FrameworkBundle/composer.json         | 2 +-
 src/Symfony/Component/Cache/composer.json                | 4 ++--
 src/Symfony/Component/Config/composer.json               | 7 ++++---
 src/Symfony/Component/Console/composer.json              | 4 ++--
 .../Tests/Compiler/AutowirePassTest.php                  | 5 -----
 .../Tests/Compiler/AutowireRequiredMethodsPassTest.php   | 9 ---------
 .../Compiler/AutowireRequiredPropertiesPassTest.php      | 5 -----
 src/Symfony/Component/DependencyInjection/composer.json  | 4 ++--
 src/Symfony/Component/ErrorHandler/composer.json         | 5 ++++-
 src/Symfony/Component/EventDispatcher/composer.json      | 7 ++++---
 src/Symfony/Component/ExpressionLanguage/composer.json   | 2 +-
 src/Symfony/Component/Form/composer.json                 | 6 +++---
 .../Component/HttpClient/Tests/HttpClientTestCase.php    | 4 ----
 src/Symfony/Component/HttpClient/composer.json           | 4 ++--
 src/Symfony/Component/HttpFoundation/composer.json       | 2 +-
 src/Symfony/Component/HttpKernel/composer.json           | 8 +++++---
 src/Symfony/Component/Ldap/composer.json                 | 2 +-
 .../Component/Mailer/Bridge/OhMySmtp/composer.json       | 2 +-
 src/Symfony/Component/Mailer/composer.json               | 5 +++--
 .../Component/Messenger/Bridge/AmazonSqs/composer.json   | 7 +++++--
 .../Component/Messenger/Bridge/Doctrine/composer.json    | 2 +-
 src/Symfony/Component/Messenger/composer.json            | 4 ++--
 .../Component/Notifier/Bridge/Mercure/composer.json      | 2 +-
 src/Symfony/Component/Notifier/composer.json             | 6 ++++--
 src/Symfony/Component/OptionsResolver/composer.json      | 2 +-
 src/Symfony/Component/PropertyAccess/composer.json       | 2 +-
 src/Symfony/Component/Security/Core/composer.json        | 4 ++--
 src/Symfony/Component/Security/Http/composer.json        | 2 +-
 src/Symfony/Component/Stopwatch/composer.json            | 2 +-
 src/Symfony/Component/String/composer.json               | 4 ++--
 src/Symfony/Component/Translation/composer.json          | 8 +++++---
 src/Symfony/Component/Validator/composer.json            | 4 ++--
 37 files changed, 70 insertions(+), 78 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index bee7d29c5b1b6..9d16c12e3273d 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -19,10 +19,10 @@
         "php": ">=8.1",
         "doctrine/event-manager": "^1.2|^2",
         "doctrine/persistence": "^2|^3",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/service-contracts": "^1.1|^2|^3"
+        "symfony/service-contracts": "^2.5|^3"
     },
     "require-dev": {
         "symfony/stopwatch": "^5.4|^6.0",
diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json
index 025d54a48398d..8fc06d8ece4e8 100644
--- a/src/Symfony/Bridge/Monolog/composer.json
+++ b/src/Symfony/Bridge/Monolog/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "monolog/monolog": "^1.25.1|^2|^3",
-        "symfony/service-contracts": "^1.1|^2|^3",
+        "symfony/service-contracts": "^2.5|^3",
         "symfony/http-kernel": "^5.4|^6.0"
     },
     "require-dev": {
diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
index b0ccda04315f1..85b11227d01c0 100644
--- a/src/Symfony/Bridge/PhpUnit/composer.json
+++ b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -21,7 +21,7 @@
         "php": ">=7.1.3"
     },
     "require-dev": {
-        "symfony/deprecation-contracts": "^2.1|^3.0",
+        "symfony/deprecation-contracts": "^2.5|^3.0",
         "symfony/error-handler": "^5.4|^6.0"
     },
     "suggest": {
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
index b3e1e9a9b5e75..e7386931204c4 100644
--- a/src/Symfony/Bridge/ProxyManager/composer.json
+++ b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -19,7 +19,7 @@
         "php": ">=8.1",
         "friendsofphp/proxy-manager-lts": "^1.0.2",
         "symfony/dependency-injection": "^6.3",
-        "symfony/deprecation-contracts": "^2.1|^3"
+        "symfony/deprecation-contracts": "^2.5|^3"
     },
     "require-dev": {
         "symfony/config": "^6.1"
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index afcd87d37096d..26b04afa63702 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/translation-contracts": "^1.1|^2|^3",
+        "symfony/translation-contracts": "^2.5|^3",
         "twig/twig": "^2.13|^3.0.4"
     },
     "require-dev": {
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index d5391abcd6567..096172bcf80e8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -22,7 +22,7 @@
         "symfony/cache": "^5.4|^6.0",
         "symfony/config": "^6.1",
         "symfony/dependency-injection": "^6.2",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/error-handler": "^6.1",
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/http-foundation": "^6.2",
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
index 8a11d7e46a21a..db55ad279214d 100644
--- a/src/Symfony/Component/Cache/composer.json
+++ b/src/Symfony/Component/Cache/composer.json
@@ -24,8 +24,8 @@
         "php": ">=8.1",
         "psr/cache": "^2.0|^3.0",
         "psr/log": "^1.1|^2|^3",
-        "symfony/cache-contracts": "^1.1.7|^2|^3",
-        "symfony/service-contracts": "^1.1|^2|^3",
+        "symfony/cache-contracts": "^2.5|^3",
+        "symfony/service-contracts": "^2.5|^3",
         "symfony/var-exporter": "^6.2"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json
index 85d842a533162..9896bcc4d5d1b 100644
--- a/src/Symfony/Component/Config/composer.json
+++ b/src/Symfony/Component/Config/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/filesystem": "^5.4|^6.0",
         "symfony/polyfill-ctype": "~1.8"
     },
@@ -25,11 +25,12 @@
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/finder": "^5.4|^6.0",
         "symfony/messenger": "^5.4|^6.0",
-        "symfony/service-contracts": "^1.1|^2|^3",
+        "symfony/service-contracts": "^2.5|^3",
         "symfony/yaml": "^5.4|^6.0"
     },
     "conflict": {
-        "symfony/finder": "<5.4"
+        "symfony/finder": "<5.4",
+        "symfony/service-contracts": "<2.5"
     },
     "suggest": {
         "symfony/yaml": "To use the yaml reference dumper"
diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
index bafe5d16511f4..06f0d6518835d 100644
--- a/src/Symfony/Component/Console/composer.json
+++ b/src/Symfony/Component/Console/composer.json
@@ -17,9 +17,9 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/service-contracts": "^1.1|^2|^3",
+        "symfony/service-contracts": "^2.5|^3",
         "symfony/string": "^5.4|^6.0"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index 8224150357dda..7f29757b50d00 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -34,7 +34,6 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\WithTarget;
 use Symfony\Component\DependencyInjection\TypedReference;
 use Symfony\Component\ExpressionLanguage\Expression;
-use Symfony\Contracts\Service\Attribute\Required;
 
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
 
@@ -705,10 +704,6 @@ public function testSetterInjection()
 
     public function testSetterInjectionWithAttribute()
     {
-        if (!class_exists(Required::class)) {
-            $this->markTestSkipped('symfony/service-contracts 2.2 required');
-        }
-
         $container = new ContainerBuilder();
         $container->register(Foo::class);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
index 9a7cdf7bc0c30..9cedd5e02f249 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
@@ -16,7 +16,6 @@
 use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\WitherStaticReturnType;
-use Symfony\Contracts\Service\Attribute\Required;
 
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
 
@@ -57,10 +56,6 @@ public function testSetterInjection()
 
     public function testSetterInjectionWithAttribute()
     {
-        if (!class_exists(Required::class)) {
-            $this->markTestSkipped('symfony/service-contracts 2.2 required');
-        }
-
         $container = new ContainerBuilder();
         $container->register(Foo::class);
 
@@ -145,10 +140,6 @@ public function testWitherWithStaticReturnTypeInjection()
 
     public function testWitherInjectionWithAttribute()
     {
-        if (!class_exists(Required::class)) {
-            $this->markTestSkipped('symfony/service-contracts 2.2 required');
-        }
-
         $container = new ContainerBuilder();
         $container->register(Foo::class);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredPropertiesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredPropertiesPassTest.php
index a9f7388061693..2cee2e7ed5c35 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredPropertiesPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredPropertiesPassTest.php
@@ -15,7 +15,6 @@
 use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredPropertiesPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Contracts\Service\Attribute\Required;
 
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes_74.php';
@@ -41,10 +40,6 @@ public function testInjection()
 
     public function testAttribute()
     {
-        if (!class_exists(Required::class)) {
-            $this->markTestSkipped('symfony/service-contracts 2.2 required');
-        }
-
         $container = new ContainerBuilder();
         $container->register(Foo::class);
 
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index 307a78fa1c33e..a71ed09d27f80 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -18,8 +18,8 @@
     "require": {
         "php": ">=8.1",
         "psr/container": "^1.1|^2.0",
-        "symfony/deprecation-contracts": "^2.1|^3",
-        "symfony/service-contracts": "^1.1.6|^2.0|^3.0",
+        "symfony/deprecation-contracts": "^2.5|^3",
+        "symfony/service-contracts": "^2.5|^3.0",
         "symfony/var-exporter": "^6.2"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/ErrorHandler/composer.json b/src/Symfony/Component/ErrorHandler/composer.json
index 5331dd88366c6..03eec618df8fb 100644
--- a/src/Symfony/Component/ErrorHandler/composer.json
+++ b/src/Symfony/Component/ErrorHandler/composer.json
@@ -23,7 +23,10 @@
     "require-dev": {
         "symfony/http-kernel": "^5.4|^6.0",
         "symfony/serializer": "^5.4|^6.0",
-        "symfony/deprecation-contracts": "^2.1|^3"
+        "symfony/deprecation-contracts": "^2.5|^3"
+    },
+    "conflict": {
+        "symfony/deprecation-contracts": "<2.5"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\ErrorHandler\\": "" },
diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json
index c05373f331c1a..925a92028a0ef 100644
--- a/src/Symfony/Component/EventDispatcher/composer.json
+++ b/src/Symfony/Component/EventDispatcher/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/event-dispatcher-contracts": "^2|^3"
+        "symfony/event-dispatcher-contracts": "^2.5|^3"
     },
     "require-dev": {
         "symfony/dependency-injection": "^5.4|^6.0",
@@ -25,12 +25,13 @@
         "symfony/config": "^5.4|^6.0",
         "symfony/error-handler": "^5.4|^6.0",
         "symfony/http-foundation": "^5.4|^6.0",
-        "symfony/service-contracts": "^1.1|^2|^3",
+        "symfony/service-contracts": "^2.5|^3",
         "symfony/stopwatch": "^5.4|^6.0",
         "psr/log": "^1|^2|^3"
     },
     "conflict": {
-        "symfony/dependency-injection": "<5.4"
+        "symfony/dependency-injection": "<5.4",
+        "symfony/service-contracts": "<2.5"
     },
     "provide": {
         "psr/event-dispatcher-implementation": "1.0",
diff --git a/src/Symfony/Component/ExpressionLanguage/composer.json b/src/Symfony/Component/ExpressionLanguage/composer.json
index 3c8811b0e3a99..a7688ad4601cf 100644
--- a/src/Symfony/Component/ExpressionLanguage/composer.json
+++ b/src/Symfony/Component/ExpressionLanguage/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "symfony/cache": "^5.4|^6.0",
-        "symfony/service-contracts": "^1.1|^2|^3"
+        "symfony/service-contracts": "^2.5|^3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\ExpressionLanguage\\": "" },
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
index c740948c5ec08..e859bf2c7fd62 100644
--- a/src/Symfony/Component/Form/composer.json
+++ b/src/Symfony/Component/Form/composer.json
@@ -17,14 +17,14 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/options-resolver": "^5.4|^6.0",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-intl-icu": "^1.21",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/property-access": "^5.4|^6.0",
-        "symfony/service-contracts": "^1.1|^2|^3"
+        "symfony/service-contracts": "^2.5|^3"
     },
     "require-dev": {
         "doctrine/collections": "^1.0|^2.0",
@@ -52,7 +52,7 @@
         "symfony/framework-bundle": "<5.4",
         "symfony/http-kernel": "<5.4",
         "symfony/translation": "<5.4",
-        "symfony/translation-contracts": "<1.1.7",
+        "symfony/translation-contracts": "<2.5",
         "symfony/twig-bridge": "<5.4"
     },
     "suggest": {
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
index 1f85f4ed143ce..fd92865ca70c0 100644
--- a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
+++ b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -321,10 +321,6 @@ private static function startVulcain(HttpClientInterface $client)
             throw new SkippedTestSuiteError('Testing with the "vulcain" is not supported on Windows.');
         }
 
-        if (['application/json'] !== $client->request('GET', 'http://127.0.0.1:8057/json')->getHeaders()['content-type']) {
-            throw new SkippedTestSuiteError('symfony/http-client-contracts >= 2.0.1 required');
-        }
-
         $process = new Process(['vulcain'], null, [
             'DEBUG' => 1,
             'UPSTREAM' => 'http://127.0.0.1:8057',
diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json
index 61be65b74ecc4..f4d175f4b46f6 100644
--- a/src/Symfony/Component/HttpClient/composer.json
+++ b/src/Symfony/Component/HttpClient/composer.json
@@ -23,9 +23,9 @@
     "require": {
         "php": ">=8.1",
         "psr/log": "^1|^2|^3",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/http-client-contracts": "^3",
-        "symfony/service-contracts": "^1.0|^2|^3"
+        "symfony/service-contracts": "^2.5|^3"
     },
     "require-dev": {
         "amphp/amp": "^2.5",
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
index 2023300b8cc2d..944029655a181 100644
--- a/src/Symfony/Component/HttpFoundation/composer.json
+++ b/src/Symfony/Component/HttpFoundation/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/polyfill-mbstring": "~1.1",
         "symfony/polyfill-php83": "^1.27"
     },
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 41ef39d3ae749..8193edbe8c28c 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/error-handler": "^6.1",
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/http-foundation": "^5.4|^6.0",
@@ -34,12 +34,12 @@
         "symfony/dom-crawler": "^5.4|^6.0",
         "symfony/expression-language": "^5.4|^6.0",
         "symfony/finder": "^5.4|^6.0",
-        "symfony/http-client-contracts": "^1.1|^2|^3",
+        "symfony/http-client-contracts": "^2.5|^3",
         "symfony/process": "^5.4|^6.0
10000
",
         "symfony/routing": "^5.4|^6.0",
         "symfony/stopwatch": "^5.4|^6.0",
         "symfony/translation": "^5.4|^6.0",
-        "symfony/translation-contracts": "^1.1|^2|^3",
+        "symfony/translation-contracts": "^2.5|^3",
         "symfony/uid": "^5.4|^6.0",
         "psr/cache": "^1.0|^2.0|^3.0",
         "twig/twig": "^2.13|^3.0.4"
@@ -56,9 +56,11 @@
         "symfony/dependency-injection": "<6.2",
         "symfony/doctrine-bridge": "<5.4",
         "symfony/http-client": "<5.4",
+        "symfony/http-client-contracts": "<2.5",
         "symfony/mailer": "<5.4",
         "symfony/messenger": "<5.4",
         "symfony/translation": "<5.4",
+        "symfony/translation-contracts": "<2.5",
         "symfony/twig-bridge": "<5.4",
         "symfony/validator": "<5.4",
         "twig/twig": "<2.13"
diff --git a/src/Symfony/Component/Ldap/composer.json b/src/Symfony/Component/Ldap/composer.json
index a2ab982ea63f8..40e775686b78b 100644
--- a/src/Symfony/Component/Ldap/composer.json
+++ b/src/Symfony/Component/Ldap/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "ext-ldap": "*",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/options-resolver": "^5.4|^6.0"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/Mailer/Bridge/OhMySmtp/composer.json b/src/Symfony/Component/Mailer/Bridge/OhMySmtp/composer.json
index d77ee18bdeed3..b984097a5bd5c 100644
--- a/src/Symfony/Component/Mailer/Bridge/OhMySmtp/composer.json
+++ b/src/Symfony/Component/Mailer/Bridge/OhMySmtp/composer.json
@@ -22,7 +22,7 @@
     "require": {
         "php": ">=8.1",
         "psr/event-dispatcher": "^1",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/mailer": "^5.4|^6.0"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json
index e83a4aade2ee9..e98f9e03925b4 100644
--- a/src/Symfony/Component/Mailer/composer.json
+++ b/src/Symfony/Component/Mailer/composer.json
@@ -22,15 +22,16 @@
         "psr/log": "^1|^2|^3",
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/mime": "^6.2",
-        "symfony/service-contracts": "^1.1|^2|^3"
+        "symfony/service-contracts": "^2.5|^3"
     },
     "require-dev": {
         "symfony/console": "^5.4|^6.0",
-        "symfony/http-client-contracts": "^1.1|^2|^3",
+        "symfony/http-client-contracts": "^2.5|^3",
         "symfony/messenger": "^6.2",
         "symfony/twig-bridge": "^6.2"
     },
     "conflict": {
+        "symfony/http-client-contracts": "<2.5",
         "symfony/http-kernel": "<5.4",
         "symfony/messenger": "<6.2",
         "symfony/mime": "<6.2",
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json
index df8b9ad8df506..090a37b6a82b0 100644
--- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json
+++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json
@@ -20,14 +20,17 @@
         "async-aws/core": "^1.5",
         "async-aws/sqs": "^1.0",
         "symfony/messenger": "^5.4|^6.0",
-        "symfony/service-contracts": "^1.1|^2|^3",
+        "symfony/service-contracts": "^2.5|^3",
         "psr/log": "^1|^2|^3"
     },
     "require-dev": {
-        "symfony/http-client-contracts": "^1|^2|^3",
+        "symfony/http-client-contracts": "^2.5|^3",
         "symfony/property-access": "^5.4|^6.0",
         "symfony/serializer": "^5.4|^6.0"
     },
+    "conflict": {
+        "symfony/http-client-contracts": "<2.5"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Messenger\\Bridge\\AmazonSqs\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json b/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json
index 5f377c81a3628..ba116bdba0801 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json
@@ -19,7 +19,7 @@
         "php": ">=8.1",
         "doctrine/dbal": "^2.13|^3.0",
         "symfony/messenger": "^5.4|^6.0",
-        "symfony/service-contracts": "^1.1|^2|^3"
+        "symfony/service-contracts": "^2.5|^3"
     },
     "require-dev": {
         "doctrine/persistence": "^1.3|^2|^3",
diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json
index 63610781b4e55..8d3d0f2653ac7 100644
--- a/src/Symfony/Component/Messenger/composer.json
+++ b/src/Symfony/Component/Messenger/composer.json
@@ -30,13 +30,13 @@
         "symfony/rate-limiter": "^5.4|^6.0",
         "symfony/routing": "^5.4|^6.0",
         "symfony/serializer": "^5.4|^6.0",
-        "symfony/service-contracts": "^1.1|^2|^3",
+        "symfony/service-contracts": "^2.5|^3",
         "symfony/stopwatch": "^5.4|^6.0",
         "symfony/validator": "^5.4|^6.0"
     },
     "conflict": {
         "symfony/event-dispatcher": "<5.4",
-        "symfony/event-dispatcher-contracts": "<2",
+        "symfony/event-dispatcher-contracts": "<2.5",
         "symfony/framework-bundle": "<5.4",
         "symfony/http-kernel": "<5.4",
         "symfony/serializer": "<5.4"
diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json b/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json
index 60997223e03c8..51f63fcfa4b2b 100644
--- a/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Mercure/composer.json
@@ -19,7 +19,7 @@
         "php": ">=8.1",
         "symfony/mercure": "^0.5.2|^0.6",
         "symfony/notifier": "^6.2",
-        "symfony/service-contracts": "^1.10|^2|^3"
+        "symfony/service-contracts": "^2.5|^3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Mercure\\": "" },
diff --git a/src/Symfony/Component/Notifier/composer.json b/src/Symfony/Component/Notifier/composer.json
index cceb46806f1ca..c2480d32f2b9e 100644
--- a/src/Symfony/Component/Notifier/composer.json
+++ b/src/Symfony/Component/Notifier/composer.json
@@ -20,13 +20,15 @@
         "psr/log": "^1|^2|^3"
     },
     "require-dev": {
-        "symfony/event-dispatcher-contracts": "^2|^3",
-        "symfony/http-client-contracts": "^2|^3",
+        "symfony/event-dispatcher-contracts": "^2.5|^3",
+        "symfony/http-client-contracts": "^2.5|^3",
         "symfony/http-foundation": "^5.4|^6.0",
         "symfony/messenger": "^5.4|^6.0"
     },
     "conflict": {
         "symfony/event-dispatcher": "<5.4",
+        "symfony/event-dispatcher-contracts": "<2.5",
+        "symfony/http-client-contracts": "<2.5",
         "symfony/http-kernel": "<5.4"
     },
     "autoload": {
diff --git a/src/Symfony/Component/OptionsResolver/composer.json b/src/Symfony/Component/OptionsResolver/composer.json
index 3355b24efc6f3..9f2daf4e7bf74 100644
--- a/src/Symfony/Component/OptionsResolver/composer.json
+++ b/src/Symfony/Component/OptionsResolver/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/deprecation-contracts": "^2.1|^3"
+        "symfony/deprecation-contracts": "^2.5|^3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\OptionsResolver\\": "" },
diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json
index a8ba0b159dc2b..324eb0c1e74b4 100644
--- a/src/Symfony/Component/PropertyAccess/composer.json
+++ b/src/Symfony/Component/PropertyAccess/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/property-info": "^5.4|^6.0"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
index 7e5f8679cd995..5f933534b29ce 100644
--- a/src/Symfony/Component/Security/Core/composer.json
+++ b/src/Symfony/Component/Security/Core/composer.json
@@ -17,8 +17,8 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/event-dispatcher-contracts": "^1.1|^2|^3",
-        "symfony/service-contracts": "^1.1.6|^2|^3",
+        "symfony/event-dispatcher-contracts": "^2.5|^3",
+        "symfony/service-contracts": "^2.5|^3",
         "symfony/password-hasher": "^5.4|^6.0"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
index 66876a3e38e4b..061c52631e5fd 100644
--- a/src/Symfony/Component/Security/Http/composer.json
+++ b/src/Symfony/Component/Security/Http/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/security-core": "^6.0",
         "symfony/http-foundation": "^5.4|^6.0",
         "symfony/http-kernel": "^6.2",
diff --git a/src/Symfony/Component/Stopwatch/composer.json b/src/Symfony/Component/Stopwatch/composer.json
index da4c3d2e32f17..4aa02b5f343d2 100644
--- a/src/Symfony/Component/Stopwatch/composer.json
+++ b/src/Symfony/Component/Stopwatch/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/service-contracts": "^1|^2|^3"
+        "symfony/service-contracts": "^2.5|^3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Stopwatch\\": "" },
diff --git a/src/Symfony/Component/String/composer.json b/src/Symfony/Component/String/composer.json
index 44a809d589d6f..3545c85311b7b 100644
--- a/src/Symfony/Component/String/composer.json
+++ b/src/Symfony/Component/String/composer.json
@@ -26,11 +26,11 @@
         "symfony/error-handler": "^5.4|^6.0",
         "symfony/intl": "^6.2",
         "symfony/http-client": "^5.4|^6.0",
-        "symfony/translation-contracts": "^2.0|^3.0",
+        "symfony/translation-contracts": "^2.5|^3.0",
         "symfony/var-exporter": "^5.4|^6.0"
     },
     "conflict": {
-        "symfony/translation-contracts": "<2.0"
+        "symfony/translation-contracts": "<2.5"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\String\\": "" },
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
index d75df651b0bc4..9b22806bd7d7f 100644
--- a/src/Symfony/Component/Translation/composer.json
+++ b/src/Symfony/Component/Translation/composer.json
@@ -18,19 +18,19 @@
     "require": {
         "php": ">=8.1",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/translation-contracts": "^2.3|^3.0"
+        "symfony/translation-contracts": "^2.5|^3.0"
     },
     "require-dev": {
         "nikic/php-parser": "^4.13",
         "symfony/config": "^5.4|^6.0",
         "symfony/console": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/http-client-contracts": "^1.1|^2.0|^3.0",
+        "symfony/http-client-contracts": "^2.5|^3.0",
         "symfony/http-kernel": "^5.4|^6.0",
         "symfony/intl": "^5.4|^6.0",
         "symfony/polyfill-intl-icu": "^1.21",
         "symfony/routing": "^5.4|^6.0",
-        "symfony/service-contracts": "^1.1.2|^2|^3",
+        "symfony/service-contracts": "^2.5|^3",
         "symfony/yaml": "^5.4|^6.0",
         "symfony/finder": "^5.4|^6.0",
         "psr/log": "^1|^2|^3"
@@ -38,7 +38,9 @@
     "conflict": {
         "symfony/config": "<5.4",
         "symfony/dependency-injection": "<5.4",
+        "symfony/http-client-contracts": "<2.5",
         "symfony/http-kernel": "<5.4",
+        "symfony/service-contracts": "<2.5",
         "symfony/twig-bundle": "<5.4",
         "symfony/yaml": "<5.4",
         "symfony/console": "<5.4"
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index c68ad9cf534b6..d23d38f861dcc 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -17,11 +17,11 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/deprecation-contracts": "^2.1|^3",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php83": "^1.27",
-        "symfony/translation-contracts": "^1.1|^2|^3"
+        "symfony/translation-contracts": "^2.5|^3"
     },
     "require-dev": {
         "symfony/console": "^5.4|^6.0",

From 6d3b3f161bf8e84c8730220eeb70c3af2f121f93 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 28 Dec 2022 16:23:52 +0100
Subject: [PATCH 095/475] Fix revert

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 48111c1e0839a..f789f4458df03 100644
--- a/composer.json
+++ b/composer.json
@@ -128,7 +128,7 @@
         "doctrine/collections": "^1.0|^2.0",
         "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "^2.13.1|^3.0",
-        "doctrine/orm": "^2.7.4",
+        "doctrine/orm": "^2.12",
         "egulias/email-validator": "^2.1.10|^3.1",
         "guzzlehttp/promises": "^1.4",
         "league/html-to-markdown": "^5.0",

From 49891944fcb9a4092dac1abeed0801fa396a4421 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 28 Dec 2022 16:29:29 +0100
Subject: [PATCH 096/475] Fix merge

---
 .../Fixtures/php/services_almost_circular_private.php     | 2 +-
 .../Fixtures/php/services_almost_circular_public.php      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
index d9cd489a02b60..705f789404677 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -495,7 +495,7 @@ protected static function getBar6Service($container)
      */
     protected static function getDoctrine_ListenerService($container)
     {
-        $a = ($container->services['doctrine.entity_manager'] ?? self::getDoctrine_EntityManagerService());
+        $a = ($container->services['doctrine.entity_manager'] ?? self::getDoctrine_EntityManagerService($container));
 
         if (isset($container->privates['doctrine.listener'])) {
             return $container->privates['doctrine.listener'];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
index 385bcb3684491..50081e7e4617a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
@@ -289,7 +289,7 @@ protected static function getDoctrine_EntityListenerResolverService($container)
      */
     protected static function getDoctrine_EntityManagerService($container)
     {
-        $a = ($container->services['doctrine.entity_listener_resolver'] ?? self::getDoctrine_EntityListenerResolverService());
+        $a = ($container->services['doctrine.entity_listener_resolver'] ?? self::getDoctrine_EntityListenerResolverService($container));
 
         if (isset($container->services['doctrine.entity_manager'])) {
             return $container->services['doctrine.entity_manager'];
@@ -308,7 +308,7 @@ protected static function getDoctrine_EntityManagerService($container)
      */
     protected static function getDoctrine_ListenerService($container)
     {
-        $a = ($container->services['doctrine.entity_manager'] ?? self::getDoctrine_EntityManagerService());
+        $a = ($container->services['doctrine.entity_manager'] ?? self::getDoctrine_EntityManagerService($container));
 
         if (isset($container->services['doctrine.listener'])) {
             return $container->services['doctrine.listener'];
@@ -510,7 +510,7 @@ protected static function getLoggerService($container)
      */
     protected static function getMailer_TransportService($container)
     {
-        $a = ($container->services['mailer.transport_factory'] ?? self::getMailer_TransportFactoryService());
+        $a = ($container->services['mailer.transport_factory'] ?? self::getMailer_TransportFactoryService($container));
 
         if (isset($container->services['mailer.transport'])) {
             return $container->services['mailer.transport'];
@@ -543,7 +543,7 @@ protected static function getMailer_TransportFactoryService($container)
      */
     protected static function getMailer_TransportFactory_AmazonService($container)
     {
-        $a = ($container->services['monolog.logger_2'] ?? self::getMonolog_Logger2Service());
+        $a = ($container->services['monolog.logger_2'] ?? self::getMonolog_Logger2Service($container));
 
         if (isset($container->services['mailer.transport_factory.amazon'])) {
             return $container->services['mailer.transport_factory.amazon'];

From 1cadd46e7ff3ff3d4d5f8374d16413420125c414 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Fri, 23 Dec 2022 14:14:43 +0100
Subject: [PATCH 097/475] [DependencyInjection] Auto exclude referencing
 service in `TaggedIteratorArgument`

---
 .../Argument/TaggedIteratorArgument.php       | 10 +++++-
 .../Attribute/TaggedIterator.php              |  1 +
 .../Attribute/TaggedLocator.php               |  1 +
 .../DependencyInjection/CHANGELOG.md          |  2 ++
 .../Compiler/AutowirePass.php                 |  4 +--
 .../Compiler/PriorityTaggedServiceTrait.php   |  5 ++-
 .../ResolveTaggedIteratorArgumentPass.php     |  7 +++-
 .../Loader/XmlFileLoader.php                  |  2 +-
 .../Loader/YamlFileLoader.php                 |  4 +--
 .../schema/dic/services/services-1.0.xsd      |  1 +
 .../RegisterServiceSubscribersPassTest.php    |  2 +-
 .../ResolveTaggedIteratorArgumentPassTest.php | 32 +++++++++++++++++++
 12 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
index c33e8615b254e..bfe9787f7c9bd 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
@@ -24,6 +24,7 @@ class TaggedIteratorArgument extends IteratorArgument
     private ?string $defaultPriorityMethod;
     private bool $needsIndexes;
     private array $exclude;
+    private bool $excludeSelf = true;
 
     /**
      * @param string      $tag                   The name of the tag identifying the target services
@@ -32,8 +33,9 @@ class TaggedIteratorArgument extends IteratorArgument
      * @param bool        $needsIndexes          Whether indexes are required and should be generated when computing the map
      * @param string|null $defaultPriorityMethod The static method that should be called to get each service's priority when their tag doesn't define the "priority" attribute
      * @param array       $exclude               Services to exclude from the iterator
+     * @param bool        $excludeSelf           Whether to automatically exclude the referencing service from the iterator
      */
-    public function __construct(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null, bool $needsIndexes = false, string $defaultPriorityMethod = null, array $exclude = [])
+    public function __construct(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null, bool $needsIndexes = false, string $defaultPriorityMethod = null, array $exclude = [], bool $excludeSelf = true)
     {
         parent::__construct([]);
 
@@ -47,6 +49,7 @@ public function __construct(string $tag, string $indexAttribute = null, string $
         $this->needsIndexes = $needsIndexes;
         $this->defaultPriorityMethod = $defaultPriorityMethod ?: ($indexAttribute ? 'getDefault'.str_replace(' ', '', ucwords(preg_replace('/[^a-zA-Z0-9\x7f-\xff]++/', ' ', $indexAttribute))).'Priority' : null);
         $this->exclude = $exclude;
+        $this->excludeSelf = $excludeSelf;
     }
 
     public function getTag()
@@ -78,4 +81,9 @@ public function getExclude(): array
     {
         return $this->exclude;
     }
+
+    public function excludeSelf(): bool
+    {
+        return $this->excludeSelf;
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/TaggedIterator.php b/src/Symfony/Component/DependencyInjection/Attribute/TaggedIterator.php
index 5898a6afe0e81..fb33fb572942b 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/TaggedIterator.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/TaggedIterator.php
@@ -20,6 +20,7 @@ public function __construct(
         public ?string $defaultIndexMethod = null,
         public ?string $defaultPriorityMethod = null,
         public string|array $exclude = [],
+        public bool $excludeSelf = true,
     ) {
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/TaggedLocator.php b/src/Symfony/Component/DependencyInjection/Attribute/TaggedLocator.php
index b706a6388bf0d..f05ae53bc4284 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/TaggedLocator.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/TaggedLocator.php
@@ -20,6 +20,7 @@ public function __construct(
         public ?string $defaultIndexMethod = null,
         public ?string $defaultPriorityMethod = null,
         public string|array $exclude = [],
+        public bool $excludeSelf = true,
     ) {
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 81dec56e681f3..df045b56f05c8 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -24,6 +24,8 @@ CHANGELOG
  * Deprecate using numeric parameter names
  * Add support for tagged iterators/locators `exclude` option to the xml and yaml loaders/dumpers
  * Allow injecting `string $env` into php config closures
+ * Add `excludeSelf` parameter to `TaggedIteratorArgument` with default value to `true`
+   to control whether the referencing service should be automatically excluded from the iterator
 
 6.1
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 66a175d76c267..ac94cd7ae5b24 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -88,11 +88,11 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
         }
 
         if ($value instanceof TaggedIterator) {
-            return new TaggedIteratorArgument($value->tag, $value->indexAttribute, $value->defaultIndexMethod, false, $value->defaultPriorityMethod, (array) $value->exclude);
+            return new TaggedIteratorArgument($value->tag, $value->indexAttribute, $value->defaultIndexMethod, false, $value->defaultPriorityMethod, (array) $value->exclude, $value->excludeSelf);
         }
 
         if ($value instanceof TaggedLocator) {
-            return new ServiceLocatorArgument(new TaggedIteratorArgument($value->tag, $value->indexAttribute, $value->defaultIndexMethod, true, $value->defaultPriorityMethod, (array) $value->exclude));
+            return new ServiceLocatorArgument(new TaggedIteratorArgument($value->tag, $value->indexAttribute, $value->defaultIndexMethod, true, $value->defaultPriorityMethod, (array) $value->exclude, $value->excludeSelf));
         }
 
         if ($value instanceof MapDecorated) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
index 309bf63118d4e..2ddcaa0c08d8c 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
@@ -37,9 +37,8 @@ trait PriorityTaggedServiceTrait
      *
      * @return Reference[]
      */
-    private function findAndSortTaggedServices(string|TaggedIteratorArgument $tagName, ContainerBuilder $container): array
+    private function findAndSortTaggedServices(string|TaggedIteratorArgument $tagName, ContainerBuilder $container, array $exclude = []): array
     {
-        $exclude = [];
         $indexAttribute = $defaultIndexMethod = $needsIndexes = $defaultPriorityMethod = null;
 
         if ($tagName instanceof TaggedIteratorArgument) {
@@ -47,7 +46,7 @@ private function findAndSortTaggedServices(string|TaggedIteratorArgument $tagNam
             $defaultIndexMethod = $tagName->getDefaultIndexMethod();
             $needsIndexes = $tagName->needsIndexes();
             $defaultPriorityMethod = $tagName->getDefaultPriorityMethod() ?? 'getDefaultPriority';
-            $exclude = $tagName->getExclude();
+            $exclude = array_merge($exclude, $tagName->getExclude());
             $tagName = $tagName->getTag();
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php
index 1fca5ebaa5f8a..469d001b51fea 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php
@@ -28,7 +28,12 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
             return parent::processValue($value, $isRoot);
         }
 
-        $value->setValues($this->findAndSortTaggedServices($value, $this->container));
+        $exclude = $value->getExclude();
+        if ($value->excludeSelf()) {
+            $exclude[] = $this->currentId;
+        }
+
+        $value->setValues($this->findAndSortTaggedServices($value, $this->container, $exclude));
 
         return $value;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 7c0ea3261300b..4acbfe56a9aa3 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -550,7 +550,7 @@ private function getArgumentsAsPhp(\DOMElement $node, string $name, string $file
                         $excludes = [$arg->getAttribute('exclude')];
                     }
 
-                    $arguments[$key] = new TaggedIteratorArgument($arg->getAttribute('tag'), $arg->getAttribute('index-by') ?: null, $arg->getAttribute('default-index-method') ?: null, $forLocator, $arg->getAttribute('default-priority-method') ?: null, $excludes);
+                    $arguments[$key] = new TaggedIteratorArgument($arg->getAttribute('tag'), $arg->getAttribute('index-by') ?: null, $arg->getAttribute('default-index-method') ?: null, $forLocator, $arg->getAttribute('default-priority-method') ?: null, $excludes, $arg->getAttribute('exclude-self') ?: true);
 
                     if ($forLocator) {
                         $arguments[$key] = new ServiceLocatorArgument($arguments[$key]);
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index ad61c14437d1a..a9e35fdad654c 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -824,11 +824,11 @@ private function resolveServices(mixed $value, string $file, bool $isParameter =
                 $forLocator = 'tagged_locator' === $value->getTag();
 
                 if (\is_array($argument) && isset($argument['tag']) && $argument['tag']) {
-                    if ($diff = array_diff(array_keys($argument), $supportedKeys = ['tag', 'index_by', 'default_index_method', 'default_priority_method', 'exclude'])) {
+                    if ($diff = array_diff(array_keys($argument), $supportedKeys = ['tag', 'index_by', 'default_index_method', 'default_priority_method', 'exclude', 'exclude_self'])) {
                         throw new InvalidArgumentException(sprintf('"!%s" tag contains unsupported key "%s"; supported ones are "%s".', $value->getTag(), implode('", "', $diff), implode('", "', $supportedKeys)));
                     }
 
-                    $argument = new TaggedIteratorArgument($argument['tag'], $argument['index_by'] ?? null, $argument['default_index_method'] ?? null, $forLocator, $argument['default_priority_method'] ?? null, (array) ($argument['exclude'] ?? null));
+                    $argument = new TaggedIteratorArgument($argument['tag'], $argument['index_by'] ?? null, $argument['default_index_method'] ?? null, $forLocator, $argument['default_priority_method'] ?? null, (array) ($argument['exclude'] ?? null), $argument['exclude_self'] ?? true);
                 } elseif (\is_string($argument) && $argument) {
                     $argument = new TaggedIteratorArgument($argument, null, null, $forLocator);
                 } else {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
index 20e97866788b6..83e430a859445 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
+++ b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
@@ -302,6 +302,7 @@
     <xsd:attribute name="default-index-method" type="xsd:string" />
     <xsd:attribute name="default-priority-method" type="xsd:string" />
     <xsd:attribute name="exclude" type="xsd:string" />
+    <xsd:attribute name="exclude-self" type="xsd:boolean" />
   </xsd:complexType>
 
   <xsd:complexType name="call">
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
index ba979be80bc04..4da06e889b715 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
@@ -462,7 +462,7 @@ public static function getSubscribedServices(): array
             'autowired' => new ServiceClosureArgument(new Reference('service.id')),
             'autowired.nullable' => new ServiceClosureArgument(new Reference('service.id', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
             'autowired.parameter' => new ServiceClosureArgument('foobar'),
-            'map.decorated' => new ServiceClosureArgument(new Reference('.service_locator.oZHAdom.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
+            'map.decorated' => new ServiceClosureArgument(new Reference('.service_locator.LnJLtj2.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
             'target' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'someTarget', [new Target('someTarget')])),
         ];
         $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php
index a62a585c6ef0c..7e2fa2f7ddda1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTaggedIteratorArgumentPassTest.php
@@ -54,4 +54,36 @@ public function testProcessWithIndexes()
         $expected->setValues(['1' => new TypedReference('service_a', 'stdClass'), '2' => new TypedReference('service_b', 'stdClass')]);
         $this->assertEquals($expected, $properties['foos']);
     }
+
+    public function testProcesWithAutoExcludeReferencingService()
+    {
+        $container = new ContainerBuilder();
+        $container->register('service_a', 'stdClass')->addTag('foo', ['key' => '1']);
+        $container->register('service_b', 'stdClass')->addTag('foo', ['key' => '2']);
+        $container->register('service_c', 'stdClass')->addTag('foo', ['key' => '3'])->setProperty('foos', new TaggedIteratorArgument('foo', 'key'));
+
+        (new ResolveTaggedIteratorArgumentPass())->process($container);
+
+        $properties = $container->getDefinition('service_c')->getProperties();
+
+        $expected = new TaggedIteratorArgument('foo', 'key');
+        $expected->setValues(['1' => new TypedReference('service_a', 'stdClass'), '2' => new TypedReference('service_b', 'stdClass')]);
+        $this->assertEquals($expected, $properties['foos']);
+    }
+
+    public function testProcesWithoutAutoExcludeReferencingService()
+    {
+        $container = new ContainerBuilder();
+        $container->register('service_a', 'stdClass')->addTag('foo', ['key' => '1']);
+        $container->register('service_b', 'stdClass')->addTag('foo', ['key' => '2']);
+        $container->register('service_c', 'stdClass')->addTag('foo', ['key' => '3'])->setProperty('foos', new TaggedIteratorArgument(tag: 'foo', indexAttribute: 'key', excludeSelf: false));
+
+        (new ResolveTaggedIteratorArgumentPass())->process($container);
+
+        $properties = $container->getDefinition('service_c')->getProperties();
+
+        $expected = new TaggedIteratorArgument(tag: 'foo', indexAttribute: 'key', excludeSelf: false);
+        $expected->setValues(['1' => new TypedReference('service_a', 'stdClass'), '2' => new TypedReference('service_b', 'stdClass'),  '3' => new TypedReference('service_c', 'stdClass')]);
+        $this->assertEquals($expected, $properties['foos']);
+    }
 }

From ecc53554fd54ba8ec47710d13913a77ddac9b8cb Mon Sep 17 00:00:00 2001
From: Alexander Schranz <alexander@sulu.io>
Date: Mon, 24 Oct 2022 21:08:21 +0200
Subject: [PATCH 098/475] [HttpFoundation] Add `StreamedJsonResponse` for
 efficient JSON streaming

---
 .../Component/HttpFoundation/CHANGELOG.md     |   1 +
 .../HttpFoundation/StreamedJsonResponse.php   | 139 ++++++++++
 .../Tests/StreamedJsonResponseTest.php        | 241 ++++++++++++++++++
 3 files changed, 381 insertions(+)
 create mode 100644 src/Symfony/Component/HttpFoundation/StreamedJsonResponse.php
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/StreamedJsonResponseTest.php

diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index ae0902547f8f0..1aaf6ed0f8507 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
 6.2
 ---
 
+ * Add `StreamedJsonResponse` class for efficient JSON streaming
  * The HTTP cache store uses the `xxh128` algorithm
  * Deprecate calling `JsonResponse::setCallback()`, `Response::setExpires/setLastModified/setEtag()`, `MockArraySessionStorage/NativeSessionStorage::setMetadataBag()`, `NativeSessionStorage::setSaveHandler()` without arguments
  * Add request matchers under the `Symfony\Component\HttpFoundation\RequestMatcher` namespace
diff --git a/src/Symfony/Component/HttpFoundation/StreamedJsonResponse.php b/src/Symfony/Component/HttpFoundation/StreamedJsonResponse.php
new file mode 100644
index 0000000000000..445bd77d794cb
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/StreamedJsonResponse.php
@@ -0,0 +1,139 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation;
+
+/**
+ * StreamedJsonResponse represents a streamed HTTP response for JSON.
+ *
+ * A StreamedJsonResponse uses a structure and generics to create an
+ * efficient resource-saving JSON response.
+ *
+ * It is recommended to use flush() function after a specific number of items to directly stream the data.
+ *
+ * @see flush()
+ *
+ * @author Alexander Schranz <alexander@sulu.io>
+ *
+ * Example usage:
+ *
+ *     function loadArticles(): \Generator
+ *         // some streamed loading
+ *         yield ['title' => 'Article 1'];
+ *         yield ['title' => 'Article 2'];
+ *         yield ['title' => 'Article 3'];
+ *         // recommended to use flush() after every specific number of items
+ *     }),
+ *
+ *     $response = new StreamedJsonResponse(
+ *         // json structure with generators in which will be streamed
+ *         [
+ *             '_embedded' => [
+ *                 'articles' => loadArticles(), // any generator which you want to stream as list of data
+ *             ],
+ *         ],
+ *     );
+ */
+class StreamedJsonResponse extends StreamedResponse
+{
+    private const PLACEHOLDER = '__symfony_json__';
+
+    /**
+     * @param mixed[]                        $data            JSON Data containing PHP generators which will be streamed as list of data
+     * @param int                            $status          The HTTP status code (200 "OK" by default)
+     * @param array<string, string|string[]> $headers         An array of HTTP headers
+     * @param int                            $encodingOptions Flags for the json_encode() function
+     */
+    public function __construct(
+        private readonly array $data,
+        int $status = 200,
+        array $headers = [],
+        private int $encodingOptions = JsonResponse::DEFAULT_ENCODING_OPTIONS,
+    ) {
+        parent::__construct($this->stream(...), $status, $headers);
+
+        if (!$this->headers->get('Content-Type')) {
+            $this->headers->set('Content-Type', 'application/json');
+        }
+    }
+
+    private function stream(): void
+    {
+        $generators = [];
+        $structure = $this->data;
+
+        array_walk_recursive($structure, function (&$item, $key) use (&$generators) {
+            if (self::PLACEHOLDER === $key) {
+                // if the placeholder is already in the structure it should be replaced with a new one that explode
+                // works like expected for the structure
+                $generators[] = $key;
+            }
+
+            // generators should be used but for better DX all kind of Traversable and objects are supported
+            if (\is_object($item)) {
+                $generators[] = $item;
+                $item = self::PLACEHOLDER;
+            } elseif (self::PLACEHOLDER === $item) {
+                // if the placeholder is already in the structure it should be replaced with a new one that explode
+                // works like expected for the structure
+                $generators[] = $item;
+            }
+        });
+
+        $jsonEncodingOptions = \JSON_THROW_ON_ERROR | $this->encodingOptions;
+        $keyEncodingOptions = $jsonEncodingOptions & ~\JSON_NUMERIC_CHECK;
+
+        $jsonParts = explode('"'.self::PLACEHOLDER.'"', json_encode($structure, $jsonEncodingOptions));
+
+        foreach ($generators as $index => $generator) {
+            // send first and between parts of the structure
+            echo $jsonParts[$index];
+
+            if ($generator instanceof \JsonSerializable || !$generator instanceof \Traversable) {
+                // the placeholders, JsonSerializable and none traversable items in the structure are rendered here
+                echo json_encode($generator, $jsonEncodingOptions);
+
+                continue;
+            }
+
+            $isFirstItem = true;
+            $startTag = '[';
+
+            foreach ($generator as $key => $item) {
+                if ($isFirstItem) {
+                    $isFirstItem = false;
+                    // depending on the first elements key the generator is detected as a list or map
+                    // we can not check for a whole list or map because that would hurt the performance
+                    // of the streamed response which is the main goal of this response class
+                    if (0 !== $key) {
+                        $startTag = '{';
+                    }
+
+                    echo $startTag;
+                } else {
+                    // if not first element of the generic, a separator is required between the elements
+                    echo ',';
+                }
+
+                if ('{' === $startTag) {
+                    echo json_encode((string) $key, $keyEncodingOptions).':';
+                }
+
+                echo json_encode($item, $jsonEncodingOptions);
+            }
+
+            echo '[' === $startTag ? ']' : '}';
+        }
+
+        // send last part of the structure
+        echo $jsonParts[array_key_last($jsonParts)];
+    }
+}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/StreamedJsonResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/StreamedJsonResponseTest.php
new file mode 100644
index 0000000000000..e142672fd0658
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/StreamedJsonResponseTest.php
@@ -0,0 +1,241 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\StreamedJsonResponse;
+
+class StreamedJsonResponseTest extends TestCase
+{
+    public function testResponseSimpleList()
+    {
+        $content = $this->createSendResponse(
+            [
+                '_embedded' => [
+                    'articles' => $this->generatorSimple('Article'),
+                    'news' => $this->generatorSimple('News'),
+                ],
+            ],
+        );
+
+        $this->assertSame('{"_embedded":{"articles":["Article 1","Article 2","Article 3"],"news":["News 1","News 2","News 3"]}}', $content);
+    }
+
+    public function testResponseObjectsList()
+    {
+        $content = $this->createSendResponse(
+            [
+                '_embedded' => [
+                    'articles' => $this->generatorArray('Article'),
+                ],
+            ],
+        );
+
+        $this->assertSame('{"_embedded":{"articles":[{"title":"Article 1"},{"title":"Article 2"},{"title":"Article 3"}]}}', $content);
+    }
+
+    public function testResponseWithoutGenerator()
+    {
+        // while it is not the intended usage, all kind of iterables should be supported for good DX
+        $content = $this->createSendResponse(
+            [
+                '_embedded' => [
+                    'articles' => ['Article 1', 'Article 2', 'Article 3'],
+                ],
+            ],
+        );
+
+        $this->assertSame('{"_embedded":{"articles":["Article 1","Article 2","Article 3"]}}', $content);
+    }
+
+    public function testResponseWithPlaceholder()
+    {
+        // the placeholder must not conflict with generator injection
+        $content = $this->createSendResponse(
+            [
+                '_embedded' => [
+                    'articles' => $this->generatorArray('Article'),
+                    'placeholder' => '__symfony_json__',
+                    'news' => $this->generatorSimple('News'),
+                ],
+                'placeholder' => '__symfony_json__',
+            ],
+        );
+
+        $this->assertSame('{"_embedded":{"articles":[{"title":"Article 1"},{"title":"Article 2"},{"title":"Article 3"}],"placeholder":"__symfony_json__","news":["News 1","News 2","News 3"]},"placeholder":"__symfony_json__"}', $content);
+    }
+
+    public function testResponseWithMixedKeyType()
+    {
+        $content = $this->createSendResponse(
+            [
+                '_embedded' => [
+                    'list' => (function (): \Generator {
+                        yield 0 => 'test';
+                        yield 'key' => 'value';
+                    })(),
+                    'map' => (function (): \Generator {
+                        yield 'key' => 'value';
+                        yield 0 => 'test';
+                    })(),
+                    'integer' => (function (): \Generator {
+                        yield 1 => 'one';
+                        yield 3 => 'three';
+                    })(),
+                ],
+            ]
+        );
+
+        $this->assertSame('{"_embedded":{"list":["test","value"],"map":{"key":"value","0":"test"},"integer":{"1":"one","3":"three"}}}', $content);
+    }
+
+    public function testResponseOtherTraversable()
+    {
+        $arrayObject = new \ArrayObject(['__symfony_json__' => '__symfony_json__']);
+
+        $iteratorAggregate = new class() implements \IteratorAggregate {
+            public function getIterator(): \Traversable
+            {
+                return new \ArrayIterator(['__symfony_json__']);
+            }
+        };
+
+        $jsonSerializable = new class() implements \IteratorAggregate, \JsonSerializable {
+            public function getIterator(): \Traversable
+            {
+                return new \ArrayIterator(['This should be ignored']);
+            }
+
+            public function jsonSerialize(): mixed
+            {
+                return ['__symfony_json__' => '__symfony_json__'];
+            }
+        };
+
+        // while Generators should be used for performance reasons, the object should also work with any Traversable
+        // to make things easier for a developer
+        $content = $this->createSendResponse(
+            [
+                'arrayObject' => $arrayObject,
+                'iteratorAggregate' => $iteratorAggregate,
+                'jsonSerializable' => $jsonSerializable,
+                // add a Generator to make sure it still work in combination with other Traversable objects
+                'articles' => $this->generatorArray('Article'),
+            ],
+        );
+
+        $this->assertSame('{"arrayObject":{"__symfony_json__":"__symfony_json__"},"iteratorAggregate":["__symfony_json__"],"jsonSerializable":{"__symfony_json__":"__symfony_json__"},"articles":[{"title":"Article 1"},{"title":"Article 2"},{"title":"Article 3"}]}', $content);
+    }
+
+    public function testPlaceholderAsKeyAndValueInStructure()
+    {
+        $content = $this->createSendResponse(
+            [
+                '__symfony_json__' => '__symfony_json__',
+                'articles' => $this->generatorArray('Article'),
+            ],
+        );
+
+        $this->assertSame('{"__symfony_json__":"__symfony_json__","articles":[{"title":"Article 1"},{"title":"Article 2"},{"title":"Article 3"}]}', $content);
+    }
+
+    public function testResponseStatusCode()
+    {
+        $response = new StreamedJsonResponse([], 201);
+
+        $this->assertSame(201, $response->getStatusCode());
+    }
+
+    public function testPlaceholderAsObjectStructure()
+    {
+        $object = new class() {
+            public $__symfony_json__ = 'foo';
+            public $bar = '__symfony_json__';
+        };
+
+        $content = $this->createSendResponse(
+            [
+                'object' => $object,
+                // add a Generator to make sure it still work in combination with other object holding placeholders
+                'articles' => $this->generatorArray('Article'),
+            ],
+        );
+
+        $this->assertSame('{"object":{"__symfony_json__":"foo","bar":"__symfony_json__"},"articles":[{"title":"Article 1"},{"title":"Article 2"},{"title":"Article 3"}]}', $content);
+    }
+
+    public function testResponseHeaders()
+    {
+        $response = new StreamedJsonResponse([], 200, ['X-Test' => 'Test']);
+
+        $this->assertSame('Test', $response->headers->get('X-Test'));
+    }
+
+    public function testCustomContentType()
+    {
+        $response = new StreamedJsonResponse([], 200, ['Content-Type' => 'application/json+stream']);
+
+        $this->assertSame('application/json+stream', $response->headers->get('Content-Type'));
+    }
+
+    public function testEncodingOptions()
+    {
+        $response = new StreamedJsonResponse([
+            '_embedded' => [
+                'count' => '2', // options are applied to the initial json encode
+                'values' => (function (): \Generator {
+                    yield 'with/unescaped/slash' => 'With/a/slash'; // options are applied to key and values
+                    yield '3' => '3'; // numeric check for value, but not for the key
+                })(),
+            ],
+        ], encodingOptions: \JSON_UNESCAPED_SLASHES | \JSON_NUMERIC_CHECK);
+
+        ob_start();
+        $response->send();
+        $content = ob_get_clean();
+
+        $this->assertSame('{"_embedded":{"count":2,"values":{"with/unescaped/slash":"With/a/slash","3":3}}}', $content);
+    }
+
+    /**
+     * @param mixed[] $data
+     */
+    private function createSendResponse(array $data): string
+    {
+        $response = new StreamedJsonResponse($data);
+
+        ob_start();
+        $response->send();
+
+        return ob_get_clean();
+    }
+
+    /**
+     * @return \Generator<int, string>
+     */
+    private function generatorSimple(string $test): \Generator
+    {
+        yield $test.' 1';
+        yield $test.' 2';
+        yield $test.' 3';
+    }
+
+    /**
+     * @return \Generator<int, array{title: string}>
+     */
+    private function generatorArray(string $test): \Generator
+    {
+        yield ['title' => $test.' 1'];
+        yield ['title' => $test.' 2'];
+        yield ['title' => $test.' 3'];
+    }
+}

From 53bfee4440bdd65d52216ebdbec16132221050c1 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Thu, 15 Dec 2022 20:28:50 +0100
Subject: [PATCH 099/475] [ExpressionLanguage] Add `enum` expression function

---
 .../Component/ExpressionLanguage/CHANGELOG.md |  5 ++
 .../ExpressionLanguage/ExpressionLanguage.php | 13 +++++
 .../Tests/ExpressionLanguageTest.php          | 49 +++++++++++++++++++
 .../Tests/Fixtures/FooBackedEnum.php          |  8 +++
 .../Tests/Fixtures/FooEnum.php                |  8 +++
 5 files changed, 83 insertions(+)
 create mode 100644 src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/FooBackedEnum.php
 create mode 100644 src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/FooEnum.php

diff --git a/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md b/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md
index 9210fc4cc33fb..44a3478ff51b4 100644
--- a/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md
+++ b/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `enum` expression function
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
index e076eb9bc56e0..ed233cd270c5a 100644
--- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
+++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
@@ -138,6 +138,19 @@ public function registerProvider(ExpressionFunctionProviderInterface $provider)
     protected function registerFunctions()
     {
         $this->addFunction(ExpressionFunction::fromPhp('constant'));
+
+        $this->addFunction(new ExpressionFunction('enum',
+            static fn ($str): string => sprintf("(\constant(\$v = (%s))) instanceof \UnitEnum ? \constant(\$v) : throw new \TypeError(\sprintf('The string \"%%s\" is not the name of a valid enum case.', \$v))", $str),
+            static function ($arguments, $str): \UnitEnum {
+                $value = \constant($str);
+
+                if (!$value instanceof \UnitEnum) {
+                    throw new \TypeError(sprintf('The string "%s" is not the name of a valid enum case.', $str));
+                }
+
+                return $value;
+            }
+        ));
     }
 
     private function getLexer(): Lexer
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
index 2efa7a3be4722..98a91600d6612 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -18,6 +18,8 @@
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\ExpressionLanguage\ParsedExpression;
 use Symfony\Component\ExpressionLanguage\SyntaxError;
+use Symfony\Component\ExpressionLanguage\Tests\Fixtures\FooBackedEnum;
+use Symfony\Component\ExpressionLanguage\Tests\Fixtures\FooEnum;
 use Symfony\Component\ExpressionLanguage\Tests\Fixtures\TestProvider;
 
 class ExpressionLanguageTest extends TestCase
@@ -78,6 +80,53 @@ public function testConstantFunction()
         $this->assertEquals('\constant("PHP_VERSION")', $expressionLanguage->compile('constant("PHP_VERSION")'));
     }
 
+    public function testEnumFunctionWithConstantThrows()
+    {
+        $this->expectException(\TypeError::class);
+        $this->expectExceptionMessage('The string "PHP_VERSION" is not the name of a valid enum case.');
+        $expressionLanguage = new ExpressionLanguage();
+        $expressionLanguage->evaluate('enum("PHP_VERSION")');
+    }
+
+    public function testCompiledEnumFunctionWithConstantThrows()
+    {
+        $this->expectException(\TypeError::class);
+        $this->expectExceptionMessage('The string "PHP_VERSION" is not the name of a valid enum case.');
+        $expressionLanguage = new ExpressionLanguage();
+        eval($expressionLanguage->compile('enum("PHP_VERSION")').';');
+    }
+
+    public function testEnumFunction()
+    {
+        $expressionLanguage = new ExpressionLanguage();
+        $this->assertSame(FooEnum::Foo, $expressionLanguage->evaluate('enum("Symfony\\\\Component\\\\ExpressionLanguage\\\\Tests\\\\Fixtures\\\\FooEnum::Foo")'));
+    }
+
+    public function testCompiledEnumFunction()
+    {
+        $result = null;
+        $expressionLanguage = new ExpressionLanguage();
+        eval(sprintf('$result = %s;', $expressionLanguage->compile('enum("Symfony\\\\Component\\\\ExpressionLanguage\\\\Tests\\\\Fixtures\\\\FooEnum::Foo")')));
+
+        $this->assertSame(FooEnum::Foo, $result);
+    }
+
+    public function testBackedEnumFunction()
+    {
+        $expressionLanguage = new ExpressionLanguage();
+        $this->assertSame(FooBackedEnum::Bar, $expressionLanguage->evaluate('enum("Symfony\\\\Component\\\\ExpressionLanguage\\\\Tests\\\\Fixtures\\\\FooBackedEnum::Bar")'));
+        $this->assertSame('Foo', $expressionLanguage->evaluate('enum("Symfony\\\\Component\\\\ExpressionLanguage\\\\Tests\\\\Fixtures\\\\FooBackedEnum::Bar").value'));
+    }
+
+    public function testCompiledEnumFunctionWithBackedEnum()
+    {
+        $result = null;
+        $expressionLanguage = new ExpressionLanguage();
+        eval(sprintf('$result = %s;', $expressionLanguage->compile('enum("Symfony\\\\Component\\\\ExpressionLanguage\\\\Tests\\\\Fixtures\\\\FooBackedEnum::Bar")')));
+
+        $this->assertSame(FooBackedEnum::Bar, $result);
+    }
+
     public function testProviders()
     {
         $expressionLanguage = new ExpressionLanguage(null, [new TestProvider()]);
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/FooBackedEnum.php b/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/FooBackedEnum.php
new file mode 100644
index 0000000000000..8bf81231b4dac
--- /dev/null
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/FooBackedEnum.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\ExpressionLanguage\Tests\Fixtures;
+
+enum FooBackedEnum: string
+{
+    case Bar = 'Foo';
+}
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/FooEnum.php b/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/FooEnum.php
new file mode 100644
index 0000000000000..7c6bd6d9fe35e
--- /dev/null
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/FooEnum.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\ExpressionLanguage\Tests\Fixtures;
+
+enum FooEnum
+{
+    case Foo;
+}

From db3c1e8ddd0325d9cc692362dd5c2692b8eca321 Mon Sep 17 00:00:00 2001
From: Thomas Hanke <thomas.hanke@pro-volution.de>
Date: Wed, 30 Nov 2022 16:47:42 +0100
Subject: [PATCH 100/475] add reject to MessageEvent to stop sending mail

---
 src/Symfony/Component/Mailer/CHANGELOG.md           |  5 +++++
 src/Symfony/Component/Mailer/Event/MessageEvent.php | 13 ++++++++++++-
 .../Mailer/Transport/AbstractTransport.php          |  4 ++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Mailer/CHANGELOG.md b/src/Symfony/Component/Mailer/CHANGELOG.md
index 772f50717334f..90fdf5d47811f 100644
--- a/src/Symfony/Component/Mailer/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `reject()` in `MessageEvent` to reject sending mail
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Mailer/Event/MessageEvent.php b/src/Symfony/Component/Mailer/Event/MessageEvent.php
index 083b8f8435b56..906d4459fabd7 100644
--- a/src/Symfony/Component/Mailer/Event/MessageEvent.php
+++ b/src/Symfony/Component/Mailer/Event/MessageEvent.php
@@ -28,6 +28,7 @@ final class MessageEvent extends Event
     private Envelope $envelope;
     private string $transport;
     private bool $queued;
+    private bool $rejected = false;
 
     /** @var StampInterface[] */
     private array $stamps = [];
@@ -70,10 +71,20 @@ public function isQueued(): bool
         return $this->queued;
     }
 
+    public function isRejected(): bool
+    {
+        return $this->rejected;
+    }
+
+    public function reject(): void
+    {
+        $this->rejected = true;
+    }
+
     public function addStamp(StampInterface $stamp): void
     {
         if (!$this->queued) {
-            throw new LogicException(sprintf('Cannot call "%s()" on a message that is not meant to be queued', __METHOD__));
+            throw new LogicException(sprintf('Cannot call "%s()" on a message that is not meant to be queued.', __METHOD__));
         }
 
         $this->stamps[] = $stamp;
diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
index a6710d007da02..f3ee80f890c8d 100644
--- a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
+++ b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
@@ -82,6 +82,10 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa
 
             $sentMessage = new SentMessage($message, $envelope);
 
+            if ($event->isRejected()) {
+                return $sentMessage;
+            }
+
             try {
                 $this->doSend($sentMessage);
             } catch (\Throwable $error) {

From ee020be06bd5c0c0aca60ff873c316d68f5109f8 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 31 Dec 2022 11:24:53 +0100
Subject: [PATCH 101/475] [Mailer] Add the possibility to reject a message

---
 src/Symfony/Component/Mailer/CHANGELOG.md     |  2 +-
 src/Symfony/Component/Mailer/Mailer.php       |  4 +++
 .../Component/Mailer/Tests/MailerTest.php     | 34 +++++++++++++++++++
 .../Tests/Transport/AbstractTransportTest.php | 31 +++++++++++++++++
 .../Mailer/Transport/AbstractTransport.php    |  8 ++---
 5 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Mailer/CHANGELOG.md b/src/Symfony/Component/Mailer/CHANGELOG.md
index 90fdf5d47811f..877872ca8ed7e 100644
--- a/src/Symfony/Component/Mailer/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/CHANGELOG.md
@@ -4,7 +4,7 @@ CHANGELOG
 6.3
 ---
 
- * Add `reject()` in `MessageEvent` to reject sending mail
+ * Add `MessageEvent::reject()` to allow rejecting an email before sending it
 
 6.2
 ---
diff --git a/src/Symfony/Component/Mailer/Mailer.php b/src/Symfony/Component/Mailer/Mailer.php
index c9f8b15aa85c1..cd305a65c4926 100644
--- a/src/Symfony/Component/Mailer/Mailer.php
+++ b/src/Symfony/Component/Mailer/Mailer.php
@@ -56,6 +56,10 @@ public function send(RawMessage $message, Envelope $envelope = null): void
             $event = new MessageEvent($clonedMessage, $clonedEnvelope, (string) $this->transport, true);
             $this->dispatcher->dispatch($event);
             $stamps = $event->getStamps();
+
+            if ($event->isRejected()) {
+                return;
+            }
         }
 
         try {
diff --git a/src/Symfony/Component/Mailer/Tests/MailerTest.php b/src/Symfony/Component/Mailer/Tests/MailerTest.php
index a369216e23cbc..3167a8270ea0b 100644
--- a/src/Symfony/Component/Mailer/Tests/MailerTest.php
+++ b/src/Symfony/Component/Mailer/Tests/MailerTest.php
@@ -13,14 +13,19 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\Mailer\Envelope as MailerEnvelope;
 use Symfony\Component\Mailer\Event\MessageEvent;
 use Symfony\Component\Mailer\Exception\LogicException;
 use Symfony\Component\Mailer\Mailer;
+use Symfony\Component\Mailer\SentMessage;
+use Symfony\Component\Mailer\Transport\AbstractTransport;
 use Symfony\Component\Mailer\Transport\NullTransport;
 use Symfony\Component\Mailer\Transport\TransportInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Stamp\StampInterface;
+use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;
 use Symfony\Component\Mime\RawMessage;
 
@@ -78,4 +83,33 @@ public function dispatch($message, array $stamps = []): Envelope
         self::assertCount(1, $bus->stamps);
         self::assertSame([$stamp], $bus->stamps);
     }
+
+    public function testRejectMessage()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(MessageEvent::class, fn (MessageEvent $event) => $event->reject());
+
+        $transport = new class($dispatcher, $this) extends AbstractTransport {
+            public function __construct(EventDispatcherInterface $dispatcher, private TestCase $test)
+            {
+                parent::__construct($dispatcher);
+            }
+
+            protected function doSend(SentMessage $message): void
+            {
+                $this->test->fail('This should never be called as message is rejected.');
+            }
+
+            public function __toString(): string
+            {
+                return 'fake://';
+            }
+        };
+        $mailer = new Mailer($transport);
+
+        $message = new RawMessage('');
+        $envelope = new MailerEnvelope(new Address('fabien@example.com'), [new Address('helene@example.com')]);
+        $mailer->send($message, $envelope);
+        $this->assertTrue(true);
+    }
 }
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/AbstractTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/AbstractTransportTest.php
index 42c23fcd735e2..7f64429002c21 100644
--- a/src/Symfony/Component/Mailer/Tests/Transport/AbstractTransportTest.php
+++ b/src/Symfony/Component/Mailer/Tests/Transport/AbstractTransportTest.php
@@ -15,9 +15,13 @@
 use Symfony\Bridge\Twig\Mime\BodyRenderer;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Mailer\Envelope;
+use Symfony\Component\Mailer\Event\MessageEvent;
 use Symfony\Component\Mailer\EventListener\MessageListener;
 use Symfony\Component\Mailer\Exception\LogicException;
+use Symfony\Component\Mailer\SentMessage;
+use Symfony\Component\Mailer\Transport\AbstractTransport;
 use Symfony\Component\Mailer\Transport\NullTransport;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\RawMessage;
@@ -78,4 +82,31 @@ public function testRenderedTemplatedEmail()
         $sentMessage = $transport->send((new TemplatedEmail())->to('me@example.com')->from('me@example.com')->htmlTemplate('tpl'));
         $this->assertMatchesRegularExpression('/Some message/', $sentMessage->getMessage()->toString());
     }
+
+    public function testRejectMessage()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(MessageEvent::class, fn (MessageEvent $event) => $event->reject());
+
+        $transport = new cl
10000
ass($dispatcher, $this) extends AbstractTransport {
+            public function __construct(EventDispatcherInterface $dispatcher, private TestCase $test)
+            {
+                parent::__construct($dispatcher);
+            }
+
+            protected function doSend(SentMessage $message): void
+            {
+                $this->test->fail('This should never be called as message is rejected.');
+            }
+
+            public function __toString(): string
+            {
+                return 'fake://';
+            }
+        };
+
+        $message = new RawMessage('');
+        $envelope = new Envelope(new Address('fabien@example.com'), [new Address('helene@example.com')]);
+        $this->assertNull($transport->send($message, $envelope));
+    }
 }
diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
index f3ee80f890c8d..6598dccfcc09e 100644
--- a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
+++ b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
@@ -73,6 +73,10 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa
 
             $event = new MessageEvent($message, $envelope, (string) $this);
             $this->dispatcher->dispatch($event);
+            if ($event->isRejected()) {
+                return null;
+            }
+
             $envelope = $event->getEnvelope();
             $message = $event->getMessage();
 
@@ -82,10 +86,6 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa
 
             $sentMessage = new SentMessage($message, $envelope);
 
-            if ($event->isRejected()) {
-                return $sentMessage;
-            }
-
             try {
                 $this->doSend($sentMessage);
             } catch (\Throwable $error) {

From 5733cf767760999139dcf82a70e316a5f31687c1 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 31 Dec 2022 12:54:12 +0100
Subject: [PATCH 102/475] [Mailer] Stop propagation when an email is rejected

---
 src/Symfony/Component/Mailer/Event/MessageEvent.php            | 1 +
 src/Symfony/Component/Mailer/Tests/MailerTest.php              | 3 ++-
 .../Component/Mailer/Tests/Transport/AbstractTransportTest.php | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Mailer/Event/MessageEvent.php b/src/Symfony/Component/Mailer/Event/MessageEvent.php
index 906d4459fabd7..f00fdd52ca24c 100644
--- a/src/Symfony/Component/Mailer/Event/MessageEvent.php
+++ b/src/Symfony/Component/Mailer/Event/MessageEvent.php
@@ -79,6 +79,7 @@ public function isRejected(): bool
     public function reject(): void
     {
         $this->rejected = true;
+        $this->stopPropagation();
     }
 
     public function addStamp(StampInterface $stamp): void
diff --git a/src/Symfony/Component/Mailer/Tests/MailerTest.php b/src/Symfony/Component/Mailer/Tests/MailerTest.php
index 3167a8270ea0b..95ab9d9391c7b 100644
--- a/src/Symfony/Component/Mailer/Tests/MailerTest.php
+++ b/src/Symfony/Component/Mailer/Tests/MailerTest.php
@@ -87,7 +87,8 @@ public function dispatch($message, array $stamps = []): Envelope
     public function testRejectMessage()
     {
         $dispatcher = new EventDispatcher();
-        $dispatcher->addListener(MessageEvent::class, fn (MessageEvent $event) => $event->reject());
+        $dispatcher->addListener(MessageEvent::class, fn (MessageEvent $event) => $event->reject(), 255);
+        $dispatcher->addListener(MessageEvent::class, fn () => throw new \RuntimeException('Should never be called.'));
 
         $transport = new class($dispatcher, $this) extends AbstractTransport {
             public function __construct(EventDispatcherInterface $dispatcher, private TestCase $test)
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/AbstractTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/AbstractTransportTest.php
index 7f64429002c21..19d574f736079 100644
--- a/src/Symfony/Component/Mailer/Tests/Transport/AbstractTransportTest.php
+++ b/src/Symfony/Component/Mailer/Tests/Transport/AbstractTransportTest.php
@@ -86,7 +86,8 @@ public function testRenderedTemplatedEmail()
     public function testRejectMessage()
     {
         $dispatcher = new EventDispatcher();
-        $dispatcher->addListener(MessageEvent::class, fn (MessageEvent $event) => $event->reject());
+        $dispatcher->addListener(MessageEvent::class, fn (MessageEvent $event) => $event->reject(), 255);
+        $dispatcher->addListener(MessageEvent::class, fn () => throw new \RuntimeException('Should never be called.'));
 
         $transport = new class($dispatcher, $this) extends AbstractTransport {
             public function __construct(EventDispatcherInterface $dispatcher, private TestCase $test)

From d0efd41d0268ddb4a55ea85002165f3c6a5f80ae Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sun, 1 Jan 2023 09:39:23 +0100
Subject: [PATCH 103/475] Bump LICENSE year

---
 src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE   | 2 +-
 src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE    | 2 +-
 src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE  | 2 +-
 src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE    | 2 +-
 src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE       | 2 +-
 src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE | 2 +-
 src/Symfony/Component/Notifier/Bridge/Termii/LICENSE      | 2 +-
 src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE b/src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE
index 0ece8964f767d..074eb2b39259e 100644
--- a/src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022 Fabien Potencier
+Copyright (c) 2022-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE b/src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE
index 0ece8964f767d..074eb2b39259e 100644
--- a/src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022 Fabien Potencier
+Copyright (c) 2022-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE b/src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE
index 0ece8964f767d..074eb2b39259e 100644
--- a/src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022 Fabien Potencier
+Copyright (c) 2022-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE b/src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE
index 0ece8964f767d..074eb2b39259e 100644
--- a/src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022 Fabien Potencier
+Copyright (c) 2022-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE b/src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE
index 0ece8964f767d..074eb2b39259e 100644
--- a/src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022 Fabien Potencier
+Copyright (c) 2022-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE b/src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE
index 0ece8964f767d..074eb2b39259e 100644
--- a/src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022 Fabien Potencier
+Copyright (c) 2022-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/LICENSE b/src/Symfony/Component/Notifier/Bridge/Termii/LICENSE
index 0ece8964f767d..074eb2b39259e 100644
--- a/src/Symfony/Component/Notifier/Bridge/Termii/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022 Fabien Potencier
+Copyright (c) 2022-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE b/src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE
index 0ece8964f767d..074eb2b39259e 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022 Fabien Potencier
+Copyright (c) 2022-2023 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 8d3e897bf7c1ad10371a65e99445688b976c211b Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Tue, 6 Dec 2022 17:06:28 +0100
Subject: [PATCH 104/475] [PhpUnitBridge] Add `enum_exists` mock

---
 src/Symfony/Bridge/PhpUnit/CHANGELOG.md       |  5 ++
 .../Bridge/PhpUnit/ClassExistsMock.php        | 24 +++++-
 .../PhpUnit/Tests/ClassExistsMockTest.php     | 46 ++++++++++++
 .../PhpUnit/Tests/EnumExistsMockTest.php      | 74 +++++++++++++++++++
 .../PhpUnit/Tests/Fixtures/ExistingEnum.php   | 16 ++++
 .../Tests/Fixtures/ExistingEnumReal.php       | 16 ++++
 src/Symfony/Bridge/PhpUnit/composer.json      |  3 +-
 7 files changed, 181 insertions(+), 3 deletions(-)
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/EnumExistsMockTest.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/Fixtures/ExistingEnum.php
 create mode 100644 src/Symfony/Bridge/PhpUnit/Tests/Fixtures/ExistingEnumReal.php

diff --git a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
index e7e3e29862bd4..9c664176565b7 100644
--- a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
+++ b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add support for mocking the `enum_exists` function
+
 6.2
 ---
 
diff --git a/src/Symfony/Bridge/PhpUnit/ClassExistsMock.php b/src/Symfony/Bridge/PhpUnit/ClassExistsMock.php
index 70fdb9f9631ad..d79624ec5fdde 100644
--- a/src/Symfony/Bridge/PhpUnit/ClassExistsMock.php
+++ b/src/Symfony/Bridge/PhpUnit/ClassExistsMock.php
@@ -18,16 +18,29 @@ class ClassExistsMock
 {
     private static $classes = [];
 
+    private static $enums = [];
+
     /**
      * Configures the classes to be checked upon existence.
      *
-     * @param array $classes Mocked class names as keys (case sensitive, without leading root namespace slash) and booleans as values
+     * @param array $classes Mocked class names as keys (case-sensitive, without leading root namespace slash) and booleans as values
      */
     public static function withMockedClasses(array $classes)
     {
         self::$classes = $classes;
     }
 
+    /**
+     * Configures the enums to be checked upon existence.
+     *
+     * @param array $enums Mocked enums names as keys (case-sensitive, without leading root namespace slash) and booleans as values
+     */
+    public static function withMockedEnums(array $enums)
+    {
+        self::$enums = $enums;
+        self::$classes += $enums;
+    }
+
     public static function class_exists($name, $autoload = true)
     {
         $name = ltrim($name, '\\');
@@ -49,6 +62,13 @@ public static function trait_exists($name, $autoload = true)
         return isset(self::$classes[$name]) ? (bool) self::$classes[$name] : \trait_exists($name, $autoload);
     }
 
+    public static function enum_exists($name, $autoload = true)
+    {
+        $name = ltrim($name, '\\');
+
+        return isset(self::$enums[$name]) ? (bool) self::$enums[$name] : \enum_exists($name, $autoload);
+    }
+
     public static function register($class)
     {
         $self = static::class;
@@ -61,7 +81,7 @@ public static function register($class)
             $mockedNs[] = substr($class, 6, strrpos($class, '\\') - 6);
         }
         foreach ($mockedNs as $ns) {
-            foreach (['class', 'interface', 'trait'] as $type) {
+            foreach (['class', 'interface', 'trait', 'enum'] as $type) {
                 if (\function_exists($ns.'\\'.$type.'_exists')) {
                     continue;
                 }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/ClassExistsMockTest.php b/src/Symfony/Bridge/PhpUnit/Tests/ClassExistsMockTest.php
index 3e3d5771b1b10..58c01646a8a61 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/ClassExistsMockTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/ClassExistsMockTest.php
@@ -31,6 +31,10 @@ protected function setUp(): void
             ExistingTrait::class => false,
             'NonExistingTrait' => true,
         ]);
+
+        ClassExistsMock::withMockedEnums([
+            'NonExistingEnum' => true,
+        ]);
     }
 
     public function testClassExists()
@@ -53,6 +57,26 @@ public function testClassExists()
         $this->assertFalse(class_exists('\\NonExistingClassReal', false));
     }
 
+    public function testEnumExistsOnClasses()
+    {
+        $this->assertFalse(enum_exists(ExistingClass::class));
+        $this->assertFalse(enum_exists(ExistingClass::class, false));
+        $this->assertFalse(enum_exists('\\'.ExistingClass::class));
+        $this->assertFalse(enum_exists('\\'.ExistingClass::class, false));
+        $this->assertFalse(enum_exists('NonExistingClass'));
+        $this->assertFalse(enum_exists('NonExistingClass', false));
+        $this->assertFalse(enum_exists('\\NonExistingClass'));
+        $this->assertFalse(enum_exists('\\NonExistingClass', false));
+        $this->assertFalse(enum_exists(ExistingClassReal::class));
+        $this->assertFalse(enum_exists(ExistingClassReal::class, false));
+        $this->assertFalse(enum_exists('\\'.ExistingClassReal::class));
+        $this->assertFalse(enum_exists('\\'.ExistingClassReal::class, false));
+        $this->assertFalse(enum_exists('NonExistingClassReal'));
+        $this->assertFalse(enum_exists('NonExistingClassReal', false));
+        $this->assertFalse(enum_exists('\\NonExistingClassReal'));
+        $this->assertFalse(enum_exists('\\NonExistingClassReal', false));
+    }
+
     public function testInterfaceExists()
     {
         $this->assertFalse(interface_exists(ExistingInterface::class));
@@ -92,6 +116,28 @@ public function testTraitExists()
         $this->assertFalse(trait_exists('\\NonExistingTraitReal'));
         $this->assertFalse(trait_exists('\\NonExistingTraitReal', false));
     }
+
+    public function testEnumExists()
+    {
+        $this->assertTrue(enum_exists('NonExistingEnum'));
+        $this->assertTrue(enum_exists('NonExistingEnum', false));
+        $this->assertTrue(enum_exists('\\NonExistingEnum'));
+        $this->assertTrue(enum_exists('\\NonExistingEnum', false));
+        $this->assertFalse(enum_exists('NonExistingClassReal'));
+        $this->assertFalse(enum_exists('NonExistingClassReal', false));
+        $this->assertFalse(enum_exists('\\NonExistingEnumReal'));
+        $this->assertFalse(enum_exists('\\NonExistingEnumReal', false));
+    }
+
+    public function testClassExistsOnEnums()
+    {
+        $this->assertTrue(class_exists('NonExistingEnum'));
+        $this->assertTrue(class_exists('NonExistingEnum', false));
+        $this->assertTrue(class_exists('\\NonExistingEnum'));
+        $this->assertTrue(class_exists('\\NonExistingEnum', false));
+        $this->assertFalse(class_exists('\\NonExistingEnumReal'));
+        $this->assertFalse(class_exists('\\NonExistingEnumReal', false));
+    }
 }
 
 class ExistingClass
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/EnumExistsMockTest.php b/src/Symfony/Bridge/PhpUnit/Tests/EnumExistsMockTest.php
new file mode 100644
index 0000000000000..8115dc1316538
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/EnumExistsMockTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ClassExistsMock;
+use Symfony\Bridge\PhpUnit\Tests\Fixtures\ExistingEnum;
+use Symfony\Bridge\PhpUnit\Tests\Fixtures\ExistingEnumReal;
+
+/**
+ * @requires PHP 8.1
+ */
+class EnumExistsMockTest extends TestCase
+{
+    public static function setUpBeforeClass(): void
+    {
+        ClassExistsMock::register(__CLASS__);
+    }
+
+    protected function setUp(): void
+    {
+        ClassExistsMock::withMockedEnums([
+            ExistingEnum::class => false,
+            'NonExistingEnum' => true,
+        ]);
+    }
+
+    public function testClassExists()
+    {
+        $this->assertFalse(class_exists(ExistingEnum::class));
+        $this->assertFalse(class_exists(ExistingEnum::class, false));
+        $this->assertFalse(class_exists('\\'.ExistingEnum::class));
+        $this->assertFalse(class_exists('\\'.ExistingEnum::class, false));
+        $this->assertTrue(class_exists('NonExistingEnum'));
+        $this->assertTrue(class_exists('NonExistingEnum', false));
+        $this->assertTrue(class_exists('\\NonExistingEnum'));
+        $this->assertTrue(class_exists('\\NonExistingEnum', false));
+        $this->assertTrue(class_exists(ExistingEnumReal::class));
+        $this->assertTrue(class_exists(ExistingEnumReal::class, false));
+        $this->assertTrue(class_exists('\\'.ExistingEnumReal::class));
+        $this->assertTrue(class_exists('\\'.ExistingEnumReal::class, false));
+        $this->assertFalse(class_exists('\\NonExistingEnumReal'));
+        $this->assertFalse(class_exists('\\NonExistingEnumReal', false));
+    }
+
+    public function testEnumExists()
+    {
+        $this->assertFalse(enum_exists(ExistingEnum::class));
+        $this->assertFalse(enum_exists(ExistingEnum::class, false));
+        $this->assertFalse(enum_exists('\\'.ExistingEnum::class));
+        $this->assertFalse(enum_exists('\\'.ExistingEnum::class, false));
+        $this->assertTrue(enum_exists('NonExistingEnum'));
+        $this->assertTrue(enum_exists('NonExistingEnum', false));
+        $this->assertTrue(enum_exists('\\NonExistingEnum'));
+        $this->assertTrue(enum_exists('\\NonExistingEnum', false));
+        $this->assertTrue(enum_exists(ExistingEnumReal::class));
+        $this->assertTrue(enum_exists(ExistingEnumReal::class, false));
+        $this->assertTrue(enum_exists('\\'.ExistingEnumReal::class));
+        $this->assertTrue(enum_exists('\\'.ExistingEnumReal::class, false));
+        $this->assertFalse(enum_exists('NonExistingClassReal'));
+        $this->assertFalse(enum_exists('NonExistingClassReal', false));
+        $this->assertFalse(enum_exists('\\NonExistingEnumReal'));
+        $this->assertFalse(enum_exists('\\NonExistingEnumReal', false));
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/ExistingEnum.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/ExistingEnum.php
new file mode 100644
index 0000000000000..039e293b0c0d7
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/ExistingEnum.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Tests\Fixtures;
+
+enum ExistingEnum
+{
+}
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/ExistingEnumReal.php b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/ExistingEnumReal.php
new file mode 100644
index 0000000000000..028090638d060
--- /dev/null
+++ b/src/Symfony/Bridge/PhpUnit/Tests/Fixtures/ExistingEnumReal.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Tests\Fixtures;
+
+enum ExistingEnumReal
+{
+}
diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
index 85b11227d01c0..75fce743284aa 100644
--- a/src/Symfony/Bridge/PhpUnit/composer.json
+++ b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -22,7 +22,8 @@
     },
     "require-dev": {
         "symfony/deprecation-contracts": "^2.5|^3.0",
-        "symfony/error-handler": "^5.4|^6.0"
+        "symfony/error-handler": "^5.4|^6.0",
+        "symfony/polyfill-php81": "^1.27"
     },
     "suggest": {
         "symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"

From e4ba7b7552f305243380af2ccfe82a712a1671c4 Mon Sep 17 00:00:00 2001
From: Nicolas PHILIPPE <nikophil@gmail.com>
Date: Thu, 29 Dec 2022 16:19:30 +0100
Subject: [PATCH 105/475] [HttpFoundation] ParameterBag::getEnum()

---
 .../Component/HttpFoundation/CHANGELOG.md     |  1 +
 .../Component/HttpFoundation/InputBag.php     | 19 ++++++++++
 .../Component/HttpFoundation/ParameterBag.php | 25 +++++++++++++
 .../HttpFoundation/Tests/InputBagTest.php     | 17 +++++++++
 .../HttpFoundation/Tests/ParameterBagTest.php | 35 +++++++++++++++++++
 5 files changed, 97 insertions(+)

diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index 1aaf6ed0f8507..208f466d749b8 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 6.3
 ---
 
+ * Add `ParameterBag::getEnum()`
  * Create migration for session table when pdo handler is used
 
 6.2
diff --git a/src/Symfony/Component/HttpFoundation/InputBag.php b/src/Symfony/Component/HttpFoundation/InputBag.php
index 877ac60f3aefd..446b82132b140 100644
--- a/src/Symfony/Component/HttpFoundation/InputBag.php
+++ b/src/Symfony/Component/HttpFoundation/InputBag.php
@@ -73,6 +73,25 @@ public function set(string $key, mixed $value)
         $this->parameters[$key] = $value;
     }
 
+    /**
+     * Returns the parameter value converted to an enum.
+     *
+     * @template T of \BackedEnum
+     *
+     * @param class-string<T> $class
+     * @param ?T              $default
+     *
+     * @return ?T
+     */
+    public function getEnum(string $key, string $class, \BackedEnum $default = null): ?\BackedEnum
+    {
+        try {
+            return parent::getEnum($key, $class, $default);
+        } catch (\UnexpectedValueException $e) {
+            throw new BadRequestException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
     public function filter(string $key, mixed $default = null, int $filter = \FILTER_DEFAULT, mixed $options = []): mixed
     {
         $value = $this->has($key) ? $this->all()[$key] : $default;
diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
index 72c8f0949c5d4..9df9604e6c0ef 100644
--- a/src/Symfony/Component/HttpFoundation/ParameterBag.php
+++ b/src/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -141,6 +141,31 @@ public function getBoolean(string $key, bool $default = false): bool
         return $this->filter($key, $default, \FILTER_VALIDATE_BOOL);
     }
 
+    /**
+     * Returns the parameter value converted to an enum.
+     *
+     * @template T of \BackedEnum
+     *
+     * @param class-string<T> $class
+     * @param ?T              $default
+     *
+     * @return ?T
+     */
+    public function getEnum(string $key, string $class, \BackedEnum $default = null): ?\BackedEnum
+    {
+        $value = $this->get($key);
+
+        if (null === $value) {
+            return $default;
+        }
+
+        try {
+            return $class::from($value);
+        } catch (\ValueError|\TypeError $e) {
+            throw new \UnexpectedValueException(sprintf('Parameter "%s" cannot be converted to enum: %s.', $key, $e->getMessage()), $e->getCode(), $e);
+        }
+    }
+
     /**
      * Filter key.
      *
diff --git a/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php
index 696318e91ea98..ccb4779ef35dc 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php
@@ -106,4 +106,21 @@ public function testFilterArrayWithoutArrayFlag()
         $bag = new InputBag(['foo' => ['bar', 'baz']]);
         $bag->filter('foo', \FILTER_VALIDATE_INT);
     }
+
+    public function testGetEnum()
+    {
+        $bag = new InputBag(['valid-value' => 1]);
+
+        $this->assertSame(Foo::Bar, $bag->getEnum('valid-value', Foo::class));
+    }
+
+    public function testGetEnumThrowsExceptionWithInvalidValue()
+    {
+        $bag = new InputBag(['invalid-value' => 2]);
+
+        $this->expectException(BadRequestException::class);
+        $this->expectExceptionMessage('Parameter "invalid-value" cannot be converted to enum: 2 is not a valid backing value for enum "Symfony\Component\HttpFoundation\Tests\Foo".');
+
+        $this->assertNull($bag->getEnum('invalid-value', Foo::class));
+    }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
index 1b60fb2418008..43aaade7efa16 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
@@ -226,4 +226,39 @@ public function testGetBoolean()
         $this->assertFalse($bag->getBoolean('string_false'), '->getBoolean() gets the string false as boolean false');
         $this->assertFalse($bag->getBoolean('unknown'), '->getBoolean() returns false if a parameter is not defined');
     }
+
+    public function testGetEnum()
+    {
+        $bag = new ParameterBag(['valid-value' => 1]);
+
+        $this->assertSame(Foo::Bar, $bag->getEnum('valid-value', Foo::class));
+
+        $this->assertNull($bag->getEnum('invalid-key', Foo::class));
+        $this->assertSame(Foo::Bar, $bag->getEnum('invalid-key', Foo::class, Foo::Bar));
+    }
+
+    public function testGetEnumThrowsExceptionWithNotBackingValue()
+    {
+        $bag = new ParameterBag(['invalid-value' => 2]);
+
+        $this->expectException(\UnexpectedValueException::class);
+        $this->expectExceptionMessage('Parameter "invalid-value" cannot be converted to enum: 2 is not a valid backing value for enum "Symfony\Component\HttpFoundation\Tests\Foo".');
+
+        $this->assertNull($bag->getEnum('invalid-value', Foo::class));
+    }
+
+    public function testGetEnumThrowsExceptionWithInvalidValueType()
+    {
+        $bag = new ParameterBag(['invalid-value' => ['foo']]);
+
+        $this->expectException(\UnexpectedValueException::class);
+        $this->expectExceptionMessage('Parameter "invalid-value" cannot be converted to enum: Symfony\Component\HttpFoundation\Tests\Foo::from(): Argument #1 ($value) must be of type int, array given.');
+
+        $this->assertNull($bag->getEnum('invalid-value', Foo::class));
+    }
+}
+
+enum Foo: int
+{
+    case Bar = 1;
 }

From 2df462301c35008bdea5d50b2b26dd533e6074c9 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Wed, 4 Jan 2023 17:46:36 +0100
Subject: [PATCH 106/475] [Clock] Fix unitialized variable

---
 src/Symfony/Component/Clock/Clock.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Clock/Clock.php b/src/Symfony/Component/Clock/Clock.php
index 8d72b8de99f1b..5148cde9f2ad5 100644
--- a/src/Symfony/Component/Clock/Clock.php
+++ b/src/Symfony/Component/Clock/Clock.php
@@ -46,14 +46,14 @@ public static function set(PsrClockInterface $clock): void
 
     public function now(): \DateTimeImmutable
     {
-        $now = ($this->clock ?? self::$globalClock)->now();
+        $now = ($this->clock ?? self::get())->now();
 
         return isset($this->timezone) ? $now->setTimezone($this->timezone) : $now;
     }
 
     public function sleep(float|int $seconds): void
     {
-        $clock = $this->clock ?? self::$globalClock;
+        $clock = $this->clock ?? self::get();
 
         if ($clock instanceof ClockInterface) {
             $clock->sleep($seconds);

From 8e8772d2c11fa47d5cde8d7c982c5ad9cb9f782d Mon Sep 17 00:00:00 2001
From: Alexis Lefebvre <alexislefebvre+github@gmail.com>
Date: Thu, 5 Jan 2023 03:10:09 +0100
Subject: [PATCH 107/475] remove double required annotation + attribute

---
 .../Bundle/FrameworkBundle/Controller/AbstractController.php   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
index cef10efcd1a29..647ef98aee258 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -58,9 +58,6 @@ abstract class AbstractController implements ServiceSubscriberInterface
      */
     protected $container;
 
-    /**
-     * @required
-     */
     #[Required]
     public function setContainer(ContainerInterface $container): ?ContainerInterface
     {

From 0a2563d561ffa016f10cb3dbcf574a4f39bd788a Mon Sep 17 00:00:00 2001
From: Dejan Angelov <angelovdejan92@gmail.com>
Date: Wed, 21 Dec 2022 21:00:06 +0100
Subject: [PATCH 108/475] [HttpKernel] Allow using `#[WithLogLevel]` for
 setting custom log level for exceptions

---
 .../HttpKernel/Attribute/WithLogLevel.php     | 31 ++++++++++++
 src/Symfony/Component/HttpKernel/CHANGELOG.md |  1 +
 .../EventListener/ErrorListener.php           | 50 +++++++++++++------
 .../Tests/Attribute/WithLogLevelTest.php      | 39 +++++++++++++++
 .../Tests/EventListener/ErrorListenerTest.php | 41 +++++++++++++++
 5 files changed, 147 insertions(+), 15 deletions(-)
 create mode 100644 src/Symfony/Component/HttpKernel/Attribute/WithLogLevel.php
 create mode 100644 src/Symfony/Component/HttpKernel/Tests/Attribute/WithLogLevelTest.php

diff --git a/src/Symfony/Component/HttpKernel/Attribute/WithLogLevel.php b/src/Symfony/Component/HttpKernel/Attribute/WithLogLevel.php
new file mode 100644
index 0000000000000..762b077043ae2
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Attribute/WithLogLevel.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Attribute;
+
+use Psr\Log\LogLevel;
+
+/**
+ * @author Dejan Angelov <angelovdejan@protonmail.com>
+ */
+#[\Attribute(\Attribute::TARGET_CLASS)]
+final class WithLogLevel
+{
+    /**
+     * @param LogLevel::* $level
+     */
+    public function __construct(public readonly string $level)
+    {
+        if (!\defined('Psr\Log\LogLevel::'.strtoupper($this->level))) {
+            throw new \InvalidArgumentException(sprintf('Invalid log level "%s".', $this->level));
+        }
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index c823fbd0cb5c4..b24b2e4fa37d8 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * `FileProfilerStorage` removes profiles automatically after two days
  * Add `#[HttpStatus]` for defining status codes for exceptions
  * Use an instance of `Psr\Clock\ClockInterface` to generate the current date time in `DateTimeValueResolver`
+ * Add `#[WithLogLevel]` for defining log levels for exceptions
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
index 11a060903addb..d131fd2fb9c0a 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
@@ -12,10 +12,12 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\HttpStatus;
+use Symfony\Component\HttpKernel\Attribute\WithLogLevel;
 use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
@@ -52,14 +54,7 @@ public function __construct(string|object|array|null $controller, LoggerInterfac
     public function logKernelException(ExceptionEvent $event)
     {
         $throwable = $event->getThrowable();
-        $logLevel = null;
-
-        foreach ($this->exceptionsMapping as $class => $config) {
-            if ($throwable instanceof $class && $config['log_level']) {
-                $logLevel = $config['log_level'];
-                break;
-            }
-        }
+        $logLevel = $this->resolveLogLevel($throwable);
 
         foreach ($this->exceptionsMapping as $class => $config) {
             if (!$throwable instanceof $class || !$config['status_code']) {
@@ -170,15 +165,40 @@ public static function getSubscribedEvents(): array
      */
     protected function logException(\Throwable $exception, string $message, string $logLevel = null): void
     {
-        if (null !== $this->logger) {
-            if (null !== $logLevel) {
-                $this->logger->log($logLevel, $message, ['exception' => $exception]);
-            } elseif (!$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500) {
-                $this->logger->critical($message, ['exception' => $exception]);
-            } else {
-                $this->logger->error($message, ['exception' => $exception]);
+        if (null === $this->logger) {
+            return;
+        }
+
+        $logLevel ??= $this->resolveLogLevel($exception);
+
+        $this->logger->log($logLevel, $message, ['exception' => $exception]);
+    }
+
+    /**
+     * Resolves the level to be used when logging the exception.
+     */
+    private function resolveLogLevel(\Throwable $throwable): string
+    {
+        foreach ($this->exceptionsMapping as $class => $config) {
+            if ($throwable instanceof $class && $config['log_level']) {
+                return $config['log_level'];
             }
         }
+
+        $attributes = (new \ReflectionClass($throwable))->getAttributes(WithLogLevel::class);
+
+        if ($attributes) {
+            /** @var WithLogLevel $instance */
+            $instance = $attributes[0]->newInstance();
+
+            return $instance->level;
+        }
+
+        if (!$throwable instanceof HttpExceptionInterface || $throwable->getStatusCode() >= 500) {
+            return LogLevel::CRITICAL;
+        }
+
+        return LogLevel::ERROR;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Tests/Attribute/WithLogLevelTest.php b/src/Symfony/Component/HttpKernel/Tests/Attribute/WithLogLevelTest.php
new file mode 100644
index 0000000000000..0b8905f9ea4f6
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Tests/Attribute/WithLogLevelTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Attribute;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LogLevel;
+use Symfony\Component\HttpKernel\Attribute\WithLogLevel;
+
+/**
+ * @author Dejan Angelov <angelovdejan@protonmail.com>
+ */
+class WithLogLevelTest extends TestCase
+{
+    public function testWithValidLogLevel()
+    {
+        $logLevel = LogLevel::NOTICE;
+
+        $attribute = new WithLogLevel($logLevel);
+
+        $this->assertSame($logLevel, $attribute->level);
+    }
+
+    public function testWithInvalidLogLevel()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid log level "invalid".');
+
+        new WithLogLevel('invalid');
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
index 5090eb11cbb79..aa878849ffa8e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
@@ -13,11 +13,13 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\HttpStatus;
+use Symfony\Component\HttpKernel\Attribute\WithLogLevel;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
@@ -118,6 +120,40 @@ public function testHandleWithLoggerAndCustomConfiguration()
         $this->assertCount(1, $logger->getLogs('warning'));
     }
 
+    public function testHandleWithLogLevelAttribute()
+    {
+        $request = new Request();
+        $event = new ExceptionEvent(new TestKernel(), $request, HttpKernelInterface::MAIN_REQUEST, new WarningWithLogLevelAttribute());
+        $logger = new TestLogger();
+        $l = new ErrorListener('not used', $logger);
+
+        $l->logKernelException($event);
+        $l->onKernelException($event);
+
+        $this->assertEquals(0, $logger->countErrors());
+        $this->assertCount(0, $logger->getLogs('critical'));
+        $this->assertCount(1, $logger->getLogs('warning'));
+    }
+
+    public function testHandleWithLogLevelAttributeAndCustomConfiguration()
+    {
+        $request = new Request();
+        $event = new ExceptionEvent(new TestKernel(), $request, HttpKernelInterface::MAIN_REQUEST, new WarningWithLogLevelAttribute());
+        $logger = new TestLogger();
+        $l = new ErrorListener('not used', $logger, false, [
+            WarningWithLogLevelAttribute::class => [
+                'log_level' => 'info',
+                'status_code' => 401,
+            ],
+        ]);
+        $l->logKernelException($event);
+        $l->onKernelException($event);
+
+        $this->assertEquals(0, $logger->countErrors());
+        $this->assertCount(0, $logger->getLogs('warning'));
+        $this->assertCount(1, $logger->getLogs('info'));
+    }
+
     /**
      * @dataProvider exceptionWithAttributeProvider
      */
@@ -312,3 +348,8 @@ class WithCustomUserProvidedAttribute extends \Exception
 class WithGeneralAttribute extends \Exception
 {
 }
+
+#[WithLogLevel(LogLevel::WARNING)]
+class WarningWithLogLevelAttribute extends \Exception
+{
+}

From fece76621b2f3ba0ea084372eead3c39689526bf Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Thu, 5 Jan 2023 07:44:56 +0100
Subject: [PATCH 109/475] [HttpKernel] Rename HttpStatus atribute to
 WithHttpStatus

---
 .../Attribute/{HttpStatus.php => WithHttpStatus.php}        | 2 +-
 src/Symfony/Component/HttpKernel/CHANGELOG.md               | 2 +-
 .../Component/HttpKernel/EventListener/ErrorListener.php    | 6 +++---
 .../HttpKernel/Tests/EventListener/ErrorListenerTest.php    | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/Symfony/Component/HttpKernel/Attribute/{HttpStatus.php => WithHttpStatus.php} (96%)

diff --git a/src/Symfony/Component/HttpKernel/Attribute/HttpStatus.php b/src/Symfony/Component/HttpKernel/Attribute/WithHttpStatus.php
similarity index 96%
rename from src/Symfony/Component/HttpKernel/Attribute/HttpStatus.php
rename to src/Symfony/Component/HttpKernel/Attribute/WithHttpStatus.php
index a2811150e07e7..718427aacc761 100644
--- a/src/Symfony/Component/HttpKernel/Attribute/HttpStatus.php
+++ b/src/Symfony/Component/HttpKernel/Attribute/WithHttpStatus.php
@@ -15,7 +15,7 @@
  * @author Dejan Angelov <angelovdejan@protonmail.com>
  */
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class HttpStatus
+class WithHttpStatus
 {
     /**
      * @param array<string, string> $headers
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index b24b2e4fa37d8..650bd9bc75b49 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -6,7 +6,7 @@ CHANGELOG
 
  * Deprecate parameters `container.dumper.inline_factories` and `container.dumper.inline_class_loader`, use `.container.dumper.inline_factories` and `.container.dumper.inline_class_loader` instead
  * `FileProfilerStorage` removes profiles automatically after two days
- * Add `#[HttpStatus]` for defining status codes for exceptions
+ * Add `#[WithHttpStatus]` for defining status codes for exceptions
  * Use an instance of `Psr\Clock\ClockInterface` to generate the current date time in `DateTimeValueResolver`
  * Add `#[WithLogLevel]` for defining log levels for exceptions
 
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
index d131fd2fb9c0a..2e8b75afcf585 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
@@ -16,7 +16,7 @@
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Attribute\HttpStatus;
+use Symfony\Component\HttpKernel\Attribute\WithHttpStatus;
 use Symfony\Component\HttpKernel\Attribute\WithLogLevel;
 use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
@@ -71,10 +71,10 @@ public function logKernelException(ExceptionEvent $event)
         // There's no specific status code defined in the configuration for this exception
         if (!$throwable instanceof HttpExceptionInterface) {
             $class = new \ReflectionClass($throwable);
-            $attributes = $class->getAttributes(HttpStatus::class, \ReflectionAttribute::IS_INSTANCEOF);
+            $attributes = $class->getAttributes(WithHttpStatus::class, \ReflectionAttribute::IS_INSTANCEOF);
 
             if ($attributes) {
-                /** @var HttpStatus $instance */
+                /** @var WithHttpStatus $instance */
                 $instance = $attributes[0]->newInstance();
 
                 $throwable = new HttpException($instance->statusCode, $throwable->getMessage(), $throwable, $instance->headers);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
index aa878849ffa8e..64068ee5d3fa8 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
@@ -18,7 +18,7 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Attribute\HttpStatus;
+use Symfony\Component\HttpKernel\Attribute\WithHttpStatus;
 use Symfony\Component\HttpKernel\Attribute\WithLogLevel;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
@@ -321,7 +321,7 @@ public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = tr
 }
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class UserProvidedHttpStatusCodeAttribute extends HttpStatus
+class UserProvidedHttpStatusCodeAttribute extends WithHttpStatus
 {
     public function __construct(array $headers = [])
     {
@@ -339,7 +339,7 @@ class WithCustomUserProvidedAttribute extends \Exception
 {
 }
 
-#[HttpStatus(
+#[WithHttpStatus(
     statusCode: Response::HTTP_PRECONDITION_FAILED,
     headers: [
         'some' => 'thing',

From 6c898944d693e8b8f22767e9151dd66f8a00dd78 Mon Sep 17 00:00:00 2001
From: voodooism <delicatessen.dev@gmail.com>
Date: Tue, 27 Dec 2022 17:04:54 +0300
Subject: [PATCH 110/475] [FrameworkBundle] Add `extra` attribute for
 HttpClient Configuration

---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md        |  1 +
 .../DependencyInjection/Configuration.php              | 10 ++++++++++
 .../Resources/config/schema/symfony-1.0.xsd            |  2 ++
 .../Fixtures/php/http_client_full_default_options.php  |  1 +
 .../php/http_client_override_default_options.php       |  2 ++
 .../Fixtures/xml/http_client_full_default_options.xml  |  5 +++++
 .../xml/http_client_override_default_options.xml       |  6 ++++++
 .../Fixtures/yml/http_client_full_default_options.yml  |  3 +++
 .../yml/http_client_override_default_options.yml       |  2 ++
 .../DependencyInjection/FrameworkExtensionTest.php     |  8 +++++++-
 10 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 443b2e2792371..706ff2d565b54 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 6.3
 ---
 
+ * Add `extra` option for `http_client.default_options` and `http_client.scoped_client`
  * Add `DomCrawlerAssertionsTrait::assertSelectorCount(int $count, string $selector)`
  * Allow to avoid `limit` definition in a RateLimiter configuration when using the `no_limit` policy
  * Add `--format` option to the `debug:config` command
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 44e812e735538..aefcfe8a217fd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1725,6 +1725,11 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e
                                         ->variableNode('md5')->end()
                                     ->end()
                                 ->end()
+                                ->arrayNode('extra')
+                                    ->info('Extra options for specific HTTP client')
+                                    ->normalizeKeys(false)
+                                    ->variablePrototype()->end()
+                                ->end()
                                 ->append($this->addHttpClientRetrySection())
                             ->end()
                         ->end()
@@ -1868,6 +1873,11 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e
                                             ->variableNode('md5')->end()
                                         ->end()
                                     ->end()
+                                    ->arrayNode('extra')
+                                        ->info('Extra options for specific HTTP client')
+                                        ->normalizeKeys(false)
+                                        ->variablePrototype()->end()
+                                    ->end()
                                     ->append($this->addHttpClientRetrySection())
                                 ->end()
                             ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
index d1f547f70778a..fd17176c2fe7a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -620,6 +620,7 @@
             <xsd:element name="header" type="http_header" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="peer-fingerprint" type="fingerprint" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="retry-failed" type="http_client_retry_failed" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="extra" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded" />
         </xsd:choice>
         <xsd:attribute name="max-redirects" type="xsd:integer" />
         <xsd:attribute name="http-version" type="xsd:string" />
@@ -645,6 +646,7 @@
             <xsd:element name="header" type="http_header" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="peer-fingerprint" type="fingerprint" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="retry-failed" type="http_client_retry_failed" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="extra" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded" />
         </xsd:choice>
         <xsd:attribute name="name" type="xsd:string" />
         <xsd:attribute name="scope" type="xsd:string" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_full_default_options.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_full_default_options.php
index 865ddd14e1203..99fa25e498678 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_full_default_options.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_full_default_options.php
@@ -24,6 +24,7 @@
                 'pin-sha256' => ['14s5erg62v1v8471g2revg48r7==', 'jsda84hjtyd4821bgfesd215bsfg5412='],
                 'md5' => 'sdhtb481248721thbr=',
             ],
+            'extra' => ['foo' => ['bar' => 'baz']],
         ],
     ],
 ]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_override_default_options.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_override_default_options.php
index c66ce8851b42e..9880dd8e7dc15 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_override_default_options.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/http_client_override_default_options.php
@@ -6,11 +6,13 @@
         'max_host_connections' => 4,
         'default_options' => [
             'headers' => ['foo' => 'bar'],
+            'extra' => ['foo' => 'bar'],
         ],
         'scoped_clients' => [
             'foo' => [
                 'base_uri' => 'http://example.com',
                 'headers' => ['bar' => 'baz'],
+                'extra' => ['bar' => 'baz'],
             ],
         ],
     ],
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/http_client_full_default_options.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/http_client_full_default_options.xml
index e897df725a93a..8d51a883927b0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/http_client_full_default_options.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/http_client_full_default_options.xml
@@ -30,6 +30,11 @@
                     <framework:pin-sha256>jsda84hjtyd4821bgfesd215bsfg5412=</framework:pin-sha256>
                     <framework:md5>sdhtb481248721thbr=</framework:md5>
                 </framework:peer-fingerprint>
+                <framework:extra>
+                    <framework:foo>
+                        <framework:bar>baz</framework:bar>
+                    </framework:foo>
+                </framework:extra>
             </framework:default-options>
         </framework:http-client>
     </framework:config>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/http_client_override_default_options.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/http_client_override_default_options.xml
index fdee9a9132a35..412d937444a6c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/http_client_override_default_options.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/http_client_override_default_options.xml
@@ -9,9 +9,15 @@
         <framework:http-client max-host-connections="4">
             <framework:default-options>
                 <framework:header name="foo">bar</framework:header>
+                <framework:extra>
+                    <framework:foo>bar</framework:foo>
+                </framework:extra>
             </framework:default-options>
             <framework:scoped-client name="foo" base-uri="http://example.com">
                 <framework:header name="bar">baz</framework:header>
+                <framework:extra>
+                    <framework:bar>baz</framework:bar>
+                </framework:extra>
             </framework:scoped-client>
         </framework:http-client>
     </framework:config>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/http_client_full_default_options.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/http_client_full_default_options.yml
index de9300e17f158..acd33293fbe65 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/http_client_full_default_options.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/http_client_full_default_options.yml
@@ -22,3 +22,6 @@ framework:
             peer_fingerprint:
                 pin-sha256: ['14s5erg62v1v8471g2revg48r7==', 'jsda84hjtyd4821bgfesd215bsfg5412=']
                 md5: 'sdhtb481248721thbr='
+            extra:
+                foo:
+                    bar: 'baz'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/http_client_override_default_options.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/http_client_override_default_options.yml
index 14a6915380dba..3f4af70018f6a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/http_client_override_default_options.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/http_client_override_default_options.yml
@@ -4,7 +4,9 @@ framework:
         max_host_connections: 4
         default_options:
             headers: {'foo': 'bar'}
+            extra: {'foo': 'bar'}
         scoped_clients:
             foo:
                 base_uri: http://example.com
                 headers: {'bar': 'baz'}
+                extra: {'bar': 'baz'}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index d3c24f28dcadc..0fe6555b3a7fb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1852,6 +1852,7 @@ public function testHttpClientDefaultOptions()
         $defaultOptions = [
             'headers' => [],
             'resolve' => [],
+            'extra' => [],
         ];
         $this->assertSame([$defaultOptions, 4], $container->getDefinition('http_client')->getArguments());
 
@@ -1872,6 +1873,7 @@ public function testHttpClientOverrideDefaultOptions()
         $container = $this->createContainerFromFile('http_client_override_default_options');
 
         $this->assertSame(['foo' => 'bar'], $container->getDefinition('http_client')->getArgument(0)['headers']);
+        $this->assertSame(['foo' => 'bar'], $container->getDefinition('http_client')->getArgument(0)['extra']);
         $this->assertSame(4, $container->getDefinition('http_client')->getArgument(1));
         $this->assertSame('http://example.com', $container->getDefinition('foo')->getArgument(1));
 
@@ -1879,10 +1881,13 @@ public function testHttpClientOverrideDefaultOptions()
             'headers' => [
                 'bar' => 'baz',
             ],
+            'extra' => [
+                'bar' => 'baz',
+            ],
             'query' => [],
             'resolve' => [],
         ];
-        $this->assertSame($expected, $container->getDefinition('foo')->getArgument(2));
+        $this->assertEquals($expected, $container->getDefinition('foo')->getArgument(2));
     }
 
     public function testHttpClientRetry()
@@ -1944,6 +1949,7 @@ public function testHttpClientFullDefaultOptions()
             'pin-sha256' => ['14s5erg62v1v8471g2revg48r7==', 'jsda84hjtyd4821bgfesd215bsfg5412='],
             'md5' => 'sdhtb481248721thbr=',
         ], $defaultOptions['peer_fingerprint']);
+        $this->assertSame(['foo' => ['bar' => 'baz']], $defaultOptions['extra']);
     }
 
     public function provideMailer(): array

From 809f02c7e47b03122aa0055557ad341f77a1ee59 Mon Sep 17 00:00:00 2001
From: Sergey Rabochiy <upyx.00@gmail.com>
Date: Sat, 7 Jan 2023 11:40:16 +0700
Subject: [PATCH 111/475] Fix ParameterBagTest message with PHP 8.2

---
 .../HttpFoundation/Tests/Fixtures/FooEnum.php | 17 +++++++++++++
 .../HttpFoundation/Tests/InputBagTest.php     | 11 ++++++---
 .../HttpFoundation/Tests/ParameterBagTest.php | 24 +++++++++----------
 3 files changed, 37 insertions(+), 15 deletions(-)
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Fixtures/FooEnum.php

diff --git a/src/Symfony/Component/HttpFoundation/Tests/Fixtures/FooEnum.php b/src/Symfony/Component/HttpFoundation/Tests/Fixtures/FooEnum.php
new file mode 100644
index 0000000000000..a6f56fba1fffc
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Fixtures/FooEnum.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests\Fixtures;
+
+enum FooEnum: int
+{
+    case Bar = 1;
+}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php
index ccb4779ef35dc..0d0d959a67028 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\InputBag;
+use Symfony\Component\HttpFoundation\Tests\Fixtures\FooEnum;
 
 class InputBagTest extends TestCase
 {
@@ -111,7 +112,7 @@ public function testGetEnum()
     {
         $bag = new InputBag(['valid-value' => 1]);
 
-        $this->assertSame(Foo::Bar, $bag->getEnum('valid-value', Foo::class));
+        $this->assertSame(FooEnum::Bar, $bag->getEnum('valid-value', FooEnum::class));
     }
 
     public function testGetEnumThrowsExceptionWithInvalidValue()
@@ -119,8 +120,12 @@ public function testGetEnumThrowsExceptionWithInvalidValue()
         $bag = new InputBag(['invalid-value' => 2]);
 
         $this->expectException(BadRequestException::class);
-        $this->expectExceptionMessage('Parameter "invalid-value" cannot be converted to enum: 2 is not a valid backing value for enum "Symfony\Component\HttpFoundation\Tests\Foo".');
+        if (\PHP_VERSION_ID >= 80200) {
+            $this->expectExceptionMessage('Parameter "invalid-value" cannot be converted to enum: 2 is not a valid backing value for enum Symfony\Component\HttpFoundation\Tests\Fixtures\FooEnum.');
+        } else {
+            $this->expectExceptionMessage('Parameter "invalid-value" cannot be converted to enum: 2 is not a valid backing value for enum "Symfony\Component\HttpFoundation\Tests\Fixtures\FooEnum".');
+        }
 
-        $this->assertNull($bag->getEnum('invalid-value', Foo::class));
+        $this->assertNull($bag->getEnum('invalid-value', FooEnum::class));
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
index 43aaade7efa16..7c9a228f751a9 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\ParameterBag;
+use Symfony\Component\HttpFoundation\Tests\Fixtures\FooEnum;
 
 class ParameterBagTest extends TestCase
 {
@@ -231,10 +232,10 @@ public function testGetEnum()
     {
         $bag = new ParameterBag(['valid-value' => 1]);
 
-        $this->assertSame(Foo::Bar, $bag->getEnum('valid-value', Foo::class));
+        $this->assertSame(FooEnum::Bar, $bag->getEnum('valid-value', FooEnum::class));
 
-        $this->assertNull($bag->getEnum('invalid-key', Foo::class));
-        $this->assertSame(Foo::Bar, $bag->getEnum('invalid-key', Foo::class, Foo::Bar));
+        $this->assertNull($bag->getEnum('invalid-key', FooEnum::class));
+        $this->assertSame(FooEnum::Bar, $bag->getEnum('invalid-key', FooEnum::class, FooEnum::Bar));
     }
 
     public function testGetEnumThrowsExceptionWithNotBackingValue()
@@ -242,9 +243,13 @@ public function testGetEnumThrowsExceptionWithNotBackingValue()
         $bag = new ParameterBag(['invalid-value' => 2]);
 
         $this->expectException(\UnexpectedValueException::class);
-        $this->expectExceptionMessage('Parameter "invalid-value" cannot be converted to enum: 2 is not a valid backing value for enum "Symfony\Component\HttpFoundation\Tests\Foo".');
+        if (\PHP_VERSION_ID >= 80200) {
+            $this->expectExceptionMessage('Parameter "invalid-value" cannot be converted to enum: 2 is not a valid backing value for enum Symfony\Component\HttpFoundation\Tests\Fixtures\FooEnum.');
+        } else {
+            $this->expectExceptionMessage('Parameter "invalid-value" cannot be converted to enum: 2 is not a valid backing value for enum "Symfony\Component\HttpFoundation\Tests\Fixtures\FooEnum".');
+        }
 
-        $this->assertNull($bag->getEnum('invalid-value', Foo::class));
+        $this->assertNull($bag->getEnum('invalid-value', FooEnum::class));
     }
 
     public function testGetEnumThrowsExceptionWithInvalidValueType()
@@ -252,13 +257,8 @@ public function testGetEnumThrowsExceptionWithInvalidValueType()
         $bag = new ParameterBag(['invalid-value' => ['foo']]);
 
         $this->expectException(\UnexpectedValueException::class);
-        $this->expectExceptionMessage('Parameter "invalid-value" cannot be converted to enum: Symfony\Component\HttpFoundation\Tests\Foo::from(): Argument #1 ($value) must be of type int, array given.');
+        $this->expectExceptionMessage('Parameter "invalid-value" cannot be converted to enum: Symfony\Component\HttpFoundation\Tests\Fixtures\FooEnum::from(): Argument #1 ($value) must be of type int, array given.');
 
-        $this->assertNull($bag->getEnum('invalid-value', Foo::class));
+        $this->assertNull($bag->getEnum('invalid-value', FooEnum::class));
     }
 }
-
-enum Foo: int
-{
-    case Bar = 1;
-}

From 83e22322ee4da85f5c1be004481cbd420ada527e Mon Sep 17 00:00:00 2001
From: Joseph Bielawski <stloyd@gmail.com>
Date: Mon, 2 Jan 2023 15:43:50 +0100
Subject: [PATCH 112/475] [Notifier] Add new Symfony Notifier for PagerDuty

---
 .../FrameworkExtension.php                    |   2 +
 .../R
97AE
esources/config/notifier_transports.php  |   5 +
 .../Notifier/Bridge/PagerDuty/.gitattributes  |   4 +
 .../Notifier/Bridge/PagerDuty/.gitignore      |   3 +
 .../Notifier/Bridge/PagerDuty/CHANGELOG.md    |   7 ++
 .../Notifier/Bridge/PagerDuty/LICENSE         |  19 ++++
 .../Bridge/PagerDuty/PagerDutyOptions.php     | 103 ++++++++++++++++++
 .../Bridge/PagerDuty/PagerDutyTransport.php   |  84 ++++++++++++++
 .../PagerDuty/PagerDutyTransportFactory.php   |  56 ++++++++++
 .../Notifier/Bridge/PagerDuty/README.md       |  23 ++++
 .../Tests/PagerDutyTransportFactoryTest.php   |  49 +++++++++
 .../Tests/PagerDutyTransportTest.php          |  48 ++++++++
 .../Notifier/Bridge/PagerDuty/composer.json   |  30 +++++
 .../Bridge/PagerDuty/phpunit.xml.dist         |  31 ++++++
 .../Exception/UnsupportedSchemeException.php  |   4 +
 .../UnsupportedSchemeExceptionTest.php        |   2 +
 src/Symfony/Component/Notifier/Transport.php  |   2 +
 17 files changed, 472 insertions(+)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/PagerDuty/.gitattributes
 create mode 100644 src/Symfony/Component/Notifier/Bridge/PagerDuty/.gitignore
 create mode 100644 src/Symfony/Component/Notifier/Bridge/PagerDuty/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/PagerDuty/LICENSE
 create mode 100644 src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyOptions.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransport.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransportFactory.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/PagerDuty/README.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/PagerDuty/composer.json
 create mode 100644 src/Symfony/Component/Notifier/Bridge/PagerDuty/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index bcd8aff6932e2..05ef6c629795c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -163,6 +163,7 @@
 use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
 use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
+use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory;
 use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
 use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
@@ -2604,6 +2605,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             OneSignalTransportFactory::class => 'notifier.transport_factory.one-signal',
             OrangeSmsTransportFactory::class => 'notifier.transport_factory.orange-sms',
             OvhCloudTransportFactory::class => 'notifier.transport_factory.ovh-cloud',
+            PagerDutyTransportFactory::class => 'notifier.transport_factory.pager-duty',
             PlivoTransportFactory::class => 'notifier.transport_factory.plivo',
             RingCentralTransportFactory::class => 'notifier.transport_factory.ring-central',
             RocketChatTransportFactory::class => 'notifier.transport_factory.rocket-chat',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
index 0d38a65d05163..c5e0371d933ba 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -48,6 +48,7 @@
 use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
 use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
+use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory;
 use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
 use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
@@ -326,5 +327,9 @@
         ->set('notifier.transport_factory.mastodon', MastodonTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
+
+        ->set('notifier.transport_factory.pager-duty', PagerDutyTransportFactory::class)
+            ->parent('notifier.transport_factory.abstract')
+            ->tag('chatter.transport_factory')
     ;
 };
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/.gitattributes b/src/Symfony/Component/Notifier/Bridge/PagerDuty/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/.gitignore b/src/Symfony/Component/Notifier/Bridge/PagerDuty/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/PagerDuty/CHANGELOG.md
new file mode 100644
index 0000000000000..1f2c8f86cde72
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+ * Add the bridge
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/LICENSE b/src/Symfony/Component/Notifier/Bridge/PagerDuty/LICENSE
new file mode 100644
index 0000000000000..f961401699b27
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2023 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyOptions.php b/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyOptions.php
new file mode 100644
index 0000000000000..774e602fe0f8c
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyOptions.php
@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\PagerDuty;
+
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Message\MessageOptionsInterface;
+
+/**
+ * @author Joseph Bielawski <stloyd@gmail.com>
+ */
+final class PagerDutyOptions implements MessageOptionsInterface
+{
+    public function __construct(string $routingKey, string $eventAction, string $severity, private array $options = [])
+    {
+        if (!\in_array($eventAction, ['trigger', 'acknowledge', 'resolve'], true)) {
+            throw new InvalidArgumentException('Invalid "event_action" option given.');
+        }
+
+        if (!\in_array($severity, ['critical', 'warning', 'error', 'info'], true)) {
+            throw new InvalidArgumentException('Invalid "severity" option given.');
+        }
+
+        if ($this->options['payload']['timestamp'] ?? null) {
+            $timestamp = \DateTimeImmutable::createFromFormat(\DateTimeInterface::RFC3339_EXTENDED, $this->options['payload']['timestamp']);
+            if (false === $timestamp) {
+                throw new InvalidArgumentException('Timestamp date must be in "RFC3339_EXTENDED" format.');
+            }
+        } else {
+            $timestamp = (new \DateTimeImmutable())->format(\DateTimeInterface::RFC3339_EXTENDED);
+        }
+
+        $this->options['routing_key'] = $routingKey;
+        $this->options['event_action'] = $eventAction;
+        $this->options['payload'] = [
+            'severity' => $severity,
+            'timestamp' => $timestamp,
+        ];
+
+        if ($dedupKey = $options['dedup_key'] ?? null) {
+            $this->options['dedup_key'] = $dedupKey;
+        }
+
+        if (null === $dedupKey && \in_array($eventAction, ['acknowledge', 'resolve'], true)) {
+            throw new InvalidArgumentException('Option "dedup_key" must be set for event actions: "acknowledge" & "resolve".');
+        }
+    }
+
+    public function toArray(): array
+    {
+        return $this->options;
+    }
+
+    public function getRecipientId(): ?string
+    {
+        return $this->options['routing_key'];
+    }
+
+    /**
+     * @return $this
+     */
+    public function attachImage(string $src, string $href = '', string $alt = ''): static
+    {
+        $this->options['images'][] = [
+            'src' => $src,
+            'href' => $href ?: $src,
+            'alt' => $alt,
+        ];
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function attachLink(string $href, string $text): static
+    {
+        $this->options['links'][] = [
+            'href' => $href,
+            'text' => $text,
+        ];
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function attachCustomDetails(array $customDetails): static
+    {
+        $this->options['payload']['custom_details'] += $customDetails;
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransport.php b/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransport.php
new file mode 100644
index 0000000000000..4e69b12c1c808
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransport.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\PagerDuty;
+
+use Symfony\Component\Notifier\Exception\LogicException;
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\PushMessage;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Transport\AbstractTransport;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @author Joseph Bielawski <stloyd@gmail.com>
+ */
+final class PagerDutyTransport extends AbstractTransport
+{
+    public function __construct(#[\SensitiveParameter] private readonly string $token, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    {
+        parent::__construct($client, $dispatcher);
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('pagerduty://%s', $this->getEndpoint());
+    }
+
+    public function supports(MessageInterface $message): bool
+    {
+        return $message instanceof PushMessage;
+    }
+
+    protected function doSend(MessageInterface $message = null): SentMessage
+    {
+        if (!$message instanceof PushMessage) {
+            throw new UnsupportedMessageTypeException(__CLASS__, PushMessage::class, $message);
+        }
+
+        if (null !== $message->getOptions() && !($message->getOptions() instanceof PagerDutyOptions)) {
+            throw new LogicException(sprintf('The "%s" transport only supports instances of "%s" for options.', __CLASS__, PagerDutyOptions::class));
+        }
+
+        $body = ($opts = $message->getOptions()) ? $opts->toArray() : [];
+        $body['payload']['summary'] = $message->getContent();
+        $body['payload']['source'] = $message->getSubject();
+
+        $response = $this->client->request('POST', 'https://events.pagerduty.com/v2/enqueue', [
+            'headers' => [
+                'Accept' => 'application/json',
+                'Authorization' => $this->token,
+            ],
+            'json' => $body,
+        ]);
+
+        try {
+            $statusCode = $response->getStatusCode();
+        } catch (TransportExceptionInterface $e) {
+            throw new TransportException('Could not reach the remote PagerDuty server.', $response, 0, $e);
+        }
+
+        $result = $response->toArray(false);
+
+        if (202 !== $statusCode) {
+            throw new TransportException(sprintf('Unable to post the PagerDuty message: "%s".', $result['error']['message']), $response);
+        }
+
+        $sentMessage = new SentMessage($message, (string) $this);
+        $sentMessage->setMessageId($result['dedup_key'] ?? $message->getRecipientId());
+
+        return $sentMessage;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransportFactory.php
new file mode 100644
index 0000000000000..93fae27f433e3
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransportFactory.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\PagerDuty;
+
+use Symfony\Component\Notifier\Exception\IncompleteDsnException;
+use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
+use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
+use Symfony\Component\Notifier\Transport\Dsn;
+
+/**
+ * @author Joseph Bielawski <stloyd@gmail.com>
+ */
+final class PagerDutyTransportFactory extends AbstractTransportFactory
+{
+    public function create(Dsn $dsn): PagerDutyTransport
+    {
+        $scheme = $dsn->getScheme();
+
+        if ('pagerduty' !== $scheme) {
+            throw new UnsupportedSchemeException($dsn, 'pagerduty', $this->getSupportedSchemes());
+        }
+
+        $apiToken = $this->getUser($dsn);
+        $host = $this->getHost($dsn);
+
+        return (new PagerDutyTransport($apiToken, $this->client, $this->dispatcher))->setHost($host);
+    }
+
+    protected function getSupportedSchemes(): array
+    {
+        return ['pagerduty'];
+    }
+
+    private function getHost(Dsn $dsn): string
+    {
+        $host = $dsn->getHost();
+        if ('default' === $host) {
+            throw new IncompleteDsnException('Host is not set.', $dsn->getOriginalDsn());
+        }
+
+        if (!str_ends_with($host, '.pagerduty.com')) {
+            throw new IncompleteDsnException('Host must be in format: "subdomain.pagerduty.com".', $dsn->getOriginalDsn());
+        }
+
+        return $host;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/README.md b/src/Symfony/Component/Notifier/Bridge/PagerDuty/README.md
new file mode 100644
index 0000000000000..01547d59d1a76
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/README.md
@@ -0,0 +1,23 @@
+PagerDuty Notifier
+==================
+
+Provides [PagerDuty](https://www.pagerduty.com) integration for Symfony Notifier.
+
+DSN example
+-----------
+
+```
+PAGERDUTY_DSN=pagerduty://TOKEN@SUBDOMAIN
+```
+
+where:
+ - `TOKEN` is your PagerDuty API token
+ - `SUBDOMAIN` is your subdomain name at pagerduty.com
+
+Resources
+---------
+
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportFactoryTest.php
new file mode 100644
index 0000000000000..bbc96f24b0e4b
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportFactoryTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\PagerDuty\Tests;
+
+use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory;
+use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+
+final class PagerDutyTransportFactoryTest extends TransportFactoryTestCase
+{
+    public function createFactory(): PagerDutyTransportFactory
+    {
+        return new PagerDutyTransportFactory();
+    }
+
+    public function createProvider(): iterable
+    {
+        yield [
+            'pagerduty://subdomain.pagerduty.com',
+            'pagerduty://token@subdomain.pagerduty.com',
+            'pagerduty://token@subdomain.eu.pagerduty.com',
+        ];
+    }
+
+    public function supportsProvider(): iterable
+    {
+        yield [true, 'pagerduty://host'];
+        yield [false, 'somethingElse://host'];
+    }
+
+    public function incompleteDsnProvider(): iterable
+    {
+        yield 'missing token' => ['pagerduty://@host'];
+        yield 'wrong host' => ['pagerduty://token@host.com'];
+    }
+
+    public function unsupportedSchemeProvider(): iterable
+    {
+        yield ['somethingElse://token@host'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportTest.php b/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportTest.php
new file mode 100644
index 0000000000000..d03f32de0ff5f
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\PagerDuty\Tests;
+
+use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyOptions;
+use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransport;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\PushMessage;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+final class PagerDutyTransportTest extends TransportTestCase
+{
+    public function createTransport(HttpClientInterface $client = null): PagerDutyTransport
+    {
+        return (new PagerDutyTransport('testToken', $client ?? $this->createMock(HttpClientInterface::class)))->setHost('test.pagerduty.com');
+    }
+
+    public function toStringProvider(): iterable
+    {
+        yield ['pagerduty://test.pagerduty.com', $this->createTransport()];
+    }
+
+    public function supportedMessagesProvider(): iterable
+    {
+        yield [new PushMessage('Source', 'Summary')];
+        yield [new PushMessage('Source', 'Summary', new PagerDutyOptions('e93facc04764012d7bfb002500d5d1a6', 'trigger', 'info'))];
+        yield [new PushMessage('Source', 'Summary', new PagerDutyOptions('e93facc04764012d7bfb002500d5d1a6', 'acknowledge', 'info', ['dedup_key' => 'srv01/test']))];
+    }
+
+    public function unsupportedMessagesProvider(): iterable
+    {
+        yield [new SmsMessage('0611223344', 'Hello!')];
+        yield [new ChatMessage('Hello!')];
+        yield [$this->createMock(MessageInterface::class)];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/composer.json b/src/Symfony/Component/Notifier/Bridge/PagerDuty/composer.json
new file mode 100644
index 0000000000000..8815e4a0d4215
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/composer.json
@@ -0,0 +1,30 @@
+{
+    "name": "symfony/pager-duty-notifier",
+    "type": "symfony-notifier-bridge",
+    "description": "Symfony PagerDuty Notifier Bridge",
+    "keywords": ["chat", "pagerduty", "notifier"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Joseph Bielawski",
+            "email": "stloyd@gmail.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/http-client": "^5.4|^6.3",
+        "symfony/notifier": "^6.3"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\PagerDuty\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/PagerDuty/phpunit.xml.dist
new file mode 100644
index 0000000000000..27af4d4b826a0
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony PagerDuty Notifier Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory>./</directory>
+        </include>
+        <exclude>
+            <directory>./Resources</directory>
+            <directory>./Tests</directory>
+            <directory>./vendor</directory>
+        </exclude>
+    </coverage>
+</phpunit>
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index bbbd56a4cd093..86aa5f3930634 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -156,6 +156,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\OvhCloud\OvhCloudTransportFactory::class,
             'package' => 'symfony/ovh-cloud-notifier',
         ],
+        'pagerduty' => [
+            'class' => Bridge\PagerDuty\PagerDutyTransportFactory::class,
+            'package' => 'symfony/pager-duty-notifier',
+        ],
         'plivo' => [
             'class' => Bridge\Plivo\PlivoTransportFactory::class,
             'package' => 'symfony/plivo-notifier',
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 8dd5d8d92c1a7..88209ec6c66fa 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -45,6 +45,7 @@
 use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
 use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
+use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory;
 use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
 use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
@@ -112,6 +113,7 @@ public static function setUpBeforeClass(): void
             OctopushTransportFactory::class => false,
             OneSignalTransportFactory::class => false,
             OvhCloudTransportFactory::class => false,
+            PagerDutyTransportFactory::class => false,
             PlivoTransportFactory::class => false,
             RingCentralTransportFactory::class => false,
             RocketChatTransportFactory::class => false,
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
index 78ab723de4ab0..10b4650a57200 100644
--- a/src/Symfony/Component/Notifier/Transport.php
+++ b/src/Symfony/Component/Notifier/Transport.php
@@ -40,6 +40,7 @@
 use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
 use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory;
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
+use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory;
 use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
 use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
@@ -108,6 +109,7 @@ final class Transport
         OctopushTransportFactory::class,
         OrangeSmsTransportFactory::class,
         OvhCloudTransportFactory::class,
+        PagerDutyTransportFactory::class,
         PlivoTransportFactory::class,
         RingCentralTransportFactory::class,
         RocketChatTransportFactory::class,

From 3d5cd0d4f2a8fb28ffc50ba7172ec72e16b54890 Mon Sep 17 00:00:00 2001
From: Reyo Stallenberg <reyostallenberg@gmail.com>
Date: Tue, 29 Nov 2022 09:13:21 +0100
Subject: [PATCH 113/475] Fix spelling of emails

Use correct spelling for email
---
 src/Symfony/Bridge/Twig/Mime/NotificationEmail.php            | 2 +-
 src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php  | 4 ++--
 .../Resources/views/Collector/mailer.html.twig                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php
index be6fea5c9cc56..e9681df41c432 100644
--- a/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php
+++ b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php
@@ -38,7 +38,7 @@ class NotificationEmail extends TemplatedEmail
         'action_url' => null,
         'markdown' => false,
         'raw' => false,
-        'footer_text' => 'Notification e-mail sent by Symfony',
+        'footer_text' => 'Notification email sent by Symfony',
     ];
     private bool $rendered = false;
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php b/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php
index ceafea1bb6b72..6e48f2b4a5d61 100644
--- a/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php
@@ -35,7 +35,7 @@ public function test()
             'markdown' => true,
             'raw' => false,
             'a' => 'b',
-            'footer_text' => 'Notification e-mail sent by Symfony',
+            'footer_text' => 'Notification email sent by Symfony',
         ], $email->getContext());
     }
 
@@ -58,7 +58,7 @@ public function testSerialize()
             'markdown' => false,
             'raw' => true,
             'a' => 'b',
-            'footer_text' => 'Notification e-mail sent by Symfony',
+            'footer_text' => 'Notification email sent by Symfony',
         ], $email->getContext());
 
         $this->assertSame('@email/example/notification/body.html.twig', $email->getHtmlTemplate());
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
index 6435cf99e102a..84f2281cd4349 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
@@ -30,7 +30,7 @@
     <span class="label {{ events.messages is empty ? 'disabled' }}">
         <span class="icon">{{ source('@WebProfiler/Icon/mailer.svg') }}</span>
 
-        <strong>E-mails</strong>
+        <strong>Emails</strong>
         {% if events.messages|length > 0 %}
             <span class="count">
                 <span>{{ events.messages|length }}</span>

From fcbfbb185c94a6fecabc59194f39ba3982db3445 Mon Sep 17 00:00:00 2001
From: Romain Monteil <monteil.romain@gmail.com>
Date: Fri, 16 Dec 2022 12:03:52 +0100
Subject: [PATCH 114/475] [FrameworkBundle] Rename service
 `notifier.logger_notification_listener` to
 `notifier.notification_logger_listener`

---
 UPGRADE-6.3.md                                              | 5 +++++
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md             | 1 +
 .../Bundle/FrameworkBundle/Resources/config/notifier.php    | 6 +++++-
 .../FrameworkBundle/Resources/config/notifier_debug.php     | 2 +-
 .../FrameworkBundle/Test/NotificationAssertionsTrait.php    | 4 ++--
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index b626a000b508f..89caa851669a4 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -38,6 +38,11 @@ FrameworkBundle
    </framework:config>
    ```
 
+FrameworkBundle
+---------------
+
+ * Deprecate the `notifier.logger_notification_listener` service, use the `notifier.notification_logger_listener` service instead
+
 HttpKernel
 ----------
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 443b2e2792371..b9d859b7a643c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * Add `--format` option to the `debug:config` command
  * Add support to pass namespace wildcard in `framework.messenger.routing`
  * Deprecate `framework:exceptions` tag, unwrap it and replace `framework:exception` tags' `name` attribute by `class`
+ * Deprecate the `notifier.logger_notification_listener` service, use the `notifier.notification_logger_listener` service instead
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier.php
index 2f53ff03de03d..6ce674148a878 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier.php
@@ -126,7 +126,11 @@
             ->args([service('texter.transports')])
             ->tag('messenger.message_handler', ['handles' => PushMessage::class])
 
-        ->set('notifier.logger_notification_listener', NotificationLoggerListener::class)
+        ->set('notifier.notification_logger_listener', NotificationLoggerListener::class)
             ->tag('kernel.event_subscriber')
+
+        ->alias('notifier.logger_notification_listener', 'notifier.notification_logger_listener')
+            ->deprecate('symfony/framework-bundle', '6.3', 'The "%alias_id%" service is deprecated, use "notifier.notification_logger_listener" instead.')
+
     ;
 };
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_debug.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_debug.php
index 6147d34e4e7eb..47eab26f936da 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_debug.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_debug.php
@@ -16,7 +16,7 @@
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set('notifier.data_collector', NotificationDataCollector::class)
-            ->args([service('notifier.logger_notification_listener')])
+            ->args([service('notifier.notification_logger_listener')])
             ->tag('data_collector', ['template' => '@WebProfiler/Collector/notifier.html.twig', 'id' => 'notifier'])
     ;
 };
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/NotificationAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/NotificationAssertionsTrait.php
index 163c2a9719c55..30298ef04c54f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/NotificationAssertionsTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/NotificationAssertionsTrait.php
@@ -91,8 +91,8 @@ public static function getNotifierMessage(int $index = 0, string $transportName
     public static function getNotificationEvents(): NotificationEvents
     {
         $container = static::getContainer();
-        if ($container->has('notifier.logger_notification_listener')) {
-            return $container->get('notifier.logger_notification_listener')->getEvents();
+        if ($container->has('notifier.notification_logger_listener')) {
+            return $container->get('notifier.notification_logger_listener')->getEvents();
         }
 
         static::fail('A client must have Notifier enabled to make notifications assertions. Did you forget to require symfony/notifier?');

From a5e4fc25289f67045c4a7cc64d3c8974e27ec5ce Mon Sep 17 00:00:00 2001
From: Matthias Bilger <matthias@bilger.info>
Date: Fri, 6 Jan 2023 22:17:21 +0100
Subject: [PATCH 115/475] Allow Usage of ContentId in html

Detect usage of Content-Id in html and mark part as related, just as it
would happen with a `cid:<name>` reference.
---
 src/Symfony/Component/Mime/CHANGELOG.md        |  5 +++++
 src/Symfony/Component/Mime/Email.php           |  6 ++++--
 src/Symfony/Component/Mime/Tests/EmailTest.php | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Mime/CHANGELOG.md b/src/Symfony/Component/Mime/CHANGELOG.md
index 83214ee6594be..3676f8a82ef42 100644
--- a/src/Symfony/Component/Mime/CHANGELOG.md
+++ b/src/Symfony/Component/Mime/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Support detection of related parts if `Content-Id` is used instead of the name
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
index 9a60f42170e86..7fcc2aae1837b 100644
--- a/src/Symfony/Component/Mime/Email.php
+++ b/src/Symfony/Component/Mime/Email.php
@@ -492,14 +492,16 @@ private function prepareParts(): ?array
         $otherParts = $relatedParts = [];
         foreach ($this->attachments as $part) {
             foreach ($names as $name) {
-                if ($name !== $part->getName()) {
+                if ($name !== $part->getName() && (!$part->hasContentId() || $name !== $part->getContentId())) {
                     continue;
                 }
                 if (isset($relatedParts[$name])) {
                     continue 2;
                 }
 
-                $html = str_replace('cid:'.$name, 'cid:'.$part->getContentId(), $html, $count);
+                if ($name !== $part->getContentId()) {
+                    $html = str_replace('cid:'.$name, 'cid:'.$part->getContentId(), $html, $count);
+                }
                 $relatedParts[$name] = $part;
                 $part->setName($part->getContentId())->asInline();
 
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
index 8dba651ffb882..a0d56cbaca70c 100644
--- a/src/Symfony/Component/Mime/Tests/EmailTest.php
+++ b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -409,6 +409,24 @@ public function testGenerateBodyWithTextAndHtmlAndAttachedFileAndAttachedImageRe
         $this->assertStringContainsString('cid:'.$parts[1]->getContentId(), $generatedHtml->getBody());
     }
 
+    public function testGenerateBodyWithTextAndHtmlAndAttachedFileAndAttachedImageReferencedViaCidAndContentId()
+    {
+        [$text, $html, $filePart, $file, $imagePart, $image] = $this->generateSomeParts();
+        $e = (new Email())->from('me@example.com')->to('you@example.com');
+        $e->text('text content');
+        $e->addPart(new DataPart($file));
+        $img = new DataPart($image, 'test.gif');
+        $e->addPart($img);
+        $e->html($content = 'html content <img src="cid:'.$img->getContentId().'">');
+        $body = $e->getBody();
+        $this->assertInstanceOf(MixedPart::class, $body);
+        $this->assertCount(2, $related = $body->getParts());
+        $this->assertInstanceOf(RelatedPart::class, $related[0]);
+        $this->assertEquals($filePart, $related[1]);
+        $this->assertCount(2, $parts = $related[0]->getParts());
+        $this->assertInstanceOf(AlternativePart::class, $parts[0]);
+    }
+
     public function testGenerateBodyWithHtmlAndInlinedImageTwiceReferencedViaCid()
     {
         // inline image (twice) referenced in the HTML content

From 34ddeb6231f60a964e11323b8072080b9ccfb12f Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Sun, 8 Jan 2023 12:36:30 +0100
Subject: [PATCH 116/475] [DependencyInjection][DX] Add message to install
 symfony/config for additional debugging information

---
 .../Compiler/AutowirePass.php                 | 16 ++++++----
 .../Tests/Compiler/AutowirePassTest
741A
.php       | 31 +++++++++++++++++++
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 66a175d76c267..42a49f82f054a 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -540,15 +540,19 @@ private function createTypeNotFoundMessage(TypedReference $reference, string $la
         if (!$r = $this->container->getReflectionClass($type, false)) {
             // either $type does not exist or a parent class does not exist
             try {
-                $resource = new ClassExistenceResource($type, false);
-                // isFresh() will explode ONLY if a parent class/trait does not exist
-                $resource->isFresh(0);
-                $parentMsg = false;
+                if (class_exists(ClassExistenceResource::class)) {
+                    $resource = new ClassExistenceResource($type, false);
+                    // isFresh() will explode ONLY if a parent class/trait does not exist
+                    $resource->isFresh(0);
+                    $parentMsg = false;
+                } else {
+                    $parentMsg = "couldn't be loaded. Either it was not found or it is missing a parent class or a trait";
+                }
             } catch (\ReflectionException $e) {
-                $parentMsg = $e->getMessage();
+                $parentMsg = sprintf('is missing a parent class (%s)', $e->getMessage());
             }
 
-            $message = sprintf('has type "%s" but this class %s.', $type, $parentMsg ? sprintf('is missing a parent class (%s)', $parentMsg) : 'was not found');
+            $message = sprintf('has type "%s" but this class %s.', $type, $parentMsg ?: 'was not found');
         } elseif ($reference->getAttributes()) {
             $message = $label;
             $label = sprintf('"#[Target(\'%s\')" on', $reference->getName());
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index 7f29757b50d00..97a2c858eac20 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -14,7 +14,9 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
+use Symfony\Bridge\PhpUnit\ClassExistsMock;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Resource\ClassExistenceResource;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\Compiler\AutowireAsDecoratorPass;
@@ -39,6 +41,11 @@
 
 class AutowirePassTest extends TestCase
 {
+    public static function setUpBeforeClass(): void
+    {
+        ClassExistsMock::register(AutowirePass::class);
+    }
+
     public function testProcess()
     {
         $container = new ContainerBuilder();
@@ -504,6 +511,30 @@ public function testParentClassNotFoundThrowsException()
         }
     }
 
+    public function testParentClassNotFoundThrowsExceptionWithoutConfigComponent()
+    {
+        ClassExistsMock::withMockedClasses([
+            ClassExistenceResource::class => false,
+        ]);
+
+        $container = new ContainerBuilder();
+
+        $aDefinition = $container->register('a', BadParentTypeHintedArgument::class);
+        $aDefinition->setAutowired(true);
+
+        $container->register(Dunglas::class, Dunglas::class);
+
+        $pass = new AutowirePass();
+        try {
+            $pass->process($container);
+            $this->fail('AutowirePass should have thrown an exception');
+        } catch (AutowiringFailedException $e) {
+            $this->assertSame('Cannot autowire service "a": argument "$r" of method "Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\BadParentTypeHintedArgument::__construct()" has type "Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\OptionalServiceClass" but this class couldn\'t be loaded. Either it was not found or it is missing a parent class or a trait.', $e->getMessage());
+        }
+
+        ClassExistsMock::withMockedClasses([]);
+    }
+
     public function testDontUseAbstractServices()
     {
         $container = new ContainerBuilder();

From 693ade3f097fc27965281648dfcf823326f3b339 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Mon, 9 Jan 2023 19:25:10 +0100
Subject: [PATCH 117/475] [PhpUnitBridge] Fix `enum_exists` mock tests

---
 src/Symfony/Bridge/PhpUnit/Tests/EnumExistsMockTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/EnumExistsMockTest.php b/src/Symfony/Bridge/PhpUnit/Tests/EnumExistsMockTest.php
index 8115dc1316538..21cdd290400ca 100644
--- a/src/Symfony/Bridge/PhpUnit/Tests/EnumExistsMockTest.php
+++ b/src/Symfony/Bridge/PhpUnit/Tests/EnumExistsMockTest.php
@@ -23,6 +23,9 @@ class EnumExistsMockTest extends TestCase
 {
     public static function setUpBeforeClass(): void
     {
+        // Require the fixture file to allow PHP to be fully aware of the enum existence
+        require __DIR__.'/Fixtures/ExistingEnumReal.php';
+
         ClassExistsMock::register(__CLASS__);
     }
 
@@ -34,6 +37,11 @@ protected function setUp(): void
         ]);
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        ClassExistsMock::withMockedEnums([]);
+    }
+
     public function testClassExists()
     {
         $this->assertFalse(class_exists(ExistingEnum::class));

From 1acf90ee68c9fdf0ca4fec746cf8ec8a1c9d484f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 11 Jan 2023 11:16:02 +0100
Subject: [PATCH 118/475] [HttpKernel] Use TZ from clock service in
 DateTimeValueResolver

---
 .../ArgumentResolver/DateTimeValueResolver.php         |  4 ++--
 .../ArgumentResolver/DateTimeValueResolverTest.php     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
index a73a7e1b47a27..0cfd42badc974 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
@@ -73,7 +73,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
         }
 
         if (null !== $format) {
-            $date = $class::createFromFormat($format, $value);
+            $date = $class::createFromFormat($format, $value, $this->clock?->now()->getTimeZone());
 
             if (($class::getLastErrors() ?: ['warning_count' => 0])['warning_count']) {
                 $date = false;
@@ -83,7 +83,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
                 $value = '@'.$value;
             }
             try {
-                $date = new $class($value);
+                $date = new $class($value, $this->clock?->now()->getTimeZone());
             } catch (\Exception) {
                 $date = false;
             }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php
index c56cbeb5e335f..6529ca9f7640b 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php
@@ -84,8 +84,8 @@ public function testUnsupportedArgument()
      */
     public function testFullDate(string $timezone, bool $withClock)
     {
-        date_default_timezone_set($timezone);
-        $resolver = new DateTimeValueResolver($withClock ? new MockClock() : null);
+        date_default_timezone_set($withClock ? 'UTC' : $timezone);
+        $resolver = new DateTimeValueResolver($withClock ? new MockClock('now', $timezone) : null);
 
         $argument = new ArgumentMetadata('dummy', \DateTimeImmutable::class, false, false, null);
         $request = self::requestWithAttributes(['dummy' => '2012-07-21 00:00:00']);
@@ -103,7 +103,7 @@ public function testFullDate(string $timezone, bool $withClock)
      */
     public function testUnixTimestamp(string $timezone, bool $withClock)
     {
-        date_default_timezone_set($timezone);
+        date_default_timezone_set($withClock ? 'UTC' : $timezone);
         $resolver = new DateTimeValueResolver($withClock ? new MockClock('now', $timezone) : null);
 
         $argument = new ArgumentMetadata('dummy', \DateTimeImmutable::class, false, false, null);
@@ -212,7 +212,7 @@ public function testCustomClass()
      */
     public function testDateTimeImmutable(string $timezone, bool $withClock)
     {
-        date_default_timezone_set($timezone);
+        date_default_timezone_set($withClock ? 'UTC' : $timezone);
         $resolver = new DateTimeValueResolver($withClock ? new MockClock('now', $timezone) : null);
 
         $argument = new ArgumentMetadata('dummy', \DateTimeImmutable::class, false, false, null);
@@ -231,7 +231,7 @@ public function testDateTimeImmutable(string $timezone, bool $withClock)
      */
     public function testWithFormat(string $timezone, bool $withClock)
     {
-        date_default_timezone_set($timezone);
+        date_default_timezone_set($withClock ? 'UTC' : $timezone);
         $resolver = new DateTimeValueResolver($withClock ? new MockClock('now', $timezone) : null);
 
         $argument = new ArgumentMetadata('dummy', \DateTimeInterface::class, false, false, null, false, [

From e6c56a3e54431f7c9a47014d4245669096f98249 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Wed, 11 Jan 2023 09:59:08 +0100
Subject: [PATCH 119/475] [WebProfilerBundle] Use a dynamic SVG favicon in the
 profiler

---
 .../Resources/views/Profiler/base.html.twig                 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig
index 1a74431d898b5..c037c07ec94bc 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig
@@ -5,7 +5,11 @@
         <meta name="robots" content="noindex,nofollow" />
         <meta name="viewport" content="width=device-width,initial-scale=1" />
         <title>{% block title %}Symfony Profiler{% endblock %}</title>
-        <link rel="icon" type="image/x-icon" sizes="16x16" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFEUlEQVR4AZVXA4wm2RMf27bXDM/+3/+sYBGfrbVtezc6BWtzfPbYXtvDL9906t6v0vWl05me7q1JzXuvvu4yXnvZgJ9hH6bwZYXLFR739vauUGuDwhq1L1N4Uv/tRYUhFjwcg49hn6aYr1V4TiGp86CoP9Oh1tV414KnM6t9fHymKUZ3DAI0hW4b1AyK3lE8phh5OxWeoJgUGhi5mLm95YzBwcHuhIQEV1JSEoWGhoKWHxYWFmenhJ/B5W0GwZpDt5Ovry9lZWWRyWOu5ORk7JsUpogsq5gnmISTU+HKQoLFQv/qq6/os88+I+EVFRUlSsRZ5oRiVmwlXMWShQkahUdERJCfnx/vd+3aRTU1NXTixAmqrq6mK1eu0PTp05mnrmD+QK6XhLO0XP2O2FJAQICRjjMU4P1PP/1EfX19NGfOHM8Z0N7ezueQkBBXYGAgSWIaQ5Em2T5QzFNSUig9PV3OHOe4uDjZ87p//34C7Nm7x/NcRUUFAX799Vec8Y7m7+8Pz92SfBDXr7VwPYRbxn/MmDG8Tps2jQBd3V30/PPPe35/6qmnaPXq1TR69Gg+h4eHiwwosdLT4dBkQDSXWmJiIq/vv/8+/fvvv3ThwgWqr6+n/Px8oyCmAerq6jy03Nxc2Yv7ySSjQzrmi4i92fVpaWlYOZ79/f2MW7dtpSlTptDp06epo6ODPvroI850ASiGdyZOnEjXrl2jyspKT4XA9cgjkaPL/D8UWG62HokieyQQoKSkRGiMs2bNotraWmprayOBNWvWyO+scGdnp5zF/WYvLEb8TwpRykp1MV7feust6uzqJMD169fpueeeY/rDDz/MKzzgdrsJoGkaffvtt/TFF19wQsIDmzZtssojt+6Fo1CgzKiAvAB3DRs2jAULtLS0eErPGB5Ad3c3lZaWUnFxMfeAd955h5+JjY3FaqXAPwhBnRCNySK4b98+Aoilv/z6i/zGggSk1g0opWupAMvGP91yt96zadWqVdTc3Ezz58/31LOAy+US6zgHBP766y+mDR8+HBUgFWSnQI2EAFnqlpcaGxsJIFkMN8L9AnPnzmX6jRs3SACeAi0vL888JwYPgTEJpauhnADo6/LSgQMHCHD37l2Cp15//XXq7eslgKb+Fi1exM9lZmbaCDclIcpQQhATE4OVsrOzuamg+cyePZuzG64Hrlu3jp9ZuWolCdy+fZueeOIJpkdHR1sLHqgM0Yh0bTRz1m7fvp2KiopYkYKCApo8ebLZIwzlFeXSOXEnsLPe2Ij+p5DbYYdOdOtDQ0rNjFya5sTcsGGDcTDZoXTcNoVBMoxWyzDS2yXmOyeUtGSskmDjx4/nRgPAfBDmMpZtUIbRcsi2GsfSD2QYyd2OcdmyZSSwdu1apuXk5GB16v4bak0yX0imyIUEgwNovFTglhMZGcm0srIy43zAVUxuTLbW4xn17Fci23wly9dngUummrTaixcvMpOtW7fiiBwQpqKYU9efHuxDJE5hC9wvL9TW1RLg+PHjPGTQ8wsLC4WpDC5Y5UR4k5qKMSLT6lqeAiX0nuAaMmSI9sMPP9CZM2foyJEj9O677wpTVIuTjidNp0HibvttoH9E5OMqbWKkSaNSlojldoLF7TEP+nUEmKI62y1kOBINbVaNarcI0PuGGUlHyfYvLHg7/jhFSFYqZh0P8KHSptd5ksOPU3tvqAEUot/hFmOIYJLp87wGe9Dwm95eg5xa/R8G6d8U5EcFhwAAAABJRU5ErkJggg==">
+
+        {% set request_collector = profile is defined ? profile.collectors.request|default(null) : null %}
+        {% set status_code = request_collector is not null ? request_collector.statuscode|default(0) : 0 %}
+        {% set favicon_color = status_code > 399 ? 'b41939' : status_code > 299 ? 'af8503' : '000000' %}
+        <link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg viewBox='0 0 600 600' xmlns='http://www.w3.org/2000/svg' fill-rule='evenodd' clip-rule='evenodd' stroke-linejoin='round' stroke-miterlimit='2'%3E%3Cstyle%3E%23circle %7B fill: %23{{ favicon_color }}; %7D %23sf %7B fill: %23ffffff; %7D%3C/style%3E%3Cpath fill='none' d='M0 0h600v600H0z'/%3E%3CclipPath id='a'%3E%3Cpath d='M0 0h600v600H0z'/%3E%3C/clipPath%3E%3Cg clip-path='url(%23a)'%3E%3Cpath id='circle' d='M599.985 299.974c0 165.696-134.307 300.024-300.003 300.024C134.302 599.998 0 465.67 0 299.974 0 134.304 134.302-.002 299.982-.002c165.696 0 300.003 134.307 300.003 299.976z' fill-rule='nonzero'/%3E%3Cpath id='sf' d='M431.154 110.993c-30.474 1.043-57.08 17.866-76.884 41.076-21.926 25.49-36.508 55.696-47.03 86.55-18.791-15.416-33.282-35.364-63.457-44.04-23.311-6.702-47.794-3.948-70.314 12.833-10.667 7.965-18.016 19.995-21.51 31.34-9.05 29.416 9.506 55.61 17.942 65.004l18.444 19.743c3.792 3.879 12.95 13.983 8.467 28.458-4.82 15.764-23.809 25.938-43.285 19.958-8.703-2.67-21.199-9.147-18.396-18.257 1.145-3.739 3.82-6.553 5.264-9.74 1.305-2.788 1.941-4.858 2.337-6.099 3.557-11.602-1.31-26.714-13.747-30.56-11.613-3.562-23.488-.738-28.094 14.202-5.22 16.979 2.905 47.795 46.436 61.206 51 15.694 94.13-12.084 100.249-48.287 3.857-22.675-6.392-39.536-25.147-61.2l-15.293-16.92c-9.254-9.248-12.437-25.018-2.856-37.134 8.093-10.233 19.6-14.581 38.476-9.457 27.543 7.468 39.809 26.58 60.285 41.996-8.44 27.741-13.977 55.584-18.973 80.548l-3.07 18.626c-14.636 76.766-25.816 118.939-54.856 143.144-5.858 4.167-14.218 10.399-26.821 10.843-6.622.203-8.757-4.355-8.847-6.344-.15-4.628 3.755-6.756 6.349-8.837 3.889-2.124 9.757-5.633 9.356-16.882-.423-13.293-11.431-24.815-27.35-24.286-11.919.402-30.09 11.608-29.4 32.149.701 21.22 20.472 37.118 50.288 36.107 15.935-.535 51.528-7.018 86.592-48.699 40.82-47.8 52.235-102.576 60.82-142.673l9.591-52.946a177.574 177.574 0 0017.209 1.22c50.844 1.075 76.257-25.249 76.653-44.41.257-11.591-7.6-23.011-18.61-22.739-7.863.22-17.759 5.473-20.123 16.353-2.332 10.671 16.17 20.316 1.712 29.704-10.27 6.643-28.683 11.319-54.615 7.526l4.712-26.061c9.623-49.416 21.493-110.193 66.528-111.68 3.284-.155 15.282.139 15.56 8.088.08 2.637-.582 3.332-3.68 9.393-3.166 4.729-4.36 8.773-4.204 13.394.433 12.608 10.024 20.91 23.916 20.429 18.572-.626 23.906-18.7 23.6-27.998-.759-21.846-23.776-35.647-54.224-34.641z' fill-rule='nonzero'/%3E%3C/g%3E%3C/svg%3E"/>
 
         {% block head %}
             <style{% if csp_style_nonce is defined and csp_style_nonce %} nonce="{{ csp_style_nonce }}"{% endif %}>

From efc9723e3b4ba7c6876825640e6cfc0953f0a8c4 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Thu, 22 Dec 2022 16:08:01 +0100
Subject: [PATCH 120/475] [WebProfilerBundle] Improve accessibility of tabs and
 some links

---
 .../views/Collector/logger.html.twig          | 16 ++++----
 .../views/Profiler/base_js.html.twig          | 39 ++++++++++++++-----
 .../views/Profiler/profiler.css.twig          | 32 ++++++++-------
 3 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
index 385c80795fdd9..75bb3fe1e636e 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -55,28 +55,28 @@
         {% set filters = collector.filters %}
         <div class="log-filters">
             <div id="log-filter-type" class="log-filter">
-                <ul class="tab-navigation">
-                    <li class="{{ not has_error_logs and not has_deprecation_logs ? 'active' }}">
+                <div class="tab-navigation" role="tablist">
+                    <button role="tab" class="tab-control {{ not has_error_logs and not has_deprecation_logs ? 'active' }}">
                         <input {{ not has_error_logs and not has_deprecation_logs ? 'checked' }} type="radio" id="filter-log-type-all" name="filter-log-type" value="all">
                         <label for="filter-log-type-all">All messages</label>
-                    </li>
+                    </button>
 
-                    <li class="{{ has_error_logs ? 'active' }}">
+                    <button role="tab" class="tab-control {{ has_error_logs ? 'active' }}">
                         <input {{ has_error_logs ? 'checked' }} type="radio" id="filter-log-type-error" name="filter-log-type" value="error">
                         <label for="filter-log-type-error">
                             Errors
                             <span class="badge status-{{ collector.counterrors ? 'error' }}">{{ collector.counterrors|default(0) }}</span>
                         </label>
-                    </li>
+                    </button>
 
-                    <li class="{{ not has_error_logs and has_deprecation_logs ? 'active' }}">
+                    <button role="tab" class="tab-control {{ not has_error_logs and has_deprecation_logs ? 'active' }}">
                         <input {{ not has_error_logs and has_deprecation_logs ? 'checked' }} type="radio" id="filter-log-type-deprecation" name="filter-log-type" value="deprecation">
                         <label for="filter-log-type-deprecation">
                             Deprecations
                             <span class="badge status-{{ collector.countdeprecations ? 'warning' }}">{{ collector.countdeprecations|default(0) }}</span>
                         </label>
-                    </li>
-                </ul>
+                    </button>
+                </div>
             </div>
 
             <details id="log-filter-priority" class="log-filter">
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
index 0c3bff7281946..b7f64bca30d11 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -663,23 +663,31 @@ if (typeof Sfjs === 'undefined' || typeof Sfjs.loadToolbar === 'undefined') {
             },
 
             createTabs: function() {
+                /* the accessibility options of this component have been defined according to: */
+                /* www.w3.org/WAI/ARIA/apg/example-index/tabs/tabs-manual.html */
                 var tabGroups = document.querySelectorAll('.sf-tabs:not([data-processed=true])');
 
                 /* create the tab navigation for each group of tabs */
                 for (var i = 0; i < tabGroups.length; i++) {
                     var tabs = tabGroups[i].querySelectorAll(':scope > .tab');
-                    var tabNavigation = document.createElement('ul');
+                    var tabNavigation = document.createElement('div');
                     tabNavigation.className = 'tab-navigation';
+                    tabNavigation.setAttribute('role', 'tablist');
 
                     var selectedTabId = 'tab-' + i + '-0'; /* select the first tab by default */
                     for (var j = 0; j < tabs.length; j++) {
                         var tabId = 'tab-' + i + '-' + j;
                         var tabTitle = tabs[j].querySelector('.tab-title').innerHTML;
 
-                        var tabNavigationItem = document.createElement('li');
+                        var tabNavigationItem = document.createElement('button');
+                        tabNavigationItem.classList.add('tab-control');
                         tabNavigationItem.setAttribute('data-tab-id', tabId);
+                        tabNavigationItem.setAttribute('role', 'tab');
+                        tabNavigationItem.setAttribute('aria-controls', tabId);
                         if (hasClass(tabs[j], 'active')) { selectedTabId = tabId; }
-                        if (hasClass(tabs[j], 'disabled')) { addClass(tabNavigationItem, 'disabled'); }
+                        if (hasClass(tabs[j], 'disabled')) {
+                            addClass(tabNavigationItem, 'disabled');
+                        }
                         tabNavigationItem.innerHTML = tabTitle;
                         tabNavigation.appendChild(tabNavigationItem);
 
@@ -693,24 +701,31 @@ if (typeof Sfjs === 'undefined' || typeof Sfjs.loadToolbar === 'undefined') {
 
                 /* display the active tab and add the 'click' event listeners */
                 for (i = 0; i < tabGroups.length; i++) {
-                    tabNavigation = tabGroups[i].querySelectorAll(':scope > .tab-navigation li');
+                    tabNavigation = tabGroups[i].querySelectorAll(':scope > .tab-navigation .tab-control');
 
                     for (j = 0; j < tabNavigation.length; j++) {
                         tabId = tabNavigation[j].getAttribute('data-tab-id');
-                        document.getElementById(tabId).querySelector('.tab-title').className = 'hidden';
+                        const tabPanel = document.getElementById(tabId);
+                        tabPanel.setAttribute('role', 'tabpanel');
+                        tabPanel.setAttribute('aria-labelledby', tabId);
+                        tabPanel.querySelector('.tab-title').className = 'hidden';
 
                         if (hasClass(tabNavigation[j], 'active')) {
-                            document.getElementById(tabId).className = 'block';
+                            tabPanel.className = 'block';
+                            tabNavigation[j].setAttribute('aria-selected', 'true');
+                            tabNavigation[j].removeAttribute('tabindex');
                         } else {
-                            document.getElementById(tabId).className = 'hidden';
+                            tabPanel.className = 'hidden';
+                            tabNavigation[j].removeAttribute('aria-selected');
+                            tabNavigation[j].setAttribute('tabindex', '-1');
                         }
 
                         tabNavigation[j].addEventListener('click', function(e) {
                             var activeTab = e.target || e.srcElement;
 
                             /* needed because when the tab contains HTML contents, user can click */
-                            /* on any of those elements instead of their parent '<li>' element */
-                            while (activeTab.tagName.toLowerCase() !== 'li') {
+                            /* on any of those elements instead of their parent '<button>' element */
+                            while (activeTab.tagName.toLowerCase() !== 'button') {
                                 activeTab = activeTab.parentNode;
                             }
 
@@ -720,9 +735,13 @@ if (typeof Sfjs === 'undefined' || typeof Sfjs.loadToolbar === 'undefined') {
                                 var tabId = tabNavigation[k].getAttribute('data-tab-id');
                                 document.getElementById(tabId).className = 'hidden';
                                 removeClass(tabNavigation[k], 'active');
+                                tabNavigation[k].removeAttribute('aria-selected');
+                                tabNavigation[k].setAttribute('tabindex', '-1');
                             }
 
                             addClass(activeTab, 'active');
+                            activeTab.setAttribute('aria-selected', 'true');
+                            activeTab.removeAttribute('tabindex');
                             var activeTabId = activeTab.getAttribute('data-tab-id');
                             document.getElementById(activeTabId).className = 'block';
                         });
@@ -894,7 +913,7 @@ if (typeof Sfjs === 'undefined' || typeof Sfjs.loadToolbar === 'undefined') {
                 document.querySelector('#log-filter-channel .filter-active-num').innerText = (channels.length === selectedChannels.length) ? 'All' : selectedChannels.length;
 
                 /* update the currently selected "log type" tab */
-                document.querySelectorAll('#log-filter-type li').forEach((tab) => tab.classList.remove('active'));
+                document.querySelectorAll('#log-filter-type .tab-control').forEach((tab) => tab.classList.remove('active'));
                 document.querySelector(`#log-filter-type input[value="${selectedType}"]`).parentElement.classList.add('active');
             },
         };
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
index 42f30d6ff4805..b8fe02e587cd7 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -516,7 +516,6 @@ input[type="radio"], input[type="checkbox"] {
     color: var(--color-link);
     text-decoration: none;
     background-color: transparent;
-    outline: none;
     border: 0;
     padding: 0;
     cursor: pointer;
@@ -1546,23 +1545,26 @@ tr.status-warning td {
     box-shadow: inset 0 0 0 1px var(--tab-border-color), 0 0 0 4px var(--page-background);
     margin: 0 0 10px;
 }
-.tab-navigation li {
+.tab-navigation .tab-control {
+    background: transparent;
+    border: 0;
     box-shadow: none;
     transition: box-shadow .05s ease-in, background-color .05s ease-in;
     cursor: pointer;
+    font-size: 14px;
     font-weight: 500;
-    list-style: none;
+    line-height: 1.4;
     margin: 0;
     padding: 4px 14px;
     position: relative;
     text-align: center;
     z-index: 1;
 }
-.sf-tabs-sm .tab-navigation li {
+.sf-tabs-sm .tab-navigation .tab-control {
     font-size: 13px;
     padding: 2.5px 10px;
 }
-.tab-navigation li:before {
+.tab-navigation .tab-control:before {
     background: var(--tab-border-color);
     bottom: 15%;
     content: "";
@@ -1571,10 +1573,12 @@ tr.status-warning td {
     top: 15%;
     width: 1px;
 }
-.tab-navigation li:first-child:before, .tab-navigation li.active + li:before, .tab-navigation li.active:before {
+.tab-navigation .tab-control:first-child:before,
+.tab-navigation .tab-control.active + .tab-control:before,
+.tab-navigation .tab-control.active:before {
     width: 0;
 }
-.tab-navigation li .badge {
+.tab-navigation .tab-control .badge {
     background: var(--selected-badge-background);
     box-shadow: var(--selected-badge-shadow);
     color: var(--selected-badge-color);
@@ -1588,10 +1592,10 @@ tr.status-warning td {
     text-align: center;
     white-space: nowrap;
 }
-.tab-navigation li.disabled {
+.tab-navigation .tab-control.disabled {
     color: var(--tab-disabled-color);
 }
-.tab-navigation li.active {
+.tab-navigation .tab-control.active {
     background-color: var(--tab-active-background);
     border-radius: 6px;
     box-shadow: inset 0 0 0 1.5px var(--tab-active-border-color);
@@ -1599,18 +1603,18 @@ tr.status-warning td {
     position: relative;
     z-index: 1;
 }
-.theme-dark .tab-navigation li.active {
+.theme-dark .tab-navigation .tab-control.active {
     box-shadow: inset 0 0 0 1px var(--tab-border-color);
 }
 .tab-content > *:first-child {
     margin-top: 0;
 }
-.tab-navigation li .badge.status-warning {
+.tab-navigation .tab-control .badge.status-warning {
     background: var(--selected-badge-warning-background);
     box-shadow: var(--selected-badge-warning-shadow);
     color: var(--selected-badge-warning-color);
 }
-.tab-navigation li .badge.status-error {
+.tab-navigation .tab-control .badge.status-error {
     background: var(--selected-badge-danger-background);
     box-shadow: var(--selected-badge-danger-shadow);
     color: var(--selected-badge-danger-color);
@@ -1784,10 +1788,10 @@ tr.status-warning td {
     font-weight: bold;
     padding: 0 1px;
 }
-.log-filter .tab-navigation li input {
+.log-filter .tab-navigation .tab-control input {
     display: none;
 }
-.log-filter .tab-navigation li label {
+.log-filter .tab-navigation .tab-control label {
     cursor: pointer;
 }
 .log-filters .log-filter .log-filter-content {

From bb0c214059ceda1bda3679383483a52d9831c874 Mon Sep 17 00:00:00 2001
From: otsch <otsch@users.noreply.github.com>
Date: Fri, 16 Dec 2022 16:32:30 +0100
Subject: [PATCH 121/475] [DomCrawler] Add argument `$normalizeWhitespace` to
 `Crawle
F438
r::innerText()` and make it return the first non-empty text

---
 src/Symfony/Component/DomCrawler/CHANGELOG.md |  2 +
 src/Symfony/Component/DomCrawler/Crawler.php  | 27 +++++++-
 .../DomCrawler/Tests/AbstractCrawlerTest.php  | 61 ++++++++++++++++---
 3 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/DomCrawler/CHANGELOG.md b/src/Symfony/Component/DomCrawler/CHANGELOG.md
index a05fb7f2ebec8..1cd98759a3270 100644
--- a/src/Symfony/Component/DomCrawler/CHANGELOG.md
+++ b/src/Symfony/Component/DomCrawler/CHANGELOG.md
@@ -5,6 +5,8 @@ CHANGELOG
 ---
 
  * Add `CrawlerSelectorCount` test constraint
+ * Add argument `$normalizeWhitespace` to `Crawler::innerText()`
+ * Make `Crawler::innerText()` return the first non-empty text
 
 6.0
 ---
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index ce96fdb088a89..2cce1e9b988a3 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -553,7 +553,7 @@ public function text(string $default = null, bool $normalizeWhitespace = true):
         $text = $this->getNode(0)->nodeValue;
 
         if ($normalizeWhitespace) {
-            return trim(preg_replace("/(?:[ \n\r\t\x0C]{2,}+|[\n\r\t\x0C])/", ' ', $text), " \n\r\t\x0C");
+            return $this->normalizeWhitespace($text);
         }
 
         return $text;
@@ -561,10 +561,26 @@ public function text(string $default = null, bool $normalizeWhitespace = true):
 
     /**
      * Returns only the inner text that is the direct descendent of the current node, excluding any child nodes.
+     *
+     * @param bool $normalizeWhitespace Whether whitespaces should be trimmed and normalized to single spaces
      */
-    public function innerText(): string
+    public function innerText(/* bool $normalizeWhitespace = true */): string
     {
-        return $this->filterXPath('.//text()')->text();
+        $normalizeWhitespace = 1 <= \func_num_args() ? func_get_arg(0) : true;
+
+        foreach ($this->getNode(0)->childNodes as $childNode) {
+            if (\XML_TEXT_NODE !== $childNode->nodeType) {
+                continue;
+            }
+            if (!$normalizeWhitespace) {
+                return $childNode->nodeValue;
+            }
+            if ('' !== trim($childNode->nodeValue)) {
+                return $this->normalizeWhitespace($childNode->nodeValue);
+            }
+        }
+
+        return '';
     }
 
     /**
@@ -1189,4 +1205,9 @@ private function isValidHtml5Heading(string $heading): bool
     {
         return 1 === preg_match('/^\x{FEFF}?\s*(<!--[^>]*?-->\s*)*$/u', $heading);
     }
+
+    private function normalizeWhitespace(string $string): string
+    {
+        return trim(preg_replace("/(?:[ \n\r\t\x0C]{2,}+|[\n\r\t\x0C])/", ' ', $string), " \n\r\t\x0C");
+    }
 }
diff --git a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
index 0fbd9196ff556..f97fd15804665 100644
--- a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
@@ -348,12 +348,56 @@ public function testText()
         $this->assertSame('my value', $this->createTestCrawler(null)->filterXPath('//ol')->text('my value'));
     }
 
-    public function testInnerText()
+    public function provideInnerTextExamples()
     {
-        self::assertCount(1, $crawler = $this->createTestCrawler()->filterXPath('//*[@id="complex-element"]'));
+        return [
+            [
+                '//*[@id="complex-elements"]/*[@class="one"]',     // XPath query
+                'Parent text Child text',                       // Result of Crawler::text()
+                'Parent text',                                  // Result of Crawler::innerText()
+                ' Parent text ',                                // Result of Crawler::innerText(false)
+            ],
+            [
+                '//*[@id="complex-elements"]/*[@class="two"]',
+                'Child text Parent text',
+                'Parent text',
+                ' ',
+            ],
+            [
+                '//*[@id="complex-elements"]/*[@class="three"]',
+                'Parent text Child text Parent text',
+                'Parent text',
+                ' Parent text ',
+            ],
+            [
+                '//*[@id="complex-elements"]/*[@class="four"]',
+                'Child text',
+                '',
+                '  ',
+            ],
+            [
+                '//*[@id="complex-elements"]/*[@class="five"]',
+                'Child text Another child',
+                '',
+                '  ',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideInnerTextExamples
+     */
+    public function testInnerText(
+        string $xPathQuery,
+        string $expectedText,
+        string $expectedInnerText,
+        string $expectedInnerTextNormalizeWhitespaceFalse,
+    ) {
+        self::assertCount(1, $crawler = $this->createTestCrawler()->filterXPath($xPathQuery));
 
-        self::assertSame('Parent text Child text', $crawler->text());
-        self::assertSame('Parent text', $crawler->innerText());
+        self::assertSame($expectedText, $crawler->text());
+        self::assertSame($expectedInnerText, $crawler->innerText());
+        self::assertSame($expectedInnerTextNormalizeWhitespaceFalse, $crawler->innerText(false));
     }
 
     public function testHtml()
@@ -1265,9 +1309,12 @@ public function createTestCrawler($uri = null)
                         <div id="child2" xmlns:foo="http://example.com"></div>
                     </div>
                     <div id="sibling"><img /></div>
-                    <div id="complex-element">
-                        Parent text
-                        <span>Child text</span>
+                    <div id="complex-elements">
+                        <div class="one"> Parent text <span>Child text</span> </div>
+                        <div class="two"> <span>Child text</span> Parent text </div>
+                        <div class="three"> Parent text <span>Child text</span> Parent text </div>
+                        <div class="four">  <span>Child text</span>  </div>
+                        <div class="five"><span>Child text</span>  <span>Another child</span></div>
                     </div>
                 </body>
             </html>

From be5fbced648bccd0f7a907c1b980e5fdb89211c0 Mon Sep 17 00:00:00 2001
From: Jules Pietri <heahdude@yahoo.fr>
Date: Thu, 29 Sep 2022 08:26:22 +0200
Subject: [PATCH 122/475] [DependencyInjection] Enable deprecating parameters

---
 .../DependencyInjection/CHANGELOG.md          |   1 +
 .../DependencyInjection/Container.php         |   6 +-
 .../DependencyInjection/ContainerBuilder.php  |  31 ++-
 .../DependencyInjection/Dumper/PhpDumper.php  |  39 +++-
 .../ParameterBag/FrozenParameterBag.php       |  13 +-
 .../ParameterBag/ParameterBag.php             |  26 ++-
 .../Tests/ContainerBuilderTest.php            | 106 +++++++++
 .../Tests/Dumper/PhpDumperTest.php            |  35 +++
 .../container_deprecated_parameters.php       |  12 ++
 .../Fixtures/php/services10_as_files.txt      |   6 +-
 .../Tests/Fixtures/php/services9_as_files.txt |   6 +-
 .../php/services9_inlined_factories.txt       |   6 +-
 .../php/services9_lazy_inlined_factories.txt  |   6 +-
 .../php/services_deprecated_parameters.php    | 110 ++++++++++
 ...ervices_deprecated_parameters_as_files.txt | 202 ++++++++++++++++++
 .../php/services_non_shared_lazy_as_files.txt |   6 +-
 .../ParameterBag/FrozenParameterBagTest.php   |  27 +++
 .../Tests/ParameterBag/ParameterBagTest.php   |  73 +++++++
 18 files changed, 671 insertions(+), 40 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_deprecated_parameters.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt

diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index df045b56f05c8..d40f439080c34 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
  * Add support for nesting autowiring-related attributes into `#[Autowire(...)]`
  * Deprecate undefined and numeric keys with `service_locator` config
  * Fail if Target attribute does not exist during compilation
+ * Enable deprecating parameters with `ContainerBuilder::deprecateParameter()`
 
 6.2
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 7b4c8ccf88ae5..ff10702229dc6 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -22,6 +22,7 @@
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag;
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Contracts\Service\ResetInterface;
 
@@ -82,7 +83,10 @@ public function compile()
     {
         $this->parameterBag->resolve();
 
-        $this->parameterBag = new FrozenParameterBag($this->parameterBag->all());
+        $this->parameterBag = new FrozenParameterBag(
+            $this->parameterBag->all(),
+            $this->parameterBag instanceof ParameterBag ? $this->parameterBag->allDeprecated() : []
+        );
 
         $this->compiled = true;
     }
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 7b10016ee8539..ad7bb37837b18 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -34,6 +34,7 @@
 use Symfony\Component\DependencyInjection\Exception\BadMethodCallException;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
@@ -610,7 +611,15 @@ public function merge(self $container)
             }
         }
         $this->addAliases($container->getAliases());
-        $this->getParameterBag()->add($container->getParameterBag()->all());
+        $parameterBag = $this->getParameterBag();
+        $otherBag = $container->getParameterBag();
+        $parameterBag->add($otherBag->all());
+
+        if ($parameterBag instanceof ParameterBag && $otherBag instanceof ParameterBag) {
+            foreach ($otherBag->allDeprecated() as $name => $deprecated) {
+                $parameterBag->deprecate($name, ...$deprecated);
+            }
+        }
 
         if ($this->trackResources) {
             foreach ($container->getResources() as $resource) {
@@ -626,9 +635,9 @@ public function merge(self $container)
             $this->extensionConfigs[$name] = array_merge($this->extensionConfigs[$name], $container->getExtensionConfig($name));
         }
 
-        if ($this->getParameterBag() instanceof EnvPlaceholderParameterBag && $container->getParameterBag() instanceof EnvPlaceholderParameterBag) {
-            $envPlaceholders = $container->getParameterBag()->getEnvPlaceholders();
-            $this->getParameterBag()->mergeEnvPlaceholders($container->getParameterBag());
+        if ($parameterBag instanceof EnvPlaceholderParameterBag && $otherBag instanceof EnvPlaceholderParameterBag) {
+            $envPlaceholders = $otherBag->getEnvPlaceholders();
+            $parameterBag->mergeEnvPlaceholders($otherBag);
         } else {
             $envPlaceholders = [];
         }
@@ -689,6 +698,20 @@ public function prependExtensionConfig(string $name, array $config)
         array_unshift($this->extensionConfigs[$name], $config);
     }
 
+    /**
+     * Deprecates a service container parameter.
+     *
+     * @throws ParameterNotFoundException if the parameter is not defined
+     */
+    public function deprecateParameter(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.'): void
+    {
+        if (!$this->parameterBag instanceof ParameterBag) {
+            throw new BadMethodCallException(sprintf('The parameter bag must be an instance of "%s" to call "%s".', ParameterBag::class, __METHOD__));
+        }
+
+        $this->parameterBag->deprecate($name, $package, $version, $message);
+    }
+
     /**
      * Compiles the container.
      *
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index c276f0ea7472c..1b9b5426bc031 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -35,6 +35,7 @@
 use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\NullDumper;
 use Symfony\Component\DependencyInjection\Loader\FileLoader;
 use Symfony\Component\DependencyInjection\Parameter;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator as BaseServiceLocator;
 use Symfony\Component\DependencyInjection\TypedReference;
@@ -1234,6 +1235,8 @@ private function startClass(string $class, string $baseClass, bool $hasProxyClas
  */
 class $class extends $baseClass
 {
+    private const DEPRECATED_PARAMETERS = [];
+
     protected \$parameters = [];
     protected readonly \WeakReference \$ref;
 
@@ -1242,11 +1245,9 @@ public function __construct()
         \$this->ref = \WeakReference::create(\$this);
 
 EOF;
+        $code = str_replace("    private const DEPRECATED_PARAMETERS = [];\n\n", $this->addDeprecatedParameters(), $code);
         if ($this->asFiles) {
-            $code = str_replace('$parameters = []', "\$containerDir;\n    protected \$parameters = [];\n    private \$buildParameters", $code);
-            $code = str_replace('__construct()', '__construct(array $buildParameters = [], $containerDir = __DIR__)', $code);
-            $code .= "        \$this->buildParameters = \$buildParameters;\n";
-            $code .= "        \$this->containerDir = \$containerDir;\n";
+            $code = str_replace('__construct()', '__construct(private array $buildParameters = [], protected string $containerDir = __DIR__)', $code);
 
             if (null !== $this->targetDirRegex) {
                 $code = str_replace('$parameters = []', "\$targetDir;\n    protected \$parameters = []", $code);
@@ -1391,6 +1392,24 @@ public function getRemovedIds(): array
 EOF;
     }
 
+    private function addDeprecatedParameters(): string
+    {
+        if (!($bag = $this->container->getParameterBag()) instanceof ParameterBag) {
+            return '';
+        }
+
+        if (!$deprecated = $bag->allDeprecated()) {
+            return '';
+        }
+        $code = '';
+        ksort($deprecated);
+        foreach ($deprecated as $param => $deprecation) {
+            $code .= '        '.$this->doExport($param).' => ['.implode(', ', array_map($this->doExport(...), $deprecation))."],\n";
+        }
+
+        return "    private const DEPRECATED_PARAMETERS = [\n{$code}    ];\n\n";
+    }
+
     private function addMethodMap(): string
     {
         $code = '';
@@ -1552,6 +1571,10 @@ private function addDefaultParametersMethod(): string
 
     public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
     {
+        if (isset(self::DEPRECATED_PARAMETERS[$name])) {
+            trigger_deprecation(...self::DEPRECATED_PARAMETERS[$name]);
+        }
+
         if (isset($this->buildParameters[$name])) {
             return $this->buildParameters[$name];
         }
@@ -1590,17 +1613,23 @@ public function getParameterBag(): ParameterBagInterface
             foreach ($this->buildParameters as $name => $value) {
                 $parameters[$name] = $value;
             }
-            $this->parameterBag = new FrozenParameterBag($parameters);
+            $this->parameterBag = new FrozenParameterBag($parameters, self::DEPRECATED_PARAMETERS);
         }
 
         return $this->parameterBag;
     }
 
 EOF;
+
         if (!$this->asFiles) {
             $code = preg_replace('/^.*buildParameters.*\n.*\n.*\n\n?/m', '', $code);
         }
 
+        if (!($bag = $this->container->getParameterBag()) instanceof ParameterBag || !$bag->allDeprecated()) {
+            $code = preg_replace("/\n.*DEPRECATED_PARAMETERS.*\n.*\n.*\n/m", '', $code, 1);
+            $code = str_replace(', self::DEPRECATED_PARAMETERS', '', $code);
+        }
+
         if ($dynamicPhp) {
             $loadedDynamicParameters = $this->exportParameters(array_combine(array_keys($dynamicPhp), array_fill(0, \count($dynamicPhp), false)), '', 8);
             $getDynamicParameter = <<<'EOF'
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
index 4e0f4bc2e929d..d4933af33e8aa 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
@@ -25,11 +25,11 @@ class FrozenParameterBag extends ParameterBag
      * all keys are already lowercased.
      *
      * This is always the case when used internally.
-     *
-     * @param array $parameters An array of parameters
      */
-    public function __construct(array $parameters = [])
-    {
+    public function __construct(
+        array $parameters = [],
+        protected array $deprecatedParameters = [],
+    ) {
         $this->parameters = $parameters;
         $this->resolved = true;
     }
@@ -49,6 +49,11 @@ public function set(string $name, array|bool|string|int|float|\UnitEnum|null $va
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
+    public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.')
+    {
+        throw new LogicException('Impossible to call deprecate() on a frozen ParameterBag.');
+    }
+
     public function remove(string $name)
     {
         throw new LogicException('Impossible to call remove() on a frozen ParameterBag.');
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
index ece5c3f45cdde..97656011d3fbd 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
@@ -24,6 +24,7 @@ class ParameterBag implements ParameterBagInterface
 {
     protected $parameters = [];
     protected $resolved = false;
+    protected array $deprecatedParameters = [];
 
     public function __construct(array $parameters = [])
     {
@@ -47,6 +48,11 @@ public function all(): array
         return $this->parameters;
     }
 
+    public function allDeprecated(): array
+    {
+        return $this->deprecatedParameters;
+    }
+
     public function get(string $name): array|bool|string|int|float|\UnitEnum|null
     {
         if (!\array_key_exists($name, $this->parameters)) {
@@ -81,6 +87,10 @@ public function get(string $name): array|bool|string|int|float|\UnitEnum|null
             throw new ParameterNotFoundException($name, null, null, null, $alternatives, $nonNestedAlternative);
         }
 
+        if (isset($this->deprecatedParameters[$name])) {
+            trigger_deprecation(...$this->deprecatedParameters[$name]);
+        }
+
         return $this->parameters[$name];
     }
 
@@ -95,6 +105,20 @@ public function set(string $name, array|bool|string|int|float|\UnitEnum|null $va
         $this->parameters[$name] = $value;
     }
 
+    /**
+     * Deprecates a service container parameter.
+     *
+     * @throws ParameterNotFoundException if the parameter is not defined
+     */
+    public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.')
+    {
+        if (!\array_key_exists($name, $this->parameters)) {
+            throw new ParameterNotFoundException($name);
+        }
+
+        $this->deprecatedParameters[$name] = [$package, $version, $message, $name];
+    }
+
     public function has(string $name): bool
     {
         return \array_key_exists($name, $this->parameters);
@@ -102,7 +126,7 @@ public function has(string $name): bool
 
     public function remove(string $name)
     {
-        unset($this->parameters[$name]);
+        unset($this->parameters[$name], $this->deprecatedParameters[$name]);
     }
 
     public function resolve()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index bdac922327721..aa217b832177c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -31,9 +31,11 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\BadMethodCallException;
 use Symfony\Component\DependencyInjection\Exception\EnvNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
@@ -42,6 +44,7 @@
 use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
 use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
@@ -100,6 +103,109 @@ public function testDefinitions()
         }
     }
 
+    /**
+     * The test should be kept in the group as it always expects a deprecation.
+     *
+     * @group legacy
+     */
+    public function testDeprecateParameter()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setParameter('foo', 'bar');
+
+        $builder->deprecateParameter('foo', 'symfony/test', '6.3');
+
+        $this->expectDeprecation('Since symfony/test 6.3: The parameter "foo" is deprecated.');
+
+        $builder->getParameter('foo');
+    }
+
+    /**
+     * The test should be kept in the group as it always expects a deprecation.
+     *
+     * @group legacy
+     */
+    public function testParameterDeprecationIsTrgiggeredWhenCompiled()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setParameter('foo', '%bar%');
+        $builder->setParameter('bar', 'baz');
+
+        $builder->deprecateParameter('bar', 'symfony/test', '6.3');
+
+        $this->expectDeprecation('Since symfony/test 6.3: The parameter "bar" is deprecated.');
+
+        $builder->compile();
+    }
+
+    public function testDeprecateParameterThrowsWhenParameterIsUndefined()
+    {
+        $builder = new ContainerBuilder();
+
+        $this->expectException(ParameterNotFoundException::class);
+        $this->expectExceptionMessage('You have requested a non-existent parameter "foo".');
+
+        $builder->deprecateParameter('foo', 'symfony/test', '6.3');
+    }
+
+    public function testDeprecateParameterThrowsWhenParameterBagIsNotInternal()
+    {
+        $builder = new ContainerBuilder(new class() implements ParameterBagInterface {
+            public function clear()
+            {
+            }
+
+            public function add(array $parameters)
+            {
+            }
+
+            public function all(): array
+            {
+                return [];
+            }
+
+            public function get(string $name): array|bool|string|int|float|\UnitEnum|null
+            {
+                return null;
+            }
+
+            public function remove(string $name)
+            {
+            }
+
+            public function set(string $name, \UnitEnum|float|int|bool|array|string|null $value)
+            {
+            }
+
+            public function has(string $name): bool
+            {
+                return false;
+            }
+
+            public function resolve()
+            {
+            }
+
+            public function resolveValue(mixed $value)
+            {
+            }
+
+            public function escapeValue(mixed $value): mixed
+            {
+                return null;
+            }
+
+            public function unescapeValue(mixed $value): mixed
+            {
+                return null;
+            }
+        });
+
+        $this->expectException(BadMethodCallException::class);
+
+        $builder->deprecateParameter('foo', 'symfony/test', '6.3');
+    }
+
     public function testRegister()
     {
         $builder = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 1cb63b4a6be32..a11ec86e6d928 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -451,6 +451,41 @@ public function testDumpAutowireData()
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/services24.php', $dumper->dump());
     }
 
+    /**
+     * The test should be kept in the group as it always expects a deprecation.
+     *
+     * @group legacy
+     */
+    public function testDeprecatedParameters()
+    {
+        $container = include self::$fixturesPath.'/containers/container_deprecated_parameters.php';
+
+        $this->expectDeprecation('Since symfony/test 6.3: The parameter "foo_class" is deprecated.');
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_deprecated_parameters.php', $dumper->dump());
+    }
+
+    /**
+     * The test should be kept in the group as it always expects a deprecation.
+     *
+     * @group legacy
+     */
+    public function testDeprecatedParametersAsFiles()
+    {
+        $container = include self::$fixturesPath.'/containers/container_deprecated_parameters.php';
+
+        $this->expectDeprecation('Since symfony/test 6.3: The parameter "foo_class" is deprecated.');
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'inline_factories_parameter' => false, 'inline_class_loader_parameter' => false]), true);
+
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/php/services_deprecated_parameters_as_files.txt', $dump);
+    }
+
     public function testEnvInId()
     {
         $container = include self::$fixturesPath.'/containers/container_env_in_id.php';
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_deprecated_parameters.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_deprecated_parameters.php
new file mode 100644
index 0000000000000..96b0f74c59759
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container_deprecated_parameters.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+$container = new ContainerBuilder();
+$container->setParameter('foo_class', 'FooClass\\Foo');
+$container->deprecateParameter('foo_class', 'symfony/test', '6.3');
+$container->register('foo', '%foo_class%')
+    ->setPublic(true)
+;
+
+return $container;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
index b7c31e8137aa4..5cbb72f802159 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
@@ -59,17 +59,13 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
  */
 class ProjectServiceContainer extends Container
 {
-    protected $containerDir;
     protected $targetDir;
     protected $parameters = [];
-    private $buildParameters;
     protected readonly \WeakReference $ref;
 
-    public function __construct(array $buildParameters = [], $containerDir = __DIR__)
+    public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
     {
         $this->ref = \WeakReference::create($this);
-        $this->buildParameters = $buildParameters;
-        $this->containerDir = $containerDir;
         $this->targetDir = \dirname($containerDir);
         $this->services = $this->privates = [];
         $this->methodMap = [
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index 1321a66ec1bce..461787826da66 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -563,17 +563,13 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
  */
 class ProjectServiceContainer extends Container
 {
-    protected $containerDir;
     protected $targetDir;
     protected $parameters = [];
-    private $buildParameters;
     protected readonly \WeakReference $ref;
 
-    public function __construct(array $buildParameters = [], $containerDir = __DIR__)
+    public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
     {
         $this->ref = \WeakReference::create($this);
-        $this->buildParameters = $buildParameters;
-        $this->containerDir = $containerDir;
         $this->targetDir = \dirname($containerDir);
         $this->parameters = $this->getDefaultParameters();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
index 920e4036507a4..b561ff647f05c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
@@ -36,17 +36,13 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
  */
 class ProjectServiceContainer extends Container
 {
-    protected $containerDir;
     protected $targetDir;
     protected $parameters = [];
-    private $buildParameters;
     protected readonly \WeakReference $ref;
 
-    public function __construct(array $buildParameters = [], $containerDir = __DIR__)
+    public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
     {
         $this->ref = \WeakReference::create($this);
-        $this->buildParameters = $buildParameters;
-        $this->containerDir = $containerDir;
         $this->targetDir = \dirname($containerDir);
         $this->parameters = $this->getDefaultParameters();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
index 4944c13961691..965dc91661cce 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -31,17 +31,13 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
  */
 class ProjectServiceContainer extends Container
 {
-    protected $containerDir;
     protected $targetDir;
     protected $parameters = [];
-    private $buildParameters;
     protected readonly \WeakReference $ref;
 
-    public function __construct(array $buildParameters = [], $containerDir = __DIR__)
+    public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
     {
         $this->ref = \WeakReference::create($this);
-        $this->buildParameters = $buildParameters;
-        $this->containerDir = $containerDir;
         $this->targetDir = \dirname($containerDir);
         $this->parameters = $this->getDefaultParameters();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters.php
new file mode 100644
index 0000000000000..2ed3522f6f578
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters.php
@@ -0,0 +1,110 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class ProjectServiceContainer extends Container
+{
+    private const DEPRECATED_PARAMETERS = [
+        'foo_class' => ['symfony/test', '6.3', 'The parameter "%s" is deprecated.', 'foo_class'],
+    ];
+
+    protected $parameters = [];
+    protected readonly \WeakReference $ref;
+
+    public function __construct()
+    {
+        $this->ref = \WeakReference::create($this);
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = $this->privates = [];
+        $this->methodMap = [
+            'foo' => 'getFooService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function compile(): void
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Gets the public 'foo' shared service.
+     *
+     * @return \FooClass\Foo
+     */
+    protected static function getFooService($container)
+    {
+        return $container->services['foo'] = new \FooClass\Foo();
+    }
+
+    public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
+    {
+        if (isset(self::DEPRECATED_PARAMETERS[$name])) {
+            trigger_deprecation(...self::DEPRECATED_PARAMETERS[$name]);
+        }
+
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
+            throw new ParameterNotFoundException($name);
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter(string $name): bool
+    {
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter(string $name, $value): void
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag(): ParameterBagInterface
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters, self::DEPRECATED_PARAMETERS);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [];
+    private $dynamicParameters = [];
+
+    private function getDynamicParameter(string $name)
+    {
+        throw new ParameterNotFoundException($name);
+    }
+
+    protected function getDefaultParameters(): array
+    {
+        return [
+            'foo_class' => 'FooClass\\Foo',
+        ];
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt
new file mode 100644
index 0000000000000..7d2af40ebda4d
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt
@@ -0,0 +1,202 @@
+Array
+(
+    [Container%s/getFooService.php] => <?php
+
+namespace Container%s;
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class getFooService extends ProjectServiceContainer
+{
+    /**
+     * Gets the public 'foo' shared service.
+     *
+     * @return \FooClass\Foo
+     */
+    public static function do($container, $lazyLoad = true)
+    {
+        return $container->services['foo'] = new \FooClass\Foo();
+    }
+}
+
+    [Container%s/ProjectServiceContainer.php] => <?php
+
+namespace Container%s;
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class ProjectServiceContainer extends Container
+{
+    private const DEPRECATED_PARAMETERS = [
+        'foo_class' => ['symfony/test', '6.3', 'The parameter "%s" is deprecated.', 'foo_class'],
+    ];
+
+    protected $targetDir;
+    protected $parameters = [];
+    protected readonly \WeakReference $ref;
+
+    public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
+    {
+        $this->ref = \WeakReference::create($this);
+        $this->targetDir = \dirname($containerDir);
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services = $this->privates = [];
+        $this->fileMap = [
+            'foo' => 'getFooService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function compile(): void
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled(): bool
+    {
+        return true;
+    }
+
+    protected function load($file, $lazyLoad = true)
+    {
+        if (class_exists($class = __NAMESPACE__.'\\'.$file, false)) {
+            return $class::do($this, $lazyLoad);
+        }
+
+        if ('.' === $file[-4]) {
+            $class = substr($class, 0, -4);
+        } else {
+            $file .= '.php';
+        }
+
+        $service = require $this->containerDir.\DIRECTORY_SEPARATOR.$file;
+
+        return class_exists($class, false) ? $class::do($this, $lazyLoad) : $service;
+    }
+
+    public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
+    {
+        if (isset(self::DEPRECATED_PARAMETERS[$name])) {
+            trigger_deprecation(...self::DEPRECATED_PARAMETERS[$name]);
+        }
+
+        if (isset($this->buildParameters[$name])) {
+            return $this->buildParameters[$name];
+        }
+
+        if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
+            throw new ParameterNotFoundException($name);
+        }
+        if (isset($this->loadedDynamicParameters[$name])) {
+            return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function hasParameter(string $name): bool
+    {
+        if (isset($this->buildParameters[$name])) {
+            return true;
+        }
+
+        return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter(string $name, $value): void
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    public function getParameterBag(): ParameterBagInterface
+    {
+        if (null === $this->parameterBag) {
+            $parameters = $this->parameters;
+            foreach ($this->loadedDynamicParameters as $name => $loaded) {
+                $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
+            }
+            foreach ($this->buildParameters as $name => $value) {
+                $parameters[$name] = $value;
+            }
+            $this->parameterBag = new FrozenParameterBag($parameters, self::DEPRECATED_PARAMETERS);
+        }
+
+        return $this->parameterBag;
+    }
+
+    private $loadedDynamicParameters = [];
+    private $dynamicParameters = [];
+
+    private function getDynamicParameter(string $name)
+    {
+        throw new ParameterNotFoundException($name);
+    }
+
+    protected function getDefaultParameters(): array
+    {
+        return [
+            'foo_class' => 'FooClass\\Foo',
+        ];
+    }
+}
+
+    [ProjectServiceContainer.preload.php] => <?php
+
+// This file has been auto-generated by the Symfony Dependency Injection Component
+// You can reference it in the "opcache.preload" php.ini setting on PHP >= 7.4 when preloading is desired
+
+use Symfony\Component\DependencyInjection\Dumper\Preloader;
+
+if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
+    return;
+}
+
+require dirname(__DIR__, %d)%svendor/autoload.php';
+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
+require __DIR__.'/Container%s/getFooService.php';
+
+$classes = [];
+$classes[] = 'FooClass\Foo';
+$classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
+
+$preloaded = Preloader::preload($classes);
+
+    [ProjectServiceContainer.php] => <?php
+
+// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
+
+if (\class_exists(\Container%s\ProjectServiceContainer::class, false)) {
+    // no-op
+} elseif (!include __DIR__.'/Container%s/ProjectServiceContainer.php') {
+    touch(__DIR__.'/Container%s.legacy');
+
+    return;
+}
+
+if (!\class_exists(ProjectServiceContainer::class, false)) {
+    \class_alias(\Container%s\ProjectServiceContainer::class, ProjectServiceContainer::class, false);
+}
+
+return new \Container%s\ProjectServiceContainer([
+    'container.build_hash' => '%s',
+    'container.build_id' => '%s',
+    'container.build_time' => %d,
+], __DIR__.\DIRECTORY_SEPARATOR.'Container%s');
+
+)
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
index 0594c76789555..f7436c455e450 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
@@ -77,17 +77,13 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
  */
 class ProjectServiceContainer extends Container
 {
-    protected $containerDir;
     protected $targetDir;
     protected $parameters = [];
-    private $buildParameters;
     protected readonly \WeakReference $ref;
 
-    public function __construct(array $buildParameters = [], $containerDir = __DIR__)
+    public function __construct(private array $buildParameters = [], protected string $containerDir = __DIR__)
     {
         $this->ref = \WeakReference::create($this);
-        $this->buildParameters = $buildParameters;
-        $this->containerDir = $containerDir;
         $this->targetDir = \dirname($containerDir);
         $this->services = $this->privates = [];
         $this->fileMap = [
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/FrozenParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/FrozenParameterBagTest.php
index 40630364d8d3c..792a9c2455cef 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/FrozenParameterBagTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/FrozenParameterBagTest.php
@@ -12,10 +12,13 @@
 namespace Symfony\Component\DependencyInjection\Tests\ParameterBag;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 class FrozenParameterBagTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     public function testConstructor()
     {
         $parameters = [
@@ -53,4 +56,28 @@ public function testRemove()
         $bag = new FrozenParameterBag(['foo' => 'bar']);
         $bag->remove('foo');
     }
+
+    public function testDeprecate()
+    {
+        $this->expectException(\LogicException::class);
+        $bag = new FrozenParameterBag(['foo' => 'bar']);
+        $bag->deprecate('foo', 'symfony/test', '6.3');
+    }
+
+    /**
+     * The test should be kept in the group as it always expects a deprecation.
+     *
+     * @group legacy
+     */
+    public function testGetDeprecated()
+    {
+        $bag = new FrozenParameterBag(
+            ['foo' => 'bar'],
+            ['foo' => ['symfony/test', '6.3', 'The parameter "%s" is deprecated.', 'foo']]
+        );
+
+        $this->expectDeprecation('Since symfony/test 6.3: The parameter "foo" is deprecated.');
+
+        $bag->get('foo');
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php
index e97ec063e52a8..201c557025e18 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\ParameterBag;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException;
 use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
@@ -19,6 +20,8 @@
 
 class ParameterBagTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     public function testConstructor()
     {
         $bag = new ParameterBag($parameters = [
@@ -48,6 +51,18 @@ public function testRemove()
         $this->assertEquals(['bar' => 'bar'], $bag->all(), '->remove() removes a parameter');
     }
 
+    public function testRemoveWithDeprecation()
+    {
+        $bag = new ParameterBag([
+            'foo' => 'foo',
+            'bar' => 'bar',
+        ]);
+        $bag->deprecate('foo', 'symfony/test', '6.3');
+        $bag->remove('foo');
+        $this->assertEquals(['bar' => 'bar'], $bag->all(), '->remove() removes a parameter');
+        $this->assertEquals([], $bag->allDeprecated());
+    }
+
     public function testGetSet()
     {
         $bag = new ParameterBag(['foo' => 'bar']);
@@ -125,6 +140,64 @@ public function provideGetThrowParameterNotFoundExceptionData()
         ];
     }
 
+    /**
+     * The test should be kept in the group as it always expects a deprecation.
+     *
+     * @group legacy
+     */
+    public function testDeprecate()
+    {
+        $bag = new ParameterBag(['foo' => 'bar']);
+
+        $bag->deprecate('foo', 'symfony/test', '6.3');
+
+        $this->expectDeprecation('Since symfony/test 6.3: The parameter "foo" is deprecated.');
+
+        $bag->get('foo');
+    }
+
+    /**
+     * The test should be kept in the group as it always expects a deprecation.
+     *
+     * @group legacy
+     */
+    public function testDeprecateWithMessage()
+    {
+        $bag = new ParameterBag(['foo' => 'bar']);
+
+        $bag->deprecate('foo', 'symfony/test', '6.3', 'The parameter "%s" is deprecated, use "new_foo" instead.');
+
+        $this->expectDeprecation('Since symfony/test 6.3: The parameter "foo" is deprecated, use "new_foo" instead.');
+
+        $bag->get('foo');
+    }
+
+    /**
+     * The test should be kept in the group as it always expects a deprecation.
+     *
+     * @group legacy
+     */
+    public function testDeprecationIsTriggeredWhenResolved()
+    {
+        $bag = new ParameterBag(['foo' => '%bar%', 'bar' => 'baz']);
+
+        $bag->deprecate('bar', 'symfony/test', '6.3');
+
+        $this->expectDeprecation('Since symfony/test 6.3: The parameter "bar" is deprecated.');
+
+        $bag->resolve();
+    }
+
+    public function testDeprecateThrowsWhenParameterIsUndefined()
+    {
+        $bag = new ParameterBag();
+
+        $this->expectException(ParameterNotFoundException::class);
+        $this->expectExceptionMessage('You have requested a non-existent parameter "foo".');
+
+        $bag->deprecate('foo', 'symfony/test', '6.3');
+    }
+
     public function testHas()
     {
         $bag = new ParameterBag(['foo' => 'bar']);

From 30cb03f6532bfceab7d858fca0f3e13542fd27ad Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 10 Jan 2023 11:12:25 +0100
Subject: [PATCH 123/475] [FrameworkBundle] Allow setting private services with
 the test container

---
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  1 +
 .../TestServiceContainerRealRefPass.php       | 10 ++++++
 .../TestServiceContainerWeakRefPass.php       |  6 ++--
 .../FrameworkBundle/Test/TestContainer.php    | 36 +++++++++++--------
 .../Tests/Functional/KernelTestCaseTest.php   | 17 +++++++++
 5 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 0fc2874be042b..3179f5ab526c1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
  * Add support to pass namespace wildcard in `framework.messenger.routing`
  * Deprecate `framework:exceptions` tag, unwrap it and replace `framework:exception` tags' `name` attribute by `class`
  * Deprecate the `notifier.logger_notification_listener` service, use the `notifier.notification_logger_listener` service instead
+ * Allow setting private services with the test container
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
index 942eb635b26f3..8d54563c2c7d0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
@@ -30,10 +30,14 @@ public function process(ContainerBuilder $container)
         $privateContainer = $container->getDefinition('test.private_services_locator');
         $definitions = $container->getDefinitions();
         $privateServices = $privateContainer->getArgument(0);
+        $renamedIds = [];
 
         foreach ($privateServices as $id => $argument) {
             if (isset($definitions[$target = (string) $argument->getValues()[0]])) {
                 $argument->setValues([new Reference($target)]);
+                if ($id !== $target) {
+                    $renamedIds[$id] = $target;
+                }
             } else {
                 unset($privateServices[$id]);
             }
@@ -47,8 +51,14 @@ public function process(ContainerBuilder $container)
             if ($definitions[$target]->hasTag('container.private')) {
                 $privateServices[$id] = new ServiceClosureArgument(new Reference($target));
             }
+
+            $renamedIds[$id] = $target;
         }
 
         $privateContainer->replaceArgument(0, $privateServices);
+
+        if ($container->hasDefinition('test.service_container') && $renamedIds) {
+            $container->getDefinition('test.service_container')->setArgument(2, $renamedIds);
+        }
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
index a68f94f7b6134..45166842b5e0d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
@@ -14,7 +14,6 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -30,10 +29,9 @@ public function process(ContainerBuilder $container)
 
         $privateServices = [];
         $definitions = $container->getDefinitions();
-        $hasErrors = method_exists(Definition::class, 'hasErrors') ? 'hasErrors' : 'getErrors';
 
         foreach ($definitions as $id => $definition) {
-            if ($id && '.' !== $id[0] && (!$definition->isPublic() || $definition->isPrivate() || $definition->hasTag('container.private')) && !$definition->$hasErrors() && !$definition->isAbstract()) {
+            if ($id && '.' !== $id[0] && (!$definition->isPublic() || $definition->isPrivate() || $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {
                 $privateServices[$id] = new Reference($id, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);
             }
         }
@@ -45,7 +43,7 @@ public function process(ContainerBuilder $container)
                 while (isset($aliases[$target = (string) $alias])) {
                     $alias = $aliases[$target];
                 }
-                if (isset($definitions[$target]) && !$definitions[$target]->$hasErrors() && !$definitions[$target]->isAbstract()) {
+                if (isset($definitions[$target]) && !$definitions[$target]->hasErrors() && !$definitions[$target]->isAbstract()) {
                     $privateServices[$id] = new Reference($target, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);
                 }
             }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php b/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php
index 883928087ea03..933fb6de47a83 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php
@@ -13,12 +13,13 @@
 
 use Psr\Container\ContainerInterface;
 use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
  * A special container used in tests. This gives access to both public and
- * private services. The container will not include private services that has
+ * private services. The container will not include private services that have
  * been inlined or removed. Private services will be removed when they are not
  * used by other services.
  *
@@ -28,13 +29,11 @@
  */
 class TestContainer extends Container
 {
-    private KernelInterface $kernel;
-    private string $privateServicesLocatorId;
-
-    public function __construct(KernelInterface $kernel, string $privateServicesLocatorId)
-    {
-        $this->kernel = $kernel;
-        $this->privateServicesLocatorId = $privateServicesLocatorId;
+    public function __construct(
+        private KernelInterface $kernel,
+        private string $privateServicesLocatorId,
+        private array $renamedIds = [],
+    ) {
     }
 
     public function compile()
@@ -69,7 +68,20 @@ public function setParameter(string $name, mixed $value)
 
     public function set(string $id, mixed $service)
     {
-        $this->getPublicContainer()->set($id, $service);
+        $container = $this->getPublicContainer();
+        $renamedId = $this->renamedIds[$id] ?? $id;
+
+        try {
+            $container->set($renamedId, $service);
+        } catch (InvalidArgumentException $e) {
+            if (!str_starts_with($e->getMessage(), "The \"$renamedId\" service is private")) {
+                throw $e;
+            }
+            if (isset($container->privates[$renamedId])) {
+                throw new InvalidArgumentException(sprintf('The "%s" service is already initialized, you cannot replace it.', $id));
+            }
+            $container->privates[$renamedId] = $service;
+        }
     }
 
     public function has(string $id): bool
@@ -104,11 +116,7 @@ public function getRemovedIds(): array
 
     private function getPublicContainer(): Container
     {
-        if (null === $container = $this->kernel->getContainer()) {
-            throw new \LogicException('Cannot access the container on a non-booted kernel. Did you forget to boot it?');
-        }
-
-        return $container;
+        return $this->kernel->getContainer() ?? throw new \LogicException('Cannot access the container on a non-booted kernel. Did you forget to boot it?');
     }
 
     private function getPrivateContainer(): ContainerInterface
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/KernelTestCaseTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/KernelTestCaseTest.php
index 32bee3b587309..aa12467829ed1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/KernelTestCaseTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/KernelTestCaseTest.php
@@ -17,6 +17,7 @@
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\PublicService;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\UnusedPrivateService;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
 class KernelTestCaseTest extends AbstractWebTestCase
 {
@@ -41,4 +42,20 @@ public function testThatPrivateServicesAreAvailableIfTestConfigIsEnabled()
         $this->assertTrue($container->has('private_service'));
         $this->assertFalse($container->has(UnusedPrivateService::class));
     }
+
+    public function testThatPrivateServicesCanBeSetIfTestConfigIsEnabled()
+    {
+        static::bootKernel(['test_case' => 'TestServiceContainer']);
+
+        $container = static::getContainer();
+
+        $service = new \stdClass();
+
+        $container->set('private_service', $service);
+        $this->assertSame($service, $container->get('private_service'));
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The "private_service" service is already initialized, you cannot replace it.');
+        $container->set('private_service', new \stdClass());
+    }
 }

From 6d905904d77ae1fe363464a940436d8cba65b1eb Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 10 Jan 2023 17:01:36 +0100
Subject: [PATCH 124/475] [HttpKernel] check preload items returned by cache
 warmers

---
 .../CacheWarmer/CacheWarmerAggregate.php      |  9 +++-
 src/Symfony/Component/HttpKernel/Kernel.php   |  2 +-
 .../CacheWarmer/CacheWarmerAggregateTest.php  | 53 +++++++++++++------
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/Symfony/Compo
10000
nent/HttpKernel/CacheWarmer/CacheWarmerAggregate.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
index af0a2d13d1a26..c4d5375f521b7 100644
--- a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
+++ b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
@@ -93,7 +93,12 @@ public function warmUp(string $cacheDir): array
                     continue;
                 }
 
-                $preload[] = array_values((array) $warmer->warmUp($cacheDir));
+                foreach ((array) $warmer->warmUp($cacheDir) as $item) {
+                    if (is_dir($item) || (str_starts_with($item, \dirname($cacheDir)) && !is_file($item))) {
+                        throw new \LogicException(sprintf('"%s::warmUp()" should return a list of files or classes but "%s" is none of them.', $warmer::class, $item));
+                    }
+                    $preload[] = $item;
+                }
             }
         } finally {
             if ($collectDeprecations) {
@@ -110,7 +115,7 @@ public function warmUp(string $cacheDir): array
             }
         }
 
-        return array_values(array_unique(array_merge([], ...$preload)));
+        return array_values(array_unique($preload));
     }
 
     public function isOptional(): bool
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 3ee733f54fd67..ef3a92baf8a64 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -527,7 +527,7 @@ protected function initializeContainer()
             $preload = array_merge($preload, (array) $this->container->get('cache_warmer')->warmUp($this->container->getParameter('kernel.cache_dir')));
         }
 
-        if ($preload && method_exists(Preloader::class, 'append') && file_exists($preloadFile = $buildDir.'/'.$class.'.preload.php')) {
+        if ($preload && file_exists($preloadFile = $buildDir.'/'.$class.'.preload.php')) {
             Preloader::append($preloadFile, $preload);
         }
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
index c34cc9c400c35..563486db15664 100644
--- a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
@@ -17,18 +17,6 @@
 
 class CacheWarmerAggregateTest extends TestCase
 {
-    protected static $cacheDir;
-
-    public static function setUpBeforeClass(): void
-    {
-        self::$cacheDir = tempnam(sys_get_temp_dir(), 'sf_cache_warmer_dir');
-    }
-
-    public static function tearDownAfterClass(): void
-    {
-        @unlink(self::$cacheDir);
-    }
-
     public function testInjectWarmersUsingConstructor()
     {
         $warmer = $this->createMock(CacheWarmerInterface::class);
@@ -36,7 +24,7 @@ public function testInjectWarmersUsingConstructor()
             ->expects($this->once())
             ->method('warmUp');
         $aggregate = new CacheWarmerAggregate([$warmer]);
-        $aggregate->warmUp(self::$cacheDir);
+        $aggregate->warmUp(__DIR__);
     }
 
     public function testWarmupDoesCallWarmupOnOptionalWarmersWhenEnableOptionalWarmersIsEnabled()
@@ -51,7 +39,7 @@ public function testWarmupDoesCallWarmupOnOptionalWarmersWhenEnableOptionalWarme
 
         $aggregate = new CacheWarmerAggregate([$warmer]);
         $aggregate->enableOptionalWarmers();
-        $aggregate->warmUp(self::$cacheDir);
+        $aggregate->warmUp(__DIR__);
     }
 
     public function testWarmupDoesNotCallWarmupOnOptionalWarmersWhenEnableOptionalWarmersIsNotEnabled()
@@ -66,6 +54,41 @@ public function testWarmupDoesNotCallWarmupOnOptionalWarmersWhenEnableOptionalWa
             ->method('warmUp');
 
         $aggregate = new CacheWarmerAggregate([$warmer]);
-        $aggregate->warmUp(self::$cacheDir);
+        $aggregate->warmUp(__DIR__);
+    }
+
+    public function testWarmupReturnsFilesOrClasses()
+    {
+        $warmer = $this->createMock(CacheWarmerInterface::class);
+        $warmer
+            ->expects($this->never())
+            ->method('isOptional');
+        $warmer
+            ->expects($this->once())
+            ->method('warmUp')
+            ->willReturn([__CLASS__, __FILE__]);
+
+        $aggregate = new CacheWarmerAggregate([$warmer]);
+        $aggregate->enableOptionalWarmers();
+
+        $this->assertSame([__CLASS__, __FILE__], $aggregate->warmUp(__DIR__));
+    }
+
+    public function testWarmupChecksInvalidFiles()
+    {
+        $warmer = $this->createMock(CacheWarmerInterface::class);
+        $warmer
+            ->expects($this->never())
+            ->method('isOptional');
+        $warmer
+            ->expects($this->once())
+            ->method('warmUp')
+            ->willReturn([self::class, __DIR__]);
+
+        $aggregate = new CacheWarmerAggregate([$warmer]);
+        $aggregate->enableOptionalWarmers();
+
+        $this->expectException(\LogicException::class);
+        $aggregate->warmUp(__DIR__);
     }
 }

From 9af8ccfc03eae20ecac4c8ccc9deae7912c41aaf Mon Sep 17 00:00:00 2001
From: "Phil E. Taylor" <phil@phil-taylor.com>
Date: Thu, 12 Jan 2023 10:30:38 +0000
Subject: [PATCH 125/475] [Messenger] Allow password in redis dsn when using
 sockets

---
 .../Redis/Tests/Transport/ConnectionTest.php  | 61 +++++++++++++++++++
 .../Bridge/Redis/Transport/Connection.php     | 27 ++++++--
 2 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php
index 12635ad14b590..07bc9039431be 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php
@@ -407,4 +407,65 @@ public function testInvalidSentinelMasterName()
 
         Connection::fromDsn(sprintf('%s/messenger-clearlasterror', $master), ['delete_after_ack' => true, 'sentinel_master' => $uid], null);
     }
+
+    public function testFromDsnOnUnixSocketWithUserAndPassword()
+    {
+        $redis = $this->createMock(\Redis::class);
+
+        $redis->expects($this->exactly(1))->method('auth')
+            ->with(['user', 'password'])
+            ->willReturn(true);
+
+        $this->assertEquals(
+            new Connection([
+                'stream' => 'queue',
+                'delete_after_ack' => true,
+                'host' => '/var/run/redis/redis.sock',
+                'port' => 0,
+                'user' => 'user',
+                'pass' => 'password',
+            ], $redis),
+            Connection::fromDsn('redis://user:password@/var/run/redis/redis.sock', ['stream' => 'queue', 'delete_after_ack' => true], $redis)
+        );
+    }
+
+    public function testFromDsnOnUnixSocketWithPassword()
+    {
+        $redis = $this->createMock(\Redis::class);
+
+        $redis->expects($this->exactly(1))->method('auth')
+            ->with('password')
+            ->willReturn(true);
+
+        $this->assertEquals(
+            new Connection([
+                'stream' => 'queue',
+                'delete_after_ack' => true,
+                'host' => '/var/run/redis/redis.sock',
+                'port' => 0,
+                'pass' => 'password',
+            ], $redis),
+            Connection::fromDsn('redis://password@/var/run/redis/redis.sock', ['stream' => 'queue', 'delete_after_ack' => true], $redis)
+        );
+    }
+
+    public function testFromDsnOnUnixSocketWithUser()
+    {
+        $redis = $this->createMock(\Redis::class);
+
+        $redis->expects($this->exactly(1))->method('auth')
+            ->with('user')
+            ->willReturn(true);
+
+        $this->assertEquals(
+            new Connection([
+                'stream' => 'queue',
+                'delete_after_ack' => true,
+                'host' => '/var/run/redis/redis.sock',
+                'port' => 0,
+                'user' => 'user',
+            ], $redis),
+            Connection::fromDsn('redis://user:@/var/run/redis/redis.sock', ['stream' => 'queue', 'delete_after_ack' => true], $redis)
+        );
+    }
 }
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
index 6c9a8fa6e5c2f..9e21dfaecc6b5 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -23,6 +23,7 @@
  * @author Robin Chalas <robin.chalas@gmail.com>
  *
  * @internal
+ *
  * @final
  */
 class Connection
@@ -203,13 +204,13 @@ public static function fromDsn(string $dsn, array $options = [], \Redis|\RedisCl
             };
         }
 
+        $pass = '' !== ($parsedUrl['pass'] ?? '') ? urldecode($parsedUrl['pass']) : null;
+        $user = '' !== ($parsedUrl['user'] ?? '') ? urldecode($parsedUrl['user']) : null;
+        $options['auth'] ??= null !== $pass && null !== $user ? [$user, $pass] : ($pass ?? $user);
+
         if (isset($parsedUrl['host'])) {
-            $pass = '' !== ($parsedUrl['pass'] ?? '') ? urldecode($parsedUrl['pass']) : null;
-            $user = '' !== ($parsedUrl['user'] ?? '') ? urldecode($parsedUrl['user']) : null;
             $options['host'] = $parsedUrl['host'] ?? $options['host'];
             $options['port'] = $parsedUrl['port'] ?? $options['port'];
-            // See: https://github.com/phpredis/phpredis/#auth
-            $options['auth'] ??= null !== $pass && null !== $user ? [$user, $pass] : ($pass ?? $user);
 
             $pathParts = explode('/', rtrim($parsedUrl['path'] ?? '', '/'));
             $options['stream'] = $pathParts[1] ?? $options['stream'];
@@ -232,9 +233,27 @@ private static function parseDsn(string $dsn, array &$options): array
             $url = str_replace($scheme.':', 'file:', $dsn);
         }
 
+        $url = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:(?<user>[^:@]*+):)?(?<password>[^@]*+)@)?#', function ($m) use (&$auth) {
+            if (isset($m['password'])) {
+                if (!\in_array($m['user'], ['', 'default'], true)) {
+                    $auth['user'] = $m['user'];
+                }
+
+                $auth['pass'] = $m['password'];
+            }
+
+            return 'file:'.($m[1] ?? '');
+        }, $url);
+
         if (false === $parsedUrl = parse_url($url)) {
             throw new InvalidArgumentException(sprintf('The given Redis DSN "%s" is invalid.', $dsn));
         }
+
+        if (null !== $auth) {
+            unset($parsedUrl['user']); // parse_url thinks //0@localhost/ is a username of "0"! doh!
+            $parsedUrl += ($auth ?? []); // But don't worry as $auth array will have user, user/pass or pass as needed
+        }
+
         if (isset($parsedUrl['query'])) {
             parse_str($parsedUrl['query'], $dsnOptions);
             $options = array_merge($options, $dsnOptions);

From f5802d3a2adb6eddf100cc63c016a2f76f68f49c Mon Sep 17 00:00:00 2001
From: tigitz <philippe.segatori@gmail.com>
Date: Sun, 1 Jan 2023 19:45:34 +0100
Subject: [PATCH 126/475] Leverage arrow function syntax for closure

---
 .../Form/ChoiceList/ORMQueryBuilderLoader.php |   8 +-
 .../Doctrine/Form/Type/DoctrineType.php       |  16 +-
 .../PropertyInfo/DoctrineExtractor.php        |   4 +-
 .../DoctrineExtensionTest.php                 |   4 +-
 .../ChoiceList/DoctrineChoiceLoaderTest.php   |   4 +-
 .../Tests/Form/Type/EntityTypeTest.php        |  36 ++---
 .../PdoSessionHandlerSchemaSubscriberTest.php |   2 +-
 .../Tests/Handler/MailerHandlerTest.php       |  12 +-
 .../Instantiator/RuntimeInstantiatorTest.php  |   4 +-
 .../Bridge/Twig/Command/DebugCommand.php      |   6 +-
 .../Bridge/Twig/Extension/CodeExtension.php   |   8 +-
 .../Twig/Tests/Command/LintCommandTest.php    |   4 +-
 .../AbstractBootstrap3LayoutTest.php          |   8 +-
 .../AbstractBootstrap4LayoutTest.php          |   8 +-
 .../Twig/Tests/Mime/BodyRendererTest.php      |   4 +-
 .../Bridge/Twig/UndefinedCallableHandler.php  |   2 +-
 .../AbstractPhpFileCacheWarmer.php            |   2 +-
 .../CacheWarmer/AnnotationsCacheWarmer.php    |   2 +-
 .../CacheWarmer/ValidatorCacheWarmer.php      |   2 +-
 .../Command/AbstractConfigCommand.php         |   4 +-
 .../Command/CachePoolListCommand.php          |   4 +-
 .../Command/DebugAutowiringCommand.php        |   4 +-
 .../Command/RouterDebugCommand.php            |   4 +-
 .../Command/SecretsListCommand.php            |   4 +-
 .../Command/TranslationUpdateCommand.php      |   8 +-
 .../Command/XliffLintCommand.php              |   4 +-
 .../Command/YamlLintCommand.php               |   4 +-
 .../Console/Descriptor/Descriptor.php         |  16 +-
 .../Console/Descriptor/JsonDescriptor.php     |   2 +-
 .../Console/Descriptor/MarkdownDescriptor.php |   2 +-
 .../Console/Descriptor/TextDescriptor.php     |   6 +-
 .../Console/Descriptor/XmlDescriptor.php      |   2 +-
 .../DependencyInjection/Configuration.php     |  64 ++++----
 .../FrameworkExtension.php                    |  16 +-
 .../Kernel/MicroKernelTrait.php               |   6 +-
 .../Bundle/FrameworkBundle/KernelBrowser.php  |   4 +-
 .../Tests/Command/CachePruneCommandTest.php   |   4 +-
 .../Tests/Command/RouterMatchCommandTest.php  |   4 +-
 .../Console/Descriptor/ObjectsProvider.php    |   4 +-
 .../Controller/AbstractControllerTest.php     |   4 +-
 .../Compiler/UnusedTagsPassTest.php           |   4 +-
 .../DependencyInjection/ConfigurationTest.php |  16 +-
 .../FrameworkExtensionTest.php                |   4 +-
 .../Tests/Routing/RouterTest.php              |   4 +-
 .../Command/DebugFirewallCommand.php          |   8 +-
 .../Compiler/SortFirewallListenersPass.php    |   4 +-
 .../DependencyInjection/MainConfiguration.php |  22 ++-
 .../Security/Factory/AccessTokenFactory.php   |   8 +-
 .../Factory/CustomAuthenticatorFactory.php    |   2 +-
 .../Security/Factory/RememberMeFactory.php    |   4 +-
 .../Security/UserProvider/InMemoryFactory.php |   2 +-
 .../Security/UserProvider/LdapFactory.php     |   2 +-
 .../DependencyInjection/SecurityExtension.php |  12 +-
 .../SecurityDataCollectorTest.php             |   2 +-
 ...erGlobalSecurityEventListenersPassTest.php |   6 +-
 .../CompleteConfigurationTest.php             |   2 +-
 .../AuthenticatorBundle/ApiAuthenticator.php  |   2 +-
 .../FirewallAwareLoginLinkHandlerTest.php     |   8 +-
 .../DependencyInjection/Configuration.php     |  14 +-
 .../Configurator/EnvironmentConfigurator.php  |   4 +-
 .../Csp/ContentSecurityPolicyHandler.php      |   4 +-
 .../Controller/ProfilerControllerTest.php     |   4 +-
 .../Tests/Resources/IconTest.php              |   2 +-
 .../Cache/Tests/Adapter/AdapterTestCase.php   |   6 +-
 .../Tests/Adapter/DoctrineDbalAdapterTest.php |   4 +-
 .../Tests/Adapter/MemcachedAdapterTest.php    |   2 +-
 .../Cache/Tests/Adapter/PdoAdapterTest.php    |   4 +-
 .../Marshaller/DefaultMarshallerTest.php      |   4 +-
 .../EarlyExpirationDispatcherTest.php         |   2 +-
 .../Component/Cache/Traits/ContractsTrait.php |   4 +-
 .../Component/Cache/Traits/RedisTrait.php     |   2 +-
 .../Config/Builder/ConfigBuilderGenerator.php |   4 +-
 .../Definition/Dumper/XmlReferenceDumper.php  |   4 +-
 .../Config/Resource/GlobResource.php          |   4 +-
 .../Resource/ReflectionClassResource.php      |   2 +-
 .../Builder/ArrayNodeDefinitionTest.php       |   4 +-
 .../Definition/Builder/ExprBuilderTest.php    |   8 +-
 .../Tests/Definition/NormalizationTest.php    |  10 +-
 src/Symfony/Component/Console/Application.php |  10 +-
 .../Console/Command/CompleteCommand.php       |   2 +-
 .../Console/Command/DumpCompletionCommand.php |   4 +-
 .../Component/Console/Command/HelpCommand.php |   8 +-
 .../Component/Console/Command/ListCommand.php |   8 +-
 .../Console/Descriptor/MarkdownDescriptor.php |  12 +-
 .../Console/Descriptor/TextDescriptor.php     |   8 +-
 .../Component/Console/Helper/Dumper.php       |  14 +-
 .../Component/Console/Helper/ProgressBar.php  |  24 +--
 .../Console/Helper/ProgressIndicator.php      |  16 +-
 .../Console/Helper/QuestionHelper.php         |   8 +-
 .../Console/Helper/TableCellStyle.php         |   4 +-
 src/Symfony/Component/Console/Input/Input.php |   4 +-
 .../Component/Console/Question/Question.php   |   4 +-
 .../Component/Console/Style/SymfonyStyle.php  |   4 +-
 .../Console/Tests/ApplicationTest.php         |  18 +--
 .../ContainerCommandLoaderTest.php            |  12 +-
 .../FactoryCommandLoaderTest.php              |  12 +-
 .../Tests/Helper/ProcessHelperTest.php        |   2 +-
 .../Console/Tests/Helper/ProgressBarTest.php  |   8 +-
 .../Tests/Helper/QuestionHelperTest.php       |   4 +-
 .../Helper/SymfonyQuestionHelperTest.php      |   2 +-
 .../Console/Tests/Question/QuestionTest.php   |  14 +-
 .../CssSelector/Node/FunctionNode.php         |   4 +-
 .../Component/CssSelector/Parser/Parser.php   |   4 +-
 .../CssSelector/Tests/Parser/ParserTest.php   |   4 +-
 .../Argument/ServiceLocator.php               |   2 +-
 .../Compiler/AutowirePass.php                 |   4 +-
 .../Compiler/PriorityTaggedServiceTrait.php   |   2 +-
 .../ResolveInstanceofConditionalsPass.php     |   2 +-
 .../DependencyInjection/ContainerBuilder.php  |   8 +-
 .../DependencyInjection/Dumper/PhpDumper.php  |  12 +-
 .../ExpressionLanguageProvider.php            |  22 +--
 .../Extension/ExtensionTrait.php              |   2 +-
 .../Configurator/ContainerConfigurator.php    |   2 +-
 .../Loader/PhpFileLoader.php                  |   2 +-
 .../Loader/XmlFileLoader.php                  |   2 +-
 .../Loader/YamlFileLoader.php                 |   2 +-
 .../DependencyInjection/ReverseContainer.php  |   4 +-
 .../RemoveUnusedDefinitionsPassTest.php       |   4 +-
 .../ValidateEnvPlaceholdersPassTest.php       |  14 +-
 .../Tests/ContainerBuilderTest.php            |   4 +-
 .../Tests/EnvVarProcessorTest.php             |  44 ++---
 .../RealServiceInstantiatorTest.php           |   4 +-
 .../Tests/Loader/XmlFileLoaderTest.php        |   4 +-
 .../Tests/Loader/YamlFileLoaderTest.php       |   4 +-
 .../Tests/ServiceLocatorTest.php              |  14 +-
 .../DomCrawler/Tests/AbstractCrawlerTest.php  |   8 +-
 .../Component/Dotenv/Command/DebugCommand.php |  12 +-
 .../ClassNotFoundErrorEnhancer.php            |   2 +-
 .../Component/ErrorHandler/ErrorHandler.php   |   4 +-
 .../ErrorRenderer/HtmlErrorRenderer.php       |   8 +-
 .../Exception/FlattenException.php            |   4 +-
 .../Tests/DebugClassLoaderTest.php            |   8 +-
 .../SerializerErrorRendererTest.php           |   2 +-
 .../Tests/Exception/FlattenExceptionTest.php  |   4 +-
 .../RegisterListenersPass.php                 |   2 +-
 .../Tests/EventDispatcherTest.php             |   6 +-
 .../Tests/ImmutableEventDispatcherTest.php    |   4 +-
 .../ExpressionLanguage/ExpressionFunction.php |   8 +-
 .../Tests/Fixtures/TestProvider.php           |   6 +-
 .../Tests/Node/FunctionNodeTest.php           |   8 +-
 .../Component/Filesystem/Filesystem.php       |   8 +-
 src/Symfony/Component/Finder/Finder.php       |   4 +-
 src/Symfony/Component/Finder/Gitignore.php    |   4 +-
 .../Finder/Iterator/SortableIterator.php      |  38 ++---
 .../Iterator/VcsIgnoredFilterIterator.php     |   4 +-
 .../Component/Finder/Tests/FinderTest.php     |  12 +-
 .../Iterator/CustomFilterIteratorTest.php     |   4 +-
 .../Tests/Iterator/IteratorTestCase.php       |  10 +-
 .../Tests/Iterator/LazyIteratorTest.php       |   4 +-
 .../Tests/Iterator/MockFileListIterator.php   |   2 +-
 .../Tests/Iterator/SortableIteratorTest.php   |   2 +-
 .../Form/ChoiceList/ArrayChoiceList.php       |   4 +-
 .../Factory/DefaultChoiceListFactory.php      |  16 +-
 .../Factory/PropertyAccessDecorator.php       |  48 ++----
 .../Component/Form/Command/DebugCommand.php   |   4 +-
 .../Console/Descriptor/TextDescriptor.php     |   4 +-
 .../Form/Extension/Core/Type/CheckboxType.php |   8 +-
 .../Form/Extension/Core/Type/ChoiceType.php   |  16 +-
 .../Form/Extension/Core/Type/CountryType.php  |   4 +-
 .../Form/Extension/Core/Type/CurrencyType.php |   4 +-
 .../Extension/Core/Type/DateIntervalType.php  |  36 ++---
 .../Form/Extension/Core/Type/DateTimeType.php |  24 +--
 .../Form/Extension/Core/Type/DateType.php     |  24 +--
 .../Form/Extension/Core/Type/EnumType.php     |   8 +-
 .../Form/Extension/Core/Type/FileType.php     |   8 +-
 .../Form/Extension/Core/Type/FormType.php     |  22 +--
 .../Form/Extension/Core/Type/LocaleType.php   |   4 +-
 .../Form/Extension/Core/Type/TimeType.php     |  20 +--
 .../Form/Extension/Core/Type/TimezoneType.php |   8 +-
 .../Form/Extension/Core/Type/WeekType.php     |  16 +-
 .../DataCollector/FormDataCollector.php       |  22 ++-
 .../Type/FormTypeValidatorExtension.php       |   4 +-
 .../Type/RepeatedTypeValidatorExtension.php   |   4 +-
 .../Type/UploadValidatorExtension.php         |   6 +-
 .../Validator/ValidatorTypeGuesser.php        |  12 +-
 src/Symfony/Component/Form/Form.php           |   4 +-
 .../Component/Form/FormTypeGuesserChain.php   |  16 +-
 .../Form/Tests/AbstractDivLayoutTest.php      |   8 +-
 .../Form/Tests/CallbackTransformerTest.php    |   4 +-
 .../Tests/ChoiceList/ArrayChoiceListTest.php  |   8 +-
 .../Factory/Cache/ChoiceLoaderTest.php        |   4 +-
 .../Factory/CachingFactoryDecoratorTest.php   |  12 +-
 .../Factory/DefaultChoiceListFactoryTest.php  | 114 ++++---------
 .../Tests/ChoiceList/LazyChoiceListTest.php   |   8 +-
 .../Loader/CallbackChoiceLoaderTest.php       |   8 +-
 .../FilterChoiceLoaderDecoratorTest.php       |  20 +--
 .../Loader/IntlCallbackChoiceLoaderTest.php   |   8 +-
 .../Form/Tests/Command/DebugCommandTest.php   |  10 +-
 .../Component/Form/Tests/CompoundFormTest.php |   6 +-
 .../Descriptor/AbstractDescriptorTest.php     |   8 +-
 .../Core/DataMapper/DataMapperTest.php        |   4 +-
 .../EventListener/ResizeFormListenerTest.php  |   4 +-
 .../Extension/Core/Type/CheckboxTypeTest.php  |   8 +-
 .../Extension/Core/Type/ChoiceTypeTest.php    |  28 +---
 .../Core/Type/ChoiceTypeTranslationTest.php   |   4 +-
 .../Core/Type/CollectionTypeTest.php          |   8 +-
 .../Extension/Core/Type/DateTimeTypeTest.php  |   4 +-
 .../Extension/Core/Type/DateTypeTest.php      |   4 +-
 .../Extension/Core/Type/FormTypeTest.php      |  10 +-
 .../Extension/Core/Type/TimeTypeTest.php      |   4 +-
 .../DataCollector/FormDataCollectorTest.php   |   4 +-
 .../Constraints/FormValidatorTest.php         |  16 +-
 .../Type/UploadValidatorExtensionTest.php     |   6 +-
 .../ViolationMapper/ViolationMapperTest.php   |   2 +-
 .../Form/Tests/Fixtures/ArrayChoiceLoader.php |   4 +-
 .../Form/Tests/Fixtures/ChoiceSubType.php     |  10 +-
 .../Fixtures/LazyChoiceTypeExtension.php      |  10 +-
 .../Tests/Resources/TranslationFilesTest.php  |   2 +-
 .../Component/Form/Tests/SimpleFormTest.php   |   4 +-
 .../Component/HttpClient/CurlHttpClient.php   |  16 +-
 .../Component/HttpClient/HttpClientTrait.php  |  24 ++-
 .../HttpClient/Internal/AmpClientState.php    |   4 +-
 .../HttpClient/Internal/CurlClientState.php   |   4 +-
 .../Component/HttpClient/NativeHttpClient.php |  14 +-
 .../HttpClient/Response/AmpResponse.php       |   4 +-
 .../HttpClient/Response/HttplugPromise.php    |   4 +-
 .../HttpClient/Response/MockResponse.php      |   4 +-
 .../HttpClient/Response/NativeResponse.php    |   4 +-
 .../HttpClient/Tests/HttplugClientTest.php    |   6 +-
 .../HttpClient/Tests/MockHttpClientTest.php   |  24 +--
 .../Tests/Response/HttplugPromiseTest.php     |   2 +-
 .../Tests/TraceableHttpClientTest.php         |   4 +-
 .../Component/HttpFoundation/AcceptHeader.php |   4 +-
 .../Component/HttpFoundation/FileBag.php      |   2 +-
 .../Component/HttpFoundation/Request.php      |   4 +-
 .../HttpFoundation/RequestMatcher.php         |   4 +-
 .../RequestMatcher/IpsRequestMatcher.php      |   4 +-
 .../RequestMatcher/MethodRequestMatcher.php   |   4 +-
 .../RequestMatcher/SchemeRequestMatcher.php   |   4 +-
 .../Constraint/ResponseCookieValueSame.php    |   4 +-
 .../Test/Constraint/ResponseHasCookie.php     |   4 +-
 .../HttpFoundation/Tests/InputBagTest.php     |   4 +-
 .../HttpFoundation/Tests/ParameterBagTest.php |   4 +-
 .../AttributesRequestMatcherTest.php          |   4 +-
 .../Tests/RequestMatcherTest.php              |   4 +-
 .../HttpFoundation/Tests/RequestTest.php      |   4 +-
 .../Tests/ResponseFunctionalTest.php          |   2 +-
 .../Handler/AbstractSessionHandlerTest.php    |   2 +-
 .../Handler/Fixtures/invalid_regenerate.php   |   2 +-
 .../Storage/Handler/Fixtures/regenerate.php   |   2 +-
 .../Storage/Handler/Fixtures/storage.php      |   2 +-
 .../Handler/Fixtures/with_samesite.php        |   2 +-
 .../Fixtures/with_samesite_and_migration.php  |   2 +-
 .../Handler/MemcachedSessionHandlerTest.php   |   2 +-
 .../Storage/Handler/PdoSessionHandlerTest.php |  10 +-
 .../Handler/SessionHandlerFactoryTest.php     |   2 +-
 .../Controller/ControllerResolver.php         |   4 +-
 .../DataCollector/LoggerDataCollector.php     |   4 +-
 .../DataCollector/RequestDataCollector.php    |   2 +-
 .../Profiler/FileProfilerStorage.php          |   4 +-
 .../HttpKernel/Resources/welcome.html.php     |   4 +-
 .../NotTaggedControllerValueResolverTest.php  |  10 +-
 .../ServiceValueResolverTest.php              |  40 ++---
 .../Controller/ControllerResolverTest.php     |   4 +-
 .../RequestDataCollectorTest.php              |   2 +-
 .../Debug/TraceableEventDispatcherTest.php    |   4 +-
 .../CacheAttributeListenerTest.php            |  16 +-
 .../Tests/EventListener/ErrorListenerTest.php |  16 +-
 .../EventListener/RouterListenerTest.php      |   4 +-
 .../HttpKernel/Tests/HttpKernelTest.php       |  10 +-
 .../HttpKernel/Tests/Log/LoggerTest.php       |   4 +-
 .../Data/Generator/CurrencyDataGenerator.php  |   4 +-
 .../Data/Generator/LanguageDataGenerator.php  |   4 +-
 .../Intl/Data/Util/LocaleScanner.php          |   4 +-
 .../Intl/Resources/bin/update-data.php        |   4 +-
 .../Component/Intl/Tests/CurrenciesTest.php   |  10 +-
 .../Component/Intl/Tests/LanguagesTest.php    |   8 +-
 .../Intl/Tests/ResourceBundleTestCase.php     |  12 +-
 .../Component/Intl/Tests/TimezonesTest.php    |   8 +-
 .../Intl/Tests/Util/GitRepositoryTest.php     |   4 +-
 .../Ldap/Adapter/AbstractConnection.php       |   8 +-
 .../Component/Ldap/Adapter/AbstractQuery.php  |   4 +-
 .../CheckLdapCredentialsListenerTest.php      |   6 +-
 .../Transport/SesApiAsyncAwsTransport.php     |   8 +-
 .../Transport/MailPaceApiTransportTest.php    |  14 +-
 .../Transport/MandrillApiTransportTest.php    |   8 +-
 .../Transport/MandrillHttpTransportTest.php   |   8 +-
 .../Transport/MandrillHttpTransport.php       |   4 +-
 .../Transport/OhMySmtpApiTransportTest.php    |  28 ++--
 .../Transport/PostmarkApiTransportTest.php    |  14 +-
 .../Tests/Command/MailerTestCommandTest.php   |  16 +-
 .../Mailer/Transport/AbstractApiTransport.php |   4 +-
 .../Mailer/Transport/AbstractTransport.php    |   4 +-
 .../Bridge/Amqp/Transport/Connection.php      |  12 +-
 .../Tests/Transport/ConnectionTest.php        |  16 +-
 .../Tests/Transport/ConnectionTest.php        |  10 +-
 .../Bridge/Doctrine/Transport/Connection.php  |   4 +-
 .../Transport/RedisExtIntegrationTest.php     |   4 +-
 .../Bridge/Redis/Transport/Connection.php     |   8 +-
 .../DataCollector/MessengerDataCollector.php  |   6 +-
 .../DelayedMessageHandlingException.php       |   4 +-
 .../Exception/HandlerFailedException.php      |   4 +-
 .../Component/Messenger/HandleTrait.php       |   4 +-
 .../Test/Middleware/MiddlewareTestCase.php    |   4 +-
 .../Tests/Command/StatsCommandTest.php        |   4 +-
 .../StopWorkerOnMemoryLimitListenerTest.php   |   8 +-
 .../Tests/FailureIntegrationTest.php          |  24 +--
 .../Messenger/Tests/MessageBusTest.php        |  16 +-
 .../DispatchAfterCurrentBusMiddlewareTest.php |  16 +-
 .../Middleware/SendMessageMiddlewareTest.php  |   8 +-
 .../Tests/Middleware/StackMiddlewareTest.php  |   4 +-
 .../Transport/Sender/SendersLocatorTest.php   |   8 +-
 .../Component/Mime/Tests/EmailTest.php        |   4 +-
 .../Chatwork/Tests/ChatworkTransportTest.php  |   4 +-
 .../Tests/ContactEveryoneTransportTest.php    |   4 +-
 .../Discord/Tests/DiscordTransportTest.php    |   4 +-
 .../Esendex/Tests/EsendexTransportTest.php    |  12 +-
 .../Firebase/Tests/FirebaseTransportTest.php  |   4 +-
 .../Tests/GatewayApiTransportTest.php         |   4 +-
 .../Tests/GoogleChatTransportTest.php         |  12 +-
 .../Isendpro/Tests/IsendproTransportTest.php  |  12 +-
 .../Tests/LineNotifyTransportTest.php         |   4 +-
 .../LinkedIn/Tests/LinkedInTransportTest.php  |  12 +-
 .../Mercure/Tests/MercureTransportTest.php    |   4 +-
 .../Tests/MicrosoftTeamsTransportTest.php     |   4 +-
 .../Tests/OneSignalTransportTest.php          |   8 +-
 .../Tests/SendinblueTransportTest.php         |   4 +-
 .../Bridge/Slack/Tests/SlackOptionsTest.php   |   4 +-
 .../Bridge/Slack/Tests/SlackTransportTest.php |  16 +-
 .../Reply/Markup/InlineKeyboardMarkup.php     |   4 +-
 .../Reply/Markup/ReplyKeyboardMarkup.php      |   4 +-
 .../Telegram/Tests/TelegramTransportTest.php  |   8 +-
 .../TurboSms/Tests/TurboSmsTransportTest.php  |   8 +-
 .../OptionsResolver/OptionsResolver.php       |   8 +-
 .../Tests/OptionsResolverTest.php             | 152 +++++-------------
 src/Symfony/Component/Process/Process.php     |   4 +-
 .../Component/Process/Tests/ProcessTest.php   |   2 +-
 .../Extractor/PhpDocExtractor.php             |   4 +-
 .../Extractor/PhpStanExtractor.php            |   4 +-
 .../Routing/Generator/UrlGenerator.php        |   4 +-
 .../Loader/AnnotationDirectoryLoader.php      |   8 +-
 .../Routing/Loader/Psr4DirectoryLoader.php    |   8 +-
 .../Matcher/ExpressionLanguageProvider.php    |   8 +-
 .../Component/Routing/RouteCollection.php     |   4 +-
 .../Tests/Fixtures/CustomXmlFileLoader.php    |   2 +-
 .../Routing/Tests/Fixtures/glob/php_dsl.php   |   4 +-
 .../Loader/AnnotationDirectoryLoaderTest.php  |   4 +-
 .../ExpressionLanguageProviderTest.php        |  23 +--
 .../Component/Routing/Tests/RouteTest.php     |   2 +-
 .../Component/Runtime/GenericRuntime.php      |   2 +-
 .../Runtime/Tests/phpt/dotenv_overload.php    |   4 +-
 ...v_overload_command_debug_exists_0_to_1.php |   8 +-
 ...v_overload_command_debug_exists_1_to_0.php |   8 +-
 .../dotenv_overload_command_env_exists.php    |   8 +-
 .../phpt/dotenv_overload_command_no_debug.php |   8 +-
 .../Component/Runtime/Tests/phpt/kernel.php   |   4 +-
 .../Component/Runtime/Tests/phpt/request.php  |   4 +-
 .../ExpressionLanguageProvider.php            |  24 +--
 .../Storage/UsageTrackingTokenStorageTest.php |   4 +-
 .../Tests/Resources/TranslationFilesTest.php  |   2 +-
 .../Security/Csrf/CsrfTokenManager.php        |   4 +-
 .../Csrf/Tests/CsrfTokenManagerTest.php       |   4 +-
 .../Authentication/AuthenticatorManager.php   |   2 +-
 .../Authenticator/RememberMeAuthenticator.php |   4 +-
 .../AuthenticatorManagerTest.php              |  22 ++-
 .../AbstractAuthenticatorTest.php             |   2 +-
 .../Passport/Badge/UserBadgeTest.php          |   2 +-
 .../RememberMeAuthenticatorTest.php           |   4 +-
 .../CheckCredentialsListenerTest.php          |  18 +--
 .../CheckRememberMeConditionsListenerTest.php |   2 +-
 .../CsrfProtectionListenerTest.php            |   2 +-
 .../PasswordMigratingListenerTest.php         |   8 +-
 .../EventListener/RememberMeListenerTest.php  |   2 +-
 .../SessionStrategyListenerTest.php           |   2 +-
 .../EventListener/UserCheckerListenerTest.php |   4 +-
 .../Tests/Firewall/ContextListenerTest.php    |   4 +-
 .../Tests/Firewall/SwitchUserListenerTest.php |  22 ++-
 .../Tests/LoginLink/LoginLinkHandlerTest.php  |  32 ++--
 .../PersistentRememberMeHandlerTest.php       |   8 +-
 .../CamelCaseToSnakeCaseNameConverter.php     |   4 +-
 .../Normalizer/ObjectNormalizer.php           |   4 +-
 .../Tests/Annotation/ContextTest.php          |  10 +-
 .../MetadataAwareNameConverterTest.php        |   8 +-
 .../Features/CallbacksTestTrait.php           |   8 +-
 .../Tests/Normalizer/ObjectNormalizerTest.php |   4 +-
 .../Serializer/Tests/SerializerTest.php       |  68 ++++----
 .../String/AbstractUnicodeString.php          |   4 +-
 .../Resources/WcswidthDataGenerator.php       |   4 +-
 .../Component/String/Slugger/AsciiSlugger.php |   4 +-
 .../String/Tests/AbstractAsciiTestCase.php    |   4 +-
 .../String/Tests/AbstractUnicodeTestCase.php  |   4 +-
 .../Component/String/Tests/LazyStringTest.php |  30 ++--
 .../Component/Templating/PhpEngine.php        |   8 +-
 .../Translation/Bridge/Loco/LocoProvider.php  |   4 +-
 .../Bridge/Lokalise/LokaliseProvider.php      |   4 +-
 .../Translation/Command/XliffLintCommand.php  |  14 +-
 .../Resources/bin/translation-status.php      |   8 +-
 .../Translation/TranslatableMessage.php       |   4 +-
 .../Component/Translation/Translator.php      |   4 +-
 .../Uid/Command/GenerateUuidCommand.php       |   4 +-
 src/Symfony/Component/Uid/Tests/UuidTest.php  |   4 +-
 .../Constraints/DateTimeValidator.php         |   4 +-
 .../Constraints/TimezoneValidator.php         |   4 +-
 .../Validator/Constraints/UniqueValidator.php |   4 +-
 .../DataCollector/ValidatorDataCollector.php  |  16 +-
 .../Test/ConstraintValidatorTestCase.php      |  24 +--
 .../Tests/Constraints/ChoiceValidatorTest.php |   4 +-
 .../Tests/Constraints/UniqueValidatorTest.php |  16 +-
 .../Tests/Resources/TranslationFilesTest.php  |   2 +-
 .../Validator/TraceableValidatorTest.php      |   2 +-
 .../RecursiveContextualValidator.php          |   4 +-
 .../Component/VarDumper/Caster/ClassStub.php  |   4 +-
 .../VarDumper/Caster/ExceptionCaster.php      |   4 +-
 .../VarDumper/Tests/Cloner/VarClonerTest.php  |   4 +-
 .../Command/Descriptor/CliDescriptorTest.php  |   4 +-
 .../Internal/LazyObjectRegistry.php           |  38 ++---
 .../VarExporter/Tests/LazyGhostTraitTest.php  |  12 +-
 .../VarExporter/Tests/LazyProxyTraitTest.php  |   8 +-
 .../EventListener/ExpressionLanguage.php      |  10 +-
 src/Symfony/Component/Workflow/Registry.php   |   4 +-
 .../Component/Workflow/Tests/RegistryTest.php |   4 +-
 .../Component/Yaml/Command/LintCommand.php    |  14 +-
 src/Symfony/Component/Yaml/Unescaper.php      |   4 +-
 413 files changed, 1100 insertions(+), 2337 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
index 7381a6a992679..c8b341f0edddb 100644
--- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
@@ -74,16 +74,12 @@ public function getEntitiesByIds(string $identifier, array $values): array
 
             // Filter out non-integer values (e.g. ""). If we don't, some
             // databases such as PostgreSQL fail.
-            $values = array_values(array_filter($values, function ($v) {
-                return (string) $v === (string) (int) $v || ctype_digit($v);
-            }));
+            $values = array_values(array_filter($values, fn ($v) => (string) $v === (string) (int) $v || ctype_digit($v)));
         } elseif (\in_array($type, ['ulid', 'uuid', 'guid'])) {
             $parameterType = Connection::PARAM_STR_ARRAY;
 
             // Like above, but we just filter out empty strings.
-            $values = array_values(array_filter($values, function ($v) {
-                return '' !== (string) $v;
-            }));
+            $values = array_values(array_filter($values, fn ($v) => '' !== (string) $v));
 
             // Convert values into right type
             if (Type::hasType($type)) {
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
index 9f7eed373df6f..68c91d157f7f0 100644
--- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -193,15 +193,13 @@ public function configureOptions(OptionsResolver $resolver)
 
         // Set the "id_reader" option via the normalizer. This option is not
         // supposed to be set by the user.
-        $idReaderNormalizer = function (Options $options) {
-            // The ID reader is a utility that is needed to read the object IDs
-            // when generating the field values. The callback generating the
-            // field values has no access to the object manager or the class
-            // of the field, so we store that information in the reader.
-            // The reader is cached so that two choice lists for the same class
-            // (and hence with the same reader) can successfully be cached.
-            return $this->getCachedIdReader($options['em'], $options['class']);
-        };
+        // The ID reader is a utility that is needed to read the object IDs
+        // when generating the field values. The callback generating the
+        // field values has no access to the object manager or the class
+        // of the field, so we store that information in the reader.
+        // The reader is cached so that two choice lists for the same class
+        // (and hence with the same reader) can successfully be cached.
+        $idReaderNormalizer = fn (Options $options) => $this->getCachedIdReader($options['em'], $options['class']);
 
         $resolver->setDefaults([
             'em' => null,
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
index 75682577ed2fc..c567fc37fd835 100644
--- a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
+++ b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -47,9 +47,7 @@ public function getProperties(string $class, array $context = []): ?array
         $properties = array_merge($metadata->getFieldNames(), $metadata->getAssociationNames());
 
         if ($metadata instanceof ClassMetadataInfo && class_exists(Embedded::class) && $metadata->embeddedClasses) {
-            $properties = array_filter($properties, function ($property) {
-                return !str_contains($property, '.');
-            });
+            $properties = array_filter($properties, fn ($property) => !str_contains($property, '.'));
 
             $properties = array_merge($properties, array_keys($metadata->embeddedClasses));
         }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
index 8880455cd9077..db9398b23cb36 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -47,9 +47,7 @@ protected function setUp(): void
 
         $this->extension->expects($this->any())
             ->method('getObjectManagerElementName')
-            ->willReturnCallback(function ($name) {
-                return 'doctrine.orm.'.$name;
-            });
+            ->willReturnCallback(fn ($name) => 'doctrine.orm.'.$name);
 
         $this->extension
             ->method('getMappingObjectDefaultName')
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
index bdbb3e9a9b4fd..8a5eb97c1d573 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
@@ -222,7 +222,7 @@ public function testLoadValuesForChoicesDoesNotLoadIfSingleIntIdAndValueGiven()
         );
 
         $choices = [$this->obj1, $this->obj2, $this->obj3];
-        $value = function (\stdClass $object) { return $object->name; };
+        $value = fn (\stdClass $object) => $object->name;
 
         $this->repository->expects($this->never())
             ->method('findAll')
@@ -367,7 +367,7 @@ public function testLoadChoicesForValuesLoadsAllIfSingleIntIdAndValueGiven()
         );
 
         $choices = [$this->obj1, $this->obj2, $this->obj3];
-        $value = function (\stdClass $object) { return $object->name; };
+        $value = fn (\stdClass $object) => $object->name;
 
         $this->repository->expects($this->once())
             ->method('findAll')
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
index 18f918dd3b522..f6e924af0f11e 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -236,9 +236,7 @@ public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()
         $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-            'query_builder' => function () {
-                return new \stdClass();
-            },
+            'query_builder' => fn () => new \stdClass(),
         ]);
 
         $field->submit('2');
@@ -1078,10 +1076,8 @@ public function testDisallowChoicesThatAreNotIncludedQueryBuilderAsClosureSingle
         $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-            'query_builder' => function (EntityRepository $repository) {
-                return $repository->createQueryBuilder('e')
-                    ->where('e.id IN (1, 2)');
-            },
+            'query_builder' => fn (EntityRepository $repository) => $repository->createQueryBuilder('e')
+                ->where('e.id IN (1, 2)'),
             'choice_label' => 'name',
         ]);
 
@@ -1102,10 +1098,8 @@ public function testDisallowChoicesThatAreNotIncludedQueryBuilderAsClosureCompos
         $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
             'em' => 'default',
             'class' => self::COMPOSITE_IDENT_CLASS,
-            'query_builder' => function (EntityRepository $repository) {
-                return $repository->createQueryBuilder('e')
-                    ->where('e.id1 IN (10, 50)');
-            },
+            'query_builder' => fn (EntityRepository $repository) => $repository->createQueryBuilder('e')
+                ->where('e.id1 IN (10, 50)'),
             'choice_label' => 'name',
         ]);
 
@@ -1220,17 +1214,13 @@ public function testLoaderCaching()
         $formBuilder->add('property2', static::TESTED_TYPE, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-            'query_builder' => function (EntityRepository $repo) {
-                return $repo->createQueryBuilder('e')->where('e.id IN (1, 2)');
-            },
+            'query_builder' => fn (EntityRepository $repo) => $repo->createQueryBuilder('e')->where('e.id IN (1, 2)'),
         ]);
 
         $formBuilder->add('property3', static::TESTED_TYPE, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-            'query_builder' => function (EntityRepository $repo) {
-                return $repo->createQueryBuilder('e')->where('e.id IN (1, 2)');
-            },
+            'query_builder' => fn (EntityRepository $repo) => $repo->createQueryBuilder('e')->where('e.id IN (1, 2)'),
         ]);
 
         $form = $formBuilder->getForm();
@@ -1280,17 +1270,13 @@ public function testLoaderCachingWithParameters()
         $formBuilder->add('property2', static::TESTED_TYPE, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-            'query_builder' => function (EntityRepository $repo) {
-                return $repo->createQueryBuilder('e')->where('e.id = :id')->setParameter('id', 1);
-            },
+            'query_builder' => fn (EntityRepository $repo) => $repo->createQueryBuilder('e')->where('e.id = :id')->setParameter('id', 1),
         ]);
 
         $formBuilder->add('property3', static::TESTED_TYPE, [
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
-            'query_builder' => function (EntityRepository $repo) {
-                return $repo->createQueryBuilder('e')->where('e.id = :id')->setParameter('id', 1);
-            },
+            'query_builder' => fn (EntityRepository $repo) => $repo->createQueryBuilder('e')->where('e.id = :id')->setParameter('id', 1),
         ]);
 
         $form = $formBuilder->getForm();
@@ -1791,9 +1777,7 @@ public function testWithSameLoaderAndDifferentChoiceValueCallbacks()
             ->add('entity_two', self::TESTED_TYPE, [
                 'em' => 'default',
                 'class' => self::SINGLE_IDENT_CLASS,
-                'choice_value' => function ($choice) {
-                    return $choice ? $choice->name : '';
-                },
+                'choice_value' => fn ($choice) => $choice ? $choice->name : '',
             ])
             ->createView()
         ;
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php
index 092d8be07e892..0e1f743803526 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php
@@ -34,7 +34,7 @@ public function testPostGenerateSchemaPdo()
         $pdoSessionHandler = $this->createMock(PdoSessionHandler::class);
         $pdoSessionHandler->expects($this->once())
             ->method('configureSchema')
-            ->with($schema, fn() => true);
+            ->with($schema, fn () => true);
 
         $subscriber = new PdoSessionHandlerSchemaSubscriber([$pdoSessionHandler]);
         $subscriber->postGenerateSchema($event);
diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/MailerHandlerTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/MailerHandlerTest.php
index 43d5ef3cfab72..b4044d9c870db 100644
--- a/src/Symfony/Bridge/Monolog/Tests/Handler/MailerHandlerTest.php
+++ b/src/Symfony/Bridge/Monolog/Tests/Handler/MailerHandlerTest.php
@@ -39,9 +39,7 @@ public function testHandle()
         $this->mailer
             ->expects($this->once())
             ->method('send')
-            ->with($this->callback(function (Email $email) {
-                return 'Alert: WARNING message' === $email->getSubject() && null === $email->getHtmlBody();
-            }))
+            ->with($this->callback(fn (Email $email) => 'Alert: WARNING message' === $email->getSubject() && null === $email->getHtmlBody()))
         ;
         $handler->handle($this->getRecord(Logger::WARNING, 'message'));
     }
@@ -53,9 +51,7 @@ public function testHandleBatch()
         $this->mailer
             ->expects($this->once())
             ->method('send')
-            ->with($this->callback(function (Email $email) {
-                return 'Alert: ERROR error' === $email->getSubject() && null === $email->getHtmlBody();
-            }))
+            ->with($this->callback(fn (Email $email) => 'Alert: ERROR error' === $email->getSubject() && null === $email->getHtmlBody()))
         ;
         $handler->handleBatch($this->getMultipleRecords());
     }
@@ -86,9 +82,7 @@ public function testHtmlContent()
         $this->mailer
             ->expects($this->once())
             ->method('send')
-            ->with($this->callback(function (Email $email) {
-                return 'Alert: WARNING message' === $email->getSubject() && null === $email->getTextBody();
-            }))
+            ->with($this->callback(fn (Email $email) => 'Alert: WARNING message' === $email->getSubject() && null === $email->getTextBody()))
         ;
         $handler->handle($this->getRecord(Logger::WARNING, 'message'));
     }
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php
index fe76f50c53284..15190df1d308b 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php
@@ -42,9 +42,7 @@ public function testInstantiateProxy()
         $instance = new \stdClass();
         $container = $this->createMock(ContainerInterface::class);
         $definition = new Definition('stdClass');
-        $instantiator = function () use ($instance) {
-            return $instance;
-        };
+        $instantiator = fn () => $instance;
 
         /* @var $proxy LazyLoadingInterface|ValueHolderInterface */
         $proxy = $this->instantiator->instantiateProxy($container, $definition, 'foo', $instantiator);
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
index 6fae02cb9bc91..d4e8528ed536c 100644
--- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -162,9 +162,7 @@ private function displayPathsText(SymfonyStyle $io, string $name)
                 [$namespace, $shortname] = $this->parseTemplateName($name);
                 $alternatives = $this->findAlternatives($shortname, $shortnames);
                 if (FilesystemLoader::MAIN_NAMESPACE !== $namespace) {
-                    $alternatives = array_map(function ($shortname) use ($namespace) {
-                        return '@'.$namespace.'/'.$shortname;
-                    }, $alternatives);
+                    $alternatives = array_map(fn ($shortname) => '@'.$namespace.'/'.$shortname, $alternatives);
                 }
             }
 
@@ -543,7 +541,7 @@ private function findAlternatives(string $name, array $collection): array
         }
 
         $threshold = 1e3;
-        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) { return $lev < 2 * $threshold; });
+        $alternatives = array_filter($alternatives, fn ($lev) => $lev < 2 * $threshold);
         ksort($alternatives, \SORT_NATURAL | \SORT_FLAG_CASE);
 
         return array_keys($alternatives);
diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
index dd2e0682d2901..748d60cb154b1 100644
--- a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
@@ -120,9 +120,7 @@ public function fileExcerpt(string $file, int $line, int $srcContext = 3): ?stri
             // remove main code/span tags
             $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
             // split multiline spans
-            $code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', function ($m) {
-                return "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>';
-            }, $code);
+            $code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', fn ($m) => "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>', $code);
             $content = explode('<br />', $code);
 
             $lines = [];
@@ -188,9 +186,7 @@ public function getFileRelative(string $file): ?string
 
     public function formatFileFromText(string $text): string
     {
-        return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', function ($match) {
-            return 'in '.$this->formatFile($match[2], $match[3]);
-        }, $text);
+        return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', fn ($match) => 'in '.$this->formatFile($match[2], $match[3]), $text);
     }
 
     /**
diff --git a/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php b/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php
index 6428f4860ba78..05bef211e62be 100644
--- a/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php
@@ -159,9 +159,7 @@ private function createCommandTester(): CommandTester
     private function createCommand(): Command
     {
         $environment = new Environment(new FilesystemLoader(\dirname(__DIR__).'/Fixtures/templates/'));
-        $environment->addFilter(new TwigFilter('deprecated_filter', function ($v) {
-            return $v;
-        }, ['deprecated' => true]));
+        $environment->addFilter(new TwigFilter('deprecated_filter', fn ($v) => $v, ['deprecated' => true]));
 
         $command = new LintCommand($environment);
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
index 808352300adf4..9f1626bd52dd8 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
@@ -1039,9 +1039,7 @@ public function testSingleChoiceExpandedWithLabelsSetFalseByCallable()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
             'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
-            'choice_label' => function () {
-                return false;
-            },
+            'choice_label' => fn () => false,
             'multiple' => false,
             'expanded' => true,
         ]);
@@ -1404,9 +1402,7 @@ public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
             'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
-            'choice_label' => function () {
-                return false;
-            },
+            'choice_label' => fn () => false,
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
index 8689df830b290..af303e49ca3e8 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
@@ -580,9 +580,7 @@ public function testSingleChoiceExpandedWithLabelsSetFalseByCallable()
     {
         $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
             'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
-            'choice_label' => function () {
-                return false;
-            },
+            'choice_label' => fn () => false,
             'multiple' => false,
             'expanded' => true,
         ]);
@@ -901,9 +899,7 @@ public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable()
     {
         $form = $this->factory->createNamed('name', ChoiceType::class, ['&a'], [
             'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
-            'choice_label' => function () {
-                return false;
-            },
+            'choice_label' => fn () => false,
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/BodyRendererTest.php b/src/Symfony/Bridge/Twig/Tests/Mime/BodyRendererTest.php
index 231067e0365dc..6af152dad6c5e 100644
--- a/src/Symfony/Bridge/Twig/Tests/Mime/BodyRendererTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Mime/BodyRendererTest.php
@@ -124,9 +124,7 @@ public function testRenderedOnceUnserializableContext()
         ;
         $email->textTemplate('text');
         $email->context([
-            'foo' => static function () {
-                return 'bar';
-            },
+            'foo' => static fn () => 'bar',
         ]);
 
         $renderer->render($email);
diff --git a/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php b/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
index c4d3971edcaff..9368f15b96d74 100644
--- a/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
+++ b/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
@@ -87,7 +87,7 @@ public static function onUndefinedFunction(string $name): TwigFunction|false
         }
 
         if ('webpack-encore-bundle' === self::FUNCTION_COMPONENTS[$name]) {
-            return new TwigFunction($name, static function () { return ''; });
+            return new TwigFunction($name, static fn () => '');
         }
 
         throw new SyntaxError(self::onUndefined($name, 'function', self::FUNCTION_COMPONENTS[$name]));
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
index 47b3db6d2c9d3..9409bba2e04b4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
@@ -53,7 +53,7 @@ public function warmUp(string $cacheDir): array
         // the ArrayAdapter stores the values serialized
         // to avoid mutation of the data after it was written to the cache
         // so here we un-serialize the values first
-        $values = array_map(function ($val) { return null !== $val ? unserialize($val) : null; }, $arrayAdapter->getValues());
+        $values = array_map(fn ($val) => null !== $val ? unserialize($val) : null, $arrayAdapter->getValues());
 
         return $this->warmUpPhpArrayAdapter(new PhpArrayAdapter($this->phpArrayFile, new NullAdapter()), $values);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
index 5ecc25b3d7078..1d94fc973b6e1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
@@ -71,7 +71,7 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter): bool
     protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array $values): array
     {
         // make sure we don't cache null values
-        $values = array_filter($values, function ($val) { return null !== $val; });
+        $values = array_filter($values, fn ($val) => null !== $val);
 
         return parent::warmUpPhpArrayAdapter($phpArrayAdapter, $values);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
index ba0dede3948a2..6325267e2ba4c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -71,7 +71,7 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter): bool
     protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array $values): array
     {
         // make sure we don't cache null values
-        $values = array_filter($values, function ($val) { return null !== $val; });
+        $values = array_filter($values, fn ($val) => null !== $val);
 
         return parent::warmUpPhpArrayAdapter($phpArrayAdapter, $values);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
index 5f79d95bf036d..5c392895eb31f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
@@ -35,9 +35,7 @@ protected function listBundles(OutputInterface|StyleInterface $output)
         $rows = [];
 
         $bundles = $this->getApplication()->getKernel()->getBundles();
-        usort($bundles, function ($bundleA, $bundleB) {
-            return strcmp($bundleA->getName(), $bundleB->getName());
-        });
+        usort($bundles, fn ($bundleA, $bundleB) => strcmp($bundleA->getName(), $bundleB->getName()));
 
         foreach ($bundles as $bundle) {
             $extension = $bundle->getContainerExtension();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolListCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolListCommand.php
index f1e05b0db0768..0894d3fa719e5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolListCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolListCommand.php
@@ -51,9 +51,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 
-        $io->table(['Pool name'], array_map(function ($pool) {
-            return [$pool];
-        }, $this->poolNames));
+        $io->table(['Pool name'], array_map(fn ($pool) => [$pool], $this->poolNames));
 
         return 0;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
index 8e5395c7a4c01..bb39b00288a99 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
@@ -77,9 +77,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         if ($search = $input->getArgument('search')) {
             $searchNormalized = preg_replace('/[^a-zA-Z0-9\x7f-\xff $]++/', '', $search);
 
-            $serviceIds = array_filter($serviceIds, function ($serviceId) use ($searchNormalized) {
-                return false !== stripos(str_replace('\\', '', $serviceId), $searchNormalized) && !str_starts_with($serviceId, '.');
-            });
+            $serviceIds = array_filter($serviceIds, fn ($serviceId) => false !== stripos(str_replace('\\', '', $serviceId), $searchNormalized) && !str_starts_with($serviceId, '.'));
 
             if (!$serviceIds) {
                 $errorIo->error(sprintf('No autowirable classes or interfaces found matching "%s"', $search));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
index a4c53beff3957..d2d1971b6ef45 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -80,9 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $routes = $this->router->getRouteCollection();
         $container = null;
         if ($this->fileLinkFormatter) {
-            $container = function () {
-                return $this->getContainerBuilder($this->getApplication()->getKernel());
-            };
+            $container = fn () => $this->getContainerBuilder($this->getApplication()->getKernel());
         }
 
         if ($name) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php
index a9d31e2217967..16a6f115992dc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php
@@ -75,9 +75,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $rows = [];
 
         $dump = new Dumper($output);
-        $dump = static function (?string $v) use ($dump) {
-            return null === $v ? '******' : $dump($v);
-        };
+        $dump = static fn (?string $v) => null === $v ? '******' : $dump($v);
 
         foreach ($secrets as $name => $value) {
             $rows[$name] = [$name, $dump($value)];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
index 426bd652ec05a..a4f34ce4dc6d9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -233,12 +233,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
                 $list = array_merge(
                     array_diff($allKeys, $newKeys),
-                    array_map(function ($id) {
-                        return sprintf('<fg=green>%s</>', $id);
-                    }, $newKeys),
-                    array_map(function ($id) {
-                        return sprintf('<fg=red>%s</>', $id);
-                    }, array_keys($operation->getObsoleteMessages($domain)))
+                    array_map(fn ($id) => sprintf('<fg=green>%s</>', $id), $newKeys),
+                    array_map(fn ($id) => sprintf('<fg=red>%s</>', $id), array_keys($operation->getObsoleteMessages($domain)))
                 );
 
                 $domainMessagesCount = \count($list);
diff --git a/src/Symfony/Bundle/FrameworkBundle
10000
/Command/XliffLintCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/XliffLintCommand.php
index 0c33e2b8b9c84..c6c66da4fb3ac 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/XliffLintCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/XliffLintCommand.php
@@ -36,9 +36,7 @@ public function __construct()
             return $default($directory);
         };
 
-        $isReadableProvider = function ($fileOrDirectory, $default) {
-            return str_starts_with($fileOrDirectory, '@') || $default($fileOrDirectory);
-        };
+        $isReadableProvider = fn ($fileOrDirectory, $default) => str_starts_with($fileOrDirectory, '@') || $default($fileOrDirectory);
 
         parent::__construct(null, $directoryIteratorProvider, $isReadableProvider);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php
index 42c1e795ccee6..d29b9e523c478 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php
@@ -35,9 +35,7 @@ public function __construct()
             return $default($directory);
         };
 
-        $isReadableProvider = function ($fileOrDirectory, $default) {
-            return str_starts_with($fileOrDirectory, '@') || $default($fileOrDirectory);
-        };
+        $isReadableProvider = fn ($fileOrDirectory, $default) => str_starts_with($fileOrDirectory, '@') || $default($fileOrDirectory);
 
         parent::__construct(null, $directoryIteratorProvider, $isReadableProvider);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
index 64c296e813671..49c7ddea1fdfa 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -241,9 +241,7 @@ protected function sortTaggedServicesByPriority(array $services): array
                 }
             }
         }
-        uasort($maxPriority, function ($a, $b) {
-            return $b <=> $a;
-        });
+        uasort($maxPriority, fn ($a, $b) => $b <=> $a);
 
         return array_keys($maxPriority);
     }
@@ -260,9 +258,7 @@ protected function sortTagsByPriority(array $tags): array
 
     protected function sortByPriority(array $tag): array
     {
-        usort($tag, function ($a, $b) {
-            return ($b['priority'] ?? 0) <=> ($a['priority'] ?? 0);
-        });
+        usort($tag, fn ($a, $b) => ($b['priority'] ?? 0) <=> ($a['priority'] ?? 0));
 
         return $tag;
     }
@@ -305,9 +301,7 @@ private function getContainerEnvVars(ContainerBuilder $container): array
         $envVars = array_unique($envVars[1]);
 
         $bag = $container->getParameterBag();
-        $getDefaultParameter = function (string $name) {
-            return parent::get($name);
-        };
+        $getDefaultParameter = fn (string $name) => parent::get($name);
         $getDefaultParameter = $getDefaultParameter->bindTo($bag, $bag::class);
 
         $getEnvReflection = new \ReflectionMethod($container, 'getEnv');
@@ -343,9 +337,7 @@ private function getContainerEnvVars(ContainerBuilder $container): array
     protected function getServiceEdges(ContainerBuilder $builder, string $serviceId): array
     {
         try {
-            return array_map(function (ServiceReferenceGraphEdge $edge) {
-                return $edge->getSourceNode()->getId();
-            }, $builder->getCompiler()->getServiceReferenceGraph()->getNode($serviceId)->getInEdges());
+            return array_map(fn (ServiceReferenceGraphEdge $edge) => $edge->getSourceNode()->getId(), $builder->getCompiler()->getServiceReferenceGraph()->getNode($serviceId)->getInEdges());
         } catch (InvalidArgumentException $exception) {
             return [];
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
index 9f93badc862a9..f8970832989c0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -304,7 +304,7 @@ private function getEventDispatcherListenersData(EventDispatcherInterface $event
                 $data[] = $l;
             }
         } else {
-            $registeredListeners = \array_key_exists('events', $options) ? array_combine($options['events'], array_map(function ($event) use ($eventDispatcher) { return $eventDispatcher->getListeners($event); }, $options['events'])) : $eventDispatcher->getListeners();
+            $registeredListeners = \array_key_exists('events', $options) ? array_combine($options['events'], array_map(fn ($event) => $eventDispatcher->getListeners($event), $options['events'])) : $eventDispatcher->getListeners();
             ksort($registeredListeners);
 
             foreach ($registeredListeners as $eventListened => $eventListeners) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
index 7115da8cd1949..164543eebb234 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -310,7 +310,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
             $registeredListeners = $eventDispatcher->getListeners($event);
         } else {
             // Try to see if "events" exists
-            $registeredListeners = \array_key_exists('events', $options) ? array_combine($options['events'], array_map(function ($event) use ($eventDispatcher) { return $eventDispatcher->getListeners($event); }, $options['events'])) : $eventDispatcher->getListeners();
+            $registeredListeners = \array_key_exists('events', $options) ? array_combine($options['events'], array_map(fn ($event) => $eventDispatcher->getListeners($event), $options['events'])) : $eventDispatcher->getListeners();
         }
 
         $this->write(sprintf('# %s', $title)."\n");
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
index 7bd73b8bd1bc4..04bd75c3facab 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -271,9 +271,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
             $tagInformation = [];
             foreach ($tags as $tagName => $tagData) {
                 foreach ($tagData as $tagParameters) {
-                    $parameters = array_map(function ($key, $value) {
-                        return sprintf('<info>%s</info>: %s', $key, $value);
-                    }, array_keys($tagParameters), array_values($tagParameters));
+                    $parameters = array_map(fn ($key, $value) => sprintf('<info>%s</info>: %s', $key, $value), array_keys($tagParameters), array_values($tagParameters));
                     $parameters = implode(', ', $parameters);
 
                     if ('' === $parameters) {
@@ -496,7 +494,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
         } else {
             $title .= ' Grouped by Event';
             // Try to see if "events" exists
-            $registeredListeners = \array_key_exists('events', $options) ? array_combine($options['events'], array_map(function ($event) use ($eventDispatcher) { return $eventDispatcher->getListeners($event); }, $options['events'])) : $eventDispatcher->getListeners();
+            $registeredListeners = \array_key_exists('events', $options) ? array_combine($options['events'], array_map(fn ($event) => $eventDispatcher->getListeners($event), $options['events'])) : $eventDispatcher->getListeners();
         }
 
         $options['output']->title($title);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
index 69cdcbf9a599c..0a530c61da4bd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -489,7 +489,7 @@ private function getEventDispatcherListenersDocument(EventDispatcherInterface $e
             $this->appendEventListenerDocument($eventDispatcher, $event, $eventDispatcherXML, $registeredListeners);
         } else {
             // Try to see if "events" exists
-            $registeredListeners = \array_key_exists('events', $options) ? array_combine($options['events'], array_map(function ($event) use ($eventDispatcher) { return $eventDispatcher->getListeners($event); }, $options['events'])) : $eventDispatcher->getListeners();
+            $registeredListeners = \array_key_exists('events', $options) ? array_combine($options['events'], array_map(fn ($event) => $eventDispatcher->getListeners($event), $options['events'])) : $eventDispatcher->getListeners();
             ksort($registeredListeners);
 
             foreach ($registeredListeners as $eventListened => $eventListeners) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 44e812e735538..38848815b75d7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -144,9 +144,7 @@ public function getConfigTreeBuilder(): TreeBuilder
             return ContainerBuilder::willBeAvailable($package, $class, $parentPackages);
         };
 
-        $enableIfStandalone = static function (string $package, string $class) use ($willBeAvailable) {
-            return !class_exists(FullStack::class) && $willBeAvailable($package, $class) ? 'canBeDisabled' : 'canBeEnabled';
-        };
+        $enableIfStandalone = static fn (string $package, string $class) => !class_exists(FullStack::class) && $willBeAvailable($package, $class) ? 'canBeDisabled' : 'canBeEnabled';
 
         $this->addCsrfSection($rootNode);
         $this->addFormSection($rootNode, $enableIfStandalone);
@@ -693,8 +691,8 @@ private function addRequestSection(ArrayNodeDefinition $rootNode)
                             ->useAttributeAsKey('name')
                             ->prototype('array')
                                 ->beforeNormalization()
-                                    ->ifTrue(function ($v) { return \is_array($v) && isset($v['mime_type']); })
-                                    ->then(function ($v) { return $v['mime_type']; })
+                                    ->ifTrue(fn ($v) => \is_array($v) && isset($v['mime_type']))
+                                    ->then(fn ($v) => $v['mime_type'])
                                 ->end()
                                 ->beforeNormalization()->castToArray()->end()
                                 ->prototype('scalar')->end()
@@ -1169,7 +1167,7 @@ private function addPhpErrorsSection(ArrayNodeDefinition $rootNode)
                                 })
                             ->end()
                             ->validate()
-                                ->ifTrue(function ($v) { return !(\is_int($v) || \is_bool($v) || \is_array($v)); })
+                                ->ifTrue(fn ($v) => !(\is_int($v) || \is_bool($v) || \is_array($v)))
                                 ->thenInvalid('The "php_errors.log" parameter should be either an integer, a boolean, or an array')
                             ->end()
                         ->end()
@@ -1220,7 +1218,7 @@ private function addExceptionsSection(ArrayNodeDefinition $rootNode)
                             ->scalarNode('log_level')
                                 ->info('The level of log message. Null to let Symfony decide.')
                                 ->validate()
-                                    ->ifTrue(function ($v) use ($logLevels) { return null !== $v && !\in_array($v, $logLevels, true); })
+                                    ->ifTrue(fn ($v) => null !== $v && !\in_array($v, $logLevels, true))
                                     ->thenInvalid(sprintf('The log level is not valid. Pick one among "%s".', implode('", "', $logLevels)))
                                 ->end()
                                 ->defaultNull()
@@ -1228,11 +1226,11 @@ private function addExceptionsSection(ArrayNodeDefinition $rootNode)
                             ->scalarNode('status_code')
                                 ->info('The status code of the response. Null or 0 to let Symfony decide.')
                                 ->beforeNormalization()
-                                    ->ifTrue(function ($v) { return 0 === $v; })
-                                    ->then(function ($v) { return null; })
+                                    ->ifTrue(fn ($v) => 0 === $v)
+                                    ->then(fn ($v) => null)
                                 ->end()
                                 ->validate()
-                                    ->ifTrue(function ($v) { return null !== $v && ($v < 100 || $v > 599); })
+                                    ->ifTrue(fn ($v) => null !== $v && ($v < 100 || $v > 599))
                                     ->thenInvalid('The status code is not valid. Pick a value between 100 and 599.')
                                 ->end()
                                 ->defaultNull()
@@ -1252,14 +1250,14 @@ private function addLockSection(ArrayNodeDefinition $rootNode, callable $enableI
                     ->info('Lock configuration')
                     ->{$enableIfStandalone('symfony/lock', Lock::class)}()
                     ->beforeNormalization()
-                        ->ifString()->then(function ($v) { return ['enabled' => true, 'resources' => $v]; })
+                        ->ifString()->then(fn ($v) => ['enabled' => true, 'resources' => $v])
                     ->end()
                     ->beforeNormalization()
-                        ->ifTrue(function ($v) { return \is_array($v) && !isset($v['enabled']); })
-                        ->then(function ($v) { return $v + ['enabled' => true]; })
+                        ->ifTrue(fn ($v) => \is_array($v) && !isset($v['enabled']))
+                        ->then(fn ($v) => $v + ['enabled' => true])
                     ->end()
                     ->beforeNormalization()
-                        ->ifTrue(function ($v) { return \is_array($v) && !isset($v['resources']) && !isset($v['resource']); })
+                        ->ifTrue(fn ($v) => \is_array($v) && !isset($v['resources']) && !isset($v['resource']))
                         ->then(function ($v) {
                             $e = $v['enabled'];
                             unset($v['enabled']);
@@ -1269,7 +1267,7 @@ private function addLockSection(ArrayNodeDefinition $rootNode, callable $enableI
                     ->end()
                     ->addDefaultsIfNotSet()
                     ->validate()
-                        ->ifTrue(static function (array $config) { return $config['enabled'] && !$config['resources']; })
+                        ->ifTrue(static fn (array $config) => $config['enabled'] && !$config['resources'])
                         ->thenInvalid('At least one resource must be defined.')
                     ->end()
                     ->fixXmlConfig('resource')
@@ -1279,10 +1277,10 @@ private function addLockSection(ArrayNodeDefinition $rootNode, callable $enableI
                             ->useAttributeAsKey('name')
                             ->defaultValue(['default' => [class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphore' : 'flock']])
                             ->beforeNormalization()
-                                ->ifString()->then(function ($v) { return ['default' => $v]; })
+                                ->ifString()->then(fn ($v) => ['default' => $v])
                             ->end()
                             ->beforeNormalization()
-                                ->ifTrue(function ($v) { return \is_array($v) && array_is_list($v); })
+                                ->ifTrue(fn ($v) => \is_array($v) && array_is_list($v))
                                 ->then(function ($v) {
                                     $resources = [];
                                     foreach ($v as $resource) {
@@ -1297,7 +1295,7 @@ private function addLockSection(ArrayNodeDefinition $rootNode, callable $enableI
                             ->end()
                             ->prototype('array')
                                 ->performNoDeepMerging()
-                                ->beforeNormalization()->ifString()->then(function ($v) { return [$v]; })->end()
+                                ->beforeNormalization()->ifString()->then(fn ($v) => [$v])->end()
                                 ->prototype('scalar')->end()
                             ->end()
                         ->end()
@@ -1315,14 +1313,14 @@ private function addSemaphoreSection(ArrayNodeDefinition $rootNode, callable $en
                     ->info('Semaphore configuration')
                     ->{$enableIfStandalone('symfony/semaphore', Semaphore::class)}()
                     ->beforeNormalization()
-                        ->ifString()->then(function ($v) { return ['enabled' => true, 'resources' => $v]; })
+                        ->ifString()->then(fn ($v) => ['enabled' => true, 'resources' => $v])
                     ->end()
                     ->beforeNormalization()
-                        ->ifTrue(function ($v) { return \is_array($v) && !isset($v['enabled']); })
-                        ->then(function ($v) { return $v + ['enabled' => true]; })
+                        ->ifTrue(fn ($v) => \is_array($v) && !isset($v['enabled']))
+                        ->then(fn ($v) => $v + ['enabled' => true])
                     ->end()
                     ->beforeNormalization()
-                        ->ifTrue(function ($v) { return \is_array($v) && !isset($v['resources']) && !isset($v['resource']); })
+                        ->ifTrue(fn ($v) => \is_array($v) && !isset($v['resources']) && !isset($v['resource']))
                         ->then(function ($v) {
                             $e = $v['enabled'];
                             unset($v['enabled']);
@@ -1338,10 +1336,10 @@ private function addSemaphoreSection(ArrayNodeDefinition $rootNode, callable $en
                             ->useAttributeAsKey('name')
                             ->requiresAtLeastOneElement()
                             ->beforeNormalization()
-                                ->ifString()->then(function ($v) { return ['default' => $v]; })
+                                ->ifString()->then(fn ($v) => ['default' => $v])
                             ->end()
                             ->beforeNormalization()
-                                ->ifTrue(function ($v) { return \is_array($v) && array_is_list($v); })
+                                ->ifTrue(fn ($v) => \is_array($v) && array_is_list($v))
                                 ->then(function ($v) {
                                     $resources = [];
                                     foreach ($v as $resource) {
@@ -1929,9 +1927,7 @@ private function addHttpClientRetrySection()
                                 ->arrayNode('methods')
                                     ->beforeNormalization()
                                     ->ifArray()
-                                        ->then(function ($v) {
-                                            return array_map('strtoupper', $v);
-                                        })
+                                        ->then(fn ($v) => array_map('strtoupper', $v))
                                     ->end()
                                     ->prototype('scalar')->end()
                                     ->info('A list of HTTP methods that triggers a retry for this status code. When empty, all methods are retried')
@@ -1957,7 +1953,7 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl
                     ->info('Mailer configuration')
                     ->{$enableIfStandalone('symfony/mailer', Mailer::class)}()
                     ->validate()
-                        ->ifTrue(function ($v) { return isset($v['dsn']) && \count($v['transports']); })
+                        ->ifTrue(fn ($v) => isset($v['dsn']) && \count($v['transports']))
                         ->thenInvalid('"dsn" and "transports" cannot be used together.')
                     ->end()
                     ->fixXmlConfig('transport')
@@ -1977,9 +1973,7 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl
                                     ->performNoDeepMerging()
                                     ->beforeNormalization()
                                     ->ifArray()
-                                        ->then(function ($v) {
-                                            return array_filter(array_values($v));
-                                        })
+                                        ->then(fn ($v) => array_filter(array_values($v)))
                                     ->end()
                                     ->prototype('scalar')->end()
                                 ->end()
@@ -1991,8 +1985,8 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl
                             ->prototype('array')
                                 ->normalizeKeys(false)
                                 ->beforeNormalization()
-                                    ->ifTrue(function ($v) { return !\is_array($v) || array_keys($v) !== ['value']; })
-                                    ->then(function ($v) { return ['value' => $v]; })
+                                    ->ifTrue(fn ($v) => !\is_array($v) || array_keys($v) !== ['value'])
+                                    ->then(fn ($v) => ['value' => $v])
                                 ->end()
                                 ->children()
                                     ->variableNode('value')->end()
@@ -2066,7 +2060,7 @@ private function addRateLimiterSection(ArrayNodeDefinition $rootNode, callable $
                     ->{$enableIfStandalone('symfony/rate-limiter', TokenBucketLimiter::class)}()
                     ->fixXmlConfig('limiter')
                     ->beforeNormalization()
-                        ->ifTrue(function ($v) { return \is_array($v) && !isset($v['limiters']) && !isset($v['limiter']); })
+                        ->ifTrue(fn ($v) => \is_array($v) && !isset($v['limiters']) && !isset($v['limiter']))
                         ->then(function (array $v) {
                             $newV = [
                                 'enabled' => $v['enabled'] ?? true,
@@ -2117,7 +2111,7 @@ private function addRateLimiterSection(ArrayNodeDefinition $rootNode, callable $
                                     ->end()
                                 ->end()
                                 ->validate()
-                                    ->ifTrue(function ($v) { return 'no_limit' !== $v['policy'] && !isset($v['limit']); })
+                                    ->ifTrue(fn ($v) => 'no_limit' !== $v['policy'] && !isset($v['limit']))
                                     ->thenInvalid('A limit must be provided when using a policy different than "no_limit".')
                                 ->end()
                             ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index bcd8aff6932e2..0f95f9c2b6074 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1013,9 +1013,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                 $validator = new Workflow\Validator\WorkflowValidator();
             }
 
-            $trs = array_map(function (Reference $ref) use ($container): Workflow\Transition {
-                return $container->get((string) $ref);
-            }, $transitions);
+            $trs = array_map(fn (Reference $ref): Workflow\Transition => $container->get((string) $ref), $transitions);
             $realDefinition = new Workflow\Definition($places, $trs, $initialMarking);
             $validator->validate($realDefinition, $name);
 
@@ -1400,9 +1398,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
                 $finder = Finder::create()
                     ->followLinks()
                     ->files()
-                    ->filter(function (\SplFileInfo $file) {
-                        return 2 <= substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());
-                    })
+                    ->filter(fn (\SplFileInfo $file) => 2 <= substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename()))
                     ->in($dir)
                     ->sortByName()
                 ;
@@ -1425,9 +1421,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
                     'resource_files' => $files,
                     'scanned_directories' => $scannedDirectories = array_merge($dirs, $nonExistingDirs),
                     'cache_vary' => [
-                        'scanned_directories' => array_map(static function (string $dir) use ($projectDir): string {
-                            return str_starts_with($dir, $projectDir.'/') ? substr($dir, 1 + \strlen($projectDir)) : $dir;
-                        }, $scannedDirectories),
+                        'scanned_directories' => array_map(static fn (string $dir): string => str_starts_with($dir, $projectDir.'/') ? substr($dir, 1 + \strlen($projectDir)) : $dir, $scannedDirectories),
                     ],
                 ]
             );
@@ -2143,9 +2137,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             }
         }
 
-        $failureTransportReferencesByTransportName = array_map(function ($failureTransportName) use ($senderReferences) {
-            return $senderReferences[$failureTransportName];
-        }, $failureTransportsByName);
+        $failureTransportReferencesByTransportName = array_map(fn ($failureTransportName) => $senderReferences[$failureTransportName], $failureTransportsByName);
 
         $messageToSendersMapping = [];
         foreach ($config['routing'] as $message => $messageConfiguration) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
index fa04ff332433d..8069822767a47 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -168,12 +168,10 @@ public function registerContainerConfiguration(LoaderInterface $loader)
             /* @var ContainerPhpFileLoader $kernelLoader */
             $kernelLoader = $loader->getResolver()->resolve($file);
             $kernelLoader->setCurrentDir(\dirname($file));
-            $instanceof = &\Closure::bind(function &() { return $this->instanceof; }, $kernelLoader, $kernelLoader)();
+            $instanceof = &\Closure::bind(fn &() => $this->instanceof, $kernelLoader, $kernelLoader)();
 
             $valuePreProcessor = AbstractConfigurator::$valuePreProcessor;
-            AbstractConfigurator::$valuePreProcessor = function ($value) {
-                return $this === $value ? new Reference('kernel') : $value;
-            };
+            AbstractConfigurator::$valuePreProcessor = fn ($value) => $this === $value ? new Reference('kernel') : $value;
 
             try {
                 $configureContainer->getClosure($this)(new ContainerConfigurator($container, $kernelLoader, $instanceof, $file, $file, $this->getEnvironment()), $loader, $container);
diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
index 0f4a3843fb843..b75b422ce7e5e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
@@ -132,9 +132,7 @@ public function loginUser(object $user, string $firewallContext = 'main'): stati
         $session->set('_security_'.$firewallContext, serialize($token));
         $session->save();
 
-        $domains = array_unique(array_map(function (Cookie $cookie) use ($session) {
-            return $cookie->getName() === $session->getName() ? $cookie->getDomain() : '';
-        }, $this->getCookieJar()->all())) ?: [''];
+        $domains = array_unique(array_map(fn (Cookie $cookie) => $cookie->getName() === $session->getName() ? $cookie->getDomain() : '', $this->getCookieJar()->all())) ?: [''];
         foreach ($domains as $domain) {
             $cookie = new Cookie($session->getName(), $session->getId(), null, null, $domain);
             $this->getCookieJar()->set($cookie);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php
index 983956fcb9b82..54467f1efe879 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php
@@ -45,9 +45,7 @@ private function getRewindableGenerator(): RewindableGenerator
 
     private function getEmptyRewindableGenerator(): RewindableGenerator
     {
-        return new RewindableGenerator(function () {
-            return new \ArrayIterator([]);
-        }, 0);
+        return new RewindableGenerator(fn () => new \ArrayIterator([]), 0);
     }
 
     private function getKernel(): MockObject&KernelInterface
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
index f5af74b98ea5f..7dab41991b1b1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
@@ -76,9 +76,7 @@ private function getKernel()
         $container
             ->expects($this->atLeastOnce())
             ->method('has')
-            ->willReturnCallback(function ($id) {
-                return 'console.command_loader' !== $id;
-            })
+            ->willReturnCallback(fn ($id) => 'console.command_loader' !== $id)
         ;
         $container
             ->expects($this->any())
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
index 94fcbcfa3bcd3..daafc6011d3d0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
@@ -243,7 +243,7 @@ public static function getEventDispatchers()
         $eventDispatcher = new EventDispatcher();
 
         $eventDispatcher->addListener('event1', 'var_dump', 255);
-        $eventDispatcher->addListener('event1', function () { return 'Closure'; }, -1);
+        $eventDispatcher->addListener('event1', fn () => 'Closure', -1);
         $eventDispatcher->addListener('event2', new CallableClass());
 
         return ['event_dispatcher_1' => $eventDispatcher];
@@ -256,7 +256,7 @@ public static function getCallables(): array
             'callable_2' => ['Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass', 'staticMethod'],
             'callable_3' => [new CallableClass(), 'method'],
             'callable_4' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass::staticMethod',
-            'callable_6' => function () { return 'Closure'; },
+            'callable_6' => fn () => 'Closure',
             'callable_7' => new CallableClass(),
             'callable_from_callable' => (new CallableClass())(...),
         ];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
index f5dd7703eacfb..830c604d145b1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
@@ -110,9 +110,7 @@ public function testForward()
         $requestStack->push($request);
 
         $kernel = $this->createMock(HttpKernelInterface::class);
-        $kernel->expects($this->once())->method('handle')->willReturnCallback(function (Request $request) {
-            return new Response($request->getRequestFormat().'--'.$request->getLocale());
-        });
+        $kernel->expects($this->once())->method('handle')->willReturnCallback(fn (Request $request) => new Response($request->getRequestFormat().'--'.$request->getLocale()));
 
         $container = new Container();
         $container->set('request_stack', $requestStack);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
index 433b798d81a94..46dd94b86b3a4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
@@ -44,9 +44,7 @@ public function testMissingKnownTags()
     private function getKnownTags(): array
     {
         $tags = \Closure::bind(
-            static function () {
-                return UnusedTagsPass::KNOWN_TAGS;
-            },
+            static fn () => UnusedTagsPass::KNOWN_TAGS,
             null,
             UnusedTagsPass::class
         )();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index f37794e3d7fe5..3770decba62d2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -145,15 +145,13 @@ public function testInvalidAssetsConfiguration(array $assetConfig, $expectedMess
     public function provideInvalidAssetConfigurationTests()
     {
         // helper to turn config into embedded package config
-        $createPackageConfig = function (array $packageConfig) {
-            return [
-                'base_urls' => '//example.com',
-                'version' => 1,
-                'packages' => [
-                    'foo' => $packageConfig,
-                ],
-            ];
-        };
+        $createPackageConfig = fn (array $packageConfig) => [
+            'base_urls' => '//example.com',
+            'version' => 1,
+            'packages' => [
+                'foo' => $packageConfig,
+            ],
+        ];
 
         $config = [
             'version' => 1,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index d3c24f28dcadc..eacaa38f509b9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1146,9 +1146,7 @@ public function testTranslator()
 
         $nonExistingDirectories = array_filter(
             $options['scanned_directories'],
-            function ($directory) {
-                return !file_exists($directory);
-            }
+            fn ($directory) => !file_exists($directory)
         );
 
         $this->assertNotEmpty($nonExistingDirectories, 'FrameworkBundle should pass non existing directories to Translator');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
index cdcaa490ac423..7f2fe5b7c4bb2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
@@ -647,9 +647,7 @@ private function getParameterBag(array $params = []): ContainerInterface
         $bag
             ->expects($this->any())
             ->method('get')
-            ->willReturnCallback(function ($key) use ($params) {
-                return $params[$key] ?? null;
-            })
+            ->willReturnCallback(fn ($key) => $params[$key] ?? null)
         ;
 
         return $bag;
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php
index 220c51314d290..0f105efd5ea1b 100644
--- a/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php
+++ b/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php
@@ -216,11 +216,9 @@ private function displayAuthenticators(string $name, SymfonyStyle $io): void
         $io->table(
             ['Classname'],
             array_map(
-                static function ($authenticator) {
-                    return [
-                        $authenticator::class,
-                    ];
-                },
+                static fn ($authenticator) => [
+                    $authenticator::class,
+                ],
                 $authenticators
             )
         );
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/SortFirewallListenersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/SortFirewallListenersPass.php
index 6d49320445c10..7f0301a3edab7 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/SortFirewallListenersPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/SortFirewallListenersPass.php
@@ -45,9 +45,7 @@ private function sortFirewallContextListeners(Definition $definition, ContainerB
         $prioritiesByServiceId = $this->getListenerPriorities($listenerIteratorArgument, $container);
 
         $listeners = $listenerIteratorArgument->getValues();
-        usort($listeners, function (Reference $a, Reference $b) use ($prioritiesByServiceId) {
-            return $prioritiesByServiceId[(string) $b] <=> $prioritiesByServiceId[(string) $a];
-        });
+        usort($listeners, fn (Reference $a, Reference $b) => $prioritiesByServiceId[(string) $b] <=> $prioritiesByServiceId[(string) $a]);
 
         $listenerIteratorArgument->setValues(array_values($listeners));
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index 44d925c1f1c0b..b748c363a9952 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -78,15 +78,15 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->booleanNode('allow_if_equal_granted_denied')->defaultTrue()->end()
                     ->end()
                     ->validate()
-                        ->ifTrue(function ($v) { return isset($v['strategy'], $v['service']); })
+                        ->ifTrue(fn ($v) => isset($v['strategy'], $v['service']))
                         ->thenInvalid('"strategy" and "service" cannot be used together.')
                     ->end()
                     ->validate()
-                        ->ifTrue(function ($v) { return isset($v['strategy'], $v['strategy_service']); })
+                        ->ifTrue(fn ($v) => isset($v['strategy'], $v['strategy_service']))
                         ->thenInvalid('"strategy" and "strategy_service" cannot be used together.')
                     ->end()
                     ->validate()
-                        ->ifTrue(function ($v) { return isset($v['service'], $v['strategy_service']); })
+                        ->ifTrue(fn ($v) => isset($v['service'], $v['strategy_service']))
                         ->thenInvalid('"service" and "strategy_service" cannot be used together.')
                     ->end()
                 ->end()
@@ -111,10 +111,10 @@ private function addRoleHierarchySection(ArrayNodeDefinition $rootNode)
                     ->useAttributeAsKey('id')
                     ->prototype('array')
                         ->performNoDeepMerging()
-                        ->beforeNormalization()->ifString()->then(function ($v) { return ['value' => $v]; })->end()
+                        ->beforeNormalization()->ifString()->then(fn ($v) => ['value' => $v])->end()
                         ->beforeNormalization()
-                            ->ifTrue(function ($v) { return \is_array($v) && isset($v['value']); })
-                            ->then(function ($v) { return preg_split('/\s*,\s*/', $v['value']); })
+                            ->ifTrue(fn ($v) => \is_array($v) && isset($v['value']))
+                            ->then(fn ($v) => preg_split('/\s*,\s*/', $v['value']))
                         ->end()
                         ->prototype('scalar')->end()
                     ->end()
@@ -324,9 +324,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
         $firewallNodeBuilder
             ->end()
             ->validate()
-                ->ifTrue(function ($v) {
-                    return true === $v['security'] && isset($v['pattern']) && !isset($v['request_matcher']);
-                })
+                ->ifTrue(fn ($v) => true === $v['security'] && isset($v['pattern']) && !isset($v['request_matcher']))
                 ->then(function ($firewall) use ($abstractFactoryKeys) {
                     foreach ($abstractFactoryKeys as $k) {
                         if (!isset($firewall[$k]['check_path'])) {
@@ -375,7 +373,7 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
                         ->arrayNode('providers')
                             ->beforeNormalization()
                                 ->ifString()
-                                ->then(function ($v) { return preg_split('/\s*,\s*/', $v); })
+                                ->then(fn ($v) => preg_split('/\s*,\s*/', $v))
                             ->end()
                             ->prototype('scalar')->end()
                         ->end()
@@ -393,11 +391,11 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
 
         $providerNodeBuilder
             ->validate()
-                ->ifTrue(function ($v) { return \count($v) > 1; })
+                ->ifTrue(fn ($v) => \count($v) > 1)
                 ->thenInvalid('You cannot set multiple provider types for the same provider')
             ->end()
             ->validate()
-                ->ifTrue(function ($v) { return 0 === \count($v); })
+                ->ifTrue(fn ($v) => 0 === \count($v))
                 ->thenInvalid('You must set a provider definition for the provider.')
             ->end()
         ;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
index a3ed0e3ee0839..a59a9a6f3ede0 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
@@ -46,7 +46,7 @@ public function addConfiguration(NodeDefinition $node): void
                 ->fixXmlConfig('token_extractors')
                 ->beforeNormalization()
                     ->ifString()
-                    ->then(static function (string $v): array { return [$v]; })
+                    ->then(static fn (string $v): array => [$v])
                 ->end()
                 ->cannotBeEmpty()
                 ->defaultValue([
@@ -97,9 +97,7 @@ private function createExtractor(ContainerBuilder $container, string $firewallNa
             'request_body' => 'security.access_token_extractor.request_body',
             'header' => 'security.access_token_extractor.header',
         ];
-        $extractors = array_map(static function (string $extractor) use ($aliases): string {
-            return $aliases[$extractor] ?? $extractor;
-        }, $extractors);
+        $extractors = array_map(static fn (string $extractor): string => $aliases[$extractor] ?? $extractor, $extractors);
 
         if (1 === \count($extractors)) {
             return current($extractors);
@@ -107,7 +105,7 @@ private function createExtractor(ContainerBuilder $container, string $firewallNa
         $extractorId = sprintf('security.authenticator.access_token.chain_extractor.%s', $firewallName);
         $container
             ->setDefinition($extractorId, new ChildDefinition('security.authenticator.access_token.chain_extractor'))
-            ->replaceArgument(0, array_map(function (string $extractorId): Reference {return new Reference($extractorId); }, $extractors))
+            ->replaceArgument(0, array_map(fn (string $extractorId): Reference => new Reference($extractorId), $extractors))
         ;
 
         return $extractorId;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/CustomAuthenticatorFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/CustomAuthenticatorFactory.php
index 269b6e85a925d..b36745c672d5c 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/CustomAuthenticatorFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/CustomAuthenticatorFactory.php
@@ -47,7 +47,7 @@ public function addConfiguration(NodeDefinition $builder)
         $factoryRootNode
             ->fixXmlConfig('custom_authenticator')
             ->validate()
-                ->ifTrue(function ($v) { return isset($v['custom_authenticators']) && empty($v['custom_authenticators']); })
+                ->ifTrue(fn ($v) => isset($v['custom_authenticators']) && empty($v['custom_authenticators']))
                 ->then(function ($v) {
                     unset($v['custom_authenticators']);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
index d3ec4633cf5ce..8d5827232bd04 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
@@ -148,7 +148,7 @@ public function addConfiguration(NodeDefinition $node)
             ->scalarNode('service')->end()
             ->arrayNode('user_providers')
                 ->beforeNormalization()
-                    ->ifString()->then(function ($v) { return [$v]; })
+                    ->ifString()->then(fn ($v) => [$v])
                 ->end()
                 ->prototype('scalar')->end()
             ->end()
@@ -162,7 +162,7 @@ public function addConfiguration(NodeDefinition $node)
             ->end()
             ->arrayNode('token_provider')
                 ->beforeNormalization()
-                    ->ifString()->then(function ($v) { return ['service' => $v]; })
+                    ->ifString()->then(fn ($v) => ['service' => $v])
                 ->end()
                 ->children()
                     ->scalarNode('service')->info('The service ID of a custom rememberme token provider.')->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
index 0abb1ce247f5e..0c8a730d1c6d4 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
@@ -54,7 +54,7 @@ public function addConfiguration(NodeDefinition $node)
                         ->children()
                             ->scalarNode('password')->defaultNull()->end()
                             ->arrayNode('roles')
-                                ->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
+                                ->beforeNormalization()->ifString()->then(fn ($v) => preg_split('/\s*,\s*/', $v))->end()
                                 ->prototype('scalar')->end()
                             ->end()
                         ->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
index c2a334369ca0c..670a848d0ebd4 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
@@ -59,7 +59,7 @@ public function addConfiguration(NodeDefinition $node)
                     ->prototype('scalar')->end()
                 ->end()
                 ->arrayNode('default_roles')
-                    ->beforeNormalization()->ifString()->then(function ($v) { return preg_split('/\s*,\s*/', $v); })->end()
+                    ->beforeNormalization()->ifString()->then(fn ($v) => preg_split('/\s*,\s*/', $v))->end()
                     ->requiresAtLeastOneElement()
                     ->prototype('scalar')->end()
                 ->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index d1724dd81b621..5e67e2bb6a612 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -501,9 +501,7 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
         $configuredEntryPoint = $defaultEntryPoint;
 
         // authenticator manager
-        $authenticators = array_map(function ($id) {
-            return new Reference($id);
-        }, $firewallAuthenticationProviders);
+        $authenticators = array_map(fn ($id) => new Reference($id), $firewallAuthenticationProviders);
         $container
             ->setDefinition($managerId = 'security.authenticator.manager.'.$id, new ChildDefinition('security.authenticator.manager'))
             ->replaceArgument(0, $authenticators)
@@ -1027,9 +1025,7 @@ public function getConfiguration(array $config, ContainerBuilder $container): ?C
 
     private function isValidIps(string|array $ips): bool
     {
-        $ipsList = array_reduce((array) $ips, static function (array $ips, string $ip) {
-            return array_merge($ips, preg_split('/\s*,\s*/', $ip));
-        }, []);
+        $ipsList = array_reduce((array) $ips, static fn (array $ips, string $ip) => array_merge($ips, preg_split('/\s*,\s*/', $ip)), []);
 
         if (!$ipsList) {
             return false;
@@ -1081,9 +1077,7 @@ private function getSortedFactories(): array
                 $factories[] = array_merge($factory, [$i]);
             }
 
-            usort($factories, function ($a, $b) {
-                return $b[0] <=> $a[0] ?: $a[2] <=> $b[2];
-            });
+            usort($factories, fn ($a, $b) => $b[0] <=> $a[0] ?: $a[2] <=> $b[2]);
 
             $this->sortedFactories = array_column($factories, 1);
         }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
index 9b5afb0b8b20a..64e7f7adb5864 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
@@ -342,7 +342,7 @@ public function testCollectDecisionLog(string $strategy, array $decisionLog, arr
         $this->assertEquals($dataCollector->getAccessDecisionLog(), $expectedDecisionLog, 'Wrong value returned by getAccessDecisionLog');
 
         $this->assertSame(
-            array_map(function ($classStub) { return (string) $classStub; }, $dataCollector->getVoters()),
+            array_map(fn ($classStub) => (string) $classStub, $dataCollector->getVoters()),
             $expectedVoterClasses,
             'Wrong value returned by getVoters'
         );
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPassTest.php
index cecf1b04835ef..b5211da3cecd2 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPassTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPassTest.php
@@ -191,10 +191,8 @@ private function assertListeners(array $expectedListeners, string $dispatcherId
             $actualListeners[] = $arguments;
         }
 
-        $foundListeners = array_uintersect($expectedListeners, $actualListeners, function (array $a, array $b) {
-            // PHP internally sorts all the arrays first, so returning proper 1 / -1 values is crucial
-            return $a <=> $b;
-        });
+        // PHP internally sorts all the arrays first, so returning proper 1 / -1 values is crucial
+        $foundListeners = array_uintersect($expectedListeners, $actualListeners, fn (array $a, array $b) => $a <=> $b);
 
         $this->assertEquals($expectedListeners, $foundListeners);
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index acf5de337fc6b..8c521c8a03414 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -93,7 +93,7 @@ public function testUserProviders()
     {
         $container = $this->getContainer('container1');
 
-        $providers = array_values(array_filter($container->getServiceIds(), function ($key) { return str_starts_with($key, 'security.user.provider.concrete'); }));
+        $providers = array_values(array_filter($container->getServiceIds(), fn ($key) => str_starts_with($key, 'security.user.provider.concrete')));
 
         $expectedProviders = [
             'security.user.provider.concrete.default',
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/ApiAuthenticator.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/ApiAuthenticator.php
index dca54cfb0d999..3060f4ef9e8c6 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/ApiAuthenticator.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/ApiAuthenticator.php
@@ -46,7 +46,7 @@ public function authenticate(Request $request): Passport
 
         $userLoader = null;
         if ($this->selfLoadingUser) {
-            $userLoader = function ($username) { return new InMemoryUser($username, 'test', ['ROLE_USER']); };
+            $userLoader = fn ($username) => new InMemoryUser($username, 'test', ['ROLE_USER']);
         }
 
         return new SelfValidatingPassport(new UserBadge($email, $userLoader));
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/LoginLink/FirewallAwareLoginLinkHandlerTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/LoginLink/FirewallAwareLoginLinkHandlerTest.php
index 0b466d0af7990..92703f41ec3c7 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/LoginLink/FirewallAwareLoginLinkHandlerTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/LoginLink/FirewallAwareLoginLinkHandlerTest.php
@@ -69,14 +69,10 @@ private function createLocator(array $linkers)
         $locator = $this->createMock(ContainerInterface::class);
         $locator->expects($this->any())
             ->method('has')
-            ->willReturnCallback(function ($firewallName) use ($linkers) {
-                return isset($linkers[$firewallName]);
-            });
+            ->willReturnCallback(fn ($firewallName) => isset($linkers[$firewallName]));
         $locator->expects($this->any())
             ->method('get')
-            ->willReturnCallback(function ($firewallName) use ($linkers) {
-                return $linkers[$firewallName];
-            });
+            ->willReturnCallback(fn ($firewallName) => $linkers[$firewallName]);
 
         return $locator;
     }
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
index 0655a51e7c159..20b7427bedb9d 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -33,7 +33,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         $rootNode = $treeBuilder->getRootNode();
 
         $rootNode->beforeNormalization()
-            ->ifTrue(function ($v) { return \is_array($v) && \array_key_exists('exception_controller', $v); })
+            ->ifTrue(fn ($v) => \is_array($v) && \array_key_exists('exception_controller', $v))
             ->then(function ($v) {
                 if (isset($v['exception_controller'])) {
                     throw new InvalidConfigurationException('Option "exception_controller" under "twig" must be null or unset, use "error_controller" under "framework" instead.');
@@ -64,10 +64,8 @@ private function addFormThemesSection(ArrayNodeDefinition $rootNode)
                     ->prototype('scalar')->defaultValue('form_div_layout.html.twig')->end()
                     ->example(['@My/form.html.twig'])
                     ->validate()
-                        ->ifTrue(function ($v) { return !\in_array('form_div_layout.html.twig', $v); })
-                        ->then(function ($v) {
-                            return array_merge(['form_div_layout.html.twig'], $v);
-                        })
+                        ->ifTrue(fn ($v) => !\in_array('form_div_layout.html.twig', $v))
+                        ->then(fn ($v) => array_merge(['form_div_layout.html.twig'], $v))
                     ->end()
                 ->end()
             ->end()
@@ -86,7 +84,7 @@ private function addGlobalsSection(ArrayNodeDefinition $rootNode)
                     ->prototype('array')
                         ->normalizeKeys(false)
                         ->beforeNormalization()
-                            ->ifTrue(function ($v) { return \is_string($v) && str_starts_with($v, '@'); })
+                            ->ifTrue(fn ($v) => \is_string($v) && str_starts_with($v, '@'))
                             ->then(function ($v) {
                                 if (str_starts_with($v, '@@')) {
                                     return substr($v, 1);
@@ -106,7 +104,7 @@ private function addGlobalsSection(ArrayNodeDefinition $rootNode)
 
                                 return true;
                             })
-                            ->then(function ($v) { return ['value' => $v]; })
+                            ->then(fn ($v) => ['value' => $v])
                         ->end()
                         ->children()
                             ->scalarNode('id')->end()
@@ -151,7 +149,7 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode)
                     ->info('Pattern of file name used for cache warmer and linter')
                     ->beforeNormalization()
                         ->ifString()
-                            ->then(function ($value) { return [$value]; })
+                            ->then(fn ($value) => [$value])
                         ->end()
                     ->prototype('scalar')->end()
                 ->end()
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php
index 7505c1fcd36fa..09da820bbb84d 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php
@@ -53,7 +53,7 @@ public function configure(Environment $environment)
         $environment->getExtension(CoreExtension::class)->setNumberFormat($this->decimals, $this->decimalPoint, $this->thousandsSeparator);
 
         // wrap UndefinedCallableHandler in closures for lazy-autoloading
-        $environment->registerUndefinedFilterCallback(function ($name) { return UndefinedCallableHandler::onUndefinedFilter($name); });
-        $environment->registerUndefinedFunctionCallback(function ($name) { return UndefinedCallableHandler::onUndefinedFunction($name); });
+        $environment->registerUndefinedFilterCallback(fn ($name) => UndefinedCallableHandler::onUndefinedFilter($name));
+        $environment->registerUndefinedFunctionCallback(fn ($name) => UndefinedCallableHandler::onUndefinedFunction($name));
     }
 }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
index 3275ea792672b..7b0b1373b7eb8 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
@@ -180,9 +180,7 @@ private function generateNonce(): string
      */
     private function generateCspHeader(array $directives): string
     {
-        return array_reduce(array_keys($directives), function ($res, $name) use ($directives) {
-            return ('' !== $res ? $res.'; ' : '').sprintf('%s %s', $name, implode(' ', $directives[$name]));
-        }, '');
+        return array_reduce(array_keys($directives), fn ($res, $name) => ('' !== $res ? $res.'; ' : '').sprintf('%s %s', $name, implode(' ', $directives[$name])), '');
     }
 
     /**
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
index 86de485e031d1..2915b173e86fa 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
@@ -188,9 +188,7 @@ public function testReturns404onTokenNotFound($withCsp)
         $profiler
             ->expects($this->exactly(2))
             ->method('loadProfile')
-            ->willReturnCallback(function ($token) {
-                return 'found' == $token ? new Profile($token) : null;
-            })
+            ->willReturnCallback(fn ($token) => 'found' == $token ? new Profile($token) : null)
         ;
 
         $controller = $this->createController($profiler, $twig, $withCsp);
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Resources/IconTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Resources/IconTest.php
index 9ce9a4c5c47ec..2c488b24d0d21 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Resources/IconTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Resources/IconTest.php
@@ -34,6 +34,6 @@ public function testIconFileContents($iconFilePath)
 
     public function provideIconFilePaths()
     {
-        return array_map(function ($filePath) { return (array) $filePath; }, glob(__DIR__.'/../../Resources/views/Icon/*.svg'));
+        return array_map(fn ($filePath) => (array) $filePath, glob(__DIR__.'/../../Resources/views/Icon/*.svg'));
     }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
index baffec7ef3cda..29164c7bc37ab 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
@@ -105,7 +105,7 @@ public function testRecursiveGet()
 
         $this->assertSame(1, $counter);
         $this->assertSame(1, $v);
-        $this->assertSame(1, $cache->get('k2', function () { return 2; }));
+        $this->assertSame(1, $cache->get('k2', fn () => 2));
     }
 
     public function testDontSaveWhenAskedNotTo()
@@ -123,9 +123,7 @@ public function testDontSaveWhenA
10000
skedNotTo()
         });
         $this->assertSame($v1, 1);
 
-        $v2 = $cache->get('some-key', function () {
-            return 2;
-        });
+        $v2 = $cache->get('some-key', fn () => 2);
         $this->assertSame($v2, 2, 'First value was cached and should not have been');
 
         $v3 = $cache->get('some-key', function () {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php
index e289d039f3f36..e5cc91e12823e 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/DoctrineDbalAdapterTest.php
@@ -79,7 +79,7 @@ public function testConfigureSchema()
         $schema = new Schema();
 
         $adapter = new DoctrineDbalAdapter($connection);
-        $adapter->configureSchema($schema, $connection, fn() => true);
+        $adapter->configureSchema($schema, $connection, fn () => true);
         $this->assertTrue($schema->hasTable('cache_items'));
     }
 
@@ -100,7 +100,7 @@ public function testConfigureSchemaTableExists()
         $schema->createTable('cache_items');
 
         $adapter = new DoctrineDbalAdapter($connection);
-        $adapter->configureSchema($schema, $connection, fn() => true);
+        $adapter->configureSchema($schema, $connection, fn () => true);
         $table = $schema->getTable('cache_items');
         $this->assertEmpty($table->getColumns(), 'The table was not overwritten');
     }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
index 0cbe628c75759..d2aacb69e46ac 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
@@ -124,7 +124,7 @@ public function testServersSetting(string $dsn, string $host, int $port)
             'port' => $port,
         ];
 
-        $f = function ($s) { return ['host' => $s['host'], 'port' => $s['port']]; };
+        $f = fn ($s) => ['host' => $s['host'], 'port' => $s['port']];
         $this->assertSame([$expect], array_map($f, $client1->getServerList()));
         $this->assertSame([$expect], array_map($f, $client2->getServerList()));
         $this->assertSame([$expect], array_map($f, $client3->getServerList()));
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php
index 9752faab3aba9..5960618ec9b13 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php
@@ -48,9 +48,7 @@ public function testCleanupExpiredItems()
     {
         $pdo = new \PDO('sqlite:'.self::$dbFile);
 
-        $getCacheItemCount = function () use ($pdo) {
-            return (int) $pdo->query('SELECT COUNT(*) FROM cache_items')->fetch(\PDO::FETCH_COLUMN);
-        };
+        $getCacheItemCount = fn () => (int) $pdo->query('SELECT COUNT(*) FROM cache_items')->fetch(\PDO::FETCH_COLUMN);
 
         $this->assertSame(0, $getCacheItemCount());
 
diff --git a/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php b/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php
index 4bc238ed341bd..b53579fe97314 100644
--- a/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php
+++ b/src/Symfony/Component/Cache/Tests/Marshaller/DefaultMarshallerTest.php
@@ -82,7 +82,7 @@ public function testNativeUnserializeInvalid()
         $this->expectException(\DomainException::class);
         $this->expectExceptionMessage('unserialize(): Error at offset 0 of 3 bytes');
         $marshaller = new DefaultMarshaller();
-        set_error_handler(function () { return false; });
+        set_error_handler(fn () => false);
         try {
             @$marshaller->unmarshall(':::');
         } finally {
@@ -102,7 +102,7 @@ public function testIgbinaryUnserializeInvalid()
         $this->expectException(\DomainException::class);
         $this->expectExceptionMessage('igbinary_unserialize_zval: unknown type \'61\', position 5');
         $marshaller = new DefaultMarshaller();
-        set_error_handler(function () { return false; });
+        set_error_handler(fn () => false);
         try {
             @$marshaller->unmarshall(rawurldecode('%00%00%00%02abc'));
         } finally {
diff --git a/src/Symfony/Component/Cache/Tests/Messenger/EarlyExpirationDispatcherTest.php b/src/Symfony/Component/Cache/Tests/Messenger/EarlyExpirationDispatcherTest.php
index a471cc18d1045..cdaef155b5c28 100644
--- a/src/Symfony/Component/Cache/Tests/Messenger/EarlyExpirationDispatcherTest.php
+++ b/src/Symfony/Component/Cache/Tests/Messenger/EarlyExpirationDispatcherTest.php
@@ -67,7 +67,7 @@ public function __invoke(CacheItem $item)
             }
         });
 
-        $this->assertSame(345, $pool->get('foo', function () { return 345; }));
+        $this->assertSame(345, $pool->get('foo', fn () => 345));
         $this->assertTrue($saveResult);
 
         $expected = [
diff --git a/src/Symfony/Component/Cache/Traits/ContractsTrait.php b/src/Symfony/Component/Cache/Traits/ContractsTrait.php
index a8e347a32623e..60b7d2bf98b4e 100644
--- a/src/Symfony/Component/Cache/Traits/ContractsTrait.php
+++ b/src/Symfony/Component/Cache/Traits/ContractsTrait.php
@@ -54,9 +54,7 @@ public function setCallbackWrapper(?callable $callbackWrapper): callable
         }
 
         $previousWrapper = $this->callbackWrapper;
-        $this->callbackWrapper = $callbackWrapper ?? static function (callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata, ?LoggerInterface $logger) {
-            return $callback($item, $save);
-        };
+        $this->callbackWrapper = $callbackWrapper ?? static fn (callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata, ?LoggerInterface $logger) => $callback($item, $save);
 
         return $previousWrapper;
     }
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index e06029ee4f677..89f8f5e5d0f58 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -553,7 +553,7 @@ private function pipeline(\Closure $generator, object $redis = null): \Generator
 
         if (!$redis instanceof \Predis\ClientInterface && 'eval' === $command && $redis->getLastError()) {
             $e = new \RedisException($redis->getLastError());
-            $results = array_map(function ($v) use ($e) { return false === $v ? $e : $v; }, (array) $results);
+            $results = array_map(fn ($v) => false === $v ? $e : $v, (array) $results);
         }
 
         if (\is_bool($results)) {
diff --git a/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php b/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
index 8dc7f4cb5f885..44ad6ca894f75 100644
--- a/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
+++ b/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
@@ -426,9 +426,7 @@ private function getComment(BaseNode $node): string
             }
 
             if ($node instanceof EnumNode) {
-                $comment .= sprintf(' * @param ParamConfigurator|%s $value', implode('|', array_map(function ($a) {
-                    return var_export($a, true);
-                }, $node->getValues())))."\n";
+                $comment .= sprintf(' * @param ParamConfigurator|%s $value', implode('|', array_map(fn ($a) => var_export($a, true), $node->getValues())))."\n";
             } else {
                 $parameterTypes = $this->getParameterTypes($node);
                 $comment .= ' * @param ParamConfigurator|'.implode('|', $parameterTypes).' $value'."\n";
diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
index 8dee2d394aeb9..2eeb4a1a4f0ad 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
@@ -53,9 +53,7 @@ private function writeNode(NodeInterface $node, int $depth = 0, bool $root = fal
 
         // xml remapping
         if ($node->getParent()) {
-            $remapping = array_filter($node->getParent()->getXmlRemappings(), function (array $mapping) use ($rootName) {
-                return $rootName === $mapping[1];
-            });
+            $remapping = array_filter($node->getParent()->getXmlRemappings(), fn (array $mapping) => $rootName === $mapping[1]);
 
             if (\count($remapping)) {
                 [$singular] = current($remapping);
diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
index 7acfcd663b410..fde1dcb87d274 100644
--- a/src/Symfony/Component/Config/Resource/GlobResource.php
+++ b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -144,9 +144,7 @@ public function getIterator(): \Traversable
                 $files = iterator_to_array(new \RecursiveIteratorIterator(
                     new \RecursiveCallbackFilterIterator(
                         new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
-                        function (\SplFileInfo $file, $path) {
-                            return !isset($this->excludedPrefixes[str_replace('\\', '/', $path)]) && '.' !== $file->getBasename()[0];
-                        }
+                        fn (\SplFileInfo $file, $path) => !isset($this->excludedPrefixes[str_replace('\\', '/', $path)]) && '.' !== $file->getBasename()[0]
                     ),
                     \RecursiveIteratorIterator::LEAVES_ONLY
                 ));
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
index 279ff203c2ac8..c8d685dbef28c 100644
--- a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
+++ b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -154,7 +154,7 @@ private function generateSignature(\ReflectionClass $class): iterable
             }
         }
 
-        $defined = \Closure::bind(static function ($c) { return \defined($c); }, null, $class->name);
+        $defined = \Closure::bind(static fn ($c) => \defined($c), null, $class->name);
 
         foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) as $m) {
             foreach ($m->getAttributes() as $a) {
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
index a57a0c12c0890..9e77618170d9e 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
@@ -239,9 +239,7 @@ public function testUnsetChild()
             ->children()
                 ->scalarNode('value')
                     ->beforeNormalization()
-                        ->ifTrue(function ($value) {
-                            return empty($value);
-                        })
+                        ->ifTrue(fn ($value) => empty($value))
                         ->thenUnset()
                     ->end()
                 ->end()
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
index e96c57c409f8f..19a84e49b10fe 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
@@ -37,13 +37,13 @@ public function testIfTrueExpression()
         $this->assertFinalizedValueIs('new_value', $test, ['key' => true]);
 
         $test = $this->getTestBuilder()
-            ->ifTrue(function () { return true; })
+            ->ifTrue(fn () => true)
             ->then($this->returnClosure('new_value'))
         ->end();
         $this->assertFinalizedValueIs('new_value', $test);
 
         $test = $this->getTestBuilder()
-            ->ifTrue(function () { return false; })
+            ->ifTrue(fn () => false)
             ->then($this->returnClosure('new_value'))
         ->end();
         $this->assertFinalizedValueIs('value', $test);
@@ -241,9 +241,7 @@ protected function finalizeTestBuilder(NodeDefinition $nodeDefinition, array $co
      */
     protected function returnClosure($val): \Closure
     {
-        return function () use ($val) {
-            return $val;
-        };
+        return fn () => $val;
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Tests/Definition/NormalizationTest.php b/src/Symfony/Component/Config/Tests/Definition/NormalizationTest.php
index 0b497707e4604..07f949ae042ac 100644
--- a/src/Symfony/Component/Config/Tests/Definition/NormalizationTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/NormalizationTest.php
@@ -31,7 +31,7 @@ public function testNormalizeEncoders($denormalized)
                     ->node('encoders', 'array')
                         ->useAttributeAsKey('class')
                         ->prototype('array')
-                            ->beforeNormalization()->ifString()->then(function ($v) { return ['algorithm' => $v]; })->end()
+                            ->beforeNormalization()->ifString()->then(fn ($v) => ['algorithm' => $v])->end()
                             ->children()
                                 ->node('algorithm', 'scalar')->end()
                             ->end()
@@ -88,9 +88,7 @@ public function getEncoderTests(): array
             ],
         ];
 
-        return array_map(function ($v) {
-            return [$v];
-        }, $configs);
+        return array_map(fn ($v) => [$v], $configs);
     }
 
     /**
@@ -136,7 +134,7 @@ public function getAnonymousKeysTests(): array
             ],
         ];
 
-        return array_map(function ($v) { return [$v]; }, $configs);
+        return array_map(fn ($v) => [$v], $configs);
     }
 
     /**
@@ -167,7 +165,7 @@ public function getNumericKeysTests(): array
             ],
         ];
 
-        return array_map(function ($v) { return [$v]; }, $configs);
+        return array_map(fn ($v) => [$v], $configs);
     }
 
     public function testNonAssociativeArrayThrowsExceptionIfAttributeNotSet()
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index f900ec12a9574..40c7035af4875 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -687,9 +687,7 @@ public function find(string $name)
 
             if ($alternatives = $this->findAlternatives($name, $allCommands)) {
                 // remove hidden commands
-                $alternatives = array_filter($alternatives, function ($name) {
-                    return !$this->get($name)->isHidden();
-                });
+                $alternatives = array_filter($alternatives, fn ($name) => !$this->get($name)->isHidden());
 
                 if (1 == \count($alternatives)) {
                     $message .= "\n\nDid you mean this?\n    ";
@@ -840,9 +838,7 @@ protected function doRenderThrowable(\Throwable $e, OutputInterface $output): vo
             }
 
             if (str_contains($message, "@anonymous\0")) {
-                $message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {
-                    return class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0];
-                }, $message);
+                $message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message);
             }
 
             $width = $this->terminal->getWidth() ? $this->terminal->getWidth() - 1 : \PHP_INT_MAX;
@@ -1163,7 +1159,7 @@ private function findAlternatives(string $name, iterable $collection): array
             }
         }
 
-        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) { return $lev < 2 * $threshold; });
+        $alternatives = array_filter($alternatives, fn ($lev) => $lev < 2 * $threshold);
         ksort($alternatives, \SORT_NATURAL | \SORT_FLAG_CASE);
 
         return array_keys($alternatives);
diff --git a/src/Symfony/Component/Console/Command/CompleteCommand.php b/src/Symfony/Component/Console/Command/CompleteCommand.php
index ba3042e786278..b251f88716b14 100644
--- a/src/Symfony/Component/Console/Command/CompleteCommand.php
+++ b/src/Symfony/Component/Console/Command/CompleteCommand.php
@@ -155,7 +155,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
             $this->log('<info>Suggestions:</>');
             if ($options = $suggestions->getOptionSuggestions()) {
-                $this->log('  --'.implode(' --', array_map(function ($o) { return $o->getName(); }, $options)));
+                $this->log('  --'.implode(' --', array_map(fn ($o) => $o->getName(), $options)));
             } elseif ($values = $suggestions->getValueSuggestions()) {
                 $this->log('  '.implode(' ', $values));
             } else {
diff --git a/src/Symfony/Component/Console/Command/DumpCompletionCommand.php b/src/Symfony/Component/Console/Command/DumpCompletionCommand.php
index 1ad1c0e7b6bf7..54146d2305257 100644
--- a/src/Symfony/Component/Console/Command/DumpCompletionCommand.php
+++ b/src/Symfony/Component/Console/Command/DumpCompletionCommand.php
@@ -141,8 +141,6 @@ private function tailDebugLog(string $commandName, OutputInterface $output): voi
      */
     private function getSupportedShells(): array
     {
-        return $this->supportedShells ??= array_map(function ($f) {
-            return pathinfo($f, \PATHINFO_EXTENSION);
-        }, glob(__DIR__.'/../Resources/completion.*'));
+        return $this->supportedShells ??= array_map(fn ($f) => pathinfo($f, \PATHINFO_EXTENSION), glob(__DIR__.'/../Resources/completion.*'));
     }
 }
diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index d4134e170b454..29c7e61c13355 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -34,12 +34,8 @@ protected function configure()
         $this
             ->setName('help')
             ->setDefinition([
-                new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help', function () {
-                    return array_keys((new ApplicationDescription($this->getApplication()))->getCommands());
-                }),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt', function () {
-                    return (new DescriptorHelper())->getFormats();
-                }),
+                new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help', fn () => array_keys((new ApplicationDescription($this->getApplication()))->getCommands())),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt', fn () => (new DescriptorHelper())->getFormats()),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command help'),
             ])
             ->setDescription('Display help for a command')
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index cab88b4392291..91edfe695d2b6 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -30,13 +30,9 @@ protected function configure()
         $this
             ->setName('list')
             ->setDefinition([
-                new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name', null, function () {
-                    return array_keys((new ApplicationDescription($this->getApplication()))->getNamespaces());
-                }),
+                new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name', null, fn () => array_keys((new ApplicationDescription($this->getApplication()))->getNamespaces())),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt', function () {
-                    return (new DescriptorHelper())->getFormats();
-                }),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt', fn () => (new DescriptorHelper())->getFormats()),
                 new InputOption('short', null, InputOption::VALUE_NONE, 'To skip describing commands\' arguments'),
             ])
             ->setDescription('List commands')
diff --git a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
index fbd9c534616e0..16f78de1333a9 100644
--- a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
@@ -110,9 +110,7 @@ protected function describeCommand(Command $command, array $options = [])
                 .str_repeat('-', Helper::width($command->getName()) + 2)."\n\n"
                 .($command->getDescription() ? $command->getDescription()."\n\n" : '')
                 .'### Usage'."\n\n"
-                .array_reduce($command->getAliases(), function ($carry, $usage) {
-                    return $carry.'* `'.$usage.'`'."\n";
-                })
+                .array_reduce($command->getAliases(), fn ($carry, $usage) => $carry.'* `'.$usage.'`'."\n")
             );
 
             return;
@@ -125,9 +123,7 @@ protected function describeCommand(Command $command, array $options = [])
             .str_repeat('-', Helper::width($command->getName()) + 2)."\n\n"
             .($command->getDescription() ? $command->getDescription()."\n\n" : '')
             .'### Usage'."\n\n"
-            .array_reduce(array_merge([$command->getSynopsis()], $command->getAliases(), $command->getUsages()), function ($carry, $usage) {
-                return $carry.'* `'.$usage.'`'."\n";
-            })
+            .array_reduce(array_merge([$command->getSynopsis()], $command->getAliases(), $command->getUsages()), fn ($carry, $usage) => $carry.'* `'.$usage.'`'."\n")
         );
 
         if ($help = $command->getProcessedHelp()) {
@@ -157,9 +153,7 @@ protected function describeApplication(Application $application, array $options
             }
 
             $this->write("\n\n");
-            $this->write(implode("\n", array_map(function ($commandName) use ($description) {
-                return sprintf('* [`%s`](#%s)', $commandName, str_replace(':', '', $description->getCommand($commandName)->getName()));
-            }, $namespace['commands'])));
+            $this->write(implode("\n", array_map(fn ($commandName) => sprintf('* [`%s`](#%s)', $commandName, str_replace(':', '', $description->getCommand($commandName)->getName())), $namespace['commands'])));
         }
 
         foreach ($description->getCommands() as $command) {
diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
index 48a0b42af9b10..31f5b4063bd89 100644
--- a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -193,9 +193,7 @@ protected function describeApplication(Application $application, array $options
             }
 
             // calculate max. width based on available commands per namespace
-            $width = $this->getColumnWidth(array_merge(...array_values(array_map(function ($namespace) use ($commands) {
-                return array_intersect($namespace['commands'], array_keys($commands));
-            }, array_values($namespaces)))));
+            $width = $this->getColumnWidth(array_merge(...array_values(array_map(fn ($namespace) => array_intersect($namespace['commands'], array_keys($commands)), array_values($namespaces)))));
 
             if ($describedNamespace) {
                 $this->writeText(sprintf('<comment>Available commands for the "%s" namespace:</comment>', $describedNamespace), $options);
@@ -204,9 +202,7 @@ protected function describeApplication(Application $application, array $options
             }
 
             foreach ($namespaces as $namespace) {
-                $namespace['commands'] = array_filter($namespace['commands'], function ($name) use ($commands) {
-                    return isset($commands[$name]);
-                });
+                $namespace['commands'] = array_filter($namespace['commands'], fn ($name) => isset($commands[$name]));
 
                 if (!$namespace['commands']) {
                     continue;
diff --git a/src/Symfony/Component/Console/Helper/Dumper.php b/src/Symfony/Component/Console/Helper/Dumper.php
index ac7571ceafa7d..8c6a94d51fa5f 100644
--- a/src/Symfony/Component/Console/Helper/Dumper.php
+++ b/src/Symfony/Component/Console/Helper/Dumper.php
@@ -40,14 +40,12 @@ public function __construct(OutputInterface $output, CliDumper $dumper = null, C
                 return rtrim($dumper->dump(($this->cloner ??= new VarCloner())->cloneVar($var)->withRefHandles(false), true));
             };
         } else {
-            $this->handler = function ($var): string {
-                return match (true) {
-                    null === $var => 'null',
-                    true === $var => 'true',
-                    false === $var => 'false',
-                    \is_string($var) => '"'.$var.'"',
-                    default => rtrim(print_r($var, true)),
-                };
+            $this->handler = fn ($var): string => match (true) {
+                null === $var => 'null',
+                true === $var => 'true',
+                false === $var => 'false',
+                \is_string($var) => '"'.$var.'"',
+                default => rtrim(print_r($var, true)),
             };
         }
     }
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
index 8dad297d5e855..e5ed5c29b909b 100644
--- a/src/Symfony/Component/Console/Helper/ProgressBar.php
+++ b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -539,9 +539,7 @@ private static function initPlaceholderFormatters(): array
 
                 return $display;
             },
-            'elapsed' => function (self $bar) {
-                return Helper::formatTime(time() - $bar->getStartTime());
-            },
+            'elapsed' => fn (self $bar) => Helper::formatTime(time() - $bar->getStartTime()),
             'remaining' => function (self $bar) {
                 if (!$bar->getMaxSteps()) {
                     throw new LogicException('Unable to display the remaining time if the maximum number of steps is not set.');
@@ -556,18 +554,10 @@ private static function initPlaceholderFormatters(): array
 
                 return Helper::formatTime($bar->getEstimated());
             },
-            'memory' => function (self $bar) {
-                return Helper::formatMemory(memory_get_usage(true));
-            },
-            'current' => function (self $bar) {
-                return str_pad($bar->getProgress(), $bar->getStepWidth(), ' ', \STR_PAD_LEFT);
-            },
-            'max' => function (self $bar) {
-                return $bar->getMaxSteps();
-            },
-            'percent' => function (self $bar) {
-                return floor($bar->getProgressPercent() * 100);
-            },
+            'memory' => fn (self $bar) => Helper::formatMemory(memory_get_usage(true)),
+            'current' => fn (self $bar) => str_pad($bar->getProgress(), $bar->getStepWidth(), ' ', \STR_PAD_LEFT),
+            'max' => fn (self $bar) => $bar->getMaxSteps(),
+            'percent' => fn (self $bar) => floor($bar->getProgressPercent() * 100),
         ];
     }
 
@@ -611,9 +601,7 @@ private function buildLine(): string
         $line = preg_replace_callback($regex, $callback, $this->format);
 
         // gets string length for each sub line with multiline format
-        $linesLength = array_map(function ($subLine) {
-            return Helper::width(Helper::removeDecoration($this->output->getFormatter(), rtrim($subLine, "\r")));
-        }, explode("\n", $line));
+        $linesLength = array_map(fn ($subLine) => Helper::width(Helper::removeDecoration($this->output->getFormatter(), rtrim($subLine, "\r"))), explode("\n", $line));
 
         $linesWidth = max($linesLength);
 
diff --git a/src/Symfony/Component/Console/Helper/ProgressIndicator.php b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
index 172036465c5b8..5ca6309f8ff36 100644
--- a/src/Symfony/Component/Console/Helper/ProgressIndicator.php
+++ b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
@@ -218,18 +218,10 @@ private function getCurrentTimeInMilliseconds(): float
     private static function initPlaceholderFormatters(): array
     {
         return [
-            'indicator' => function (self $indicator) {
-                return $indicator->indicatorValues[$indicator->indicatorCurrent % \count($indicator->indicatorValues)];
-            },
-            'message' => function (self $indicator) {
-                return $indicator->message;
-            },
-            'elapsed' => function (self $indicator) {
-                return Helper::formatTime(time() - $indicator->startTime);
-            },
-            'memory' => function () {
-                return Helper::formatMemory(memory_get_usage(true));
-            },
+            'indicator' => fn (self $indicator) => $indicator->indicatorValues[$indicator->indicatorCurrent % \count($indicator->indicatorValues)],
+            'message' => fn (self $indicator) => $indicator->message,
+            'elapsed' => fn (self $indicator) => Helper::formatTime(time() - $indicator->startTime),
+            'memory' => fn () => Helper::formatMemory(memory_get_usage(true)),
         ];
     }
 }
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index c345b4af7747f..7297a236422eb 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -68,9 +68,7 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu
                 return $this->doAsk($output, $question);
             }
 
-            $interviewer = function () use ($output, $question) {
-                return $this->doAsk($output, $question);
-            };
+            $interviewer = fn () => $this->doAsk($output, $question);
 
             return $this->validateAttempts($interviewer, $output, $question);
         } catch (MissingInputException $exception) {
@@ -314,9 +312,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
 
                         $matches = array_filter(
                             $autocomplete($ret),
-                            function ($match) use ($ret) {
-                                return '' === $ret || str_starts_with($match, $ret);
-                            }
+                            fn ($match) => '' === $ret || str_starts_with($match, $ret)
                         );
                         $numMatches = \count($matches);
                         $ofs = -1;
diff --git a/src/Symfony/Component/Console/Helper/TableCellStyle.php b/src/Symfony/Component/Console/Helper/TableCellStyle.php
index 65ae9e728109f..9419dcb402e05 100644
--- a/src/Symfony/Component/Console/Helper/TableCellStyle.php
+++ b/src/Symfony/Component/Console/Helper/TableCellStyle.php
@@ -67,9 +67,7 @@ public function getTagOptions(): array
     {
         return array_filter(
             $this->getOptions(),
-            function ($key) {
-                return \in_array($key, self::TAG_OPTIONS) && isset($this->options[$key]);
-            },
+            fn ($key) => \in_array($key, self::TAG_OPTIONS) && isset($this->options[$key]),
             \ARRAY_FILTER_USE_KEY
         );
     }
diff --git a/src/Symfony/Component/Console/Input/Input.php b/src/Symfony/Component/Console/Input/Input.php
index 7b90713c865f5..4cfb0bb8d0d83 100644
--- a/src/Symfony/Component/Console/Input/Input.php
+++ b/src/Symfony/Component/Console/Input/Input.php
@@ -62,9 +62,7 @@ public function validate()
         $definition = $this->definition;
         $givenArguments = $this->arguments;
 
-        $missingArguments = array_filter(array_keys($definition->getArguments()), function ($argument) use ($definition, $givenArguments) {
-            return !\array_key_exists($argument, $givenArguments) && $definition->getArgument($argument)->isRequired();
-        });
+        $missingArguments = array_filter(array_keys($definition->getArguments()), fn ($argument) => !\array_key_exists($argument, $givenArguments) && $definition->getArgument($argument)->isRequired());
 
         if (\count($missingArguments) > 0) {
             throw new RuntimeException(sprintf('Not enough arguments (missing: "%s").', implode(', ', $missingArguments)));
diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
index b06db9459bccf..58b09c3543456 100644
--- a/src/Symfony/Component/Console/Question/Question.php
+++ b/src/Symfony/Component/Console/Question/Question.php
@@ -146,9 +146,7 @@ public function setAutocompleterValues(?iterable $values): static
         if (\is_array($values)) {
             $values = $this->isAssoc($values) ? array_merge(array_keys($values), array_values($values)) : array_values($values);
 
-            $callback = static function () use ($values) {
-                return $values;
-            };
+            $callback = static fn () => $values;
         } elseif ($values instanceof \Traversable) {
             $valueCache = null;
             $callback = static function () use ($values, &$valueCache) {
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
index 4dde785e86420..4225823b8d27a 100644
--- a/src/Symfony/Component/Console/Style/SymfonyStyle.php
+++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -92,9 +92,7 @@ public function section(string $message)
     public function listing(array $elements)
     {
         $this->autoPrependText();
-        $elements = array_map(function ($element) {
-            return sprintf(' * %s', $element);
-        }, $elements);
+        $elements = array_map(fn ($element) => sprintf(' * %s', $element), $elements);
 
         $this->writeln($elements);
         $this->newLine();
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index f6eff84dacec7..78f6c025bef37 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -164,7 +164,7 @@ public function testAllWithCommandLoader()
         $this->assertCount(1, $commands, '->all() takes a namespace as its first argument');
 
         $application->setCommandLoader(new FactoryCommandLoader([
-            'foo:bar1' => function () { return new \Foo1Command(); },
+            'foo:bar1' => fn () => new \Foo1Command(),
         ]));
         $commands = $application->all('foo');
         $this->assertCount(2, $commands, '->all() takes a namespace as its first argument');
@@ -255,7 +255,7 @@ public function testHasGetWithCommandLoader()
         $this->assertEquals($foo, $application->get('afoobar'), '->get() returns a command by alias');
 
         $application->setCommandLoader(new FactoryCommandLoader([
-            'foo:bar1' => function () { return new \Foo1Command(); },
+            'foo:bar1' => fn () => new \Foo1Command(),
         ]));
 
         $this->assertTrue($application->has('afoobar'), '->has() returns true if an instance is registered for an alias even with command loader');
@@ -405,7 +405,7 @@ public function testFindWithCommandLoader()
     {
         $application = new Application();
         $application->setCommandLoader(new FactoryCommandLoader([
-            'foo:bar' => $f = function () { return new \FooCommand(); },
+            'foo:bar' => $f = fn () => new \FooCommand(),
         ]));
 
         $this->assertInstanceOf(\FooCommand::class, $application->find('foo:bar'), '->find() returns a command if its name exists');
@@ -654,7 +654,7 @@ public function testFindAlternativeCommandsWithAnAlias()
 
         $application = new Application();
         $application->setCommandLoader(new FactoryCommandLoader([
-            'foo3' => static function () use ($fooCommand) { return $fooCommand; },
+            'foo3' => static fn () => $fooCommand,
         ]));
         $application->add($fooCommand);
 
@@ -1769,21 +1769,21 @@ public function testGetDisabledLazyCommand()
     {
         $this->expectException(CommandNotFoundException::class);
         $application = new Application();
-        $application->setCommandLoader(new FactoryCommandLoader(['disabled' => function () { return new DisabledCommand(); }]));
+        $application->setCommandLoader(new FactoryCommandLoader(['disabled' => fn () => new DisabledCommand()]));
         $application->get('disabled');
     }
 
     public function testHasReturnsFalseForDisabledLazyCommand()
     {
         $application = new Application();
-        $application->setCommandLoader(new FactoryCommandLoader(['disabled' => function () { return new DisabledCommand(); }]));
+        $application->setCommandLoader(new FactoryCommandLoader(['disabled' => fn () => new DisabledCommand()]));
         $this->assertFalse($application->has('disabled'));
     }
 
     public function testAllExcludesDisabledLazyCommand()
     {
         $application = new Application();
-        $application->setCommandLoader(new FactoryCommandLoader(['disabled' => function () { return new DisabledCommand(); }]));
+        $application->setCommandLoader(new FactoryCommandLoader(['disabled' => fn () => new DisabledCommand()]));
         $this->assertArrayNotHasKey('disabled', $application->all());
     }
 
@@ -1891,7 +1891,7 @@ public function testCommandNameMismatchWithCommandLoaderKeyThrows()
 
         $app = new Application();
         $loader = new FactoryCommandLoader([
-            'test' => static function () { return new Command('test-command'); },
+            'test' => static fn () => new Command('test-command'),
         ]);
 
         $app->setCommandLoader($loader);
@@ -2095,7 +2095,7 @@ private function createSignalableApplication(Command $command, ?EventDispatcherI
         if ($dispatcher) {
             $application->setDispatcher($dispatcher);
         }
-        $application->add(new LazyCommand('signal', [], '', false, function () use ($command) { return $command; }, true));
+        $application->add(new LazyCommand('signal', [], '', false, fn () => $command, true));
 
         return $application;
     }
diff --git a/src/Symfony/Component/Console/Tests/CommandLoader/ContainerCommandLoaderTest.php b/src/Symfony/Component/Console/Tests/CommandLoader/ContainerCommandLoaderTest.php
index e7f138933ae7a..f2049ef5cc8d7 100644
--- a/src/Symfony/Component/Console/Tests/CommandLoader/ContainerCommandLoaderTest.php
+++ b/src/Symfony/Component/Console/Tests/CommandLoader/ContainerCommandLoaderTest.php
@@ -22,8 +22,8 @@ class ContainerCommandLoaderTest extends TestCase
     public function testHas()
     {
         $loader = new ContainerCommandLoader(new ServiceLocator([
-            'foo-service' => function () { return new Command('foo'); },
-            'bar-service' => function () { return new Command('bar'); },
+            'foo-service' => fn () => new Command('foo'),
+            'bar-service' => fn () => new Command('bar'),
         ]), ['foo' => 'foo-service', 'bar' => 'bar-service']);
 
         $this->assertTrue($loader->has('foo'));
@@ -34,8 +34,8 @@ public function testHas()
     public function testGet()
     {
         $loader = new ContainerCommandLoader(new ServiceLocator([
-            'foo-service' => function () { return new Command('foo'); },
-            'bar-service' => function () { return new Command('bar'); },
+            'foo-service' => fn () => new Command('foo'),
+            'bar-service' => fn () => new Command('bar'),
         ]), ['foo' => 'foo-service', 'bar' => 'bar-service']);
 
         $this->assertInstanceOf(Command::class, $loader->get('foo'));
@@ -51,8 +51,8 @@ public function testGetUnknownCommandThrows()
     public function testGetCommandNames()
     {
         $loader = new ContainerCommandLoader(new ServiceLocator([
-            'foo-service' => function () { return new Command('foo'); },
-            'bar-service' => function () { return new Command('bar'); },
+            'foo-service' => fn () => new Command('foo'),
+            'bar-service' => fn () => new Command('bar'),
         ]), ['foo' => 'foo-service', 'bar' => 'bar-service']);
 
         $this->assertSame(['foo', 'bar'], $loader->getNames());
diff --git a/src/Symfony/Component/Console/Tests/CommandLoader/FactoryCommandLoaderTest.php b/src/Symfony/Component/Console/Tests/CommandLoader/FactoryCommandLoaderTest.php
index aebb429e652f7..148806413e78a 100644
--- a/src/Symfony/Component/Console/Tests/CommandLoader/FactoryCommandLoaderTest.php
+++ b/src/Symfony/Component/Console/Tests/CommandLoader/FactoryCommandLoaderTest.php
@@ -21,8 +21,8 @@ class FactoryCommandLoaderTest extends TestCase
     public function testHas()
     {
         $loader = new FactoryCommandLoader([
-            'foo' => function () { return new Command('foo'); },
-            'bar' => function () { return new Command('bar'); },
+            'foo' => fn () => new Command('foo'),
+            'bar' => fn () => new Command('bar'),
         ]);
 
         $this->assertTrue($loader->has('foo'));
@@ -33,8 +33,8 @@ public function testHas()
     public function testGet()
     {
         $loader = new FactoryCommandLoader([
-            'foo' => function () { return new Command('foo'); },
-            'bar' => function () { return new Command('bar'); },
+            'foo' => fn () => new Command('foo'),
+            'bar' => fn () => new Command('bar'),
         ]);
 
         $this->assertInstanceOf(Command::class, $loader->get('foo'));
@@ -50,8 +50,8 @@ public function testGetUnknownCommandThrows()
     public function testGetCommandNames()
     {
         $loader = new FactoryCommandLoader([
-            'foo' => function () { return new Command('foo'); },
-            'bar' => function () { return new Command('bar'); },
+            'foo' => fn () => new Command('foo'),
+            'bar' => fn () => new Command('bar'),
         ]);
 
         $this->assertSame(['foo', 'bar'], $loader->getNames());
diff --git a/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php
index e2880f22f4317..f9cd3b9111454 100644
--- a/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php
@@ -99,7 +99,7 @@ public function provideCommandsAndOutput()
         $args = new Process(['php', '-r', 'echo 42;']);
         $args = $args->getCommandLine();
         $successOutputProcessDebug = str_replace("'php' '-r' 'echo 42;'", $args, $successOutputProcessDebug);
-        $fromShellCommandline = method_exists(Process::class, 'fromShellCommandline') ? [Process::class, 'fromShellCommandline'] : function ($cmd) { return new Process($cmd); };
+        $fromShellCommandline = method_exists(Process::class, 'fromShellCommandline') ? [Process::class, 'fromShellCommandline'] : fn ($cmd) => new Process($cmd);
 
         return [
             ['', 'php -r "echo 42;"', StreamOutput::VERBOSITY_VERBOSE, null],
diff --git a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
index 3a44ba6626259..73b3a7c97e1b5 100644
--- a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
@@ -842,9 +842,7 @@ public function testWithSmallScreen()
 
     public function testAddingPlaceholderFormatter()
     {
-        ProgressBar::setPlaceholderFormatterDefinition('remaining_steps', function (ProgressBar $bar) {
-            return $bar->getMaxSteps() - $bar->getProgress();
-        });
+        ProgressBar::setPlaceholderFormatterDefinition('remaining_steps', fn (ProgressBar $bar) => $bar->getMaxSteps() - $bar->getProgress());
         $bar = new ProgressBar($output = $this->getOutputStream(), 3, 0);
         $bar->setFormat(' %remaining_steps% [%bar%]');
 
@@ -865,9 +863,7 @@ public function testAddingInstancePlaceholderFormatter()
     {
         $bar = new ProgressBar($output = $this->getOutputStream(), 3, 0);
         $bar->setFormat(' %countdown% [%bar%]');
-        $bar->setPlaceholderFormatter('countdown', $function = function (ProgressBar $bar) {
-            return $bar->getMaxSteps() - $bar->getProgress();
-        });
+        $bar->setPlaceholderFormatter('countdown', $function = fn (ProgressBar $bar) => $bar->getMaxSteps() - $bar->getProgress());
 
         $this->assertSame($function, $bar->getPlaceholderFormatter('countdown'));
 
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
index 1eb3eeed7de5b..59f8c7598f963 100644
--- a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -286,9 +286,7 @@ public function testAskWithAutocompleteCallback()
             $suggestionBase = $inputWords ? implode(' ', $inputWords).' ' : '';
 
             return array_map(
-                function ($word) use ($suggestionBase) {
-                    return $suggestionBase.$word.' ';
-                },
+                fn ($word) => $suggestionBase.$word.' ',
                 $knownWords
             );
         };
diff --git a/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
index 72c3f879f2c69..d32fbc2a58d93 100644
--- a/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -101,7 +101,7 @@ public function testAskReturnsNullIfValidatorAllowsIt()
     {
         $questionHelper = new SymfonyQuestionHelper();
         $question = new Question('What is your favorite superhero?');
-        $question->setValidator(function ($value) { return $value; });
+        $question->setValidator(fn ($value) => $value);
         $input = $this->createStreamableInputInterfaceMock($this->getInputStream("\n"));
         $this->assertNull($questionHelper->ask($input, $this->createOutputInterface(), $question));
     }
diff --git a/src/Symfony/Component/Console/Tests/Question/QuestionTest.php b/src/Symfony/Component/Console/Tests/Question/QuestionTest.php
index 55e9d58d4a2c7..8235e3995fdad 100644
--- a/src/Symfony/Component/Console/Tests/Question/QuestionTest.php
+++ b/src/Symfony/Component/Console/Tests/Question/QuestionTest.php
@@ -62,7 +62,7 @@ public function testIsHiddenDefault()
     public function testSetHiddenWithAutocompleterCallback()
     {
         $this->question->setAutocompleterCallback(
-            function (string $input): array { return []; }
+            fn (string $input): array => []
         );
 
         $this->expectException(\LogicException::class);
@@ -76,7 +76,7 @@ function (string $input): array { return []; }
     public function testSetHiddenWithNoAutocompleterCallback()
     {
         $this->question->setAutocompleterCallback(
-            function (string $input): array { return []; }
+            fn (string $input): array => []
         );
         $this->question->setAutocompleterCallback(null);
 
@@ -187,7 +187,7 @@ public function testGetAutocompleterValuesDefault()
 
     public function testGetSetAutocompleterCallback()
     {
-        $callback = function (string $input): array { return []; };
+        $callback = fn (string $input): array => [];
 
         $this->question->setAutocompleterCallback($callback);
         self::assertSame($callback, $this->question->getAutocompleterCallback());
@@ -208,7 +208,7 @@ public function testSetAutocompleterCallbackWhenHidden()
         );
 
         $this->question->setAutocompleterCallback(
-            function (string $input): array { return []; }
+            fn (string $input): array => []
         );
     }
 
@@ -220,7 +220,7 @@ public function testSetAutocompleterCallbackWhenNotHidden()
         $exception = null;
         try {
             $this->question->setAutocompleterCallback(
-                function (string $input): array { return []; }
+                fn (string $input): array => []
             );
         } catch (\Exception $exception) {
             // Do nothing
@@ -232,7 +232,7 @@ function (string $input): array { return []; }
     public function providerGetSetValidator()
     {
         return [
-            [function ($input) { return $input; }],
+            [fn ($input) => $input],
             [null],
         ];
     }
@@ -288,7 +288,7 @@ public function testGetMaxAttemptsDefault()
 
     public function testGetSetNormalizer()
     {
-        $normalizer = function ($input) { return $input; };
+        $normalizer = fn ($input) => $input;
         $this->question->setNormalizer($normalizer);
         self::assertSame($normalizer, $this->question->getNormalizer());
     }
diff --git a/src/Symfony/Component/CssSelector/Node/FunctionNode.php b/src/Symfony/Component/CssSelector/Node/FunctionNode.php
index 8428bacc9c2e9..938a82b1a70a5 100644
--- a/src/Symfony/Component/CssSelector/Node/FunctionNode.php
+++ b/src/Symfony/Component/CssSelector/Node/FunctionNode.php
@@ -64,9 +64,7 @@ public function getSpecificity(): Specificity
 
     public function __toString(): string
     {
-        $arguments = implode(', ', array_map(function (Token $token) {
-            return "'".$token->getValue()."'";
-        }, $this->arguments));
+        $arguments = implode(', ', array_map(fn (Token $token) => "'".$token->getValue()."'", $this->arguments));
 
         return sprintf('%s[%s:%s(%s)]', $this->getNodeName(), $this->selector, $this->name, $arguments ? '['.$arguments.']' : '');
     }
diff --git a/src/Symfony/Component/CssSelector/Parser/Parser.php b/src/Symfony/Component/CssSelector/Parser/Parser.php
index d611efec8d31f..101df57f3866f 100644
--- a/src/Symfony/Component/CssSelector/Parser/Parser.php
+++ b/src/Symfony/Component/CssSelector/Parser/Parser.php
@@ -57,9 +57,7 @@ public static function parseSeries(array $tokens): array
             }
         }
 
-        $joined = trim(implode('', array_map(function (Token $token) {
-            return $token->getValue();
-        }, $tokens)));
+        $joined = trim(implode('', array_map(fn (Token $token) => $token->getValue(), $tokens)));
 
         $int = function ($string) {
             if (!is_numeric($string)) {
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php
index 48a67f5ab6678..919357b5d9492 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php
@@ -25,9 +25,7 @@ public function testParser($source, $representation)
     {
         $parser = new Parser();
 
-        $this->assertEquals($representation, array_map(function (SelectorNode $node) {
-            return (string) $node->getTree();
-        }, $parser->parse($source)));
+        $this->assertEquals($representation, array_map(fn (SelectorNode $node) => (string) $node->getTree(), $parser->parse($source)));
     }
 
     /** @dataProvider getParserExceptionTestData */
diff --git a/src/Symfony/Component/DependencyInjection/Argument/ServiceLocator.php b/src/Symfony/Component/DependencyInjection/Argument/ServiceLocator.php
index fe927c91b887d..e58293489d419 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/ServiceLocator.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/ServiceLocator.php
@@ -43,6 +43,6 @@ public function get(string $id): mixed
 
     public function getProvidedServices(): array
     {
-        return $this->serviceTypes ??= array_map(function () { return '?'; }, $this->serviceMap);
+        return $this->serviceTypes ??= array_map(fn () => '?', $this->serviceMap);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 66a175d76c267..6aa1367d25995 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -518,9 +518,7 @@ private function createTypeNotFoundMessageCallback(TypedReference $reference, st
         }
         $currentId = $this->currentId;
 
-        return (function () use ($reference, $label, $currentId) {
-            return $this->createTypeNotFoundMessage($reference, $label, $currentId);
-        })->bindTo($this->typesClone);
+        return (fn () => $this->createTypeNotFoundMessage($reference, $label, $currentId))->bindTo($this->typesClone);
     }
 
     private function createTypeNotFoundMessage(TypedReference $reference, string $label, string $currentId): string
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
index 309bf63118d4e..9d433131b30a8 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
@@ -92,7 +92,7 @@ private function findAndSortTaggedServices(string|TaggedIteratorArgument $tagNam
             }
         }
 
-        uasort($services, static function ($a, $b) { return $b[0] <=> $a[0] ?: $a[1] <=> $b[1]; });
+        uasort($services, static fn ($a, $b) => $b[0] <=> $a[0] ?: $a[1] <=> $b[1]);
 
         $refs = [];
         foreach ($services as [, , $index, $serviceId, $class]) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
index c8217154741c9..2e404244ffa71 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -154,7 +154,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
     private function mergeConditionals(array $autoconfiguredInstanceof, array $instanceofConditionals, ContainerBuilder $container): array
     {
         // make each value an array of ChildDefinition
-        $conditionals = array_map(function ($childDef) { return [$childDef]; }, $autoconfiguredInstanceof);
+        $conditionals = array_map(fn ($childDef) => [$childDef], $autoconfiguredInstanceof);
 
         foreach ($instanceofConditionals as $interface => $instanceofDef) {
             // make sure the interface/class exists (but don't validate automaticInstanceofConditionals)
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index ae7ca22ee5035..5dcc490caa6c4 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1020,9 +1020,7 @@ private function createService(Definition $definition, array &$inlineServices, b
             } elseif (!\is_string($factory)) {
                 throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory.', $id));
             } elseif (str_starts_with($factory, '@=')) {
-                $factory = function (ServiceLocator $arguments) use ($factory) {
-                    return $this->getExpressionLanguage()->evaluate(substr($factory, 2), ['container' => $this, 'args' => $arguments]);
-                };
+                $factory = fn (ServiceLocator $arguments) => $this->getExpressionLanguage()->evaluate(substr($factory, 2), ['container' => $this, 'args' => $arguments]);
                 $arguments = [new ServiceLocatorArgument($arguments)];
             }
         }
@@ -1127,9 +1125,7 @@ private function doResolveServices(mixed $value, array &$inlineServices = [], bo
             }
         } elseif ($value instanceof ServiceClosureArgument) {
             $reference = $value->getValues()[0];
-            $value = function () use ($reference) {
-                return $this->resolveServices($reference);
-            };
+            $value = fn () => $this->resolveServices($reference);
         } elseif ($value instanceof IteratorArgument) {
             $value = new RewindableGenerator(function () use ($value, &$inlineServices) {
                 foreach ($value->getValues() as $k => $v) {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 0cd43d1504cc2..37e1b015f0bbb 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -920,7 +920,7 @@ protected static function {$methodName}(\$container$lazyInitialization)
             $c = $this->addServiceInclude($id, $definition, null !== $isProxyCandidate);
 
             if ('' !== $c && $isProxyCandidate && !$definition->isShared()) {
-                $c = implode("\n", array_map(function ($line) { return $line ? '    '.$line : $line; }, explode("\n", $c)));
+                $c = implode("\n", array_map(fn ($line) => $line ? '    '.$line : $line, explode("\n", $c)));
                 $code .= "        static \$include = true;\n\n";
                 $code .= "        if (\$include) {\n";
                 $code .= $c;
@@ -933,7 +933,7 @@ protected static function {$methodName}(\$container$lazyInitialization)
             $c = $this->addInlineService($id, $definition);
 
             if (!$isProxyCandidate && !$definition->isShared()) {
-                $c = implode("\n", array_map(function ($line) { return $line ? '    '.$line : $line; }, explode("\n", $c)));
+                $c = implode("\n", array_map(fn ($line) => $line ? '    '.$line : $line, explode("\n", $c)));
                 $lazyloadInitialization = $definition->isLazy() ? ', $lazyLoad = true' : '';
 
                 $c = sprintf("        %s = static function (\$container%s) {\n%s        };\n\n        return %1\$s(\$container);\n", $factory, $lazyloadInitialization, $c);
@@ -1684,7 +1684,7 @@ private function wrapServiceConditionals(mixed $value, string $code): string
         }
 
         // re-indent the wrapped code
-        $code = implode("\n", array_map(function ($line) { return $line ? '    '.$line : $line; }, explode("\n", $code)));
+        $code = implode("\n", array_map(fn ($line) => $line ? '    '.$line : $line, explode("\n", $code)));
 
         return sprintf("        if (%s) {\n%s        }\n", $condition, $code);
     }
@@ -1906,9 +1906,7 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
                 // the preg_replace_callback converts them to strings
                 return $this->dumpParameter($match[1]);
             } else {
-                $replaceParameters = function ($match) {
-                    return "'.".$this->dumpParameter($match[2]).".'";
-                };
+                $replaceParameters = fn ($match) => "'.".$this->dumpParameter($match[2]).".'";
 
                 $code = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', $replaceParameters, $this->export($value)));
 
@@ -2183,7 +2181,7 @@ private function doExport(mixed $value, bool $resolveEnv = false): mixed
         }
         if (\is_string($value) && str_contains($value, "\n")) {
             $cleanParts = explode("\n", $value);
-            $cleanParts = array_map(function ($part) { return var_export($part, true); }, $cleanParts);
+            $cleanParts = array_map(fn ($part) => var_export($part, true), $cleanParts);
             $export = implode('."\n".', $cleanParts);
         } else {
             $export = var_export($value, true);
diff --git a/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php b/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php
index 05028781a340d..d0cc1f70b5939 100644
--- a/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php
+++ b/src/Symfony/Component/DependencyInjection/ExpressionLanguageProvider.php
@@ -39,21 +39,11 @@ public function __construct(callable $serviceCompiler = null, \Closure $getEnv =
     public function getFunctions(): array
     {
         return [
-            new ExpressionFunction('service', $this->serviceCompiler ?? function ($arg) {
-                return sprintf('$container->get(%s)', $arg);
-            }, function (array $variables, $value) {
-                return $variables['container']->get($value);
-            }),
+            new ExpressionFunction('service', $this->serviceCompiler ?? fn ($arg) => sprintf('$container->get(%s)', $arg), fn (array $variables, $value) => $variables['container']->get($value)),
 
-            new ExpressionFunction('parameter', function ($arg) {
-                return sprintf('$container->getParameter(%s)', $arg);
-            }, function (array $variables, $value) {
-                return $variables['container']->getParameter($value);
-            }),
+            new ExpressionFunction('parameter', fn ($arg) => sprintf('$container->getParameter(%s)', $arg), fn (array $variables, $value) => $variables['container']->getParameter($value)),
 
-            new ExpressionFunction('env', function ($arg) {
-                return sprintf('$container->getEnv(%s)', $arg);
-            }, function (array $variables, $value) {
+            new ExpressionFunction('env', fn ($arg) => sprintf('$container->getEnv(%s)', $arg), function (array $variables, $value) {
                 if (!$this->getEnv) {
                     throw new LogicException('You need to pass a getEnv closure to the expression langage provider to use the "env" function.');
                 }
@@ -61,11 +51,7 @@ public function getFunctions(): array
                 return ($this->getEnv)($value);
             }),
 
-            new ExpressionFunction('arg', function ($arg) {
-                return sprintf('$args?->get(%s)', $arg);
-            }, function (array $variables, $value) {
-                return $variables['args']?->get($value);
-            }),
+            new ExpressionFunction('arg', fn ($arg) => sprintf('$args?->get(%s)', $arg), fn (array $variables, $value) => $variables['args']?->get($value)),
         ];
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Extension/ExtensionTrait.php b/src/Symfony/Component/DependencyInjection/Extension/ExtensionTrait.php
index d920b848a9118..5bd88892fb9b3 100644
--- a/src/Symfony/Component/DependencyInjection/Extension/ExtensionTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Extension/ExtensionTrait.php
@@ -40,7 +40,7 @@ private function executeConfiguratorCallback(ContainerBuilder $container, \Closu
             throw new \LogicException('Unable to create the ContainerConfigurator.');
         }
         $bundleLoader->setCurrentDir(\dirname($file));
-        $instanceof = &\Closure::bind(function &() { return $this->instanceof; }, $bundleLoader, $bundleLoader)();
+        $instanceof = &\Closure::bind(fn &() => $this->instanceof, $bundleLoader, $bundleLoader)();
 
         try {
             $callback(new ContainerConfigurator($container, $bundleLoader, $instanceof, $file, $file, $env));
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
index 91acd9a10ea7d..f98ee506d0032 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configu
10000
rator/ContainerConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
@@ -51,7 +51,7 @@ public function __construct(ContainerBuilder $container, PhpFileLoader $loader,
     final public function extension(string $namespace, array $config)
     {
         if (!$this->container->hasExtension($namespace)) {
-            $extensions = array_filter(array_map(function (ExtensionInterface $ext) { return $ext->getAlias(); }, $this->container->getExtensions()));
+            $extensions = array_filter(array_map(fn (ExtensionInterface $ext) => $ext->getAlias(), $this->container->getExtensions()));
             throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $namespace, $this->file, $namespace, $extensions ? implode('", "', $extensions) : 'none'));
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
index e417f30bf8d85..65b1c2d0651e5 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -182,7 +182,7 @@ private function configBuilder(string $namespace): ConfigBuilderInterface
         }
 
         if (!$this->container->hasExtension($alias)) {
-            $extensions = array_filter(array_map(function (ExtensionInterface $ext) { return $ext->getAlias(); }, $this->container->getExtensions()));
+            $extensions = array_filter(array_map(fn (ExtensionInterface $ext) => $ext->getAlias(), $this->container->getExtensions()));
             throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s". Looked for namespace "%s", found "%s".', $namespace, $alias, $extensions ? implode('", "', $extensions) : 'none'));
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 7c0ea3261300b..953a62a138b24 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -757,7 +757,7 @@ private function validateExtensions(\DOMDocument $dom, string $file)
 
             // can it be handled by an extension?
             if (!$this->container->hasExtension($node->namespaceURI)) {
-                $extensionNamespaces = array_filter(array_map(function (ExtensionInterface $ext) { return $ext->getNamespace(); }, $this->container->getExtensions()));
+                $extensionNamespaces = array_filter(array_map(fn (ExtensionInterface $ext) => $ext->getNamespace(), $this->container->getExtensions()));
                 throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $node->tagName, $file, $node->namespaceURI, $extensionNamespaces ? implode('", "', $extensionNamespaces) : 'none'));
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index ad61c14437d1a..45b8c7df85d47 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -774,7 +774,7 @@ private function validate(mixed $content, string $file): ?array
             }
 
             if (!$this->container->hasExtension($namespace)) {
-                $extensionNamespaces = array_filter(array_map(function (ExtensionInterface $ext) { return $ext->getAlias(); }, $this->container->getExtensions()));
+                $extensionNamespaces = array_filter(array_map(fn (ExtensionInterface $ext) => $ext->getAlias(), $this->container->getExtensions()));
                 throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $namespace, $file, $namespace, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none'));
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/ReverseContainer.php b/src/Symfony/Component/DependencyInjection/ReverseContainer.php
index 9b1d331d85e63..22d1b35df1d06 100644
--- a/src/Symfony/Component/DependencyInjection/ReverseContainer.php
+++ b/src/Symfony/Component/DependencyInjection/ReverseContainer.php
@@ -31,9 +31,7 @@ public function __construct(Container $serviceContainer, ContainerInterface $rev
         $this->serviceContainer = $serviceContainer;
         $this->reversibleLocator = $reversibleLocator;
         $this->tagName = $tagName;
-        $this->getServiceId = \Closure::bind(function (object $service): ?string {
-            return array_search($service, $this->services, true) ?: array_search($service, $this->privates, true) ?: null;
-        }, $serviceContainer, Container::class);
+        $this->getServiceId = \Closure::bind(fn (object $service): ?string => array_search($service, $this->services, true) ?: array_search($service, $this->privates, true) ?: null, $serviceContainer, Container::class);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
index 80ae50ada8761..8bb125906bd01 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RemoveUnusedDefinitionsPassTest.php
@@ -143,9 +143,7 @@ public function testProcessDoesNotErrorOnServicesThatDoNotHaveDefinitions()
     public function testProcessWorksWithClosureErrorsInDefinitions()
     {
         $definition = new Definition();
-        $definition->addError(function () {
-            return 'foo bar';
-        });
+        $definition->addError(fn () => 'foo bar');
 
         $container = new ContainerBuilder();
         $container
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
index e7bdb78615362..ffb05d78c78fc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
@@ -304,9 +304,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->scalarNode('scalar_node_not_empty_validated')
                     ->cannotBeEmpty()
                     ->validate()
-                        ->always(function ($value) {
-                            return $value;
-                        })
+                        ->always(fn ($value) => $value)
                     ->end()
                 ->end()
                 ->integerNode('int_node')->end()
@@ -314,8 +312,8 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->booleanNode('bool_node')->end()
                 ->arrayNode('array_node')
                     ->beforeNormalization()
-                        ->ifTrue(function ($value) { return !\is_array($value); })
-                        ->then(function ($value) { return ['child_node' => $value]; })
+                        ->ifTrue(fn ($value) => !\is_array($value))
+                        ->then(fn ($value) => ['child_node' => $value])
                     ->end()
                     ->beforeNormalization()
                         ->ifArray()
@@ -332,7 +330,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->booleanNode('bool_force_cast')->end()
                         ->integerNode('int_unset_at_zero')
                             ->validate()
-                                ->ifTrue(function ($value) { return 0 === $value; })
+                                ->ifTrue(fn ($value) => 0 === $value)
                                 ->thenUnset()
                             ->end()
                         ->end()
@@ -343,9 +341,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->variableNode('variable_node')->end()
                 ->scalarNode('string_node')
                     ->validate()
-                        ->ifTrue(function ($value) {
-                            return !\is_string($value) || 'fail' === $value;
-                        })
+                        ->ifTrue(fn ($value) => !\is_string($value) || 'fail' === $value)
                         ->thenInvalid('%s is not a valid string')
                     ->end()
                 ->end()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index 9ec5d0631fe61..c9cf9e5fd4410 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -1037,9 +1037,7 @@ public function testCompilesClassDefinitionsOfLazyServices()
 
         $matchingResources = array_filter(
             $container->getResources(),
-            function (ResourceInterface $resource) {
-                return 'reflection.BarClass' === (string) $resource;
-            }
+            fn (ResourceInterface $resource) => 'reflection.BarClass' === (string) $resource
         );
 
         $this->assertNotEmpty($matchingResources);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
index 0ea6aa5679096..5d6435ec06d9c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -264,10 +264,10 @@ public function testGetEnvBase64()
 
         $this->assertSame('hello', $result);
 
-        $result = $processor->getEnv('base64', 'foo', function ($name) { return '/+0='; });
+        $result = $processor->getEnv('base64', 'foo', fn ($name) => '/+0=');
         $this->assertSame("\xFF\xED", $result);
 
-        $result = $processor->getEnv('base64', 'foo', function ($name) { return '_-0='; });
+        $result = $processor->getEnv('base64', 'foo', fn ($name) => '_-0=');
         $this->assertSame("\xFF\xED", $result);
     }
 
@@ -509,9 +509,7 @@ public function testGetEnvEnumInvalidResolvedValue()
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Resolved value of "foo" did not result in a string or int value.');
 
-        $processor->getEnv('enum', StringBackedEnum::class.':foo', function () {
-            return null;
-        });
+        $processor->getEnv('enum', StringBackedEnum::class.':foo', fn () => null);
     }
 
     public function testGetEnvEnumInvalidArg()
@@ -521,9 +519,7 @@ public function testGetEnvEnumInvalidArg()
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('"bogus" is not a "BackedEnum".');
 
-        $processor->getEnv('enum', 'bogus:foo', function () {
-            return '';
-        });
+        $processor->getEnv('enum', 'bogus:foo', fn () => '');
     }
 
     public function testGetEnvEnumInvalidBackedValue()
@@ -533,9 +529,7 @@ public function testGetEnvEnumInvalidBackedValue()
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Enum value "bogus" is not backed by "'.StringBackedEnum::class.'".');
 
-        $processor->getEnv('enum', StringBackedEnum::class.':foo', function () {
-            return 'bogus';
-        });
+        $processor->getEnv('enum', StringBackedEnum::class.':foo', fn () => 'bogus');
     }
 
     /**
@@ -569,9 +563,7 @@ public function testRequireMissingFile()
         $this->expectExceptionMessage('missing-file');
         $processor = new EnvVarProcessor(new Container());
 
-        $processor->getEnv('require', '/missing-file', function ($name) {
-            return $name;
-        });
+        $processor->getEnv('require', '/missing-file', fn ($name) => $name);
     }
 
     public function testRequireFile()
@@ -600,9 +592,7 @@ public function testGetEnvResolve($value, $processed)
 
         $processor = new EnvVarProcessor($container);
 
-        $result = $processor->getEnv('resolve', 'foo', function () {
-            return '%bar%';
-        });
+        $result = $processor->getEnv('resolve', 'foo', fn () => '%bar%');
 
         $this->assertSame($processed, $result);
     }
@@ -622,9 +612,7 @@ public function testGetEnvResolveNoMatch()
     {
         $processor = new EnvVarProcessor(new Container());
 
-        $result = $processor->getEnv('resolve', 'foo', function () {
-            return '%%';
-        });
+        $result = $processor->getEnv('resolve', 'foo', fn () => '%%');
 
         $this->assertSame('%', $result);
     }
@@ -643,9 +631,7 @@ public function testGetEnvResolveNotScalar($value)
 
         $processor = new EnvVarProcessor($container);
 
-        $processor->getEnv('resolve', 'foo', function () {
-            return '%bar%';
-        });
+        $processor->getEnv('resolve', 'foo', fn () => '%bar%');
     }
 
     public function notScalarResolve()
@@ -665,9 +651,7 @@ public function testGetEnvResolveNestedEnv()
         $processor = new EnvVarProcessor($container);
         $getEnv = $processor->getEnv(...);
 
-        $result = $processor->getEnv('resolve', 'foo', function ($name) use ($getEnv) {
-            return 'foo' === $name ? '%env(BAR)%' : $getEnv('string', $name, function () {});
-        });
+        $result = $processor->getEnv('resolve', 'foo', fn ($name) => 'foo' === $name ? '%env(BAR)%' : $getEnv('string', $name, function () {}));
 
         $this->assertSame('BAR in container', $result);
     }
@@ -683,9 +667,7 @@ public function testGetEnvResolveNestedRealEnv()
         $processor = new EnvVarProcessor($container);
         $getEnv = $processor->getEnv(...);
 
-        $result = $processor->getEnv('resolve', 'foo', function ($name) use ($getEnv) {
-            return 'foo' === $name ? '%env(BAR)%' : $getEnv('string', $name, function () {});
-        });
+        $result = $processor->getEnv('resolve', 'foo', fn ($name) => 'foo' === $name ? '%env(BAR)%' : $getEnv('string', $name, function () {}));
 
         $this->assertSame('BAR in environment', $result);
 
@@ -835,9 +817,7 @@ public function testGetEnvInvalidPrefixWithDefault()
      */
     public function testGetEnvUrlPath(?string $expected, string $url)
     {
-        $this->assertSame($expected, (new EnvVarProcessor(new Container()))->getEnv('url', 'foo', static function () use ($url): string {
-            return $url;
-        })['path']);
+        $this->assertSame($expected, (new EnvVarProcessor(new Container()))->getEnv('url', 'foo', static fn (): string => $url)['path']);
     }
 
     public function provideGetEnvUrlPath()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php b/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
index 4abbfdad3717f..544c046d0097b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
@@ -28,9 +28,7 @@ public function testInstantiateProxy()
         $instantiator = new RealServiceInstantiator();
         $instance = new \stdClass();
         $container = $this->createMock(ContainerInterface::class);
-        $callback = function () use ($instance) {
-            return $instance;
-        };
+        $callback = fn () => $instance;
 
         $this->assertSame($instance, $instantiator->instantiateProxy($container, new Definition(), 'foo', $callback));
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
index 56a5fe0be4871..2404e8c0de234 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -1016,7 +1016,7 @@ public function testBindings()
             '$quz' => 'quz',
             '$factory' => 'factory',
             'iterable $baz' => new TaggedIteratorArgument('bar'),
-        ], array_map(function (BoundArgument $v) { return $v->getValues()[0]; }, $definition->getBindings()));
+        ], array_map(fn (BoundArgument $v) => $v->getValues()[0], $definition->getBindings()));
         $this->assertEquals([
             'quz',
             null,
@@ -1034,7 +1034,7 @@ public function testBindings()
             'NonExistent' => null,
             '$quz' => 'quz',
             '$factory' => 'factory',
-        ], array_map(function (BoundArgument $v) { return $v->getValues()[0]; }, $definition->getBindings()));
+        ], array_map(fn (BoundArgument $v) => $v->getValues()[0], $definition->getBindings()));
     }
 
     public function testFqcnLazyProxy()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
index 9515bfee92099..48006a5842a7f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -913,7 +913,7 @@ public function testBindings()
             '$quz' => 'quz',
             '$factory' => 'factory',
             'iterable $baz' => new TaggedIteratorArgument('bar'),
-        ], array_map(function (BoundArgument $v) { return $v->getValues()[0]; }, $definition->getBindings()));
+        ], array_map(fn (BoundArgument $v) => $v->getValues()[0], $definition->getBindings()));
         $this->assertEquals([
             'quz',
             null,
@@ -931,7 +931,7 @@ public function testBindings()
             'NonExistent' => null,
             '$quz' => 'quz',
             '$factory' => 'factory',
-        ], array_map(function (BoundArgument $v) { return $v->getValues()[0]; }, $definition->getBindings()));
+        ], array_map(fn (BoundArgument $v) => $v->getValues()[0], $definition->getBindings()));
     }
 
     public function testProcessNotExistingActionParam()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php b/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
index d8a3a0006dbc4..fdaefb1d23ab5 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
@@ -32,8 +32,8 @@ public function testGetThrowsOnUndefinedService()
         $this->expectException(NotFoundExceptionInterface::class);
         $this->expectExceptionMessage('Service "dummy" not found: the container inside "Symfony\Component\DependencyInjection\Tests\ServiceLocatorTest" is a smaller service locator that only knows about the "foo" and "bar" services.');
         $locator = $this->getServiceLocator([
-            'foo' => function () { return 'bar'; },
-            'bar' => function () { return 'baz'; },
+            'foo' => fn () => 'bar',
+            'bar' => fn () => 'baz',
         ]);
 
         $locator->get('dummy');
@@ -74,8 +74,8 @@ public function testGetThrowsServiceNotFoundException()
     public function testInvoke()
     {
         $locator = $this->getServiceLocator([
-            'foo' => function () { return 'bar'; },
-            'bar' => function () { return 'baz'; },
+            'foo' => fn () => 'bar',
+            'bar' => fn () => 'baz',
         ]);
 
         $this->assertSame('bar', $locator('foo'));
@@ -86,9 +86,9 @@ public function testInvoke()
     public function testProvidesServicesInformation()
     {
         $locator = new ServiceLocator([
-            'foo' => function () { return 'bar'; },
-            'bar' => function (): string { return 'baz'; },
-            'baz' => function (): ?string { return 'zaz'; },
+            'foo' => fn () => 'bar',
+            'bar' => fn (): string => 'baz',
+            'baz' => fn (): ?string => 'zaz',
         ]);
 
         $this->assertSame($locator->getProvidedServices(), [
diff --git a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
index 0fbd9196ff556..09388ad45982a 100644
--- a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
@@ -262,9 +262,7 @@ public function testNormalizeWhiteSpace()
 
     public function testEach()
     {
-        $data = $this->createTestCrawler()->filterXPath('//ul[1]/li')->each(function ($node, $i) {
-            return $i.'-'.$node->text();
-        });
+        $data = $this->createTestCrawler()->filterXPath('//ul[1]/li')->each(fn ($node, $i) => $i.'-'.$node->text());
 
         $this->assertEquals(['0-One', '1-Two', '2-Three'], $data, '->each() executes an anonymous function on each node of the list');
     }
@@ -290,9 +288,7 @@ public function testSlice()
     public function testReduce()
     {
         $crawler = $this->createTestCrawler()->filterXPath('//ul[1]/li');
-        $nodes = $crawler->reduce(function ($node, $i) {
-            return 1 !== $i;
-        });
+        $nodes = $crawler->reduce(fn ($node, $i) => 1 !== $i);
         $this->assertNotSame($nodes, $crawler, '->reduce() returns a new instance of a crawler');
         $this->assertInstanceOf(Crawler::class, $nodes, '->reduce() returns a new instance of a crawler');
 
diff --git a/src/Symfony/Component/Dotenv/Command/DebugCommand.php b/src/Symfony/Component/Dotenv/Command/DebugCommand.php
index fa76da97e9eb7..85cca991ca760 100644
--- a/src/Symfony/Component/Dotenv/Command/DebugCommand.php
+++ b/src/Symfony/Component/Dotenv/Command/DebugCommand.php
@@ -81,9 +81,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         $envFiles = $this->getEnvFiles();
-        $availableFiles = array_filter($envFiles, function (string $file) {
-            return is_file($this->getFilePath($file));
-        });
+        $availableFiles = array_filter($envFiles, fn (string $file) => is_file($this->getFilePath($file)));
 
         if (\in_array('.env.local.php', $availableFiles, true)) {
             $io->warning('Due to existing dump file (.env.local.php) all other dotenv files are skipped.');
@@ -94,11 +92,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         $io->section('Scanned Files (in descending priority)');
-        $io->listing(array_map(static function (string $envFile) use ($availableFiles) {
-            return \in_array($envFile, $availableFiles, true)
-                ? sprintf('<fg=green>✓</> %s', $envFile)
-                : sprintf('<fg=red>⨯</> %s', $envFile);
-        }, $envFiles));
+        $io->listing(array_map(static fn (string $envFile) => \in_array($envFile, $availableFiles, true)
+            ? sprintf('<fg=green>✓</> %s', $envFile)
+            : sprintf('<fg=red>⨯</> %s', $envFile), $envFiles));
 
         $nameFilter = $input->getArgument('filter');
         $variables = $this->getVariables($availableFiles, $nameFilter);
diff --git a/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php b/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php
index 153819f2a0804..2191e63bb02f1 100644
--- a/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php
+++ b/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php
@@ -140,7 +140,7 @@ private function convertFileToClass(string $path, string $file, string $prefix):
         ];
 
         if ($prefix) {
-            $candidates = array_filter($candidates, function ($candidate) use ($prefix) { return str_starts_with($candidate, $prefix); });
+            $candidates = array_filter($candidates, fn ($candidate) => str_starts_with($candidate, $prefix));
         }
 
         // We cannot use the autoloader here as most of them use require; but if the class
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
index 0bf1ef6aecfe5..581bfbee917de 100644
--- a/src/Symfony/Component/ErrorHandler/ErrorHandler.php
+++ b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -722,8 +722,6 @@ private function cleanTrace(array $backtrace, int $type, string &$file, int &$li
      */
     private function parseAnonymousClass(string $message): string
     {
-        return preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', static function ($m) {
-            return class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0];
-        }, $message);
+        return preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', static fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message);
     }
 }
diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
index 57f34d8fcad4a..758048cb9444e 100644
--- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
+++ b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
@@ -255,9 +255,7 @@ private function fileExcerpt(string $file, int $line, int $srcContext = 3): stri
             // remove main code/span tags
             $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
             // split multiline spans
-            $code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', function ($m) {
-                return "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>';
-            }, $code);
+            $code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', fn ($m) => "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>', $code);
             $content = explode('<br />', $code);
 
             $lines = [];
@@ -296,9 +294,7 @@ private function fixCodeMarkup(string $line)
 
     private function formatFileFromText(string $text)
     {
-        return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', function ($match) {
-            return 'in '.$this->formatFile($match[2], $match[3]);
-        }, $text);
+        return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', fn ($match) => 'in '.$this->formatFile($match[2], $match[3]), $text);
     }
 
     private function formatLogMessage(string $message, array $context)
diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
index 19d69fee000fc..461c26812c047 100644
--- a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
+++ b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
@@ -195,9 +195,7 @@ public function getMessage(): string
     public function setMessage(string $message): static
     {
         if (str_contains($message, "@anonymous\0")) {
-            $message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {
-                return class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0];
-            }, $message);
+            $message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $message);
         }
 
         $this->message = $message;
diff --git a/src/Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php
index ab2ea41a08c6c..f47973ccc4ff7 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php
@@ -120,7 +120,7 @@ public function testClassAlias()
      */
     public function testDeprecatedSuper(string $class, string $super, string $type)
     {
-        set_error_handler(function () { return false; });
+        set_error_handler(fn () => false);
         $e = error_reporting(0);
         trigger_error('', E_USER_DEPRECATED);
 
@@ -150,7 +150,7 @@ public function provideDeprecatedSuper(): array
 
     public function testInterfaceExtendsDeprecatedInterface()
     {
-        set_error_handler(function () { return false; });
+        set_error_handler(fn () => false);
         $e = error_reporting(0);
         trigger_error('', E_USER_NOTICE);
 
@@ -172,7 +172,7 @@ class_exists('Test\\'.NonDeprecatedInterfaceClass::class, true);
 
     public function testDeprecatedSuperInSameNamespace()
     {
-        set_error_handler(function () { return false; });
+        set_error_handler(fn () => false);
         $e = error_reporting(0);
         trigger_error('', E_USER_NOTICE);
 
@@ -242,7 +242,7 @@ class_exists(Fixtures\ExtendedFinalMethod::class, true);
 
     public function testExtendedDeprecatedMethodDoesntTriggerAnyNotice()
     {
-        set_error_handler(function () { return false; });
+        set_error_handler(fn () => false);
         $e = error_reporting(0);
         trigger_error('', E_USER_NOTICE);
 
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/SerializerErrorRendererTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/SerializerErrorRendererTest.php
index 77a28ecde69d6..211ed3177568a 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/SerializerErrorRendererTest.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/ErrorRenderer/SerializerErrorRendererTest.php
@@ -31,7 +31,7 @@ public function testSerializerContent()
         $exception = new \RuntimeException('Foo');
         $errorRenderer = new SerializerErrorRenderer(
             new Serializer([new ProblemNormalizer()], [new JsonEncoder()]),
-            function () { return 'json'; }
+            fn () => 'json'
         );
 
         $this->assertSame('{"type":"https:\/\/tools.ietf.org\/html\/rfc2616#section-10","title":"An error occurred","status":500,"detail":"Internal Server Error"}', $errorRenderer->render($exception)->getAsString());
diff --git a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
index dce4658c35edf..a7b0cae437761 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
@@ -272,9 +272,7 @@ public function testToStringEmptyMessage()
 
     public function testToString()
     {
-        $test = function ($a, $b, $c, $d) {
-            return new \RuntimeException('This is a test message');
-        };
+        $test = fn ($a, $b, $c, $d) => new \RuntimeException('This is a test message');
 
         $exception = $test('foo123', 1, null, 1.5);
 
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
index 51159d25078bc..6b7e074652e19 100644
--- a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
+++ b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -83,7 +83,7 @@ public function process(ContainerBuilder $container)
                     $event['method'] = 'on'.preg_replace_callback([
                         '/(?<=\b|_)[a-z]/i',
                         '/[^a-z0-9]/i',
-                    ], function ($matches) { return strtoupper($matches[0]); }, $event['event']);
+                    ], fn ($matches) => strtoupper($matches[0]), $event['event']);
                     $event['method'] = preg_replace('/[^a-z0-9]/i', '', $event['method']);
 
                     if (null !== ($class = $container->getDefinition($id)->getClass()) && ($r = $container->getReflectionClass($class, false)) && !$r->hasMethod($event['method']) && $r->hasMethod('__invoke')) {
diff --git a/src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
index a13e6f43f06f6..59f6fcbebfb37 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
@@ -347,7 +347,7 @@ public function testDispatchLazyListener()
     public function testRemoveFindsLazyListeners()
     {
         $test = new TestWithDispatcher();
-        $factory = function () use ($test) { return $test; };
+        $factory = fn () => $test;
 
         $this->dispatcher->addListener('foo', [$factory, 'foo']);
         $this->assertTrue($this->dispatcher->hasListeners('foo'));
@@ -363,7 +363,7 @@ public function testRemoveFindsLazyListeners()
     public function testPriorityFindsLazyListeners()
     {
         $test = new TestWithDispatcher();
-        $factory = function () use ($test) { return $test; };
+        $factory = fn () => $test;
 
         $this->dispatcher->addListener('foo', [$factory, 'foo'], 3);
         $this->assertSame(3, $this->dispatcher->getListenerPriority('foo', [$test, 'foo']));
@@ -376,7 +376,7 @@ public function testPriorityFindsLazyListeners()
     public function testGetLazyListeners()
     {
         $test = new TestWithDispatcher();
-        $factory = function () use ($test) { return $test; };
+        $factory = fn () => $test;
 
         $this->dispatcher->addListener('foo', [$factory, 'foo'], 3);
         $this->assertSame([[$test, 'foo']], $this->dispatcher->getListeners('foo'));
diff --git a/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
index 403bd7f4e913c..35bab1a9325da 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
@@ -75,7 +75,7 @@ public function testHasListenersDelegates()
     public function testAddListenerDisallowed()
     {
         $this->expectException(\BadMethodCallException::class);
-        $this->dispatcher->addListener('event', function () { return 'foo'; });
+        $this->dispatcher->addListener('event', fn () => 'foo');
     }
 
     public function testAddSubscriberDisallowed()
@@ -89,7 +89,7 @@ public function testAddSubscriberDisallowed()
     public function testRemoveListenerDisallowed()
     {
         $this->expectException(\BadMethodCallException::class);
-        $this->dispatcher->removeListener('event', function () { return 'foo'; });
+        $this->dispatcher->removeListener('event', fn () => 'foo');
     }
 
     public function testRemoveSubscriberDisallowed()
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
index e1f8ebc0919f1..d0ddd10f7d83f 100644
--- a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
+++ b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
@@ -82,13 +82,9 @@ public static function fromPhp(string $phpFunctionName, string $expressionFuncti
             throw new \InvalidArgumentException(sprintf('An expression function name must be defined when PHP function "%s" is namespaced.', $phpFunctionName));
         }
 
-        $compiler = function (...$args) use ($phpFunctionName) {
-            return sprintf('\%s(%s)', $phpFunctionName, implode(', ', $args));
-        };
+        $compiler = fn (...$args) => sprintf('\%s(%s)', $phpFunctionName, implode(', ', $args));
 
-        $evaluator = function ($p, ...$args) use ($phpFunctionName) {
-            return $phpFunctionName(...$args);
-        };
+        $evaluator = fn ($p, ...$args) => $phpFunctionName(...$args);
 
         return new self($expressionFunctionName ?: end($parts), $compiler, $evaluator);
     }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/TestProvider.php b/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/TestProvider.php
index 339c03ff1267a..daffca32574b5 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/TestProvider.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Fixtures/TestProvider.php
@@ -19,11 +19,7 @@ class TestProvider implements ExpressionFunctionProviderInterface
     public function getFunctions(): array
     {
         return [
-            new ExpressionFunction('identity', function ($input) {
-                return $input;
-            }, function (array $values, $input) {
-                return $input;
-            }),
+            new ExpressionFunction('identity', fn ($input) => $input, fn (array $values, $input) => $input),
 
             ExpressionFunction::fromPhp('strtoupper'),
 
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/FunctionNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/FunctionNodeTest.php
index c6cb02c1b9a43..062b001c2e21d 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/FunctionNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/FunctionNodeTest.php
@@ -41,12 +41,8 @@ public function getDumpData()
     protected function getCallables()
     {
         return [
-            'compiler' => function ($arg) {
-                return sprintf('foo(%s)', $arg);
-            },
-            'evaluator' => function ($variables, $arg) {
-                return $arg;
-            },
+            'compiler' => fn ($arg) => sprintf('foo(%s)', $arg),
+            'evaluator' => fn ($variables, $arg) => $arg,
         ];
     }
 }
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index c7f3dd29531f5..1ca852d29feac 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -438,11 +438,9 @@ public function makePathRelative(string $endPath, string $startPath): string
             $startPath = str_replace('\\', '/', $startPath);
         }
 
-        $splitDriveLetter = function ($path) {
-            return (\strlen($path) > 2 && ':' === $path[1] && '/' === $path[2] && ctype_alpha($path[0]))
-                ? [substr($path, 2), strtoupper($path[0])]
-                : [$path, null];
-        };
+        $splitDriveLetter = fn ($path) => (\strlen($path) > 2 && ':' === $path[1] && '/' === $path[2] && ctype_alpha($path[0]))
+            ? [substr($path, 2), strtoupper($path[0])]
+            : [$path, null];
 
         $splitPath = function ($path) {
             $result = [];
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index 7baecdf906260..76083f661e587 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -671,9 +671,7 @@ public function getIterator(): \Iterator
 
         $iterator = new \AppendIterator();
         foreach ($this->dirs as $dir) {
-            $iterator->append(new \IteratorIterator(new LazyIterator(function () use ($dir) {
-                return $this->searchInDirectory($dir);
-            })));
+            $iterator->append(new \IteratorIterator(new LazyIterator(fn () => $this->searchInDirectory($dir))));
         }
 
         foreach ($this->iterators as $it) {
diff --git a/src/Symfony/Component/Finder/Gitignore.php b/src/Symfony/Component/Finder/Gitignore.php
index 070074b3ba85c..bf05c5b3793bb 100644
--- a/src/Symfony/Component/Finder/Gitignore.php
+++ b/src/Symfony/Component/Finder/Gitignore.php
@@ -79,9 +79,7 @@ private static function lineToRegex(string $gitignoreLine): string
         }
 
         $regex = preg_quote(str_replace('\\', '', $gitignoreLine), '~');
-        $regex = preg_replace_callback('~\\\\\[((?:\\\\!)?)([^\[\]]*)\\\\\]~', function (array $matches): string {
-            return '['.('' !== $matches[1] ? '^' : '').str_replace('\\-', '-', $matches[2]).']';
-        }, $regex);
+        $regex = preg_replace_callback('~\\\\\[((?:\\\\!)?)([^\[\]]*)\\\\\]~', fn (array $matches): string => '['.('' !== $matches[1] ? '^' : '').str_replace('\\-', '-', $matches[2]).']', $regex);
         $regex = preg_replace('~(?:(?:\\\\\*){2,}(/?))+~', '(?:(?:(?!//).(?<!//))+$1)?', $regex);
         $regex = preg_replace('~\\\\\*~', '[^/]*', $regex);
         $regex = preg_replace('~\\\\\?~', '[^/]', $regex);
diff --git a/src/Symfony/Component/Finder/Iterator/SortableIterator.php b/src/Symfony/Component/Finder/Iterator/SortableIterator.php
index e8b556502ef81..177cd0b602d71 100644
--- a/src/Symfony/Component/Finder/Iterator/SortableIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/SortableIterator.php
@@ -48,21 +48,13 @@ public function __construct(\Traversable $iterator, int|callable $sort, bool $re
         $order = $reverseOrder ? -1 : 1;
 
         if (self::SORT_BY_NAME === $sort) {
-            $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
-                return $order * strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
-            };
+            $this->sort = static fn (\SplFileInfo $a, \SplFileInfo $b) => $order * strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
         } elseif (self::SORT_BY_NAME_NATURAL === $sort) {
-            $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
-                return $order * strnatcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
-            };
+            $this->sort = static fn (\SplFileInfo $a, \SplFileInfo $b) => $order * strnatcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
         } elseif (self::SORT_BY_NAME_CASE_INSENSITIVE === $sort) {
-            $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
-                return $order * strcasecmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
-            };
+            $this->sort = static fn (\SplFileInfo $a, \SplFileInfo $b) => $order * strcasecmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
         } elseif (self::SORT_BY_NAME_NATURAL_CASE_INSENSITIVE === $sort) {
-            $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
-                return $order * strnatcasecmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
-            };
+            $this->sort = static fn (\SplFileInfo $a, \SplFileInfo $b) => $order * strnatcasecmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
         } elseif (self::SORT_BY_TYPE === $sort) {
             $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
                 if ($a->isDir() && $b->isFile()) {
@@ -74,29 +66,19 @@ public function __construct(\Traversable $iterator, int|callable $sort, bool $re
                 return $order * strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
             };
         } elseif (self::SORT_BY_ACCESSED_TIME === $sort) {
-            $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
-                return $order * ($a->getATime() - $b->getATime());
-            };
+            $this->sort = static fn (\SplFileInfo $a, \SplFileInfo $b) => $order * ($a->getATime() - $b->getATime());
         } elseif (self::SORT_BY_CHANGED_TIME === $sort) {
-            $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
-                return $order * ($a->getCTime() - $b->getCTime());
-            };
+            $this->sort = static fn (\SplFileInfo $a, \SplFileInfo $b) => $order * ($a->getCTime() - $b->getCTime());
         } elseif (self::SORT_BY_MODIFIED_TIME === $sort) {
-            $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
-                return $order * ($a->getMTime() - $b->getMTime());
-            };
+            $this->sort = static fn (\SplFileInfo $a, \SplFileInfo $b) => $order * ($a->getMTime() - $b->getMTime());
         } elseif (self::SORT_BY_EXTENSION === $sort) {
-            $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
-                return $order * strnatcmp($a->getExtension(), $b->getExtension());
-            };
+            $this->sort = static fn (\SplFileInfo $a, \SplFileInfo $b) => $order * strnatcmp($a->getExtension(), $b->getExtension());
         } elseif (self::SORT_BY_SIZE === $sort) {
-            $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
-                return $order * ($a->getSize() - $b->getSize());
-            };
+            $this->sort = static fn (\SplFileInfo $a, \SplFileInfo $b) => $order * ($a->getSize() - $b->getSize());
         } elseif (self::SORT_BY_NONE === $sort) {
             $this->sort = $order;
         } elseif (\is_callable($sort)) {
-            $this->sort = $reverseOrder ? static function (\SplFileInfo $a, \SplFileInfo $b) use ($sort) { return -$sort($a, $b); } : $sort(...);
+            $this->sort = $reverseOrder ? static fn (\SplFileInfo $a, \SplFileInfo $b) => -$sort($a, $b) : $sort(...);
         } else {
             throw new \InvalidArgumentException('The SortableIterator takes a PHP callable or a valid built-in sort algorithm as an argument.');
         }
diff --git a/src/Symfony/Component/Finder/Iterator/VcsIgnoredFilterIterator.php b/src/Symfony/Component/Finder/Iterator/VcsIgnoredFilterIterator.php
index 29fc2d99b1af7..7e6051d38971a 100644
--- a/src/Symfony/Component/Finder/Iterator/VcsIgnoredFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/VcsIgnoredFilterIterator.php
@@ -126,9 +126,7 @@ private function parentDirectoriesUpTo(string $from, string $upTo): array
     {
         return array_filter(
             $this->parentDirectoriesUpwards($from),
-            static function (string $directory) use ($upTo): bool {
-                return str_starts_with($directory, $upTo);
-            }
+            static fn (string $directory): bool => str_starts_with($directory, $upTo)
         );
     }
 
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
index 85d7c278e6a95..796cf7c47ddae 100644
--- a/src/Symfony/Component/Finder/Tests/FinderTest.php
+++ b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -958,7 +958,7 @@ public function testSortByNameCaseInsensitive()
     public function testSort()
     {
         $finder = $this->buildFinder();
-        $this->assertSame($finder, $finder->sort(function (\SplFileInfo $a, \SplFileInfo $b) { return strcmp($a->getRealPath(), $b->getRealPath()); }));
+        $this->assertSame($finder, $finder->sort(fn (\SplFileInfo $a, \SplFileInfo $b) => strcmp($a->getRealPath(), $b->getRealPath())));
         $this->assertOrderedIterator($this->toAbsolute([
             'Zephire.php',
             'foo',
@@ -990,12 +990,8 @@ public function testSortAcrossDirectories()
             ])
             ->depth(0)
             ->files()
-            ->filter(static function (\SplFileInfo $file): bool {
-                return '' !== $file->getExtension();
-            })
-            ->sort(static function (\SplFileInfo $a, \SplFileInfo $b): int {
-                return strcmp($a->getExtension(), $b->getExtension()) ?: strcmp($a->getFilename(), $b->getFilename());
-            })
+            ->filter(static fn (\SplFileInfo $file): bool => '' !== $file->getExtension())
+            ->sort(static fn (\SplFileInfo $a, \SplFileInfo $b): int => strcmp($a->getExtension(), $b->getExtension()) ?: strcmp($a->getFilename(), $b->getFilename()))
         ;
 
         $this->assertOrderedIterator($this->toAbsolute([
@@ -1018,7 +1014,7 @@ public function testSortAcrossDirectories()
     public function testFilter()
     {
         $finder = $this->buildFinder();
-        $this->assertSame($finder, $finder->filter(function (\SplFileInfo $f) { return str_contains($f, 'test'); }));
+        $this->assertSame($finder, $finder->filter(fn (\SplFileInfo $f) => str_contains($f, 'test')));
         $this->assertIterator($this->toAbsolute(['test.php', 'test.py']), $finder->in(self::$tmpDir)->getIterator());
     }
 
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php
index 7c3c65ce5ee81..8538dd9e62494 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php
@@ -36,8 +36,8 @@ public function testAccept($filters, $expected)
     public function getAcceptData()
     {
         return [
-            [[function (\SplFileInfo $fileinfo) { return false; }], []],
-            [[function (\SplFileInfo $fileinfo) { return str_starts_with($fileinfo, 'test'); }], ['test.php', 'test.py']],
+            [[fn (\SplFileInfo $fileinfo) => false], []],
+            [[fn (\SplFileInfo $fileinfo) => str_starts_with($fileinfo, 'test')], ['test.php', 'test.py']],
             [['is_dir'], []],
         ];
     }
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php b/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php
index 71db60b48c9e3..e66f9362f09db 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php
@@ -19,9 +19,9 @@ protected function assertIterator($expected, \Traversable $iterator)
     {
         // set iterator_to_array $use_key to false to avoid values merge
         // this made FinderTest::testAppendWithAnArray() fail with GnuFinderAdapter
-        $values = array_map(function (\SplFileInfo $fileinfo) { return str_replace('/', \DIRECTORY_SEPARATOR, $fileinfo->getPathname()); }, iterator_to_array($iterator, false));
+        $values = array_map(fn (\SplFileInfo $fileinfo) => str_replace('/', \DIRECTORY_SEPARATOR, $fileinfo->getPathname()), iterator_to_array($iterator, false));
 
-        $expected = array_map(function ($path) { return str_replace('/', \DIRECTORY_SEPARATOR, $path); }, $expected);
+        $expected = array_map(fn ($path) => str_replace('/', \DIRECTORY_SEPARATOR, $path), $expected);
 
         sort($values);
         sort($expected);
@@ -31,8 +31,8 @@ protected function assertIterator($expected, \Traversable $iterator)
 
     protected function assertOrderedIterator($expected, \Traversable $iterator)
     {
-        $values = array_map(function (\SplFileInfo $fileinfo) { return str_replace('/', \DIRECTORY_SEPARATOR, $fileinfo->getPathname()); }, iterator_to_array($iterator));
-        $expected = array_map(function ($path) { return str_replace('/', \DIRECTORY_SEPARATOR, $path); }, $expected);
+        $values = array_map(fn (\SplFileInfo $fileinfo) => str_replace('/', \DIRECTORY_SEPARATOR, $fileinfo->getPathname()), iterator_to_array($iterator));
+        $expected = array_map(fn ($path) => str_replace('/', \DIRECTORY_SEPARATOR, $path), $expected);
 
         $this->assertEquals($expected, array_values($values));
     }
@@ -48,7 +48,7 @@ protected function assertOrderedIterator($expected, \Traversable $iterator)
      */
     protected function assertOrderedIteratorForGroups(array $expected, \Traversable $iterator)
     {
-        $values = array_values(array_map(function (\SplFileInfo $fileinfo) { return $fileinfo->getPathname(); }, iterator_to_array($iterator)));
+        $values = array_values(array_map(fn (\SplFileInfo $fileinfo) => $fileinfo->getPathname(), iterator_to_array($iterator)));
 
         foreach ($expected as $subarray) {
             $temp = [];
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/LazyIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/LazyIteratorTest.php
index 1a96c32d0b787..a32619cd4a618 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/LazyIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/LazyIteratorTest.php
@@ -27,9 +27,7 @@ public function testLazy()
 
     public function testDelegate()
     {
-        $iterator = new LazyIterator(function () {
-            return new Iterator(['foo', 'bar']);
-        });
+        $iterator = new LazyIterator(fn () => new Iterator(['foo', 'bar']));
 
         $this->assertCount(2, $iterator);
     }
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/MockFileListIterator.php b/src/Symfony/Component/Finder/Tests/Iterator/MockFileListIterator.php
index 670478d7a7524..5cee84c3b0c73 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/MockFileListIterator.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/MockFileListIterator.php
@@ -15,7 +15,7 @@ class MockFileListIterator extends \ArrayIterator
 {
     public function __construct(array $filesArray = [])
     {
-        $files = array_map(function ($file) { return new MockSplFileInfo($file); }, $filesArray);
+        $files = array_map(fn ($file) => new MockSplFileInfo($file), $filesArray);
         parent::__construct($files);
     }
 }
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php
index 182e58fbfe9c7..f8936f6f1b9e9 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php
@@ -267,7 +267,7 @@ public function getAcceptData()
             [SortableIterator::SORT_BY_CHANGED_TIME, $this->toAbsolute($sortByChangedTime)],
             [SortableIterator::SORT_BY_MODIFIED_TIME, $this->toAbsolute($sortByModifiedTime)],
             [SortableIterator::SORT_BY_NAME_NATURAL, $this->toAbsolute($sortByNameNatural)],
-            [function (\SplFileInfo $a, \SplFileInfo $b) { return strcmp($a->getRealPath(), $b->getRealPath()); }, $this->toAbsolute($customComparison)],
+            [fn (\SplFileInfo $a, \SplFileInfo $b) => strcmp($a->getRealPath(), $b->getRealPath()), $this->toAbsolute($customComparison)],
         ];
     }
 }
diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
index 524bbf4355cf7..8c25c19ccf49e 100644
--- a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
+++ b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
@@ -64,9 +64,7 @@ public function __construct(iterable $choices, callable $value = null)
         }
 
         if (null === $value && $this->castableToString($choices)) {
-            $value = function ($choice) {
-                return false === $choice ? '0' : (string) $choice;
-            };
+            $value = fn ($choice) => false === $choice ? '0' : (string) $choice;
         }
 
         if (null !== $value) {
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
index ef3769934167d..c417b84ac5755 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
@@ -35,9 +35,7 @@ public function createListFromChoices(iterable $choices, callable $value = null,
         if ($filter) {
             // filter the choice list lazily
             return $this->createListFromLoader(new FilterChoiceLoaderDecorator(
-                new CallbackChoiceLoader(static function () use ($choices) {
-                    return $choices;
-                }
+                new CallbackChoiceLoader(static fn () => $choices
                 ), $filter), $value);
         }
 
@@ -67,9 +65,7 @@ public function createView(ChoiceListInterface $list, array|callable $preferredC
             } else {
                 // make sure we have keys that reflect order
                 $preferredChoices = array_values($preferredChoices);
-                $preferredChoices = static function ($choice) use ($preferredChoices) {
-                    return array_search($choice, $preferredChoices, true);
-                };
+                $preferredChoices = static fn ($choice) => array_search($choice, $preferredChoices, true);
             }
         }
 
@@ -137,11 +133,9 @@ public function createView(ChoiceListInterface $list, array|callable $preferredC
             );
         }
 
-        uksort($preferredViews, static function ($a, $b) use ($preferredViewsOrder): int {
-            return isset($preferredViewsOrder[$a], $preferredViewsOrder[$b])
-                ? $preferredViewsOrder[$a] <=> $preferredViewsOrder[$b]
-                : 0;
-        });
+        uksort($preferredViews, static fn ($a, $b): int => isset($preferredViewsOrder[$a], $preferredViewsOrder[$b])
+            ? $preferredViewsOrder[$a] <=> $preferredViewsOrder[$b]
+            : 0);
 
         return new ChoiceListView($otherViews, $preferredViews);
     }
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
index 2f29bda726cab..b0b8e479d8aba 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
@@ -63,13 +63,11 @@ public function createListFromChoices(iterable $choices, mixed $value = null, mi
 
         if ($value instanceof PropertyPathInterface) {
             $accessor = $this->propertyAccessor;
-            $value = function ($choice) use ($accessor, $value) {
-                // The callable may be invoked with a non-object/array value
-                // when such values are passed to
-                // ChoiceListInterface::getValuesForChoices(). Handle this case
-                // so that the call to getValue() doesn't break.
-                return \is_object($choice) || \is_array($choice) ? $accessor->getValue($choice, $value) : null;
-            };
+            // The callable may be invoked with a non-object/array value
+            // when such values are passed to
+            // ChoiceListInterface::getValuesForChoices(). Handle this case
+            // so that the call to getValue() doesn't break.
+            $value = fn ($choice) => \is_object($choice) || \is_array($choice) ? $accessor->getValue($choice, $value) : null;
         }
 
         if (\is_string($filter)) {
@@ -78,9 +76,7 @@ public function createListFromChoices(iterable $choices, mixed $value = null, mi
 
         if ($filter instanceof PropertyPath) {
             $accessor = $this->propertyAccessor;
-            $filter = static function ($choice) use ($accessor, $filter) {
-                return (\is_object($choice) || \is_array($choice)) && $accessor->getValue($choice, $filter);
-            };
+            $filter = static fn ($choice) => (\is_object($choice) || \is_array($choice)) && $accessor->getValue($choice, $filter);
         }
 
         return $this->decoratedFactory->createListFromChoices($choices, $value, $filter);
@@ -94,13 +90,11 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, mixed $value
 
         if ($value instanceof PropertyPathInterface) {
             $accessor = $this->propertyAccessor;
-            $value = function ($choice) use ($accessor, $value) {
-                // The callable may be invoked with a non-object/array value
-                // when such values are passed to
-                // ChoiceListInterface::getValuesForChoices(). Handle this case
-                // so that the call to getValue() doesn't break.
-                return \is_object($choice) || \is_array($choice) ? $accessor->getValue($choice, $value) : null;
-            };
+            // The callable may be invoked with a non-object/array value
+            // when such values are passed to
+            // ChoiceListInterface::getValuesForChoices(). Handle this case
+            // so that the call to getValue() doesn't break.
+            $value = fn ($choice) => \is_object($choice) || \is_array($choice) ? $accessor->getValue($choice, $value) : null;
         }
 
         if (\is_string($filter)) {
@@ -109,9 +103,7 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, mixed $value
 
         if ($filter instanceof PropertyPath) {
             $accessor = $this->propertyAccessor;
-            $filter = static function ($choice) use ($accessor, $filter) {
-                return (\is_object($choice) || \is_array($choice)) && $accessor->getValue($choice, $filter);
-            };
+            $filter = static fn ($choice) => (\is_object($choice) || \is_array($choice)) && $accessor->getValue($choice, $filter);
         }
 
         return $this->decoratedFactory->createListFromLoader($loader, $value, $filter);
@@ -126,9 +118,7 @@ public function createView(ChoiceListInterface $list, mixed $preferredChoices =
         }
 
         if ($label instanceof PropertyPathInterface) {
-            $label = function ($choice) use ($accessor, $label) {
-                return $accessor->getValue($choice, $label);
-            };
+            $label = fn ($choice) => $accessor->getValue($choice, $label);
         }
 
         if (\is_string($preferredChoices)) {
@@ -151,9 +141,7 @@ public function createView(ChoiceListInterface $list, mixed $preferredChoices =
         }
 
         if ($index instanceof PropertyPathInterface) {
-            $index = function ($choice) use ($accessor, $index) {
-                return $accessor->getValue($choice, $index);
-            };
+            $index = fn ($choice) => $accessor->getValue($choice, $index);
         }
 
         if (\is_string($groupBy)) {
@@ -176,9 +164,7 @@ public function createView(ChoiceListInterface $list, mixed $preferredChoices =
         }
 
         if ($attr instanceof PropertyPathInterface) {
-            $attr = function ($choice) use ($accessor, $attr) {
-                return $accessor->getValue($choice, $attr);
-            };
+            $attr = fn ($choice) => $accessor->getValue($choice, $attr);
         }
 
         if (\is_string($labelTranslationParameters)) {
@@ -186,9 +172,7 @@ public function createView(ChoiceListInterface $list, mixed $preferredChoices =
         }
 
         if ($labelTranslationParameters instanceof PropertyPath) {
-            $labelTranslationParameters = static function ($choice) use ($accessor, $labelTranslationParameters) {
-                return $accessor->getValue($choice, $labelTranslationParameters);
-            };
+            $labelTranslationParameters = static fn ($choice) => $accessor->getValue($choice, $labelTranslationParameters);
         }
 
         return $this->decoratedFactory->createView(
diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
index 0aadd4347a8f9..a4975470c9b79 100644
--- a/src/Symfony/Component/Form/Command/DebugCommand.php
+++ b/src/Symfony/Component/Form/Command/DebugCommand.php
@@ -204,7 +204,7 @@ private function getCoreTypes(): array
         $coreExtension = new CoreExtension();
         $loadTypesRefMethod = (new \ReflectionObject($coreExtension))->getMethod('loadTypes');
         $coreTypes = $loadTypesRefMethod->invoke($coreExtension);
-        $coreTypes = array_map(function (FormTypeInterface $type) { return $type::class; }, $coreTypes);
+        $coreTypes = array_map(fn (FormTypeInterface $type) => $type::class, $coreTypes);
         sort($coreTypes);
 
         return $coreTypes;
@@ -237,7 +237,7 @@ private function findAlternatives(string $name, array $collection): array
         }
 
         $threshold = 1e3;
-        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) { return $lev < 2 * $threshold; });
+        $alternatives = array_filter($alternatives, fn ($lev) => $lev < 2 * $threshold);
         ksort($alternatives, \SORT_NATURAL | \SORT_FLAG_CASE);
 
         return array_keys($alternatives);
diff --git a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
index 53151574bdeb0..
10000
317287f174478 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
@@ -35,9 +35,7 @@ protected function describeDefaults(array $options)
     {
         if ($options['core_types']) {
             $this->output->section('Built-in form types (Symfony\Component\Form\Extension\Core\Type)');
-            $shortClassNames = array_map(function ($fqcn) {
-                return $this->formatClassLink($fqcn, \array_slice(explode('\\', $fqcn), -1)[0]);
-            }, $options['core_types']);
+            $shortClassNames = array_map(fn ($fqcn) => $this->formatClassLink($fqcn, \array_slice(explode('\\', $fqcn), -1)[0]), $options['core_types']);
             for ($i = 0, $loopsMax = \count($shortClassNames); $i * 5 < $loopsMax; ++$i) {
                 $this->output->writeln(' '.implode(', ', \array_slice($shortClassNames, $i * 5, 5)));
             }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
index d513694a4ccf8..b9f5c3f478305 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
@@ -42,9 +42,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $emptyData = function (FormInterface $form, $viewData) {
-            return $viewData;
-        };
+        $emptyData = fn (FormInterface $form, $viewData) => $viewData;
 
         $resolver->setDefaults([
             'value' => '1',
@@ -52,9 +50,7 @@ public function configureOptions(OptionsResolver $resolver)
             'compound' => false,
             'false_values' => [null],
             'invalid_message' => 'The checkbox has an invalid value.',
-            'is_empty_callback' => static function ($modelData): bool {
-                return false === $modelData;
-            },
+            'is_empty_callback' => static fn ($modelData): bool => false === $modelData,
         ]);
 
         $resolver->setAllowedTypes('false_values', 'array');
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 65692faeb48e8..051795b9571da 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -245,13 +245,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         // closure here that is optimized for the value of the form, to
         // avoid making the type check inside the closure.
         if ($options['multiple']) {
-            $view->vars['is_selected'] = function ($choice, array $values) {
-                return \in_array($choice, $values, true);
-            };
+            $view->vars['is_selected'] = fn ($choice, array $values) => \in_array($choice, $values, true);
         } else {
-            $view->vars['is_selected'] = function ($choice, $value) {
-                return $choice === $value;
-            };
+            $view->vars['is_selected'] = fn ($choice, $value) => $choice === $value;
         }
 
         // Check if the choices already contain the empty value
@@ -301,9 +297,7 @@ public function configureOptions(OptionsResolver $resolver)
             return '';
         };
 
-        $placeholderDefault = function (Options $options) {
-            return $options['required'] ? null : '';
-        };
+        $placeholderDefault = fn (Options $options) => $options['required'] ? null : '';
 
         $placeholderNormalizer = function (Options $options, $placeholder) {
             if ($options['multiple']) {
@@ -324,9 +318,7 @@ public function configureOptions(OptionsResolver $resolver)
             return $placeholder;
         };
 
-        $compound = function (Options $options) {
-            return $options['expanded'];
-        };
+        $compound = fn (Options $options) => $options['expanded'];
 
         $choiceTranslationDomainNormalizer = function (Options $options, $choiceTranslationDomain) {
             if (true === $choiceTranslationDomain) {
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
index 25aa652f5cc72..69f284c8233f4 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
@@ -33,9 +33,7 @@ public function configureOptions(OptionsResolver $resolver)
                 $choiceTranslationLocale = $options['choice_translation_locale'];
                 $alpha3 = $options['alpha3'];
 
-                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale, $alpha3) {
-                    return array_flip($alpha3 ? Countries::getAlpha3Names($choiceTranslationLocale) : Countries::getNames($choiceTranslationLocale));
-                }), [$choiceTranslationLocale, $alpha3]);
+                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(fn () => array_flip($alpha3 ? Countries::getAlpha3Names($choiceTranslationLocale) : Countries::getNames($choiceTranslationLocale))), [$choiceTranslationLocale, $alpha3]);
             },
             'choice_translation_domain' => false,
             'choice_translation_locale' => null,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
index 435bc157091bc..f697f35416225 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
@@ -32,9 +32,7 @@ public function configureOptions(OptionsResolver $resolver)
 
                 $choiceTranslationLocale = $options['choice_translation_locale'];
 
-                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
-                    return array_flip(Currencies::getNames($choiceTranslationLocale));
-                }), $choiceTranslationLocale);
+                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(fn () => array_flip(Currencies::getNames($choiceTranslationLocale))), $choiceTranslationLocale);
             },
             'choice_translation_domain' => false,
             'choice_translation_locale' => null,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
index e745c1af045ee..db1a14b52b74d 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
@@ -159,16 +159,10 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $compound = function (Options $options) {
-            return 'single_text' !== $options['widget'];
-        };
-        $emptyData = function (Options $options) {
-            return 'single_text' === $options['widget'] ? '' : [];
-        };
+        $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+        $emptyData = fn (Options $options) => 'single_text' === $options['widget'] ? '' : [];
 
-        $placeholderDefault = function (Options $options) {
-            return $options['required'] ? null : '';
-        };
+        $placeholderDefault = fn (Options $options) => $options['required'] ? null : '';
 
         $placeholderNormalizer = function (Options $options, $placeholder) use ($placeholderDefault) {
             if (\is_array($placeholder)) {
@@ -180,20 +174,16 @@ public function configureOptions(OptionsResolver $resolver)
             return array_fill_keys(self::TIME_PARTS, $placeholder);
         };
 
-        $labelsNormalizer = function (Options $options, array $labels) {
-            return array_replace([
-                'years' => null,
-                'months' => null,
-                'days' => null,
-                'weeks' => null,
-                'hours' => null,
-                'minutes' => null,
-                'seconds' => null,
-                'invert' => 'Negative interval',
-            ], array_filter($labels, function ($label) {
-                return null !== $label;
-            }));
-        };
+        $labelsNormalizer = fn (Options $options, array $labels) => array_replace([
+            'years' => null,
+            'months' => null,
+            'days' => null,
+            'weeks' => null,
+            'hours' => null,
+            'minutes' => null,
+            'seconds' => null,
+            'invert' => 'Negative interval',
+        ], array_filter($labels, fn ($label) => null !== $label));
 
         $resolver->setDefaults([
             'with_years' => true,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
index 35022530e6873..bf7a734a9b2c5 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -107,12 +107,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]));
 
             if ($emptyData instanceof \Closure) {
-                $lazyEmptyData = static function ($option) use ($emptyData) {
-                    return static function (FormInterface $form) use ($emptyData, $option) {
-                        $emptyData = $emptyData($form->getParent());
+                $lazyEmptyData = static fn ($option) => static function (FormInterface $form) use ($emptyData, $option) {
+                    $emptyData = $emptyData($form->getParent());
 
-                        return $emptyData[$option] ?? '';
-                    };
+                    return $emptyData[$option] ?? '';
                 };
 
                 $dateOptions['empty_data'] = $lazyEmptyData('date');
@@ -222,19 +220,13 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $compound = function (Options $options) {
-            return 'single_text' !== $options['widget'];
-        };
+        $compound = fn (Options $options) => 'single_text' !== $options['widget'];
 
         // Defaults to the value of "widget"
-        $dateWidget = function (Options $options) {
-            return 'single_text' === $options['widget'] ? null : $options['widget'];
-        };
+        $dateWidget = fn (Options $options) => 'single_text' === $options['widget'] ? null : $options['widget'];
 
         // Defaults to the value of "widget"
-        $timeWidget = function (Options $options) {
-            return 'single_text' === $options['widget'] ? null : $options['widget'];
-        };
+        $timeWidget = fn (Options $options) => 'single_text' === $options['widget'] ? null : $options['widget'];
 
         $resolver->setDefaults([
             'input' => 'datetime',
@@ -260,9 +252,7 @@ public function configureOptions(OptionsResolver $resolver)
             'compound' => $compound,
             'date_label' => null,
             'time_label' => null,
-            'empty_data' => function (Options $options) {
-                return $options['compound'] ? [] : '';
-            },
+            'empty_data' => fn (Options $options) => $options['compound'] ? [] : '',
             'input_format' => 'Y-m-d H:i:s',
             'invalid_message' => 'Please enter a valid date and time.',
         ]);
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
index d88819ebd673e..b18df900ff68e 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -81,12 +81,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $emptyData = $builder->getEmptyData() ?: [];
 
             if ($emptyData instanceof \Closure) {
-                $lazyEmptyData = static function ($option) use ($emptyData) {
-                    return static function (FormInterface $form) use ($emptyData, $option) {
-                        $emptyData = $emptyData($form->getParent());
+                $lazyEmptyData = static fn ($option) => static function (FormInterface $form) use ($emptyData, $option) {
+                    $emptyData = $emptyData($form->getParent());
 
-                        return $emptyData[$option] ?? '';
-                    };
+                    return $emptyData[$option] ?? '';
                 };
 
                 $yearOptions['empty_data'] = $lazyEmptyData('year');
@@ -218,13 +216,9 @@ public function finishView(FormView $view, FormInterface $form, array $options)
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $compound = function (Options $options) {
-            return 'single_text' !== $options['widget'];
-        };
+        $compound = fn (Options $options) => 'single_text' !== $options['widget'];
 
-        $placeholderDefault = function (Options $options) {
-            return $options['required'] ? null : '';
-        };
+        $placeholderDefault = fn (Options $options) => $options['required'] ? null : '';
 
         $placeholderNormalizer = function (Options $options, $placeholder) use ($placeholderDefault) {
             if (\is_array($placeholder)) {
@@ -260,9 +254,7 @@ public function configureOptions(OptionsResolver $resolver)
             ];
         };
 
-        $format = function (Options $options) {
-            return 'single_text' === $options['widget'] ? self::HTML5_FORMAT : self::DEFAULT_FORMAT;
-        };
+        $format = fn (Options $options) => 'single_text' === $options['widget'] ? self::HTML5_FORMAT : self::DEFAULT_FORMAT;
 
         $resolver->setDefaults([
             'years' => range((int) date('Y') - 5, (int) date('Y') + 5),
@@ -285,9 +277,7 @@ public function configureOptions(OptionsResolver $resolver)
             // this option.
             'data_class' => null,
             'compound' => $compound,
-            'empty_data' => function (Options $options) {
-                return $options['compound'] ? [] : '';
-            },
+            'empty_data' => fn (Options $options) => $options['compound'] ? [] : '',
             'choice_translation_domain' => false,
             'input_format' => 'Y-m-d',
             'invalid_message' => 'Please enter a valid date.',
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/EnumType.php b/src/Symfony/Component/Form/Extension/Core/Type/EnumType.php
index 33944c2aec7c4..003819e065738 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/EnumType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/EnumType.php
@@ -28,12 +28,8 @@ public function configureOptions(OptionsResolver $resolver): void
             ->setRequired(['class'])
             ->setAllowedTypes('class', 'string')
             ->setAllowedValues('class', enum_exists(...))
-            ->setDefault('choices', static function (Options $options): array {
-                return $options['class']::cases();
-            })
-            ->setDefault('choice_label', static function (\UnitEnum $choice): string {
-                return $choice->name;
-            })
+            ->setDefault('choices', static fn (Options $options): array => $options['class']::cases())
+            ->setDefault('choice_label', static fn (\UnitEnum $choice): string => $choice->name)
             ->setDefault('choice_value', static function (Options $options): ?\Closure {
                 if (!is_a($options['class'], \BackedEnum::class, true)) {
                     return null;
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
index 9e8e81394e8ce..d1bad77505c69 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -104,14 +104,10 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $dataClass = null;
         if (class_exists(File::class)) {
-            $dataClass = function (Options $options) {
-                return $options['multiple'] ? null : File::class;
-            };
+            $dataClass = fn (Options $options) => $options['multiple'] ? null : File::class;
         }
 
-        $emptyData = function (Options $options) {
-            return $options['multiple'] ? [] : null;
-        };
+        $emptyData = fn (Options $options) => $options['multiple'] ? [] : null;
 
         $resolver->setDefaults([
             'compound' => false,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
index e7ae6373bad01..c08d5f9b522ce 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -134,37 +134,25 @@ public function configureOptions(OptionsResolver $resolver)
         parent::configureOptions($resolver);
 
         // Derive "data_class" option from passed "data" object
-        $dataClass = function (Options $options) {
-            return isset($options['data']) && \is_object($options['data']) ? $options['data']::class : null;
-        };
+        $dataClass = fn (Options $options) => isset($options['data']) && \is_object($options['data']) ? $options['data']::class : null;
 
         // Derive "empty_data" closure from "data_class" option
         $emptyData = function (Options $options) {
             $class = $options['data_class'];
 
             if (null !== $class) {
-                return function (FormInterface $form) use ($class) {
-                    return $form->isEmpty() && !$form->isRequired() ? null : new $class();
-                };
+                return fn (FormInterface $form) => $form->isEmpty() && !$form->isRequired() ? null : new $class();
             }
 
-            return function (FormInterface $form) {
-                return $form->getConfig()->getCompound() ? [] : '';
-            };
+            return fn (FormInterface $form) => $form->getConfig()->getCompound() ? [] : '';
         };
 
         // Wrap "post_max_size_message" in a closure to translate it lazily
-        $uploadMaxSizeMessage = function (Options $options) {
-            return function () use ($options) {
-                return $options['post_max_size_message'];
-            };
-        };
+        $uploadMaxSizeMessage = fn (Options $options) => fn () => $options['post_max_size_message'];
 
         // For any form that is not represented by a single HTML control,
         // errors should bubble up by default
-        $errorBubbling = function (Options $options) {
-            return $options['compound'] && !$options['inherit_data'];
-        };
+        $errorBubbling = fn (Options $options) => $options['compound'] && !$options['inherit_data'];
 
         // If data is given, the form is locked to that data
         // (independent of its value)
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
index d4adca1f5993a..0cdde9e46bb25 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
@@ -32,9 +32,7 @@ public function configureOptions(OptionsResolver $resolver)
 
                 $choiceTranslationLocale = $options['choice_translation_locale'];
 
-                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
-                    return array_flip(Locales::getNames($choiceTranslationLocale));
-                }), $choiceTranslationLocale);
+                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(fn () => array_flip(Locales::getNames($choiceTranslationLocale))), $choiceTranslationLocale);
             },
             'choice_translation_domain' => false,
             'choice_translation_locale' => null,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index 2b8bbb5010214..78929d79bf464 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -96,12 +96,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $emptyData = $builder->getEmptyData() ?: [];
 
             if ($emptyData instanceof \Closure) {
-                $lazyEmptyData = static function ($option) use ($emptyData) {
-                    return static function (FormInterface $form) use ($emptyData, $option) {
-                        $emptyData = $emptyData($form->getParent());
+                $lazyEmptyData = static fn ($option) => static function (FormInterface $form) use ($emptyData, $option) {
+                    $emptyData = $emptyData($form->getParent());
 
-                        return $emptyData[$option] ?? '';
-                    };
+                    return $emptyData[$option] ?? '';
                 };
 
                 $hourOptions['empty_data'] = $lazyEmptyData('hour');
@@ -235,13 +233,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $compound = function (Options $options) {
-            return 'single_text' !== $options['widget'];
-        };
+        $compound = fn (Options $options) => 'single_text' !== $options['widget'];
 
-        $placeholderDefault = function (Options $options) {
-            return $options['required'] ? null : '';
-        };
+        $placeholderDefault = fn (Options $options) => $options['required'] ? null : '';
 
         $placeholderNormalizer = function (Options $options, $placeholder) use ($placeholderDefault) {
             if (\is_array($placeholder)) {
@@ -324,9 +318,7 @@ public function configureOptions(OptionsResolver $resolver)
             // representation is not \DateTime, but an array, we need to unset
             // this option.
             'data_class' => null,
-            'empty_data' => function (Options $options) {
-                return $options['compound'] ? [] : '';
-            },
+            'empty_data' => fn (Options $options) => $options['compound'] ? [] : '',
             'compound' => $compound,
             'choice_translation_domain' => false,
             'invalid_message' => 'Please enter a valid time.',
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
index edea6678e2ef0..d6ce3c3435e22 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
@@ -48,14 +48,10 @@ public function configureOptions(OptionsResolver $resolver)
 
                     $choiceTranslationLocale = $options['choice_translation_locale'];
 
-                    return ChoiceList::loader($this, new IntlCallbackChoiceLoader(function () use ($input, $choiceTranslationLocale) {
-                        return self::getIntlTimezones($input, $choiceTranslationLocale);
-                    }), [$input, $choiceTranslationLocale]);
+                    return ChoiceList::loader($this, new IntlCallbackChoiceLoader(fn () => self::getIntlTimezones($input, $choiceTranslationLocale)), [$input, $choiceTranslationLocale]);
                 }
 
-                return ChoiceList::lazy($this, function () use ($input) {
-                    return self::getPhpTimezones($input);
-                }, $input);
+                return ChoiceList::lazy($this, fn () => self::getPhpTimezones($input), $input);
             },
             'choice_translation_domain' => false,
             'choice_translation_locale' => null,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
index 760bb880b1bd0..5b05e0a310544 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
@@ -91,13 +91,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $compound = function (Options $options) {
-            return 'single_text' !== $options['widget'];
-        };
+        $compound = fn (Options $options) => 'single_text' !== $options['widget'];
 
-        $placeholderDefault = function (Options $options) {
-            return $options['required'] ? null : '';
-        };
+        $placeholderDefault = fn (Options $options) => $options['required'] ? null : '';
 
         $placeholderNormalizer = function (Options $options, $placeholder) use ($placeholderDefault) {
             if (\is_array($placeholder)) {
@@ -137,13 +133,9 @@ public function configureOptions(OptionsResolver $resolver)
             'widget' => 'single_text',
             'input' => 'array',
             'placeholder' => $placeholderDefault,
-            'html5' => static function (Options $options) {
-                return 'single_text' === $options['widget'];
-            },
+            'html5' => static fn (Options $options) => 'single_text' === $options['widget'],
             'error_bubbling' => false,
-            'empty_data' => function (Options $options) {
-                return $options['compound'] ? [] : '';
-            },
+            'empty_data' => fn (Options $options) => $options['compound'] ? [] : '',
             'compound' => $compound,
             'choice_translation_domain' => false,
             'invalid_message' => 'Please enter a valid week.',
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
index 0fca88069b066..cdc13c9d0394c 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -229,20 +229,16 @@ protected function getCasters(): array
 
                 return $a;
             },
-            FormInterface::class => function (FormInterface $f, array $a) {
-                return [
-                    Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
-                    Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub($f->getConfig()->getType()->getInnerType()::class),
-                ];
-            },
+            FormInterface::class => fn (FormInterface $f, array $a) => [
+                Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
+                Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub($f->getConfig()->getType()->getInnerType()::class),
+            ],
             FormView::class => StubCaster::cutInternals(...),
-            ConstraintViolationInterface::class => function (ConstraintViolationInterface $v, array $a) {
-                return [
-                    Caster::PREFIX_VIRTUAL.'root' => $v->getRoot(),
-                    Caster::PREFIX_VIRTUAL.'path' => $v->getPropertyPath(),
-                    Caster::PREFIX_VIRTUAL.'value' => $v->getInvalidValue(),
-                ];
-            },
+            ConstraintViolationInterface::class => fn (ConstraintViolationInterface $v, array $a) => [
+                Caster::PREFIX_VIRTUAL.'root' => $v->getRoot(),
+                Caster::PREFIX_VIRTUAL.'path' => $v->getPropertyPath(),
+                Caster::PREFIX_VIRTUAL.'value' => $v->getInvalidValue(),
+            ],
         ];
     }
 
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
index 26653dc9985b0..b28cf870b0c23 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
@@ -47,9 +47,7 @@ public function configureOptions(OptionsResolver $resolver)
         parent::configureOptions($resolver);
 
         // Constraint should always be converted to an array
-        $constraintsNormalizer = function (Options $options, $constraints) {
-            return \is_object($constraints) ? [$constraints] : (array) $constraints;
-        };
+        $constraintsNormalizer = fn (Options $options, $constraints) => \is_object($constraints) ? [$constraints] : (array) $constraints;
 
         $resolver->setDefaults([
             'error_mapping' => [],
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
index 664a3edae2766..0e8a4ccf14fbc 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
@@ -24,9 +24,7 @@ class RepeatedTypeValidatorExtension extends AbstractTypeExtension
     public function configureOptions(OptionsResolver $resolver)
     {
         // Map errors to the first field
-        $errorMapping = function (Options $options) {
-            return ['.' => $options['first_name']];
-        };
+        $errorMapping = fn (Options $options) => ['.' => $options['first_name']];
 
         $resolver->setDefaults([
             'error_mapping' => $errorMapping,
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
index 14f6c8f2d8b7e..c720e6a0ecbd0 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
@@ -36,11 +36,7 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $translator = $this->translator;
         $translationDomain = $this->translationDomain;
-        $resolver->setNormalizer('upload_max_size_message', function (Options $options, $message) use ($translator, $translationDomain) {
-            return function () use ($translator, $translationDomain, $message) {
-                return $translator->trans($message(), [], $translationDomain);
-            };
-        });
+        $resolver->setNormalizer('upload_max_size_message', fn (Options $options, $message) => fn () => $translator->trans($message(), [], $translationDomain));
     }
 
     public static function getExtendedTypes(): iterable
diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
index 6fb47884d2e21..4d65d071ee563 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
@@ -66,9 +66,7 @@ public function __construct(MetadataFactoryInterface $metadataFactory)
 
     public function guessType(string $class, string $property): ?TypeGuess
     {
-        return $this->guess($class, $property, function (Constraint $constraint) {
-            return $this->guessTypeForConstraint($constraint);
-        });
+        return $this->guess($class, $property, fn (Constraint $constraint) => $this->guessTypeForConstraint($constraint));
     }
 
     public function guessRequired(string $class, string $property): ?ValueGuess
@@ -82,16 +80,12 @@ public function guessRequired(string $class, string $property): ?ValueGuess
 
     public function guessMaxLength(string $class, string $property): ?ValueGuess
     {
-        return $this->guess($class, $property, function (Constraint $constraint) {
-            return $this->guessMaxLengthForConstraint($constraint);
-        });
+        return $this->guess($class, $property, fn (Constraint $constraint) => $this->guessMaxLengthForConstraint($constraint));
     }
 
     public function guessPattern(string $class, string $property): ?ValueGuess
     {
-        return $this->guess($class, $property, function (Constraint $constraint) {
-            return $this->guessPatternForConstraint($constraint);
-        });
+        return $this->guess($class, $property, fn (Constraint $constraint) => $this->guessPatternForConstraint($constraint));
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
index 7acf8c7251a3c..9d6344c8695e6 100644
--- a/src/Symfony/Component/Form/Form.php
+++ b/src/Symfony/Component/Form/Form.php
@@ -930,9 +930,7 @@ private function sort(array &$children): void
             return;
         }
 
-        uksort($children, static function ($a, $b) use ($c): int {
-            return [$c[$b]['p'], $c[$a]['i']] <=> [$c[$a]['p'], $c[$b]['i']];
-        });
+        uksort($children, static fn ($a, $b): int => [$c[$b]['p'], $c[$a]['i']] <=> [$c[$a]['p'], $c[$b]['i']]);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/FormTypeGuesserChain.php b/src/Symfony/Component/Form/FormTypeGuesserChain.php
index 7d8f617f7baaa..2ac8e3c263ab1 100644
--- a/src/Symfony/Component/Form/FormTypeGuesserChain.php
+++ b/src/Symfony/Component/Form/FormTypeGuesserChain.php
@@ -45,30 +45,22 @@ public function __construct(iterable $guessers)
 
     public function guessType(string $class, string $property): ?TypeGuess
     {
-        return $this->guess(function ($guesser) use ($class, $property) {
-            return $guesser->guessType($class, $property);
-        });
+        return $this->guess(fn ($guesser) => $guesser->guessType($class, $property));
     }
 
     public function guessRequired(string $class, string $property): ?ValueGuess
     {
-        return $this->guess(function ($guesser) use ($class, $property) {
-            return $guesser->guessRequired($class, $property);
-        });
+        return $this->guess(fn ($guesser) => $guesser->guessRequired($class, $property));
     }
 
     public function guessMaxLength(string $class, string $property): ?ValueGuess
     {
-        return $this->guess(function ($guesser) use ($class, $property) {
-            return $guesser->guessMaxLength($class, $property);
-        });
+        return $this->guess(fn ($guesser) => $guesser->guessMaxLength($class, $property));
     }
 
     public function guessPattern(string $class, string $property): ?ValueGuess
     {
-        return $this->guess(function ($guesser) use ($class, $property) {
-            return $guesser->guessPattern($class, $property);
-        });
+        return $this->guess(fn ($guesser) => $guesser->guessPattern($class, $property));
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
index 6a38a77017dba..23b90ebf7629c 100644
--- a/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
@@ -763,9 +763,7 @@ public function testSingleChoiceExpandedWithLabelsSetFalseByCallable()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
             'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
-            'choice_label' => function () {
-                return false;
-            },
+            'choice_label' => fn () => false,
             'multiple' => false,
             'expanded' => true,
         ]);
@@ -840,9 +838,7 @@ public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', ['&a'], [
             'choices' => ['Choice&A' => '&a', 'Choice&B' => '&b'],
-            'choice_label' => function () {
-                return false;
-            },
+            'choice_label' => fn () => false,
             'multiple' => true,
             'expanded' => true,
         ]);
diff --git a/src/Symfony/Component/Form/Tests/CallbackTransformerTest.php b/src/Symfony/Component/Form/Tests/CallbackTransformerTest.php
index 9142e1fa3c5e3..1fb6134dd9592 100644
--- a/src/Symfony/Component/Form/Tests/CallbackTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/CallbackTransformerTest.php
@@ -19,8 +19,8 @@ class CallbackTransformerTest extends TestCase
     public function testTransform()
     {
         $transformer = new CallbackTransformer(
-            function ($value) { return $value.' has been transformed'; },
-            function ($value) { return $value.' has reversely been transformed'; }
+            fn ($value) => $value.' has been transformed',
+            fn ($value) => $value.' has reversely been transformed'
         );
 
         $this->assertEquals('foo has been transformed', $transformer->transform('foo'));
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
index ce5f2e933f00d..5dc2e5db909eb 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
@@ -45,9 +45,7 @@ protected function getValues()
 
     public function testCreateChoiceListWithValueCallback()
     {
-        $callback = function ($choice) {
-            return ':'.$choice;
-        };
+        $callback = fn ($choice) => ':'.$choice;
 
         $choiceList = new ArrayChoiceList([2 => 'foo', 7 => 'bar', 10 => 'baz'], $callback);
 
@@ -112,9 +110,7 @@ public function testCreateChoiceListWithGroupedChoices()
 
     public function testCompareChoicesByIdentityByDefault()
     {
-        $callback = function ($choice) {
-            return $choice->value;
-        };
+        $callback = fn ($choice) => $choice->value;
 
         $obj1 = (object) ['value' => 'value1'];
         $obj2 = (object) ['value' => 'value2'];
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/Cache/ChoiceLoaderTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/Cache/ChoiceLoaderTest.php
index b2d0d2e6d700e..6134160046ddf 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/Cache/ChoiceLoaderTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/Cache/ChoiceLoaderTest.php
@@ -26,9 +26,7 @@ public function testSameFormTypeUseCachedLoader()
         $choiceList = new ArrayChoiceList($choices);
 
         $type = new FormType();
-        $decorated = new CallbackChoiceLoader(static function () use ($choices) {
-            return $choices;
-        });
+        $decorated = new CallbackChoiceLoader(static fn () => $choices);
         $loader1 = new ChoiceLoader($type, $decorated);
         $loader2 = new ChoiceLoader($type, new ArrayChoiceLoader());
 
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php
index 4f5c4eb0e342f..48aa3677a5966 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php
@@ -146,9 +146,7 @@ public function testCreateFromChoicesSameFilterClosure()
         $filter = function () {};
         $list1 = $this->factory->createListFromChoices($choices, null, $filter);
         $list2 = $this->factory->createListFromChoices($choices, null, $filter);
-        $lazyChoiceList = new LazyChoiceList(new FilterChoiceLoaderDecorator(new CallbackChoiceLoader(static function () use ($choices) {
-            return $choices;
-        }), $filter), null);
+        $lazyChoiceList = new LazyChoiceList(new FilterChoiceLoaderDecorator(new CallbackChoiceLoader(static fn () => $choices), $filter), null);
 
         $this->assertNotSame($list1, $list2);
         $this->assertEquals($lazyChoiceList, $list1);
@@ -162,9 +160,7 @@ public function testCreateFromChoicesSameFilterClosureUseCache()
         $filterCallback = function () {};
         $list1 = $this->factory->createListFromChoices($choices, null, ChoiceList::filter($formType, $filterCallback));
         $list2 = $this->factory->createListFromChoices($choices, null, ChoiceList::filter($formType, function () {}));
-        $lazyChoiceList = new LazyChoiceList(new FilterChoiceLoaderDecorator(new CallbackChoiceLoader(static function () use ($choices) {
-            return $choices;
-        }), function () {}), null);
+        $lazyChoiceList = new LazyChoiceList(new FilterChoiceLoaderDecorator(new CallbackChoiceLoader(static fn () => $choices), function () {}), null);
 
         $this->assertSame($list1, $list2);
         $this->assertEquals($lazyChoiceList, $list1);
@@ -178,9 +174,7 @@ public function testCreateFromChoicesDifferentFilterClosure()
         $closure2 = function () {};
         $list1 = $this->factory->createListFromChoices($choices, null, $closure1);
         $list2 = $this->factory->createListFromChoices($choices, null, $closure2);
-        $lazyChoiceList = new LazyChoiceList(new FilterChoiceLoaderDecorator(new CallbackChoiceLoader(static function () use ($choices) {
-            return $choices;
-        }), function () {}), null);
+        $lazyChoiceList = new LazyChoiceList(new FilterChoiceLoaderDecorator(new CallbackChoiceLoader(static fn () => $choices), function () {}), null);
 
         $this->assertNotSame($list1, $list2);
         $this->assertEquals($lazyChoiceList, $list1);
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
index 054739c8ccd80..35526a98f671b 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
@@ -151,7 +151,7 @@ public function testCreateFromChoicesFlatValuesAsClosure()
     {
         $list = $this->factory->createListFromChoices(
             ['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4],
-            function ($object) { return $object->value; }
+            fn ($object) => $object->value
         );
 
         $this->assertObjectListWithCustomValues($list);
@@ -199,7 +199,7 @@ public function testCreateFromChoicesGroupedValuesAsClosure()
                 'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
                 'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
             ],
-            function ($object) { return $object->value; }
+            fn ($object) => $object->value
         );
 
         $this->assertObjectListWithCustomValues($list);
@@ -210,9 +210,7 @@ public function testCreateFromFilteredChoices()
         $list = $this->factory->createListFromChoices(
             ['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4, 'E' => $this->obj5, 'F' => $this->obj6],
             null,
-            function ($choice) {
-                return $choice !== $this->obj5 && $choice !== $this->obj6;
-            }
+            fn ($choice) => $choice !== $this->obj5 && $choice !== $this->obj6
         );
 
         $this->assertObjectListWithGeneratedValues($list);
@@ -228,9 +226,7 @@ public function testCreateFromChoicesGroupedAndFiltered()
                 'Group 4' => [/* empty group should be filtered */],
             ],
             null,
-            function ($choice) {
-                return $choice !== $this->obj5 && $choice !== $this->obj6;
-            }
+            fn ($choice) => $choice !== $this->obj5 && $choice !== $this->obj6
         );
 
         $this->assertObjectListWithGeneratedValues($list);
@@ -246,9 +242,7 @@ public function testCreateFromChoicesGroupedAndFilteredTraversable()
                 'Group 4' => [/* empty group should be filtered */],
             ]),
             null,
-            function ($choice) {
-                return $choice !== $this->obj5 && $choice !== $this->obj6;
-            }
+            fn ($choice) => $choice !== $this->obj5 && $choice !== $this->obj6
         );
 
         $this->assertObjectListWithGeneratedValues($list);
@@ -313,9 +307,7 @@ public function testCreateViewFlatPreferredChoicesSameOrder()
             [$this->obj2, $this->obj1, $this->obj4, $this->obj3]
         );
 
-        $preferredLabels = array_map(static function (ChoiceView $view): string {
-            return $view->label;
-        }, $view->preferredChoices);
+        $preferredLabels = array_map(static fn (ChoiceView $view): string => $view->label, $view->preferredChoices);
 
         $this->assertSame(
             [
@@ -338,11 +330,7 @@ public function testCreateViewFlatPreferredChoiceGroupsSameOrder()
             $this->getGroup(...)
         );
 
-        $preferredLabels = array_map(static function (ChoiceGroupView $groupView): array {
-            return array_map(static function (ChoiceView $view): string {
-                return $view->label;
-            }, $groupView->choices);
-        }, $view->preferredChoices);
+        $preferredLabels = array_map(static fn (ChoiceGroupView $groupView): array => array_map(static fn (ChoiceView $view): string => $view->label, $groupView->choices), $view->preferredChoices);
 
         $this->assertEquals(
             [
@@ -393,9 +381,7 @@ public function testCreateViewFlatPreferredChoicesAsClosure()
 
         $view = $this->factory->createView(
             $this->list,
-            function ($object) use ($obj2, $obj3) {
-                return $obj2 === $object || $obj3 === $object;
-            }
+            fn ($object) => $obj2 === $object || $obj3 === $object
         );
 
         $this->assertFlatView($view);
@@ -405,9 +391,7 @@ public function testCreateViewFlatPreferredChoicesClosureReceivesKey()
     {
         $view = $this->factory->createView(
             $this->list,
-            function ($object, $key) {
-                return 'B' === $key || 'C' === $key;
-            }
+            fn ($object, $key) => 'B' === $key || 'C' === $key
         );
 
         $this->assertFlatView($view);
@@ -417,9 +401,7 @@ public function testCreateViewFlatPreferredChoicesClosureReceivesValue()
     {
         $view = $this->factory->createView(
             $this->list,
-            function ($object, $key, $value) {
-                return '1' === $value || '2' === $value;
-            }
+            fn ($object, $key, $value) => '1' === $value || '2' === $value
         );
 
         $this->assertFlatView($view);
@@ -441,9 +423,7 @@ public function testCreateViewFlatLabelAsClosure()
         $view = $this->factory->createView(
             $this->list,
             [$this->obj2, $this->obj3],
-            function ($object) {
-                return $object->label;
-            }
+            fn ($object) => $object->label
         );
 
         $this->assertFlatView($view);
@@ -454,9 +434,7 @@ public function testCreateViewFlatLabelClosureReceivesKey()
         $view = $this->factory->createView(
             $this->list,
             [$this->obj2, $this->obj3],
-            function ($object, $key) {
-                return $key;
-            }
+            fn ($object, $key) => $key
         );
 
         $this->assertFlatView($view);
@@ -498,9 +476,7 @@ public function testCreateViewFlatIndexAsClosure()
             $this->list,
             [$this->obj2, $this->obj3],
             null, // label
-            function ($object) {
-                return $object->index;
-            }
+            fn ($object) => $object->index
         );
 
         $this->assertFlatViewWithCustomIndices($view);
@@ -622,9 +598,7 @@ public function testCreateViewFlatGroupByAsClosure()
             [$this->obj2, $this->obj3],
             null, // label
             null, // index
-            function ($object) use ($obj1, $obj2) {
-                return $obj1 === $object || $obj2 === $object ? 'Group 1' : 'Group 2';
-            }
+            fn ($object) => $obj1 === $object || $obj2 === $object ? 'Group 1' : 'Group 2'
         );
 
         $this->assertGroupedView($view);
@@ -637,9 +611,7 @@ public function testCreateViewFlatGroupByClosureReceivesKey()
             [$this->obj2, $this->obj3],
             null, // label
             null, // index
-            function ($object, $key) {
-                return 'A' === $key || 'B' === $key ? 'Group 1' : 'Group 2';
-            }
+            fn ($object, $key) => 'A' === $key || 'B' === $key ? 'Group 1' : 'Group 2'
         );
 
         $this->assertGroupedView($view);
@@ -652,9 +624,7 @@ public function testCreateViewFlatGroupByClosureReceivesValue()
             [$this->obj2, $this->obj3],
             null, // label
             null, // index
-            function ($object, $key, $value) {
-                return '0' === $value || '1' === $value ? 'Group 1' : 'Group 2';
-            }
+            fn ($object, $key, $value) => '0' === $value || '1' === $value ? 'Group 1' : 'Group 2'
         );
 
         $this->assertGroupedView($view);
@@ -713,9 +683,7 @@ public function testCreateViewFlatAttrAsClosure()
             null, // label
             null, // index
             null, // group
-            function ($object) {
-                return $object->attr;
-            }
+            fn ($object) => $object->attr
         );
 
         $this->assertFlatViewWithAttr($view);
@@ -729,12 +697,10 @@ public function testCreateViewFlatAttrClosureReceivesKey()
             null, // label
             null, // index
             null, // group
-            function ($object, $key) {
-                return match ($key) {
-                    'B' => ['attr1' => 'value1'],
-                    'C' => ['attr2' => 'value2'],
-                    default => [],
-                };
+            fn ($object, $key) => match ($key) {
+                'B' => ['attr1' => 'value1'],
+                'C' => ['attr2' => 'value2'],
+                default => [],
             }
         );
 
@@ -749,12 +715,10 @@ public function testCreateViewFlatAttrClosureReceivesValue()
             null, // label
             null, // index
             null, // group
-            function ($object, $key, $value) {
-                return match ($value) {
-                    '1' => ['attr1' => 'value1'],
-                    '2' => ['attr2' => 'value2'],
-                    default => [],
-                };
+            fn ($object, $key, $value) => match ($value) {
+                '1' => ['attr1' => 'value1'],
+                '2' => ['attr2' => 'value2'],
+                default => [],
             }
         );
 
@@ -766,9 +730,7 @@ public function testPassTranslatableMessageAsLabelDoesntCastItToString()
         $view = $this->factory->createView(
             $this->list,
             [$this->obj1],
-            static function ($choice, $key, $value) {
-                return new TranslatableMessage('my_message', ['param1' => 'value1']);
-            }
+            static fn ($choice, $key, $value) => new TranslatableMessage('my_message', ['param1' => 'value1'])
         );
 
         $this->assertInstanceOf(TranslatableMessage::class, $view->choices[0]->label);
@@ -788,9 +750,7 @@ public function trans(TranslatorInterface $translator, string $locale = null): s
         $view = $this->factory->createView(
             $this->list,
             [$this->obj1],
-            static function () use ($message) {
-                return $message;
-            }
+            static fn () => $message
         );
 
         $this->assertSame($message, $view->choices[0]->label);
@@ -852,9 +812,7 @@ public function testCreateViewFlatlabelTranslationParametersAsClosure()
             null, // index
             null, // group
             null, // attr
-            function ($object) {
-                return $object->labelTranslationParameters;
-            }
+            fn ($object) => $object->labelTranslationParameters
         );
 
         $this->assertFlatViewWithlabelTranslationParameters($view);
@@ -869,11 +827,9 @@ public function testCreateViewFlatlabelTranslationParametersClosureReceivesKey()
             null, // index
             null, // group
             null, // attr
-            function ($object, $key) {
-                return match ($key) {
-                    'D' => ['%placeholder1%' => 'value1'],
-                    default => [],
-                };
+            fn ($object, $key) => match ($key) {
+                'D' => ['%placeholder1%' => 'value1'],
+                default => [],
             }
         );
 
@@ -889,11 +845,9 @@ public function testCreateViewFlatlabelTranslationParametersClosureReceivesValue
             null, // index
             null, // group
             null, // attr
-            function ($object, $key, $value) {
-                return match ($value) {
-                    '3' => ['%placeholder1%' => 'value1'],
-                    default => [],
-                };
+            fn ($object, $key, $value) => match ($value) {
+                '3' => ['%placeholder1%' => 'value1'],
+                default => [],
             }
         );
 
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
index 94d41cf9e740f..501f4377ad559 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
@@ -108,9 +108,7 @@ public function testGetChoicesForValuesUsesLoadedList()
             'b' => 'bar',
             'c' => 'baz',
         ];
-        $list = new LazyChoiceList(new ArrayChoiceLoader($choices), function ($choice) use ($choices) {
-            return array_search($choice, $choices);
-        });
+        $list = new LazyChoiceList(new ArrayChoiceLoader($choices), fn ($choice) => array_search($choice, $choices));
 
         // load choice list
         $list->getChoices();
@@ -126,9 +124,7 @@ public function testGetValuesForChoicesUsesLoadedList()
             'b' => 'bar',
             'c' => 'baz',
         ];
-        $list = new LazyChoiceList(new ArrayChoiceLoader($choices), function ($choice) use ($choices) {
-            return array_search($choice, $choices);
-        });
+        $list = new LazyChoiceList(new ArrayChoiceLoader($choices), fn ($choice) => array_search($choice, $choices));
 
         // load choice list
         $list->getChoices();
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php
index 69eb787a23dfa..e3e813b377c6d 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php
@@ -48,12 +48,8 @@ class CallbackChoiceLoaderTest extends TestCase
 
     public static function setUpBeforeClass(): void
     {
-        self::$loader = new CallbackChoiceLoader(function () {
-            return self::$choices;
-        });
-        self::$value = function ($choice) {
-            return $choice->value ?? null;
-        };
+        self::$loader = new CallbackChoiceLoader(fn () => self::$choices);
+        self::$value = fn ($choice) => $choice->value ?? null;
         self::$choices = [
             (object) ['value' => 'choice_one'],
             (object) ['value' => 'choice_two'],
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Loader/FilterChoiceLoaderDecoratorTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Loader/FilterChoiceLoaderDecoratorTest.php
index 1f91a47275a33..5a41e5aff3415 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/Loader/FilterChoiceLoaderDecoratorTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/Loader/FilterChoiceLoaderDecoratorTest.php
@@ -20,9 +20,7 @@ class FilterChoiceLoaderDecoratorTest extends TestCase
 {
     public function testLoadChoiceList()
     {
-        $filter = function ($choice) {
-            return 0 === $choice % 2;
-        };
+        $filter = fn ($choice) => 0 === $choice % 2;
 
         $loader = new FilterChoiceLoaderDecorator(new ArrayChoiceLoader(range(1, 4)), $filter);
 
@@ -31,9 +29,7 @@ public function testLoadChoiceList()
 
     public function testLoadChoiceListWithGroupedChoices()
     {
-        $filter = function ($choice) {
-            return $choice < 9 && 0 === $choice % 2;
-        };
+        $filter = fn ($choice) => $choice < 9 && 0 === $choice % 2;
 
         $loader = new FilterChoiceLoaderDecorator(new ArrayChoiceLoader(['units' => range(1, 9), 'tens' => range(10, 90, 10)]), $filter);
 
@@ -49,9 +45,7 @@ public function testLoadChoiceListWithGroupedChoices()
 
     public function testLoadChoiceListMixedWithGroupedAndNonGroupedChoices()
     {
-        $filter = function ($choice) {
-            return 0 === $choice % 2;
-        };
+        $filter = fn ($choice) => 0 === $choice % 2;
 
         $choices = array_merge(range(1, 9), ['grouped' => range(10, 40, 5)]);
         $loader = new FilterChoiceLoaderDecorator(new ArrayChoiceLoader($choices), $filter);
@@ -74,9 +68,7 @@ public function testLoadValuesForChoices()
     {
         $evenValues = [1 => '2', 3 => '4'];
 
-        $filter = function ($choice) {
-            return 0 === $choice % 2;
-        };
+        $filter = fn ($choice) => 0 === $choice % 2;
 
         $loader = new FilterChoiceLoaderDecorator(new ArrayChoiceLoader([range(1, 4)]), $filter);
 
@@ -88,9 +80,7 @@ public function testLoadChoicesForValues()
         $evenChoices = [1 => 2, 3 => 4];
         $values = array_map('strval', range(1, 4));
 
-        $filter = function ($choice) {
-            return 0 === $choice % 2;
-        };
+        $filter = fn ($choice) => 0 === $choice % 2;
 
         $loader = new FilterChoiceLoaderDecorator(new ArrayChoiceLoader(range(1, 4)), $filter);
 
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Loader/IntlCallbackChoiceLoaderTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Loader/IntlCallbackChoiceLoaderTest.php
index e2827b0d913be..0aed92fb5e901 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/Loader/IntlCallbackChoiceLoaderTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/Loader/IntlCallbackChoiceLoaderTest.php
@@ -49,12 +49,8 @@ class IntlCallbackChoiceLoaderTest extends TestCase
 
     public static function setUpBeforeClass(): void
     {
-        self::$loader = new IntlCallbackChoiceLoader(function () {
-            return self::$choices;
-        });
-        self::$value = function ($choice) {
-            return $choice->value ?? null;
-        };
+        self::$loader = new IntlCallbackChoiceLoader(fn () => self::$choices);
+        self::$value = fn ($choice) => $choice->value ?? null;
         self::$choices = [
             (object) ['value' => 'choice_one'],
             (object) ['value' => 'choice_two'],
diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
index f8ce76316ff1e..9e3847d9ac646 100644
--- a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
+++ b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
@@ -263,7 +263,7 @@ private static function getCoreTypes(): array
         $coreExtension = new CoreExtension();
         $loadTypesRefMethod = (new \ReflectionObject($coreExtension))->getMethod('loadTypes');
         $coreTypes = $loadTypesRefMethod->invoke($coreExtension);
-        $coreTypes = array_map(function (FormTypeInterface $type) { return $type::class; }, $coreTypes);
+        $coreTypes = array_map(fn (FormTypeInterface $type) => $type::class, $coreTypes);
         sort($coreTypes);
 
         return $coreTypes;
@@ -290,15 +290,11 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setDefault('empty_data', function (Options $options) {
             $foo = $options['foo'];
 
-            return function (FormInterface $form) use ($foo) {
-                return $form->getConfig()->getCompound() ? [$foo] : $foo;
-            };
+            return fn (FormInterface $form) => $form->getConfig()->getCompound() ? [$foo] : $foo;
         });
         $resolver->setAllowedTypes('foo', 'string');
         $resolver->setAllowedValues('foo', ['bar', 'baz']);
-        $resolver->setNormalizer('foo', function (Options $options, $value) {
-            return (string) $value;
-        });
+        $resolver->setNormalizer('foo', fn (Options $options, $value) => (string) $value);
         $resolver->setInfo('foo', 'Info');
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/CompoundFormTest.php b/src/Symfony/Component/Form/Tests/CompoundFormTest.php
index 833dcc7616ad2..52efb607b2033 100644
--- a/src/Symfony/Component/Form/Tests/CompoundFormTest.php
+++ b/src/Symfony/Component/Form/Tests/CompoundFormTest.php
@@ -955,10 +955,8 @@ public function testCreateViewWithChildren()
         $this->form->add($field1);
         $this->form->add($field2);
 
-        $assertChildViewsEqual = function (array $childViews) {
-            return function (FormView $view) use ($childViews) {
-                $this->assertSame($childViews, $view->children);
-            };
+        $assertChildViewsEqual = fn (array $childViews) => function (FormView $view) use ($childViews) {
+            $this->assertSame($childViews, $view->children);
         };
 
         // First create the view
diff --git a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
index bc870494e6461..15532929419ae 100644
--- a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -167,14 +167,10 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setDefault('empty_data', function (Options $options, $value) {
             $foo = $options['foo'];
 
-            return function (FormInterface $form) use ($foo) {
-                return $form->getConfig()->getCompound() ? [$foo] : $foo;
-            };
+            return fn (FormInterface $form) => $form->getConfig()->getCompound() ? [$foo] : $foo;
         });
         $resolver->setAllowedTypes('foo', 'string');
         $resolver->setAllowedValues('foo', ['bar', 'baz']);
-        $resolver->setNormalizer('foo', function (Options $options, $value) {
-            return (string) $value;
-        });
+        $resolver->setNormalizer('foo', fn (Options $options, $value) => (string) $value);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/DataMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/DataMapperTest.php
index b39572ed808a5..a125078fd69b6 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/DataMapperTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/DataMapperTest.php
@@ -359,9 +359,7 @@ public function testMapDataToFormsUsingGetCallbackOption()
         $person = new DummyPerson($initialName);
 
         $config = new FormConfigBuilder('name', null, $this->dispatcher, [
-            'getter' => static function (DummyPerson $person) {
-                return $person->myName();
-            },
+            'getter' => static fn (DummyPerson $person) => $person->myName(),
         ]);
         $form = new Form($config);
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
index 9bcb22efe0473..d42d4d8899585 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
@@ -285,9 +285,7 @@ public function testOnSubmitDeleteEmptyCompoundEntriesIfAllowDelete()
             $this->form->get($child)->submit($dat);
         }
         $event = new FormEvent($this->form, $data);
-        $callback = function ($data) {
-            return null === $data['name'];
-        };
+        $callback = fn ($data) => null === $data['name'];
         $listener = new ResizeFormListener('text', [], false, true, $callback);
         $listener->onSubmit($event);
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
index 93ca921b7c650..95ef611b1c2b7 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/
10000
CheckboxTypeTest.php
@@ -146,12 +146,8 @@ public function testCustomModelTransformer($data, $checked)
     {
         // present a binary status field as a checkbox
         $transformer = new CallbackTransformer(
-            function ($value) {
-                return 'checked' == $value;
-            },
-            function ($value) {
-                return $value ? 'checked' : 'unchecked';
-            }
+            fn ($value) => 'checked' == $value,
+            fn ($value) => $value ? 'checked' : 'unchecked'
         );
 
         $form = $this->factory->createBuilder(static::TESTED_TYPE)
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
index 8109a9c60079d..8bf3dc23594db 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -531,9 +531,7 @@ public function testSubmitSingleNonExpandedEmptyExplicitEmptyChoice()
             'choices' => [
                 'Empty' => 'EMPTY_CHOICE',
             ],
-            'choice_value' => function () {
-                return '';
-            },
+            'choice_value' => fn () => '',
         ]);
 
         $form->submit('');
@@ -2208,9 +2206,7 @@ public function testFilteredChoices()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $this->choices,
-            'choice_filter' => function ($choice) {
-                return \in_array($choice, range('a', 'c'), true);
-            },
+            'choice_filter' => fn ($choice) => \in_array($choice, range('a', 'c'), true),
         ]);
 
         $this->assertEquals([
@@ -2224,9 +2220,7 @@ public function testFilteredGroupedChoices()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'choices' => $this->groupedChoices,
-            'choice_filter' => function ($choice) {
-                return \in_array($choice, range('a', 'c'), true);
-            },
+            'choice_filter' => fn ($choice) => \in_array($choice, range('a', 'c'), true),
         ]);
 
         $this->assertEquals(['Symfony' => new ChoiceGroupView('Symfony', [
@@ -2239,12 +2233,8 @@ public function testFilteredGroupedChoices()
     public function testFilteredChoiceLoader()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
-            'choice_loader' => new CallbackChoiceLoader(function () {
-                return $this->choices;
-            }),
-            'choice_filter' => function ($choice) {
-                return \in_array($choice, range('a', 'c'), true);
-            },
+            'choice_loader' => new CallbackChoiceLoader(fn () => $this->choices),
+            'choice_filter' => fn ($choice) => \in_array($choice, range('a', 'c'), true),
         ]);
 
         $this->assertEquals([
@@ -2256,9 +2246,7 @@ public function testFilteredChoiceLoader()
 
     public function testWithSameLoaderAndDifferentChoiceValueCallbacks()
     {
-        $choiceLoader = new CallbackChoiceLoader(function () {
-            return [1, 2, 3];
-        });
+        $choiceLoader = new CallbackChoiceLoader(fn () => [1, 2, 3]);
 
         $view = $this->factory->create(FormTypeTest::TESTED_TYPE)
             ->add('choice_one', self::TESTED_TYPE, [
@@ -2266,9 +2254,7 @@ public function testWithSameLoaderAndDifferentChoiceValueCallbacks()
             ])
             ->add('choice_two', self::TESTED_TYPE, [
                 'choice_loader' => $choiceLoader,
-                'choice_value' => function ($choice) {
-                    return $choice ? (string) $choice * 10 : '';
-                },
+                'choice_value' => fn ($choice) => $choice ? (string) $choice * 10 : '',
             ])
             ->createView()
         ;
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTranslationTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTranslationTest.php
index 9e144100590ac..490e84604aa15 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTranslationTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTranslationTest.php
@@ -31,9 +31,7 @@ protected function getExtensions()
     {
         $translator = $this->createMock(TranslatorInterface::class);
         $translator->expects($this->any())->method('trans')
-            ->willReturnCallback(function ($key, $params) {
-                return strtr(sprintf('Translation of: %s', $key), $params);
-            }
+            ->willReturnCallback(fn ($key, $params) => strtr(sprintf('Translation of: %s', $key), $params)
             );
 
         return array_merge(parent::getExtensions(), [new CoreExtension(null, null, $translator)]);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
index 129c2c97b9a34..9df4eede1e482 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -120,9 +120,7 @@ public function testResizedDownWithDeleteEmptyCallable()
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'entry_type' => AuthorType::class,
             'allow_delete' => true,
-            'delete_empty' => function (Author $obj = null) {
-                return null === $obj || empty($obj->firstName);
-            },
+            'delete_empty' => fn (Author $obj = null) => null === $obj || empty($obj->firstName),
         ]);
 
         $form->setData([new Author('Bob'), new Author('Alice')]);
@@ -143,9 +141,7 @@ public function testResizedDownIfSubmittedWithCompoundEmptyDataDeleteEmptyAndNoD
             'entry_options' => ['data_class' => null],
             'allow_add' => true,
             'allow_delete' => true,
-            'delete_empty' => function ($author) {
-                return empty($author['firstName']);
-            },
+            'delete_empty' => fn ($author) => empty($author['firstName']),
         ]);
         $form->setData([['firstName' => 'first', 'lastName' => 'last']]);
         $form->submit([
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
index 71edd6afc7d61..12b6939a68b02 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -709,9 +709,7 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa
     public function provideEmptyData()
     {
         $expectedData = \DateTime::createFromFormat('Y-m-d H:i', '2018-11-11 21:23');
-        $lazyEmptyData = static function (FormInterface $form) {
-            return $form->getConfig()->getCompound() ? ['date' => ['year' => '2018', 'month' => '11', 'day' => '11'], 'time' => ['hour' => '21', 'minute' => '23']] : '2018-11-11T21:23:00';
-        };
+        $lazyEmptyData = static fn (FormInterface $form) => $form->getConfig()->getCompound() ? ['date' => ['year' => '2018', 'month' => '11', 'day' => '11'], 'time' => ['hour' => '21', 'minute' => '23']] : '2018-11-11T21:23:00';
 
         return [
             'Simple field' => ['single_text', '2018-11-11T21:23:00', $expectedData],
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
index 74e0a8d35524f..62a12289cb301 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -1057,9 +1057,7 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa
     public function provideEmptyData()
     {
         $expectedData = \DateTime::createFromFormat('Y-m-d H:i:s', '2018-11-11 00:00:00');
-        $lazyEmptyData = static function (FormInterface $form) {
-            return $form->getConfig()->getCompound() ? ['year' => '2018', 'month' => '11', 'day' => '11'] : '2018-11-11';
-        };
+        $lazyEmptyData = static fn (FormInterface $form) => $form->getConfig()->getCompound() ? ['year' => '2018', 'month' => '11', 'day' => '11'] : '2018-11-11';
 
         return [
             'Simple field' => ['single_text', '2018-11-11', $expectedData],
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
index 3701b653f855e..b4bca1513083d 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
@@ -439,9 +439,8 @@ public function testSubformCallsSettersIfReferenceIsScalar()
         $builder->add('referenceCopy', static::TESTED_TYPE);
         $builder->get('referenceCopy')->addViewTransformer(new CallbackTransformer(
             function () {},
-            function ($value) { // reverseTransform
-                return 'foobar';
-            }
+            fn ($value) => // reverseTransform
+'foobar'
         ));
         $form = $builder->getForm();
 
@@ -464,9 +463,8 @@ public function testSubformAlwaysInsertsIntoArrays()
         $builder->add('referenceCopy', static::TESTED_TYPE);
         $builder->get('referenceCopy')->addViewTransformer(new CallbackTransformer(
             function () {},
-            function ($value) use ($ref2) { // reverseTransform
-                return $ref2;
-            }
+            fn ($value) => // reverseTransform
+$ref2
         ));
         $form = $builder->getForm();
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
index 08284dbbf00e7..991d9c23fe865 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -1113,9 +1113,7 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa
     public function provideEmptyData()
     {
         $expectedData = \DateTime::createFromFormat('Y-m-d H:i', '1970-01-01 21:23');
-        $lazyEmptyData = static function (FormInterface $form) {
-            return $form->getConfig()->getCompound() ? ['hour' => '21', 'minute' => '23'] : '21:23';
-        };
+        $lazyEmptyData = static fn (FormInterface $form) => $form->getConfig()->getCompound() ? ['hour' => '21', 'minute' => '23'] : '21:23';
 
         return [
             'Simple field' => ['single_text', '21:23', $expectedData],
diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
index 39009b598c530..fd9870fa6d50e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
@@ -335,9 +335,7 @@ public function testSerializeWithFormAddedMultipleTimes()
         $form1View = new FormView();
         $form2View = new FormView();
         $child1View = new FormView();
-        $child1View->vars['is_selected'] = function ($choice, array $values) {
-            return \in_array($choice, $values, true);
-        };
+        $child1View->vars['is_selected'] = fn ($choice, array $values) => \in_array($choice, $values, true);
 
         $form1->add($child1);
         $form2->add($child1);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
index c614a1ac181f4..7d9061c882808 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -272,7 +272,7 @@ public function testDontValidateIfNotSynchronized()
             ])
             ->setData($object)
             ->addViewTransformer(new CallbackTransformer(
-                function ($data) { return $data; },
+                fn ($data) => $data,
                 function () { throw new TransformationFailedException(); }
             ))
             ->getForm();
@@ -309,7 +309,7 @@ public function testAddInvalidErrorEvenIfNoValidationGroups()
             ])
             ->setData($object)
             ->addViewTransformer(new CallbackTransformer(
-                function ($data) { return $data; },
+                fn ($data) => $data,
                 function () { throw new TransformationFailedException(); }
             ))
             ->getForm();
@@ -344,7 +344,7 @@ public function testDontValidateConstraintsIfNotSynchronized()
         $form = $this->getBuilder('name', '\stdClass', $options)
             ->setData($object)
             ->addViewTransformer(new CallbackTransformer(
-                function ($data) { return $data; },
+                fn ($data) => $data,
                 function () { throw new TransformationFailedException(); }
             ))
             ->getForm();
@@ -375,7 +375,7 @@ public function testTransformationFailedExceptionInvalidMessageIsUsed()
             ])
             ->setData($object)
             ->addViewTransformer(new CallbackTransformer(
-                function ($data) { return $data; },
+                fn ($data) => $data,
                 function () {
                     $failure = new TransformationFailedException();
                     $failure->setInvalidMessage('safe message to be used', ['{{ bar }}' => 'bar']);
@@ -451,9 +451,7 @@ public function testDontExecuteFunctionNames()
     public function testHandleClosureValidationGroups()
     {
         $object = new \stdClass();
-        $options = ['validation_groups' => function (FormInterface $form) {
-            return ['group1', 'group2'];
-        }];
+        $options = ['validation_groups' => fn (FormInterface $form) => ['group1', 'group2']];
         $form = $this->getCompoundForm($object, $options);
         $form->submit([]);
 
@@ -565,9 +563,7 @@ public function testUseInheritedClosureValidationGroup()
         $object = new \stdClass();
 
         $parentOptions = [
-            'validation_groups' => function () {
-                return ['group1', 'group2'];
-            },
+            'validation_groups' => fn () => ['group1', 'group2'],
         ];
         $parent = $this->getBuilder('parent', null, $parentOptions)
             ->setCompound(true)
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
index 34c911f52a9fa..0533883f701f2 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
@@ -26,11 +26,7 @@ public function testPostMaxSizeTranslation()
 
         $resolver = new OptionsResolver();
         $resolver->setDefault('post_max_size_message', 'old max {{ max }}!');
-        $resolver->setDefault('upload_max_size_message', function (Options $options) {
-            return function () use ($options) {
-                return $options['post_max_size_message'];
-            };
-        });
+        $resolver->setDefault('upload_max_size_message', fn (Options $options) => fn () => $options['post_max_size_message']);
 
         $extension->configureOptions($resolver);
         $options = $resolver->resolve();
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
index 08b8caaedd5f5..f0a9124c6f568 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
@@ -91,7 +91,7 @@ protected function getForm($name = 'name', $propertyPath = null, $dataClass = nu
 
         if (!$synchronized) {
             $config->addViewTransformer(new CallbackTransformer(
-                function ($normData) { return $normData; },
+                fn ($normData) => $normData,
                 function () { throw new TransformationFailedException(); }
             ));
         }
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/ArrayChoiceLoader.php b/src/Symfony/Component/Form/Tests/Fixtures/ArrayChoiceLoader.php
index 7224d0e93639e..8c5a3a4733e6c 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/ArrayChoiceLoader.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/ArrayChoiceLoader.php
@@ -8,8 +8,6 @@ class ArrayChoiceLoader extends CallbackChoiceLoader
 {
     public function __construct(array $choices = [])
     {
-        parent::__construct(static function () use ($choices): array {
-            return $choices;
-        });
+        parent::__construct(static fn (): array => $choices);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
index d67f0b96ace50..7399dfe36bdba 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
@@ -23,12 +23,10 @@ class ChoiceSubType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(['expanded' => true]);
-        $resolver->setNormalizer('choices', function () {
-            return [
-                'attr1' => 'Attribute 1',
-                'attr2' => 'Attribute 2',
-            ];
-        });
+        $resolver->setNormalizer('choices', fn () => [
+            'attr1' => 'Attribute 1',
+            'attr2' => 'Attribute 2',
+        ]);
     }
 
     public function getParent(): ?string
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
index b04eb61721c41..ccd5b3f4890f5 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
@@ -21,12 +21,10 @@ class LazyChoiceTypeExtension extends AbstractTypeExtension
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefault('choice_loader', ChoiceList::lazy($this, function () {
-            return [
-                'Lazy A' => 'lazy_a',
-                'Lazy B' => 'lazy_b',
-            ];
-        }));
+        $resolver->setDefault('choice_loader', ChoiceList::lazy($this, fn () => [
+            'Lazy A' => 'lazy_a',
+            'Lazy B' => 'lazy_b',
+        ]));
     }
 
     public static function getExtendedTypes(): iterable
diff --git a/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php b/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php
index 1b83bfc3bf452..00e6c687c91c5 100644
--- a/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php
+++ b/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php
@@ -46,7 +46,7 @@ public function testTranslationFileIsValidWithoutEntityLoader($filePath)
     public function provideTranslationFiles()
     {
         return array_map(
-            function ($filePath) { return (array) $filePath; },
+            fn ($filePath) => (array) $filePath,
             glob(\dirname(__DIR__, 2).'/Resources/translations/*.xlf')
         );
     }
diff --git a/src/Symfony/Component/Form/Tests/SimpleFormTest.php b/src/Symfony/Component/Form/Tests/SimpleFormTest.php
index 3d8b0b20d83f1..19ae3b507455c 100644
--- a/src/Symfony/Component/Form/Tests/SimpleFormTest.php
+++ b/src/Symfony/Component/Form/Tests/SimpleFormTest.php
@@ -1112,12 +1112,12 @@ public function testIsEmptyCallback()
     {
         $config = new FormConfigBuilder('foo', null, new EventDispatcher());
 
-        $config->setIsEmptyCallback(function ($modelData): bool { return 'ccc' === $modelData; });
+        $config->setIsEmptyCallback(fn ($modelData): bool => 'ccc' === $modelData);
         $form = new Form($config);
         $form->setData('ccc');
         $this->assertTrue($form->isEmpty());
 
-        $config->setIsEmptyCallback(function (): bool { return false; });
+        $config->setIsEmptyCallback(fn (): bool => false);
         $form = new Form($config);
         $form->setData(null);
         $this->assertFalse($form->isEmpty());
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
index c1e3dd9fa6e48..460398a983f60 100644
--- a/src/Symfony/Component/HttpClient/CurlHttpClient.php
+++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -382,14 +382,10 @@ private static function createRedirectResolver(array $options, string $host, int
         if (0 < $options['max_redirects']) {
             $redirectHeaders['host'] = $host;
             $redirectHeaders['port'] = $port;
-            $redirectHeaders['with_auth'] = $redirectHeaders['no_auth'] = array_filter($options['headers'], static function ($h) {
-                return 0 !== stripos($h, 'Host:');
-            });
+            $redirectHeaders['with_auth'] = $redirectHeaders['no_auth'] = array_filter($options['headers'], static fn ($h) => 0 !== stripos($h, 'Host:'));
 
             if (isset($options['normalized_headers']['authorization'][0]) || isset($options['normalized_headers']['cookie'][0])) {
-                $redirectHeaders['no_auth'] = array_filter($options['headers'], static function ($h) {
-                    return 0 !== stripos($h, 'Authorization:') && 0 !== stripos($h, 'Cookie:');
-                });
+                $redirectHeaders['no_auth'] = array_filter($options['headers'], static fn ($h) => 0 !== stripos($h, 'Authorization:') && 0 !== stripos($h, 'Cookie:'));
             }
         }
 
@@ -401,9 +397,7 @@ private static function createRedirectResolver(array $options, string $host, int
             }
 
             if ($noContent && $redirectHeaders) {
-                $filterContentHeaders = static function ($h) {
-                    return 0 !== stripos($h, 'Content-Length:') && 0 !== stripos($h, 'Content-Type:') && 0 !== stripos($h, 'Transfer-Encoding:');
-                };
+                $filterContentHeaders = static fn ($h) => 0 !== stripos($h, 'Content-Length:') && 0 !== stripos($h, 'Content-Type:') && 0 !== stripos($h, 'Transfer-Encoding:');
                 $redirectHeaders['no_auth'] = array_filter($redirectHeaders['no_auth'], $filterContentHeaders);
                 $redirectHeaders['with_auth'] = array_filter($redirectHeaders['with_auth'], $filterContentHeaders);
             }
@@ -431,9 +425,7 @@ private static function createRedirectResolver(array $options, string $host, int
 
     private function findConstantName(int $opt): ?string
     {
-        $constants = array_filter(get_defined_constants(), static function ($v, $k) use ($opt) {
-            return $v === $opt && 'C' === $k[0] && (str_starts_with($k, 'CURLOPT_') || str_starts_with($k, 'CURLINFO_'));
-        }, \ARRAY_FILTER_USE_BOTH);
+        $constants = array_filter(get_defined_constants(), static fn ($v, $k) => $v === $opt && 'C' === $k[0] && (str_starts_with($k, 'CURLOPT_') || str_starts_with($k, 'CURLINFO_')), \ARRAY_FILTER_USE_BOTH);
 
         return key($constants);
     }
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
index d47158e52d99c..0997fe4dc996b 100644
--- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
+++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -330,19 +330,17 @@ private static function normalizeBody($body)
             return $body;
         }
 
-        $generatorToCallable = static function (\Generator $body): \Closure {
-            return static function () use ($body) {
-                while ($body->valid()) {
-                    $chunk = $body->current();
-                    $body->next();
-
-                    if ('' !== $chunk) {
-                        return $chunk;
-                    }
+        $generatorToCallable = static fn (\Generator $body): \Closure => static function () use ($body) {
+            while ($body->valid()) {
+                $chunk = $body->current();
+                $body->next();
+
+                if ('' !== $chunk) {
+                    return $chunk;
                 }
+            }
 
-                return '';
-            };
+            return '';
         };
 
         if ($body instanceof \Generator) {
@@ -536,11 +534,11 @@ private static function parseUrl(string $url, array $query = [], array $allowedS
 
             if (str_contains($parts[$part], '%')) {
                 // https://tools.ietf.org/html/rfc3986#section-2.3
-                $parts[$part] = preg_replace_callback('/%(?:2[DE]|3[0-9]|[46][1-9A-F]|5F|[57][0-9A]|7E)++/i', function ($m) { return rawurldecode($m[0]); }, $parts[$part]);
+                $parts[$part] = preg_replace_callback('/%(?:2[DE]|3[0-9]|[46][1-9A-F]|5F|[57][0-9A]|7E)++/i', fn ($m) => rawurldecode($m[0]), $parts[$part]);
             }
 
             // https://tools.ietf.org/html/rfc3986#section-3.3
-            $parts[$part] = preg_replace_callback("#[^-A-Za-z0-9._~!$&/'()*+,;=:@%]++#", function ($m) { return rawurlencode($m[0]); }, $parts[$part]);
+            $parts[$part] = preg_replace_callback("#[^-A-Za-z0-9._~!$&/'()*+,;=:@%]++#", fn ($m) => rawurlencode($m[0]), $parts[$part]);
         }
 
         return [
diff --git a/src/Symfony/Component/HttpClient/Internal/AmpClientState.php b/src/Symfony/Component/HttpClient/Internal/AmpClientState.php
index 18a1722c38115..2360a7f87d0e5 100644
--- a/src/Symfony/Component/HttpClient/Internal/AmpClientState.php
+++ b/src/Symfony/Component/HttpClient/Internal/AmpClientState.php
@@ -94,9 +94,7 @@ public function request(array $options, Request $request, CancellationToken $can
         }
 
         $request->addEventListener(new AmpListener($info, $options['peer_fingerprint']['pin-sha256'] ?? [], $onProgress, $handle));
-        $request->setPushHandler(function ($request, $response) use ($options): Promise {
-            return $this->handlePush($request, $response, $options);
-        });
+        $request->setPushHandler(fn ($request, $response): Promise => $this->handlePush($request, $response, $options));
 
         ($request->hasHeader('content-length') ? new Success((int) $request->getHeader('content-length')) : $request->getBody()->getBodyLength())
             ->onResolve(static function ($e, $bodySize) use (&$info) {
diff --git a/src/Symfony/Component/HttpClient/Internal/CurlClientState.php b/src/Symfony/Component/HttpClient/Internal/CurlClientState.php
index aaaae4b23a5ef..61fd5ee9b61a4 100644
--- a/src/Symfony/Component/HttpClient/Internal/CurlClientState.php
+++ b/src/Symfony/Component/HttpClient/Internal/CurlClientState.php
@@ -74,9 +74,7 @@ public function __construct(int $maxHostConnections, int $maxPendingPushes)
         $multi->handlesActivity = &$this->handlesActivity;
         $multi->openHandles = &$this->openHandles;
 
-        curl_multi_setopt($this->handle, \CURLMOPT_PUSHFUNCTION, static function ($parent, $pushed, array $requestHeaders) use ($multi, $maxPendingPushes) {
-            return $multi->handlePush($parent, $pushed, $requestHeaders, $maxPendingPushes);
-        });
+        curl_multi_setopt($this->handle, \CURLMOPT_PUSHFUNCTION, static fn ($parent, $pushed, array $requestHeaders) => $multi->handlePush($parent, $pushed, $requestHeaders, $maxPendingPushes));
     }
 
     public function reset()
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
index 734effbb40354..23acce28de0c1 100644
--- a/src/Symfony/Component/HttpClient/NativeHttpClient.php
+++ b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -223,7 +223,7 @@ public function request(string $method, string $url, array $options = []): Respo
                 'allow_self_signed' => (bool) $options['peer_fingerprint'],
                 'SNI_enabled' => true,
                 'disable_compression' => true,
-            ], static function ($v) { return null !== $v; }),
+            ], static fn ($v) => null !== $v),
             'socket' => [
                 'bindto' => $options['bindto'],
                 'tcp_nodelay' => true,
@@ -342,14 +342,10 @@ private static function createRedirectResolver(array $options, string $host, str
         $redirectHeaders = [];
         if (0 < $maxRedirects = $options['max_redirects']) {
             $redirectHeaders = ['host' => $host, 'port' => $port];
-            $redirectHeaders['with_auth'] = $redirectHeaders['no_auth'] = array_filter($options['headers'], static function ($h) {
-                return 0 !== stripos($h, 'Host:');
-            });
+            $redirectHeaders['with_auth'] = $redirectHeaders['no_auth'] = array_filter($options['headers'], static fn ($h) => 0 !== stripos($h, 'Host:'));
 
             if (isset($options['normalized_headers']['authorization']) || isset($options['normalized_headers']['cookie'])) {
-                $redirectHeaders['no_auth'] = array_filter($redirectHeaders['no_auth'], static function ($h) {
-                    return 0 !== stripos($h, 'Authorization:') && 0 !== stripos($h, 'Cookie:');
-                });
+                $redirectHeaders['no_auth'] = array_filter($redirectHeaders['no_auth'], static fn ($h) => 0 !== stripos($h, 'Authorization:') && 0 !== stripos($h, 'Cookie:'));
             }
         }
 
@@ -386,9 +382,7 @@ private static function createRedirectResolver(array $options, string $host, str
                 if ('POST' === $options['method'] || 303 === $info['http_code']) {
                     $info['http_method'] = $options['method'] = 'HEAD' === $options['method'] ? 'HEAD' : 'GET';
                     $options['content'] = '';
-                    $filterContentHeaders = static function ($h) {
-                        return 0 !== stripos($h, 'Content-Length:') && 0 !== stripos($h, 'Content-Type:') && 0 !== stripos($h, 'Transfer-Encoding:');
-                    };
+                    $filterContentHeaders = static fn ($h) => 0 !== stripos($h, 'Content-Length:') && 0 !== stripos($h, 'Content-Type:') && 0 !== stripos($h, 'Transfer-Encoding:');
                     $options['header'] = array_filter($options['header'], $filterContentHeaders);
                     $redirectHeaders['no_auth'] = array_filter($redirectHeaders['no_auth'], $filterContentHeaders);
                     $redirectHeaders['with_auth'] = array_filter($redirectHeaders['with_auth'], $filterContentHeaders);
diff --git a/src/Symfony/Component/HttpClient/Response/AmpResponse.php b/src/Symfony/Component/HttpClient/Response/AmpResponse.php
index d46e4036d801c..1c143e5c83041 100644
--- a/src/Symfony/Component/HttpClient/Response/AmpResponse.php
+++ b/src/Symfony/Component/HttpClient/Response/AmpResponse.php
@@ -67,9 +67,7 @@ public function __construct(AmpClientState $multi, Request $request, array $opti
             $request->setHeader('Accept-Encoding', 'gzip');
         }
 
-        $this->initializer = static function (self $response) {
-            return null !== $response->options;
-        };
+        $this->initializer = static fn (self $response) => null !== $response->options;
 
         $info = &$this->info;
         $headers = &$this->headers;
diff --git a/src/Symfony/Component/HttpClient/Response/HttplugPromise.php b/src/Symfony/Component/HttpClient/Response/HttplugPromise.php
index deaea720da735..e9dc24041e5fa 100644
--- a/src/Symfony/Component/HttpClient/Response/HttplugPromise.php
+++ b/src/Symfony/Component/HttpClient/Response/HttplugPromise.php
@@ -68,8 +68,6 @@ private function wrapThenCallback(?callable $callback): ?callable
             return null;
         }
 
-        return static function ($value) use ($callback) {
-            return Create::promiseFor($callback($value));
-        };
+        return static fn ($value) => Create::promiseFor($callback($value));
     }
 }
diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php
index 59e73ba1ba176..350e9c49f85fa 100644
--- a/src/Symfony/Component/HttpClient/Response/MockResponse.php
+++ b/src/Symfony/Component/HttpClient/Response/MockResponse.php
@@ -121,9 +121,7 @@ public static function fromRequest(string $method, string $url, array $options,
         $response->requestOptions = $options;
         $response->id = ++self::$idSequence;
         $response->shouldBuffer = $options['buffer'] ?? true;
-        $response->initializer = static function (self $response) {
-            return \is_array($response->body[0] ?? null);
-        };
+        $response->initializer = static fn (self $response) => \is_array($response->body[0] ?? null);
 
         $response->info['redirect_count'] = 0;
         $response->info['redirect_url'] = null;
diff --git a/src/Symfony/Component/HttpClient/Response/NativeResponse.php b/src/Symfony/Component/HttpClient/Response/NativeResponse.php
index a6b9dd989bebb..3d2b26dae112c 100644
--- a/src/Symfony/Component/HttpClient/Response/NativeResponse.php
+++ b/src/Symfony/Component/HttpClient/Response/NativeResponse.php
@@ -71,9 +71,7 @@ public function __construct(NativeClientState $multi, $context, string $url, arr
         $info['max_duration'] = $options['max_duration'];
         ++$multi->responseCount;
 
-        $this->initializer = static function (self $response) {
-            return null === $response->remaining;
-        };
+        $this->initializer = static fn (self $response) => null === $response->remaining;
 
         $pauseExpiry = &$this->pauseExpiry;
         $info['pause_handler'] = static function (float $duration) use (&$pauseExpiry) {
diff --git a/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php b/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php
index db3ce095d9df6..7d5d6464a81c0 100644
--- a/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php
@@ -251,11 +251,7 @@ function (\Exception $exception) use ($errorMessage, &$failureCallableCalled, $c
                     $failureCallableCalled = true;
 
                     // Ensure arbitrary levels of promises work.
-                    return (new FulfilledPromise(null))->then(function () use ($client, $request) {
-                        return (new GuzzleFulfilledPromise(null))->then(function () use ($client, $request) {
-                            return $client->sendAsyncRequest($request);
-                        });
-                    });
+                    return (new FulfilledPromise(null))->then(fn () => (new GuzzleFulfilledPromise(null))->then(fn () => $client->sendAsyncRequest($request)));
                 }
             )
         ;
diff --git a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
index 495644211990e..c47428fb9a198 100644
--- a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
@@ -45,9 +45,7 @@ public function testMocking($factory, array $expectedResponses)
     public function mockingProvider(): iterable
     {
         yield 'callable' => [
-            static function (string $method, string $url, array $options = []) {
-                return new MockResponse($method.': '.$url.' (body='.$options['body'].')');
-            },
+            static fn (string $method, string $url, array $options = []) => new MockResponse($method.': '.$url.' (body='.$options['body'].')'),
             [
                 'POST: https://example.com/foo (body=payload)',
                 'POST: https://example.com/bar (body=payload)',
@@ -56,12 +54,8 @@ static function (string $method, string $url, array $options = []) {
 
         yield 'array of callable' => [
             [
-                static function (string $method, string $url, array $options = []) {
-                    return new MockResponse($method.': '.$url.' (body='.$options['body'].') [1]');
-                },
-                static function (string $method, string $url, array $options = []) {
-                    return new MockResponse($method.': '.$url.' (body='.$options['body'].') [2]');
-                },
+                static fn (string $method, string $url, array $options = []) => new MockResponse($method.': '.$url.' (body='.$options['body'].') [1]'),
+                static fn (string $method, string $url, array $options = []) => new MockResponse($method.': '.$url.' (body='.$options['body'].') [2]'),
             ],
             [
                 'POST: https://example.com/foo (body=payload) [1]',
@@ -115,7 +109,7 @@ public function testValidResponseFactory($responseFactory)
     public function validResponseFactoryProvider()
     {
         return [
-            [static function (): MockResponse { return new MockResponse(); }],
+            [static fn (): MockResponse => new MockResponse()],
             [new MockResponse()],
             [[new MockResponse()]],
             [new \ArrayIterator([new MockResponse()])],
@@ -142,12 +136,8 @@ public function transportExceptionProvider(): iterable
     {
         yield 'array of callable' => [
             [
-                static function (string $method, string $url, array $options = []) {
-                    return new MockResponse();
-                },
-                static function (string $method, string $url, array $options = []) {
-                    return new MockResponse();
-                },
+                static fn (string $method, string $url, array $options = []) => new MockResponse(),
+                static fn (string $method, string $url, array $options = []) => new MockResponse(),
             ],
         ];
 
@@ -183,7 +173,7 @@ public function invalidResponseFactoryProvider()
     {
         return [
             [static function (): \Generator { yield new MockResponse(); }, 'The response factory passed to MockHttpClient must return/yield an instance of ResponseInterface, "Generator" given.'],
-            [static function (): array { return [new MockResponse()]; }, 'The response factory passed to MockHttpClient must return/yield an instance of ResponseInterface, "array" given.'],
+            [static fn (): array => [new MockResponse()], 'The response factory passed to MockHttpClient must return/yield an instance of ResponseInterface, "array" given.'],
             [(static function (): \Generator { yield 'ccc'; })(), 'The response factory passed to MockHttpClient must return/yield an instance of ResponseInterface, "string" given.'],
         ];
     }
diff --git a/src/Symfony/Component/HttpClient/Tests/Response/HttplugPromiseTest.php b/src/Symfony/Component/HttpClient/Tests/Response/HttplugPromiseTest.php
index d781d4925b17b..9fb3ad2fc9631 100644
--- a/src/Symfony/Component/HttpClient/Tests/Response/HttplugPromiseTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/Response/HttplugPromiseTest.php
@@ -29,7 +29,7 @@ public function testComplexNesting()
 
         $promise1 = $mkPromise('result');
         $promise2 = $promise1->then($mkPromise);
-        $promise3 = $promise2->then(function ($result) { return $result; });
+        $promise3 = $promise2->then(fn ($result) => $result);
 
         $this->assertSame('result', $promise3->wait());
     }
diff --git a/src/Symfony/Component/HttpClient/Tests/TraceableHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/TraceableHttpClientTest.php
index 5f20e1989dfa1..cf437a653bd76 100755
--- a/src/Symfony/Component/HttpClient/Tests/TraceableHttpClientTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/TraceableHttpClientTest.php
@@ -123,9 +123,7 @@ public function testToArrayChecksStatusCodeBeforeDecoding()
     {
         $this->expectException(ClientExceptionInterface::class);
 
-        $sut = new TraceableHttpClient(new MockHttpClient($responseFactory = function (): MockResponse {
-            return new MockResponse('Errored.', ['http_code' => 400]);
-        }));
+        $sut = new TraceableHttpClient(new MockHttpClient($responseFactory = fn (): MockResponse => new MockResponse('Errored.', ['http_code' => 400])));
 
         $response = $sut->request('GET', 'https://example.com/foo/bar');
         $response->toArray();
diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeader.php b/src/Symfony/Component/HttpFoundation/AcceptHeader.php
index 180e9604c7fad..5edf5f5f18251 100644
--- a/src/Symfony/Component/HttpFoundation/AcceptHeader.php
+++ b/src/Symfony/Component/HttpFoundation/AcceptHeader.php
@@ -115,9 +115,7 @@ public function all(): array
      */
     public function filter(string $pattern): self
     {
-        return new self(array_filter($this->items, function (AcceptHeaderItem $item) use ($pattern) {
-            return preg_match($pattern, $item->getValue());
-        }));
+        return new self(array_filter($this->items, fn (AcceptHeaderItem $item) => preg_match($pattern, $item->getValue())));
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php
index 7ed39408fd5af..3ccc45d1d5431 100644
--- a/src/Symfony/Component/HttpFoundation/FileBag.php
+++ b/src/Symfony/Component/HttpFoundation/FileBag.php
@@ -75,7 +75,7 @@ protected function convertFileInformation(array|UploadedFile $file): array|Uploa
                 $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['error'], false);
             }
         } else {
-            $file = array_map(function ($v) { return $v instanceof UploadedFile || \is_array($v) ? $this->convertFileInformation($v) : $v; }, $file);
+            $file = array_map(fn ($v) => $v instanceof UploadedFile || \is_array($v) ? $this->convertFileInformation($v) : $v, $file);
             if (array_keys($keys) === $keys) {
                 $file = array_filter($file);
             }
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 3cf8a9954007d..56d74874c1319 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -605,9 +605,7 @@ public static function getTrustedHeaderSet(): int
      */
     public static function setTrustedHosts(array $hostPatterns)
     {
-        self::$trustedHostPatterns = array_map(function ($hostPattern) {
-            return sprintf('{%s}i', $hostPattern);
-        }, $hostPatterns);
+        self::$trustedHostPatterns = array_map(fn ($hostPattern) => sprintf('{%s}i', $hostPattern), $hostPatterns);
         // we need to reset trusted hosts on trusted host patterns change
         self::$trustedHosts = [];
     }
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
index c2addd36e8ad1..28cdd20c55f32 100644
--- a/src/Symfony/Component/HttpFoundation/RequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
@@ -120,9 +120,7 @@ public function matchIps(string|array|null $ips)
     {
         $ips = null !== $ips ? (array) $ips : [];
 
-        $this->ips = array_reduce($ips, static function (array $ips, string $ip) {
-            return array_merge($ips, preg_split('/\s*,\s*/', $ip));
-        }, []);
+        $this->ips = array_reduce($ips, static fn (array $ips, string $ip) => array_merge($ips, preg_split('/\s*,\s*/', $ip)), []);
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher/IpsRequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher/IpsRequestMatcher.php
index 2ddff038df769..333612e2f29b2 100644
--- a/src/Symfony/Component/HttpFoundation/RequestMatcher/IpsRequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/RequestMatcher/IpsRequestMatcher.php
@@ -30,9 +30,7 @@ class IpsRequestMatcher implements RequestMatcherInterface
      */
     public function __construct(array|string $ips)
     {
-        $this->ips = array_reduce((array) $ips, static function (array $ips, string $ip) {
-            return array_merge($ips, preg_split('/\s*,\s*/', $ip));
-        }, []);
+        $this->ips = array_reduce((array) $ips, static fn (array $ips, string $ip) => array_merge($ips, preg_split('/\s*,\s*/', $ip)), []);
     }
 
     public function matches(Request $request): bool
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher/MethodRequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher/MethodRequestMatcher.php
index c7a915980c239..b37f6e3c87f96 100644
--- a/src/Symfony/Component/HttpFoundation/RequestMatcher/MethodRequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/RequestMatcher/MethodRequestMatcher.php
@@ -32,9 +32,7 @@ class MethodRequestMatcher implements RequestMatcherInterface
      */
     public function __construct(array|string $methods)
     {
-        $this->methods = array_reduce(array_map('strtoupper', (array) $methods), static function (array $methods, string $method) {
-            return array_merge($methods, preg_split('/\s*,\s*/', $method));
-        }, []);
+        $this->methods = array_reduce(array_map('strtoupper', (array) $methods), static fn (array $methods, string $method) => array_merge($methods, preg_split('/\s*,\s*/', $method)), []);
     }
 
     public function matches(Request $request): bool
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher/SchemeRequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher/SchemeRequestMatcher.php
index 4f5eabc2c5ba1..9c9cd58b983cc 100644
--- a/src/Symfony/Component/HttpFoundation/RequestMatcher/SchemeRequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/RequestMatcher/SchemeRequestMatcher.php
@@ -32,9 +32,7 @@ class SchemeRequestMatcher implements RequestMatcherInterface
      */
     public function __construct(array|string $schemes)
     {
-        $this->schemes = array_reduce(array_map('strtolower', (array) $schemes), static function (array $schemes, string $scheme) {
-            return array_merge($schemes, preg_split('/\s*,\s*/', $scheme));
-        }, []);
+        $this->schemes = array_reduce(array_map('strtolower', (array) $schemes), static fn (array $schemes, string $scheme) => array_merge($schemes, preg_split('/\s*,\s*/', $scheme)), []);
     }
 
     public function matches(Request $request): bool
diff --git a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseCookieValueSame.php b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseCookieValueSame.php
index b3d375e4c37f9..417efc77a6688 100644
--- a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseCookieValueSame.php
+++ b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseCookieValueSame.php
@@ -69,9 +69,7 @@ protected function getCookie(Response $response): ?Cookie
     {
         $cookies = $response->headers->getCookies();
 
-        $filteredCookies = array_filter($cookies, function (Cookie $cookie) {
-            return $cookie->getName() === $this->name && $cookie->getPath() === $this->path && $cookie->getDomain() === $this->domain;
-        });
+        $filteredCookies = array_filter($cookies, fn (Cookie $cookie) => $cookie->getName() === $this->name && $cookie->getPath() === $this->path && $cookie->getDomain() === $this->domain);
 
         return reset($filteredCookies) ?: null;
     }
diff --git a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseHasCookie.php b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseHasCookie.php
index 9b15aeae83785..73393d386fbce 100644
--- a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseHasCookie.php
+++ b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseHasCookie.php
@@ -61,9 +61,7 @@ private function getCookie(Response $response): ?Cookie
     {
         $cookies = $response->headers->getCookies();
 
-        $filteredCookies = array_filter($cookies, function (Cookie $cookie) {
-            return $cookie->getName() === $this->name && $cookie->getPath() === $this->path && $cookie->getDomain() === $this->domain;
-        });
+        $filteredCookies = array_filter($cookies, fn (Cookie $cookie) => $cookie->getName() === $this->name && $cookie->getPath() === $this->path && $cookie->getDomain() === $this->domain);
 
         return reset($filteredCookies) ?: null;
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php
index 696318e91ea98..8d758916cb2c9 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php
@@ -64,9 +64,7 @@ public function testFilterCallback()
     public function testFilterClosure()
     {
         $bag = new InputBag(['foo' => 'bar']);
-        $result = $bag->filter('foo', null, \FILTER_CALLBACK, ['options' => function ($value) {
-            return strtoupper($value);
-        }]);
+        $result = $bag->filter('foo', null, \FILTER_CALLBACK, ['options' => strtoupper(...)]);
 
         $this->assertSame('BAR', $result);
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
index 1b60fb2418008..7a737e2f20fcc 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
@@ -188,9 +188,7 @@ public function testFilterCallback()
     public function testFilterClosure()
     {
         $bag = new ParameterBag(['foo' => 'bar']);
-        $result = $bag->filter('foo', null, \FILTER_CALLBACK, ['options' => function ($value) {
-            return strtoupper($value);
-        }]);
+        $result = $bag->filter('foo', null, \FILTER_CALLBACK, ['options' => strtoupper(...)]);
 
         $this->assertSame('BAR', $result);
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestMatcher/AttributesRequestMatcherTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestMatcher/AttributesRequestMatcherTest.php
index 9ca88765234f7..ce8cc7f20c96c 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestMatcher/AttributesRequestMatcherTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestMatcher/AttributesRequestMatcherTest.php
@@ -26,9 +26,7 @@ public function test(string $key, string $regexp, bool $expected)
         $matcher = new AttributesRequestMatcher([$key => $regexp]);
         $request = Request::create('/admin/foo');
         $request->attributes->set('foo', 'foo_bar');
-        $request->attributes->set('_controller', function () {
-            return new Response('foo');
-        });
+        $request->attributes->set('_controller', fn () => new Response('foo'));
         $this->assertSame($expected, $matcher->matches($request));
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php
index 0419d36932dee..a51df62340109 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php
@@ -173,9 +173,7 @@ public function testAttributesWithClosure()
         $matcher = new RequestMatcher();
 
         $request = Request::create('/admin/foo');
-        $request->attributes->set('_controller', function () {
-            return new Response('foo');
-        });
+        $request->attributes->set('_controller', fn () => new Response('foo'));
 
         $matcher->matchAttribute('_controller', 'babar');
         $this->assertFalse($matcher->matches($request));
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index 23acd2e05f7fe..fda63830578a2 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -2139,9 +2139,7 @@ public function testSetTrustedHostsDoesNotBreakOnSpecialCharacters()
 
     public function testFactory()
     {
-        Request::setFactory(function (array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null) {
-            return new NewRequest();
-        });
+        Request::setFactory(fn (array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null) => new NewRequest());
 
         $this->assertEquals('foo', Request::create('/')->getFoo());
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php
index aca283af0023d..dc3e5a3ac2752 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php
@@ -44,7 +44,7 @@ public static function tearDownAfterClass(): void
     public function testCookie($fixture)
     {
         $result = file_get_contents(sprintf('http://localhost:8054/%s.php', $fixture));
-        $result = preg_replace_callback('/expires=[^;]++/', function ($m) { return str_replace('-', ' ', $m[0]); }, $result);
+        $result = preg_replace_callback('/expires=[^;]++/', fn ($m) => str_replace('-', ' ', $m[0]), $result);
         $this->assertStringMatchesFormatFile(__DIR__.sprintf('/Fixtures/response-functional/%s.expected', $fixture), $result);
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
index aca2bfd882b20..ae470da5d0772 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
@@ -46,7 +46,7 @@ public function testSession($fixture)
         $context = ['http' => ['header' => "Cookie: sid=123abc\r\n"]];
         $context = stream_context_create($context);
         $result = file_get_contents(sprintf('http://localhost:8053/%s.php', $fixture), false, $context);
-        $result = preg_replace_callback('/expires=[^;]++/', function ($m) { return str_replace('-', ' ', $m[0]); }, $result);
+        $result = preg_replace_callback('/expires=[^;]++/', fn ($m) => str_replace('-', ' ', $m[0]), $result);
 
         $this->assertStringEqualsFile(__DIR__.sprintf('/Fixtures/%s.expected', $fixture), $result);
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/invalid_regenerate.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/invalid_regenerate.php
index 2798442a9d624..d7ec890d99e61 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/invalid_regenerate.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/invalid_regenerate.php
@@ -17,4 +17,4 @@
 echo empty($_SESSION) ? '$_SESSION is empty' : '$_SESSION is not empty';
 echo "\n";
 
-ob_start(function ($buffer) { return preg_replace('~_sf2_meta.*$~m', '', str_replace(session_id(), 'random_session_id', $buffer)); });
+ob_start(fn ($buffer) => preg_replace('~_sf2_meta.*$~m', '', str_replace(session_id(), 'random_session_id', $buffer)));
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/regenerate.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/regenerate.php
index a0f635c8712ec..b85849595ad0b 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/regenerate.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/regenerate.php
@@ -7,4 +7,4 @@
 
 session_regenerate_id(true);
 
-ob_start(function ($buffer) { return str_replace(session_id(), 'random_session_id', $buffer); });
+ob_start(fn ($buffer) => str_replace(session_id(), 'random_session_id', $buffer));
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/storage.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/storage.php
index 96dca3c2c0006..a86c8205623f9 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/storage.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/storage.php
@@ -21,4 +21,4 @@
 
 echo empty($_SESSION) ? '$_SESSION is empty' : '$_SESSION is not empty';
 
-ob_start(function ($buffer) { return str_replace(session_id(), 'random_session_id', $buffer); });
+ob_start(fn ($buffer) => str_replace(session_id(), 'random_session_id', $buffer));
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_samesite.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_samesite.php
index fc2c4182895ac..a005362ceba5a 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_samesite.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_samesite.php
@@ -10,4 +10,4 @@
 
 $_SESSION = ['foo' => 'bar'];
 
-ob_start(function ($buffer) { return str_replace(session_id(), 'random_session_id', $buffer); });
+ob_start(fn ($buffer) => str_replace(session_id(), 'random_session_id', $buffer));
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.php
index a28b6fedfc375..13c951ee32e0a 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.php
@@ -12,4 +12,4 @@
 
 $storage->regenerate(true);
 
-ob_start(function ($buffer) { return preg_replace('~_sf2_meta.*$~m', '', str_replace(session_id(), 'random_session_id', $buffer)); });
+ob_start(fn ($buffer) => preg_replace('~_sf2_meta.*$~m', '', str_replace(session_id(), 'random_session_id', $buffer)));
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
index 3e0e7844104b4..8bb307f44ab5b 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
         }
 
         $r = new \ReflectionClass(\Memcached::class);
-        $methodsToMock = array_map(function ($m) { return $m->name; }, $r->getMethods(\ReflectionMethod::IS_PUBLIC));
+        $methodsToMock = array_map(fn ($m) => $m->name, $r->getMethods(\ReflectionMethod::IS_PUBLIC));
         $methodsToMock = array_diff($methodsToMock, ['getDelayed', 'getDelayedByKey']);
 
         $this->memcached = $this->getMockBuilder(\Memcached::class)
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
index 07a82d09a57a5..18151df7da681 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -157,9 +157,7 @@ public function testReadLockedConvertsStreamToString()
         $selectStmt = $this->createMock(\PDOStatement::class);
         $insertStmt = $this->createMock(\PDOStatement::class);
 
-        $pdo->prepareResult = function ($statement) use ($selectStmt, $insertStmt) {
-            return str_starts_with($statement, 'INSERT') ? $insertStmt : $selectStmt;
-        };
+        $pdo->prepareResult = fn ($statement) => str_starts_with($statement, 'INSERT') ? $insertStmt : $selectStmt;
 
         $content = 'foobar';
         $stream = $this->createStream($content);
@@ -333,7 +331,7 @@ public function testConfigureSchemaDifferentDatabase()
         $schema = new Schema();
 
         $pdoSessionHandler = new PdoSessionHandler($this->getMemorySqlitePdo());
-        $pdoSessionHandler->configureSchema($schema, fn() => false);
+        $pdoSessionHandler->configureSchema($schema, fn () => false);
         $this->assertFalse($schema->hasTable('sessions'));
     }
 
@@ -342,7 +340,7 @@ public function testConfigureSchemaSameDatabase()
         $schema = new Schema();
 
         $pdoSessionHandler = new PdoSessionHandler($this->getMemorySqlitePdo());
-        $pdoSessionHandler->configureSchema($schema, fn() => true);
+        $pdoSessionHandler->configureSchema($schema, fn () => true);
         $this->assertTrue($schema->hasTable('sessions'));
     }
 
@@ -352,7 +350,7 @@ public function testConfigureSchemaTableExistsPdo()
         $schema->createTable('sessions');
 
         $pdoSessionHandler = new PdoSessionHandler($this->getMemorySqlitePdo());
-        $pdoSessionHandler->configureSchema($schema, fn() => true);
+        $pdoSessionHandler->configureSchema($schema, fn () => true);
         $table = $schema->getTable('sessions');
         $this->assertEmpty($table->getColumns(), 'The table was not overwritten');
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php
index 203c4b2851ff2..6b8b8f111dc6b 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php
@@ -72,7 +72,7 @@ public function testCreateRedisHandlerFromDsn()
         $ttlProperty = $reflection->getProperty('ttl');
         $this->assertSame(3600, $ttlProperty->getValue($handler));
 
-        $handler = SessionHandlerFactory::createHandler('redis://localhost?prefix=foo&ttl=3600&ignored=bar', ['ttl' => function () { return 123; }]);
+        $handler = SessionHandlerFactory::createHandler('redis://localhost?prefix=foo&ttl=3600&ignored=bar', ['ttl' => fn () => 123]);
 
         $this->assertInstanceOf(\Closure::class, $reflection->getProperty('ttl')->getValue($handler));
     }
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
index 4a08041f33775..b12ce8d35ffd6 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -197,8 +197,6 @@ private function getClassMethodsWithoutMagicMethods($classOrObject): array
     {
         $methods = get_class_methods($classOrObject);
 
-        return array_filter($methods, function (string $method) {
-            return 0 !== strncmp($method, '__', 2);
-        });
+        return array_filter($methods, fn (string $method) => 0 !== strncmp($method, '__', 2));
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
index 661b84e0ade9c..b6448ba5edda5 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -110,9 +110,7 @@ public function getProcessedLogs()
         }
 
         // sort logs from oldest to newest
-        usort($logs, static function ($logA, $logB) {
-            return $logA['timestamp'] <=> $logB['timestamp'];
-        });
+        usort($logs, static fn ($logA, $logB) => $logA['timestamp'] <=> $logB['timestamp']);
 
         return $this->processedLogs = $logs;
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
index aa505783bbd46..cdfa081d8b971 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -136,7 +136,7 @@ public function collect(Request $request, Response $response, \Throwable $except
                 continue;
             }
             if ('request_headers' === $key || 'response_headers' === $key) {
-                $this->data[$key] = array_map(functi
10000
on ($v) { return isset($v[0]) && !isset($v[1]) ? $v[0] : $v; }, $value);
+                $this->data[$key] = array_map(fn ($v) => isset($v[0]) && !isset($v[1]) ? $v[0] : $v, $value);
             }
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
index 0870b6a241d1e..9e8c27b26e682 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
@@ -127,9 +127,7 @@ public function write(Profile $profile): bool
         // when there are errors in sub-requests, the parent and/or children tokens
         // may equal the profile token, resulting in infinite loops
         $parentToken = $profile->getParentToken() !== $profileToken ? $profile->getParentToken() : null;
-        $childrenToken = array_filter(array_map(function (Profile $p) use ($profileToken) {
-            return $profileToken !== $p->getToken() ? $p->getToken() : null;
-        }, $profile->getChildren()));
+        $childrenToken = array_filter(array_map(fn (Profile $p) => $profileToken !== $p->getToken() ? $p->getToken() : null, $profile->getChildren()));
 
         // Store profile
         $data = [
diff --git a/src/Symfony/Component/HttpKernel/Resources/welcome.html.php b/src/Symfony/Component/HttpKernel/Resources/welcome.html.php
index 44d962d503f3f..2670ce1ab8f00 100644
--- a/src/Symfony/Component/HttpKernel/Resources/welcome.html.php
+++ b/src/Symfony/Component/HttpKernel/Resources/welcome.html.php
@@ -7,8 +7,8 @@
     <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>👋</text></svg>">
     <style>
         <?php $hue = random_int(0, 360); ?>
-        <?php $darkColor = static function (float $alpha = 1) use ($hue) { return "hsla($hue, 20%, 45%, $alpha)"; }; ?>
-        <?php $lightColor = static function (float $alpha = 1) use ($hue) { return "hsla($hue, 20%, 95%, $alpha)"; }; ?>
+        <?php $darkColor = static fn (float $alpha = 1) => "hsla($hue, 20%, 45%, $alpha)"; ?>
+        <?php $lightColor = static fn (float $alpha = 1) => "hsla($hue, 20%, 95%, $alpha)"; ?>
         body { background: <?= $lightColor(); ?>; color: <?= $darkColor(); ?>; display: flex; font: 16px/1.5 sans-serif; justify-content: center; margin: 0; }
         h1, h2 { line-height: 1.2; margin: 0 0 .5em; }
         h1 { font-size: 36px; }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/NotTaggedControllerValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/NotTaggedControllerValueResolverTest.php
index 71b5543b04092..e28f8d513092c 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/NotTaggedControllerValueResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/NotTaggedControllerValueResolverTest.php
@@ -40,13 +40,9 @@ public function testDoSupportWhenControllerDoNotExists()
     public function testDoNotSupportWhenControllerExists()
     {
         $resolver = new NotTaggedControllerValueResolver(new ServiceLocator([
-            'App\\Controller\\Mine::method' => function () {
-                return new ServiceLocator([
-                    'dummy' => function () {
-                        return new \stdClass();
-                    },
-                ]);
-            },
+            'App\\Controller\\Mine::method' => fn () => new ServiceLocator([
+                'dummy' => fn () => new \stdClass(),
+            ]),
         ]));
         $argument = new ArgumentMetadata('dummy', \stdClass::class, false, false, null);
         $request = $this->requestWithAttributes(['_controller' => 'App\\Controller\\Mine::method']);
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
index 7bc4259439e97..63a35b41246ae 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
@@ -40,13 +40,9 @@ public function testDoNotSupportWhenControllerDoNotExists()
     public function testExistingController()
     {
         $resolver = new ServiceValueResolver(new ServiceLocator([
-            'App\\Controller\\Mine::method' => function () {
-                return new ServiceLocator([
-                    'dummy' => function () {
-                        return new DummyService();
-                    },
-                ]);
-            },
+            'App\\Controller\\Mine::method' => fn () => new ServiceLocator([
+                'dummy' => fn () => new DummyService(),
+            ]),
         ]));
 
         $request = $this->requestWithAttributes(['_controller' => 'App\\Controller\\Mine::method']);
@@ -58,13 +54,9 @@ public function testExistingController()
     public function testExistingControllerWithATrailingBackSlash()
     {
         $resolver = new ServiceValueResolver(new ServiceLocator([
-            'App\\Controller\\Mine::method' => function () {
-                return new ServiceLocator([
-                    'dummy' => function () {
-                        return new DummyService();
-                    },
-                ]);
-            },
+            'App\\Controller\\Mine::method' => fn () => new ServiceLocator([
+                'dummy' => fn () => new DummyService(),
+            ]),
         ]));
 
         $request = $this->requestWithAttributes(['_controller' => '\\App\\Controller\\Mine::method']);
@@ -76,13 +68,9 @@ public function testExistingControllerWithATrailingBackSlash()
     public function testExistingControllerWithMethodNameStartUppercase()
     {
         $resolver = new ServiceValueResolver(new ServiceLocator([
-            'App\\Controller\\Mine::method' => function () {
-                return new ServiceLocator([
-                    'dummy' => function () {
-                        return new DummyService();
-                    },
-                ]);
-            },
+            'App\\Controller\\Mine::method' => fn () => new ServiceLocator([
+                'dummy' => fn () => new DummyService(),
+            ]),
         ]));
         $request = $this->requestWithAttributes(['_controller' => 'App\\Controller\\Mine::Method']);
         $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
@@ -93,13 +81,9 @@ public function testExistingControllerWithMethodNameStartUppercase()
     public function testControllerNameIsAnArray()
     {
         $resolver = new ServiceValueResolver(new ServiceLocator([
-            'App\\Controller\\Mine::method' => function () {
-                return new ServiceLocator([
-                    'dummy' => function () {
-                        return new DummyService();
-                    },
-                ]);
-            },
+            'App\\Controller\\Mine::method' => fn () => new ServiceLocator([
+                'dummy' => fn () => new DummyService(),
+            ]),
         ]));
 
         $request = $this->requestWithAttributes(['_controller' => ['App\\Controller\\Mine', 'method']]);
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
index a85c5e863aa94..3b5535973bf7e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
@@ -116,9 +116,7 @@ public function testGetControllerWithClosure()
     {
         $resolver = $this->createControllerResolver();
 
-        $closure = function () {
-            return 'test';
-        };
+        $closure = fn () => 'test';
 
         $request = Request::create('/');
         $request->attributes->set('_controller', $closure);
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
index 696fb75561cbd..7b9785376f826 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -113,7 +113,7 @@ public function provideControllerCallables()
 
             [
                 'Closure',
-                function () { return 'foo'; },
+                fn () => 'foo',
                 [
                     'class' => __NAMESPACE__.'\{closure}',
                     'method' => null,
diff --git a/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
index a307bbff55d6c..1845bd1e1773a 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
@@ -113,9 +113,7 @@ public function testListenerCanRemoveItselfWhenExecuted()
     protected function getHttpKernel($dispatcher)
     {
         $controllerResolver = $this->createMock(ControllerResolverInterface::class);
-        $controllerResolver->expects($this->once())->method('getController')->willReturn(function () {
-            return new Response();
-        });
+        $controllerResolver->expects($this->once())->method('getController')->willReturn(fn () => new Response());
         $argumentResolver = $this->createMock(ArgumentResolverInterface::class);
         $argumentResolver->expects($this->once())->method('getArguments')->willReturn([]);
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/CacheAttributeListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/CacheAttributeListenerTest.php
index 78c8333af6a3d..99eb34530a701 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/CacheAttributeListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/CacheAttributeListenerTest.php
@@ -183,9 +183,7 @@ public function testLastModifiedNotModifiedResponse(string $expression)
         $request->headers->add(['If-Modified-Since' => 'Fri, 23 Aug 2013 00:00:00 GMT']);
 
         $listener = new CacheAttributeListener();
-        $controllerArgumentsEvent = new ControllerArgumentsEvent($this->getKernel(), function (TestEntity $test) {
-            return new Response();
-        }, [$entity], $request, null);
+        $controllerArgumentsEvent = new ControllerArgumentsEvent($this->getKernel(), fn (TestEntity $test) => new Response(), [$entity], $request, null);
 
         $listener->onKernelControllerArguments($controllerArgumentsEvent);
         $response = $controllerArgumentsEvent->getController()($entity);
@@ -205,9 +203,7 @@ public function testLastModifiedHeader(string $expression)
         $request->attributes->set('date', new \DateTimeImmutable('Fri, 23 Aug 2013 00:00:00 GMT'));
 
         $listener = new CacheAttributeListener();
-        $controllerArgumentsEvent = new ControllerArgumentsEvent($this->getKernel(), function (TestEntity $test) {
-            return new Response();
-        }, [$entity], $request, null);
+        $controllerArgumentsEvent = new ControllerArgumentsEvent($this->getKernel(), fn (TestEntity $test) => new Response(), [$entity], $request, null);
         $listener->onKernelControllerArguments($controllerArgumentsEvent);
 
         $controllerResponse = $controllerArgumentsEvent->getController()($entity);
@@ -234,9 +230,7 @@ public function testEtagNotModifiedResponse(string $expression)
         $request->headers->add(['If-None-Match' => sprintf('"%s"', hash('sha256', $entity->getId()))]);
 
         $listener = new CacheAttributeListener();
-        $controllerArgumentsEvent = new ControllerArgumentsEvent($this->getKernel(), function (TestEntity $test) {
-            return new Response();
-        }, [$entity], $request, null);
+        $controllerArgumentsEvent = new ControllerArgumentsEvent($this->getKernel(), fn (TestEntity $test) => new Response(), [$entity], $request, null);
 
         $listener->onKernelControllerArguments($controllerArgumentsEvent);
         $response = $controllerArgumentsEvent->getController()($entity);
@@ -256,9 +250,7 @@ public function testEtagHeader(string $expression)
         $request->attributes->set('id', '12345');
 
         $listener = new CacheAttributeListener();
-        $controllerArgumentsEvent = new ControllerArgumentsEvent($this->getKernel(), function (TestEntity $test) {
-            return new Response();
-        }, [$entity], $request, null);
+        $controllerArgumentsEvent = new ControllerArgumentsEvent($this->getKernel(), fn (TestEntity $test) => new Response(), [$entity], $request, null);
         $listener->onKernelControllerArguments($controllerArgumentsEvent);
 
         $controllerResponse = $controllerArgumentsEvent->getController()($entity);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
index 5090eb11cbb79..5e684a096d26e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
@@ -169,9 +169,7 @@ public function testSubRequestFormat()
         $listener = new ErrorListener('foo', $this->createMock(LoggerInterface::class));
 
         $kernel = $this->createMock(HttpKernelInterface::class);
-        $kernel->expects($this->once())->method('handle')->willReturnCallback(function (Request $request) {
-            return new Response($request->getRequestFormat());
-        });
+        $kernel->expects($this->once())->method('handle')->willReturnCallback(fn (Request $request) => new Response($request->getRequestFormat()));
 
         $request = Request::create('/');
         $request->setRequestFormat('xml');
@@ -187,9 +185,7 @@ public function testCSPHeaderIsRemoved()
     {
         $dispatcher = new EventDispatcher();
         $kernel = $this->createMock(HttpKernelInterface::class);
-        $kernel->expects($this->once())->method('handle')->willReturnCallback(function (Request $request) {
-            return new Response($request->getRequestFormat());
-        });
+        $kernel->expects($this->once())->method('handle')->willReturnCallback(fn (Request $request) => new Response($request->getRequestFormat()));
 
         $listener = new ErrorListener('foo', $this->createMock(LoggerInterface::class), true);
 
@@ -233,9 +229,7 @@ public function testOnControllerArguments(callable $controller)
 
     public function controllerProvider()
     {
-        yield [function (FlattenException $exception) {
-            return new Response('OK: '.$exception->getMessage());
-        }];
+        yield [fn (FlattenException $exception) => new Response('OK: '.$exception->getMessage())];
 
         yield [function ($exception) {
             $this->assertInstanceOf(FlattenException::class, $exception);
@@ -243,9 +237,7 @@ public function controllerProvider()
             return new Response('OK: '.$exception->getMessage());
         }];
 
-        yield [function (\Throwable $exception) {
-            return new Response('OK: '.$exception->getMessage());
-        }];
+        yield [fn (\Throwable $exception) => new Response('OK: '.$exception->getMessage())];
     }
 
     public static function exceptionWithAttributeProvider()
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
index e7a67cea1593a..ace21b9befa8b 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
@@ -169,9 +169,7 @@ public function testWithBadRequest()
         $dispatcher = new EventDispatcher();
         $dispatcher->addSubscriber(new ValidateRequestListener());
         $dispatcher->addSubscriber(new RouterListener($requestMatcher, $requestStack, new RequestContext()));
-        $dispatcher->addSubscriber(new ErrorListener(function () {
-            return new Response('Exception handled', 400);
-        }));
+        $dispatcher->addSubscriber(new ErrorListener(fn () => new Response('Exception handled', 400)));
 
         $kernel = new HttpKernel($dispatcher, new ControllerResolver(), $requestStack, new ArgumentResolver());
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
index a277f7a5079e9..7fe5d49d442a5 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -295,7 +295,7 @@ public function testHandleWhenTheControllerIsAClosure()
     {
         $response = new Response('foo');
         $dispatcher = new EventDispatcher();
-        $kernel = $this->getHttpKernel($dispatcher, function () use ($response) { return $response; });
+        $kernel = $this->getHttpKernel($dispatcher, fn () => $response);
 
         $this->assertSame($response, $kernel->handle(new Request()));
     }
@@ -357,7 +357,7 @@ public function testHandleWhenTheControllerDoesNotReturnAResponseButAViewIsRegis
             $event->setResponse(new Response($event->getControllerResult()));
         });
 
-        $kernel = $this->getHttpKernel($dispatcher, function () { return 'foo'; });
+        $kernel = $this->getHttpKernel($dispatcher, fn () => 'foo');
 
         $this->assertEquals('foo', $kernel->handle(new Request())->getContent());
     }
@@ -380,7 +380,7 @@ public function testHandleAllowChangingControllerArguments()
             $event->setArguments(['foo']);
         });
 
-        $kernel = $this->getHttpKernel($dispatcher, function ($content) { return new Response($content); });
+        $kernel = $this->getHttpKernel($dispatcher, fn ($content) => new Response($content));
 
         $this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));
     }
@@ -404,7 +404,7 @@ public function testHandleAllowChangingControllerAndArguments()
             $event->setArguments(['bar']);
         });
 
-        $kernel = $this->getHttpKernel($dispatcher, function ($content) { return new Response($content); }, null, ['foo']);
+        $kernel = $this->getHttpKernel($dispatcher, fn ($content) => new Response($content), null, ['foo']);
 
         $this->assertResponseEquals(new Response('foo', 200, ['X-Id' => 'bar']), $kernel->handle(new Request()));
     }
@@ -479,7 +479,7 @@ public function testInconsistentClientIpsOnMainRequests()
 
     private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, RequestStack $requestStack = null, array $arguments = [], bool $handleAllThrowables = false)
     {
-        $controller ??= function () { return new Response('Hello'); };
+        $controller ??= fn () => new Response('Hello');
 
         $controllerResolver = $this->createMock(ControllerResolverInterface::class);
         $controllerResolver
diff --git a/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php b/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
index 6625835f71587..0da7b59298dca 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
@@ -185,9 +185,7 @@ public function testContextExceptionKeyCanBeExceptionOrOtherValues()
 
     public function testFormatter()
     {
-        $this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile, function ($level, $message, $context) {
-            return json_encode(['level' => $level, 'message' => $message, 'context' => $context]);
-        });
+        $this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile, fn ($level, $message, $context) => json_encode(['level' => $level, 'message' => $message, 'context' => $context]));
 
         $this->logger->error('An error', ['foo' => 'bar']);
         $this->logger->warning('A warning', ['baz' => 'bar']);
diff --git a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
index 1999138c792e7..dbf045bd20e0e 100644
--- a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
@@ -112,9 +112,7 @@ protected function generateDataForMeta(BundleEntryReaderInterface $reader, strin
 
     private function generateSymbolNamePairs(ArrayAccessibleResourceBundle $rootBundle): array
     {
-        $symbolNamePairs = array_map(function ($pair) {
-            return \array_slice(iterator_to_array($pair), 0, 2);
-        }, iterator_to_array($rootBundle['Currencies']));
+        $symbolNamePairs = array_map(fn ($pair) => \array_slice(iterator_to_array($pair), 0, 2), iterator_to_array($rootBundle['Currencies']));
 
         // Remove unwanted currencies
         $symbolNamePairs = array_diff_key($symbolNamePairs, self::DENYLIST);
diff --git a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
index afff0255d99f7..363f173103c32 100644
--- a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
@@ -169,9 +169,7 @@ private static function generateLanguageNames(ArrayAccessibleResourceBundle $loc
 
     private function generateAlpha3Codes(array $languageCodes, ArrayAccessibleResourceBundle $metadataBundle): array
     {
-        $alpha3Codes = array_flip(array_filter($languageCodes, static function (string $language): bool {
-            return 3 === \strlen($language);
-        }));
+        $alpha3Codes = array_flip(array_filter($languageCodes, static fn (string $language): bool => 3 === \strlen($language)));
 
         foreach ($metadataBundle['alias']['language'] as $alias => $data) {
             if (3 === \strlen($alias) && 'overlong' === $data['reason']) {
diff --git a/src/Symfony/Component/Intl/Data/Util/LocaleScanner.php b/src/Symfony/Component/Intl/Data/Util/LocaleScanner.php
index ff189bc98bf8b..63d75a6734570 100644
--- a/src/Symfony/Component/Intl/Data/Util/LocaleScanner.php
+++ b/src/Symfony/Component/Intl/Data/Util/LocaleScanner.php
@@ -46,9 +46,7 @@ public function scanLocales(string $sourceDir): array
         array_walk($locales, function (&$locale) { $locale = basename($locale, '.txt'); });
 
         // Remove non-locales
-        $locales = array_filter($locales, function ($locale) {
-            return preg_match('/^[a-z]{2}(_.+)?$/', $locale);
-        });
+        $locales = array_filter($locales, fn ($locale) => preg_match('/^[a-z]{2}(_.+)?$/', $locale));
 
         sort($locales);
 
diff --git a/src/Symfony/Component/Intl/Resources/bin/update-data.php b/src/Symfony/Component/Intl/Resources/bin/update-data.php
index 2aeb141d2cc26..5c11770b64acc 100644
--- a/src/Symfony/Component/Intl/Resources/bin/update-data.php
+++ b/src/Symfony/Component/Intl/Resources/bin/update-data.php
@@ -77,9 +77,7 @@
     echo "Git clone to {$repoDir} complete.\n";
 }
 
-$gitTag = $git->getLastTag(function ($tag) {
-    return preg_match('#^release-[0-9]{1,}-[0-9]{1}$#', $tag);
-});
+$gitTag = $git->getLastTag(fn ($tag) => preg_match('#^release-[0-9]{1,}-[0-9]{1}$#', $tag));
 $shortIcuVersion = strip_minor_versions(preg_replace('#release-([0-9]{1,})-([0-9]{1,})#', '$1.$2', $gitTag));
 
 echo "Checking out `{$gitTag}` for version `{$shortIcuVersion}`...\n";
diff --git a/src/Symfony/Component/Intl/Tests/CurrenciesTest.php b/src/Symfony/Component/Intl/Tests/CurrenciesTest.php
index 94453f3278731..ee22b78c127d7 100644
--- a/src/Symfony/Component/Intl/Tests/CurrenciesTest.php
+++ b/src/Symfony/Component/Intl/Tests/CurrenciesTest.php
@@ -677,7 +677,7 @@ public function testGetSymbol($displayLocale)
     public function provideCurrencies()
     {
         return array_map(
-            function ($currency) { return [$currency]; },
+            fn ($currency) => [$currency],
             self::CURRENCIES
         );
     }
@@ -704,7 +704,7 @@ public function testGetRoundingIncrement($currency)
     public function provideCurrenciesWithNumericEquivalent()
     {
         return array_map(
-            function ($value) { return [$value]; },
+            fn ($value) => [$value],
             array_keys(self::ALPHA3_TO_NUMERIC)
         );
     }
@@ -720,7 +720,7 @@ public function testGetNumericCode($currency)
     public function provideCurrenciesWithoutNumericEquivalent()
     {
         return array_map(
-            function ($value) { return [$value]; },
+            fn ($value) => [$value],
             array_diff(self::CURRENCIES, array_keys(self::ALPHA3_TO_NUMERIC))
         );
     }
@@ -739,7 +739,7 @@ public function provideValidNumericCodes()
         $numericToAlpha3 = $this->getNumericToAlpha3Mapping();
 
         return array_map(
-            function ($numeric, $alpha3) { return [$numeric, $alpha3]; },
+            fn ($numeric, $alpha3) => [$numeric, $alpha3],
             array_keys($numericToAlpha3),
             $numericToAlpha3
         );
@@ -765,7 +765,7 @@ public function provideInvalidNumericCodes()
         $invalidNumericCodes = array_diff(range(0, 1000), $validNumericCodes);
 
         return array_map(
-            function ($value) { return [$value]; },
+            fn ($value) => [$value],
             $invalidNumericCodes
         );
     }
diff --git a/src/Symfony/Component/Intl/Tests/LanguagesTest.php b/src/Symfony/Component/Intl/Tests/LanguagesTest.php
index bc0641e40c97f..9f6d2fcd37fed 100644
--- a/src/Symfony/Component/Intl/Tests/LanguagesTest.php
+++ b/src/Symfony/Component/Intl/Tests/LanguagesTest.php
@@ -1745,7 +1745,7 @@ public function testGetNameDefaultLocale()
     public function provideLanguagesWithAlpha3Equivalent()
     {
         return array_map(
-            function ($value) { return [$value]; },
+            fn ($value) => [$value],
             array_keys(self::ALPHA2_TO_ALPHA3)
         );
     }
@@ -1761,7 +1761,7 @@ public function testGetAlpha3Code($language)
     public function provideLanguagesWithoutAlpha3Equivalent()
     {
         return array_map(
-            function ($value) { return [$value]; },
+            fn ($value) => [$value],
             array_diff(self::LANGUAGES, array_keys(self::ALPHA2_TO_ALPHA3))
         );
     }
@@ -1795,7 +1795,7 @@ public function testGetAlpha3Codes()
     public function provideLanguagesWithAlpha2Equivalent()
     {
         return array_map(
-            function ($value) { return [$value]; },
+            fn ($value) => [$value],
             array_keys(self::ALPHA3_TO_ALPHA2)
         );
     }
@@ -1811,7 +1811,7 @@ public function testGetAlpha2Code($language)
     public function provideLanguagesWithoutAlpha2Equivalent()
     {
         return array_map(
-            function ($value) { return [$value]; },
+            fn ($value) => [$value],
             array_diff(self::ALPHA3_CODES, array_keys(self::ALPHA3_TO_ALPHA2))
         );
     }
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php b/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php
index d646b64f69a1f..4cd72cbc5b731 100644
--- a/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php
+++ b/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php
@@ -752,7 +752,7 @@ protected function tearDown(): void
     public function provideLocales()
     {
         return array_map(
-            function ($locale) { return [$locale]; },
+            fn ($locale) => [$locale],
             $this->getLocales()
         );
     }
@@ -760,7 +760,7 @@ function ($locale) { return [$locale]; },
     public function provideLocaleAliases()
     {
         return array_map(
-            function ($alias, $ofLocale) { return [$alias, $ofLocale]; },
+            fn ($alias, $ofLocale) => [$alias, $ofLocale],
             array_keys($this->getLocaleAliases()),
             $this->getLocaleAliases()
         );
@@ -769,7 +769,7 @@ function ($alias, $ofLocale) { return [$alias, $ofLocale]; },
     public function provideRootLocales()
     {
         return array_map(
-            function ($locale) { return [$locale]; },
+            fn ($locale) => [$locale],
             $this->getRootLocales()
         );
     }
@@ -787,10 +787,8 @@ protected function getLocaleAliases()
     protected function getRootLocales()
     {
         if (null === self::$rootLocales) {
-            self::$rootLocales = array_filter($this->getLocales(), function ($locale) {
-                // no locales for which fallback is possible (e.g "en_GB")
-                return !str_contains($locale, '_');
-            });
+            self::$rootLocales = array_filter($this->getLocales(), fn ($locale) => // no locales for which fallback is possible (e.g "en_GB")
+!str_contains($locale, '_'));
         }
 
         return self::$rootLocales;
diff --git a/src/Symfony/Component/Intl/Tests/TimezonesTest.php b/src/Symfony/Component/Intl/Tests/TimezonesTest.php
index 96e0c34aa3449..885cbbaa84e9a 100644
--- a/src/Symfony/Component/Intl/Tests/TimezonesTest.php
+++ b/src/Symfony/Component/Intl/Tests/TimezonesTest.php
@@ -641,9 +641,7 @@ public function testGetCountryCodeAvailability(string $timezone)
 
     public function provideTimezones(): iterable
     {
-        return array_map(function ($timezone) {
-            return [$timezone];
-        }, self::ZONES);
+        return array_map(fn ($timezone) => [$timezone], self::ZONES);
     }
 
     /**
@@ -659,9 +657,7 @@ public function testForCountryCodeAvailability(string $country)
 
     public function provideCountries(): iterable
     {
-        return array_map(function ($country) {
-            return [$country];
-        }, Countries::getCountryCodes());
+        return array_map(fn ($country) => [$country], Countries::getCountryCodes());
     }
 
     public function testGetRawOffsetChangeTimeCountry()
diff --git a/src/Symfony/Component/Intl/Tests/Util/GitRepositoryTest.php b/src/Symfony/Component/Intl/Tests/Util/GitRepositoryTest.php
index 492ff9b2729a8..bf81b387b680b 100644
--- a/src/Symfony/Component/Intl/Tests/Util/GitRepositoryTest.php
+++ b/src/Symfony/Component/Intl/Tests/Util/GitRepositoryTest.php
@@ -58,14 +58,14 @@ public function testItClonesTheRepository()
         $this->assertNotEmpty($git->getLastAuthor());
         $this->assertInstanceOf(\DateTimeImmutable::class, $git->getLastAuthoredDate());
         $this->assertStringMatchesFormat('v%s', $git->getLastTag());
-        $this->assertStringMatchesFormat('v3%s', $git->getLastTag(function ($tag) { return str_starts_with($tag, 'v3'); }));
+        $this->assertStringMatchesFormat('v3%s', $git->getLastTag(fn ($tag) => str_starts_with($tag, 'v3')));
     }
 
     public function testItCheckoutsToTheLastTag()
     {
         $git = GitRepository::download(self::REPO_URL, $this->targetDir);
         $lastCommitHash = $git->getLastCommitHash();
-        $lastV3Tag = $git->getLastTag(function ($tag) { return str_starts_with($tag, 'v3'); });
+        $lastV3Tag = $git->getLastTag(fn ($tag) => str_starts_with($tag, 'v3'));
 
         $git->checkout($lastV3Tag);
 
diff --git a/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php b/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php
index b82d7146eacb8..4f6b0c8222dab 100644
--- a/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php
+++ b/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php
@@ -40,13 +40,9 @@ protected function configureOptions(OptionsResolver $resolver)
             'options' => [],
         ]);
 
-        $resolver->setDefault('port', function (Options $options) {
-            return 'ssl' === $options['encryption'] ? 636 : 389;
-        });
+        $resolver->setDefault('port', fn (Options $options) => 'ssl' === $options['encryption'] ? 636 : 389);
 
-        $resolver->setDefault('connection_string', function (Options $options) {
-            return sprintf('ldap%s://%s:%s', 'ssl' === $options['encryption'] ? 's' : '', $options['host'], $options['port']);
-        });
+        $resolver->setDefault('connection_string', fn (Options $options) => sprintf('ldap%s://%s:%s', 'ssl' === $options['encryption'] ? 's' : '', $options['host'], $options['port']));
 
         $resolver->setAllowedTypes('host', 'string');
         $resolver->setAllowedTypes('port', 'numeric');
diff --git a/src/Symfony/Component/Ldap/Adapter/AbstractQuery.php b/src/Symfony/Component/Ldap/Adapter/AbstractQuery.php
index b2b777d8454dd..56e0d91b283db 100644
--- a/src/Symfony/Component/Ldap/Adapter/AbstractQuery.php
+++ b/src/Symfony/Component/Ldap/Adapter/AbstractQuery.php
@@ -40,9 +40,7 @@ public function __construct(ConnectionInterface $connection, string $dn, string
         $resolver->setAllowedValues('deref', [static::DEREF_ALWAYS, static::DEREF_NEVER, static::DEREF_FINDING, static::DEREF_SEARCHING]);
         $resolver->setAllowedValues('scope', [static::SCOPE_BASE, static::SCOPE_ONE, static::SCOPE_SUB]);
 
-        $resolver->setNormalizer('filter', function (Options $options, $value) {
-            return \is_array($value) ? $value : [$value];
-        });
+        $resolver->setNormalizer('filter', fn (Options $options, $value) => \is_array($value) ? $value : [$value]);
 
         $this->connection = $connection;
         $this->dn = $dn;
diff --git a/src/Symfony/Component/Ldap/Tests/Security/CheckLdapCredentialsListenerTest.php b/src/Symfony/Component/Ldap/Tests/Security/CheckLdapCredentialsListenerTest.php
index cf1e614e94305..c24682c54ec13 100644
--- a/src/Symfony/Component/Ldap/Tests/Security/CheckLdapCredentialsListenerTest.php
+++ b/src/Symfony/Component/Ldap/Tests/Security/CheckLdapCredentialsListenerTest.php
@@ -214,15 +214,13 @@ private function createEvent($password = 's3cr3t', $ldapBadge = null)
     {
         return new CheckPassportEvent(
             new TestAuthenticator(),
-            new Passport(new UserBadge('Wouter', function () { return new InMemoryUser('Wouter', null, ['ROLE_USER']); }), new PasswordCredentials($password), [$ldapBadge ?? new LdapBadge('app.ldap')])
+            new Passport(new UserBadge('Wouter', fn () => new InMemoryUser('Wouter', null, ['ROLE_USER'])), new PasswordCredentials($password), [$ldapBadge ?? new LdapBadge('app.ldap')])
         );
     }
 
     private function createListener()
     {
-        $ldapLocator = new class(['app.ldap' => function () {
-            return $this->ldap;
-        }]) implements ContainerInterface {
+        $ldapLocator = new class(['app.ldap' => fn () => $this->ldap]) implements ContainerInterface {
             use ServiceLocatorTrait;
         };
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php
index ec27819b184e2..5ce2cad3dd75d 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php
@@ -115,16 +115,12 @@ private function getRecipients(Email $email, Envelope $envelope): array
     {
         $emailRecipients = array_merge($email->getCc(), $email->getBcc());
 
-        return array_filter($envelope->getRecipients(), function (Address $address) use ($emailRecipients) {
-            return !\in_array($address, $emailRecipients, true);
-        });
+        return array_filter($envelope->getRecipients(), fn (Address $address) => !\in_array($address, $emailRecipients, true));
     }
 
     protected function stringifyAddresses(array $addresses): array
     {
-        return array_map(function (Address $a) {
-            return $this->stringifyAddress($a);
-        }, $addresses);
+        return array_map(fn (Address $a) => $this->stringifyAddress($a), $addresses);
     }
 
     protected function stringifyAddress(Address $a): string
diff --git a/src/Symfony/Component/Mailer/Bridge/MailPace/Tests/Transport/MailPaceApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/MailPace/Tests/Transport/MailPaceApiTransportTest.php
index ac8deaa808453..e6e91216addbc 100644
--- a/src/Symfony/Component/Mailer/Bridge/MailPace/Tests/Transport/MailPaceApiTransportTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/MailPace/Tests/Transport/MailPaceApiTransportTest.php
@@ -99,14 +99,12 @@ public function testSend()
 
     public function testSendThrowsForErrorResponse()
     {
-        $client = new MockHttpClient(static function (string $method, string $url, array $options): ResponseInterface {
-            return new MockResponse(json_encode(['Message' => 'i\'m a teapot', 'ErrorCode' => 418]), [
-                'http_code' => 418,
-                'response_headers' => [
-                    'content-type' => 'application/json',
-                ],
-            ]);
-        });
+        $client = new MockHttpClient(static fn (string $method, string $url, array $options): ResponseInterface => new MockResponse(json_encode(['Message' => 'i\'m a teapot', 'ErrorCode' => 418]), [
+            'http_code' => 418,
+            'response_headers' => [
+                'content-type' => 'application/json',
+            ],
+        ]));
         $transport = new MailPaceApiTransport('KEY', $client);
         $transport->setPort(8984);
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillApiTransportTest.php
index d8508d217e5ce..80f83f9e01127 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillApiTransportTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillApiTransportTest.php
@@ -103,11 +103,9 @@ public function testSend()
 
     public function testSendThrowsForErrorResponse()
     {
-        $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface {
-            return new MockResponse(json_encode(['status' => 'error', 'message' => 'i\'m a teapot', 'code' => 418]), [
-                'http_code' => 418,
-            ]);
-        });
+        $client = new MockHttpClient(fn (string $method, string $url, array $options): ResponseInterface => new MockResponse(json_encode(['status' => 'error', 'message' => 'i\'m a teapot', 'code' => 418]), [
+            'http_code' => 418,
+        ]));
 
         $transport = new MandrillApiTransport('KEY', $client);
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillHttpTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillHttpTransportTest.php
index ff582d5e9451f..ecb26c1081881 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillHttpTransportTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillHttpTransportTest.php
@@ -88,11 +88,9 @@ public function testSend()
 
     public function testSendThrowsForErrorResponse()
     {
-        $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface {
-            return new MockResponse(json_encode(['status' => 'error', 'message' => 'i\'m a teapot', 'code' => 418]), [
-                'http_code' => 418,
-            ]);
-        });
+        $client = new MockHttpClient(fn (string $method, string $url, array $options): ResponseInterface => new MockResponse(json_encode(['status' => 'error', 'message' => 'i\'m a teapot', 'code' => 418]), [
+            'http_code' => 418,
+        ]));
 
         $transport = new MandrillHttpTransport('KEY', $client);
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php
index 8d61ba59e21e8..e1b672a1efa6c 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php
@@ -50,9 +50,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
         $response = $this->client->request('POST', 'https://'.$this->getEndpoint().'/api/1.0/messages/send-raw.json', [
             'json' => [
                 'key' => $this->key,
-                'to' => array_map(function (Address $recipient): string {
-                    return $recipient->getAddress();
-                }, $envelope->getRecipients()),
+                'to' => array_map(fn (Address $recipient): string => $recipient->getAddress(), $envelope->getRecipients()),
                 'from_email' => $envelope->getSender()->getAddress(),
                 'from_name' => $envelope->getSender()->getName(),
                 'raw_message' => $message->toString(),
diff --git a/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Tests/Transport/OhMySmtpApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Tests/Transport/OhMySmtpApiTransportTest.php
index 91994ada278d9..c0d9602c85af5 100644
--- a/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Tests/Transport/OhMySmtpApiTransportTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Tests/Transport/OhMySmtpApiTransportTest.php
@@ -102,14 +102,12 @@ public function testSend()
 
     public function testSendThrowsForErrorResponse()
     {
-        $client = new MockHttpClient(static function (string $method, string $url, array $options): ResponseInterface {
-            return new MockResponse(json_encode(['error' => 'i\'m a teapot']), [
-                'http_code' => 418,
-                'response_headers' => [
-                    'content-type' => 'application/json',
-                ],
-            ]);
-        });
+        $client = new MockHttpClient(static fn (string $method, string $url, array $options): ResponseInterface => new MockResponse(json_encode(['error' => 'i\'m a teapot']), [
+            'http_code' => 418,
+            'response_headers' => [
+                'content-type' => 'application/json',
+            ],
+        ]));
         $transport = new OhMySmtpApiTransport('KEY', $client);
         $transport->setPort(8984);
 
@@ -126,14 +124,12 @@ public function testSendThrowsForErrorResponse()
 
     public function testSendThrowsForMultipleErrorResponses()
     {
-        $client = new MockHttpClient(static function (string $method, string $url, array $options): ResponseInterface {
-            return new MockResponse(json_encode(['errors' => ['to' => 'undefined field']]), [
-                'http_code' => 418,
-                'response_headers' => [
-                    'content-type' => 'application/json',
-                ],
-            ]);
-        });
+        $client = new MockHttpClient(static fn (string $method, string $url, array $options): ResponseInterface => new MockResponse(json_encode(['errors' => ['to' => 'undefined field']]), [
+            'http_code' => 418,
+            'response_headers' => [
+                'content-type' => 'application/json',
+            ],
+        ]));
         $transport = new OhMySmtpApiTransport('KEY', $client);
         $transport->setPort(8984);
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php
index 058407becd6ef..a7a950a3a4946 100644
--- a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php
@@ -102,14 +102,12 @@ public function testSend()
 
     public function testSendThrowsForErrorResponse()
     {
-        $client = new MockHttpClient(static function (string $method, string $url, array $options): ResponseInterface {
-            return new MockResponse(json_encode(['Message' => 'i\'m a teapot', 'ErrorCode' => 418]), [
-                'http_code' => 418,
-                'response_headers' => [
-                    'content-type' => 'application/json',
-                ],
-            ]);
-        });
+        $client = new MockHttpClient(static fn (string $method, string $url, array $options): ResponseInterface => new MockResponse(json_encode(['Message' => 'i\'m a teapot', 'ErrorCode' => 418]), [
+            'http_code' => 418,
+            'response_headers' => [
+                'content-type' => 'application/json',
+            ],
+        ]));
         $transport = new PostmarkApiTransport('KEY', $client);
         $transport->setPort(8984);
 
diff --git a/src/Symfony/Component/Mailer/Tests/Command/MailerTestCommandTest.php b/src/Symfony/Component/Mailer/Tests/Command/MailerTestCommandTest.php
index f6c28172f2e20..cef3d706dd5d8 100644
--- a/src/Symfony/Component/Mailer/Tests/Command/MailerTestCommandTest.php
+++ b/src/Symfony/Component/Mailer/Tests/Command/MailerTestCommandTest.php
@@ -30,14 +30,10 @@ public function testSendsEmail()
         $mailer
             ->expects($this->once())
             ->method('send')
-            ->with(self::callback(static function (Email $message) use ($from, $to, $subject, $body): bool {
-                return
-                    $message->getFrom()[0]->getAddress() === $from &&
-                    $message->getTo()[0]->getAddress() === $to &&
-                    $message->getSubject() === $subject &&
-                    $message->getTextBody() === $body
-                ;
-            }))
+            ->with(self::callback(static fn (Email $message): bool => $message->getFrom()[0]->getAddress() === $from &&
+            $message->getTo()[0]->getAddress() === $to &&
+            $message->getSubject() === $subject &&
+            $message->getTextBody() === $body))
         ;
 
         $tester = new CommandTester(new MailerTestCommand($mailer));
@@ -57,9 +53,7 @@ public function testUsesCustomTransport()
         $mailer
             ->expects($this->once())
             ->method('send')
-            ->with(self::callback(static function (Email $message) use ($transport): bool {
-                return $message->getHeaders()->getHeaderBody('X-Transport') === $transport;
-            }))
+            ->with(self::callback(static fn (Email $message): bool => $message->getHeaders()->getHeaderBody('X-Transport') === $transport))
         ;
 
         $tester = new CommandTester(new MailerTestCommand($mailer));
diff --git a/src/Symfony/Component/Mailer/Transport/AbstractApiTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractApiTransport.php
index 392484dd685a4..7ca0b4bf1a52d 100644
--- a/src/Symfony/Component/Mailer/Transport/AbstractApiTransport.php
+++ b/src/Symfony/Component/Mailer/Transport/AbstractApiTransport.php
@@ -39,8 +39,6 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
 
     protected function getRecipients(Email $email, Envelope $envelope): array
     {
-        return array_filter($envelope->getRecipients(), function (Address $address) use ($email) {
-            return false === \in_array($address, array_merge($email->getCc(), $email->getBcc()), true);
-        });
+        return array_filter($envelope->getRecipients(), fn (Address $address) => false === \in_array($address, array_merge($email->getCc(), $email->getBcc()), true));
     }
 }
diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
index a6710d007da02..979030acbeffc 100644
--- a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
+++ b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
@@ -108,9 +108,7 @@ abstract protected function doSend(SentMessage $message): void;
      */
     protected function stringifyAddresses(array $addresses): array
     {
-        return array_map(function (Address $a) {
-            return $a->toString();
-        }, $addresses);
+        return array_map(fn (Address $a) => $a->toString(), $addresses);
     }
 
     protected function getLogger(): LoggerInterface
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
index 353d56a2ddb6c..37d52009faa47 100644
--- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -306,9 +306,7 @@ public function publish(string $body, array $headers = [], int $delayInMs = 0, A
      */
     public function countMessagesInQueues(): int
     {
-        return array_sum(array_map(function ($queueName) {
-            return $this->queue($queueName)->declareQueue();
-        }, $this->getQueueNames()));
+        return array_sum(array_map(fn ($queueName) => $this->queue($queueName)->declareQueue(), $this->getQueueNames()));
     }
 
     /**
@@ -494,12 +492,8 @@ public function channel(): \AMQPChannel
             if ('' !== ($this->connectionOptions['confirm_timeout'] ?? '')) {
                 $this->amqpChannel->confirmSelect();
                 $this->amqpChannel->setConfirmCallback(
-                    static function (): bool {
-                        return false;
-                    },
-                    static function (): bool {
-                        return false;
-                    }
+                    static fn (): bool => false,
+                    static fn (): bool => false
                 );
             }
 
diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/ConnectionTest.php
index 274b64478a237..2ccd39be96a1f 100644
--- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/ConnectionTest.php
@@ -175,9 +175,7 @@ public function testAck()
 
         $client = $this->createMock(PheanstalkInterface::class);
         $client->expects($this->once())->method('useTube')->with($tube)->willReturn($client);
-        $client->expects($this->once())->method('delete')->with($this->callback(function (JobId $jobId) use ($id): bool {
-            return $jobId->getId() === $id;
-        }));
+        $client->expects($this->once())->method('delete')->with($this->callback(fn (JobId $jobId): bool => $jobId->getId() === $id));
 
         $connection = new Connection(['tube_name' => $tube], $client);
 
@@ -194,9 +192,7 @@ public function testAckWhenABeanstalkdExceptionOccurs()
 
         $client = $this->createMock(PheanstalkInterface::class);
         $client->expects($this->once())->method('useTube')->with($tube)->willReturn($client);
-        $client->expects($this->once())->method('delete')->with($this->callback(function (JobId $jobId) use ($id): bool {
-            return $jobId->getId() === $id;
-        }))->willThrowException($exception);
+        $client->expects($this->once())->method('delete')->with($this->callback(fn (JobId $jobId): bool => $jobId->getId() === $id))->willThrowException($exception);
 
         $connection = new Connection(['tube_name' => $tube], $client);
 
@@ -212,9 +208,7 @@ public function testReject()
 
         $client = $this->createMock(PheanstalkInterface::class);
         $client->expects($this->once())->method('useTube')->with($tube)->willReturn($client);
-        $client->expects($this->once())->method('delete')->with($this->callback(function (JobId $jobId) use ($id): bool {
-            return $jobId->getId() === $id;
-        }));
+        $client->expects($this->once())->method('delete')->with($this->callback(fn (JobId $jobId): bool => $jobId->getId() === $id));
 
         $connection = new Connection(['tube_name' => $tube], $client);
 
@@ -231,9 +225,7 @@ public function testRejectWhenABeanstalkdExceptionOccurs()
 
         $client = $this->createMock(PheanstalkInterface::class);
         $client->expects($this->once())->method('useTube')->with($tube)->willReturn($client);
-        $client->expects($this->once())->method('delete')->with($this->callback(function (JobId $jobId) use ($id): bool {
-            return $jobId->getId() === $id;
-        }))->willThrowException($exception);
+        $client->expects($this->once())->method('delete')->with($this->callback(fn (JobId $jobId): bool => $jobId->getId() === $id))->willThrowException($exception);
 
         $connection = new Connection(['tube_name' => $tube], $client);
 
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
index 7e79c32d22248..73f3e239734c2 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
@@ -358,9 +358,7 @@ public function testGeneratedSql(AbstractPlatform $platform, string $expectedSql
     {
         $driverConnection = $this->createMock(DBALConnection::class);
         $driverConnection->method('getDatabasePlatform')->willReturn($platform);
-        $driverConnection->method('createQueryBuilder')->willReturnCallback(function () use ($driverConnection) {
-            return new QueryBuilder($driverConnection);
-        });
+        $driverConnection->method('createQueryBuilder')->willReturnCallback(fn () => new QueryBuilder($driverConnection));
 
         if (interface_exists(DriverResult::class)) {
             $result = $this->createMock(DriverResult::class);
@@ -411,7 +409,7 @@ public function testConfigureSchema()
         $schema = new Schema();
 
         $connection = new Connection(['table_name' => 'queue_table'], $driverConnection);
-        $connection->configureSchema($schema, $driverConnection, fn() => true);
+        $connection->configureSchema($schema, $driverConnection, fn () => true);
         $this->assertTrue($schema->hasTable('queue_table'));
     }
 
@@ -422,7 +420,7 @@ public function testConfigureSchemaDifferentDbalConnection()
         $schema = new Schema();
 
         $connection = new Connection([], $driverConnection);
-        $connection->configureSchema($schema, $driverConnection2, fn() => false);
+        $connection->configureSchema($schema, $driverConnection2, fn () => false);
         $this->assertFalse($schema->hasTable('messenger_messages'));
     }
 
@@ -433,7 +431,7 @@ public function testConfigureSchemaTableExists()
         $schema->createTable('messenger_messages');
 
         $connection = new Connection([], $driverConnection);
-        $connection->configureSchema($schema, $driverConnection, fn() => true);
+        $connection->configureSchema($schema, $driverConnection, fn () => true);
         $table = $schema->getTable('messenger_messages');
         $this->assertEmpty($table->getColumns(), 'The table was not overwritten');
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
index 2c4e6a4746ae5..222791b8d0ba9 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -305,9 +305,7 @@ public function findAll(int $limit = null): array
         $stmt = $this->executeQuery($queryBuilder->getSQL(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
         $data = $stmt instanceof Result || $stmt instanceof DriverResult ? $stmt->fetchAllAssociative() : $stmt->fetchAll();
 
-        return array_map(function ($doctrineEnvelope) {
-            return $this->decodeEnvelopeHeaders($doctrineEnvelope);
-        }, $data);
+        return array_map(fn ($doctrineEnvelope) => $this->decodeEnvelopeHeaders($doctrineEnvelope), $data);
     }
 
     public function find(mixed $id): ?array
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
index 99da54f40bf85..5ac0dbb5fc668 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
@@ -288,9 +288,7 @@ public function testFromDsnWithMultipleHosts()
 
         $hosts = explode(' ', getenv('REDIS_CLUSTER_HOSTS'));
 
-        $dsn = array_map(function ($host) {
-            return 'redis://'.$host;
-        }, $hosts);
+        $dsn = array_map(fn ($host) => 'redis://'.$host, $hosts);
         $dsn = implode(',', $dsn);
 
         $this->assertInstanceOf(Connection::class, Connection::fromDsn($dsn, ['sentinel_master' => getenv('MESSENGER_REDIS_SENTINEL_MASTER')]));
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
index 6c9a8fa6e5c2f..89f93bbbca951 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -87,9 +87,7 @@ public function __construct(array $options, \Redis|\RedisCluster $redis = null)
 
         if (\is_array($host) || $redis instanceof \RedisCluster) {
             $hosts = \is_string($host) ? [$host.':'.$port] : $host; // Always ensure we have an array
-            $this->redis = static function () use ($redis, $hosts, $auth, $options) {
-                return self::initializeRedisCluster($redis, $hosts, $auth, $options);
-            };
+            $this->redis = static fn () => self::initializeRedisCluster($redis, $hosts, $auth, $options);
         } else {
             if (null !== $sentinelMaster) {
                 $sentinelClient = new \RedisSentinel($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);
@@ -101,9 +99,7 @@ public function __construct(array $options, \Redis|\RedisCluster $redis = null)
                 [$host, $port] = $address;
             }
 
-            $this->redis = static function () use ($redis, $host, $port, $auth, $options) {
-                return self::initializeRedis($redis ?? new \Redis(), $host, $port, $auth, $options);
-            };
+            $this->redis = static fn () => self::initializeRedis($redis ?? new \Redis(), $host, $port, $auth, $options);
         }
 
         if (!$options['lazy']) {
diff --git a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
index be10f5e7bc97a..ff27ecbb0e460 100644
--- a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
+++ b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
@@ -50,7 +50,7 @@ public function lateCollect()
         }
 
         // Order by call time
-        usort($messages, function ($a, $b) { return $a[1] <=> $b[1]; });
+        usort($messages, fn ($a, $b) => $a[1] <=> $b[1]);
 
         // Keep the messages clones only
         $this->data['messages'] = array_column($messages, 0);
@@ -122,9 +122,7 @@ public function getMessages(string $bus = null): array
             return $this->data['messages'];
         }
 
-        return array_filter($this->data['messages'], function ($message) use ($bus) {
-            return $bus === $message['bus'];
-        });
+        return array_filter($this->data['messages'], fn ($message) => $bus === $message['bus']);
     }
 
     public function getBuses(): array
diff --git a/src/Symfony/Component/Messenger/Exception/DelayedMessageHandlingException.php b/src/Symfony/Component/Messenger/Exception/DelayedMessageHandlingException.php
index a5065131c40ff..6934562bda05f 100644
--- a/src/Symfony/Component/Messenger/Exception/DelayedMessageHandlingException.php
+++ b/src/Symfony/Component/Messenger/Exception/DelayedMessageHandlingException.php
@@ -24,9 +24,7 @@ class DelayedMessageHandlingException extends RuntimeException
     public function __construct(array $exceptions)
     {
         $exceptionMessages = implode(", \n", array_map(
-            function (\Throwable $e) {
-                return $e::class.': '.$e->getMessage();
-            },
+            fn (\Throwable $e) => $e::class.': '.$e->getMessage(),
             $exceptions
         ));
 
diff --git a/src/Symfony/Component/Messenger/Exception/HandlerFailedException.php b/src/Symfony/Component/Messenger/Exception/HandlerFailedException.php
index 293b1c26bc80e..05be1b89e3808 100644
--- a/src/Symfony/Component/Messenger/Exception/HandlerFailedException.php
+++ b/src/Symfony/Component/Messenger/Exception/HandlerFailedException.php
@@ -58,9 +58,7 @@ public function getNestedExceptionOfClass(string $exceptionClassName): array
         return array_values(
             array_filter(
                 $this->exceptions,
-                function ($exception) use ($exceptionClassName) {
-                    return is_a($exception, $exceptionClassName);
-                }
+                fn ($exception) => is_a($exception, $exceptionClassName)
             )
         );
     }
diff --git a/src/Symfony/Component/Messenger/HandleTrait.php b/src/Symfony/Component/Messenger/HandleTrait.php
index b3cbb0982b81c..ac86302af4095 100644
--- a/src/Symfony/Component/Messenger/HandleTrait.php
+++ b/src/Symfony/Component/Messenger/HandleTrait.php
@@ -46,9 +46,7 @@ private function handle(object $message): mixed
         }
 
         if (\count($handledStamps) > 1) {
-            $handlers = implode(', ', array_map(function (HandledStamp $stamp): string {
-                return sprintf('"%s"', $stamp->getHandlerName());
-            }, $handledStamps));
+            $handlers = implode(', ', array_map(fn (HandledStamp $stamp): string => sprintf('"%s"', $stamp->getHandlerName()), $handledStamps));
 
             throw new LogicException(sprintf('Message of type "%s" was handled multiple times. Only one handler is expected when using "%s::%s()", got %d: %s.', get_debug_type($envelope->getMessage()), static::class, __FUNCTION__, \count($handledStamps), $handlers));
         }
diff --git a/src/Symfony/Component/Messenger/Test/Middleware/MiddlewareTestCase.php b/src/Symfony/Component/Messenger/Test/Middleware/MiddlewareTestCase.php
index 08c3d6adb712d..5563537c29910 100644
--- a/src/Symfony/Component/Messenger/Test/Middleware/MiddlewareTestCase.php
+++ b/src/Symfony/Component/Messenger/Test/Middleware/MiddlewareTestCase.php
@@ -38,9 +38,7 @@ protected function getStackMock(bool $nextIsCalled = true)
         $nextMiddleware
             ->expects($this->once())
             ->method('handle')
-            ->willReturnCallback(function (Envelope $envelope, StackInterface $stack): Envelope {
-                return $envelope;
-            })
+            ->willReturnCallback(fn (Envelope $envelope, StackInterface $stack): Envelope => $envelope)
         ;
 
         return new StackMiddleware($nextMiddleware);
diff --git a/src/Symfony/Component/Messenger/Tests/Command/StatsCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/StatsCommandTest.php
index 920bc67674edb..9eb8268930609 100644
--- a/src/Symfony/Component/Messenger/Tests/Command/StatsCommandTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Command/StatsCommandTest.php
@@ -46,9 +46,7 @@ protected function setUp(): void
             });
         $serviceLocator
             ->method('has')
-            ->willReturnCallback(function (string $transportName) {
-                return \in_array($transportName, ['message_countable', 'simple', 'another_message_countable'], true);
-            })
+            ->willReturnCallback(fn (string $transportName) => \in_array($transportName, ['message_countable', 'simple', 'another_message_countable'], true))
         ;
 
         $this->command = new StatsCommand($serviceLocator, [
diff --git a/src/Symfony/Component/Messenger/Tests/EventListener/StopWorkerOnMemoryLimitListenerTest.php b/src/Symfony/Component/Messenger/Tests/EventListener/StopWorkerOnMemoryLimitListenerTest.php
index 81c21a4faf95c..5f43075baf00e 100644
--- a/src/Symfony/Component/Messenger/Tests/EventListener/StopWorkerOnMemoryLimitListenerTest.php
+++ b/src/Symfony/Component/Messenger/Tests/EventListener/StopWorkerOnMemoryLimitListenerTest.php
@@ -24,9 +24,7 @@ class StopWorkerOnMemoryLimitListenerTest extends TestCase
      */
     public function testWorkerStopsWhenMemoryLimitExceeded(int $memoryUsage, int $memoryLimit, bool $shouldStop)
     {
-        $memoryResolver = function () use ($memoryUsage) {
-            return $memoryUsage;
-        };
+        $memoryResolver = fn () => $memoryUsage;
 
         $worker = $this->createMock(Worker::class);
         $worker->expects($shouldStop ? $this->once() : $this->never())->method('stop');
@@ -49,9 +47,7 @@ public function testWorkerLogsMemoryExceededWhenLoggerIsGiven()
         $logger->expects($this->once())->method('info')
             -
10000
>with('Worker stopped due to memory limit of {limit} bytes exceeded ({memory} bytes used)', ['limit' => 64, 'memory' => 70]);
 
-        $memoryResolver = function () {
-            return 70;
-        };
+        $memoryResolver = fn () => 70;
 
         $worker = $this->createMock(Worker::class);
         $event = new WorkerRunningEvent($worker, false);
diff --git a/src/Symfony/Component/Messenger/Tests/FailureIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/FailureIntegrationTest.php
index fbec1224cd8f5..a41ee33ac72af 100644
--- a/src/Symfony/Component/Messenger/Tests/FailureIntegrationTest.php
+++ b/src/Symfony/Component/Messenger/Tests/FailureIntegrationTest.php
@@ -46,12 +46,8 @@ public function testRequeueMechanism()
         $transport2 = new DummyFailureTestSenderAndReceiver();
         $failureTransport = new DummyFailureTestSenderAndReceiver();
         $sendersLocatorFailureTransport = new ServiceLocator([
-            'transport1' => function () use ($failureTransport) {
-                return $failureTransport;
-            },
-            'transport2' => function () use ($failureTransport) {
-                return $failureTransport;
-            },
+            'transport1' => fn () => $failureTransport,
+            'transport2' => fn () => $failureTransport,
         ]);
 
         $transports = [
@@ -66,9 +62,7 @@ public function testRequeueMechanism()
             ->willReturn(true);
         $locator->expects($this->any())
             ->method('get')
-            ->willReturnCallback(function ($transportName) use ($transports) {
-                return $transports[$transportName];
-            });
+            ->willReturnCallback(fn ($transportName) => $transports[$transportName]);
         $senderLocator = new SendersLocator(
             [DummyMessage::class => ['transport1', 'transport2']],
             $locator
@@ -237,12 +231,8 @@ public function testMultipleFailedTransportsWithoutGlobalFailureTransport()
         $failureTransport2 = new DummyFailureTestSenderAndReceiver();
 
         $sendersLocatorFailureTransport = new ServiceLocator([
-            'transport1' => function () use ($failureTransport1) {
-                return $failureTransport1;
-            },
-            'transport2' => function () use ($failureTransport2) {
-                return $failureTransport2;
-            },
+            'transport1' => fn () => $failureTransport1,
+            'transport2' => fn () => $failureTransport2,
         ]);
 
         $transports = [
@@ -258,9 +248,7 @@ public function testMultipleFailedTransportsWithoutGlobalFailureTransport()
             ->willReturn(true);
         $locator->expects($this->any())
             ->method('get')
-            ->willReturnCallback(function ($transportName) use ($transports) {
-                return $transports[$transportName];
-            });
+            ->willReturnCallback(fn ($transportName) => $transports[$transportName]);
         $senderLocator = new SendersLocator(
             [DummyMessage::class => ['transport1', 'transport2']],
             $locator
diff --git a/src/Symfony/Component/Messenger/Tests/MessageBusTest.php b/src/Symfony/Component/Messenger/Tests/MessageBusTest.php
index fc0d638bb1ca3..fa34bb9d70bbb 100644
--- a/src/Symfony/Component/Messenger/Tests/MessageBusTest.php
+++ b/src/Symfony/Component/Messenger/Tests/MessageBusTest.php
@@ -41,9 +41,7 @@ public function testItCallsMiddleware()
         $firstMiddleware->expects($this->once())
             ->method('handle')
             ->with($envelope, $this->anything())
-            ->willReturnCallback(function ($envelope, $stack) {
-                return $stack->next()->handle($envelope, $stack);
-            });
+            ->willReturnCallback(fn ($envelope, $stack) => $stack->next()->handle($envelope, $stack));
 
         $secondMiddleware = $this->createMock(MiddlewareInterface::class);
         $secondMiddleware->expects($this->once())
@@ -70,17 +68,13 @@ public function testThatAMiddlewareCanAddSomeStampsToTheEnvelope()
         $firstMiddleware->expects($this->once())
             ->method('handle')
             ->with($envelope, $this->anything())
-            ->willReturnCallback(function ($envelope, $stack) {
-                return $stack->next()->handle($envelope->with(new AnEnvelopeStamp()), $stack);
-            });
+            ->willReturnCallback(fn ($envelope, $stack) => $stack->next()->handle($envelope->with(new AnEnvelopeStamp()), $stack));
 
         $secondMiddleware = $this->createMock(MiddlewareInterface::class);
         $secondMiddleware->expects($this->once())
             ->method('handle')
             ->with($envelopeWithAnotherStamp, $this->anything())
-            ->willReturnCallback(function ($envelope, $stack) {
-                return $stack->next()->handle($envelope, $stack);
-            });
+            ->willReturnCallback(fn ($envelope, $stack) => $stack->next()->handle($envelope, $stack));
 
         $thirdMiddleware = $this->createMock(MiddlewareInterface::class);
         $thirdMiddleware->expects($this->once())
@@ -110,9 +104,7 @@ public function testThatAMiddlewareCanUpdateTheMessageWhileKeepingTheEnvelopeSta
         $firstMiddleware->expects($this->once())
             ->method('handle')
             ->with($envelope, $this->anything())
-            ->willReturnCallback(function ($envelope, $stack) use ($expectedEnvelope) {
-                return $stack->next()->handle($expectedEnvelope, $stack);
-            });
+            ->willReturnCallback(fn ($envelope, $stack) => $stack->next()->handle($expectedEnvelope, $stack));
 
         $secondMiddleware = $this->createMock(MiddlewareInterface::class);
         $secondMiddleware->expects($this->once())
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/DispatchAfterCurrentBusMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/DispatchAfterCurrentBusMiddlewareTest.php
index c6a1a34da75d4..86d74f2ea7d2f 100644
--- a/src/Symfony/Component/Messenger/Tests/Middleware/DispatchAfterCurrentBusMiddlewareTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Middleware/DispatchAfterCurrentBusMiddlewareTest.php
@@ -244,15 +244,11 @@ public function testHandleDelayedEventFromQueue()
         $commandHandlingMiddleware->expects($this->once())
             ->method('handle')
             ->with($this->expectHandledMessage($message))
-            ->willReturnCallback(function ($envelope, StackInterface $stack) {
-                return $stack->next()->handle($envelope, $stack);
-            });
+            ->willReturnCallback(fn ($envelope, StackInterface $stack) => $stack->next()->handle($envelope, $stack));
         $eventHandlingMiddleware->expects($this->once())
             ->method('handle')
             ->with($this->expectHandledMessage($event))
-            ->willReturnCallback(function ($envelope, StackInterface $stack) {
-                return $stack->next()->handle($envelope, $stack);
-            });
+            ->willReturnCallback(fn ($envelope, StackInterface $stack) => $stack->next()->handle($envelope, $stack));
         $messageBus->dispatch($message);
     }
 
@@ -280,16 +276,12 @@ public function testDispatchOutOfAnotherHandlerDispatchesAndRemoveStamp()
 
     private function expectHandledMessage($message): Callback
     {
-        return $this->callback(function (Envelope $envelope) use ($message) {
-            return $envelope->getMessage() === $message;
-        });
+        return $this->callback(fn (Envelope $envelope) => $envelope->getMessage() === $message);
     }
 
     private function willHandleMessage(): ReturnCallback
     {
-        return $this->returnCallback(function ($envelope, StackInterface $stack) {
-            return $stack->next()->handle($envelope, $stack);
-        });
+        return $this->returnCallback(fn ($envelope, StackInterface $stack) => $stack->next()->handle($envelope, $stack));
     }
 }
 
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/SendMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/SendMessageMiddlewareTest.php
index e296571c1573a..df402764c1e98 100644
--- a/src/Symfony/Component/Messenger/Tests/Middleware/SendMessageMiddlewareTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Middleware/SendMessageMiddlewareTest.php
@@ -237,14 +237,10 @@ private function createSendersLocator(array $sendersMap, array $senders): Sender
         $container = $this->createMock(ContainerInterface::class);
         $container->expects($this->any())
             ->method('has')
-            ->willReturnCallback(function ($id) use ($senders) {
-                return isset($senders[$id]);
-            });
+            ->willReturnCallback(fn ($id) => isset($senders[$id]));
         $container->expects($this->any())
             ->method('get')
-            ->willReturnCallback(function ($id) use ($senders) {
-                return $senders[$id];
-            });
+            ->willReturnCallback(fn ($id) => $senders[$id]);
 
         return new SendersLocator($sendersMap, $container);
     }
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/StackMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/StackMiddlewareTest.php
index c08d65a01b15d..9166d29439409 100644
--- a/src/Symfony/Component/Messenger/Tests/Middleware/StackMiddlewareTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Middleware/StackMiddlewareTest.php
@@ -39,9 +39,7 @@ public function testClone()
         $middleware2
             ->expects($this->exactly(2))
             ->method('handle')
-            ->willReturnCallback(function (Envelope $envelope, StackInterface $stack): Envelope {
-                return $envelope;
-            })
+            ->willReturnCallback(fn (Envelope $envelope, StackInterface $stack): Envelope => $envelope)
         ;
 
         $bus = new MessageBus([$middleware1, $middleware2]);
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php
index 3faab44d0696a..4d9697eeaccc1 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php
@@ -74,14 +74,10 @@ private function createContainer(array $senders): ContainerInterface
         $container = $this->createMock(ContainerInterface::class);
         $container->expects($this->any())
             ->method('has')
-            ->willReturnCallback(function ($id) use ($senders) {
-                return isset($senders[$id]);
-            });
+            ->willReturnCallback(fn ($id) => isset($senders[$id]));
         $container->expects($this->any())
             ->method('get')
-            ->willReturnCallback(function ($id) use ($senders) {
-                return $senders[$id];
-            });
+            ->willReturnCallback(fn ($id) => $senders[$id]);
 
         return $container;
     }
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
index 8dba651ffb882..77d5d52fc3d0d 100644
--- a/src/Symfony/Component/Mime/Tests/EmailTest.php
+++ b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -465,8 +465,8 @@ public function testAttachments()
         $e = new Email();
         $e->addPart(new DataPart(new File($name)));
         $e->addPart((new DataPart(new File($name)))->asInline());
-        $this->assertEquals([$att->bodyToString(), $inline->bodyToString()], array_map(function (DataPart $a) { return $a->bodyToString(); }, $e->getAttachments()));
-        $this->assertEquals([$att->getPreparedHeaders(), $inline->getPreparedHeaders()], array_map(function (DataPart $a) { return $a->getPreparedHeaders(); }, $e->getAttachments()));
+        $this->assertEquals([$att->bodyToString(), $inline->bodyToString()], array_map(fn (DataPart $a) => $a->bodyToString(), $e->getAttachments()));
+        $this->assertEquals([$att->getPreparedHeaders(), $inline->getPreparedHeaders()], array_map(fn (DataPart $a) => $a->getPreparedHeaders(), $e->getAttachments()));
     }
 
     public function testSerialize()
diff --git a/src/Symfony/Component/Notifier/Bridge/Chatwork/Tests/ChatworkTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Chatwork/Tests/ChatworkTransportTest.php
index 08db6b056bef4..2f4f8ff2f38c4 100644
--- a/src/Symfony/Component/Notifier/Bridge/Chatwork/Tests/ChatworkTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Chatwork/Tests/ChatworkTransportTest.php
@@ -55,9 +55,7 @@ public function testWithErrorResponseThrows()
             ->method('getContent')
             ->willReturn(json_encode(['errors' => ['first error', 'second error']]));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
diff --git a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportTest.php b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportTest.php
index 97194efdd87be..afba65cd861f7 100644
--- a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportTest.php
@@ -50,9 +50,7 @@ public function testSendSuccessfully()
         $response = $this->createMock(ResponseInterface::class);
         $response->method('getStatusCode')->willReturn(200);
         $response->method('getContent')->willReturn($messageId);
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportTest.php
index 461c351fe4a08..799b2b00ed9c2 100644
--- a/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportTest.php
@@ -65,9 +65,7 @@ public function testSendWithErrorResponseThrows()
             ->method('getContent')
             ->willReturn(json_encode(['message' => 'testDescription', 'code' => 'testErrorCode']));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php
index cde836ae55607..f822051b0fa97 100644
--- a/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php
@@ -51,9 +51,7 @@ public function testSendWithErrorResponseThrowsTransportException()
             ->method('getStatusCode')
             ->willReturn(500);
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
@@ -73,9 +71,7 @@ public function testSendWithErrorResponseContainingDetailsThrowsTransportExcepti
             ->method('getContent')
             ->willReturn(json_encode(['errors' => [['code' => 'accountreference_invalid', 'description' => 'Invalid Account Reference EX0000000']]]));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
@@ -96,9 +92,7 @@ public function testSendWithSuccessfulResponseDispatchesMessageEvent()
             ->method('getContent')
             ->willReturn(json_encode(['batch' => ['messageheaders' => [['id' => $messageId]]]]));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportTest.php
index 5a73babb43ec6..f9ee5ae6d77b1 100644
--- a/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportTest.php
@@ -56,9 +56,7 @@ public function testSendWithErrorThrowsTransportException(ResponseInterface $res
     {
         $this->expectException(TransportException::class);
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
         $options = new class('recipient-id', []) extends FirebaseOptions {};
 
         $transport = $this->createTransport($client);
diff --git a/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportTest.php b/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportTest.php
index 2d0b222e96f12..1d5eab995fd1a 100644
--- a/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportTest.php
@@ -58,9 +58,7 @@ public function testSend()
             ->method('getContent')
             ->willReturn(json_encode(['ids' => [42]]));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $message = new SmsMessage('3333333333', 'Hello!');
 
diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportTest.php b/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportTest.php
index 6335c8a5bd5e8..b6ce227bbc770 100644
--- a/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportTest.php
@@ -63,9 +63,7 @@ public function testSendWithEmptyArrayResponseThrowsTransportException()
             ->method('getContent')
             ->willReturn('[]');
 
-        $client = new MockHttpClient(function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
@@ -87,9 +85,7 @@ public function testSendWithErrorResponseThrowsTransportException()
             ->method('getContent')
             ->willReturn('{"error":{"code":400,"message":"API key not valid. Please pass a valid API key.","status":"INVALID_ARGUMENT"}}');
 
-        $client = new MockHttpClient(function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
@@ -166,9 +162,7 @@ public function testSendWithInvalidOptions()
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('The "'.GoogleChatTransport::class.'" transport only supports instances of "'.GoogleChatOptions::class.'" for options.');
 
-        $client = new MockHttpClient(function (string $method, string $url, array $options = []): ResponseInterface {
-            return $this->createMock(ResponseInterface::class);
-        });
+        $client = new MockHttpClient(fn (string $method, string $url, array $options = []): ResponseInterface => $this->createMock(ResponseInterface::class));
 
         $transport = $this->createTransport($client);
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportTest.php
index bcafe34c5a263..990b740f7d92f 100644
--- a/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportTest.php
@@ -51,9 +51,7 @@ public function testSendWithErrorResponseThrowsTransportException()
             ->method('getStatusCode')
             ->willReturn(500);
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
@@ -73,9 +71,7 @@ public function testSendWithErrorResponseContainingDetailsThrowsTransportExcepti
             ->method('getContent')
             ->willReturn(json_encode(['etat' => ['etat' => [['code' => '3', 'message' => 'Your credentials are incorrect']]]]));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
@@ -95,9 +91,7 @@ public function testSendWithSuccessfulResponseDispatchesMessageEvent()
             ->method('getContent')
             ->willReturn(json_encode(['etat' => ['etat' => [['code' => 0]]]]));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php
index b7b83aac7305d..063ff8caec787 100644
--- a/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php
@@ -57,9 +57,7 @@ public function testSendWithErrorResponseThrows()
             ->method('getContent')
             ->willReturn(json_encode(['message' => 'testDescription', 'code' => 'testErrorCode', 'status' => 'testStatus']));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
diff --git a/src/Symfony/Component/Notifier/Bridge/LinkedIn/Tests/LinkedInTransportTest.php b/src/Symfony/Component/Notifier/Bridge/LinkedIn/Tests/LinkedInTransportTest.php
index 5cfe7ea1af563..d2897187f276e 100644
--- a/src/Symfony/Component/Notifier/Bridge/LinkedIn/Tests/LinkedInTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/LinkedIn/Tests/LinkedInTransportTest.php
@@ -57,9 +57,7 @@ public function testSendWithEmptyArrayResponseThrowsTransportException()
             ->method('getContent')
             ->willReturn('[]');
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
@@ -82,9 +80,7 @@ public function testSendWithErrorResponseThrowsTransportException()
             ->method('getContent')
             ->willReturn('testErrorCode');
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
@@ -187,9 +183,7 @@ public function testSendWithInvalidOptions()
     {
         $this->expectException(LogicException::class);
 
-        $client = new MockHttpClient(function (string $method, string $url, array $options = []): ResponseInterface {
-            return $this->createMock(ResponseInterface::class);
-        });
+        $client = new MockHttpClient(fn (string $method, string $url, array $options = []): ResponseInterface => $this->createMock(ResponseInterface::class));
 
         $transport = $this->createTransport($client);
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/Tests/MercureTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Mercure/Tests/MercureTransportTest.php
index 6d04b10fe6571..bffa4e9d271e8 100644
--- a/src/Symfony/Component/Notifier/Bridge/Mercure/Tests/MercureTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Mercure/Tests/MercureTransportTest.php
@@ -159,9 +159,7 @@ public function testSendSuccessfully()
     {
         $messageId = 'urn:uuid:a7045be0-a75d-4d40-8bd2-29fa4e5dd10b';
 
-        $hub = new MockHub('https://foo.com/.well-known/mercure', new StaticTokenProvider('foo'), function (Update $update) use ($messageId): string {
-            return $messageId;
-        });
+        $hub = new MockHub('https://foo.com/.well-known/mercure', new StaticTokenProvider('foo'), fn (Update $update): string => $messageId);
 
         $sentMessage = $this->createTransport(null, $hub)->send(new ChatMessage('subject'));
         $this->assertSame($messageId, $sentMessage->getMessageId());
diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsTransportTest.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsTransportTest.php
index 0c4fa43748cdd..7307a18bbb0b5 100644
--- a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsTransportTest.php
@@ -49,9 +49,7 @@ public function unsupportedMessagesProvider(): iterable
 
     public function testSendWithErrorResponseThrows()
     {
-        $client = new MockHttpClient(function (string $method, string $url, array $options = []): ResponseInterface {
-            return new MockResponse('testErrorMessage', ['response_headers' => ['request-id' => ['testRequestId']], 'http_code' => 400]);
-        });
+        $client = new MockHttpClient(fn (string $method, string $url, array $options = []): ResponseInterface => new MockResponse('testErrorMessage', ['response_headers' => ['request-id' => ['testRequestId']], 'http_code' => 400]));
 
         $transport = $this->createTransport($client);
 
diff --git a/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportTest.php b/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportTest.php
index 90c5ebb22e27e..c8ce2ce7d12f7 100644
--- a/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportTest.php
@@ -97,9 +97,7 @@ public function testSendWithErrorResponseThrows()
             ->method('getContent')
             ->willReturn(json_encode(['errors' => ['Message Notifications must have English language content']]));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client, 'ea345989-d273-4f21-a33b-0c006efc5edb');
 
@@ -119,9 +117,7 @@ public function testSendWithErrorResponseThrowsWhenAllUnsubscribed()
             ->method('getContent')
             ->willReturn(json_encode(['id' => '', 'recipients' => 0, 'errors' => ['All included players are not subscribed']]));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client, 'ea345989-d273-4f21-a33b-0c006efc5edb');
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Sendinblue/Tests/SendinblueTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Sendinblue/Tests/SendinblueTransportTest.php
index 6c89cbc85e08f..70777437a2d32 100644
--- a/src/Symfony/Component/Notifier/Bridge/Sendinblue/Tests/SendinblueTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Sendinblue/Tests/SendinblueTransportTest.php
@@ -54,9 +54,7 @@ public function testSendWithErrorResponseThrowsTransportException()
             ->method('getContent')
             ->willReturn(json_encode(['code' => 400, 'message' => 'bad request']));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client);
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackOptionsTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackOptionsTest.php
index 9cc2cd478e6fb..91b33f7dfbfac 100644
--- a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackOptionsTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackOptionsTest.php
@@ -179,7 +179,7 @@ public function fromNotificationProvider(): iterable
 
     public function testConstructWithMaximumBlocks()
     {
-        $options = new SlackOptions(['blocks' => array_map(static function () { return ['type' => 'divider']; }, range(0, 49))]);
+        $options = new SlackOptions(['blocks' => array_map(static fn () => ['type' => 'divider'], range(0, 49))]);
 
         $this->assertCount(50, $options->toArray()['blocks']);
     }
@@ -189,7 +189,7 @@ public function testConstructThrowsWithTooManyBlocks()
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('Maximum number of "blocks" has been reached (50).');
 
-        new SlackOptions(['blocks' => array_map(static function () { return ['type' => 'divider']; }, range(0, 50))]);
+        new SlackOptions(['blocks' => array_map(static fn () => ['type' => 'divider'], range(0, 50))]);
     }
 
     public function testAddMaximumBlocks()
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
index 56a7e93a9a9b5..e7d86b0a5a833 100644
--- a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
@@ -71,9 +71,7 @@ public function testSendWithEmptyArrayResponseThrowsTransportException()
             ->method('getContent')
             ->willReturn('[]');
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client, 'testChannel');
 
@@ -94,9 +92,7 @@ public function testSendWithErrorResponseThrowsTransportException()
             ->method('getContent')
             ->willReturn(json_encode(['error' => 'testErrorCode']));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client, 'testChannel');
 
@@ -177,9 +173,7 @@ public function testSendWithInvalidOptions()
     {
         $this->expectException(LogicException::class);
 
-        $client = new MockHttpClient(function (string $method, string $url, array $options = []): ResponseInterface {
-            return $this->createMock(ResponseInterface::class);
-        });
+        $client = new MockHttpClient(fn (string $method, string $url, array $options = []): ResponseInterface => $this->createMock(ResponseInterface::class));
 
         $transport = $this->createTransport($client, 'testChannel');
 
@@ -255,9 +249,7 @@ public function testSendWithErrorsIncluded()
                 'errors' => ['no more than 50 items allowed [json-pointer:/blocks]'],
             ]));
 
-        $client = new MockHttpClient(function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client, 'testChannel');
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/Reply/Markup/InlineKeyboardMarkup.php b/src/Symfony/Component/Notifier/Bridge/Telegram/Reply/Markup/InlineKeyboardMarkup.php
index 18b6402f2a7fe..1ff00a250ea31 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/Reply/Markup/InlineKeyboardMarkup.php
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/Reply/Markup/InlineKeyboardMarkup.php
@@ -32,9 +32,7 @@ public function __construct()
      */
     public function inlineKeyboard(array $buttons): static
     {
-        $buttons = array_map(static function (InlineKeyboardButton $button) {
-            return $button->toArray();
-        }, $buttons);
+        $buttons = array_map(static fn (InlineKeyboardButton $button) => $button->toArray(), $buttons);
 
         $this->options['inline_keyboard'][] = $buttons;
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/Reply/Markup/ReplyKeyboardMarkup.php b/src/Symfony/Component/Notifier/Bridge/Telegram/Reply/Markup/ReplyKeyboardMarkup.php
index 8c02bbca63f3b..e4223eb0da844 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/Reply/Markup/ReplyKeyboardMarkup.php
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/Reply/Markup/ReplyKeyboardMarkup.php
@@ -32,9 +32,7 @@ public function __construct()
      */
     public function keyboard(array $buttons): static
     {
-        $buttons = array_map(static function (KeyboardButton $button) {
-            return $button->toArray();
-        }, $buttons);
+        $buttons = array_map(static fn (KeyboardButton $button) => $button->toArray(), $buttons);
 
         $this->options['keyboard'][] = $buttons;
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php
index 87812731600ff..2acc839594670 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php
@@ -59,9 +59,7 @@ public function testSendWithErrorResponseThrowsTransportException()
             ->method('getContent')
             ->willReturn(json_encode(['description' => 'testDescription', 'error_code' => 400]));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client, 'testChannel');
 
@@ -81,9 +79,7 @@ public function testSendWithErrorResponseThrowsTransportExceptionForEdit()
             ->method('getContent')
             ->willReturn(json_encode(['description' => 'testDescription', 'error_code' => 404]));
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $transport = $this->createTransport($client, 'testChannel');
 
diff --git a/src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportTest.php b/src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportTest.php
index 6eda92fa57bc7..e0af6fc6fd7ce 100644
--- a/src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/TurboSms/Tests/TurboSmsTransportTest.php
@@ -71,9 +71,7 @@ public function testSuccessfulSend()
             ]))
         ;
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $message = new SmsMessage('380931234567', 'Тест/Test');
 
@@ -102,9 +100,7 @@ public function testFailedSend()
             ]))
         ;
 
-        $client = new MockHttpClient(static function () use ($response): ResponseInterface {
-            return $response;
-        });
+        $client = new MockHttpClient(static fn (): ResponseInterface => $response);
 
         $message = new SmsMessage('380931234567', 'Тест/Test');
 
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index e22265f1dce18..b4298121761e4 100644
--- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -1018,9 +1018,7 @@ public function offsetGet(mixed $option, bool $triggerDeprecation = true): mixed
                 $fmtActualValue = $this->formatValue($value);
                 $fmtAllowedTypes = implode('" or "', $this->allowedTypes[$option]);
                 $fmtProvidedTypes = implode('|', array_keys($invalidTypes));
-                $allowedContainsArrayType = \count(array_filter($this->allowedTypes[$option], static function ($item) {
-                    return str_ends_with($item, '[]');
-                })) > 0;
+                $allowedContainsArrayType = \count(array_filter($this->allowedTypes[$option], static fn ($item) => str_ends_with($item, '[]'))) > 0;
 
                 if (\is_array($value) && $allowedContainsArrayType) {
                     throw new InvalidOptionsException(sprintf('The option "%s" with value %s is expected to be of type "%s", but one of the elements is of type "%s".', $this->formatOptions([$option]), $fmtActualValue, $fmtAllowedTypes, $fmtProvidedTypes));
@@ -1281,9 +1279,7 @@ private function formatOptions(array $options): string
                 $prefix .= sprintf('[%s]', $this->prototypeIndex);
             }
 
-            $options = array_map(static function (string $option) use ($prefix): string {
-                return sprintf('%s[%s]', $prefix, $option);
-            }, $options);
+            $options = array_map(static fn (string $option): string => sprintf('%s[%s]', $prefix, $option), $options);
         }
 
         return implode('", "', $options);
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
index d06c86d1fa97d..263afc63ad141 100644
--- a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
+++ b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -113,9 +113,7 @@ public function testSetLazyReturnsThis()
 
     public function testSetLazyClosure()
     {
-        $this->resolver->setDefault('foo', function (Options $options) {
-            return 'lazy';
-        });
+        $this->resolver->setDefault('foo', fn (Options $options) => 'lazy');
 
         $this->assertEquals(['foo' => 'lazy'], $this->resolver->resolve());
     }
@@ -160,9 +158,7 @@ public function testAccessPreviousDefaultValue()
     public function testAccessPreviousLazyDefaultValue()
     {
         // defined by superclass
-        $this->resolver->setDefault('foo', function (Options $options) {
-            return 'bar';
-        });
+        $this->resolver->setDefault('foo', fn (Options $options) => 'bar');
 
         // defined by subclass
         $this->resolver->setDefault('foo', function (Options $options, $previousValue) {
@@ -182,9 +178,7 @@ public function testPreviousValueIsNotEvaluatedIfNoSecondArgument()
         });
 
         // defined by subclass, no $previousValue argument defined!
-        $this->resolver->setDefault('foo', function (Options $options) {
-            return 'lazy';
-        });
+        $this->resolver->setDefault('foo', fn (Options $options) => 'lazy');
 
         $this->assertEquals(['foo' => 'lazy'], $this->resolver->resolve());
     }
@@ -467,9 +461,7 @@ public function testLazyDeprecationFailsIfInvalidDeprecationMessageType()
         $this->expectExceptionMessage('Invalid type for deprecation message, expected string but got "bool", return an empty string to ignore.');
         $this->resolver
             ->setDefined('foo')
-            ->setDeprecated('foo', 'vendor/package', '1.1', function (Options $options, $value) {
-                return false;
-            })
+            ->setDeprecated('foo', 'vendor/package', '1.1', fn (Options $options, $value) => false)
         ;
         $this->resolver->resolve(['foo' => null]);
     }
@@ -560,9 +552,7 @@ function (OptionsResolver $resolver) {
             function (OptionsResolver $resolver) {
                 $resolver
                     ->setDefined('foo')
-                    ->setDefault('bar', function (Options $options) {
-                        return $options['foo'];
-                    })
+                    ->setDefault('bar', fn (Options $options) => $options['foo'])
                     ->setDeprecated('foo', 'vendor/package', '1.1', 'The option "foo" is deprecated, use "bar" option instead.')
                 ;
             },
@@ -656,9 +646,7 @@ function (OptionsResolver $resolver) {
             function (OptionsResolver $resolver) {
                 $resolver
                     ->setDefault('foo', null)
-                    ->setDeprecated('foo', 'vendor/package', '1.1', function (Options $options, $value) {
-                        return '';
-                    })
+                    ->setDeprecated('foo', 'vendor/package', '1.1', fn (Options $options, $value) => '')
                 ;
             },
             ['foo' => Bar::class],
@@ -731,14 +719,10 @@ function (OptionsResolver $resolver) {
         yield 'It explicitly ignores a deprecation' => [
             function (OptionsResolver $resolver) {
                 $resolver
-                    ->setDefault('baz', function (Options $options) {
-                        return $options->offsetGet('foo', false);
-                    })
+                    ->setDefault('baz', fn (Options $options) => $options->offsetGet('foo', false))
                     ->setDefault('foo', null)
                     ->setDeprecated('foo', 'vendor/package', '1.1', 'The option "%name%" is deprecated.')
-                    ->setDefault('bar', function (Options $options) {
-                        return $options->offsetGet('foo', false);
-                    })
+                    ->setDefault('bar', fn (Options $options) => $options->offsetGet('foo', false))
                 ;
             },
             [],
@@ -1105,9 +1089,9 @@ public function testResolveFailsIfAllClosuresReturnFalse()
         $this->expectException(InvalidOptionsException::class);
         $this->resolver->setDefault('foo', 42);
         $this->resolver->setAllowedValues('foo', [
-            function () { return false; },
-            function () { return false; },
-            function () { return false; },
+            fn () => false,
+            fn () => false,
+            fn () => false,
         ]);
 
         $this->resolver->resolve();
@@ -1117,9 +1101,9 @@ public function testResolveSucceedsIfAnyClosureReturnsTrue()
     {
         $this->resolver->setDefault('foo', 'bar');
         $this->resolver->setAllowedValues('foo', [
-            function () { return false; },
-            function () { return true; },
-            function () { return false; },
+            fn () => false,
+            fn () => true,
+            fn () => false,
         ]);
 
         $this->assertEquals(['foo' => 'bar'], $this->resolver->resolve());
@@ -1207,8 +1191,8 @@ public function testResolveFailsIfAllAddedClosuresReturnFalse()
     {
         $this->expectException(InvalidOptionsException::class);
         $this->resolver->setDefault('foo', 42);
-        $this->resolver->setAllowedValues('foo', function () { return false; });
-        $this->resolver->addAllowedValues('foo', function () { return false; });
+        $this->resolver->setAllowedValues('foo', fn () => false);
+        $this->resolver->addAllowedValues('foo', fn () => false);
 
         $this->resolver->resolve();
     }
@@ -1216,8 +1200,8 @@ public function testResolveFailsIfAllAddedClosuresReturnFalse()
     public function testResolveSucceedsIfAnyAddedClosureReturnsTrue()
     {
         $this->resolver->setDefault('foo', 'bar');
-        $this->resolver->setAllowedValues('foo', function () { return false; });
-        $this->resolver->addAllowedValues('foo', function () { return true; });
+        $this->resolver->setAllowedValues('foo', fn () => false);
+        $this->resolver->addAllowedValues('foo', fn () => true);
 
         $this->assertEquals(['foo' => 'bar'], $this->resolver->resolve());
     }
@@ -1225,8 +1209,8 @@ public function testResolveSucceedsIfAnyAddedClosureReturnsTrue()
     public function testResolveSucceedsIfAnyAddedClosureReturnsTrue2()
     {
         $this->resolver->setDefault('foo', 'bar');
-        $this->resolver->setAllowedValues('foo', function () { return true; });
-        $this->resolver->addAllowedValues('foo', function () { return false; });
+        $this->resolver->setAllowedValues('foo', fn () => true);
+        $this->resolver->addAllowedValues('foo', fn () => false);
 
         $this->assertEquals(['foo' => 'bar'], $this->resolver->resolve());
     }
@@ -1240,9 +1224,7 @@ public function testSetNormalizerReturnsThis()
     public function testSetNormalizerClosure()
     {
         $this->resolver->setDefault('foo', 'bar');
-        $this->resolver->setNormalizer('foo', function () {
-            return 'normalized';
-        });
+        $this->resolver->setNormalizer('foo', fn () => 'normalized');
 
         $this->assertEquals(['foo' => 'normalized'], $this->resolver->resolve());
     }
@@ -1269,9 +1251,7 @@ public function testNormalizerReceivesSetOption()
     {
         $this->resolver->setDefault('foo', 'bar');
 
-        $this->resolver->setNormalizer('foo', function (Options $options, $value) {
-            return 'normalized['.$value.']';
-        });
+        $this->resolver->setNormalizer('foo', fn (Options $options, $value) => 'normalized['.$value.']');
 
         $this->assertEquals(['foo' => 'normalized[bar]'], $this->resolver->resolve());
     }
@@ -1280,9 +1260,7 @@ public function testNormalizerReceivesPassedOption()
     {
         $this->resolver->setDefault('foo', 'bar');
 
-        $this->resolver->setNormalizer('foo', function (Options $options, $value) {
-            return 'normalized['.$value.']';
-        });
+        $this->resolver->setNormalizer('foo', fn (Options $options, $value) => 'normalized['.$value.']');
 
         $resolved = $this->resolver->resolve(['foo' => 'baz']);
 
@@ -1337,9 +1315,7 @@ public function testNormalizerCanAccessOtherOptions()
 
     public function testNormalizerCanAccessLazyOptions()
     {
-        $this->resolver->setDefault('lazy', function (Options $options) {
-            return 'bar';
-        });
+        $this->resolver->setDefault('lazy', fn (Options $options) => 'bar');
         $this->resolver->setDefault('norm', 'baz');
 
         $this->resolver->setNormalizer('norm', function (Options $options) {
@@ -1481,13 +1457,9 @@ public function testAddNormalizerClosure()
     {
         // defined by superclass
         $this->resolver->setDefault('foo', 'bar');
-        $this->resolver->setNormalizer('foo', function (Options $options, $value) {
-            return '1st-normalized-'.$value;
-        });
+        $this->resolver->setNormalizer('foo', fn (Options $options, $value) => '1st-normalized-'.$value);
         // defined by subclass
-        $this->resolver->addNormalizer('foo', function (Options $options, $value) {
-            return '2nd-normalized-'.$value;
-        });
+        $this->resolver->addNormalizer('foo', fn (Options $options, $value) => '2nd-normalized-'.$value);
 
         $this->assertEquals(['foo' => '2nd-normalized-1st-normalized-bar'], $this->resolver->resolve());
     }
@@ -1496,13 +1468,9 @@ public function testForcePrependNormalizerClosure()
     {
         // defined by superclass
         $this->resolver->setDefault('foo', 'bar');
-        $this->resolver->setNormalizer('foo', function (Options $options, $value) {
-            return '2nd-normalized-'.$value;
-        });
+        $this->resolver->setNormalizer('foo', fn (Options $options, $value) => '2nd-normalized-'.$value);
         // defined by subclass
-        $this->resolver->addNormalizer('foo', function (Options $options, $value) {
-            return '1st-normalized-'.$value;
-        }, true);
+        $this->resolver->addNormalizer('foo', fn (Options $options, $value) => '1st-normalized-'.$value, true);
 
         $this->assertEquals(['foo' => '2nd-normalized-1st-normalized-bar'], $this->resolver->resolve());
     }
@@ -1511,9 +1479,7 @@ public function testForcePrependNormalizerForResolverWithoutPreviousNormalizers(
     {
         // defined by superclass
         $this->resolver->setDefault('foo', 'bar');
-        $this->resolver->addNormalizer('foo', function (Options $options, $value) {
-            return '1st-normalized-'.$value;
-        }, true);
+        $this->resolver->addNormalizer('foo', fn (Options $options, $value) => '1st-normalized-'.$value, true);
 
         $this->assertEquals(['foo' => '1st-normalized-bar'], $this->resolver->resolve());
     }
@@ -1595,9 +1561,7 @@ public function testRemoveMultipleOptions()
 
     public function testRemoveLazyOption()
     {
-        $this->resolver->setDefault('foo', function (Options $options) {
-            return 'lazy';
-        });
+        $this->resolver->setDefault('foo', fn (Options $options) => 'lazy');
         $this->resolver->remove('foo');
 
         $this->assertSame([], $this->resolver->resolve());
@@ -1606,9 +1570,7 @@ public function testRemoveLazyOption()
     public function testRemoveNormalizer()
     {
         $this->resolver->setDefault('foo', 'bar');
-        $this->resolver->setNormalizer('foo', function (Options $options, $value) {
-            return 'normalized';
-        });
+        $this->resolver->setNormalizer('foo', fn (Options $options, $value) => 'normalized');
         $this->resolver->remove('foo');
         $this->resolver->setDefault('foo', 'bar');
 
@@ -1669,9 +1631,7 @@ public function testClearRemovesAllOptions()
 
     public function testClearLazyOption()
     {
-        $this->resolver->setDefault('foo', function (Options $options) {
-            return 'lazy';
-        });
+        $this->resolver->setDefault('foo', fn (Options $options) => 'lazy');
         $this->resolver->clear();
 
         $this->assertSame([], $this->resolver->resolve());
@@ -1680,9 +1640,7 @@ public function testClearLazyOption()
     public function testClearNormalizer()
     {
         $this->resolver->setDefault('foo', 'bar');
-        $this->resolver->setNormalizer('foo', function (Options $options, $value) {
-            return 'normalized';
-        });
+        $this->resolver->setNormalizer('foo', fn (Options $options, $value) => 'normalized');
         $this->resolver->clear();
         $this->resolver->setDefault('foo', 'bar');
 
@@ -1724,13 +1682,9 @@ public function testFailIfClearFromLazyption()
     public function testClearOptionAndNormalizer()
     {
         $this->resolver->setDefault('foo1', 'bar');
-        $this->resolver->setNormalizer('foo1', function (Options $options) {
-            return '';
-        });
+        $this->resolver->setNormalizer('foo1', fn (Options $options) => '');
         $this->resolver->setDefault('foo2', 'bar');
-        $this->resolver->setNormalizer('foo2', function (Options $options) {
-            return '';
-        });
+        $this->resolver->setNormalizer('foo2', fn (Options $options) => '');
 
         $this->resolver->clear();
         $this->assertEmpty($this->resolver->resolve());
@@ -1742,9 +1696,7 @@ public function testArrayAccess()
         $this->resolver->setDefault('default2', 1);
         $this->resolver->setRequired('required');
         $this->resolver->setDefined('defined');
-        $this->resolver->setDefault('lazy1', function (Options $options) {
-            return 'lazy';
-        });
+        $this->resolver->setDefault('lazy1', fn (Options $options) => 'lazy');
 
         $this->resolver->setDefault('lazy2', function (Options $options) {
             Assert::assertArrayHasKey('default1', $options);
@@ -2149,9 +2101,7 @@ public function testResolveMultipleNestedOptions()
     public function testResolveLazyOptionUsingNestedOption()
     {
         $this->resolver->setDefaults([
-            'version' => function (Options $options) {
-                return $options['database']['server_version'];
-            },
+            'version' => fn (Options $options) => $options['database']['server_version'],
             'database' => function (OptionsResolver $resolver) {
                 $resolver->setDefault('server_version', '3.15');
             },
@@ -2197,9 +2147,7 @@ public function testOverwrittenNestedOptionNotEvaluatedIfLazyDefault()
             Assert::fail('Should not be called');
         });
         // defined by subclass
-        $this->resolver->setDefault('foo', function (Options $options) {
-            return 'lazy';
-        });
+        $this->resolver->setDefault('foo', fn (Options $options) => 'lazy');
         $this->assertSame(['foo' => 'lazy'], $this->resolver->resolve());
     }
 
@@ -2272,9 +2220,7 @@ public function testFailsIfCyclicDependencyBetweenNestedOptionAndParentLazyOptio
     {
         $this->expectException(OptionDefinitionException::class);
         $this->resolver->setDefaults([
-            'version' => function (Options $options) {
-                return $options['database']['server_version'];
-            },
+            'version' => fn (Options $options) => $options['database']['server_version'],
             'database' => function (OptionsResolver $resolver, Options $parent) {
                 $resolver->setDefault('server_version', $parent['version']);
             },
@@ -2347,9 +2293,7 @@ public function testResolveLazyOptionWithTransitiveDefaultDependency()
                     $resolver->setDefault('host', $parent['host']);
                 });
             },
-            'secondary_replica' => function (Options $options) {
-                return $options['database']['primary_replica']['host'];
-            },
+            'secondary_replica' => fn (Options $options) => $options['database']['primary_replica']['host'],
         ]);
         $actualOptions = $this->resolver->resolve(['ip' => '127.0.0.1']);
         $expectedOptions = [
@@ -2370,12 +2314,8 @@ public function testAccessToParentOptionFromNestedNormalizerAndLazyOption()
             'database' => function (OptionsResolver $resolver, Options $parent) {
                 $resolver
                     ->setDefined('logging')
-                    ->setDefault('profiling', function (Options $options) use ($parent) {
-                        return $parent['debug'];
-                    })
-                    ->setNormalizer('logging', function (Options $options, $value) use ($parent) {
-                        return false === $parent['debug'] ? true : $value;
-                    });
+                    ->setDefault('profiling', fn (Options $options) => $parent['debug'])
+                    ->setNormalizer('logging', fn (Options $options, $value) => false === $parent['debug'] ? true : $value);
             },
         ]);
         $actualOptions = $this->resolver->resolve([
@@ -2405,9 +2345,7 @@ public function testResolveOptionsDefinedByOptionConfigurator()
             ->default('bar')
             ->allowedTypes('string', 'bool')
             ->allowedValues('bar', 'zab')
-            ->normalize(static function (Options $options, $value) {
-                return $value;
-            })
+            ->normalize(static fn (Options $options, $value) => $value)
             ->info('info message')
         ;
         $introspector = new OptionsResolverIntrospector($this->resolver);
@@ -2471,9 +2409,7 @@ public function testInfoOnInvalidValue()
             ->setRequired('expires')
             ->setInfo('expires', 'A future date time')
             ->setAllowedTypes('expires', \DateTimeImmutable::class)
-            ->setAllowedValues('expires', static function ($value) {
-                return $value >= new \DateTimeImmutable('now');
-            })
+            ->setAllowedValues('expires', static fn ($value) => $value >= new \DateTimeImmutable('now'))
         ;
 
         $this->resolver->resolve(['expires' => new \DateTimeImmutable('-1 hour')]);
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index bdeab7e75cdae..3c70be2a2a162 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -1253,9 +1253,7 @@ private function getDescriptors(): array
     protected function buildCallback(callable $callback = null): \Closure
     {
         if ($this->outputDisabled) {
-            return function ($type, $data) use ($callback): bool {
-                return null !== $callback && $callback($type, $data);
-            };
+            return fn ($type, $data): bool => null !== $callback && $callback($type, $data);
         }
 
         $out = self::OUT;
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
index 013bca9b5d7a7..979d72a953424 100644
--- a/src/Symfony/Component/Process/Tests/ProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -155,7 +155,7 @@ public function testWaitUntilCanReturnFalse()
     {
         $p = $this->getProcess('echo foo');
         $p->start();
-        $this->assertFalse($p->waitUntil(function () { return false; }));
+        $this->assertFalse($p->waitUntil(fn () => false));
     }
 
     public function testAllOutputIsActuallyReadOnTermination()
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
index 3f235ca127687..3aee1956e675a 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -210,9 +210,7 @@ private function getDocBlockFromConstructor(string $class, string $property): ?D
 
     private function filterDocBlockParams(DocBlock $docBlock, string $allowedParam): DocBlock
     {
-        $tags = array_values(array_filter($docBlock->getTagsByName('param'), function ($tag) use ($allowedParam) {
-            return $tag instanceof DocBlock\Tags\Param && $allowedParam === $tag->getVariableName();
-        }));
+        $tags = array_values(array_filter($docBlock->getTagsByName('param'), fn ($tag) => $tag instanceof DocBlock\Tags\Param && $allowedParam === $tag->getVariableName()));
 
         return new DocBlock($docBlock->getSummary(), $docBlock->getDescription(), $tags, $docBlock->getContext(),
             $docBlock->getLocation(), $docBlock->isTemplateStart(), $docBlock->isTemplateEnd());
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php
index 429f43202543d..1cf232c10940c 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php
@@ -180,9 +180,7 @@ private function getDocBlockFromConstructor(string $class, string $property): ?P
 
     private function filterDocBlockParams(PhpDocNode $docNode, string $allowedParam): ?ParamTagValueNode
     {
-        $tags = array_values(array_filter($docNode->getTagsByName('@param'), function ($tagNode) use ($allowedParam) {
-            return $tagNode instanceof PhpDocTagNode && ('$'.$allowedParam) === $tagNode->value->parameterName;
-        }));
+        $tags = array_values(array_filter($docNode->getTagsByName('@param'), fn ($tagNode) => $tagNode instanceof PhpDocTagNode && ('$'.$allowedParam) === $tagNode->value->parameterName));
 
         if (!$tags) {
             return null;
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
index 7b27dcc7a9bca..7e78a0bdd58d3 100644
--- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php
+++ b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -269,9 +269,7 @@ protected function doGenerate(array $variables, array $defaults, array $requirem
         }
 
         // add a query string if needed
-        $extra = array_udiff_assoc(array_diff_key($parameters, $variables), $defaults, function ($a, $b) {
-            return $a == $b ? 0 : 1;
-        });
+        $extra = array_udiff_assoc(array_diff_key($parameters, $variables), $defaults, fn ($a, $b) => $a == $b ? 0 : 1);
 
         array_walk_recursive($extra, $caster = static function (&$v) use (&$caster) {
             if (\is_object($v)) {
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php
index 258673593625b..a9bc4a9409383 100644
--- a/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php
+++ b/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php
@@ -36,15 +36,11 @@ public function load(mixed $path, string $type = null): ?RouteCollection
         $files = iterator_to_array(new \RecursiveIteratorIterator(
             new \RecursiveCallbackFilterIterator(
                 new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
-                function (\SplFileInfo $current) {
-                    return !str_starts_with($current->getBasename(), '.');
-                }
+                fn (\SplFileInfo $current) => !str_starts_with($current->getBasename(), '.')
             ),
             \RecursiveIteratorIterator::LEAVES_ONLY
         ));
-        usort($files, function (\SplFileInfo $a, \SplFileInfo $b) {
-            return (string) $a > (string) $b ? 1 : -1;
-        });
+        usort($files, fn (\SplFileInfo $a, \SplFileInfo $b) => (string) $a > (string) $b ? 1 : -1);
 
         foreach ($files as $file) {
             if (!$file->isFile() || !str_ends_with($file->getFilename(), '.php')) {
diff --git a/src/Symfony/Component/Routing/Loader/Psr4DirectoryLoader.php b/src/Symfony/Component/Routing/Loader/Psr4DirectoryLoader.php
index e4b848065409e..059edc99ead46 100644
--- a/src/Symfony/Component/Routing/Loader/Psr4DirectoryLoader.php
+++ b/src/Symfony/Component/Routing/Loader/Psr4DirectoryLoader.php
@@ -66,15 +66,11 @@ private function loadFromDirectory(string $directory, string $psr4Prefix): Route
         $files = iterator_to_array(new \RecursiveIteratorIterator(
             new \RecursiveCallbackFilterIterator(
                 new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
-                function (\SplFileInfo $current) {
-                    return !str_starts_with($current->getBasename(), '.');
-                }
+                fn (\SplFileInfo $current) => !str_starts_with($current->getBasename(), '.')
             ),
             \RecursiveIteratorIterator::SELF_FIRST
         ));
-        usort($files, function (\SplFileInfo $a, \SplFileInfo $b) {
-            return (string) $a > (string) $b ? 1 : -1;
-        });
+        usort($files, fn (\SplFileInfo $a, \SplFileInfo $b) => (string) $a > (string) $b ? 1 : -1);
 
         /** @var \SplFileInfo $file */
         foreach ($files as $file) {
diff --git a/src/Symfony/Component/Routing/Matcher/ExpressionLanguageProvider.php b/src/Symfony/Component/Routing/Matcher/ExpressionLanguageProvider.php
index 303798d644032..3aeebe699def5 100644
--- a/src/Symfony/Component/Routing/Matcher/ExpressionLanguageProvider.php
+++ b/src/Symfony/Component/Routing/Matcher/ExpressionLanguageProvider.php
@@ -36,12 +36,8 @@ public function getFunctions(): array
         foreach ($this->functions->getProvidedServices() as $function => $type) {
             $functions[] = new ExpressionFunction(
                 $function,

10000
-                static function (...$args) use ($function) {
-                    return sprintf('($context->getParameter(\'_functions\')->get(%s)(%s))', var_export($function, true), implode(', ', $args));
-                },
-                function ($values, ...$args) use ($function) {
-                    return $values['context']->getParameter('_functions')->get($function)(...$args);
-                }
+                static fn (...$args) => sprintf('($context->getParameter(\'_functions\')->get(%s)(%s))', var_export($function, true), implode(', ', $args)),
+                fn ($values, ...$args) => $values['context']->getParameter('_functions')->get($function)(...$args)
             );
         }
 
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
index c452aa0673724..2e4ae30c65fc5 100644
--- a/src/Symfony/Component/Routing/RouteCollection.php
+++ b/src/Symfony/Component/Routing/RouteCollection.php
@@ -103,9 +103,7 @@ public function all(): array
         if ($this->priorities) {
             $priorities = $this->priorities;
             $keysOrder = array_flip(array_keys($this->routes));
-            uksort($this->routes, static function ($n1, $n2) use ($priorities, $keysOrder) {
-                return (($priorities[$n2] ?? 0) <=> ($priorities[$n1] ?? 0)) ?: ($keysOrder[$n1] <=> $keysOrder[$n2]);
-            });
+            uksort($this->routes, static fn ($n1, $n2) => (($priorities[$n2] ?? 0) <=> ($priorities[$n1] ?? 0)) ?: ($keysOrder[$n1] <=> $keysOrder[$n2]));
         }
 
         return $this->routes;
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/CustomXmlFileLoader.php b/src/Symfony/Component/Routing/Tests/Fixtures/CustomXmlFileLoader.php
index b88d5ffccb495..dfb79d1d5bafe 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/CustomXmlFileLoader.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/CustomXmlFileLoader.php
@@ -21,6 +21,6 @@ class CustomXmlFileLoader extends XmlFileLoader
 {
     protected function loadFile(string $file): \DOMDocument
     {
-        return XmlUtils::loadFile($file, function () { return true; });
+        return XmlUtils::loadFile($file, fn () => true);
     }
 }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/glob/php_dsl.php b/src/Symfony/Component/Routing/Tests/Fixtures/glob/php_dsl.php
index 897fa11f282af..d1890e1e8e7e7 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/glob/php_dsl.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/glob/php_dsl.php
@@ -2,6 +2,4 @@
 
 namespace Symfony\Component\Routing\Loader\Configurator;
 
-return function (RoutingConfigurator $routes) {
-    return $routes->import('php_dsl_ba?.php');
-};
+return fn (RoutingConfigurator $routes) => $routes->import('php_dsl_ba?.php');
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
index e8e14c9ba7b9e..62c4c4426c6c3 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
@@ -112,8 +112,6 @@ private function expectAnnotationsToBeReadFrom(array $classes)
     {
         $this->reader->expects($this->exactly(\count($classes)))
             ->method('getClassAnnotation')
-            ->with($this->callback(function (\ReflectionClass $class) use ($classes) {
-                return \in_array($class->getName(), $classes);
-            }));
+            ->with($this->callback(fn (\ReflectionClass $class) => \in_array($class->getName(), $classes)));
     }
 }
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/ExpressionLanguageProviderTest.php b/src/Symfony/Component/Routing/Tests/Matcher/ExpressionLanguageProviderTest.php
index 0aa3549b26c60..e59f7a0bed8f9 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/ExpressionLanguageProviderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/ExpressionLanguageProviderTest.php
@@ -25,23 +25,12 @@ class ExpressionLanguageProviderTest extends TestCase
     protected function setUp(): void
     {
         $functionProvider = new ServiceLocator([
-            'env' => function () {
-                // function with one arg
-                return function (string $arg) {
-                    return [
-                        'APP_ENV' => 'test',
-                        'PHP_VERSION' => '7.2',
-                    ][$arg] ?? null;
-                };
-            },
-            'sum' => function () {
-                // function with multiple args
-                return function ($a, $b) { return $a + $b; };
-            },
-            'foo' => function () {
-                // function with no arg
-                return function () { return 'bar'; };
-            },
+            'env' => fn () => fn (string $arg) => [
+                'APP_ENV' => 'test',
+                'PHP_VERSION' => '7.2',
+            ][$arg] ?? null,
+            'sum' => fn () => fn ($a, $b) => $a + $b,
+            'foo' => fn () => fn () => 'bar',
         ]);
 
         $this->context = new RequestContext();
diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php
index 29c51caefd68c..df01c84ac6805 100644
--- a/src/Symfony/Component/Routing/Tests/RouteTest.php
+++ b/src/Symfony/Component/Routing/Tests/RouteTest.php
@@ -98,7 +98,7 @@ public function testDefaults()
         $this->assertEquals('bar2', $route->getDefault('foo2'), '->getDefault() return the default value');
         $this->assertNull($route->getDefault('not_defined'), '->getDefault() return null if default value is not set');
 
-        $route->setDefault('_controller', $closure = function () { return 'Hello'; });
+        $route->setDefault('_controller', $closure = fn () => 'Hello');
         $this->assertEquals($closure, $route->getDefault('_controller'), '->setDefault() sets a default value');
 
         $route->setDefaults(['foo' => 'foo']);
diff --git a/src/Symfony/Component/Runtime/GenericRuntime.php b/src/Symfony/Component/Runtime/GenericRuntime.php
index ec23336aea6db..f1b3254ad4808 100644
--- a/src/Symfony/Component/Runtime/GenericRuntime.php
+++ b/src/Symfony/Component/Runtime/GenericRuntime.php
@@ -113,7 +113,7 @@ public function getResolver(callable $callable, \ReflectionFunction $reflector =
 
     public function getRunner(?object $application): RunnerInterface
     {
-        $application ??= static function () { return 0; };
+        $application ??= static fn () => 0;
 
         if ($application instanceof RunnerInterface) {
             return $application;
diff --git a/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload.php b/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload.php
index b15d0a5c857a0..a35ca88fff43c 100644
--- a/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload.php
+++ b/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload.php
@@ -19,6 +19,4 @@
 
 require __DIR__.'/autoload.php';
 
-return function (Request $request, array $context) {
-    return new Response('OK Request '.$context['SOME_VAR']);
-};
+return fn (Request $request, array $context) => new Response('OK Request '.$context['SOME_VAR']);
diff --git a/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_debug_exists_0_to_1.php b/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_debug_exists_0_to_1.php
index 536f611fe922d..af6409dda62bc 100644
--- a/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_debug_exists_0_to_1.php
+++ b/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_debug_exists_0_to_1.php
@@ -20,8 +20,6 @@
 
 require __DIR__.'/autoload.php';
 
-return static function (Command $command, OutputInterface $output, array $context): Command {
-    return $command->setCode(static function () use ($output, $context): void {
-        $output->writeln($context['DEBUG_ENABLED']);
-    });
-};
+return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): void {
+    $output->writeln($context['DEBUG_ENABLED']);
+});
diff --git a/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_debug_exists_1_to_0.php b/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_debug_exists_1_to_0.php
index 4bdc09ac6aec6..78a0bf29448b8 100644
--- a/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_debug_exists_1_to_0.php
+++ b/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_debug_exists_1_to_0.php
@@ -20,8 +20,6 @@
 
 require __DIR__.'/autoload.php';
 
-return static function (Command $command, OutputInterface $output, array $context): Command {
-    return $command->setCode(static function () use ($output, $context): void {
-        $output->writeln($context['DEBUG_MODE']);
-    });
-};
+return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): void {
+    $output->writeln($context['DEBUG_MODE']);
+});
diff --git a/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_env_exists.php b/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_env_exists.php
index bd0a053010104..3e72372e5af06 100644
--- a/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_env_exists.php
+++ b/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_env_exists.php
@@ -20,8 +20,6 @@
 
 require __DIR__.'/autoload.php';
 
-return static function (Command $command, OutputInterface $output, array $context): Command {
-    return $command->setCode(static function () use ($output, $context): void {
-        $output->writeln($context['ENV_MODE']);
-    });
-};
+return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): void {
+    $output->writeln($context['ENV_MODE']);
+});
diff --git a/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_no_debug.php b/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_no_debug.php
index 89e2e1223084e..3fe4f44d7967b 100644
--- a/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_no_debug.php
+++ b/src/Symfony/Component/Runtime/Tests/phpt/dotenv_overload_command_no_debug.php
@@ -19,8 +19,6 @@
 
 require __DIR__.'/autoload.php';
 
-return static function (Command $command, OutputInterface $output, array $context): Command {
-    return $command->setCode(static function () use ($output, $context): void {
-        $output->writeln($context['DEBUG_ENABLED']);
-    });
-};
+return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): void {
+    $output->writeln($context['DEBUG_ENABLED']);
+});
diff --git a/src/Symfony/Component/Runtime/Tests/phpt/kernel.php b/src/Symfony/Component/Runtime/Tests/phpt/kernel.php
index cd9686741ce4c..707a7be20e06c 100644
--- a/src/Symfony/Component/Runtime/Tests/phpt/kernel.php
+++ b/src/Symfony/Component/Runtime/Tests/phpt/kernel.php
@@ -30,6 +30,4 @@ public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = tr
     }
 }
 
-return function (array $context) {
-    return new TestKernel($context['SOME_VAR']);
-};
+return fn (array $context) => new TestKernel($context['SOME_VAR']);
diff --git a/src/Symfony/Component/Runtime/Tests/phpt/request.php b/src/Symfony/Component/Runtime/Tests/phpt/request.php
index 4fbf9e7a210b5..5560182fb55df 100644
--- a/src/Symfony/Component/Runtime/Tests/phpt/request.php
+++ b/src/Symfony/Component/Runtime/Tests/phpt/request.php
@@ -14,6 +14,4 @@
 
 require __DIR__.'/autoload.php';
 
-return function (Request $request, array $context) {
-    return new Response('OK Request '.$context['SOME_VAR']);
-};
+return fn (Request $request, array $context) => new Response('OK Request '.$context['SOME_VAR']);
diff --git a/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguageProvider.php b/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguageProvider.php
index 755efd6558d33..d3e2dac05791c 100644
--- a/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguageProvider.php
+++ b/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguageProvider.php
@@ -24,29 +24,13 @@ class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface
     public function getFunctions(): array
     {
         return [
-            new ExpressionFunction('is_authenticated', function () {
-                return '$auth_checker->isGranted("IS_AUTHENTICATED")';
-            }, function (array $variables) {
-                return $variables['auth_checker']->isGranted('IS_AUTHENTICATED');
-            }),
+            new ExpressionFunction('is_authenticated', fn () => '$auth_checker->isGranted("IS_AUTHENTICATED")', fn (array $variables) => $variables['auth_checker']->isGranted('IS_AUTHENTICATED')),
 
-            new ExpressionFunction('is_fully_authenticated', function () {
-                return '$token && $auth_checker->isGranted("IS_AUTHENTICATED_FULLY")';
-            }, function (array $variables) {
-                return $variables['token'] && $variables['auth_checker']->isGranted('IS_AUTHENTICATED_FULLY');
-            }),
+            new ExpressionFunction('is_fully_authenticated', fn () => '$token && $auth_checker->isGranted("IS_AUTHENTICATED_FULLY")', fn (array $variables) => $variables['token'] && $variables['auth_checker']->isGranted('IS_AUTHENTICATED_FULLY')),
 
-            new ExpressionFunction('is_granted', function ($attributes, $object = 'null') {
-                return sprintf('$auth_checker->isGranted(%s, %s)', $attributes, $object);
-            }, function (array $variables, $attributes, $object = null) {
-                return $variables['auth_checker']->isGranted($attributes, $object);
-            }),
+            new ExpressionFunction('is_granted', fn ($attributes, $object = 'null') => sprintf('$auth_checker->isGranted(%s, %s)', $attributes, $object), fn (array $variables, $attributes, $object = null) => $variables['auth_checker']->isGranted($attributes, $object)),
 
-            new ExpressionFunction('is_remember_me', function () {
-                return '$token && $auth_checker->isGranted("IS_REMEMBERED")';
-            }, function (array $variables) {
-                return $variables['token'] && $variables['auth_checker']->isGranted('IS_REMEMBERED');
-            }),
+            new ExpressionFunction('is_remember_me', fn () => '$token && $auth_checker->isGranted("IS_REMEMBERED")', fn (array $variables) => $variables['token'] && $variables['auth_checker']->isGranted('IS_REMEMBERED')),
         ];
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/Storage/UsageTrackingTokenStorageTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/Storage/UsageTrackingTokenStorageTest.php
index f8f11d1347289..5671e650699e1 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/Storage/UsageTrackingTokenStorageTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/Storage/UsageTrackingTokenStorageTest.php
@@ -68,9 +68,7 @@ public function testGetSetToken()
 
     public function testWithoutMainRequest()
     {
-        $locator = new class(['request_stack' => function () {
-            return new RequestStack();
-        }]) implements ContainerInterface {
+        $locator = new class(['request_stack' => fn () => new RequestStack()]) implements ContainerInterface {
             use ServiceLocatorTrait;
         };
         $tokenStorage = new TokenStorage();
diff --git a/src/Symfony/Component/Security/Core/Tests/Resources/TranslationFilesTest.php b/src/Symfony/Component/Security/Core/Tests/Resources/TranslationFilesTest.php
index cd96e7e61c44e..5b54f1ebc45cc 100644
--- a/src/Symfony/Component/Security/Core/Tests/Resources/TranslationFilesTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Resources/TranslationFilesTest.php
@@ -45,7 +45,7 @@ public function testTranslationFileIsValidWithoutEntityLoader($filePath)
     public function provideTranslationFiles()
     {
         return array_map(
-            function ($filePath) { return (array) $filePath; },
+            fn ($filePath) => (array) $filePath,
             glob(\dirname(__DIR__, 2).'/Resources/translations/*.xlf')
         );
     }
diff --git a/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php b/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php
index 7cefe8b0a0572..335eaa08b586b 100644
--- a/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php
+++ b/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php
@@ -42,9 +42,7 @@ public function __construct(TokenGeneratorInterface $generator = null, TokenStor
         $this->generator = $generator ?? new UriSafeTokenGenerator();
         $this->storage = $storage ?? new NativeSessionTokenStorage();
 
-        $superGlobalNamespaceGenerator = function () {
-            return !empty($_SERVER['HTTPS']) && 'off' !== strtolower($_SERVER['HTTPS']) ? 'https-' : '';
-        };
+        $superGlobalNamespaceGenerator = fn () => !empty($_SERVER['HTTPS']) && 'off' !== strtolower($_SERVER['HTTPS']) ? 'https-' : '';
 
         if (null === $namespace) {
             $this->namespace = $superGlobalNamespaceGenerator;
diff --git a/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php b/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php
index bd911987f1f2d..63a98543b126b 100644
--- a/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php
+++ b/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php
@@ -260,9 +260,7 @@ public function getManagerGeneratorAndStorage()
         $data[] = ['https-', new CsrfTokenManager($generator, $storage, $requestStack), $storage, $generator];
 
         [$generator, $storage] = $this->getGeneratorAndStorage();
-        $data[] = ['generated-', new CsrfTokenManager($generator, $storage, function () {
-            return 'generated-';
-        }), $storage, $generator];
+        $data[] = ['generated-', new CsrfTokenManager($generator, $storage, fn () => 'generated-'), $storage, $generator];
 
         $requestStack = new RequestStack();
         $requestStack->push(new Request());
diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php
index 963a0f9a08327..eabfb0654ee88 100644
--- a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php
+++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php
@@ -76,7 +76,7 @@ public function __construct(iterable $authenticators, TokenStorageInterface $tok
     public function authenticateUser(UserInterface $user, AuthenticatorInterface $authenticator, Request $request, array $badges = []): ?Response
     {
         // create an authentication token for the User
-        $passport = new SelfValidatingPassport(new UserBadge($user->getUserIdentifier(), function () use ($user) { return $user; }), $badges);
+        $passport = new SelfValidatingPassport(new UserBadge($user->getUserIdentifier(), fn () => $user), $badges);
         $token = $authenticator->createToken($passport, $this->firewallName);
 
         // announce the authentication token
diff --git a/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php
index 2082176e63b84..dd63c9c689aed 100644
--- a/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php
+++ b/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php
@@ -87,9 +87,7 @@ public function authenticate(Request $request): Passport
 
         $rememberMeCookie = RememberMeDetails::fromRawCookie($rawCookie);
 
-        $userBadge = new UserBadge($rememberMeCookie->getUserIdentifier(), function () use ($rememberMeCookie) {
-            return $this->rememberMeHandler->consumeRememberMeCookie($rememberMeCookie);
-        });
+        $userBadge = new UserBadge($rememberMeCookie->getUserIdentifier(), fn () => $this->rememberMeHandler->consumeRememberMeCookie($rememberMeCookie));
 
         return new SelfValidatingPassport($userBadge);
     }
diff --git a/src/Symfony/Component/Security/Http/Tests/Authentication/AuthenticatorManagerTest.php b/src/Symfony/Component/Security/Http/Tests/Authentication/AuthenticatorManagerTest.php
index a7f1facd69e3b..9a7e1074af285 100644
--- a/src/Symfony/Component/Security/Http/Tests/Authentication/AuthenticatorManagerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Authentication/AuthenticatorManagerTest.php
@@ -101,7 +101,7 @@ public function testAuthenticateRequest($matchingAuthenticatorIndex)
 
         $authenticators[($matchingAuthenticatorIndex + 1) % 2]->expects($this->never())->method('authenticate');
 
-        $matchingAuthenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $matchingAuthenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
 
         $listenerCalled = false;
         $this->eventDispatcher->addListener(CheckPassportEvent::class, function (CheckPassportEvent $event) use (&$listenerCalled, $matchingAuthenticator) {
@@ -129,7 +129,7 @@ public function testNoCredentialsValidated()
         $authenticator = $this->createAuthenticator();
         $this->request->attributes->set('_security_authenticators', [$authenticator]);
 
-        $authenticator->expects($this->any())->method('authenticate')->willReturn(new Passport(new UserBadge('wouter', function () { return $this->user; }), new PasswordCredentials('pass')));
+        $authenticator->expects($this->any())->method('authenticate')->willReturn(new Passport(new UserBadge('wouter', fn () => $this->user), new PasswordCredentials('pass')));
 
         $authenticator->expects($this->once())
             ->method('onAuthenticationFailure')
@@ -146,9 +146,7 @@ public function testRequiredBadgeMissing()
 
         $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter')));
 
-        $authenticator->expects($this->once())->method('onAuthenticationFailure')->with($this->anything(), $this->callback(function ($exception) {
-            return 'Authentication failed; Some badges marked as required by the firewall config are not available on the passport: "'.CsrfTokenBadge::class.'".' === $exception->getMessage();
-        }));
+        $authenticator->expects($this->once())->method('onAuthenticationFailure')->with($this->anything(), $this->callback(fn ($exception) => 'Authentication failed; Some badges marked as required by the firewall config are not available on the passport: "'.CsrfTokenBadge::class.'".' === $exception->getMessage()));
 
         $manager = $this->createManager([$authenticator], 'main', true, [CsrfTokenBadge::class]);
         $manager->authenticateRequest($this->request);
@@ -178,7 +176,7 @@ public function testEraseCredentials($eraseCredentials)
         $authenticator = $this->createAuthenticator();
         $this->request->attributes->set('_security_authenticators', [$authenticator]);
 
-        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
 
         $authenticator->expects($this->any())->method('createToken')->willReturn($this->token);
 
@@ -199,7 +197,7 @@ public function testAuthenticateRequestCanModifyTokenFromEvent()
         $authenticator = $this->createAuthenticator();
         $this->request->attributes->set('_security_authenticators', [$authenticator]);
 
-        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
 
         $authenticator->expects($this->any())->method('createToken')->willReturn($this->token);
 
@@ -257,7 +255,7 @@ public function testInteractiveAuthenticator()
         $authenticator->expects($this->any())->method('isInteractive')->willReturn(true);
         $this->request->attributes->set('_security_authenticators', [$authenticator]);
 
-        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
         $authenticator->expects($this->any())->method('createToken')->willReturn($this->token);
 
         $this->tokenStorage->expects($this->once())->method('setToken')->with($this->token);
@@ -278,7 +276,7 @@ public function testLegacyInteractiveAuthenticator()
         $authenticator->expects($this->any())->method('isInteractive')->willReturn(true);
         $this->request->attributes->set('_security_authenticators', [$authenticator]);
 
-        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
         $authenticator->expects($this->any())->method('createToken')->willReturn($this->token);
 
         $this->tokenStorage->expects($this->once())->method('setToken')->with($this->token);
@@ -303,9 +301,7 @@ public function testAuthenticateRequestHidesInvalidUserExceptions()
 
         $authenticator->expects($this->any())
             ->method('onAuthenticationFailure')
-            ->with($this->equalTo($this->request), $this->callback(function ($e) use ($invalidUserException) {
-                return $e instanceof BadCredentialsException && $invalidUserException === $e->getPrevious();
-            }))
+            ->with($this->equalTo($this->request), $this->callback(fn ($e) => $e instanceof BadCredentialsException && $invalidUserException === $e->getPrevious()))
             ->willReturn($this->response);
 
         $manager = $this->createManager([$authenticator]);
@@ -319,7 +315,7 @@ public function testLogsUseTheDecoratedAuthenticatorWhenItIsTraceable()
         $authenticator->expects($this->any())->method('isInteractive')->willReturn(true);
         $this->request->attributes->set('_security_authenticators', [new TraceableAuthenticator($authenticator)]);
 
-        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $authenticator->expects($this->any())->method('authenticate')->willReturn(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
         $authenticator->expects($this->any())->method('createToken')->willReturn($this->token);
 
         $this->tokenStorage->expects($this->once())->method('setToken')->with($this->token);
diff --git a/src/Symfony/Component/Security/Http/Tests/Authenticator/AbstractAuthenticatorTest.php b/src/Symfony/Component/Security/Http/Tests/Authenticator/AbstractAuthenticatorTest.php
index e7af32d226a21..77ca011f66ce0 100644
--- a/src/Symfony/Component/Security/Http/Tests/Authenticator/AbstractAuthenticatorTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Authenticator/AbstractAuthenticatorTest.php
@@ -30,7 +30,7 @@ public function testCreateToken()
         $authenticator = new ConcreteAuthenticator();
         $this->assertInstanceOf(
             PostAuthenticationToken::class,
-            $authenticator->createToken(new SelfValidatingPassport(new UserBadge('dummy', function () { return new InMemoryUser('robin', 'hood'); })), 'dummy')
+            $authenticator->createToken(new SelfValidatingPassport(new UserBadge('dummy', fn () => new InMemoryUser('robin', 'hood'))), 'dummy')
         );
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/Authenticator/Passport/Badge/UserBadgeTest.php b/src/Symfony/Component/Security/Http/Tests/Authenticator/Passport/Badge/UserBadgeTest.php
index d8e4c4cbdd295..cc79cc1fb9c1a 100644
--- a/src/Symfony/Component/Security/Http/Tests/Authenticator/Passport/Badge/UserBadgeTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Authenticator/Passport/Badge/UserBadgeTest.php
@@ -19,7 +19,7 @@ class UserBadgeTest extends TestCase
 {
     public function testUserNotFound()
     {
-        $badge = new UserBadge('dummy', function () { return null; });
+        $badge = new UserBadge('dummy', fn () => null);
         $this->expectException(UserNotFoundException::class);
         $badge->getUser();
     }
diff --git a/src/Symfony/Component/Security/Http/Tests/Authenticator/RememberMeAuthenticatorTest.php b/src/Symfony/Component/Security/Http/Tests/Authenticator/RememberMeAuthenticatorTest.php
index c7492a95a464f..f45d7fb462b6f 100644
--- a/src/Symfony/Component/Security/Http/Tests/Authenticator/RememberMeAuthenticatorTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Authenticator/RememberMeAuthenticatorTest.php
@@ -69,9 +69,7 @@ public function testAuthenticate()
         $request = Request::create('/', 'GET', [], ['_remember_me_cookie' => $rememberMeDetails->toString()]);
         $passport = $this->authenticator->authenticate($request);
 
-        $this->rememberMeHandler->expects($this->once())->method('consumeRememberMeCookie')->with($this->callback(function ($arg) use ($rememberMeDetails) {
-            return $rememberMeDetails == $arg;
-        }));
+        $this->rememberMeHandler->expects($this->once())->method('consumeRememberMeCookie')->with($this->callback(fn ($arg) => $rememberMeDetails == $arg));
         $passport->getUser(); // trigger the user loader
     }
 
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/CheckCredentialsListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/CheckCredentialsListenerTest.php
index bab2ad0fc13f7..584b57040ef38 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/CheckCredentialsListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/CheckCredentialsListenerTest.php
@@ -55,7 +55,7 @@ public function testPasswordAuthenticated($password, $passwordValid, $result)
         }
 
         $credentials = new PasswordCredentials($password);
-        $this->listener->checkPassport($this->createEvent(new Passport(new UserBadge('wouter', function () { return $this->user; }), $credentials)));
+        $this->listener->checkPassport($this->createEvent(new Passport(new UserBadge('wouter', fn () => $this->user), $credentials)));
 
         if (true === $result) {
             $this->assertTrue($credentials->isResolved());
@@ -75,7 +75,7 @@ public function testEmptyPassword()
 
         $this->hasherFactory->expects($this->never())->method('getPasswordHasher');
 
-        $event = $this->createEvent(new Passport(new UserBadge('wouter', function () { return $this->user; }), new PasswordCredentials('')));
+        $event = $this->createEvent(new Passport(new UserBadge('wouter', fn () => $this->user), new PasswordCredentials('')));
         $this->listener->checkPassport($event);
     }
 
@@ -90,10 +90,8 @@ public function testCustomAuthenticated($result)
             $this->expectException(BadCredentialsException::class);
         }
 
-        $credentials = new CustomCredentials(function () use ($result) {
-            return $result;
-        }, ['password' => 'foo']);
-        $this->listener->checkPassport($this->createEvent(new Passport(new UserBadge('wouter', function () { return $this->user; }), $credentials)));
+        $credentials = new CustomCredentials(fn () => $result, ['password' => 'foo']);
+        $this->listener->checkPassport($this->createEvent(new Passport(new UserBadge('wouter', fn () => $this->user), $credentials)));
 
         if (true === $result) {
             $this->assertTrue($credentials->isResolved());
@@ -110,7 +108,7 @@ public function testNoCredentialsBadgeProvided()
     {
         $this->hasherFactory->expects($this->never())->method('getPasswordHasher');
 
-        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('wouter', function () { return $this->user; })));
+        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('wouter', fn () => $this->user)));
         $this->listener->checkPassport($event);
     }
 
@@ -121,7 +119,7 @@ public function testAddsPasswordUpgradeBadge()
 
         $this->hasherFactory->expects($this->any())->method('getPasswordHasher')->with($this->identicalTo($this->user))->willReturn($hasher);
 
-        $passport = new Passport(new UserBadge('wouter', function () { return $this->user; }), new PasswordCredentials('ThePa$$word'));
+        $passport = new Passport(new UserBadge('wouter', fn () => $this->user), new PasswordCredentials('ThePa$$word'));
         $this->listener->checkPassport($this->createEvent($passport));
 
         $this->assertTrue($passport->hasBadge(PasswordUpgradeBadge::class));
@@ -137,7 +135,7 @@ public function testAddsNoPasswordUpgradeBadgeIfItAlreadyExists()
 
         $passport = $this->getMockBuilder(Passport::class)
             ->setMethods(['addBadge'])
-            ->setConstructorArgs([new UserBadge('wouter', function () { return $this->user; }), new PasswordCredentials('ThePa$$word'), [new PasswordUpgradeBadge('ThePa$$word')]])
+            ->setConstructorArgs([new UserBadge('wouter', fn () => $this->user), new PasswordCredentials('ThePa$$word'), [new PasswordUpgradeBadge('ThePa$$word')]])
             ->getMock();
 
         $passport->expects($this->never())->method('addBadge')->with($this->isInstanceOf(PasswordUpgradeBadge::class));
@@ -154,7 +152,7 @@ public function testAddsNoPasswordUpgradeBadgeIfPasswordIsInvalid()
 
         $passport = $this->getMockBuilder(Passport::class)
             ->setMethods(['addBadge'])
-            ->setConstructorArgs([new UserBadge('wouter', function () { return $this->user; }), new PasswordCredentials('ThePa$$word'), [new PasswordUpgradeBadge('ThePa$$word')]])
+            ->setConstructorArgs([new UserBadge('wouter', fn () => $this->user), new PasswordCredentials('ThePa$$word'), [new PasswordUpgradeBadge('ThePa$$word')]])
             ->getMock();
 
         $passport->expects($this->never())->method('addBadge')->with($this->isInstanceOf(PasswordUpgradeBadge::class));
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php
index b46536462b1fd..c8d7d7042ef88 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php
@@ -96,6 +96,6 @@ private function createLoginSuccessfulEvent(Passport $passport)
 
     private function createPassport(array $badges = null)
     {
-        return new SelfValidatingPassport(new UserBadge('test', function ($username) { return new InMemoryUser($username, null); }), $badges ?? [new RememberMeBadge()]);
+        return new SelfValidatingPassport(new UserBadge('test', fn ($username) => new InMemoryUser($username, null)), $badges ?? [new RememberMeBadge()]);
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/CsrfProtectionListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/CsrfProtectionListenerTest.php
index 358475a2b184b..7acdc329a2c40 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/CsrfProtectionListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/CsrfProtectionListenerTest.php
@@ -76,7 +76,7 @@ private function createEvent($passport)
 
     private function createPassport(?CsrfTokenBadge $badge)
     {
-        $passport = new SelfValidatingPassport(new UserBadge('wouter', function ($username) { return new InMemoryUser($username, 'pass'); }));
+        $passport = new SelfValidatingPassport(new UserBadge('wouter', fn ($username) => new InMemoryUser($username, 'pass')));
         if ($badge) {
             $passport->addBadge($badge);
         }
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php
index e66b9bb641813..bae8b791c329b 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php
@@ -60,10 +60,10 @@ public function testUnsupportedEvents($event)
     public function provideUnsupportedEvents()
     {
         // no password upgrade badge
-        yield [$this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->createMock(UserInterface::class); })))];
+        yield [$this->createEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->createMock(UserInterface::class))))];
 
         // blank password
-        yield [$this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->createMock(TestPasswordAuthenticatedUser::class); }), [new PasswordUpgradeBadge('', $this->createPasswordUpgrader())]))];
+        yield [$this->createEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->createMock(TestPasswordAuthenticatedUser::class)), [new PasswordUpgradeBadge('', $this->createPasswordUpgrader())]))];
     }
 
     public function testUpgradeWithUpgrader()
@@ -74,7 +74,7 @@ public function testUpgradeWithUpgrader()
             ->with($this->user, 'new-hash')
         ;
 
-        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }), [new PasswordUpgradeBadge('pa$$word', $passwordUpgrader)]));
+        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->user), [new PasswordUpgradeBadge('pa$$word', $passwordUpgrader)]));
         $this->listener->onLoginSuccess($event);
     }
 
@@ -101,7 +101,7 @@ public function testUserWithoutPassword()
 
         $this->hasherFactory->expects($this->never())->method('getPasswordHasher');
 
-        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }), [new PasswordUpgradeBadge('pa$$word')]));
+        $event = $this->createEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->user), [new PasswordUpgradeBadge('pa$$word')]));
         $this->listener->onLoginSuccess($event);
     }
 
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/RememberMeListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/RememberMeListenerTest.php
index c64f4a7e5654f..d7e4d845bcd00 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/RememberMeListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/RememberMeListenerTest.php
@@ -79,6 +79,6 @@ private function createPassport(array $badges = null)
             $badges = [$badge];
         }
 
-        return new SelfValidatingPassport(new UserBadge('test', function ($username) { return new InMemoryUser($username, null); }), $badges);
+        return new SelfValidatingPassport(new UserBadge('test', fn ($username) => new InMemoryUser($username, null)), $badges);
     }
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/SessionStrategyListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/SessionStrategyListenerTest.php
index a28b316f31d48..d06ee60ad1910 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/SessionStrategyListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/SessionStrategyListenerTest.php
@@ -64,7 +64,7 @@ public function testStatelessFirewalls()
 
     private function createEvent($firewallName)
     {
-        return new LoginSuccessEvent($this->createMock(AuthenticatorInterface::class), new SelfValidatingPassport(new UserBadge('test', function ($username) { return new InMemoryUser($username, null); })), $this->token, $this->request, null, $firewallName);
+        return new LoginSuccessEvent($this->createMock(AuthenticatorInterface::class), new SelfValidatingPassport(new UserBadge('test', fn ($username) => new InMemoryUser($username, null))), $this->token, $this->request, null, $firewallName);
     }
 
     private function configurePreviousSession()
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/UserCheckerListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/UserCheckerListenerTest.php
index f615983b5b439..5ba70dac5ae7f 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/UserCheckerListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/UserCheckerListenerTest.php
@@ -47,7 +47,7 @@ public function testPreAuthenticatedBadge()
     {
         $this->userChecker->expects($this->never())->method('checkPreAuth');
 
-        $this->listener->preCheckCredentials($this->createCheckPassportEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }), [new PreAuthenticatedUserBadge()])));
+        $this->listener->preCheckCredentials($this->createCheckPassportEvent(new SelfValidatingPassport(new UserBadge('test', fn () => $this->user), [new PreAuthenticatedUserBadge()])));
     }
 
     public function testPostAuthValidCredentials()
@@ -59,7 +59,7 @@ public function testPostAuthValidCredentials()
 
     private function createCheckPassportEvent($passport = null)
     {
-        $passport ??= new SelfValidatingPassport(new UserBadge('test', function () { return $this->user; }));
+        $passport ??= new SelfValidatingPassport(new UserBadge('test', fn () => $this->user));
 
         return new CheckPassportEvent($this->createMock(AuthenticatorInterface::class), $passport);
     }
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
index 1c02e92995697..8b4081b419dba 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -359,7 +359,7 @@ protected function runSessionOnKernelResponse($newToken, $original = null)
             $session->set('_security_session', $original);
         }
 
-        $factories = ['request_stack' => function () use ($requestStack) { return $requestStack; }];
+        $factories = ['request_stack' => fn () => $requestStack];
         $tokenStorage = new UsageTrackingTokenStorage(new TokenStorage(), new class($factories) implements ContainerInterface {
             use ServiceLocatorTrait;
         });
@@ -405,7 +405,7 @@ private function handleEventWithPreviousSession($userProviders, UserInterface $u
         $tokenStorage = new TokenStorage();
         $usageIndex = $session->getUsageIndex();
 
-        $factories = ['request_stack' => function () use ($requestStack) { return $requestStack; }];
+        $factories = ['request_stack' => fn () => $requestStack];
         $tokenStorage = new UsageTrackingTokenStorage($tokenStorage, new class($factories) implements ContainerInterface {
             use ServiceLocatorTrait;
         });
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
index 9ccbf741c4214..fa117b8a961de 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
@@ -127,9 +127,7 @@ public function testExitUserDispatchesEventWithRefreshedUser()
             ->expects($this->once())
             ->method('dispatch')
             ->with(
-                $this->callback(function (SwitchUserEvent $event) use ($refreshedUser) {
-                    return $event->getTargetUser() === $refreshedUser;
-                }),
+                $this->callback(fn (SwitchUserEvent $event) => $event->getTargetUser() === $refreshedUser),
                 SecurityEvents::SWITCH_USER
             )
         ;
@@ -178,11 +176,11 @@ public function testSwitchUser()
         $this->request->query->set('_switch_user', 'kuba');
 
         $this->accessDecisionManager->expects($this->once())
-            ->method('decide')->with($token, ['ROLE_ALLOWED_TO_SWITCH'], $this->callback(function ($user) { return 'kuba' === $user->getUserIdentifier(); }))
+            ->method('decide')->with($token, ['ROLE_ALLOWED_TO_SWITCH'], $this->callback(fn ($user) => 'kuba' === $user->getUserIdentifier()))
             ->willReturn(true);
 
         $this->userChecker->expects($this->once())
-            ->method('checkPostAuth')->with($this->callback(function ($user) { return 'kuba' === $user->getUserIdentifier(); }));
+            ->method('checkPostAuth')->with($this->callback(fn ($user) => 'kuba' === $user->getUserIdentifier()));
 
         $listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager);
         $listener($this->event);
@@ -202,7 +200,7 @@ public function testSwitchUserAlreadySwitched()
 
         $this->request->query->set('_switch_user', 'kuba');
 
-        $targetsUser = $this->callback(function ($user) { return 'kuba' === $user->getUserIdentifier(); });
+        $targetsUser = $this->callback(fn ($user) => 'kuba' === $user->getUserIdentifier());
         $this->accessDecisionManager->expects($this->once())
             ->method('decide')->with($originalToken, ['ROLE_ALLOWED_TO_SWITCH'], $targetsUser)
             ->willReturn(true);
@@ -234,7 +232,7 @@ public function testSwitchUserWorksWithFalsyUsernames()
             ->willReturn(true);
 
         $this->userChecker->expects($this->once())
-            ->method('checkPostAuth')->with($this->callback(function ($argUser) use ($user) { return $user->isEqualTo($argUser); }));
+            ->method('checkPostAuth')->with($this->callback(fn ($argUser) => $user->isEqualTo($argUser)));
 
         $listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager);
         $listener($this->event);
@@ -255,7 +253,7 @@ public function testSwitchUserKeepsOtherQueryStringParameters()
             'section' => 2,
         ]);
 
-        $targetsUser = $this->callback(function ($user) { return 'kuba' === $user->getUserIdentifier(); });
+        $targetsUser = $this->callback(fn ($user) => 'kuba' === $user->getUserIdentifier());
         $this->accessDecisionManager->expects($this->once())
             ->method('decide')->with($token, ['ROLE_ALLOWED_TO_SWITCH'], $targetsUser)
             ->willReturn(true);
@@ -282,7 +280,7 @@ public function testSwitchUserWithReplacedToken()
         $this->request->query->set('_switch_user', 'kuba');
 
         $this->accessDecisionManager->expects($this->any())
-            ->method('decide')->with($token, ['ROLE_ALLOWED_TO_SWITCH'], $this->callback(function ($user) { return 'kuba' === $user->getUserIdentifier(); }))
+            ->method('decide')->with($token, ['ROLE_ALLOWED_TO_SWITCH'], $this->callback(fn ($user) => 'kuba' === $user->getUserIdentifier()))
             ->willReturn(true);
 
         $dispatcher = $this->createMock(EventDispatcherInterface::class);
@@ -323,7 +321,7 @@ public function testSwitchUserStateless()
         $this->tokenStorage->setToken($token);
         $this->request->query->set('_switch_user', 'kuba');
 
-        $targetsUser = $this->callback(function ($user) { return 'kuba' === $user->getUserIdentifier(); });
+        $targetsUser = $this->callback(fn ($user) => 'kuba' === $user->getUserIdentifier());
         $this->accessDecisionManager->expects($this->once())
             ->method('decide')->with($token, ['ROLE_ALLOWED_TO_SWITCH'], $targetsUser)
             ->willReturn(true);
@@ -357,9 +355,7 @@ public function testSwitchUserRefreshesOriginalToken()
             ->expects($this->once())
             ->method('dispatch')
             ->with(
-                $this->callback(function (SwitchUserEvent $event) use ($refreshedOriginalUser) {
-                    return $event->getToken()->getUser() === $refreshedOriginalUser;
-                }),
+                $this->callback(fn (SwitchUserEvent $event) => $event->getToken()->getUser() === $refreshedOriginalUser),
                 SecurityEvents::SWITCH_USER
             )
         ;
diff --git a/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php
index 52aaf89faea2e..e5cd1af774a48 100644
--- a/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php
@@ -61,15 +61,13 @@ public function testCreateLoginLink($user, array $extraProperties, Request $requ
             ->method('generate')
             ->with(
                 'app_check_login_link_route',
-                $this->callback(function ($parameters) use ($extraProperties) {
-                    return 'weaverryan' == $parameters['user']
-                        && isset($parameters['expires'])
-                        && isset($parameters['hash'])
-                         // allow a small expiration offset to avoid time-sensitivity
-                        && abs(time() + 600 - $parameters['expires']) <= 1
-                        // make sure hash is what we expect
-                        && $parameters['hash'] === $this->createSignatureHash('weaverryan', $parameters['expires'], array_values($extraProperties));
-                }),
+                $this->callback(fn ($parameters) => 'weaverryan' == $parameters['user']
+                    && isset($parameters['expires'])
+                    && isset($parameters['hash'])
+                     // allow a small expiration offset to avoid time-sensitivity
+                    && abs(time() + 600 - $parameters['expires']) <= 1
+                    // make sure hash is what we expect
+                    && $parameters['hash'] === $this->createSignatureHash('weaverryan', $parameters['expires'], array_values($extraProperties))),
                 UrlGeneratorInterface::ABSOLUTE_URL
             )
             ->willReturn('https://example.com/login/verify?user=weaverryan&hash=abchash&expires=1601235000');
@@ -120,15 +118,13 @@ public function testCreateLoginLinkWithLifetime()
             ->method('generate')
             ->with(
                 'app_check_login_link_route',
-                $this->callback(function ($parameters) use ($extraProperties) {
-                    return 'weaverryan' == $parameters['user']
-                        && isset($parameters['expires'])
-                         // allow a small expiration offset to avoid time-sensitivity
-                        && abs(time() + 1000 - $parameters['expires']) <= 1
-                        && isset($parameters['hash'])
-                        // make sure hash is what we expect
-                        && $parameters['hash'] === $this->createSignatureHash('weaverryan', $parameters['expires'], array_values($extraProperties));
-                }),
+                $this->callback(fn ($parameters) => 'weaverryan' == $parameters['user']
+                    && isset($parameters['expires'])
+                     // allow a small expiration offset to avoid time-sensitivity
+                    && abs(time() + 1000 - $parameters['expires']) <= 1
+                    && isset($parameters['hash'])
+                    // make sure hash is what we expect
+                    && $parameters['hash'] === $this->createSignatureHash('weaverryan', $parameters['expires'], array_values($extraProperties))),
                 UrlGeneratorInterface::ABSOLUTE_URL
             )
             ->willReturn('https://example.com/login/verify?user=weaverryan&hash=abchash&expires=1654244256');
diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php
index 4e2c0980ba0aa..03f2c1dcc298e 100644
--- a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php
@@ -49,11 +49,9 @@ public function testCreateRememberMeCookie()
     {
         $this->tokenProvider->expects($this->once())
             ->method('createNewToken')
-            ->with($this->callback(function ($persistentToken) {
-                return $persistentToken instanceof PersistentToken
-                    && 'wouter' === $persistentToken->getUserIdentifier()
-                    && InMemoryUser::class === $persistentToken->getClass();
-            }));
+            ->with($this->callback(fn ($persistentToken) => $persistentToken instanceof PersistentToken
+                && 'wouter' === $persistentToken->getUserIdentifier()
+                && InMemoryUser::class === $persistentToken->getClass()));
 
         $this->handler->createRememberMeCookie(new InMemoryUser('wouter', null));
     }
diff --git a/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php b/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
index 14c2e8a28ca7d..de34f5b57d2c9 100644
--- a/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
+++ b/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
@@ -42,9 +42,7 @@ public function normalize(string $propertyName): string
 
     public function denormalize(string $propertyName): string
     {
-        $camelCasedName = preg_replace_callback('/(^|_|\.)+(.)/', function ($match) {
-            return ('.' === $match[1] ? '_' : '').strtoupper($match[2]);
-        }, $propertyName);
+        $camelCasedName = preg_replace_callback('/(^|_|\.)+(.)/', fn ($match) => ('.' === $match[1] ? '_' : '').strtoupper($match[2]), $propertyName);
 
         if ($this->lowerCamelCase) {
             $camelCasedName = lcfirst($camelCasedName);
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index b949193e4312b..37d3204aadf9b 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -44,9 +44,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
 
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
 
-        $this->objectClassResolver = $objectClassResolver ?? function ($class) {
-            return \is_object($class) ? $class::class : $class;
-        };
+        $this->objectClassResolver = $objectClassResolver ?? fn ($class) => \is_object($class) ? $class::class : $class;
     }
 
     public function hasCacheableSupportsMethod(): bool
diff --git a/src/Symfony/Component/Serializer/Tests/Annotation/ContextTest.php b/src/Symfony/Component/Serializer/Tests/Annotation/ContextTest.php
index 9d5dd0098e42c..6b3a3f0c7ec5d 100644
--- a/src/Symfony/Component/Serializer/Tests/Annotation/ContextTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Annotation/ContextTest.php
@@ -76,7 +76,7 @@ public function testValidInputs(callable $factory, string $expectedDump)
     public function provideValidInputs(): iterable
     {
         yield 'named arguments: with context option' => [
-            function () { return new Context(context: ['foo' => 'bar']); },
+            fn () => new Context(context: ['foo' => 'bar']),
             <<<DUMP
 Symfony\Component\Serializer\Annotation\Context {
   -groups: []
@@ -90,7 +90,7 @@ function () { return new Context(context: ['foo' => 'bar']); },
         ];
 
         yield 'named arguments: with normalization context option' => [
-            function () { return new Context(normalizationContext: ['foo' => 'bar']); },
+            fn () => new Context(normalizationContext: ['foo' => 'bar']),
             <<<DUMP
 Symfony\Component\Serializer\Annotation\Context {
   -groups: []
@@ -104,7 +104,7 @@ function () { return new Context(normalizationContext: ['foo' => 'bar']); },
         ];
 
         yield 'named arguments: with denormalization context option' => [
-            function () { return new Context(denormalizationContext: ['foo' => 'bar']); },
+            fn () => new Context(denormalizationContext: ['foo' => 'bar']),
             <<<DUMP
 Symfony\Component\Serializer\Annotation\Context {
   -groups: []
@@ -118,7 +118,7 @@ function () { return new Context(denormalizationContext: ['foo' => 'bar']); },
         ];
 
         yield 'named arguments: with groups option as string' => [
-            function () { return new Context(context: ['foo' => 'bar'], groups: 'a'); },
+            fn () => new Context(context: ['foo' => 'bar'], groups: 'a'),
             <<<DUMP
 Symfony\Component\Serializer\Annotation\Context {
   -groups: [
@@ -134,7 +134,7 @@ function () { return new Context(context: ['foo' => 'bar'], groups: 'a'); },
         ];
 
         yield 'named arguemnts: with groups option as array' => [
-            function () { return new Context(context: ['foo' => 'bar'], groups: ['a', 'b']); },
+            fn () => new Context(context: ['foo' => 'bar'], groups: ['a', 'b']),
             <<<DUMP
 Symfony\Component\Serializer\Annotation\Context {
   -groups: [
diff --git a/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php b/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php
index 6cd01bbc17540..f0663c08e4202 100644
--- a/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php
+++ b/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php
@@ -58,9 +58,7 @@ public function testNormalizeWithFallback($propertyName, $expected)
         $fallback = $this->createMock(NameConverterInterface::class);
         $fallback
             ->method('normalize')
-            ->willReturnCallback(function ($propertyName) {
-                return strtoupper($propertyName);
-            })
+            ->willReturnCallback(strtoupper(...))
         ;
 
         $nameConverter = new MetadataAwareNameConverter($classMetadataFactory, $fallback);
@@ -90,9 +88,7 @@ public function testDenormalizeWithFallback($expected, $propertyName)
         $fallback = $this->createMock(NameConverterInterface::class);
         $fallback
             ->method('denormalize')
-            ->willReturnCallback(function ($propertyName) {
-                return strtolower($propertyName);
-            })
+            ->willReturnCallback(strtolower(...))
         ;
 
         $nameConverter = new MetadataAwareNameConverter($classMetadataFactory, $fallback);
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php
index a8ef81bb660a9..e9a9721fda749 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/CallbacksTestTrait.php
@@ -180,9 +180,7 @@ public function provideNormalizeCallbacks()
             ],
             'Count a property' => [
                 [
-                    'bar' => function (array $bars) {
-                        return \count($bars);
-                    },
+                    'bar' => fn (array $bars) => \count($bars),
                 ],
                 [new CallbacksObject(), new CallbacksObject()],
                 ['bar' => 2, 'foo' => null],
@@ -244,9 +242,7 @@ public function provideDenormalizeCallbacks(): array
             ],
             'Count a property' => [
                 [
-                    'bar' => function (array $bars) {
-                        return \count($bars);
-                    },
+                    'bar' => fn (array $bars) => \count($bars),
                 ],
                 [new CallbacksObject(), new CallbacksObject()],
                 new CallbacksObject(2),
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
index 396a2a04b497b..47747c6dbf645 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -826,9 +826,7 @@ public function testDefaultObjectClassResolver()
 
     public function testObjectClassResolver()
     {
-        $classResolver = function ($object) {
-            return ObjectDummy::class;
-        };
+        $classResolver = fn ($object) => ObjectDummy::class;
 
         $normalizer = new ObjectNormalizer(null, null, null, null, null, $classResolver);
 
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
index 255abb3864b1d..eed0c3290c969 100644
--- a/src/Symfony/Component/Serializer/Tests/SerializerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -154,9 +154,7 @@ public function testNormalizeWithSupportOnData()
     {
         $normalizer1 = $this->createMock(NormalizerInterface::class);
         $normalizer1->method('supportsNormalization')
-            ->willReturnCallback(function ($data, $format) {
-                return isset($data->test);
-            });
+            ->willReturnCallback(fn ($data, $format) => isset($data->test));
         $normalizer1->method('normalize')->willReturn('test1');
 
         $normalizer2 = $this->createMock(NormalizerInterface::class);
@@ -177,9 +175,7 @@ public function testDenormalizeWithSupportOnData()
     {
         $denormalizer1 = $this->createMock(DenormalizerInterface::class);
         $denormalizer1->method('supportsDenormalization')
-            ->willReturnCallback(function ($data, $type, $format) {
-                return isset($data['test1']);
-            });
+            ->willReturnCallback(fn ($data, $type, $format) => isset($data['test1']));
         $denormalizer1->method('denormalize')->willReturn('test1');
 
         $denormalizer2 = $this->createMock(DenormalizerInterface::class);
@@ -898,15 +894,13 @@ public function testCollectDenormalizationErrors(?ClassMetadataFactory $classMet
 
         $this->assertInstanceOf(Php74Full::class, $th->getData());
 
-        $exceptionsAsArray = array_map(function (NotNormalizableValueException $e): array {
-            return [
-                'currentType' => $e->getCurrentType(),
-                'expectedTypes' => $e->getExpectedTypes(),
-                'path' => $e->getPath(),
-                'useMessageForUser' => $e->canUseMessageForUser(),
-                'message' => $e->getMessage(),
-            ];
-        }, $th->getErrors());
+        $exceptionsAsArray = array_map(fn (NotNormalizableValueException $e): array => [
+            'currentType' => $e->getCurrentType(),
+            'expectedTypes' => $e->getExpectedTypes(),
+            'path' => $e->getPath(),
+            'useMessageForUser' => $e->canUseMessageForUser(),
+            'message' => $e->getMessage(),
+        ], $th->getErrors());
 
         $expected = [
             [
@@ -1096,15 +1090,13 @@ public function testCollectDenormalizationErrors2(?ClassMetadataFactory $classMe
         $this->assertInstanceOf(Php74Full::class, $th->getData()[0]);
         $this->assertInstanceOf(Php74Full::class, $th->getData()[1]);
 
-        $exceptionsAsArray = array_map(function (NotNormalizableValueException $e): array {
-            return [
-                'currentType' => $e->getCurrentType(),
-                'expectedTypes' => $e->getExpectedTypes(),
-                'path' => $e->getPath(),
-                'useMessageForUser' => $e->canUseMessageForUser(),
-                'message' => $e->getMessage(),
-            ];
-        }, $th->getErrors());
+        $exceptionsAsArray = array_map(fn (NotNormalizableValueException $e): array => [
+          
57AE
  'currentType' => $e->getCurrentType(),
+            'expectedTypes' => $e->getExpectedTypes(),
+            'path' => $e->getPath(),
+            'useMessageForUser' => $e->canUseMessageForUser(),
+            'message' => $e->getMessage(),
+        ], $th->getErrors());
 
         $expected = [
             [
@@ -1158,15 +1150,13 @@ public function testCollectDenormalizationErrorsWithConstructor(?ClassMetadataFa
 
         $this->assertInstanceOf(Php80WithPromotedTypedConstructor::class, $th->getData());
 
-        $exceptionsAsArray = array_map(function (NotNormalizableValueException $e): array {
-            return [
-                'currentType' => $e->getCurrentType(),
-                'expectedTypes' => $e->getExpectedTypes(),
-                'path' => $e->getPath(),
-                'useMessageForUser' => $e->canUseMessageForUser(),
-                'message' => $e->getMessage(),
-            ];
-        }, $th->getErrors());
+        $exceptionsAsArray = array_map(fn (NotNormalizableValueException $e): array => [
+            'currentType' => $e->getCurrentType(),
+            'expectedTypes' => $e->getExpectedTypes(),
+            'path' => $e->getPath(),
+            'useMessageForUser' => $e->canUseMessageForUser(),
+            'message' => $e->getMessage(),
+        ], $th->getErrors());
 
         $expected = [
             [
@@ -1201,13 +1191,11 @@ public function testCollectDenormalizationErrorsWithEnumConstructor()
             $this->assertInstanceOf(PartialDenormalizationException::class, $th);
         }
 
-        $exceptionsAsArray = array_map(function (NotNormalizableValueException $e): array {
-            return [
-                'currentType' => $e->getCurrentType(),
-                'useMessageForUser' => $e->canUseMessageForUser(),
-                'message' => $e->getMessage(),
-            ];
-        }, $th->getErrors());
+        $exceptionsAsArray = array_map(fn (NotNormalizableValueException $e): array => [
+            'currentType' => $e->getCurrentType(),
+            'useMessageForUser' => $e->canUseMessageForUser(),
+            'message' => $e->getMessage(),
+        ], $th->getErrors());
 
         $expected = [
             [
diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/AbstractUnicodeString.php
index 52912276f174f..0d8db3a2757e5 100644
--- a/src/Symfony/Component/String/AbstractUnicodeString.php
+++ b/src/Symfony/Component/String/AbstractUnicodeString.php
@@ -360,9 +360,7 @@ public function title(bool $allWords = false): static
 
         $limit = $allWords ? -1 : 1;
 
-        $str->string = preg_replace_callback('/\b./u', static function (array $m): string {
-            return mb_convert_case($m[0], \MB_CASE_TITLE, 'UTF-8');
-        }, $str->string, $limit);
+        $str->string = preg_replace_callback('/\b./u', static fn (array $m): string => mb_convert_case($m[0], \MB_CASE_TITLE, 'UTF-8'), $str->string, $limit);
 
         return $str;
     }
diff --git a/src/Symfony/Component/String/Resources/WcswidthDataGenerator.php b/src/Symfony/Component/String/Resources/WcswidthDataGenerator.php
index 10e68d92f9f04..0526da166e72f 100644
--- a/src/Symfony/Component/String/Resources/WcswidthDataGenerator.php
+++ b/src/Symfony/Component/String/Resources/WcswidthDataGenerator.php
@@ -104,9 +104,7 @@ private function format(array $rawData): array
             return [hexdec($start), hexdec($end)];
         }, $rawData);
 
-        usort($data, static function (array $a, array $b): int {
-            return $a[0] - $b[0];
-        });
+        usort($data, static fn (array $a, array $b): int => $a[0] - $b[0]);
 
         return $data;
     }
diff --git a/src/Symfony/Component/String/Slugger/AsciiSlugger.php b/src/Symfony/Component/String/Slugger/AsciiSlugger.php
index 826d07ca09e0c..a573888ce2176 100644
--- a/src/Symfony/Component/String/Slugger/AsciiSlugger.php
+++ b/src/Symfony/Component/String/Slugger/AsciiSlugger.php
@@ -121,9 +121,7 @@ public function slug(string $string, string $separator = '-', string $locale = n
             // If the symbols map is passed as a closure, there is no need to fallback to the parent locale
             // as the closure can just provide substitutions for all locales of interest.
             $symbolsMap = $this->symbolsMap;
-            array_unshift($transliterator, static function ($s) use ($symbolsMap, $locale) {
-                return $symbolsMap($s, $locale);
-            });
+            array_unshift($transliterator, static fn ($s) => $symbolsMap($s, $locale));
         }
 
         $unicodeString = (new UnicodeString($string))->ascii($transliterator);
diff --git a/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php b/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php
index a0cf2068f9476..2801daa2afdf0 100644
--- a/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php
+++ b/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php
@@ -993,9 +993,7 @@ public static function provideReplaceMatches()
             ['April,15,2003', 'April 15, 2003', '/(\w+) (\d+), (\d+)/i', '${1},$2,$3'],
             ['5/27/1999', '1999-5-27', '/(19|20)(\d{2})-(\d{1,2})-(\d{1,2})/', '\3/\4/\1\2'],
             ['Copyright 2000', 'Copyright 1999', '([0-9]+)', '2000'],
-            ['hello world! this is a test', 'HELLO WORLD! THIS is a test', '/\b([A-Z]+)\b/', function ($word) {
-                return strtolower($word[1]);
-            }],
+            ['hello world! this is a test', 'HELLO WORLD! THIS is a test', '/\b([A-Z]+)\b/', fn ($word) => strtolower($word[1])],
             ['COPYRIGHT 1999', 'Copyright 1999', '/[a-z]/', function ($matches) {
                 foreach ($matches as $match) {
                     return strtoupper($match);
diff --git a/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php b/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php
index d8f71ffd93d6a..1ed16bca1cd6a 100644
--- a/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php
+++ b/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php
@@ -44,9 +44,7 @@ public function testAscii()
 
     public function testAsciiClosureRule()
     {
-        $rule = function ($c) {
-            return str_replace('ö', 'OE', $c);
-        };
+        $rule = fn ($c) => str_replace('ö', 'OE', $c);
 
         $s = static::createFromString('Dieser Wert sollte größer oder gleich');
         $this->assertSame('Dieser Wert sollte grOEsser oder gleich', (string) $s->ascii([$rule]));
diff --git a/src/Symfony/Component/String/Tests/LazyStringTest.php b/src/Symfony/Component/String/Tests/LazyStringTest.php
index c311a3be9ff06..1c7540234bec6 100644
--- a/src/Symfony/Component/String/Tests/LazyStringTest.php
+++ b/src/Symfony/Component/String/Tests/LazyStringTest.php
@@ -29,6 +29,21 @@ public function testLazyString()
         $this->assertSame(1, $count);
     }
 
+    /**
+     * @runInSeparateProcess
+     */
+    public function testReturnTypeError()
+    {
+        ErrorHandler::register();
+
+        $s = LazyString::fromCallable(fn () => []);
+
+        $this->expectException(\TypeError::class);
+        $this->expectExceptionMessage('Return value of '.__NAMESPACE__.'\{closure}() passed to '.LazyString::class.'::fromCallable() must be of the type string, array returned.');
+
+        (string) $s;
+    }
+
     public function testLazyCallable()
     {
         $count = 0;
@@ -55,21 +70,6 @@ public function __invoke()
         $this->assertSame(1, $count);
     }
 
-    /**
-     * @runInSeparateProcess
-     */
-    public function testReturnTypeError()
-    {
-        ErrorHandler::register();
-
-        $s = LazyString::fromCallable(function () { return []; });
-
-        $this->expectException(\TypeError::class);
-        $this->expectExceptionMessage('Return value of '.__NAMESPACE__.'\{closure}() passed to '.LazyString::class.'::fromCallable() must be of the type string, array returned.');
-
-        (string) $s;
-    }
-
     public function testFromStringable()
     {
         $this->assertInstanceOf(LazyString::class, LazyString::fromStringable('abc'));
diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php
index 15dfdb5e1e4d4..b1ccfcd8819f8 100644
--- a/src/Symfony/Component/Templating/PhpEngine.php
+++ b/src/Symfony/Component/Templating/PhpEngine.php
@@ -364,11 +364,9 @@ protected function initializeEscapers()
                  *
                  * @return string
                  */
-                function ($value) use ($flags) {
-                    // Numbers and Boolean values get turned into strings which can cause problems
-                    // with type comparisons (e.g. === or is_int() etc).
-                    return \is_string($value) ? htmlspecialchars($value, $flags, $this->getCharset(), false) : $value;
-                },
+                fn ($value) => // Numbers and Boolean values get turned into strings which can cause problems
+// with type comparisons (e.g. === or is_int() etc).
+\is_string($value) ? htmlspecialchars($value, $flags, $this->getCharset(), false) : $value,
 
             'js' =>
                 /**
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
index 466584a3363a7..f43a825eb8993 100644
--- a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
+++ b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php
@@ -217,9 +217,7 @@ private function getAssetsIds(string $domain): array
             }
         }
 
-        return array_map(function ($asset) {
-            return $asset['id'];
-        }, $response->toArray(false));
+        return array_map(fn ($asset) => $asset['id'], $response->toArray(false));
     }
 
     private function createAssets(array $keys, string $domain): array
diff --git a/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php b/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php
index 7c9e64cae1b4a..e4f9b20cf1722 100644
--- a/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php
+++ b/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php
@@ -356,9 +356,7 @@ private function createLanguages(array $languages): void
     {
         $response = $this->client->request('POST', 'languages', [
             'json' => [
-                'languages' => array_map(static function ($language) {
-                    return ['lang_iso' => $language];
-                }, $languages),
+                'languages' => array_map(static fn ($language) => ['lang_iso' => $language], $languages),
             ],
         ]);
 
diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
index 1e5f26c618503..59a5c581299ea 100644
--- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php
+++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
@@ -228,12 +228,10 @@ private function getFiles(string $fileOrDirectory)
 
     private function getDirectoryIterator(string $directory)
     {
-        $default = function ($directory) {
-            return new \RecursiveIteratorIterator(
-                new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
-                \RecursiveIteratorIterator::LEAVES_ONLY
-            );
-        };
+        $default = fn ($directory) => new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
+            \RecursiveIteratorIterator::LEAVES_ONLY
+        );
 
         if (null !== $this->directoryIteratorProvider) {
             return ($this->directoryIteratorProvider)($directory, $default);
@@ -244,9 +242,7 @@ private function getDirectoryIterator(string $directory)
 
     private function isReadable(string $fileOrDirectory)
     {
-        $default = function ($fileOrDirectory) {
-            return is_readable($fileOrDirectory);
-        };
+        $default = fn ($fileOrDirectory) => is_readable($fileOrDirectory);
 
         if (null !== $this->isReadableProvider) {
             return ($this->isReadableProvider)($fileOrDirectory, $default);
diff --git a/src/Symfony/Component/Translation/Resources/bin/translation-status.php b/src/Symfony/Component/Translation/Resources/bin/translation-status.php
index 4fe814cf6522d..21ef604723a84 100644
--- a/src/Symfony/Component/Translation/Resources/bin/translation-status.php
+++ b/src/Symfony/Component/Translation/Resources/bin/translation-status.php
@@ -87,12 +87,8 @@
     $translationFilePaths = findTranslationFiles($originalFilePath, $config['locale_to_analyze']);
     $translationStatus = calculateTranslationStatus($originalFilePath, $translationFilePaths);
 
-    $totalMissingTranslations += array_sum(array_map(function ($translation) {
-        return count($translation['missingKeys']);
-    }, array_values($translationStatus)));
-    $totalTranslationMismatches += array_sum(array_map(function ($translation) {
-        return count($translation['mismatches']);
-    }, array_values($translationStatus)));
+    $totalMissingTranslations += array_sum(array_map(fn ($translation) => count($translation['missingKeys']), array_values($translationStatus)));
+    $totalTranslationMismatches += array_sum(array_map(fn ($translation) => count($translation['mismatches']), array_values($translationStatus)));
 
     printTranslationStatus($originalFilePath, $translationStatus, $config['verbose_output'], $config['include_completed_languages']);
 }
diff --git a/src/Symfony/Component/Translation/TranslatableMessage.php b/src/Symfony/Component/Translation/TranslatableMessage.php
index b1a3b6b137e4d..91d4c194168ce 100644
--- a/src/Symfony/Component/Translation/TranslatableMessage.php
+++ b/src/Symfony/Component/Translation/TranslatableMessage.php
@@ -53,9 +53,7 @@ public function getDomain(): ?string
     public function trans(TranslatorInterface $translator, string $locale = null): string
     {
         return $translator->trans($this->getMessage(), array_map(
-            static function ($parameter) use ($translator, $locale) {
-                return $parameter instanceof TranslatableInterface ? $parameter->trans($translator, $locale) : $parameter;
-            },
+            static fn ($parameter) => $parameter instanceof TranslatableInterface ? $parameter->trans($translator, $locale) : $parameter,
             $this->getParameters()
         ), $this->getDomain(), $locale);
     }
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
index a9344dddff574..08eba7f51dab2 100644
--- a/src/Symfony/Component/Translation/Translator.php
+++ b/src/Symfony/Component/Translation/Translator.php
@@ -178,9 +178,7 @@ public function trans(?string $id, array $parameters = [], string $domain = null
             }
         }
 
-        $parameters = array_map(function ($parameter) use ($locale) {
-            return $parameter instanceof TranslatableInterface ? $parameter->trans($this, $locale) : $parameter;
-        }, $parameters);
+        $parameters = array_map(fn ($parameter) => $parameter instanceof TranslatableInterface ? $parameter->trans($this, $locale) : $parameter, $parameters);
 
         $len = \strlen(MessageCatalogue::INTL_DOMAIN_SUFFIX);
         if ($this->hasIntlFormatter
diff --git a/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php b/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php
index eed0e5109346b..b8b6a6cda7ec4 100644
--- a/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php
+++ b/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php
@@ -132,9 +132,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                     return 1;
                 }
 
-                $create = function () use ($node, $time): Uuid {
-                    return $this->factory->timeBased($node)->create(new \DateTimeImmutable($time));
-                };
+                $create = fn (): Uuid => $this->factory->timeBased($node)->create(new \DateTimeImmutable($time));
                 break;
 
             case null !== $name:
diff --git a/src/Symfony/Component/Uid/Tests/UuidTest.php b/src/Symfony/Component/Uid/Tests/UuidTest.php
index 3ac925aa4194a..5e2f2b1e70e26 100644
--- a/src/Symfony/Component/Uid/Tests/UuidTest.php
+++ b/src/Symfony/Component/Uid/Tests/UuidTest.php
@@ -240,9 +240,7 @@ public function testCompare()
 
         $this->assertNotSame([$a, $b, $c, $d], $uuids);
 
-        usort($uuids, static function (Uuid $a, Uuid $b): int {
-            return $a->compare($b);
-        });
+        usort($uuids, static fn (Uuid $a, Uuid $b): int => $a->compare($b));
 
         $this->assertSame([$a, $b, $c, $d], $uuids);
     }
diff --git a/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php b/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
index 67134b6a5b361..02d56c801d9c6 100644
--- a/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
@@ -51,9 +51,7 @@ public function validate(mixed $value, Constraint $constraint)
         }
 
         if (str_ends_with($constraint->format, '+')) {
-            $errors['warnings'] = array_filter($errors['warnings'], function ($warning) {
-                return 'Trailing data' !== $warning;
-            });
+            $errors['warnings'] = array_filter($errors['warnings'], fn ($warning) => 'Trailing data' !== $warning);
         }
 
         foreach ($errors['warnings'] as $warning) {
diff --git a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
index 7427a5042593d..35fdf710ba32a 100644
--- a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
@@ -111,9 +111,7 @@ private static function getIntlTimezones(int $zone, string $countryCode = null):
                 continue;
             }
 
-            $filtered[] = array_filter($timezones, static function ($id) use ($const) {
-                return 0 === stripos($id, $const.'/');
-            });
+            $filtered[] = array_filter($timezones, static fn ($id) => 0 === stripos($id, $const.'/'));
         }
 
         return $filtered ? array_merge(...$filtered) : [];
diff --git a/src/Symfony/Component/Validator/Constraints/UniqueValidator.php b/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
index de2edce631837..8948500f3a78b 100644
--- a/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
@@ -61,9 +61,7 @@ public function validate(mixed $value, Constraint $constraint)
     private function getNormalizer(Unique $unique): callable
     {
         if (null === $unique->normalizer) {
-            return static function ($value) {
-                return $value;
-            };
+            return static fn ($value) => $value;
         }
 
         return $unique->normalizer;
diff --git a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
index acad1a1cccbff..e787112764084 100644
--- a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
+++ b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
@@ -54,9 +54,7 @@ public function lateCollect()
     {
         $collected = $this->validator->getCollectedData();
         $this->data['calls'] = $this->cloneVar($collected);
-        $this->data['violations_count'] = array_reduce($collected, function ($previous, $item) {
-            return $previous + \count($item['violations']);
-        }, 0);
+        $this->data['violations_count'] = array_reduce($collected, fn ($previous, $item) => $previous + \count($item['violations']), 0);
     }
 
     public function getCalls(): Data
@@ -87,13 +85,11 @@ protected function getCasters(): array
 
                 return $a;
             },
-            FormInterface::class => function (FormInterface $f, array $a) {
-                return [
-                    Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
-                    Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub($f->getConfig()->getType()->getInnerType()::class),
-                    Caster::PREFIX_VIRTUAL.'data' => $f->getData(),
-                ];
-            },
+            FormInterface::class => fn (FormInterface $f, array $a) => [
+                Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
+                Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub($f->getConfig()->getType()->getInnerType()::class),
+                Caster::PREFIX_VIRTUAL.'data' => $f->getData(),
+            ],
         ];
     }
 }
diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
index d9bb9bd3906d7..19dcb2ab18f5f 100644
--- a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
+++ b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
@@ -124,9 +124,7 @@ protected function createContext()
         $validator = $this->createMock(ValidatorInterface::class);
         $validator->expects($this->any())
             ->method('validate')
-            ->willReturnCallback(function () {
-                return $this->expectedViolations[$this->call++] ?? new ConstraintViolationList();
-            });
+            ->willReturnCallback(fn () => $this->expectedViolations[$this->call++] ?? new ConstraintViolationList());
 
         $context = new ExecutionContext($validator, $this->root, $translator);
         $context->setGroup($this->group);
@@ -145,29 +143,19 @@ protected function createContext()
             ->getMock();
         $contextualValidator->expects($this->any())
             ->method('atPath')
-            ->willReturnCallback(function ($path) use ($contextualValidator) {
-                return $contextualValidator->doAtPath($path);
-            });
+            ->willRet
B41A
urnCallback(fn ($path) => $contextualValidator->doAtPath($path));
         $contextualValidator->expects($this->any())
             ->method('validate')
-            ->willReturnCallback(function ($value, $constraints = null, $groups = null) use ($contextualValidator) {
-                return $contextualValidator->doValidate($value, $constraints, $groups);
-            });
+            ->willReturnCallback(fn ($value, $constraints = null, $groups = null) => $contextualValidator->doValidate($value, $constraints, $groups));
         $contextualValidator->expects($this->any())
             ->method('validateProperty')
-            ->willReturnCallback(function ($object, $propertyName, $groups = null) use ($contextualValidator) {
-                return $contextualValidator->validateProperty($object, $propertyName, $groups);
-            });
+            ->willReturnCallback(fn ($object, $propertyName, $groups = null) => $contextualValidator->validateProperty($object, $propertyName, $groups));
         $contextualValidator->expects($this->any())
             ->method('validatePropertyValue')
-            ->willReturnCallback(function ($objectOrClass, $propertyName, $value, $groups = null) use ($contextualValidator) {
-                return $contextualValidator->doValidatePropertyValue($objectOrClass, $propertyName, $value, $groups);
-            });
+            ->willReturnCallback(fn ($objectOrClass, $propertyName, $value, $groups = null) => $contextualValidator->doValidatePropertyValue($objectOrClass, $propertyName, $value, $groups));
         $contextualValidator->expects($this->any())
             ->method('getViolations')
-            ->willReturnCallback(function () use ($contextualValidator) {
-                return $contextualValidator->doGetViolations();
-            });
+            ->willReturnCallback(fn () => $contextualValidator->doGetViolations());
         $validator->expects($this->any())
             ->method('inContext')
             ->with($context)
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
index 38582d85d66f5..5514966d8e22b 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
@@ -106,9 +106,7 @@ public function provideConstraintsWithCallbackFunction(): iterable
     {
         yield 'doctrine style, namespaced function' => [new Choice(['callback' => __NAMESPACE__.'\choice_callback'])];
         yield 'doctrine style, closure' => [new Choice([
-            'callback' => function () {
-                return ['foo', 'bar'];
-            },
+            'callback' => fn () => ['foo', 'bar'],
         ])];
         yield 'doctrine style, static method' => [new Choice(['callback' => [__CLASS__, 'staticCallback']])];
         yield 'named arguments, namespaced function' => [new Choice(callback: __NAMESPACE__.'\choice_callback')];
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php
index eeaa6f8cdfa26..f392976ee0b0a 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php
@@ -157,9 +157,7 @@ public function testExpectsNonUniqueObjects($callback)
     public function getCallback(): array
     {
         return [
-            'static function' => [static function (\stdClass $object) {
-                return [$object->name, $object->email];
-            }],
+            'static function' => [static fn (\stdClass $object) => [$object->name, $object->email]],
             'callable with string notation' => ['Symfony\Component\Validator\Tests\Constraints\CallableClass::execute'],
             'callable with static notation' => [[CallableClass::class, 'execute']],
             'callable with first-class callable notation' => [CallableClass::execute(...)],
@@ -182,9 +180,7 @@ public function testExpectsInvalidNonStrictComparison()
 
     public function testExpectsValidNonStrictComparison()
     {
-        $callback = static function ($item) {
-            return (int) $item;
-        };
+        $callback = static fn ($item) => (int) $item;
 
         $this->validator->validate([1, '2', 3, '4.0'], new Unique([
             'normalizer' => $callback,
@@ -195,9 +191,7 @@ public function testExpectsValidNonStrictComparison()
 
     public function testExpectsInvalidCaseInsensitiveComparison()
     {
-        $callback = static function ($item) {
-            return mb_strtolower($item);
-        };
+        $callback = static fn ($item) => mb_strtolower($item);
 
         $this->validator->validate(['Hello', 'hello', 'HELLO', 'hellO'], new Unique([
             'message' => 'myMessage',
@@ -212,9 +206,7 @@ public function testExpectsInvalidCaseInsensitiveComparison()
 
     public function testExpectsValidCaseInsensitiveComparison()
     {
-        $callback = static function ($item) {
-            return mb_strtolower($item);
-        };
+        $callback = static fn ($item) => mb_strtolower($item);
 
         $this->validator->validate(['Hello', 'World'], new Unique([
             'normalizer' => $callback,
diff --git a/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php b/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php
index 9997cda3aa97c..5765c548714e4 100644
--- a/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php
+++ b/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php
@@ -45,7 +45,7 @@ public function testTranslationFileIsValidWithoutEntityLoader($filePath)
     public function provideTranslationFiles()
     {
         return array_map(
-            function ($filePath) { return (array) $filePath; },
+            fn ($filePath) => (array) $filePath,
             glob(\dirname(__DIR__, 2).'/Resources/translations/*.xlf')
         );
     }
diff --git a/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php
index 8acfa597c2849..ae728b19cb6c0 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php
@@ -72,7 +72,7 @@ public function testForwardsToOriginalValidator()
         $originalValidator = $this->createMock(ValidatorInterface::class);
         $validator = new TraceableValidator($originalValidator);
 
-        $expects = function ($method) use ($originalValidator) { return $originalValidator->expects($this->once())->method($method); };
+        $expects = fn ($method) => $originalValidator->expects($this->once())->method($method);
 
         $expects('getMetadataFor')->willReturn($expected = $this->createMock(MetadataInterface::class));
         $this->assertSame($expected, $validator->getMetadataFor('value'), 'returns original validator getMetadataFor() result');
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
index b382f5519b908..2c6f1fec8059f 100644
--- a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
+++ b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -491,9 +491,7 @@ private function validateClassNode(object $object, ?string $cacheKey, ClassMetad
                 }
 
                 if ($propertyMetadata instanceof GetterMetadata) {
-                    $propertyValue = new LazyProperty(static function () use ($propertyMetadata, $object) {
-                        return $propertyMetadata->getPropertyValue($object);
-                    });
+                    $propertyValue = new LazyProperty(static fn () => $propertyMetadata->getPropertyValue($object));
                 } else {
                     $propertyValue = $propertyMetadata->getPropertyValue($object);
                 }
diff --git a/src/Symfony/Component/VarDumper/Caster/ClassStub.php b/src/Symfony/Component/VarDumper/Caster/ClassStub.php
index fb8377a0390e3..f27a17ce46e2e 100644
--- a/src/Symfony/Component/VarDumper/Caster/ClassStub.php
+++ b/src/Symfony/Component/VarDumper/Caster/ClassStub.php
@@ -56,9 +56,7 @@ public function __construct(string $identifier, callable|array|string $callable
             }
 
             if (str_contains($identifier, "@anonymous\0")) {
-                $this->value = $identifier = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {
-                    return class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0];
-                }, $identifier);
+                $this->value = $identifier = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $identifier);
             }
 
             if (null !== $callable && $r instanceof \ReflectionFunctionAbstract) {
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
index 14caf71f32d68..80a91ead0c4ec 100644
--- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -288,9 +288,7 @@ private static function filterExceptionArray(string $xClass, array $a, string $x
         unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']);
 
         if (isset($a[Caster::PREFIX_PROTECTED.'message']) && str_contains($a[Caster::PREFIX_PROTECTED.'message'], "@anonymous\0")) {
-            $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {
-                return class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0];
-            }, $a[Caster::PREFIX_PROTECTED.'message']);
+            $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $a[Caster::PREFIX_PROTECTED.'message']);
         }
 
         if (isset($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line'])) {
diff --git a/src/Symfony/Component/VarDumper/Tests/Cloner/VarClonerTest.php b/src/Symfony/Component/VarDumper/Tests/Cloner/VarClonerTest.php
index 36639ca91b58e..ad1796999e2d9 100644
--- a/src/Symfony/Component/VarDumper/Tests/Cloner/VarClonerTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Cloner/VarClonerTest.php
@@ -399,9 +399,7 @@ public function testJsonCast()
     public function testCaster()
     {
         $cloner = new VarCloner([
-            '*' => function ($obj, $array) {
-                return ['foo' => 123];
-            },
+            '*' => fn ($obj, $array) => ['foo' => 123],
             __CLASS__ => function ($obj, $array) {
                 ++$array['foo'];
 
diff --git a/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php b/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php
index 56fb218776259..6b1f543033e5a 100644
--- a/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Command/Descriptor/CliDescriptorTest.php
@@ -45,9 +45,7 @@ public function testDescribe(array $context, string $expectedOutput, bool $decor
     {
         $output = new BufferedOutput();
         $output->setDecorated($decorated);
-        $descriptor = new CliDescriptor(new CliDumper(function ($s) {
-            return $s;
-        }));
+        $descriptor = new CliDescriptor(new CliDumper(fn ($s) => $s));
 
         $descriptor->describe($output, new Data([[123]]), $context + ['timestamp' => 1544804268.3668], 1);
 
diff --git a/src/Symfony/Component/VarExporter/Internal/LazyObjectRegistry.php b/src/Symfony/Component/VarExporter/Internal/LazyObjectRegistry.php
index 2ce7df11b6741..cfcfd9b7affae 100644
--- a/src/Symfony/Component/VarExporter/Internal/LazyObjectRegistry.php
+++ b/src/Symfony/Component/VarExporter/Internal/LazyObjectRegistry.php
@@ -92,27 +92,23 @@ public static function getClassResetters($class)
 
     public static function getClassAccessors($class)
     {
-        return \Closure::bind(static function () {
-            return [
-                'get' => static function &($instance, $name, $readonly) {
-                    if (!$readonly) {
-                        return $instance->$name;
-                    }
-                    $value = $instance->$name;
-
-                    return $value;
-                },
-                'set' => static function ($instance, $name, $value) {
-                    $instance->$name = $value;
-                },
-                'isset' => static function ($instance, $name) {
-                    return isset($instance->$name);
-                },
-                'unset' => static function ($instance, $name) {
-                    unset($instance->$name);
-                },
-            ];
-        }, null, \Closure::class === $class ? null : $class)();
+        return \Closure::bind(static fn () => [
+            'get' => static function &($instance, $name, $readonly) {
+                if (!$readonly) {
+                    return $instance->$name;
+                }
+                $value = $instance->$name;
+
+                return $value;
+            },
+            'set' => static function ($instance, $name, $value) {
+                $instance->$name = $value;
+            },
+            'isset' => static fn ($instance, $name) => isset($instance->$name),
+            'unset' => static function ($instance, $name) {
+                unset($instance->$name);
+            },
+        ], null, \Closure::class === $class ? null : $class)();
     }
 
     public static function getParentMethods($class)
diff --git a/src/Symfony/Component/VarExporter/Tests/LazyGhostTraitTest.php b/src/Symfony/Component/VarExporter/Tests/LazyGhostTraitTest.php
index 3ef2a8c95c1c2..708c4113b0dde 100644
--- a/src/Symfony/Component/VarExporter/Tests/LazyGhostTraitTest.php
+++ b/src/Symfony/Component/VarExporter/Tests/LazyGhostTraitTest.php
@@ -244,9 +244,7 @@ public function testPartialInitialization()
 
     public function testPartialInitializationWithReset()
     {
-        $initializer = static function (ChildTestClass $instance, string $property, ?string $scope, mixed $default) {
-            return 234;
-        };
+        $initializer = static fn (ChildTestClass $instance, string $property, ?string $scope, mixed $default) => 234;
         $instance = ChildTestClass::createLazyGhost([
             'public' => $initializer,
             'publicReadonly' => $initializer,
@@ -278,9 +276,7 @@ public function testPartialInitializationWithReset()
 
     public function testPartialInitializationWithNastyPassByRef()
     {
-        $instance = ChildTestClass::createLazyGhost(['public' => function (ChildTestClass $instance, string &$property, ?string &$scope, mixed $default) {
-            return $property = $scope = 123;
-        }]);
+        $instance = ChildTestClass::createLazyGhost(['public' => fn (ChildTestClass $instance, string &$property, ?string &$scope, mixed $default) => $property = $scope = 123]);
 
         $this->assertSame(123, $instance->public);
     }
@@ -313,9 +309,7 @@ public function testReflectionPropertyGetValue()
     public function testFullPartialInitialization()
     {
         $counter = 0;
-        $initializer = static function (ChildTestClass $instance, string $property, ?string $scope, mixed $default) use (&$counter) {
-            return 234;
-        };
+        $initializer = static fn (ChildTestClass $instance, string $property, ?string $scope, mixed $default) => 234;
         $instance = ChildTestClass::createLazyGhost([
             'public' => $initializer,
             'publicReadonly' => $initializer,
diff --git a/src/Symfony/Component/VarExporter/Tests/LazyProxyTraitTest.php b/src/Symfony/Component/VarExporter/Tests/LazyProxyTraitTest.php
index 074934ae17991..d93492cfbabc9 100644
--- a/src/Symfony/Component/VarExporter/Tests/LazyProxyTraitTest.php
+++ b/src/Symfony/Component/VarExporter/Tests/LazyProxyTraitTest.php
@@ -176,18 +176,14 @@ public function testDynamicProperty()
 
     public function testStringMagicGet()
     {
-        $proxy = $this->createLazyProxy(StringMagicGetClass::class, function () {
-            return new StringMagicGetClass();
-        });
+        $proxy = $this->createLazyProxy(StringMagicGetClass::class, fn () => new StringMagicGetClass());
 
         $this->assertSame('abc', $proxy->abc);
     }
 
     public function testFinalPublicClass()
     {
-        $proxy = $this->createLazyProxy(FinalPublicClass::class, function () {
-            return new FinalPublicClass();
-        });
+        $proxy = $this->createLazyProxy(FinalPublicClass::class, fn () => new FinalPublicClass());
 
         $this->assertSame(1, $proxy->increment());
         $this->assertSame(2, $proxy->increment());
diff --git a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
index 6fb43077bb7a4..91957a4204ffe 100644
--- a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
+++ b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
@@ -26,15 +26,9 @@ protected function registerFunctions()
     {
         parent::registerFunctions();
 
-        $this->register('is_granted', function ($attributes, $object = 'null') {
-            return sprintf('$auth_checker->isGranted(%s, %s)', $attributes, $object);
-        }, function (array $variables, $attributes, $object = null) {
-            return $variables['auth_checker']->isGranted($attributes, $object);
-        });
+        $this->register('is_granted', fn ($attributes, $object = 'null') => sprintf('$auth_checker->isGranted(%s, %s)', $attributes, $object), fn (array $variables, $attributes, $object = null) => $variables['auth_checker']->isGranted($attributes, $object));
 
-        $this->register('is_valid', function ($object = 'null', $groups = 'null') {
-            return sprintf('0 === count($validator->validate(%s, null, %s))', $object, $groups);
-        }, function (array $variables, $object = null, $groups = null) {
+        $this->register('is_valid', fn ($object = 'null', $groups = 'null') => sprintf('0 === count($validator->validate(%s, null, %s))', $object, $groups), function (array $variables, $object = null, $groups = null) {
             if (!$variables['validator'] instanceof ValidatorInterface) {
                 throw new RuntimeException('"is_valid" cannot be used as the Validator component is not installed.');
             }
diff --git a/src/Symfony/Component/Workflow/Registry.php b/src/Symfony/Component/Workflow/Registry.php
index a9c21af18a906..9f3171f937cd4 100644
--- a/src/Symfony/Component/Workflow/Registry.php
+++ b/src/Symfony/Component/Workflow/Registry.php
@@ -55,9 +55,7 @@ public function get(object $subject, string $workflowName = null): Workflow
         }
 
         if (2 <= \count($matched)) {
-            $names = array_map(static function (WorkflowInterface $workflow): string {
-                return $workflow->getName();
-            }, $matched);
+            $names = array_map(static fn (WorkflowInterface $workflow): string => $workflow->getName(), $matched);
 
             throw new InvalidArgumentException(sprintf('Too many workflows (%s) match this subject (%s); set a different name on each and use the second (name) argument of this method.', implode(', ', $names), get_debug_type($subject)));
         }
diff --git a/src/Symfony/Component/Workflow/Tests/RegistryTest.php b/src/Symfony/Component/Workflow/Tests/RegistryTest.php
index a0d9c0d1f1991..cf3ee8c14a924 100644
--- a/src/Symfony/Component/Workflow/Tests/RegistryTest.php
+++ b/src/Symfony/Component/Workflow/Tests/RegistryTest.php
@@ -112,9 +112,7 @@ private function createWorkflowSupportStrategy($supportedClassName)
     {
         $strategy = $this->createMock(WorkflowSupportStrategyInterface::class);
         $strategy->expects($this->any())->method('supports')
-            ->willReturnCallback(function ($workflow, $subject) use ($supportedClassName) {
-                return $subject instanceof $supportedClassName;
-            });
+            ->willReturnCallback(fn ($workflow, $subject) => $subject instanceof $supportedClassName);
 
         return $strategy;
     }
diff --git a/src/Symfony/Component/Yaml/Command/LintCommand.php b/src/Symfony/Component/Yaml/Command/LintCommand.php
index 19a0af08c11f0..565a276fdbdb8 100644
--- a/src/Symfony/Component/Yaml/Command/LintCommand.php
+++ b/src/Symfony/Component/Yaml/Command/LintCommand.php
@@ -240,12 +240,10 @@ private function getParser(): Parser
 
     private function getDirectoryIterator(string $directory): iterable
     {
-        $default = function ($directory) {
-            return new \RecursiveIteratorIterator(
-                new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
-                \RecursiveIteratorIterator::LEAVES_ONLY
-            );
-        };
+        $default = fn ($directory) => new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
+            \RecursiveIteratorIterator::LEAVES_ONLY
+        );
 
         if (null !== $this->directoryIteratorProvider) {
             return ($this->directoryIteratorProvider)($directory, $default);
@@ -256,9 +254,7 @@ private function getDirectoryIterator(string $directory): iterable
 
     private function isReadable(string $fileOrDirectory): bool
     {
-        $default = function ($fileOrDirectory) {
-            return is_readable($fileOrDirectory);
-        };
+        $default = is_readable(...);
 
         if (null !== $this->isReadableProvider) {
             return ($this->isReadableProvider)($fileOrDirectory, $default);
diff --git a/src/Symfony/Component/Yaml/Unescaper.php b/src/Symfony/Component/Yaml/Unescaper.php
index 2238210d93dfe..9e640ff248ff5 100644
--- a/src/Symfony/Component/Yaml/Unescaper.php
+++ b/src/Symfony/Component/Yaml/Unescaper.php
@@ -45,9 +45,7 @@ public function unescapeSingleQuotedString(string $value): string
      */
     public function unescapeDoubleQuotedString(string $value): string
     {
-        $callback = function ($match) {
-            return $this->unescapeCharacter($match[0]);
-        };
+        $callback = fn ($match) => $this->unescapeCharacter($match[0]);
 
         // evaluate the string
         return preg_replace_callback('/'.self::REGEX_ESCAPED_CHARACTER.'/u', $callback, $value);

From cd4ca48a2e187b39b3e1faf54dd8f8706b1fe740 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 13 Jan 2023 10:29:14 +0100
Subject: [PATCH 127/475] Fix merge

---
 .../Tests/Fixtures/php/services_almost_circular_private.php   | 4 ++--
 .../Tests/NameConverter/MetadataAwareNameConverterTest.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
index af6a2bb91c3ad..f37e9635736b0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -425,7 +425,7 @@ protected static function getMonologInline_LoggerService($container)
      */
     protected static function getPAService($container)
     {
-        $a = ($container->privates['pC'] ?? $container->getPCService());
+        $a = ($container->privates['pC'] ?? self::getPCService($container));
 
         if (isset($container->services['pA'])) {
             return $container->services['pA'];
@@ -434,7 +434,7 @@ protected static function getPAService($container)
 
         $container->services['pA'] = $instance = new \stdClass($b, $a);
 
-        $b->d = ($container->privates['pD'] ?? $container->getPDService());
+        $b->d = ($container->privates['pD'] ?? self::getPDService($container));
 
         return $instance;
     }
diff --git a/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php b/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php
index f0663c08e4202..c64ac12189053 100644
--- a/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php
+++ b/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php
@@ -58,7 +58,7 @@ public function testNormalizeWithFallback($propertyName, $expected)
         $fallback = $this->createMock(NameConverterInterface::class);
         $fallback
             ->method('normalize')
-            ->willReturnCallback(strtoupper(...))
+            ->willReturnCallback(fn ($propertyName) => strtoupper($propertyName))
         ;
 
         $nameConverter = new MetadataAwareNameConverter($classMetadataFactory, $fallback);
@@ -88,7 +88,7 @@ public function testDenormalizeWithFallback($expected, $propertyName)
         $fallback = $this->createMock(NameConverterInterface::class);
         $fallback
             ->method('denormalize')
-            ->willReturnCallback(strtolower(...))
+            ->willReturnCallback(fn ($propertyName) => strtolower($propertyName))
         ;
 
         $nameConverter = new MetadataAwareNameConverter($classMetadataFactory, $fallback);

From a8523cb09157588a1f03d7fd0853b3e306d943f3 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Thu, 12 Jan 2023 14:46:07 +0100
Subject: [PATCH 128/475] [WebProfilerBundle] [WebProfilerPanel] Update the
 logger panel filters

---
 .../views/Collector/logger.html.twig          | 39 +++++++++----------
 .../views/Profiler/base_js.html.twig          | 14 +++----
 .../views/Profiler/profiler.css.twig          | 29 ++++++++++++--
 3 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
index 75bb3fe1e636e..2ecaf52a4aeb6 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -55,27 +55,24 @@
         {% set filters = collector.filters %}
         <div class="log-filters">
             <div id="log-filter-type" class="log-filter">
-                <div class="tab-navigation" role="tablist">
-                    <button role="tab" class="tab-control {{ not has_error_logs and not has_deprecation_logs ? 'active' }}">
-                        <input {{ not has_error_logs and not has_deprecation_logs ? 'checked' }} type="radio" id="filter-log-type-all" name="filter-log-type" value="all">
-                        <label for="filter-log-type-all">All messages</label>
-                    </button>
-
-                    <button role="tab" class="tab-control {{ has_error_logs ? 'active' }}">
-                        <input {{ has_error_logs ? 'checked' }} type="radio" id="filter-log-type-error" name="filter-log-type" value="error">
-                        <label for="filter-log-type-error">
-                            Errors
-                            <span class="badge status-{{ collector.counterrors ? 'error' }}">{{ collector.counterrors|default(0) }}</span>
-                        </label>
-                    </button>
-
-                    <button role="tab" class="tab-control {{ not has_error_logs and has_deprecation_logs ? 'active' }}">
-                        <input {{ not has_error_logs and has_deprecation_logs ? 'checked' }} type="radio" id="filter-log-type-deprecation" name="filter-log-type" value="deprecation">
-                        <label for="filter-log-type-deprecation">
-                            Deprecations
-                            <span class="badge status-{{ collector.countdeprecations ? 'warning' }}">{{ collector.countdeprecations|default(0) }}</span>
-                        </label>
-                    </button>
+                <div class="tab-navigation">
+                    {% set initially_active_tab = has_error_logs ? 'error' : has_deprecation_logs ? 'deprecation' : 'all' %}
+                    <input type="radio" id="filter-log-type-all" name="filter-log-type" value="all" {{ 'all' == initially_active_tab ? 'checked' }}>
+                    <label for="filter-log-type-all" class="tab-control">
+                        All messages
+                    </label>
+
+                    <input type="radio" id="filter-log-type-error" name="filter-log-type" value="error" {{ 'error' == initially_active_tab ? 'checked' }}>
+                    <label for="filter-log-type-error" class="tab-control">
+                        Errors
+                        <span class="badge status-{{ collector.counterrors ? 'error' }}">{{ collector.counterrors|default(0) }}</span>
+                    </label>
+
+                    <input type="radio" id="filter-log-type-deprecation" name="filter-log-type" value="deprecation" {{ 'deprecation' == initially_active_tab ? 'checked' }}>
+                    <label for="filter-log-type-deprecation" class="tab-control">
+                        Deprecations
+                        <span class="badge status-{{ collector.countdeprecations ? 'warning' }}">{{ collector.countdeprecations|default(0) }}</span>
+                    </label>
                 </div>
             </div>
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
index 829e43c717ef4..3086f3f6b852e 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -868,6 +868,11 @@ if (typeof Sfjs === 'undefined' || typeof Sfjs.loadToolbar === 'undefined') {
             },
 
             updateLogsTable: function() {
+                const logs = document.querySelector('table.logs');
+                if (null === logs) {
+                    return;
+                }
+
                 const selectedType = document.querySelector('#log-filter-type input:checked').value;
                 const priorities = document.querySelectorAll('#log-filter-priority input');
                 const allPriorities = Array.from(priorities).map((input) => input.value);
@@ -875,11 +880,6 @@ if (typeof Sfjs === 'undefined' || typeof Sfjs.loadToolbar === 'undefined') {
                 const channels = document.querySelectorAll('#log-filter-channel input');
                 const selectedChannels = Array.from(channels).filter((input) => input.checked).map((input) => input.value);
 
-                const logs = document.querySelector('table.logs');
-                if (null === logs) {
-                    return;
-                }
-
                 /* hide rows that don't match the current filters */
                 let numVisibleRows = 0;
                 logs.querySelectorAll('tbody tr').forEach((row) => {
@@ -909,10 +909,6 @@ if (typeof Sfjs === 'undefined' || typeof Sfjs.loadToolbar === 'undefined') {
                 /* update the selected totals of all filters */
                 document.querySelector('#log-filter-priority .filter-active-num').innerText = (priorities.length === selectedPriorities.length) ? 'All' : selectedPriorities.length;
                 document.querySelector('#log-filter-channel .filter-active-num').innerText = (channels.length === selectedChannels.length) ? 'All' : selectedChannels.length;
-
-                /* update the currently selected "log type" tab */
-                document.querySelectorAll('#log-filter-type .tab-control').forEach((tab) => tab.classList.remove('active'));
-                document.querySelector(`#log-filter-type input[value="${selectedType}"]`).parentElement.classList.add('active');
             },
         };
     })();
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
index 383e975d989eb..0ff9c9d710222 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -1554,6 +1554,7 @@ tr.status-warning td {
     background: transparent;
     border: 0;
     box-shadow: none;
+    color: var(--color-text);
     transition: box-shadow .05s ease-in, background-color .05s ease-in;
     cursor: pointer;
     font-size: 14px;
@@ -1793,12 +1794,32 @@ tr.status-warning td {
     font-weight: bold;
     padding: 0 1px;
 }
-.log-filter .tab-navigation .tab-control input {
-    display: none;
+.log-filter .tab-navigation {
+    position: relative;
 }
-.log-filter .tab-navigation .tab-control label {
-    cursor: pointer;
+.log-filter .tab-navigation input[type="radio"] {
+    position: absolute;
+    pointer-events: none;
+    opacity: 0;
+}
+.tab-navigation input[type="radio"]:checked + .tab-control {
+    background-color: var(--tab-active-background);
+    border-radius: 6px;
+    box-shadow: inset 0 0 0 1.5px var(--tab-active-border-color);
+    color: var(--tab-active-color);
+    position: relative;
+    z-index: 1;
+}
+.theme-dark .tab-navigation input[type="radio"]:checked + .tab-control {
+    box-shadow: inset 0 0 0 1px var(--tab-border-color);
 }
+.tab-navigation input[type="radio"]:focus-visible + .tab-control {
+    outline: 1px solid var(--color-link);
+}
+.tab-navigation input[type="radio"]:checked + .tab-control + input[type="radio"] + .tab-control:before{
+    width: 0;
+}
+
 .log-filters .log-filter .log-filter-content {
     background: var(--base-0);
     border: 1px solid var(--table-border-color);

From ef7e6b18120940e81ddaaf31c0c6a2398ccb4bcd Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Sat, 14 Jan 2023 08:56:42 +0100
Subject: [PATCH 129/475] try to read SYMFONY_PATCH_TYPE_DECLARATIONS from
 superglobal arrays too

---
 src/Symfony/Component/ErrorHandler/DebugClassLoader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
index 69c28c114c51c..561a7aa0bf3be 100644
--- a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
+++ b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -134,7 +134,7 @@ public function __construct(callable $classLoader)
     {
         $this->classLoader = $classLoader;
         $this->isFinder = \is_array($classLoader) && method_exists($classLoader[0], 'findFile');
-        parse_str(getenv('SYMFONY_PATCH_TYPE_DECLARATIONS') ?: '', $this->patchTypes);
+        parse_str($_ENV['SYMFONY_PATCH_TYPE_DECLARATIONS'] ?? $_SERVER['SYMFONY_PATCH_TYPE_DECLARATIONS'] ?? getenv('SYMFONY_PATCH_TYPE_DECLARATIONS') ?: '', $this->patchTypes);
         $this->patchTypes += [
             'force' => null,
             'php' => \PHP_MAJOR_VERSION.'.'.\PHP_MINOR_VERSION,

From deaa81cdc3e6b443bb87589c652d0da4a637fa78 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Sat, 14 Jan 2023 09:47:17 +0100
Subject: [PATCH 130/475] fix tests by using the actual system's temporary
 directory

---
 src/Symfony/Component/HttpKernel/Tests/KernelTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index 036b5992802e8..2c7c8c5a38674 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -650,7 +650,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
             public function boot()
             {
                 $this->container->compile();
-                parent::dumpContainer(new ConfigCache(tempnam('/tmp', 'symfony-kernel-deprecated-parameter'), true), $this->container, Container::class, $this->getContainerBaseClass());
+                parent::dumpContainer(new ConfigCache(tempnam(sys_get_temp_dir(), 'symfony-kernel-deprecated-parameter'), true), $this->container, Container::class, $this->getContainerBaseClass());
             }
 
             public function getContainerClass(): string

From cab49ef9a877ada891851a28e1f355a453ac5755 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sun, 15 Jan 2023 16:12:55 +0100
Subject: [PATCH 131/475] [Validator] Make exception for all constraints
 consistent

---
 .../Component/Validator/Constraints/ChoiceValidator.php      | 3 ++-
 .../Component/Validator/Constraints/EmailValidator.php       | 5 +++--
 .../Constraints/NotCompromisedPasswordValidator.php          | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
index ace179a9faf08..9cc89ba25af58 100644
--- a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
+use Symfony\Component\Validator\Exception\RuntimeException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
@@ -57,7 +58,7 @@ public function validate(mixed $value, Constraint $constraint)
         }
 
         if (true !== $constraint->strict) {
-            throw new \RuntimeException('The "strict" option of the Choice constraint should not be used.');
+            throw new RuntimeException('The "strict" option of the Choice constraint should not be used.');
         }
 
         if ($constraint->multiple) {
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
index 6ff845bb6f712..d5097b5b4ad8f 100644
--- a/src/Symfony/Component/Validator/Constraints/EmailValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -16,6 +16,7 @@
 use Egulias\EmailValidator\Validation\NoRFCWarningsValidation;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\InvalidArgumentException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
@@ -39,7 +40,7 @@ class EmailValidator extends ConstraintValidator
     public function __construct(string $defaultMode = Email::VALIDATION_MODE_LOOSE)
     {
         if (!\in_array($defaultMode, Email::VALIDATION_MODES, true)) {
-            throw new \InvalidArgumentException('The "defaultMode" parameter value is not valid.');
+            throw new InvalidArgumentException('The "defaultMode" parameter value is not valid.');
         }
 
         if (Email::VALIDATION_MODE_LOOSE === $defaultMode) {
@@ -81,7 +82,7 @@ public function validate(mixed $value, Constraint $constraint)
         }
 
         if (!\in_array($constraint->mode, Email::VALIDATION_MODES, true)) {
-            throw new \InvalidArgumentException(sprintf('The "%s::$mode" parameter value is not valid.', get_debug_type($constraint)));
+            throw new InvalidArgumentException(sprintf('The "%s::$mode" parameter value is not valid.', get_debug_type($constraint)));
         }
 
         if (Email::VALIDATION_MODE_STRICT === $constraint->mode) {
diff --git a/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php b/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php
index 2b4b1eaf359b2..b5cdc1b0a98eb 100644
--- a/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php
@@ -14,6 +14,7 @@
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\LogicException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;
@@ -39,7 +40,7 @@ class NotCompromisedPasswordValidator extends ConstraintValidator
     public function __construct(HttpClientInterface $httpClient = null, string $charset = 'UTF-8', bool $enabled = true, string $endpoint = null)
     {
         if (null === $httpClient && !class_exists(HttpClient::class)) {
-            throw new \LogicException(sprintf('The "%s" class requires the "HttpClient" component. Try running "composer require symfony/http-client".', self::class));
+            throw new LogicException(sprintf('The "%s" class requires the "HttpClient" component. Try running "composer require symfony/http-client".', self::class));
         }
 
         $this->httpClient = $httpClient ?? HttpClient::create();

From ce24a2bd8bbba39c60543d4cff7063cbf5b0a5ca Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Mon, 16 Jan 2023 16:46:43 +0100
Subject: [PATCH 132/475] [WebProfilerBundle] Mailer panel tweaks

---
 .../views/Collector/mailer.html.twig          | 91 ++++++++++---------
 .../views/Profiler/profiler.css.twig          | 23 ++++-
 2 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
index 84f2281cd4349..e1bdb4c51cd35 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
@@ -177,56 +177,59 @@
                             </div>
                         {% endif %}
 
-                        {% if message.htmlBody or message.textBody %}
-                            <div class="card-block">
-                                <div class="sf-tabs sf-tabs-sm">
-                                    {% if message.htmlBody %}
-                                        {% set htmlBody = message.htmlBody() %}
-                                        <div class="tab">
-                                            <h3 class="tab-title">HTML content</h3>
-                                            <div class="tab-content">
-                                                <pre class="prewrap" style="max-height: 600px">
-                                                    {%- if message.htmlCharset() %}
-                                                        {{- htmlBody|convert_encoding('UTF-8', message.htmlCharset()) }}
-                                                    {%- else %}
-                                                        {{- htmlBody }}
-                                                    {%- endif -%}
-                                                </pre>
+                        <div class="card-block">
+                            {% set textBody = message.textBody %}
+                            {% set htmlBody = message.htmlBody %}
+                            <div class="sf-tabs sf-tabs-sm">
+                                <div class="tab {{ not textBody ? 'disabled' }} {{ textBody ? 'active' }}">
+                                    <h3 class="tab-title">Text content</h3>
+                                    <div class="tab-content">
+                                        {% if textBody %}
+                                            <pre class="mailer-email-body prewrap" style="max-height: 600px">
+                                                {%- if message.textCharset() %}
+                                                    {{- textBody|convert_encoding('UTF-8', message.textCharset()) }}
+                                                {%- else %}
+                                                    {{- textBody }}
+                                                {%- endif -%}
+                                            </pre>
+                                        {% else %}
+                                            <div class="mailer-empty-email-body">
+                                                <p>The text body is empty.</p>
                                             </div>
-                                        </div>
+                                        {% endif %}
+                                    </div>
+                           
F438
     </div>
 
-                                        <div class="tab">
-                                            <h3 class="tab-title">HTML preview</h3>
-                                            <div class="tab-content">
-                                                <pre class="prewrap" style="max-height: 600px">
-                                                    <iframe
-                                                        src="data:text/html;charset=utf-8;base64,{{ collector.base64Encode(htmlBody) }}"
-                                                        style="height: 80vh;width: 100%;"
-                                                    >
-                                                    </iframe>
-                                                </pre>
+                                <div class="tab {{ not htmlBody ? 'disabled' }} {{ not textBody and htmlBody ? 'active' }}">
+                                    <h3 class="tab-title">HTML content</h3>
+                                    <div class="tab-content">
+                                        {% if htmlBody %}
+                                            <pre class="mailer-email-body prewrap" style="max-height: 600px">
+                                                {%- if message.htmlCharset() %}
+                                                    {{- htmlBody|convert_encoding('UTF-8', message.htmlCharset()) }}
+                                                {%- else %}
+                                                    {{- htmlBody }}
+                                                {%- endif -%}
+                                            </pre>
+                                        {% else %}
+                                            <div class="mailer-empty-email-body">
+                                                <p>The HTML body is empty.</p>
                                             </div>
-                                        </div>
-                                    {% endif %}
+                                        {% endif %}
+                                    </div>
+                                </div>
 
-                                    {% if message.textBody %}
-                                        {% set textBody = message.textBody() %}
-                                        <div class="tab">
-                                            <h3 class="tab-title">Text content</h3>
-                                            <div class="tab-content">
-                                                <pre class="prewrap" style="max-height: 600px">
-                                                    {%- if message.textCharset() %}
-                                                        {{- textBody|convert_encoding('UTF-8', message.textCharset()) }}
-                                                    {%- else %}
-                                                        {{- textBody }}
-                                                    {%- endif -%}
-                                                </pre>
-                                            </div>
+                                {% if htmlBody %}
+                                    <div class="tab">
+                                        <h3 class="tab-title">HTML preview</h3>
+                                        <div class="tab-content">
+                                            <pre class="prewrap" style="max-height: 600px"><iframe src="data:text/html;charset=utf-8;base64,{{ collector.base64Encode(htmlBody) }}" style="height: 80vh;width: 100%;"></iframe>
+                                            </pre>
                                         </div>
-                                    {% endif %}
-                                </div>
+                                    </div>
+                                {% endif %}
                             </div>
-                        {% endif %}
+                        </div>
                     </div>
                 </div>
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
index 0ff9c9d710222..9e603317c004e 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -668,8 +668,7 @@ table tbody td.num-col {
 .empty p {
     font-size: var(--font-size-body);
     max-width: 60ch;
-    margin-left: auto;
-    margin-right: auto;
+    margin: 1em auto;
     text-align: center;
 }
 .empty.empty-panel {
@@ -2081,6 +2080,26 @@ tr.log-status-silenced > td:first-child:before {
 .mailer-message-attachments-list li a {
     margin-left: 5px;
 }
+.mailer-email-body {
+    margin: 0;
+    padding: 6px 8px;
+}
+.mailer-empty-email-body {
+    background-image: url("data:image/svg+xml,%3csvg width='100%25' height='100%25' xmlns='http://www.w3.org/2000/svg'%3e%3crect width='100%25' height='100%25' fill='none' stroke='%23e5e5e5' stroke-width='4' stroke-dasharray='6%2c 14' stroke-dashoffset='0' stroke-linecap='square'/%3e%3c/svg%3e");
+    border-radius: 6px;
+    color: var(--color-muted);
+    margin: 1em 0 0;
+    padding: .5em 1em;
+}
+.theme-dark .mailer-empty-email-body {
+    background-image: url("data:image/svg+xml,%3csvg width='100%25' height='100%25' xmlns='http://www.w3.org/2000/svg'%3e%3crect width='100%25' height='100%25' fill='none' stroke='%23737373' stroke-width='4' stroke-dasharray='6%2c 14' stroke-dashoffset='0' stroke-linecap='square'/%3e%3c/svg%3e");
+}
+.mailer-empty-email-body p {
+    font-size: var(--font-size-body);
+    margin: 0;
+    padding: 0.5em 0;
+}
+
 .mailer-message-download-raw {
     align-items: center;
     display: flex;

From 5e6b471a15fc10891906d39062e344901909e8ef Mon Sep 17 00:00:00 2001
From: Florent Destremau <florentdestremau@users.noreply.github.com>
Date: Tue, 17 Jan 2023 16:14:21 +0100
Subject: [PATCH 133/475] Added condition to always return the real
 Authenticator

---
 .../Component/Security/Http/Event/CheckPassportEvent.php       | 3 ++-
 .../Component/Security/Http/Event/LoginFailureEvent.php        | 3 ++-
 .../Component/Security/Http/Event/LoginSuccessEvent.php        | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Security/Http/Event/CheckPassportEvent.php b/src/Symfony/Component/Security/Http/Event/CheckPassportEvent.php
index 18f540cba949b..5e3be93711a64 100644
--- a/src/Symfony/Component/Security/Http/Event/CheckPassportEvent.php
+++ b/src/Symfony/Component/Security/Http/Event/CheckPassportEvent.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Security\Http\Event;
 
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
+use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticator;
 use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
 use Symfony\Contracts\EventDispatcher\Event;
 
@@ -37,7 +38,7 @@ public function __construct(AuthenticatorInterface $authenticator, Passport $pas
 
     public function getAuthenticator(): AuthenticatorInterface
     {
-        return $this->authenticator;
+        return $this->authenticator instanceof TraceableAuthenticator ? $this->authenticator->getAuthenticator() : $this->authenticator;
     }
 
     public function getPassport(): Passport
diff --git a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
index d3427c687d49d..bec3ccc79dc95 100644
--- a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
+++ b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
@@ -15,6 +15,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
+use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticator;
 use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
 use Symfony\Contracts\EventDispatcher\Event;
 
@@ -52,7 +53,7 @@ public function getException(): AuthenticationException
 
     public function getAuthenticator(): AuthenticatorInterface
     {
-        return $this->authenticator;
+        return $this->authenticator instanceof TraceableAuthenticator ? $this->authenticator->getAuthenticator() : $this->authenticator;
     }
 
     public function getFirewallName(): string
diff --git a/src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php b/src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php
index 581ec9c7d45eb..634c26ade25bb 100644
--- a/src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php
+++ b/src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
+use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticator;
 use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
 use Symfony\Contracts\EventDispatcher\Event;
 
@@ -50,7 +51,7 @@ public function __construct(AuthenticatorInterface $authenticator, Passport $pas
 
     public function getAuthenticator(): AuthenticatorInterface
     {
-        return $this->authenticator;
+        return $this->authenticator instanceof TraceableAuthenticator ? $this->authenticator->getAuthenticator() : $this->authenticator;
     }
 
     public function getPassport(): Passport

From 32c9f28bebe3573431644838db625ef941f5405b Mon Sep 17 00:00:00 2001
From: mark burdett <mfburdett@gmail.com>
Date: Tue, 17 Jan 2023 13:39:30 -0800
Subject: [PATCH 134/475] Add #[\SensitiveParameter] to $sessionId

---
 .../HttpFoundation/Session/SessionUtils.php    |  2 +-
 .../Storage/Handler/AbstractSessionHandler.php | 14 +++++++-------
 .../Handler/MarshallingSessionHandler.php      | 10 +++++-----
 .../Handler/MemcachedSessionHandler.php        |  8 ++++----
 .../Handler/MigratingSessionHandler.php        | 10 +++++-----
 .../Storage/Handler/MongoDbSessionHandler.php  |  8 ++++----
 .../Storage/Handler/NullSessionHandler.php     | 10 +++++-----
 .../Storage/Handler/PdoSessionHandler.php      | 18 +++++++++---------
 .../Storage/Handler/RedisSessionHandler.php    |  8 ++++----
 .../Storage/Handler/StrictSessionHandler.php   | 10 +++++-----
 .../Storage/Proxy/SessionHandlerProxy.php      | 10 +++++-----
 11 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionUtils.php b/src/Symfony/Component/HttpFoundation/Session/SessionUtils.php
index b5bce4a884eff..504c5848e9dd9 100644
--- a/src/Symfony/Component/HttpFoundation/Session/SessionUtils.php
+++ b/src/Symfony/Component/HttpFoundation/Session/SessionUtils.php
@@ -25,7 +25,7 @@ final class SessionUtils
      * Finds the session header amongst the headers that are to be sent, removes it, and returns
      * it so the caller can process it further.
      */
-    public static function popSessionCookie(string $sessionName, string $sessionId): ?string
+    public static function popSessionCookie(string $sessionName, #[\SensitiveParameter] string $sessionId): ?string
     {
         $sessionCookie = null;
         $sessionCookiePrefix = sprintf(' %s=', urlencode($sessionName));
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php
index 88e513c5ddd3f..288c24232c89d 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php
@@ -38,13 +38,13 @@ public function open(string $savePath, string $sessionName): bool
         return true;
     }
 
-    abstract protected function doRead(string $sessionId): string;
+    abstract protected function doRead(#[\SensitiveParameter] string $sessionId): string;
 
-    abstract protected function doWrite(string $sessionId, string $data): bool;
+    abstract protected function doWrite(#[\SensitiveParameter] string $sessionId, string $data): bool;
 
-    abstract protected function doDestroy(string $sessionId): bool;
+    abstract protected function doDestroy(#[\SensitiveParameter] string $sessionId): bool;
 
-    public function validateId(string $sessionId): bool
+    public function validateId(#[\SensitiveParameter] string $sessionId): bool
     {
         $this->prefetchData = $this->read($sessionId);
         $this->prefetchId = $sessionId;
@@ -52,7 +52,7 @@ public function validateId(string $sessionId): bool
         return '' !== $this->prefetchData;
     }
 
-    public function read(string $sessionId): string
+    public function read(#[\SensitiveParameter] string $sessionId): string
     {
         if (isset($this->prefetchId)) {
             $prefetchId = $this->prefetchId;
@@ -72,7 +72,7 @@ public function read(string $sessionId): string
         return $data;
     }
 
-    public function write(string $sessionId, string $data): bool
+    public function write(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         // see https://github.com/igbinary/igbinary/issues/146
         $this->igbinaryEmptyData ??= \function_exists('igbinary_serialize') ? igbinary_serialize([]) : '';
@@ -84,7 +84,7 @@ public function write(string $sessionId, string $data): bool
         return $this->doWrite($sessionId, $data);
     }
 
-    public function destroy(string $sessionId): bool
+    public function destroy(#[\SensitiveParameter] string $sessionId): bool
     {
         if (!headers_sent() && filter_var(\ini_get('session.use_cookies'), \FILTER_VALIDATE_BOOL)) {
             if (!isset($this->sessionName)) {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MarshallingSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MarshallingSessionHandler.php
index 9962fef3d6c4c..1567f54332c51 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MarshallingSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MarshallingSessionHandler.php
@@ -37,7 +37,7 @@ public function close(): bool
         return $this->handler->close();
     }
 
-    public function destroy(string $sessionId): bool
+    public function destroy(#[\SensitiveParameter] string $sessionId): bool
     {
         return $this->handler->destroy($sessionId);
     }
@@ -47,12 +47,12 @@ public function gc(int $maxlifetime): int|false
         return $this->handler->gc($maxlifetime);
     }
 
-    public function read(string $sessionId): string
+    public function read(#[\SensitiveParameter] string $sessionId): string
     {
         return $this->marshaller->unmarshall($this->handler->read($sessionId));
     }
 
-    public function write(string $sessionId, string $data): bool
+    public function write(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         $failed = [];
         $marshalledData = $this->marshaller->marshall(['data' => $data], $failed);
@@ -64,12 +64,12 @@ public function write(string $sessionId, string $data): bool
         return $this->handler->write($sessionId, $marshalledData['data']);
     }
 
-    public function validateId(string $sessionId): bool
+    public function validateId(#[\SensitiveParameter] string $sessionId): bool
     {
         return $this->handler->validateId($sessionId);
     }
 
-    public function updateTimestamp(string $sessionId, string $data): bool
+    public function updateTimestamp(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         return $this->handler->updateTimestamp($sessionId, $data);
     }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
index 2bc29b459cacd..91a023ddbc119 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -59,19 +59,19 @@ public function close(): bool
         return $this->memcached->quit();
     }
 
-    protected function doRead(string $sessionId): string
+    protected function doRead(#[\SensitiveParameter] string $sessionId): string
     {
         return $this->memcached->get($this->prefix.$sessionId) ?: '';
     }
 
-    public function updateTimestamp(string $sessionId, string $data): bool
+    public function updateTimestamp(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         $this->memcached->touch($this->prefix.$sessionId, $this->getCompatibleTtl());
 
         return true;
     }
 
-    protected function doWrite(string $sessionId, string $data): bool
+    protected function doWrite(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         return $this->memcached->set($this->prefix.$sessionId, $data, $this->getCompatibleTtl());
     }
@@ -89,7 +89,7 @@ private function getCompatibleTtl(): int
         return $ttl;
     }
 
-    protected function doDestroy(string $sessionId): bool
+    protected function doDestroy(#[\SensitiveParameter] string $sessionId): bool
     {
         $result = $this->memcached->delete($this->prefix.$sessionId);
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php
index 46fbeb006f453..8ed6a7b3fd08b 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php
@@ -46,7 +46,7 @@ public function close(): bool
         return $result;
     }
 
-    public function destroy(string $sessionId): bool
+    public function destroy(#[\SensitiveParameter] string $sessionId): bool
     {
         $result = $this->currentHandler->destroy($sessionId);
         $this->writeOnlyHandler->destroy($sessionId);
@@ -70,13 +70,13 @@ public function open(string $savePath, string $sessionName): bool
         return $result;
     }
 
-    public function read(string $sessionId): string
+    public function read(#[\SensitiveParameter] string $sessionId): string
     {
         // No reading from new handler until switch-over
         return $this->currentHandler->read($sessionId);
     }
 
-    public function write(string $sessionId, string $sessionData): bool
+    public function write(#[\SensitiveParameter] string $sessionId, string $sessionData): bool
     {
         $result = $this->currentHandler->write($sessionId, $sessionData);
         $this->writeOnlyHandler->write($sessionId, $sessionData);
@@ -84,13 +84,13 @@ public function write(string $sessionId, string $sessionData): bool
         return $result;
     }
 
-    public function validateId(string $sessionId): bool
+    public function validateId(#[\SensitiveParameter] string $sessionId): bool
     {
         // No reading from new handler until switch-over
         return $this->currentHandler->validateId($sessionId);
     }
 
-    public function updateTimestamp(string $sessionId, string $sessionData): bool
+    public function updateTimestamp(#[\SensitiveParameter] string $sessionId, string $sessionData): bool
     {
         $result = $this->currentHandler->updateTimestamp($sessionId, $sessionData);
         $this->writeOnlyHandler->updateTimestamp($sessionId, $sessionData);
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
index 63c609ae21657..5ea5b4ae7d98d 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -84,7 +84,7 @@ public function close(): bool
         return true;
     }
 
-    protected function doDestroy(string $sessionId): bool
+    protected function doDestroy(#[\SensitiveParameter] string $sessionId): bool
     {
         $this->getCollection()->deleteOne([
             $this->options['id_field'] => $sessionId,
@@ -100,7 +100,7 @@ public function gc(int $maxlifetime): int|false
         ])->getDeletedCount();
     }
 
-    protected function doWrite(string $sessionId, string $data): bool
+    protected function doWrite(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         $ttl = ($this->ttl instanceof \Closure ? ($this->ttl)() : $this->ttl) ?? \ini_get('session.gc_maxlifetime');
         $expiry = new UTCDateTime((time() + (int) $ttl) * 1000);
@@ -120,7 +120,7 @@ protected function doWrite(string $sessionId, string $data): bool
         return true;
     }
 
-    public function updateTimestamp(string $sessionId, string $data): bool
+    public function updateTimestamp(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         $ttl = ($this->ttl instanceof \Closure ? ($this->ttl)() : $this->ttl) ?? \ini_get('session.gc_maxlifetime');
         $expiry = new UTCDateTime((time() + (int) $ttl) * 1000);
@@ -136,7 +136,7 @@ public function updateTimestamp(string $sessionId, string $data): bool
         return true;
     }
 
-    protected function doRead(string $sessionId): string
+    protected function doRead(#[\SensitiveParameter] string $sessionId): string
     {
         $dbData = $this->getCollection()->findOne([
             $this->options['id_field'] => $sessionId,
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php
index 790ac2fedd8f5..a77185e2ebf77 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php
@@ -23,27 +23,27 @@ public function close(): bool
         return true;
     }
 
-    public function validateId(string $sessionId): bool
+    public function validateId(#[\SensitiveParameter] string $sessionId): bool
     {
         return true;
     }
 
-    protected function doRead(string $sessionId): string
+    protected function doRead(#[\SensitiveParameter] string $sessionId): string
     {
         return '';
     }
 
-    public function updateTimestamp(string $sessionId, string $data): bool
+    public function updateTimestamp(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         return true;
     }
 
-    protected function doWrite(string $sessionId, string $data): bool
+    protected function doWrite(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         return true;
     }
 
-    protected function doDestroy(string $sessionId): bool
+    protected function doDestroy(#[\SensitiveParameter] string $sessionId): bool
     {
         return true;
     }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
index a046aef95b08c..a5257b4172549 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -285,7 +285,7 @@ public function open(string $savePath, string $sessionName): bool
         return parent::open($savePath, $sessionName);
     }
 
-    public function read(string $sessionId): string
+    public function read(#[\SensitiveParameter] string $sessionId): string
     {
         try {
             return parent::read($sessionId);
@@ -305,7 +305,7 @@ public function gc(int $maxlifetime): int|false
         return 0;
     }
 
-    protected function doDestroy(string $sessionId): bool
+    protected function doDestroy(#[\SensitiveParameter] string $sessionId): bool
     {
         // delete the record associated with this id
         $sql = "DELETE FROM $this->table WHERE $this->idCol = :id";
@@ -323,7 +323,7 @@ protected function doDestroy(string $sessionId): bool
         return true;
     }
 
-    protected function doWrite(string $sessionId, string $data): bool
+    protected function doWrite(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         $maxlifetime = (int) (($this->ttl instanceof \Closure ? ($this->ttl)() : $this->ttl) ?? \ini_get('session.gc_maxlifetime'));
 
@@ -366,7 +366,7 @@ protected function doWrite(string $sessionId, string $data): bool
         return true;
     }
 
-    public function updateTimestamp(string $sessionId, string $data): bool
+    public function updateTimestamp(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         $expiry = time() + (int) (($this->ttl instanceof \Closure ? ($this->ttl)() : $this->ttl) ?? \ini_get('session.gc_maxlifetime'));
 
@@ -610,7 +610,7 @@ private function rollback(): void
      * We need to make sure we do not return session data that is already considered garbage according
      * to the session.gc_maxlifetime setting because gc() is called after read() and only sometimes.
      */
-    protected function doRead(string $sessionId): string
+    protected function doRead(#[\SensitiveParameter] string $sessionId): string
     {
         if (self::LOCK_ADVISORY === $this->lockMode) {
             $this->unlockStatements[] = $this->doAdvisoryLock($sessionId);
@@ -681,7 +681,7 @@ protected function doRead(string $sessionId): string
      *       - for oci using DBMS_LOCK.REQUEST
      *       - for sqlsrv using sp_getapplock with LockOwner = Session
      */
-    private function doAdvisoryLock(string $sessionId): \PDOStatement
+    private function doAdvisoryLock(#[\SensitiveParameter] string $sessionId): \PDOStatement
     {
         switch ($this->driver) {
             case 'mysql':
@@ -780,7 +780,7 @@ private function getSelectSql(): string
     /**
      * Returns an insert statement supported by the database for writing session data.
      */
-    private function getInsertStatement(string $sessionId, string $sessionData, int $maxlifetime): \PDOStatement
+    private function getInsertStatement(#[\SensitiveParameter] string $sessionId, string $sessionData, int $maxlifetime): \PDOStatement
     {
         switch ($this->driver) {
             case 'oci':
@@ -807,7 +807,7 @@ private function getInsertStatement(string $sessionId, string $sessionData, int
     /**
      * Returns an update statement supported by the database for writing session data.
      */
-    private function getUpdateStatement(string $sessionId, string $sessionData, int $maxlifetime): \PDOStatement
+    private function getUpdateStatement(#[\SensitiveParameter] string $sessionId, string $sessionData, int $maxlifetime): \PDOStatement
     {
         switch ($this->driver) {
             case 'oci':
@@ -834,7 +834,7 @@ private function getUpdateStatement(string $sessionId, string $sessionData, int
     /**
      * Returns a merge/upsert (i.e. insert or update) statement when supported by the database for writing session data.
      */
-    private function getMergeStatement(string $sessionId, string $data, int $maxlifetime): ?\PDOStatement
+    private function getMergeStatement(#[\SensitiveParameter] string $sessionId, string $data, int $maxlifetime): ?\PDOStatement
     {
         switch (true) {
             case 'mysql' === $this->driver:
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
index 38f488644deba..c4f1e0216e6cf 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
@@ -50,12 +50,12 @@ public function __construct(
         $this->ttl = $options['ttl'] ?? null;
     }
 
-    protected function doRead(string $sessionId): string
+    protected function doRead(#[\SensitiveParameter] string $sessionId): string
     {
         return $this->redis->get($this->prefix.$sessionId) ?: '';
     }
 
-    protected function doWrite(string $sessionId, string $data): bool
+    protected function doWrite(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         $ttl = ($this->ttl instanceof \Closure ? ($this->ttl)() : $this->ttl) ?? \ini_get('session.gc_maxlifetime');
         $result = $this->redis->setEx($this->prefix.$sessionId, (int) $ttl, $data);
@@ -63,7 +63,7 @@ protected function doWrite(string $sessionId, string $data): bool
         return $result && !$result instanceof ErrorInterface;
     }
 
-    protected function doDestroy(string $sessionId): bool
+    protected function doDestroy(#[\SensitiveParameter] string $sessionId): bool
     {
         static $unlink = true;
 
@@ -93,7 +93,7 @@ public function gc(int $maxlifetime): int|false
         return 0;
     }
 
-    public function updateTimestamp(string $sessionId, string $data): bool
+    public function updateTimestamp(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         $ttl = ($this->ttl instanceof \Closure ? ($this->ttl)() : $this->ttl) ?? \ini_get('session.gc_maxlifetime');
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php
index 1a163648155d1..1f8668744762d 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php
@@ -47,22 +47,22 @@ public function open(string $savePath, string $sessionName): bool
         return $this->handler->open($savePath, $sessionName);
     }
 
-    protected function doRead(string $sessionId): string
+    protected function doRead(#[\SensitiveParameter] string $sessionId): string
     {
         return $this->handler->read($sessionId);
     }
 
-    public function updateTimestamp(string $sessionId, string $data): bool
+    public function updateTimestamp(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         return $this->write($sessionId, $data);
     }
 
-    protected function doWrite(string $sessionId, string $data): bool
+    protected function doWrite(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         return $this->handler->write($sessionId, $data);
     }
 
-    public function destroy(string $sessionId): bool
+    public function destroy(#[\SensitiveParameter] string $sessionId): bool
     {
         $this->doDestroy = true;
         $destroyed = parent::destroy($sessionId);
@@ -70,7 +70,7 @@ public function destroy(string $sessionId): bool
         return $this->doDestroy ? $this->doDestroy($sessionId) : $destroyed;
     }
 
-    protected function doDestroy(string $sessionId): bool
+    protected function doDestroy(#[\SensitiveParameter] string $sessionId): bool
     {
         $this->doDestroy = false;
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
index c292e58f05851..7bf3f9ff1e1dc 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
@@ -44,17 +44,17 @@ public function close(): bool
         return $this->handler->close();
     }
 
-    public function read(string $sessionId): string|false
+    public function read(#[\SensitiveParameter] string $sessionId): string|false
     {
         return $this->handler->read($sessionId);
     }
 
-    public function write(string $sessionId, string $data): bool
+    public function write(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         return $this->handler->write($sessionId, $data);
     }
 
-    public function destroy(string $sessionId): bool
+    public function destroy(#[\SensitiveParameter] string $sessionId): bool
     {
         return $this->handler->destroy($sessionId);
     }
@@ -64,12 +64,12 @@ public function gc(int $maxlifetime): int|false
         return $this->handler->gc($maxlifetime);
     }
 
-    public function validateId(string $sessionId): bool
+    public function validateId(#[\SensitiveParameter] string $sessionId): bool
     {
         return !$this->handler instanceof \SessionUpdateTimestampHandlerInterface || $this->handler->validateId($sessionId);
     }
 
-    public function updateTimestamp(string $sessionId, string $data): bool
+    public function updateTimestamp(#[\SensitiveParameter] string $sessionId, string $data): bool
     {
         return $this->handler instanceof \SessionUpdateTimestampHandlerInterface ? $this->handler->updateTimestamp($sessionId, $data) : $this->write($sessionId, $data);
     }

From f63bb7b4cd0ad86491b2433f8f6e58f09877a704 Mon Sep 17 00:00:00 2001
From: Tomas <norkunas.tom@gmail.com>
Date: Tue, 17 Jan 2023 17:40:13 +0200
Subject: [PATCH 135/475] [WebProfilerBundle] Close profiler settings on escape

---
 .../views/Profiler/settings.html.twig         | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/settings.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/settings.html.twig
index 71080c737782a..9f96c5b881eb6 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/settings.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/settings.html.twig
@@ -41,7 +41,9 @@
 }
 
 .modal-wrap {
-    -webkit-transition: all 0.3s ease-in-out;
+    -webkit-transition-duration: 0.3s;
+    -webkit-transition-property: opacity, visibility;
+    -webkit-transition-timing-function: ease-in-out;
     align-items: center;
     background: rgba(0, 0, 0, 0.70);
     display: flex;
@@ -49,11 +51,13 @@
     height: 100%;
     justify-content: center;
     left: 0;
-    opacity: 1;
+    opacity: 0;
     overflow: auto;
     position: fixed;
     top: 0;
-    transition: all 0.3s ease-in-out;
+    transition-duration: 0.3s;
+    transition-property: opacity, visibility;
+    transition-timing-function: ease-in-out;
     visibility: hidden;
     width: 100%;
     z-index: 100000;
@@ -195,7 +199,7 @@
     <div class="modal-container">
         <div class="modal-header">
             <h3>Configuration Settings</h3>
-            <button class="close-modal">&times;</button>
+            <button aria-label="Close" class="close-modal">&times;</button>
         </div>
 
         <div class="modal-content">
@@ -282,22 +286,30 @@
     const openModalButton = document.getElementById('open-settings');
     const modalWindow = document.getElementById('profiler-settings');
     const closeModalButton = document.getElementsByClassName('close-modal')[0];
-    const modalWrapper = document.getElementsByClassName('modal-wrap')[0]
+    const modalWrapper = document.getElementsByClassName('modal-wrap')[0];
+    const closeModal = () => {
+        modalWindow.classList.remove('visible');
+        setTimeout(() => openModalButton.focus(), 30);
+    };
 
     openModalButton.addEventListener('click', function(event) {
         document.getElementById('settings-' + (localStorage.getItem('symfony/profiler/theme') || 'theme-auto')).checked = 'checked';
         document.getElementById('settings-' + (localStorage.getItem('symfony/profiler/width') || 'width-normal')).checked = 'checked';
 
         modalWindow.classList.toggle('visible');
+        setTimeout(() => closeModalButton.focus(), 30);
         event.preventDefault();
     });
 
-    closeModalButton.addEventListener('click', function() {
-        modalWindow.classList.remove('visible');
-    });
+    closeModalButton.addEventListener('click', closeModal);
     modalWrapper.addEventListener('click', function(event) {
         if (event.target == event.currentTarget) {
-            modalWindow.classList.remove('visible');
+            closeModal();
+        }
+    });
+    modalWrapper.addEventListener('keydown', function(event) {
+        if (event.key === 'Esc' || event.key === 'Escape') {
+            closeModal();
         }
     });
 })();

From ec60013366a472a03707f444c2f0b6d373b97356 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 18 Jan 2023 19:07:28 +0100
Subject: [PATCH 136/475] [Clock] Make ClockAwareTrait use the global clock by
 default

---
 src/Symfony/Component/Clock/ClockAwareTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Clock/ClockAwareTrait.php b/src/Symfony/Component/Clock/ClockAwareTrait.php
index 22f5d4698a0aa..02698d7fb222f 100644
--- a/src/Symfony/Component/Clock/ClockAwareTrait.php
+++ b/src/Symfony/Component/Clock/ClockAwareTrait.php
@@ -31,6 +31,6 @@ public function setClock(ClockInterface $clock): void
 
     protected function now(): \DateTimeImmutable
     {
-        return ($this->clock ??= new NativeClock())->now();
+        return ($this->clock ??= new Clock())->now();
     }
 }

From c9d8b15dcac5ce02bd949d783b9f26003752dbe6 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Thu, 12 Jan 2023 09:19:38 +0100
Subject: [PATCH 137/475] [Config] Do not array_unique EnumNode values

---
 .../Config/Builder/ConfigBuilderGenerator.php   |  2 +-
 .../Definition/Builder/EnumNodeDefinition.php   |  2 --
 .../Definition/Dumper/XmlReferenceDumper.php    |  4 ++--
 .../Definition/Dumper/YamlReferenceDumper.php   |  2 +-
 .../Component/Config/Definition/EnumNode.php    |  7 ++++++-
 .../Builder/EnumNodeDefinitionTest.php          | 17 ++++++++---------
 .../Config/Tests/Definition/EnumNodeTest.php    | 16 ++++++++++++++++
 7 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php b/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
index 44ad6ca894f75..d7b8dd04432ab 100644
--- a/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
+++ b/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
@@ -426,7 +426,7 @@ private function getComment(BaseNode $node): string
             }
 
             if ($node instanceof EnumNode) {
-                $comment .= sprintf(' * @param ParamConfigurator|%s $value', implode('|', array_map(fn ($a) => var_export($a, true), $node->getValues())))."\n";
+                $comment .= sprintf(' * @param ParamConfigurator|%s $value', implode('|', array_unique(array_map(fn ($a) => var_export($a, true), $node->getValues()))))."\n";
             } else {
                 $parameterTypes = $this->getParameterTypes($node);
                 $comment .= ' * @param ParamConfigurator|'.implode('|', $parameterTypes).' $value'."\n";
diff --git a/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php
index 6df62d30ab8b3..99f31812331c1 100644
--- a/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php
+++ b/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php
@@ -27,8 +27,6 @@ class EnumNodeDefinition extends ScalarNodeDefinition
      */
     public function values(array $values): static
     {
-        $values = array_unique($values);
-
         if (!$values) {
             throw new \InvalidArgumentException('->values() must be called with at least one value.');
         }
diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
index 563c29d8ed598..eb8fce4385e6b 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
@@ -107,7 +107,7 @@ private function writeNode(NodeInterface $node, int $depth = 0, bool $root = fal
                             FloatNode::class,
                             IntegerNode::class => 'numeric value',
                             BooleanNode::class => 'true|false',
-                            EnumNode::class => implode('|', array_map('json_encode', $prototype->getValues())),
+                            EnumNode::class => implode('|', array_unique(array_map('json_encode', $prototype->getValues()))),
                             default => 'value',
                         };
                     }
@@ -149,7 +149,7 @@ private function writeNode(NodeInterface $node, int $depth = 0, bool $root = fal
                 }
 
                 if ($child instanceof EnumNode) {
-                    $comments[] = 'One of '.implode('; ', array_map('json_encode', $child->getValues()));
+                    $comments[] = 'One of '.implode('; ', array_unique(array_map('json_encode', $child->getValues())));
                 }
 
                 if (\count($comments)) {
diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
index 606c3edaad58f..04cb38c20b451 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -98,7 +98,7 @@ private function writeNode(NodeInterface $node, NodeInterface $parentNode = null
                 }
             }
         } elseif ($node instanceof EnumNode) {
-            $comments[] = 'One of '.implode('; ', array_map('json_encode', $node->getValues()));
+            $comments[] = 'One of '.implode('; ', array_unique(array_map('json_encode', $node->getValues())));
             $default = $node->hasDefaultValue() ? Inline::dump($node->getDefaultValue()) : '~';
         } elseif (VariableNode::class === $node::class && \is_array($example)) {
             // If there is an array example, we are sure we dont need to print a default value
diff --git a/src/Symfony/Component/Config/Definition/EnumNode.php b/src/Symfony/Component/Config/Definition/EnumNode.php
index 76d8d12ac4fdb..ebb78daa28508 100644
--- a/src/Symfony/Component/Config/Definition/EnumNode.php
+++ b/src/Symfony/Component/Config/Definition/EnumNode.php
@@ -24,11 +24,16 @@ class EnumNode extends ScalarNode
 
     public function __construct(?string $name, NodeInterface $parent = null, array $values = [], string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR)
     {
-        $values = array_unique($values);
         if (!$values) {
             throw new \InvalidArgumentException('$values must contain at least one element.');
         }
 
+        foreach ($values as $value) {
+            if (null !== $value && !\is_scalar($value)) {
+                throw new \InvalidArgumentException(sprintf('"%s" only supports scalar or null values, "%s" given.', __CLASS__, get_debug_type($value)));
+            }
+        }
+
         parent::__construct($name, $parent, $pathSeparator);
         $this->values = $values;
     }
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
index 06a227ca3cb38..c75841afe9439 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
@@ -25,15 +25,6 @@ public function testWithOneValue()
         $this->assertEquals(['foo'], $node->getValues());
     }
 
-    public function testWithOneDistinctValue()
-    {
-        $def = new EnumNodeDefinition('foo');
-        $def->values(['foo', 'foo']);
-
-        $node = $def->getNode();
-        $this->assertEquals(['foo'], $node->getValues());
-    }
-
     public function testNoValuesPassed()
     {
         $this->expectException(\RuntimeException::class);
@@ -73,4 +64,12 @@ public function testSetDeprecated()
         $this->assertSame('vendor/package', $deprecation['package']);
         $this->assertSame('1.1', $deprecation['version']);
     }
+
+    public function testSameStringCoercedValuesAreDifferent()
+    {
+        $def = new EnumNodeDefinition('ccc');
+        $def->values(['', false, null]);
+
+        $this->assertSame(['', false, null], $def->getNode()->getValues());
+    }
 }
diff --git a/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
index b728dec5b1c78..86bc045eeca0f 100644
--- a/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
@@ -71,4 +71,20 @@ public function testWithPlaceHolderWithInvalidValue()
         $this->expectExceptionMessage('The value "foo" is not allowed for path "cookie_samesite". Permissible values: "lax", "strict", "none"');
         $node->finalize('custom');
     }
+
+    public function testSameStringCoercedValuesAreDifferent()
+    {
+        $node = new EnumNode('ccc', null, ['', false, null]);
+        $this->assertSame('', $node->finalize(''));
+        $this->assertFalse($node->finalize(false));
+        $this->assertNull($node->finalize(null));
+    }
+
+    public function testNonScalarOrNullValueThrows()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('"Symfony\Component\Config\Definition\EnumNode" only supports scalar or null values, "stdClass" given.');
+
+        new EnumNode('ccc', null, [new \stdClass()]);
+    }
 }

From 5e69f599960d4324b73f3e36442fc57ca29b0d87 Mon Sep 17 00:00:00 2001
From: Allison Guilhem <allison.guilhem@gmail.com>
Date: Mon, 16 Jan 2023 19:45:57 +0100
Subject: [PATCH 138/475] [Lock] create migration for lock table when
 DoctrineDbalStore is used

---
 .../LockStoreSchemaSubscriber.php             | 39 +++++++++++++++++++
 .../FrameworkExtension.php                    |  6 ++-
 src/Symfony/Component/Lock/CHANGELOG.md       |  5 +++
 .../Lock/Store/DoctrineDbalStore.php          | 10 ++++-
 .../Tests/Store/DoctrineDbalStoreTest.php     | 36 +++++++++++++++++
 .../Lock/Tests/Store/PdoStoreTest.php         |  1 +
 6 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaSubscriber.php

diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaSubscriber.php
new file mode 100644
index 0000000000000..cbd76fe1d10e2
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaSubscriber.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\SchemaListener;
+
+use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+use Symfony\Component\Lock\PersistingStoreInterface;
+use Symfony\Component\Lock\Store\DoctrineDbalStore;
+
+final class LockStoreSchemaSubscriber extends AbstractSchemaSubscriber
+{
+    /**
+     * @param iterable<mixed, PersistingStoreInterface> $stores
+     */
+    public function __construct(private iterable $stores)
+    {
+    }
+
+    public function postGenerateSchema(GenerateSchemaEventArgs $event): void
+    {
+        $connection = $event->getEntityManager()->getConnection();
+
+        foreach ($this->stores as $store) {
+            if (!$store instanceof DoctrineDbalStore) {
+                continue;
+            }
+
+            $store->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));
+        }
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 1a80c9ca9cfa5..551f02dc66299 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1898,8 +1898,10 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
             foreach ($resourceStores as $resourceStore) {
                 $storeDsn = $container->resolveEnvPlaceholders($resourceStore, null, $usedEnvs);
                 $storeDefinition = new Definition(PersistingStoreInterface::class);
-                $storeDefinition->setFactory([StoreFactory::class, 'createStore']);
-                $storeDefinition->setArguments([$resourceStore]);
+                $storeDefinition
+                    ->setFactory([StoreFactory::class, 'createStore'])
+                    ->setArguments([$resourceStore])
+                    ->addTag('lock.store');
 
                 $container->setDefinition($storeDefinitionId = '.lock.'.$resourceName.'.store.'.$container->hash($storeDsn), $storeDefinition);
 
diff --git a/src/Symfony/Component/Lock/CHANGELOG.md b/src/Symfony/Component/Lock/CHANGELOG.md
index 45d08d29f36ba..cc5528ffe188a 100644
--- a/src/Symfony/Component/Lock/CHANGELOG.md
+++ b/src/Symfony/Component/Lock/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Create migration for lock table when DoctrineDbalStore is used
+
 6.0
 ---
 
diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
index 9ea46a25ff9a2..dcdcc557881fe 100644
--- a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
+++ b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
@@ -181,13 +181,21 @@ public function createTable(): void
 
     /**
      * Adds the Table to the Schema if it doesn't exist.
+     *
+     * @param \Closure $isSameDatabase
      */
-    public function configureSchema(Schema $schema): void
+    public function configureSchema(Schema $schema/* , \Closure $isSameDatabase */): void
     {
         if ($schema->hasTable($this->table)) {
             return;
         }
 
+        $isSameDatabase = 1 < \func_num_args() ? func_get_arg(1) : static fn () => true;
+
+        if (!$isSameDatabase($this->conn->executeStatement(...))) {
+            return;
+        }
+
         $table = $schema->createTable($this->table);
         $table->addColumn($this->idCol, 'string', ['length' => 64]);
         $table->addColumn($this->tokenCol, 'string', ['length' => 44]);
diff --git a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php
index cf414926ff3ca..63e4cf8572d76 100644
--- a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php
@@ -15,6 +15,7 @@
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Exception\TableNotFoundException;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\Lock\Key;
 use Symfony\Component\Lock\PersistingStoreInterface;
 use Symfony\Component\Lock\Store\DoctrineDbalStore;
@@ -208,4 +209,39 @@ public function testCreatesTableOutsideTransaction()
 
         $store->save($key);
     }
+
+    public function testConfigureSchemaDifferentDatabase()
+    {
+        $conn = $this->createMock(Connection::class);
+        $someFunction = function () { return false; };
+        $schema = new Schema();
+
+        $dbalStore = new DoctrineDbalStore($conn);
+        $dbalStore->configureSchema($schema, $someFunction);
+        $this->assertFalse($schema->hasTable('lock_keys'));
+    }
+
+    public function testConfigureSchemaSameDatabase()
+    {
+        $conn = $this->createMock(Connection::class);
+        $someFunction = function () { return true; };
+        $schema = new Schema();
+
+        $dbalStore = new DoctrineDbalStore($conn);
+        $dbalStore->configureSchema($schema, $someFunction);
+        $this->assertTrue($schema->hasTable('lock_keys'));
+    }
+
+    public function testConfigureSchemaTableExists()
+    {
+        $conn = $this->createMock(Connection::class);
+        $schema = new Schema();
+        $schema->createTable('lock_keys');
+
+        $dbalStore = new DoctrineDbalStore($conn);
+        $someFunction = function () { return true; };
+        $dbalStore->configureSchema($schema, $someFunction);
+        $table = $schema->getTable('lock_keys');
+        $this->assertEmpty($table->getColumns(), 'The table was not overwritten');
+    }
 }
diff --git a/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php
index 35a605385f4e6..3f19e91487e01 100644
--- a/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php
@@ -20,6 +20,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
  * @requires extension pdo_sqlite
+ *
  * @group integration
  */
 class PdoStoreTest extends AbstractStoreTest

From 206c5f02bedba0d20cf4159e90a39b210dc8f314 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Tue, 17 Jan 2023 17:10:21 +0100
Subject: [PATCH 139/475] [WebProfilerBundle] Display date/time elements in the
 user local timezone

---
 .../views/Collector/logger.html.twig          |  2 +-
 .../views/Profiler/base_js.html.twig          | 37 +++++++++++++++++++
 .../Resources/views/Profiler/layout.html.twig |  2 +-
 .../views/Profiler/profiler.css.twig          |  5 +++
 .../views/Profiler/results.html.twig          |  8 +++-
 5 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
index 2ecaf52a4aeb6..c4d789e4778c1 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -138,7 +138,7 @@
                     %}
                     <tr class="log-status-{{ css_class }}" data-type="{{ log.type }}" data-priority="{{ log.priority }}" data-channel="{{ log.channel }}" style="{{ 'event' == log.channel or 'DEBUG' == log.priorityName ? 'display: none' }}">
                         <td class="log-timestamp">
-                            <time title="{{ log.timestamp|date('r') }}" datetime="{{ log.timestamp|date('c') }}">
+                            <time class="newline" title="{{ log.timestamp|date('r') }}" datetime="{{ log.timestamp|date(constant('\DateTime::RFC3339_EXTENDED')) }}" data-convert-to-user-timezone data-render-as-time data-render-with-millisecond-precision>
                                 {{ log.timestamp|date('H:i:s.v') }}
                             </time>
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
index 3086f3f6b852e..4b4a114045483 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -910,12 +910,49 @@ if (typeof Sfjs === 'undefined' || typeof Sfjs.loadToolbar === 'undefined') {
                 document.querySelector('#log-filter-priority .filter-active-num').innerText = (priorities.length === selectedPriorities.length) ? 'All' : selectedPriorities.length;
                 document.querySelector('#log-filter-channel .filter-active-num').innerText = (channels.length === selectedChannels.length) ? 'All' : selectedChannels.length;
             },
+
+            convertDateTimesToUserTimezone: function() {
+                const userTimezoneName = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+                document.querySelectorAll('time[data-convert-to-user-timezone]').forEach((timeElement) => {
+                    const iso8601Datetime = timeElement.getAttribute('datetime');
+                    const dateInUserTimezone = new Date(iso8601Datetime);
+
+                    let options = {};
+                    if (timeElement.hasAttribute('data-render-as-datetime')) {
+                        options = {
+                            year: 'numeric', month: 'long', day: 'numeric',
+                            hour: 'numeric', minute: 'numeric', second: 'numeric'
+                        };
+                    } else if (timeElement.hasAttribute('data-render-as-date')) {
+                        options = { year: 'numeric', month: 'long', day: 'numeric' };
+                    } else if (timeElement.hasAttribute('data-render-as-time')) {
+                        options = { hour: 'numeric', minute: 'numeric', second: 'numeric' };
+                    }
+
+                    if (timeElement.hasAttribute('data-render-with-millisecond-precision')) {
+                        options.fractionalSecondDigits = 3;
+                    }
+
+                    /* dates/times are always rendered in English to match the rest of the Profiler interface */
+                    timeElement.textContent = dateInUserTimezone.toLocaleString('en', options);
+
+                    if (undefined !== userTimezoneName) {
+                        const existingTitle = timeElement.getAttribute('title');
+                        const newTitle = null === existingTitle
+                            ? `Date/times shown in your timezone: ${userTimezoneName}`
+                            : existingTitle + ` (date/times shown in your timezone: ${userTimezoneName})`;
+                        timeElement.setAttribute('title', newTitle);
+                    }
+                });
+            },
         };
     })();
 
     Sfjs.addEventListener(document, 'DOMContentLoaded', function() {
         Sfjs.createTabs();
         Sfjs.createToggles();
+        Sfjs.convertDateTimesToUserTimezone();
     });
 }
 /*]]>*/</script>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
index a38bae9405d32..1bca6ae8e8cb8 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
@@ -79,7 +79,7 @@
                         </dd>
 
                         <dt>Profiled on</dt>
-                        <dd><time datetime="{{ profile.time|date('c') }}">{{ profile.time|date('r') }}</time></dd>
+                        <dd><time data-convert-to-user-timezone data-render-as-datetime datetime="{{ profile.time|date('c') }}">{{ profile.time|date('r') }}</time></dd>
 
                         <dt>Token</dt>
                         <dd>{{ profile.token }}</dd>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
index 0ff9c9d710222..e748024220da6 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -466,6 +466,11 @@ input[type="radio"], input[type="checkbox"] {
     box-shadow: none;
 }
 
+time[data-render-as-date],
+time[data-render-as-time] {
+    white-space: nowrap;
+}
+
 /* Used to hide elements added for accessibility reasons (the !important modifier is needed here) */
 .visually-hidden {
     border: 0 !important;
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig
index ae18451444218..26fcff3d242d2 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig
@@ -49,8 +49,12 @@
                             {{ _self.profile_search_filter(request, result, 'url') }}
                         </td>
                         <td class="text-small">
-                            <span class="nowrap">{{ result.time|date('d-M-Y') }}</span>
-                            <span class="nowrap newline">{{ result.time|date('H:i:s') }}</span>
+                            <time data-convert-to-user-timezone data-render-as-date datetime="{{ result.time|date('c') }}">
+                                {{ result.time|date('d-M-Y') }}
+                            </time>
+                            <time class="newline" data-convert-to-user-timezone data-render-as-time datetime="{{ result.time|date('c') }}">
+                                {{ result.time|date('H:i:s') }}
+                            </time>
                         </td>
                         <td class="nowrap"><a href="{{ path('_profiler', { token: result.token }) }}">{{ result.token }}</a></td>
                     </tr>

From fd48818b44c1cc20b359569248ef3e975d788ad5 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Fri, 20 Jan 2023 19:12:46 +0100
Subject: [PATCH 140/475] [Config] Fix EnumNode invalid value message

---
 src/Symfony/Component/Config/Definition/EnumNode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Config/Definition/EnumNode.php b/src/Symfony/Component/Config/Definition/EnumNode.php
index ebb78daa28508..771813c70b8a9 100644
--- a/src/Symfony/Component/Config/Definition/EnumNode.php
+++ b/src/Symfony/Component/Config/Definition/EnumNode.php
@@ -48,7 +48,7 @@ protected function finalizeValue(mixed $value): mixed
         $value = parent::finalizeValue($value);
 
         if (!\in_array($value, $this->values, true)) {
-            $ex = new InvalidConfigurationException(sprintf('The value %s is not allowed for path "%s". P
10000
ermissible values: %s', json_encode($value), $this->getPath(), implode(', ', array_map('json_encode', $this->values))));
+            $ex = new InvalidConfigurationException(sprintf('The value %s is not allowed for path "%s". Permissible values: %s', json_encode($value), $this->getPath(), implode(', ', array_unique(array_map('json_encode', $this->values)))));
             $ex->setPath($this->getPath());
 
             throw $ex;

From 47dd88289532bae8c2ec7e8cc3e14e6c67d1c49e Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Fri, 20 Jan 2023 19:18:13 +0100
Subject: [PATCH 141/475] conflict with symfony/dom-crawler < 6.3

This way we avoid surprising exceptions when the DomCrawlerAssertionsTrait's
assertSelectorCount() method is used with an older version of the DomCrawler
component.
---
 src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 096172bcf80e8..21574402c3594 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -80,7 +80,7 @@
         "symfony/console": "<5.4",
         "symfony/dotenv": "<5.4",
         "symfony/dom-crawler": "<5.4",
-        "symfony/http-client": "<5.4",
+        "symfony/http-client": "<6.3",
         "symfony/form": "<5.4",
         "symfony/lock": "<5.4",
         "symfony/mailer": "<5.4",

From c9fce4a783e1ddf4e65057b7746a622c4c1ea42d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 20 Jan 2023 19:39:38 +0100
Subject: [PATCH 142/475] Mention SensioLabs and Shopware as sponsors of
 version 6.3

---
 README.md | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 9882d80116fb8..faf5f2904d61b 100644
--- a/README.md
+++ b/README.md
@@ -17,17 +17,16 @@ Installation
 Sponsor
 -------
 
-Symfony 6.2 is [backed][27] by [Les-Tilleuls.coop][28] and [Sulu][29].
+Symfony 6.3 is [backed][27] by [SensioLabs][28] and [Shopware][29].
 
-**Les-Tilleuls.coop** is a team of 50+ Symfony experts who can help you design,
-develop and fix your projects. We provide a wide range of professional services
-including development, consulting, coaching, training and audits. We also are
-highly skilled in JS, Go and DevOps. We are a worker cooperative!
+As the creator of Symfony, **SensioLabs** supports companies using Symfony,
+with an offering encompassing consultancy, expertise, services, training, and
+technical assistance to ensure the success of web application development projects.
 
-**Sulu** is the CMS for Symfony developers. It provides pre-built content-management
-features while giving developers the freedom to build, deploy, and maintain
-custom solutions using full-stack Symfony. Sulu is ideal for creating complex
-websites, integrating external tools, and building custom-built solutions.
+**Shopware** offers you cutting-edge, highly adaptable ecommerce solutions trusted
+by the world's most acclaimed brands. Create outstanding customer experiences,
+innovate fast, and accelerate your growth in the ever-evolving space of digital
+commerce. You decide how far you want to go, and we'll be by your side.
 
 Help Symfony by [sponsoring][30] its development!
 
@@ -92,6 +91,6 @@ and supported by [Symfony contributors][19].
 [25]: https://symfony.com/doc/current/contributing/code_of_conduct/care_team.html
 [26]: https://symfony.com/book
 [27]: https://symfony.com/backers
-[28]: https://les-tilleuls.coop/
-[29]: https://sulu.io/
+[28]: https://sensiolabs.com
+[29]: https://www.shopware.com
 [30]: https://symfony.com/sponsor

From 80386491de4baa93111fe95929aa2577991400c8 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 23 Jan 2023 10:11:49 +0100
Subject: [PATCH 143/475] Mention Les-Tilleuls.coop as backer of version 6.3

---
 README.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index faf5f2904d61b..ff6e42444de69 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Installation
 Sponsor
 -------
 
-Symfony 6.3 is [backed][27] by [SensioLabs][28] and [Shopware][29].
+Symfony 6.3 is [backed][27] by [SensioLabs][28], [Shopware][29] and [Les-Tilleuls.coop][30].
 
 As the creator of Symfony, **SensioLabs** supports companies using Symfony,
 with an offering encompassing consultancy, expertise, services, training, and
@@ -28,7 +28,12 @@ by the world's most acclaimed brands. Create outstanding customer experiences,
 innovate fast, and accelerate your growth in the ever-evolving space of digital
 commerce. You decide how far you want to go, and we'll be by your side.
 
-Help Symfony by [sponsoring][30] its development!
+**Les-Tilleuls.coop** is a team of 70+ Symfony experts who can help you design,
+develop and fix your projects. We provide a wide range of professional services
+including development, consulting, coaching, training and audits. We also are
+highly skilled in JS, Go and DevOps. We are a worker cooperative!
+
+Help Symfony by [sponsoring][31] its development!
 
 Documentation
 -------------
@@ -93,4 +98,5 @@ and supported by [Symfony contributors][19].
 [27]: https://symfony.com/backers
 [28]: https://sensiolabs.com
 [29]: https://www.shopware.com
-[30]: https://symfony.com/sponsor
+[30]: https://les-tilleuls.coop
+[31]: https://symfony.com/sponsor

From 849e575ecffc50b5a9a70f31978357564ffb2b2d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 22 Jan 2023 15:14:08 +0100
Subject: [PATCH 144/475] Mark DSNs as #[SensitiveParameter]

---
 .../Component/Cache/Adapter/AbstractAdapter.php    |  2 +-
 .../Cache/Adapter/CouchbaseBucketAdapter.php       |  2 +-
 .../Cache/Adapter/CouchbaseCollectionAdapter.php   |  2 +-
 .../Component/Cache/Adapter/MemcachedAdapter.php   |  2 +-
 src/Symfony/Component/Cache/Adapter/PdoAdapter.php |  2 +-
 src/Symfony/Component/Cache/Traits/RedisTrait.php  |  2 +-
 .../Session/Storage/Handler/PdoSessionHandler.php  |  6 +++---
 .../Lock/Store/DoctrineDbalPostgreSqlStore.php     |  4 ++--
 src/Symfony/Component/Lock/Store/PdoStore.php      |  2 +-
 .../Component/Lock/Store/PostgreSqlStore.php       |  2 +-
 .../Component/Lock/Store/ZookeeperStore.php        |  2 +-
 src/Symfony/Component/Mailer/Transport.php         | 10 +++++-----
 .../Mailer/Transport/AbstractTransportFactory.php  | 14 ++------------
 src/Symfony/Component/Mailer/Transport/Dsn.php     |  2 +-
 .../Transport/AmazonSqsTransportFactory.php        |  4 ++--
 .../Bridge/AmazonSqs/Transport/Connection.php      |  2 +-
 .../Bridge/Amqp/Transport/AmqpTransportFactory.php |  4 ++--
 .../Messenger/Bridge/Amqp/Transport/Connection.php |  2 +-
 .../Transport/BeanstalkdTransportFactory.php       |  4 ++--
 .../Bridge/Beanstalkd/Transport/Connection.php     |  2 +-
 .../Bridge/Doctrine/Transport/Connection.php       |  2 +-
 .../Transport/DoctrineTransportFactory.php         |  4 ++--
 .../Bridge/Redis/Transport/Connection.php          |  2 +-
 .../Redis/Transport/RedisTransportFactory.php      |  4 ++--
 .../Transport/Sync/SyncTransportFactory.php        |  4 ++--
 .../Messenger/Transport/TransportFactory.php       |  4 ++--
 .../Transport/TransportFactoryInterface.php        |  4 ++--
 src/Symfony/Component/Notifier/Transport.php       | 10 +++++-----
 .../Transport/AbstractTransportFactory.php         | 14 ++------------
 src/Symfony/Component/Notifier/Transport/Dsn.php   |  2 +-
 .../Provider/AbstractProviderFactory.php           | 12 ++----------
 src/Symfony/Component/Translation/Provider/Dsn.php |  2 +-
 32 files changed, 54 insertions(+), 82 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
index 994c2fb9e2964..c91da94b04f45 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -110,7 +110,7 @@ public static function createSystemCache(string $namespace, int $defaultLifetime
         return new ChainAdapter([$apcu, $opcache]);
     }
 
-    public static function createConnection(string $dsn, array $options = [])
+    public static function createConnection(#[\SensitiveParameter] string $dsn, array $options = [])
     {
         if (str_starts_with($dsn, 'redis:') || str_starts_with($dsn, 'rediss:')) {
             return RedisAdapter::createConnection($dsn, $options);
diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php
index 63a318e7725c2..f7b2c156e1de5 100644
--- a/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php
@@ -54,7 +54,7 @@ public function __construct(\CouchbaseBucket $bucket, string $namespace = '', in
         $this->marshaller = $marshaller ?? new DefaultMarshaller();
     }
 
-    public static function createConnection(array|string $servers, array $options = []): \CouchbaseBucket
+    public static function createConnection(#[\SensitiveParameter] array|string $servers, array $options = []): \CouchbaseBucket
     {
         if (\is_string($servers)) {
             $servers = [$servers];
diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php
index b452ed5b5986d..321e7b3ee67cf 100644
--- a/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php
@@ -47,7 +47,7 @@ public function __construct(Collection $connection, string $namespace = '', int
         $this->marshaller = $marshaller ?? new DefaultMarshaller();
     }
 
-    public static function createConnection(array|string $dsn, array $options = []): Bucket|Collection
+    public static function createConnection(#[\SensitiveParameter] array|string $dsn, array $options = []): Bucket|Collection
     {
         if (\is_string($dsn)) {
             $dsn = [$dsn];
diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
index e3765469050c8..e5ab3c72dad3b 100644
--- a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
@@ -92,7 +92,7 @@ public static function isSupported()
      *
      * @throws \ErrorException When invalid options or servers are provided
      */
-    public static function createConnection(array|string $servers, array $options = []): \Memcached
+    public static function createConnection(#[\SensitiveParameter] array|string $servers, array $options = []): \Memcached
     {
         if (\is_string($servers)) {
             $servers = [$servers];
diff --git a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
index 355efbe8ff061..bafc6dff4da0d 100644
--- a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
@@ -55,7 +55,7 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
      * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      * @throws InvalidArgumentException When namespace contains invalid characters
      */
-    public function __construct(\PDO|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)
+    public function __construct(#[\SensitiveParameter] \PDO|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)
     {
         if (\is_string($connOrDsn) && str_contains($connOrDsn, '://')) {
             throw new InvalidArgumentException(sprintf('Usage of Doctrine DBAL URL with "%s" is not supported. Use a PDO DSN or "%s" instead. Got "%s".', __CLASS__, DoctrineDbalAdapter::class, $connOrDsn));
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index 0251ce67e53c3..ef5de296f6550 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -80,7 +80,7 @@ private function init(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface $
      *
      * @throws InvalidArgumentException when the DSN is invalid
      */
-    public static function createConnection(string $dsn, array $options = []): \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface
+    public static function createConnection(#[\SensitiveParameter] string $dsn, array $options = []): \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface
     {
         if (str_starts_with($dsn, 'redis:')) {
             $scheme = 'redis';
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
index a5257b4172549..84b3e336fbdd2 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -151,7 +151,7 @@ class PdoSessionHandler extends AbstractSessionHandler
      *
      * @throws \InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      */
-    public function __construct(\PDO|string $pdoOrDsn = null, array $options = [])
+    public function __construct(#[\SensitiveParameter] \PDO|string $pdoOrDsn = null, #[\SensitiveParameter] array $options = [])
     {
         if ($pdoOrDsn instanceof \PDO) {
             if (\PDO::ERRMODE_EXCEPTION !== $pdoOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) {
@@ -415,7 +415,7 @@ public function close(): bool
     /**
      * Lazy-connects to the database.
      */
-    private function connect(string $dsn): void
+    private function connect(#[\SensitiveParameter] string $dsn): void
     {
         $this->pdo = new \PDO($dsn, $this->username, $this->password, $this->connectionOptions);
         $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
@@ -427,7 +427,7 @@ private function connect(string $dsn): void
      *
      * @todo implement missing support for oci DSN (which look totally different from other PDO ones)
      */
-    private function buildDsnFromUrl(string $dsnOrUrl): string
+    private function buildDsnFromUrl(#[\SensitiveParameter] string $dsnOrUrl): string
     {
         // (pdo_)?sqlite3?:///... => (pdo_)?sqlite3?://localhost/... or else the URL will be invalid
         $url = preg_replace('#^((?:pdo_)?sqlite3?):///#', '$1://localhost/', $dsnOrUrl);
diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
index a3a179ed54893..d2ec6c6f9e243 100644
--- a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
+++ b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
@@ -38,7 +38,7 @@ class DoctrineDbalPostgreSqlStore implements BlockingSharedLockStoreInterface, B
      *
      * @throws InvalidArgumentException When first argument is not Connection nor string
      */
-    public function __construct(Connection|string $connOrUrl)
+    public function __construct(#[\SensitiveParameter] Connection|string $connOrUrl)
     {
         if ($connOrUrl instanceof Connection) {
             if (!$connOrUrl->getDatabasePlatform() instanceof PostgreSQLPlatform) {
@@ -243,7 +243,7 @@ private function unlockShared(Key $key): void
      *
      * @throws InvalidArgumentException when driver is not supported
      */
-    private function filterDsn(string $dsn): string
+    private function filterDsn(#[\SensitiveParameter] string $dsn): string
     {
         if (!str_contains($dsn, '://')) {
             throw new InvalidArgumentException(sprintf('String "%" is not a valid DSN for Doctrine DBAL.', $dsn));
diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php
index c5a7552c8d95b..61803278ab76e 100644
--- a/src/Symfony/Component/Lock/Store/PdoStore.php
+++ b/src/Symfony/Component/Lock/Store/PdoStore.php
@@ -64,7 +64,7 @@ class PdoStore implements PersistingStoreInterface
      * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      * @throws InvalidArgumentException When the initial ttl is not valid
      */
-    public function __construct(\PDO|string $connOrDsn, array $options = [], float $gcProbability = 0.01, int $initialTtl = 300)
+    public function __construct(#[\SensitiveParameter] \PDO|string $connOrDsn, #[\SensitiveParameter] array $options = [], float $gcProbability = 0.01, int $initialTtl = 300)
     {
         $this->init($options, $gcProbability, $initialTtl);
 
diff --git a/src/Symfony/Component/Lock/Store/PostgreSqlStore.php b/src/Symfony/Component/Lock/Store/PostgreSqlStore.php
index d83259ce96332..8e78c2c2efc95 100644
--- a/src/Symfony/Component/Lock/Store/PostgreSqlStore.php
+++ b/src/Symfony/Component/Lock/Store/PostgreSqlStore.php
@@ -49,7 +49,7 @@ class PostgreSqlStore implements BlockingSharedLockStoreInterface, BlockingStore
      * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      * @throws InvalidArgumentException When namespace contains invalid characters
      */
-    public function __construct(\PDO|string $connOrDsn, array $options = [])
+    public function __construct(#[\SensitiveParameter] \PDO|string $connOrDsn, #[\SensitiveParameter] array $options = [])
     {
         if ($connOrDsn instanceof \PDO) {
             if (\PDO::ERRMODE_EXCEPTION !== $connOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) {
diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
index 22214b4e8328d..03b9bec310695 100644
--- a/src/Symfony/Component/Lock/Store/ZookeeperStore.php
+++ b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
@@ -34,7 +34,7 @@ public function __construct(\Zookeeper $zookeeper)
         $this->zookeeper = $zookeeper;
     }
 
-    public static function createConnection(string $dsn): \Zookeeper
+    public static function createConnection(#[\SensitiveParameter] string $dsn): \Zookeeper
     {
         if (!str_starts_with($dsn, 'zookeeper:')) {
             throw new InvalidArgumentException(sprintf('Unsupported DSN: "%s".', $dsn));
diff --git a/src/Symfony/Component/Mailer/Transport.php b/src/Symfony/Component/Mailer/Transport.php
index f1d7c1d77798f..3a27fe9f6edc9 100644
--- a/src/Symfony/Component/Mailer/Transport.php
+++ b/src/Symfony/Component/Mailer/Transport.php
@@ -58,14 +58,14 @@ final class Transport
 
     private iterable $factories;
 
-    public static function fromDsn(string $dsn, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface
+    public static function fromDsn(#[\SensitiveParameter] string $dsn, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface
     {
         $factory = new self(iterator_to_array(self::getDefaultFactories($dispatcher, $client, $logger)));
 
         return $factory->fromString($dsn);
     }
 
-    public static function fromDsns(array $dsns, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface
+    public static function fromDsns(#[\SensitiveParameter] array $dsns, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface
     {
         $factory = new self(iterator_to_array(self::getDefaultFactories($dispatcher, $client, $logger)));
 
@@ -80,7 +80,7 @@ public function __construct(iterable $factories)
         $this->factories = $factories;
     }
 
-    public function fromStrings(array $dsns): Transports
+    public function fromStrings(#[\SensitiveParameter] array $dsns): Transports
     {
         $transports = [];
         foreach ($dsns as $name => $dsn) {
@@ -90,7 +90,7 @@ public function fromStrings(array $dsns): Transports
         return new Transports($transports);
     }
 
-    public function fromString(string $dsn): TransportInterface
+    public function fromString(#[\SensitiveParameter] string $dsn): TransportInterface
     {
         [$transport, $offset] = $this->parseDsn($dsn);
         if ($offset !== \strlen($dsn)) {
@@ -100,7 +100,7 @@ public function fromString(string $dsn): TransportInterface
         return $transport;
     }
 
-    private function parseDsn(string $dsn, int $offset = 0): array
+    private function parseDsn(#[\SensitiveParameter] string $dsn, int $offset = 0): array
     {
         static $keywords = [
             'failover' => FailoverTransport::class,
diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransportFactory.php b/src/Symfony/Component/Mailer/Transport/AbstractTransportFactory.php
index e1617d2702134..0d021ed8e0151 100644
--- a/src/Symfony/Component/Mailer/Transport/AbstractTransportFactory.php
+++ b/src/Symfony/Component/Mailer/Transport/AbstractTransportFactory.php
@@ -41,21 +41,11 @@ abstract protected function getSupportedSchemes(): array;
 
     protected function getUser(Dsn $dsn): string
     {
-        $user = $dsn->getUser();
-        if (null === $user) {
-            throw new IncompleteDsnException('User is not set.');
-        }
-
-        return $user;
+        return $dsn->getUser() ?? throw new IncompleteDsnException('User is not set.');
     }
 
     protected function getPassword(Dsn $dsn): string
     {
-        $password = $dsn->getPassword();
-        if (null === $password) {
-            throw new IncompleteDsnException('Password is not set.');
-        }
-
-        return $password;
+        return $dsn->getPassword() ?? throw new IncompleteDsnException('Password is not set.');
     }
 }
diff --git a/src/Symfony/Component/Mailer/Transport/Dsn.php b/src/Symfony/Component/Mailer/Transport/Dsn.php
index 065be9a3f2e9f..3c65053f89697 100644
--- a/src/Symfony/Component/Mailer/Transport/Dsn.php
+++ b/src/Symfony/Component/Mailer/Transport/Dsn.php
@@ -35,7 +35,7 @@ public function __construct(string $scheme, string $host, string $user = null, #
         $this->options = $options;
     }
 
-    public static function fromString(string $dsn): self
+    public static function fromString(#[\SensitiveParameter] string $dsn): self
     {
         if (false === $parsedDsn = parse_url($dsn)) {
             throw new InvalidArgumentException(sprintf('The "%s" mailer DSN is invalid.', $dsn));
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransportFactory.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransportFactory.php
index cc59aa2cf90c8..20677937b921e 100644
--- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransportFactory.php
+++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransportFactory.php
@@ -28,14 +28,14 @@ public function __construct(LoggerInterface $logger = null)
         $this->logger = $logger;
     }
 
-    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
+    public function createTransport(#[\SensitiveParameter] string $dsn, array $options, SerializerInterface $serializer): TransportInterface
     {
         unset($options['transport_name']);
 
         return new AmazonSqsTransport(Connection::fromDsn($dsn, $options, null, $this->logger), $serializer);
     }
 
-    public function supports(string $dsn, array $options): bool
+    public function supports(#[\SensitiveParameter] string $dsn, array $options): bool
     {
         return str_starts_with($dsn, 'sqs://') || preg_match('#^https://sqs\.[\w\-]+\.amazonaws\.com/.+#', $dsn);
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php
index 2b7da7ee0646e..2f1e4d8ad9c2c 100644
--- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php
@@ -99,7 +99,7 @@ public function __destruct()
      * * auto_setup: Whether the queue should be created automatically during send / get (Default: true)
      * * debug: Log all HTTP requests and responses as LoggerInterface::DEBUG (Default: false)
      */
-    public static function fromDsn(string $dsn, array $options = [], HttpClientInterface $client = null, LoggerInterface $logger = null): self
+    public static function fromDsn(#[\SensitiveParameter] string $dsn, array $options = [], HttpClientInterface $client = null, LoggerInterface $logger = null): self
     {
         if (false === $parsedUrl = parse_url($dsn)) {
             throw new InvalidArgumentException(sprintf('The given Amazon SQS DSN "%s" is invalid.', $dsn));
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpTransportFactory.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpTransportFactory.php
index e77eeb1766afb..34f6d473373de 100644
--- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpTransportFactory.php
+++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpTransportFactory.php
@@ -20,14 +20,14 @@
  */
 class AmqpTransportFactory implements TransportFactoryInterface
 {
-    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
+    public function createTransport(#[\SensitiveParameter] string $dsn, array $options, SerializerInterface $serializer): TransportInterface
     {
         unset($options['transport_name']);
 
         return new AmqpTransport(Connection::fromDsn($dsn, $options), $serializer);
     }
 
-    public function supports(string $dsn, array $options): bool
+    public function supports(#[\SensitiveParameter] string $dsn, array $options): bool
     {
         return str_starts_with($dsn, 'amqp://') || str_starts_with($dsn, 'amqps://');
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
index 37d52009faa47..3fb9b852b45c4 100644
--- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -160,7 +160,7 @@ public function __construct(array $connectionOptions, array $exchangeOptions, ar
      *     * verify: Enable or disable peer verification. If peer verification is enabled then the common name in the
      *       server certificate must match the server name. Peer verification is enabled by default.
      */
-    public static function fromDsn(string $dsn, array $options = [], AmqpFactory $amqpFactory = null): self
+    public static function fromDsn(#[\SensitiveParameter] string $dsn, array $options = [], AmqpFactory $amqpFactory = null): self
     {
         if (false === $parsedUrl = parse_url($dsn)) {
             // this is a valid URI that parse_url cannot handle when you want to pass all parameters as options
diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdTransportFactory.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdTransportFactory.php
index 318d373ea1df3..26c65ecd1bfa0 100644
--- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdTransportFactory.php
+++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdTransportFactory.php
@@ -20,14 +20,14 @@
  */
 class BeanstalkdTransportFactory implements TransportFactoryInterface
 {
-    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
+    public function createTransport(#[\SensitiveParameter] string $dsn, array $options, SerializerInterface $serializer): TransportInterface
     {
         unset($options['transport_name']);
 
         return new BeanstalkdTransport(Connection::fromDsn($dsn, $options), $serializer);
     }
 
-    public function supports(string $dsn, array $options): bool
+    public function supports(#[\SensitiveParameter] string $dsn, array $options): bool
     {
         return str_starts_with($dsn, 'beanstalkd://');
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php
index f664b090305e3..df115897809c8 100644
--- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php
@@ -55,7 +55,7 @@ public function __construct(array $configuration, PheanstalkInterface $client)
         $this->ttr = $this->configuration['ttr'];
     }
 
-    public static function fromDsn(string $dsn, array $options = []): self
+    public static function fromDsn(#[\SensitiveParameter] string $dsn, array $options = []): self
     {
         if (false === $components = parse_url($dsn)) {
             throw new InvalidArgumentException(sprintf('The given Beanstalkd DSN "%s" is invalid.', $dsn));
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
index 222791b8d0ba9..061f0715013d2 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -84,7 +84,7 @@ public function getConfiguration(): array
         return $this->configuration;
     }
 
-    public static function buildConfiguration(string $dsn, array $options = []): array
+    public static function buildConfiguration(#[\SensitiveParameter] string $dsn, array $options = []): array
     {
         if (false === $components = parse_url($dsn)) {
             throw new InvalidArgumentException(sprintf('The given Doctrine Messenger DSN "%s" is invalid.', $dsn));
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php
index 2b054ea37e864..d7f0d6136d216 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php
@@ -30,7 +30,7 @@ public function __construct(ConnectionRegistry $registry)
         $this->registry = $registry;
     }
 
-    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
+    public function createTransport(#[\SensitiveParameter] string $dsn, array $options, SerializerInterface $serializer): TransportInterface
     {
         $useNotify = ($options['use_notify'] ?? true);
         unset($options['transport_name'], $options['use_notify']);
@@ -52,7 +52,7 @@ public function createTransport(string $dsn, array $options, SerializerInterface
         return new DoctrineTransport($connection, $serializer);
     }
 
-    public function supports(string $dsn, array $options): bool
+    public function supports(#[\SensitiveParameter] string $dsn, array $options): bool
     {
         return str_starts_with($dsn, 'doctrine://');
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
index 1884286185196..284b4cb89fed3 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -157,7 +157,7 @@ private static function initializeRedisCluster(?\RedisCluster $redis, array $hos
         return $redis;
     }
 
-    public static function fromDsn(string $dsn, array $options = [], \Redis|\RedisCluster $redis = null): self
+    public static function fromDsn(#[\SensitiveParameter] string $dsn, array $options = [], \Redis|\RedisCluster $redis = null): self
     {
         if (!str_contains($dsn, ',')) {
             $parsedUrl = self::parseDsn($dsn, $options);
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransportFactory.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransportFactory.php
index 7e783775868db..5b95da565971f 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransportFactory.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransportFactory.php
@@ -21,14 +21,14 @@
  */
 class RedisTransportFactory implements TransportFactoryInterface
 {
-    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
+    public function createTransport(#[\SensitiveParameter] string $dsn, array $options, SerializerInterface $serializer): TransportInterface
     {
         unset($options['transport_name']);
 
         return new RedisTransport(Connection::fromDsn($dsn, $options), $serializer);
     }
 
-    public function supports(string $dsn, array $options): bool
+    public function supports(#[\SensitiveParameter] string $dsn, array $options): bool
     {
         return str_starts_with($dsn, 'redis://') || str_starts_with($dsn, 'rediss://');
     }
diff --git a/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php b/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php
index e3af38340c222..c4c9ebb6bebea 100644
--- a/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php
+++ b/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php
@@ -28,12 +28,12 @@ public function __construct(MessageBusInterface $messageBus)
         $this->messageBus = $messageBus;
     }
 
-    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
+    public function createTransport(#[\SensitiveParameter] string $dsn, array $options, SerializerInterface $serializer): TransportInterface
     {
         return new SyncTransport($this->messageBus);
     }
 
-    public function supports(string $dsn, array $options): bool
+    public function supports(#[\SensitiveParameter] string $dsn, array $options): bool
     {
         return str_starts_with($dsn, 'sync://');
     }
diff --git a/src/Symfony/Component/Messenger/Transport/TransportFactory.php b/src/Symfony/Component/Messenger/Transport/TransportFactory.php
index 6a3cf3365c3b2..aa16305a18f14 100644
--- a/src/Symfony/Component/Messenger/Transport/TransportFactory.php
+++ b/src/Symfony/Component/Messenger/Transport/TransportFactory.php
@@ -29,7 +29,7 @@ public function __construct(iterable $factories)
         $this->factories = $factories;
     }
 
-    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
+    public function createTransport(#[\SensitiveParameter] string $dsn, array $options, SerializerInterface $serializer): TransportInterface
     {
         foreach ($this->factories as $factory) {
             if ($factory->supports($dsn, $options)) {
@@ -54,7 +54,7 @@ public function createTransport(string $dsn, array $options, SerializerInterface
         throw new InvalidArgumentException(sprintf('No transport supports the given Messenger DSN "%s".%s.', $dsn, $packageSuggestion));
     }
 
-    public function supports(string $dsn, array $options): bool
+    public function supports(#[\SensitiveParameter] string $dsn, array $options): bool
     {
         foreach ($this->factories as $factory) {
             if ($factory->supports($dsn, $options)) {
diff --git a/src/Symfony/Component/Messenger/Transport/TransportFactoryInterface.php b/src/Symfony/Component/Messenger/Transport/TransportFactoryInterface.php
index 5741c3065d98d..f70d45c8e0889 100644
--- a/src/Symfony/Component/Messenger/Transport/TransportFactoryInterface.php
+++ b/src/Symfony/Component/Messenger/Transport/TransportFactoryInterface.php
@@ -20,7 +20,7 @@
  */
 interface TransportFactoryInterface
 {
-    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface;
+    public function createTransport(#[\SensitiveParameter] string $dsn, array $options, SerializerInterface $serializer): TransportInterface;
 
-    public function supports(string $dsn, array $options): bool;
+    public function supports(#[\SensitiveParameter] string $dsn, array $options): bool;
 }
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
index 10b4650a57200..260c57cb349b7 100644
--- a/src/Symfony/Component/Notifier/Transport.php
+++ b/src/Symfony/Component/Notifier/Transport.php
@@ -136,14 +136,14 @@ final class Transport
 
     private iterable $factories;
 
-    public static function fromDsn(string $dsn, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null): TransportInterface
+    public static function fromDsn(#[\SensitiveParameter] string $dsn, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null): TransportInterface
     {
         $factory = new self(self::getDefaultFactories($dispatcher, $client));
 
         return $factory->fromString($dsn);
     }
 
-    public static function fromDsns(array $dsns, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null): TransportInterface
+    public static function fromDsns(#[\SensitiveParameter] array $dsns, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null): TransportInterface
     {
         $factory = new self(iterator_to_array(self::getDefaultFactories($dispatcher, $client)));
 
@@ -158,7 +158,7 @@ public function __construct(iterable $factories)
         $this->factories = $factories;
     }
 
-    public function fromStrings(array $dsns): Transports
+    public function fromStrings(#[\SensitiveParameter] array $dsns): Transports
     {
         $transports = [];
         foreach ($dsns as $name => $dsn) {
@@ -168,7 +168,7 @@ public function fromStrings(array $dsns): Transports
         return new Transports($transports);
     }
 
-    public function fromString(string $dsn): TransportInterface
+    public function fromString(#[\SensitiveParameter] string $dsn): TransportInterface
     {
         $dsns = preg_split('/\s++\|\|\s++/', $dsn);
         if (\count($dsns) > 1) {
@@ -197,7 +197,7 @@ public function fromDsnObject(Dsn $dsn): TransportInterface
     /**
      * @return TransportInterface[]
      */
-    private function createFromDsns(array $dsns): array
+    private function createFromDsns(#[\SensitiveParameter] array $dsns): array
     {
         $transports = [];
         foreach ($dsns as $dsn) {
diff --git a/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php b/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php
index 0a1d1513e8bae..4703fb05719de 100644
--- a/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php
+++ b/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php
@@ -42,21 +42,11 @@ abstract protected function getSupportedSchemes(): array;
 
     protected function getUser(Dsn $dsn): string
     {
-        $user = $dsn->getUser();
-        if (null === $user) {
-            throw new IncompleteDsnException('User is not set.', $dsn->getOriginalDsn());
-        }
-
-        return $user;
+        return $dsn->getUser() ?? throw new IncompleteDsnException('User is not set.', $dsn->getOriginalDsn());
     }
 
     protected function getPassword(Dsn $dsn): string
     {
-        $password = $dsn->getPassword();
-        if (null === $password) {
-            throw new IncompleteDsnException('Password is not set.', $dsn->getOriginalDsn());
-        }
-
-        return $password;
+        return $dsn->getPassword() ?? new IncompleteDsnException('Password is not set.', $dsn->getOriginalDsn());
     }
 }
diff --git a/src/Symfony/Component/Notifier/Transport/Dsn.php b/src/Symfony/Component/Notifier/Transport/Dsn.php
index d528f7a39ada0..450acda1c8752 100644
--- a/src/Symfony/Component/Notifier/Transport/Dsn.php
+++ b/src/Symfony/Component/Notifier/Transport/Dsn.php
@@ -29,7 +29,7 @@ final class Dsn
     private array $options = [];
     private string $originalDsn;
 
-    public function __construct(string $dsn)
+    public function __construct(#[\SensitiveParameter] string $dsn)
     {
         $this->originalDsn = $dsn;
 
diff --git a/src/Symfony/Component/Translation/Provider/AbstractProviderFactory.php b/src/Symfony/Component/Translation/Provider/AbstractProviderFactory.php
index 17442fde873a1..d9b05b5e9813c 100644
--- a/src/Symfony/Component/Translation/Provider/AbstractProviderFactory.php
+++ b/src/Symfony/Component/Translation/Provider/AbstractProviderFactory.php
@@ -27,19 +27,11 @@ abstract protected function getSupportedSchemes(): array;
 
     protected function getUser(Dsn $dsn): string
     {
-        if (null === $user = $dsn->getUser()) {
-            throw new IncompleteDsnException('User is not set.', $dsn->getOriginalDsn());
-        }
-
-        return $user;
+        return $dsn->getUser() ?? throw new IncompleteDsnException('User is not set.', $dsn->getOriginalDsn());
     }
 
     protected function getPassword(Dsn $dsn): string
     {
-        if (null === $password = $dsn->getPassword()) {
-            throw new IncompleteDsnException('Password is not set.', $dsn->getOriginalDsn());
-        }
-
-        return $password;
+        return $dsn->getPassword() ?? throw new IncompleteDsnException('Password is not set.', $dsn->getOriginalDsn());
     }
 }
diff --git a/src/Symfony/Component/Translation/Provider/Dsn.php b/src/Symfony/Component/Translation/Provider/Dsn.php
index 0f74d17fbddc1..46061530ea1f6 100644
--- a/src/Symfony/Component/Translation/Provider/Dsn.php
+++ b/src/Symfony/Component/Translation/Provider/Dsn.php
@@ -29,7 +29,7 @@ final class Dsn
     private array $options = [];
     private string $originalDsn;
 
-    public function __construct(string $dsn)
+    public function __construct(#[\SensitiveParameter] string $dsn)
     {
         $this->originalDsn = $dsn;
 

From 62dcacd109c21ef7b38c00ee6eb09b7cc10d5a1c Mon Sep 17 00:00:00 2001
From: Dane Powell <git@danepowell.com>
Date: Mon, 16 Jan 2023 11:49:07 -0800
Subject: [PATCH 145/475] Fix Psalm errors

---
 .github/workflows/psalm.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index b7e520f340920..26d816ccb6c63 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -49,8 +49,10 @@ jobs:
           git checkout composer.json
           git checkout -m ${{ github.base_ref }}
 
-          # to be removed when psalm adds support for intersection types
+          # @todo intersection types are broken in Psalm
+          # @see https://github.com/vimeo/psalm/issues/7520
           sed -i 's/Uuid&/Uuid|/' src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php
+          sed -i 's/Interface&/Interface|/' src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php
           ./vendor/bin/psalm.phar --set-baseline=.github/psalm/psalm.baseline.xml --no-progress
           git checkout -m FETCH_HEAD
 

From 1cbd95eac633746278d8c38d07fb22487d32bc8c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 23 Jan 2023 14:36:51 +0100
Subject: [PATCH 146/475] Remove full DSNs from exception messages

---
 .../Cache/Adapter/AbstractAdapter.php         |  2 +-
 .../Cache/Adapter/CouchbaseBucketAdapter.php  |  2 +-
 .../Adapter/CouchbaseCollectionAdapter.php    |  2 +-
 .../Cache/Adapter/DoctrineDbalAdapter.php     |  2 +-
 .../Cache/Adapter/MemcachedAdapter.php        |  8 ++---
 .../Component/Cache/Adapter/PdoAdapter.php    |  2 +-
 .../Component/Cache/Traits/RedisTrait.php     | 34 +++++++++----------
 .../Storage/Handler/SessionHandlerFactory.php |  4 +--
 .../Store/DoctrineDbalPostgreSqlStore.php     |  4 +--
 .../Lock/Store/DoctrineDbalStore.php          |  2 +-
 .../Component/Lock/Store/StoreFactory.php     |  4 +--
 .../Component/Lock/Store/ZookeeperStore.php   |  4 +--
 .../Mailer/Tests/Transport/DsnTest.php        |  6 ++--
 .../Component/Mailer/Tests/TransportTest.php  |  6 ++--
 src/Symfony/Component/Mailer/Transport.php    |  2 +-
 .../Component/Mailer/Transport/Dsn.php        |  6 ++--
 .../Tests/Transport/ConnectionTest.php        |  2 +-
 .../Bridge/AmazonSqs/Transport/Connection.php |  3 +-
 .../Amqp/Tests/Transport/ConnectionTest.php   |  2 +-
 .../Bridge/Amqp/Transport/Connection.php      |  2 +-
 .../Tests/Transport/ConnectionTest.php        |  5 ++-
 .../Beanstalkd/Transport/Connection.php       |  3 +-
 .../DoctrineTransportFactoryTest.php          |  2 +-
 .../Bridge/Doctrine/Transport/Connection.php  |  2 +-
 .../Transport/DoctrineTransportFactory.php    |  2 +-
 .../Redis/Tests/Transport/ConnectionTest.php  |  2 +-
 .../Bridge/Redis/Transport/Connection.php     |  6 ++--
 .../Messenger/Transport/TransportFactory.php  |  2 +-
 .../MicrosoftTeamsTransportFactory.php        |  2 +-
 .../Bridge/OvhCloud/OvhCloudTransport.php     |  6 ++--
 .../Tests/OvhCloudTransportFactoryTest.php    | 10 +++---
 .../OvhCloud/Tests/OvhCloudTransportTest.php  |  6 ++--
 .../PagerDuty/PagerDutyTransportFactory.php   |  4 +--
 .../Bridge/Sendberry/SendberryTransport.php   |  2 +-
 .../Tests/SendberryTransportFactoryTest.php   |  2 +-
 .../Tests/SendberryTransportTest.php          |  2 +-
 .../Telegram/TelegramTransportFactory.php     |  4 +--
 .../Tests/TwitterTransportFactoryTest.php     |  2 +-
 .../Twitter/TwitterTransportFactory.php       |  2 +-
 .../Zendesk/ZendeskTransportFactory.php       |  4 +--
 .../Notifier/Tests/Transport/DsnTest.php      |  6 ++--
 .../Transport/AbstractTransportFactory.php    |  4 +--
 .../Component/Notifier/Transport/Dsn.php      |  6 ++--
 .../Semaphore/Store/StoreFactory.php          |  5 +--
 .../Provider/AbstractProviderFactory.php      |  2 +-
 .../Component/Translation/Provider/Dsn.php    |  6 ++--
 .../Translation/Tests/Provider/DsnTest.php    |  6 ++--
 47 files changed, 103 insertions(+), 101 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
index c91da94b04f45..a4fa30c14af12 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -126,7 +126,7 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
             return CouchbaseCollectionAdapter::createConnection($dsn, $options);
         }
 
-        throw new InvalidArgumentException(sprintf('Unsupported DSN: "%s".', $dsn));
+        throw new InvalidArgumentException('Unsupported DSN: it does not start with "redis[s]:", "memcached:" nor "couchbase:".');
     }
 
     public function commit(): bool
diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php
index f7b2c156e1de5..12d6db86a1515 100644
--- a/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php
@@ -78,7 +78,7 @@ public static function createConnection(#[\SensitiveParameter] array|string $ser
 
             foreach ($servers as $dsn) {
                 if (!str_starts_with($dsn, 'couchbase:')) {
-                    throw new InvalidArgumentException(sprintf('Invalid Couchbase DSN: "%s" does not start with "couchbase:".', $dsn));
+                    throw new InvalidArgumentException('Invalid Couchbase DSN: it does not start with "couchbase:".');
                 }
 
                 preg_match($dsnPattern, $dsn, $matches);
diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php
index 321e7b3ee67cf..19c9e075db95b 100644
--- a/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php
@@ -71,7 +71,7 @@ public static function createConnection(#[\SensitiveParameter] array|string $dsn
 
             foreach ($dsn as $server) {
                 if (!str_starts_with($server, 'couchbase:')) {
-                    throw new InvalidArgumentException(sprintf('Invalid Couchbase DSN: "%s" does not start with "couchbase:".', $server));
+                    throw new InvalidArgumentException('Invalid Couchbase DSN: it does not start with "couchbase:".');
                 }
 
                 preg_match($dsnPattern, $server, $matches);
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
index 2615e29429f50..45097c24693d8 100644
--- a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
@@ -64,7 +64,7 @@ public function __construct(Connection|string $connOrDsn, string $namespace = ''
             $this->conn = $connOrDsn;
         } else {
             if (!class_exists(DriverManager::class)) {
-                throw new InvalidArgumentException(sprintf('Failed to parse the DSN "%s". Try running "composer require doctrine/dbal".', $connOrDsn));
+                throw new InvalidArgumentException('Failed to parse DSN. Try running "composer require doctrine/dbal".');
             }
             $this->conn = DriverManager::getConnection(['url' => $connOrDsn]);
         }
diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
index e5ab3c72dad3b..eafb31f9f955f 100644
--- a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
@@ -113,7 +113,7 @@ public static function createConnection(#[\SensitiveParameter] array|string $ser
                     continue;
                 }
                 if (!str_starts_with($dsn, 'memcached:')) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s" does not start with "memcached:".', $dsn));
+                    throw new InvalidArgumentException('Invalid Memcached DSN: it does not start with "memcached:".');
                 }
                 $params = preg_replace_callback('#^memcached:(//)?(?:([^@]*+)@)?#', function ($m) use (&$username, &$password) {
                     if (!empty($m[2])) {
@@ -123,7 +123,7 @@ public static function createConnection(#[\SensitiveParameter] array|string $ser
                     return 'file:'.($m[1] ?? '');
                 }, $dsn);
                 if (false === $params = parse_url($params)) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn));
+                    throw new InvalidArgumentException('Invalid Memcached DSN.');
                 }
                 $query = $hosts = [];
                 if (isset($params['query'])) {
@@ -131,7 +131,7 @@ public static function createConnection(#[\SensitiveParameter] array|string $ser
 
                     if (isset($query['host'])) {
                         if (!\is_array($hosts = $query['host'])) {
-                            throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn));
+                            throw new InvalidArgumentException('Invalid Memcached DSN: query parameter "host" must be an array.');
                         }
                         foreach ($hosts as $host => $weight) {
                             if (false === $port = strrpos($host, ':')) {
@@ -150,7 +150,7 @@ public static function createConnection(#[\SensitiveParameter] array|string $ser
                     }
                 }
                 if (!isset($params['host']) && !isset($params['path'])) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn));
+                    throw new InvalidArgumentException('Invalid Memcached DSN: missing host or path.');
                 }
                 if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) {
                     $params['weight'] = $m[1];
diff --git a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
index bafc6dff4da0d..6851727cd20e1 100644
--- a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
@@ -58,7 +58,7 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
     public function __construct(#[\SensitiveParameter] \PDO|string $connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)
     {
         if (\is_string($connOrDsn) && str_contains($connOrDsn, '://')) {
-            throw new InvalidArgumentException(sprintf('Usage of Doctrine DBAL URL with "%s" is not supported. Use a PDO DSN or "%s" instead. Got "%s".', __CLASS__, DoctrineDbalAdapter::class, $connOrDsn));
+            throw new InvalidArgumentException(sprintf('Usage of Doctrine DBAL URL with "%s" is not supported. Use a PDO DSN or "%s" instead.', __CLASS__, DoctrineDbalAdapter::class));
         }
 
         if (isset($namespace[0]) && preg_match('#[^-+.A-Za-z0-9]#', $namespace, $match)) {
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index ef5de296f6550..131b9f3268f1e 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -87,11 +87,11 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
         } elseif (str_starts_with($dsn, 'rediss:')) {
             $scheme = 'rediss';
         } else {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s" does not start with "redis:" or "rediss".', $dsn));
+            throw new InvalidArgumentException('Invalid Redis DSN: it does not start with "redis[s]:".');
         }
 
         if (!\extension_loaded('redis') && !class_exists(\Predis\Client::class)) {
-            throw new CacheException(sprintf('Cannot find the "redis" extension nor the "predis/predis" package: "%s".', $dsn));
+            throw new CacheException('Cannot find the "redis" extension nor the "predis/predis" package.');
         }
 
         $params = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:(?<user>[^:@]*+):)?(?<password>[^@]*+)@)?#', function ($m) use (&$auth) {
@@ -111,7 +111,7 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
         }, $dsn);
 
         if (false === $params = parse_url($params)) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn));
+            throw new InvalidArgumentException('Invalid Redis DSN.');
         }
 
         $query = $hosts = [];
@@ -124,7 +124,7 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
 
             if (isset($query['host'])) {
                 if (!\is_array($hosts = $query['host'])) {
-                    throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn));
+                    throw new InvalidArgumentException('Invalid Redis DSN: query parameter "host" must be an array.');
                 }
                 foreach ($hosts as $host => $parameters) {
                     if (\is_string($parameters)) {
@@ -148,7 +148,7 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                     $params['dbindex'] = $m[1];
                     $params['path'] = substr($params['path'], 0, -\strlen($m[0]));
                 } elseif (isset($params['host'])) {
-                    throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s", the "dbindex" parameter must be a number.', $dsn));
+                    throw new InvalidArgumentException('Invalid Redis DSN: query parameter "dbindex" must be a number.');
                 }
             }
 
@@ -160,17 +160,17 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
         }
 
         if (!$hosts) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn));
+            throw new InvalidArgumentException('Invalid Redis DSN: missing host.');
         }
 
         $params += $query + $options + self::$defaultConnectionOptions;
 
         if (isset($params['redis_sentinel']) && !class_exists(\Predis\Client::class) && !class_exists(\RedisSentinel::class)) {
-            throw new CacheException(sprintf('Redis Sentinel support requires the "predis/predis" package or the "redis" extension v5.2 or higher: "%s".', $dsn));
+            throw new CacheException('Redis Sentinel support requires the "predis/predis" package or the "redis" extension v5.2 or higher.');
         }
 
         if ($params['redis_cluster'] && isset($params['redis_sentinel'])) {
-            throw new InvalidArgumentException(sprintf('Cannot use both "redis_cluster" and "redis_sentinel" at the same time: "%s".', $dsn));
+            throw new InvalidArgumentException('Cannot use both "redis_cluster" and "redis_sentinel" at the same time.');
         }
 
         if (null === $params['class'] && \extension_loaded('redis')) {
@@ -179,14 +179,14 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
             $class = $params['class'] ?? \Predis\Client::class;
 
             if (isset($params['redis_sentinel']) && !is_a($class, \Predis\Client::class, true) && !class_exists(\RedisSentinel::class)) {
-                throw new CacheException(sprintf('Cannot use Redis Sentinel: class "%s" does not extend "Predis\Client" and ext-redis >= 5.2 not found: "%s".', $class, $dsn));
+                throw new CacheException(sprintf('Cannot use Redis Sentinel: class "%s" does not extend "Predis\Client" and ext-redis >= 5.2 not found.', $class));
             }
         }
 
         if (is_a($class, \Redis::class, true)) {
             $connect = $params['persistent'] || $params['persistent_id'] ? 'pconnect' : 'connect';
 
-            $initializer = static function () use ($class, $connect, $params, $dsn, $auth, $hosts, $tls) {
+            $initializer = static function () use ($class, $connect, $params, $auth, $hosts, $tls) {
                 $redis = new $class();
                 $hostIndex = 0;
                 do {
@@ -213,7 +213,7 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                 } while (++$hostIndex < \count($hosts) && !$address);
 
                 if (isset($params['redis_sentinel']) && !$address) {
-                    throw new InvalidArgumentException(sprintf('Failed to retrieve master information from sentinel "%s" and dsn "%s".', $params['redis_sentinel'], $dsn));
+                    throw new InvalidArgumentException(sprintf('Failed to retrieve master information from sentinel "%s".', $params['redis_sentinel']));
                 }
 
                 try {
@@ -233,21 +233,21 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                     }
                     if (!$isConnected) {
                         $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error ?? $redis->getLastError() ?? '', $error) ? sprintf(' (%s)', $error[1]) : '';
-                        throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$error.'.');
+                        throw new InvalidArgumentException('Redis connection failed: '.$error.'.');
                     }
 
                     if ((null !== $auth && !$redis->auth($auth))
                         || ($params['dbindex'] && !$redis->select($params['dbindex']))
                     ) {
                         $e = preg_replace('/^ERR /', '', $redis->getLastError());
-                        throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e.'.');
+                        throw new InvalidArgumentException('Redis connection failed: '.$e.'.');
                     }
 
                     if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) {
                         $redis->setOption(\Redis::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
                     }
                 } catch (\RedisException $e) {
-                    throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
+                    throw new InvalidArgumentException('Redis connection failed: '.$e->getMessage());
                 }
 
                 return $redis;
@@ -268,14 +268,14 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
             try {
                 $redis = new $class($hosts, $params);
             } catch (\RedisClusterException $e) {
-                throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
+                throw new InvalidArgumentException('Redis connection failed: '.$e->getMessage());
             }
 
             if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) {
                 $redis->setOption(\Redis::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
             }
         } elseif (is_a($class, \RedisCluster::class, true)) {
-            $initializer = static function () use ($class, $params, $dsn, $hosts) {
+            $initializer = static function () use ($class, $params, $hosts) {
                 foreach ($hosts as $i => $host) {
                     $hosts[$i] = match ($host['scheme']) {
                         'tcp' => $host['host'].':'.$host['port'],
@@ -287,7 +287,7 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                 try {
                     $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent'], $params['auth'] ?? '', ...\defined('Redis::SCAN_PREFIX') ? [$params['ssl'] ?? null] : []);
                 } catch (\RedisClusterException $e) {
-                    throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
+                    throw new InvalidArgumentException('Redis connection failed: '.$e->getMessage());
                 }
 
                 if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php
index e390c8feea5cf..33aaa7df5f60a 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php
@@ -54,7 +54,7 @@ public static function createHandler(object|string $connection, array $options =
             case str_starts_with($connection, 'rediss:'):
             case str_starts_with($connection, 'memcached:'):
                 if (!class_exists(AbstractAdapter::class)) {
-                    throw new \InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $connection));
+                    throw new \InvalidArgumentException('Unsupported Redis or Memcached DSN. Try running "composer require symfony/cache".');
                 }
                 $handlerClass = str_starts_with($connection, 'memcached:') ? MemcachedSessionHandler::class : RedisSessionHandler::class;
                 $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);
@@ -63,7 +63,7 @@ public static function createHandler(object|string $connection, array $options =
 
             case str_starts_with($connection, 'pdo_oci://'):
                 if (!class_exists(DriverManager::class)) {
-                    throw new \InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require doctrine/dbal".', $connection));
+                    throw new \InvalidArgumentException('Unsupported PDO OCI DSN. Try running "composer require doctrine/dbal".');
                 }
                 $connection = DriverManager::getConnection(['url' => $connection])->getWrappedConnection();
                 // no break;
diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
index d2ec6c6f9e243..84865ce3659c5 100644
--- a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
+++ b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
@@ -47,7 +47,7 @@ public function __construct(#[\SensitiveParameter] Connection|string $connOrUrl)
             $this->conn = $connOrUrl;
         } else {
       
10000
      if (!class_exists(DriverManager::class)) {
-                throw new InvalidArgumentException(sprintf('Failed to parse the DSN "%s". Try running "composer require doctrine/dbal".', $connOrUrl));
+                throw new InvalidArgumentException('Failed to parse DSN. Try running "composer require doctrine/dbal".');
             }
             $this->conn = DriverManager::getConnection(['url' => $this->filterDsn($connOrUrl)]);
         }
@@ -246,7 +246,7 @@ private function unlockShared(Key $key): void
     private function filterDsn(#[\SensitiveParameter] string $dsn): string
     {
         if (!str_contains($dsn, '://')) {
-            throw new InvalidArgumentException(sprintf('String "%" is not a valid DSN for Doctrine DBAL.', $dsn));
+            throw new InvalidArgumentException('DSN is invalid for Doctrine DBAL.');
         }
 
         [$scheme, $rest] = explode(':', $dsn, 2);
diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
index dcdcc557881fe..568fcaa10bc09 100644
--- a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
+++ b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
@@ -66,7 +66,7 @@ public function __construct(Connection|string $connOrUrl, array $options = [], f
             $this->conn = $connOrUrl;
         } else {
             if (!class_exists(DriverManager::class)) {
-                throw new InvalidArgumentException(sprintf('Failed to parse the DSN "%s". Try running "composer require doctrine/dbal".', $connOrUrl));
+                throw new InvalidArgumentException('Failed to parse the DSN. Try running "composer require doctrine/dbal".');
             }
             $this->conn = DriverManager::getConnection(['url' => $connOrUrl]);
         }
diff --git a/src/Symfony/Component/Lock/Store/StoreFactory.php b/src/Symfony/Component/Lock/Store/StoreFactory.php
index 94368cc53471a..f93dcd086c363 100644
--- a/src/Symfony/Component/Lock/Store/StoreFactory.php
+++ b/src/Symfony/Component/Lock/Store/StoreFactory.php
@@ -23,7 +23,7 @@
  */
 class StoreFactory
 {
-    public static function createStore(object|string $connection): PersistingStoreInterface
+    public static function createStore(#[\SensitiveParameter] object|string $connection): PersistingStoreInterface
     {
         switch (true) {
             case $connection instanceof \Redis:
@@ -62,7 +62,7 @@ public static function createStore(object|string $connection): PersistingStoreIn
             case str_starts_with($connection, 'rediss:'):
             case str_starts_with($connection, 'memcached:'):
                 if (!class_exists(AbstractAdapter::class)) {
-                    throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $connection));
+                    throw new InvalidArgumentException('Unsupported Redis or Memcached DSN. Try running "composer require symfony/cache".');
                 }
                 $storeClass = str_starts_with($connection, 'memcached:') ? MemcachedStore::class : RedisStore::class;
                 $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);
diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
index 03b9bec310695..e9e37ad2c3092 100644
--- a/src/Symfony/Component/Lock/Store/ZookeeperStore.php
+++ b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
@@ -37,11 +37,11 @@ public function __construct(\Zookeeper $zookeeper)
     public static function createConnection(#[\SensitiveParameter] string $dsn): \Zookeeper
     {
         if (!str_starts_with($dsn, 'zookeeper:')) {
-            throw new InvalidArgumentException(sprintf('Unsupported DSN: "%s".', $dsn));
+            throw new InvalidArgumentException('Unsupported DSN for Zookeeper.');
         }
 
         if (false === $params = parse_url($dsn)) {
-            throw new InvalidArgumentException(sprintf('Invalid Zookeeper DSN: "%s".', $dsn));
+            throw new InvalidArgumentException('Invalid Zookeeper DSN.');
         }
 
         $host = $params['host'] ?? '';
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/DsnTest.php b/src/Symfony/Component/Mailer/Tests/Transport/DsnTest.php
index 2816333ff3981..3b851f56888d1 100644
--- a/src/Symfony/Component/Mailer/Tests/Transport/DsnTest.php
+++ b/src/Symfony/Component/Mailer/Tests/Transport/DsnTest.php
@@ -92,17 +92,17 @@ public function invalidDsnProvider(): iterable
     {
         yield [
             'some://',
-            'The "some://" mailer DSN is invalid.',
+            'The mailer DSN is invalid.',
         ];
 
         yield [
             '//sendmail',
-            'The "//sendmail" mailer DSN must contain a scheme.',
+            'The mailer DSN must contain a scheme.',
         ];
 
         yield [
             'file:///some/path',
-            'The "file:///some/path" mailer DSN must contain a host (use "default" by default).',
+            'The mailer DSN must contain a host (use "default" by default).',
         ];
     }
 }
diff --git a/src/Symfony/Component/Mailer/Tests/TransportTest.php b/src/Symfony/Component/Mailer/Tests/TransportTest.php
index 690b0eed766fc..82663671cb25b 100644
--- a/src/Symfony/Component/Mailer/Tests/TransportTest.php
+++ b/src/Symfony/Component/Mailer/Tests/TransportTest.php
@@ -90,11 +90,11 @@ public function testFromWrongString(string $dsn, string $error)
 
     public function fromWrongStringProvider(): iterable
     {
-        yield 'garbage at the end' => ['dummy://a some garbage here', 'The DSN has some garbage at the end: " some garbage here".'];
+        yield 'garbage at the end' => ['dummy://a some garbage here', 'The mailer DSN has some garbage at the end.'];
 
-        yield 'not a valid DSN' => ['something not a dsn', 'The "something" mailer DSN must contain a scheme.'];
+        yield 'not a valid DSN' => ['something not a dsn', 'The mailer DSN must contain a scheme.'];
 
-        yield 'failover not closed' => ['failover(dummy://a', 'The "(dummy://a" mailer DSN must contain a scheme.'];
+        yield 'failover not closed' => ['failover(dummy://a', 'The mailer DSN must contain a scheme.'];
 
         yield 'not a valid keyword' => ['foobar(dummy://a)', 'The "foobar" keyword is not valid (valid ones are "failover", "roundrobin")'];
     }
diff --git a/src/Symfony/Component/Mailer/Transport.php b/src/Symfony/Component/Mailer/Transport.php
index 3a27fe9f6edc9..11286a26b0204 100644
--- a/src/Symfony/Component/Mailer/Transport.php
+++ b/src/Symfony/Component/Mailer/Transport.php
@@ -94,7 +94,7 @@ public function fromString(#[\SensitiveParameter] string $dsn): TransportInterfa
     {
         [$transport, $offset] = $this->parseDsn($dsn);
         if ($offset !== \strlen($dsn)) {
-            throw new InvalidArgumentException(sprintf('The DSN has some garbage at the end: "%s".', substr($dsn, $offset)));
+            throw new InvalidArgumentException('The mailer DSN has some garbage at the end.');
         }
 
         return $transport;
diff --git a/src/Symfony/Component/Mailer/Transport/Dsn.php b/src/Symfony/Component/Mailer/Transport/Dsn.php
index 3c65053f89697..abd0becbbe857 100644
--- a/src/Symfony/Component/Mailer/Transport/Dsn.php
+++ b/src/Symfony/Component/Mailer/Transport/Dsn.php
@@ -38,15 +38,15 @@ public function __construct(string $scheme, string $host, string $user = null, #
     public static function fromString(#[\SensitiveParameter] string $dsn): self
     {
         if (false === $parsedDsn = parse_url($dsn)) {
-            throw new InvalidArgumentException(sprintf('The "%s" mailer DSN is invalid.', $dsn));
+            throw new InvalidArgumentException('The mailer DSN is invalid.');
         }
 
         if (!isset($parsedDsn['scheme'])) {
-            throw new InvalidArgumentException(sprintf('The "%s" mailer DSN must contain a scheme.', $dsn));
+            throw new InvalidArgumentException('The mailer DSN must contain a scheme.');
         }
 
         if (!isset($parsedDsn['host'])) {
-            throw new InvalidArgumentException(sprintf('The "%s" mailer DSN must contain a host (use "default" by default).', $dsn));
+            throw new InvalidArgumentException('The mailer DSN must contain a host (use "default" by default).');
         }
 
         $user = '' !== ($parsedDsn['user'] ?? '') ? urldecode($parsedDsn['user']) : null;
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php
index 6e50b7d2a002c..e2915d2c0b9b4 100644
--- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php
@@ -77,7 +77,7 @@ public function testConfigureWithTemporaryCredentials()
     public function testFromInvalidDsn()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('The given Amazon SQS DSN "sqs://" is invalid.');
+        $this->expectExceptionMessage('The given Amazon SQS DSN is invalid.');
 
         Connection::fromDsn('sqs://');
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php
index 2f1e4d8ad9c2c..f24ad53a2dfcf 100644
--- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php
@@ -26,6 +26,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  *
  * @internal
+ *
  * @final
  */
 class Connection
@@ -102,7 +103,7 @@ public function __destruct()
     public static function fromDsn(#[\SensitiveParameter] string $dsn, array $options = [], HttpClientInterface $client = null, LoggerInterface $logger = null): self
     {
         if (false === $parsedUrl = parse_url($dsn)) {
-            throw new InvalidArgumentException(sprintf('The given Amazon SQS DSN "%s" is invalid.', $dsn));
+            throw new InvalidArgumentException('The given Amazon SQS DSN is invalid.');
         }
 
         $query = [];
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
index 0df199e046a17..f5d60556997f3 100644
--- a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
@@ -30,7 +30,7 @@ class ConnectionTest extends TestCase
     public function testItCannotBeConstructedWithAWrongDsn()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('The given AMQP DSN "amqp://:" is invalid.');
+        $this->expectExceptionMessage('The given AMQP DSN is invalid.');
         Connection::fromDsn('amqp://:');
     }
 
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
index 3fb9b852b45c4..9f908ccfbb754 100644
--- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -165,7 +165,7 @@ public static function fromDsn(#[\SensitiveParameter] string $dsn, array $option
         if (false === $parsedUrl = parse_url($dsn)) {
             // this is a valid URI that parse_url cannot handle when you want to pass all parameters as options
             if (!\in_array($dsn, ['amqp://', 'amqps://'])) {
-                throw new InvalidArgumentException(sprintf('The given AMQP DSN "%s" is invalid.', $dsn));
+                throw new InvalidArgumentException('The given AMQP DSN is invalid.');
             }
 
             $parsedUrl = [];
diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/ConnectionTest.php
index 2ccd39be96a1f..f4cc745846584 100644
--- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/ConnectionTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Messenger\Bridge\Beanstalkd\Tests\Transport;
 
-use InvalidArgumentException;
 use Pheanstalk\Contract\PheanstalkInterface;
 use Pheanstalk\Exception;
 use Pheanstalk\Exception\ClientException;
@@ -30,8 +29,8 @@ final class ConnectionTest extends TestCase
 {
     public function testFromInvalidDsn()
     {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The given Beanstalkd DSN "beanstalkd://" is invalid.');
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The given Beanstalkd DSN is invalid.');
 
         Connection::fromDsn('beanstalkd://');
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php
index df115897809c8..af9b4bb62a480 100644
--- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php
@@ -23,6 +23,7 @@
  * @author Antonio Pauletich <antonio.pauletich95@gmail.com>
  *
  * @internal
+ *
  * @final
  */
 class Connection
@@ -58,7 +59,7 @@ public function __construct(array $configuration, PheanstalkInterface $client)
     public static function fromDsn(#[\SensitiveParameter] string $dsn, array $options = []): self
     {
         if (false === $components = parse_url($dsn)) {
-            throw new InvalidArgumentException(sprintf('The given Beanstalkd DSN "%s" is invalid.', $dsn));
+            throw new InvalidArgumentException('The given Beanstalkd DSN is invalid.');
         }
 
         $connectionCredentials = [
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportFactoryTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportFactoryTest.php
index 54dd7ab153adf..b81b95fd07ad9 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportFactoryTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportFactoryTest.php
@@ -90,7 +90,7 @@ public function testCreateTransportNotifyWithPostgreSQLPlatform()
     public function testCreateTransportMustThrowAnExceptionIfManagerIsNotFound()
     {
         $this->expectException(TransportException::class);
-        $this->expectExceptionMessage('Could not find Doctrine connection from Messenger DSN "doctrine://default".');
+        $this->expectExceptionMessage('Could not find Doctrine connection from Messenger DSN.');
         $registry = $this->createMock(ConnectionRegistry::class);
         $registry->expects($this->once())
             ->method('getConnection')
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
index 061f0715013d2..d9c442931addd 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -87,7 +87,7 @@ public function getConfiguration(): array
     public static function buildConfiguration(#[\SensitiveParameter] string $dsn, array $options = []): array
     {
         if (false === $components = parse_url($dsn)) {
-            throw new InvalidArgumentException(sprintf('The given Doctrine Messenger DSN "%s" is invalid.', $dsn));
+            throw new InvalidArgumentException('The given Doctrine Messenger DSN is invalid.');
         }
 
         $query = [];
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php
index d7f0d6136d216..cff92bf11c19f 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php
@@ -40,7 +40,7 @@ public function createTransport(#[\SensitiveParameter] string $dsn, array $optio
         try {
             $driverConnection = $this->registry->getConnection($configuration['connection']);
         } catch (\InvalidArgumentException $e) {
-            throw new TransportException(sprintf('Could not find Doctrine connection from Messenger DSN "%s".', $dsn), 0, $e);
+            throw new TransportException('Could not find Doctrine connection from Messenger DSN.', 0, $e);
         }
 
         if ($useNotify && $driverConnection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php
index 07bc9039431be..6cce2db012a0f 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php
@@ -23,7 +23,7 @@ class ConnectionTest extends TestCase
     public function testFromInvalidDsn()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('The given Redis DSN "redis://" is invalid.');
+        $this->expectExceptionMessage('The given Redis DSN is invalid.');
 
         Connection::fromDsn('redis://');
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
index 284b4cb89fed3..481dc5d64bba8 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -176,9 +176,9 @@ public static function fromDsn(#[\SensitiveParameter] string $dsn, array $option
             $tls = 'rediss' === $parsedUrl['scheme'];
 
             // Regroup all the hosts in an array interpretable by RedisCluster
-            $parsedUrl['host'] = array_map(function ($parsedUrl, $dsn) use ($tls) {
+            $parsedUrl['host'] = array_map(function ($parsedUrl) use ($tls) {
                 if (!isset($parsedUrl['host'])) {
-                    throw new InvalidArgumentException(sprintf('Missing host in DSN part "%s", it must be defined when using Redis Cluster.', $dsn));
+                    throw new InvalidArgumentException('Missing host in DSN, it must be defined when using Redis Cluster.');
                 }
                 if ($tls) {
                     $parsedUrl['host'] = 'tls://'.$parsedUrl['host'];
@@ -242,7 +242,7 @@ private static function parseDsn(string $dsn, array &$options): array
         }, $url);
 
         if (false === $parsedUrl = parse_url($url)) {
-            throw new InvalidArgumentException(sprintf('The given Redis DSN "%s" is invalid.', $dsn));
+            throw new InvalidArgumentException('The given Redis DSN is invalid.');
         }
 
         if (null !== $auth) {
diff --git a/src/Symfony/Component/Messenger/Transport/TransportFactory.php b/src/Symfony/Component/Messenger/Transport/TransportFactory.php
index aa16305a18f14..987f19d2a74bf 100644
--- a/src/Symfony/Component/Messenger/Transport/TransportFactory.php
+++ b/src/Symfony/Component/Messenger/Transport/TransportFactory.php
@@ -51,7 +51,7 @@ public function createTransport(#[\SensitiveParameter] string $dsn, array $optio
             $packageSuggestion = ' Run "composer require symfony/beanstalkd-messenger" to install Beanstalkd transport.';
         }
 
-        throw new InvalidArgumentException(sprintf('No transport supports the given Messenger DSN "%s".%s.', $dsn, $packageSuggestion));
+        throw new InvalidArgumentException('No transport supports the given Messenger DSN.'.$packageSuggestion);
     }
 
     public function supports(#[\SensitiveParameter] string $dsn, array $options): bool
diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/MicrosoftTeamsTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/MicrosoftTeamsTransportFactory.php
index dbec3473fabc8..53cbfb7d90bbf 100644
--- a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/MicrosoftTeamsTransportFactory.php
+++ b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/MicrosoftTeamsTransportFactory.php
@@ -33,7 +33,7 @@ public function create(Dsn $dsn): MicrosoftTeamsTransport
         $path = $dsn->getPath();
 
         if (null === $path) {
-            throw new IncompleteDsnException('Path is not set.', $dsn->getOriginalDsn());
+            throw new IncompleteDsnException('Path is not set.', 'microsoftteams://'.$dsn->getHost());
         }
 
         $host = $dsn->getHost();
diff --git a/src/Symfony/Component/Notifier/Bridge/OvhCloud/OvhCloudTransport.php b/src/Symfony/Component/Notifier/Bridge/OvhCloud/OvhCloudTransport.php
index 8a97aaadde581..a2356c6b6277b 100644
--- a/src/Symfony/Component/Notifier/Bridge/OvhCloud/OvhCloudTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/OvhCloud/OvhCloudTransport.php
@@ -35,7 +35,7 @@ final class OvhCloudTransport extends AbstractTransport
     private ?string $sender = null;
     private bool $noStopClause = false;
 
-    public function __construct(string $applicationKey, #[\SensitiveParameter] string $applicationSecret, string $consumerKey, string $serviceName, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(string $applicationKey, #[\SensitiveParameter] string $applicationSecret, #[\SensitiveParameter] string $consumerKey, string $serviceName, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
     {
         $this->applicationKey = $applicationKey;
         $this->applicationSecret = $applicationSecret;
@@ -48,10 +48,10 @@ public function __construct(string $applicationKey, #[\SensitiveParameter] strin
     public function __toString(): string
     {
         if (null !== $this->sender) {
-            return sprintf('ovhcloud://%s?consumer_key=%s&service_name=%s&sender=%s&no_stop_clause=%s', $this->getEndpoint(), $this->consumerKey, $this->serviceName, $this->sender, (int) $this->noStopClause);
+            return sprintf('ovhcloud://%s?service_name=%s&sender=%s', $this->getEndpoint(), $this->serviceName, $this->sender);
         }
 
-        return sprintf('ovhcloud://%s?consumer_key=%s&service_name=%s&no_stop_clause=%s', $this->getEndpoint(), $this->consumerKey, $this->serviceName, (int) $this->noStopClause);
+        return sprintf('ovhcloud://%s?service_name=%s', $this->getEndpoint(), $this->serviceName);
     }
 
     /**
diff --git a/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportFactoryTest.php
index 1d4a2c893e746..384e362ef4d99 100644
--- a/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportFactoryTest.php
@@ -24,27 +24,27 @@ public function createFactory(): OvhCloudTransportFactory
     public function createProvider(): iterable
     {
         yield [
-            'ovhcloud://host.test?consumer_key=consumerKey&service_name=serviceName&no_stop_clause=0',
+            'ovhcloud://host.test?service_name=serviceName',
             'ovhcloud://key:secret@host.test?consumer_key=consumerKey&service_name=serviceName',
         ];
 
         yield [
-            'ovhcloud://host.test?consumer_key=consumerKey&service_name=serviceName&sender=sender&no_stop_clause=0',
+            'ovhcloud://host.test?service_name=serviceName&sender=sender',
             'ovhcloud://key:secret@host.test?consumer_key=consumerKey&service_name=serviceName&sender=sender',
         ];
 
         yield [
-            'ovhcloud://host.test?consumer_key=consumerKey&service_name=serviceName&no_stop_clause=0',
+            'ovhcloud://host.test?service_name=serviceName',
             'ovhcloud://key:secret@host.test?consumer_key=consumerKey&service_name=serviceName&no_stop_clause=0',
         ];
 
         yield [
-            'ovhcloud://host.test?consumer_key=consumerKey&service_name=serviceName&no_stop_clause=1',
+            'ovhcloud://host.test?service_name=serviceName',
             'ovhcloud://key:secret@host.test?consumer_key=consumerKey&service_name=serviceName&no_stop_clause=1',
         ];
 
         yield [
-            'ovhcloud://host.test?consumer_key=consumerKey&service_name=serviceName&no_stop_clause=1',
+            'ovhcloud://host.test?service_name=serviceName',
             'ovhcloud://key:secret@host.test?consumer_key=consumerKey&service_name=serviceName&no_stop_clause=true',
         ];
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportTest.php b/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportTest.php
index f5e1a01aab159..715d109188a0d 100644
--- a/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportTest.php
@@ -30,9 +30,9 @@ public function createTransport(HttpClientInterface $client = null, string $send
 
     public function toStringProvider(): iterable
     {
-        yield ['ovhcloud://eu.api.ovh.com?consumer_key=consumerKey&service_name=serviceName&no_stop_clause=0', $this->createTransport()];
-        yield ['ovhcloud://eu.api.ovh.com?consumer_key=consumerKey&service_name=serviceName&no_stop_clause=1', $this->createTransport(null, null, true)];
-        yield ['ovhcloud://eu.api.ovh.com?consumer_key=consumerKey&service_name=serviceName&sender=sender&no_stop_clause=0', $this->createTransport(null, 'sender')];
+        yield ['ovhcloud://eu.api.ovh.com?service_name=serviceName', $this->createTransport()];
+        yield ['ovhcloud://eu.api.ovh.com?service_name=serviceName', $this->createTransport(null, null, true)];
+        yield ['ovhcloud://eu.api.ovh.com?service_name=serviceName&sender=sender', $this->createTransport(null, 'sender')];
     }
 
     public function supportedMessagesProvider(): iterable
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransportFactory.php
index 93fae27f433e3..06916c2ad7829 100644
--- a/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransportFactory.php
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransportFactory.php
@@ -44,11 +44,11 @@ private function getHost(Dsn $dsn): string
     {
         $host = $dsn->getHost();
         if ('default' === $host) {
-            throw new IncompleteDsnException('Host is not set.', $dsn->getOriginalDsn());
+            throw new IncompleteDsnException('Host is not set.', 'pagerduty://default');
         }
 
         if (!str_ends_with($host, '.pagerduty.com')) {
-            throw new IncompleteDsnException('Host must be in format: "subdomain.pagerduty.com".', $dsn->getOriginalDsn());
+            throw new IncompleteDsnException('Host must be in format: "subdomain.pagerduty.com".', 'pagerduty://'.$host);
         }
 
         return $host;
diff --git a/src/Symfony/Component/Notifier/Bridge/Sendberry/SendberryTransport.php b/src/Symfony/Component/Notifier/Bridge/Sendberry/SendberryTransport.php
index 2b55f150ab6f1..e347ff30ab29d 100644
--- a/src/Symfony/Component/Notifier/Bridge/Sendberry/SendberryTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/Sendberry/SendberryTransport.php
@@ -46,7 +46,7 @@ public function __construct(string $username, #[\SensitiveParameter] string $pas
 
     public function __toString(): string
     {
-        return sprintf('sendberry://%s:%s@%s?auth_key=%s&from=%s', $this->username, $this->password, $this->getEndpoint(), $this->authKey, $this->from);
+        return sprintf('sendberry://%s?from=%s', $this->getEndpoint(), $this->from);
     }
 
     public function supports(MessageInterface $message): bool
diff --git a/src/Symfony/Component/Notifier/Bridge/Sendberry/Tests/SendberryTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Sendberry/Tests/SendberryTransportFactoryTest.php
index 9a75c5684f07e..9fcab7ff0bc8a 100644
--- a/src/Symfony/Component/Notifier/Bridge/Sendberry/Tests/SendberryTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Sendberry/Tests/SendberryTransportFactoryTest.php
@@ -24,7 +24,7 @@ public function createFactory(): SendberryTransportFactory
     public function createProvider(): iterable
     {
         yield [
-            'sendberry://user:password@host.test?auth_key=auth_key&from=+0611223344',
+            'sendberry://host.test?from=+0611223344',
             'sendberry://user:password@host.test?auth_key=auth_key&from=%2B0611223344',
         ];
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/Sendberry/Tests/SendberryTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Sendberry/Tests/SendberryTransportTest.php
index 5a9ca1058c1cd..1dccf9b7ca83b 100644
--- a/src/Symfony/Component/Notifier/Bridge/Sendberry/Tests/SendberryTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Sendberry/Tests/SendberryTransportTest.php
@@ -27,7 +27,7 @@ public function createTransport(HttpClientInterface $client = null): SendberryTr
 
     public function toStringProvider(): iterable
     {
-        yield ['sendberry://username:password@api.sendberry.com?auth_key=auth_key&from=from', $this->createTransport()];
+        yield ['sendberry://api.sendberry.com?from=from', $this->createTransport()];
     }
 
     public function supportedMessagesProvider(): iterable
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransportFactory.php
index 8f5dec7772020..13dc53e33f294 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransportFactory.php
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransportFactory.php
@@ -45,11 +45,11 @@ protected function getSupportedSchemes(): array
     private function getToken(Dsn $dsn): string
     {
         if (null === $dsn->getUser() && null === $dsn->getPassword()) {
-            throw new IncompleteDsnException('Missing token.', $dsn->getOriginalDsn());
+            throw new IncompleteDsnException('Missing token.', 'telegram://'.$dsn->getHost());
         }
 
         if (null === $dsn->getPassword()) {
-            throw new IncompleteDsnException('Malformed token.', $dsn->getOriginalDsn());
+            throw new IncompleteDsnException('Malformed token.', 'telegram://'.$dsn->getHost());
         }
 
         return sprintf('%s:%s', $dsn->getUser(), $dsn->getPassword());
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php
index 7aa6c0f2b4966..a3f0bcb02139e 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php
@@ -39,6 +39,6 @@ public function unsupportedSchemeProvider(): iterable
 
     public function incompleteDsnProvider(): iterable
     {
-        yield ['twitter://A:B@default', 'Invalid "twitter://A:B@default" notifier DSN: Access Token is missing'];
+        yield ['twitter://A:B@default', 'Invalid "twitter://default" notifier DSN: Access Token is missing'];
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransportFactory.php
index 1d99076dac8e7..d8d711a6dfc6a 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransportFactory.php
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransportFactory.php
@@ -34,7 +34,7 @@ public function create(Dsn $dsn): TwitterTransport
 
         foreach (['API Key' => $apiKey, 'API Key Secret' => $apiSecret, 'Access Token' => $accessToken, 'Access Token Secret' => $accessSecret] as $name => $key) {
             if (!$key) {
-                throw new IncompleteDsnException($name.' is missing.', $dsn->getOriginalDsn());
+                throw new IncompleteDsnException($name.' is missing.', 'twitter://'.$dsn->getHost());
             }
         }
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Zendesk/ZendeskTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Zendesk/ZendeskTransportFactory.php
index 2015f5a765514..09b0178b9dd4c 100644
--- a/src/Symfony/Component/Notifier/Bridge/Zendesk/ZendeskTransportFactory.php
+++ b/src/Symfony/Component/Notifier/Bridge/Zendesk/ZendeskTransportFactory.php
@@ -45,11 +45,11 @@ private function getHost(Dsn $dsn): string
     {
         $host = $dsn->getHost();
         if ('default' === $host) {
-            throw new IncompleteDsnException('Host is not set.', $dsn->getOriginalDsn());
+            throw new IncompleteDsnException('Host is not set.', 'zendesk://default');
         }
 
         if (!str_ends_with($host, '.zendesk.com')) {
-            throw new IncompleteDsnException('Host must be in format: "subdomain.zendesk.com".', $dsn->getOriginalDsn());
+            throw new IncompleteDsnException('Host must be in format: "subdomain.zendesk.com".', 'zendesk://'.$dsn->getHost());
         }
 
         return $host;
diff --git a/src/Symfony/Component/Notifier/Tests/Transport/DsnTest.php b/src/Symfony/Component/Notifier/Tests/Transport/DsnTest.php
index b927c9d955689..2af529f7b45ad 100644
--- a/src/Symfony/Component/Notifier/Tests/Transport/DsnTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Transport/DsnTest.php
@@ -155,17 +155,17 @@ public function invalidDsnProvider(): iterable
     {
         yield [
             'some://',
-            'The "some://" notifier DSN is invalid.',
+            'The notifier DSN is invalid.',
         ];
 
         yield [
             '//slack',
-            'The "//slack" notifier DSN must contain a scheme.',
+            'The notifier DSN must contain a scheme.',
         ];
 
         yield [
             'file:///some/path',
-            'The "file:///some/path" notifier DSN must contain a host (use "default" by default).',
+            'The notifier DSN must contain a host (use "default" by default).',
         ];
     }
 
diff --git a/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php b/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php
index 4703fb05719de..914208a10071b 100644
--- a/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php
+++ b/src/Symfony/Component/Notifier/Transport/AbstractTransportFactory.php
@@ -42,11 +42,11 @@ abstract protected function getSupportedSchemes(): array;
 
     protected function getUser(Dsn $dsn): string
     {
-        return $dsn->getUser() ?? throw new IncompleteDsnException('User is not set.', $dsn->getOriginalDsn());
+        return $dsn->getUser() ?? throw new IncompleteDsnException('User is not set.', $dsn->getScheme().'://'.$dsn->getHost());
     }
 
     protected function getPassword(Dsn $dsn): string
     {
-        return $dsn->getPassword() ?? new IncompleteDsnException('Password is not set.', $dsn->getOriginalDsn());
+        return $dsn->getPassword() ?? throw new IncompleteDsnException('Password is not set.', $dsn->getOriginalDsn());
     }
 }
diff --git a/src/Symfony/Component/Notifier/Transport/Dsn.php b/src/Symfony/Component/Notifier/Transport/Dsn.php
index 450acda1c8752..3d38f1444c07f 100644
--- a/src/Symfony/Component/Notifier/Transport/Dsn.php
+++ b/src/Symfony/Component/Notifier/Transport/Dsn.php
@@ -34,16 +34,16 @@ public function __construct(#[\SensitiveParameter] string $dsn)
         $this->originalDsn = $dsn;
 
         if (false === $parsedDsn = parse_url($dsn)) {
-            throw new InvalidArgumentException(sprintf('The "%s" notifier DSN is invalid.', $dsn));
+            throw new InvalidArgumentException('The notifier DSN is invalid.');
         }
 
         if (!isset($parsedDsn['scheme'])) {
-            throw new InvalidArgumentException(sprintf('The "%s" notifier DSN must contain a scheme.', $dsn));
+            throw new InvalidArgumentException('The notifier DSN must contain a scheme.');
         }
         $this->scheme = $parsedDsn['scheme'];
 
         if (!isset($parsedDsn['host'])) {
-            throw new InvalidArgumentException(sprintf('The "%s" notifier DSN must contain a host (use "default" by default).', $dsn));
+            throw new InvalidArgumentException('The notifier DSN must contain a host (use "default" by default).');
         }
         $this->host = $parsedDsn['host'];
 
diff --git a/src/Symfony/Component/Semaphore/Store/StoreFactory.php b/src/Symfony/Component/Semaphore/Store/StoreFactory.php
index 6556f87504ace..eb77431c39030 100644
--- a/src/Symfony/Component/Semaphore/Store/StoreFactory.php
+++ b/src/Symfony/Component/Semaphore/Store/StoreFactory.php
@@ -22,7 +22,7 @@
  */
 class StoreFactory
 {
-    public static function createStore(object|string $connection): PersistingStoreInterface
+    public static function createStore(#[\SensitiveParameter] object|string $connection): PersistingStoreInterface
     {
         switch (true) {
             case $connection instanceof \Redis:
@@ -33,10 +33,11 @@ public static function createStore(object|string $connection): PersistingStoreIn
 
             case !\is_string($connection):
                 throw new InvalidArgumentException(sprintf('Unsupported Connection: "%s".', $connection::class));
+
             case str_starts_with($connection, 'redis://'):
             case str_starts_with($connection, 'rediss://'):
                 if (!class_exists(AbstractAdapter::class)) {
-                    throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $connection));
+                    throw new InvalidArgumentException('Unsupported Redis DSN. Try running "composer require symfony/cache".');
                 }
                 $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);
 
diff --git a/src/Symfony/Component/Translation/Provider/AbstractProviderFactory.php b/src/Symfony/Component/Translation/Provider/AbstractProviderFactory.php
index d9b05b5e9813c..f0c11d85de74c 100644
--- a/src/Symfony/Component/Translation/Provider/AbstractProviderFactory.php
+++ b/src/Symfony/Component/Translation/Provider/AbstractProviderFactory.php
@@ -27,7 +27,7 @@ abstract protected function getSupportedSchemes(): array;
 
     protected function getUser(Dsn $dsn): string
     {
-        return $dsn->getUser() ?? throw new IncompleteDsnException('User is not set.', $dsn->getOriginalDsn());
+        return $dsn->getUser() ?? throw new IncompleteDsnException('User is not set.', $dsn->getScheme().'://'.$dsn->getHost());
     }
 
     protected function getPassword(Dsn $dsn): string
diff --git a/src/Symfony/Component/Translation/Provider/Dsn.php b/src/Symfony/Component/Translation/Provider/Dsn.php
index 46061530ea1f6..77577b0f64df2 100644
--- a/src/Symfony/Component/Translation/Provider/Dsn.php
+++ b/src/Symfony/Component/Translation/Provider/Dsn.php
@@ -34,16 +34,16 @@ public function __construct(#[\SensitiveParameter] string $dsn)
         $this->originalDsn = $dsn;
 
         if (false === $parsedDsn = parse_url($dsn)) {
-            throw new InvalidArgumentException(sprintf('The "%s" translation provider DSN is invalid.', $dsn));
+            throw new InvalidArgumentException('The translation provider DSN is invalid.');
         }
 
         if (!isset($parsedDsn['scheme'])) {
-            throw new InvalidArgumentException(sprintf('The "%s" translation provider DSN must contain a scheme.', $dsn));
+            throw new InvalidArgumentException('The translation provider DSN must contain a scheme.');
         }
         $this->scheme = $parsedDsn['scheme'];
 
         if (!isset($parsedDsn['host'])) {
-            throw new InvalidArgumentException(sprintf('The "%s" translation provider DSN must contain a host (use "default" by default).', $dsn));
+            throw new InvalidArgumentException('The translation provider DSN must contain a host (use "default" by default).');
         }
         $this->host = $parsedDsn['host'];
 
diff --git a/src/Symfony/Component/Translation/Tests/Provider/DsnTest.php b/src/Symfony/Component/Translation/Tests/Provider/DsnTest.php
index 99e3a60386f16..810255113ceae 100644
--- a/src/Symfony/Component/Translation/Tests/Provider/DsnTest.php
+++ b/src/Symfony/Component/Translation/Tests/Provider/DsnTest.php
@@ -155,17 +155,17 @@ public function invalidDsnProvider(): iterable
     {
         yield [
             'some://',
-            'The "some://" translation provider DSN is invalid.',
+            'The translation provider DSN is invalid.',
         ];
 
         yield [
             '//loco',
-            'The "//loco" translation provider DSN must contain a scheme.',
+            'The translation provider DSN must contain a scheme.',
         ];
 
         yield [
             'file:///some/path',
-            'The "file:///some/path" translation provider DSN must contain a host (use "default" by default).',
+            'The translation provider DSN must contain a host (use "default" by default).',
         ];
     }
 

From 032ee261c50da30bfb6cf720b3b7bddc47d3fea3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 22 Jan 2023 14:19:58 +0100
Subject: [PATCH 147/475] [ExpressionLanguage] Deprecate loose comparisons when
 using the "in" operator

---
 .../Component/ExpressionLanguage/CHANGELOG.md |  2 ++
 .../ExpressionLanguage/Node/BinaryNode.php    | 26 +++++++++++++++----
 .../Tests/ExpressionLanguageTest.php          |  2 +-
 .../Tests/Node/BinaryNodeTest.php             | 26 ++++++++++++++++---
 .../ExpressionLanguage/composer.json          |  1 +
 5 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md b/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md
index 44a3478ff51b4..b06620cd79acb 100644
--- a/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md
+++ b/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md
@@ -5,6 +5,8 @@ CHANGELOG
 ---
 
  * Add `enum` expression function
+ * Deprecate loose comparisons when using the "in" operator; normalize the array parameter
+   so it only has the expected types or implement loose matching in your own expression function
 
 6.2
 ---
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
index 745fd26dc4cee..0b31c66dede7c 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
@@ -30,8 +30,8 @@ class BinaryNode extends Node
     private const FUNCTIONS = [
         '**' => 'pow',
         '..' => 'range',
-        'in' => 'in_array',
-        'not in' => '!in_array',
+        'in' => '\\'.self::class.'::inArray',
+        'not in' => '!\\'.self::class.'::inArray',
         'contains' => 'str_contains',
         'starts with' => 'str_starts_with',
         'ends with' => 'str_ends_with',
@@ -101,7 +101,7 @@ public function evaluate(array $functions, array $values)
             $right = $this->nodes['right']->evaluate($functions, $values);
 
             if ('not in' === $operator) {
-                return !\in_array($left, $right);
+                return !self::inArray($left, $right);
             }
             $f = self::FUNCTIONS[$operator];
 
@@ -143,9 +143,9 @@ public function evaluate(array $functions, array $values)
             case '<=':
                 return $left <= $right;
             case 'not in':
-                return !\in_array($left, $right);
+                return !self::inArray($left, $right);
             case 'in':
-                return \in_array($left, $right);
+                return self::inArray($left, $right);
             case '+':
                 return $left + $right;
             case '-':
@@ -176,6 +176,22 @@ public function toArray()
         return ['(', $this->nodes['left'], ' '.$this->attributes['operator'].' ', $this->nodes['right'], ')'];
     }
 
+    /**
+     * @internal to be replaced by an inline strict call to in_array() in version 7.0
+     */
+    public static function inArray($value, array $array): bool
+    {
+        if (false === $key = array_search($value, $array)) {
+            return false;
+        }
+
+        if (!\in_array($value, $array, true)) {
+            trigger_deprecation('symfony/expression-language', '6.3', 'The "in" operator will use strict comparisons in Symfony 7.0. Loose match found with key "%s" for value %s. Normalize the array parameter so it only has the expected types or implement loose matching in your own expression function.', $key, json_encode($value));
+        }
+
+        return true;
+    }
+
     private function evaluateMatches(string $regexp, ?string $str): int
     {
         set_error_handler(function ($t, $m) use ($regexp) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
index ce6b47cccc30e..c385a09f713ae 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -269,7 +269,7 @@ public function testOperatorCollisions()
         $expressionLanguage = new ExpressionLanguage();
         $expression = 'foo.not in [bar]';
         $compiled = $expressionLanguage->compile($expression, ['foo', 'bar']);
-        $this->assertSame('in_array($foo->not, [0 => $bar])', $compiled);
+        $this->assertSame('\Symfony\Component\ExpressionLanguage\Node\BinaryNode::inArray($foo->not, [0 => $bar])', $compiled);
 
         $result = $expressionLanguage->evaluate($expression, ['foo' => (object) ['not' => 'test'], 'bar' => 'test']);
         $this->assertTrue($result);
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
index 9e7ec6e7825d0..c43dcb19abd70 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\ExpressionLanguage\Compiler;
 use Symfony\Component\ExpressionLanguage\Node\ArrayNode;
 use Symfony\Component\ExpressionLanguage\Node\BinaryNode;
@@ -20,6 +21,8 @@
 
 class BinaryNodeTest extends AbstractNodeTest
 {
+    use ExpectDeprecationTrait;
+
     public function getEvaluateData()
     {
         $array = new ArrayNode();
@@ -113,10 +116,10 @@ public function getCompileData()
             ['pow(5, 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))],
             ['("a" . "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))],
 
-            ['in_array("a", [0 => "a", 1 => "b"])', new BinaryNode('in', new ConstantNode('a'), $array)],
-            ['in_array("c", [0 => "a", 1 => "b"])', new BinaryNode('in', new ConstantNode('c'), $array)],
-            ['!in_array("c", [0 => "a", 1 => "b"])', new BinaryNode('not in', new ConstantNode('c'), $array)],
-            ['!in_array("a", [0 => "a", 1 => "b"])', new BinaryNode('not in', new ConstantNode('a'), $array)],
+            ['\Symfony\Component\ExpressionLanguage\Node\BinaryNode::inArray("a", [0 => "a", 1 => "b"])', new BinaryNode('in', new ConstantNode('a'), $array)],
+            ['\Symfony\Component\ExpressionLanguage\Node\BinaryNode::inArray("c", [0 => "a", 1 => "b"])', new BinaryNode('in', new ConstantNode('c'), $array)],
+            ['!\Symfony\Component\ExpressionLanguage\Node\BinaryNode::inArray("c", [0 => "a", 1 => "b"])', new BinaryNode('not in', new ConstantNode('c'), $array)],
+            ['!\Symfony\Component\ExpressionLanguage\Node\BinaryNode::inArray("a", [0 => "a", 1 => "b"])', new BinaryNode('not in', new ConstantNode('a'), $array)],
 
             ['range(1, 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],
 
@@ -214,4 +217,19 @@ public function testCompileMatchesWithInvalidRegexpAsExpression()
         $node->compile($compiler);
         eval('$regexp = "this is not a regexp"; '.$compiler->getSource().';');
     }
+
+    /**
+     * @group legacy
+     */
+    public function testInOperatorStrictness()
+    {
+        $array = new ArrayNode();
+        $array->addElement(new ConstantNode('a'));
+        $array->addElement(new ConstantNode(true));
+
+        $node = new BinaryNode('in', new ConstantNode('b'), $array);
+
+        $this->expectDeprecation('Since symfony/expression-language 6.3: The "in" operator will use strict comparisons in Symfony 7.0. Loose match found with key "1" for value "b". Normalize the array parameter so it only has the expected types or implement loose matching in your own expression function.');
+        $this->assertTrue($node->evaluate([], []));
+    }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/composer.json b/src/Symfony/Component/ExpressionLanguage/composer.json
index a7688ad4601cf..4f66a7e2481a6 100644
--- a/src/Symfony/Component/ExpressionLanguage/composer.json
+++ b/src/Symfony/Component/ExpressionLanguage/composer.json
@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/cache": "^5.4|^6.0",
         "symfony/service-contracts": "^2.5|^3"
     },

From 7ec6ccc0bec200f596b5cb8c3e2622b19daa22b8 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 23 Jan 2023 16:56:00 +0100
Subject: [PATCH 148/475] [DI] cs fix

---
 src/Symfony/Component/DependencyInjection/ContainerBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 95bcaf6924282..9b4a7c0fd007d 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1060,7 +1060,7 @@ private function createService(Definition $definition, array &$inlineServices, b
         }
 
         if (!array_is_list($arguments)) {
-            $arguments = array_combine(array_map(function ($k) { return preg_replace('/^.*\\$/', '', $k); }, array_keys($arguments)), $arguments);
+            $arguments = array_combine(array_map(fn ($k) => preg_replace('/^.*\\$/', '', $k), array_keys($arguments)), $arguments);
         }
 
         if (null !== $factory) {

From 94e0f5e6d872a3e238a8cc4ceba9f29b8880cd9d Mon Sep 17 00:00:00 2001
From: Alexis Lefebvre <alexislefebvre+github@gmail.com>
Date: Mon, 23 Jan 2023 19:21:43 +0100
Subject: [PATCH 149/475] fix outdated test for redis

---
 .../Cache/Tests/Adapter/RedisAdapterSentinelTest.php          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
index 521c5dc4a5579..5291580c4ce7e 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
@@ -39,7 +39,7 @@ public static function setUpBeforeClass(): void
     public function testInvalidDSNHasBothClusterAndSentinel()
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Cannot use both "redis_cluster" and "redis_sentinel" at the same time:');
+        $this->expectExceptionMessage('Cannot use both "redis_cluster" and "redis_sentinel" at the same time.');
         $dsn = 'redis:?host[redis1]&host[redis2]&host[redis3]&redis_cluster=1&redis_sentinel=mymaster';
         RedisAdapter::createConnection($dsn);
     }
@@ -49,7 +49,7 @@ public function testExceptionMessageWhenFailingToRetrieveMasterInformation()
         $hosts = getenv('REDIS_SENTINEL_HOSTS');
         $dsn = 'redis:?host['.str_replace(' ', ']&host[', $hosts).']';
         $this->expectException(\Symfony\Component\Cache\Exception\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Failed to retrieve master information from sentinel "invalid-masterset-name" and dsn "'.$dsn.'".');
+        $this->expectExceptionMessage('Failed to retrieve master information from sentinel "invalid-masterset-name".');
         AbstractAdapter::createConnection($dsn, ['redis_sentinel' => 'invalid-masterset-name']);
     }
 }

From 4c2375e993ced723760b255240450b5a97f35c1c Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Tue, 24 Jan 2023 09:23:15 +0100
Subject: [PATCH 150/475] [WebProfilerBundle] Move panel specific styles to
 each panel

---
 .../views/Collector/security.html.twig        |  29 +
 .../views/Collector/config.html.twig          |  46 +
 .../Resources/views/Collector/form.html.twig  |  21 +
 .../views/Collector/http_client.html.twig     |  36 +
 .../views/Collector/logger.html.twig          | 215 +++++
 .../views/Collector/mailer.html.twig          | 138 +++
 .../views/Collector/messenger.html.twig       |  57 +-
 .../views/Collector/request.html.twig         |  23 +
 .../views/Collector/serializer.html.twig      |  28 +
 .../Resources/views/Collector/time.html.twig  |  38 +
 .../Resources/views/Collector/twig.html.twig  |  37 +
 .../views/Collector/validator.html.twig       |  29 +
 .../views/Profiler/profiler.css.twig          | 833 ++----------------
 .../views/Profiler/results.html.twig          |  22 +
 14 files changed, 768 insertions(+), 784 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
index 4a5fa01a9e3bc..48e6c95998c7a 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
@@ -2,6 +2,35 @@
 
 {% block page_title 'Security' %}
 
+{% block head %}
+    {{ parent() }}
+
+    <style>
+        #collector-content .decision-log .voter_result td {
+            border-top-width: 1px;
+            border-bottom-width: 0;
+            padding-bottom: 0;
+        }
+
+        #collector-content .decision-log .voter_details td {
+            border-top-width: 0;
+            border-bottom-width: 1px;
+            padding-bottom: 0;
+        }
+
+        #collector-content .decision-log .voter_details table {
+            border: 0;
+            margin: 0;
+            box-shadow: unset;
+        }
+
+        #collector-content .decision-log .voter_details table td {
+            border: 0;
+            padding: 0 0 8px 0;
+        }
+    </style>
+{% endblock %}
+
 {% block toolbar %}
     {% if collector.firewall %}
         {% set icon %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
index b0353b87db310..ca51978f13333 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
@@ -1,5 +1,51 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
+{% block head %}
+    {{ parent() }}
+
+    <style>
+        .config-symfony-version-lts {
+            border: 0;
+            color: var(--color-muted);
+            font-size: 21px;
+            line-height: 33px;
+        }
+        .config-symfony-version-lts[title] {
+            text-decoration: none;
+        }
+        .config-symfony-version-status-badge {
+            background-color: var(--badge-background);
+            border-radius: 4px;
+            color: var(--badge-color);
+            display: inline-block;
+            font-size: 15px;
+            font-weight: bold;
+            margin: 10px 0 5px;
+            padding: 3px 7px;
+            white-space: nowrap;
+        }
+        .config-symfony-version-status-badge.status-success {
+            background-color: var(--badge-success-background);
+            color: var(--badge-success-color);
+        }
+        .config-symfony-version-status-badge.status-warning {
+            background-color: var(--badge-warning-background);
+            color: var(--badge-warning-color);
+        }
+        .config-symfony-version-status-badge.status-error {
+            background-color: var(--badge-danger-background);
+            color: var(--badge-danger-color);
+        }
+        .config-symfony-version-roadmap-link {
+            display: inline-block;
+            margin: 10px 5px 5px;
+        }
+        .config-symfony-eol {
+            margin-top: 5px;
+        }
+    </style>
+{% endblock %}
+
 {% block toolbar %}
     {% if 'unknown' == collector.symfonyState %}
         {% set block_status = '' %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
index 3dcd475dcd7ea..7f389405141ab 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -41,6 +41,27 @@
     {{ parent() }}
 
     <style>
+        .form-type-class {
+            font-size: var(--font-size-body);
+            display: flex;
+            margin: 0 0 15px;
+        }
+        .form-type-class-label {
+            margin-right: 4px;
+        }
+        .form-type-class pre.sf-dump {
+            font-family: var(--font-family-system) !important;
+            font-size: var(--font-size-body) !important;
+            margin-left: 5px;
+        }
+        .form-type-class .sf-dump .sf-dump-str {
+            color: var(--color-link) !important;
+            text-decoration: underline;
+        }
+        .form-type-class .sf-dump .sf-dump-str:hover {
+            text-decoration: none;
+        }
+
         #tree-menu {
             float: left;
             padding-right: 10px;
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/http_client.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/http_client.html.twig
index ed926bf8c2fcc..2cdd22b2d0f1a 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/http_client.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/http_client.html.twig
@@ -1,5 +1,41 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
+{% block head %}
+    {{ parent() }}
+
+    <style>
+        .sf-profiler-httpclient-requests thead th {
+            vertical-align: top;
+        }
+        .sf-profiler-httpclient-requests .http-method {
+            border: 1px solid var(--header-status-request-method-color);
+            border-radius: 5px;
+            color: var(--header-status-request-method-color);
+            display: inline-block;
+            font-weight: 500;
+            line-height: 1;
+            margin-right: 6px;
+            padding: 2px 4px;
+            text-align: center;
+            white-space: nowrap;
+        }
+        .sf-profiler-httpclient-requests .status-response-status-code {
+            background: var(--gray-600);
+            border-radius: 4px;
+            color: var(--white);
+            display: inline-block;
+            font-size: 12px;
+            font-weight: bold;
+            margin-bottom: 2px;
+            padding: 1px 3px;
+        }
+        .sf-profiler-httpclient-requests .status-response-status-code.status-success { background: var(--header-success-status-code-background); color: var(--header-success-status-code-color); }
+        .sf-profiler-httpclient-requests .status-response-status-code.status-warning { background: var(--header-warning-status-code-background); color: var(--header-warning-status-code-color); }
+        .sf-profiler-httpclient-requests .status-response-status-code.status-error { background: var(--header-error-status-code-background); color: var(--header-error-status-code-color); }
+    </style>
+{% endblock %}
+
+
 {% block toolbar %}
     {% if collector.requestCount %}
         {% set icon %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
index c4d789e4778c1..d826993ee7ce8 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -1,5 +1,220 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
+{% block head %}
+    {{ parent() }}
+
+    <style>
+        :root {
+            --log-filter-active-num-color: #2563EB;
+            --log-timestamp-color: #555;
+        }
+        .theme-dark {
+            --log-filter-active-num-color: #2563EB;
+            --log-timestamp-color: #ccc;
+        }
+
+        .log-filters {
+            display: flex;
+            flex-wrap: wrap;
+        }
+        .log-filters .log-filter {
+            flex-shrink: 0;
+            margin-right: 15px;
+            position: relative;
+        }
+        .log-filters .log-filter summary {
+            align-items: center;
+            background: var(--button-background);
+            border-radius: 6px;
+            border: 1px solid var(--button-border-color);
+            box-shadow: var(--button-box-shadow);
+            color: var(--button-color);
+            cursor: pointer;
+            display: flex;
+            font-size: 13px;
+            font-weight: 500;
+            padding: 4px 8px;
+            white-space: nowrap;
+        }
+        .log-filters .log-filter summary:active {
+            box-shadow: none;
+            transform: translateY(1px);
+        }
+        .log-filters .log-filter summary .icon {
+            height: 18px;mai
+            width: 18px;
+            margin: 0 7px 0 0;
+        }
+        .log-filters .log-filter summary svg {
+            height: 18px;
+            width: 18px;
+            opacity: 0.7;
+        }
+        .log-filters .log-filter summary svg {
+            stroke-width: 2;
+        }
+        .log-filters .log-filter summary .filter-active-num {
+            color: var(--log-filter-active-num-color);
+            font-weight: bold;
+            padding: 0 1px;
+        }
+        .log-filter .tab-navigation .tab-control input {
+            display: none;
+        }
+        .log-filter .tab-navigation .tab-control label {
+            cursor: pointer;
+        }
+        .log-filters .log-filter .log-filter-content {
+            background: var(--base-0);
+            border: 1px solid var(--table-border-color);
+            border-radius: 6px;
+            box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
+            padding: 15px;
+            position: absolute;
+            left: 0;
+            top: 32px;
+            max-width: 400px;
+            min-width: 200px;
+            z-index: 9999;
+        }
+        .log-filters .log-filter .log-filter-content .log-filter-option {
+            align-items: center;
+            display: flex;
+        }
+        .log-filter .filter-select-all-or-none {
+            margin-bottom: 10px;
+        }
+        .log-filter .filter-select-all-or-none button + button {
+            margin-left: 15px;
+        }
+        .log-filters .log-filter .log-filter-content .log-filter-option + .log-filter-option {
+            margin: 7px 0 0;
+        }
+        .log-filters .log-filter .log-filter-content .log-filter-option label {
+            cursor: pointer;
+            flex: 1;
+            padding-left: 10px;
+        }
+
+        table.logs {
+            border-bottom-width: 0;
+            border-collapse: collapse;
+        }
+        table.logs tr + tr td {
+            border-width: 1px 0 0;
+        }
+        table.logs .metadata {
+            display: block;
+            font-size: 12px;
+        }
+        .theme-dark tr.status-error td,
+        .theme-dark tr.status-warning td { border-bottom: unset; border-top: unset; }
+
+        table.logs .log-timestamp {
+            color: var(--log-timestamp-color);
+        }
+        table.logs .log-metadata {
+            margin: 8px 0 0;
+        }
+        table.logs .log-metadata > span {
+            display: inline-block;
+        }
+        table.logs .log-metadata > span + span {
+            margin-left: 10px;
+        }
+        tabl
10000
e.logs .log-metadata .log-channel {
+            color: var(--base-1);
+            font-size: 13px;
+            font-weight: bold;
+        }
+        table.logs .log-metadata .badge {
+            background: var(--badge-light-background);
+            color: var(--badge-light-color);
+        }
+        table.logs .log-metadata .log-num-occurrences {
+            color: var(--color-muted);
+            font-size: 13px;
+        }
+        table.logs .log-metadata .context {
+            background: var(--code-block-background);
+            border-radius: 4px;
+            padding: 5px;
+        }
+        table.logs .log-metadata .context + .context {
+            margin-top: 10px;
+        }
+        .log-type-badge {
+            background: var(--badge-light-background);
+            box-shadow: none;
+            color: var(--badge-light-color);
+            display: inline-block;
+            font-family: var(--font-family-system);
+            margin-top: 5px;
+        }
+        .log-type-badge.badge-deprecation,
+        .log-type-badge.badge-warning {
+            background: var(--badge-warning-background);
+            color: var(--badge-warning-color);
+        }
+        .log-type-badge.badge-error {
+            background: var(--badge-danger-background);
+            color: var(--badge-danger-color);
+        }
+        .log-type-badge.badge-silenced {
+            background: #EDE9FE;
+            color: #6D28D9;
+        }
+        .theme-dark .log-type-badge.badge-silenced {
+            background: #5B21B6;
+            color: #EDE9FE;
+        }
+
+        tr.log-status-warning > td:first-child,
+        tr.log-status-error > td:first-child,
+        tr.log-status-silenced > td:first-child {
+            position: relative;
+        }
+        tr.log-status-warning > td:first-child:before,
+        tr.log-status-error > td:first-child:before,
+        tr.log-status-silenced > td:first-child:before {
+            background: transparent;
+            border-radius: 0;
+            content: '';
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 4px;
+            height: 100%;
+        }
+        tr.log-status-warning > td:first-child:before {
+            background: var(--yellow-400);
+        }
+        tr.log-status-error > td:first-child:before {
+            background: var(--red-400);
+        }
+        tr.log-status-silenced > td:first-child:before {
+            background: #a78bfa;
+        }
+
+        .container-compilation-logs {
+            background: var(--table-background);
+            border: 1px solid var(--base-2);
+            border-radius: 6px;
+            margin-top: 30px;
+            padding: 15px;
+        }
+        .container-compilation-logs summary {
+            cursor: pointer;
+        }
+        .container-compilation-logs summary h4 {
+            margin: 0 0 5px;
+        }
+        .container-compilation-logs summary p {
+            margin: 0;
+        }
+    </style>
+{% endblock %}
+
 {% block toolbar %}
     {% if collector.counterrors or collector.countdeprecations or collector.countwarnings %}
         {% set icon %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
index e1bdb4c51cd35..8e65365a15ce0 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
@@ -1,5 +1,143 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
+{% block head %}
+    {{  parent() }}
+
+    <style>
+        :root {
+            --mailer-email-table-wrapper-background: var(--gray-100);
+            --mailer-email-table-active-row-background: #dbeafe;
+            --mailer-email-table-active-row-color: var(--color-text);
+        }
+        .theme-dark {
+            --mailer-email-table-wrapper-background: var(--gray-900);
+            --mailer-email-table-active-row-background: var(--gray-300);
+            --mailer-email-table-active-row-color: var(--gray-800);
+        }
+
+        .mailer-email-summary-table-wrapper {
+            background: var(--mailer-email-table-wrapper-background);
+            border-bottom: 4px double var(--table-border-color);
+            border-radius: inherit;
+            border-bottom-left-radius: 0;
+            border-bottom-right-radius: 0;
+            margin: 0 -9px 10px -9px;
+            padding-bottom: 10px;
+            transform: translateY(-9px);
+            max-height: 265px;
+            overflow-y: auto;
+        }
+        .mailer-email-summary-table,
+        .mailer-email-summary-table tr,
+        .mailer-email-summary-table td {
+            border: 0;
+            border-radius: inherit;
+            border-bottom-left-radius: 0;
+            border-bottom-right-radius: 0;
+            box-shadow: none;
+        }
+        .mailer-email-summary-table th {
+            color: var(--color-muted);
+            font-size: 13px;
+            padding: 4px 10px;
+        }
+        .mailer-email-summary-table tr td,
+        .mailer-email-summary-table tr:last-of-type td {
+            border: solid var(--table-border-color);
+            border-width: 1px 0;
+        }
+        .mailer-email-summary-table-row {
+            margin: 5px 0;
+        }
+        .mailer-email-summary-table-row:hover {
+            cursor: pointer;
+        }
+        .mailer-email-summary-table-row.active {
+            background: var(--mailer-email-table-active-row-background);
+            color: var(--mailer-email-table-active-row-color);
+        }
+        .mailer-email-summary-table-row td {
+            font-family: var(--font-family-system);
+            font-size: inherit;
+        }
+        .mailer-email-details {
+            display: none;
+        }
+        .mailer-email-details.active {
+            display: block;
+        }
+        .mailer-transport-information {
+            border-bottom: 1px solid var(--form-input-border-color);
+            padding-bottom: 5px;
+            font-size: var(--font-size-body);
+            margin: 5px 0 10px 5px;
+        }
+        .mailer-transport-information .badge {
+            font-size: inherit;
+            font-weight: inherit;
+        }
+        .mailer-message-subject {
+            font-size: 21px;
+            font-weight: bold;
+            margin: 5px;
+        }
+        .mailer-message-headers {
+            margin-bottom: 10px;
+        }
+        .mailer-message-headers p {
+            font-size: var(--font-size-body);
+            margin: 2px 5px;
+        }
+        .mailer-message-header-secondary {
+            color: var(--color-muted);
+        }
+        .mailer-message-attachments-title {
+            align-items: center;
+            display: flex;
+            font-size: var(--font-size-body);
+            font-weight: 600;
+            margin-bottom: 10px;
+        }
+        .mailer-message-attachments-title svg {
+            color: var(--color-muted);
+            margin-right: 5px;
+            height: 18px;
+            width: 18px;
+        }
+        .mailer-message-attachments-title span {
+            font-weight: normal;
+            margin-left: 4px;
+        }
+        .mailer-message-attachments-list {
+            list-style: none;
+            margin: 0 0 5px 20px;
+            padding: 0;
+        }
+        .mailer-message-attachments-list li {
+            align-items: center;
+            display: flex;
+        }
+        .mailer-message-attachments-list li svg {
+            margin-right: 5px;
+            height: 18px;
+            width: 18px;
+        }
+        .mailer-message-attachments-list li a {
+            margin-left: 5px;
+        }
+        .mailer-message-download-raw {
+            align-items: center;
+            display: flex;
+            padding: 5px 0 0 5px;
+        }
+        .mailer-message-download-raw svg {
+            height: 18px;
+            width: 18px;
+            margin-right: 3px;
+        }
+    </style>
+{% endblock %}
+
 {% block toolbar %}
     {% set events = collector.events %}
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
index cd1b9ece321ed..d803d6f2f80d0 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
@@ -1,5 +1,43 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
+{% block head %}
+    {{ parent() }}
+
+    <style>
+        .message-item thead th { position: relative; cursor: pointer; user-select: none; padding-right: 35px; }
+        .message-item tbody tr td:first-child { width: 170px; }
+
+        .message-item .label { float: right; padding: 1px 5px; opacity: .75; margin-left: 5px; }
+        .message-item .toggle-button { position: absolute; right: 6px; top: 6px; opacity: .5; pointer-events: none }
+        .message-item .icon svg { height: 24px; width: 24px; }
+
+        .message-item .sf-toggle-off .icon-close, .sf-toggle-on .icon-open { display: none; }
+        .message-item .sf-toggle-off .icon-open, .sf-toggle-on .icon-close { display: block; }
+
+        .message-bus .badge.status-some-errors { line-height: 16px; border-bottom: 2px solid #B0413E; }
+
+        .message-item tbody.sf-toggle-content.sf-toggle-visible { display: table-row-group; }
+
+        #collector-content .message-bus .trace {
+            border: var(--border);
+            background: var(--base-0);
+            padding: 10px;
+            margin: 0.5em 0;
+            overflow: auto;
+        }
+        #collector-content .message-bus .trace {
+            font-size: 12px;
+        }
+        #collector-content .message-bus .trace li {
+            margin-bottom: 0;
+            padding: 0;
+        }
+        #collector-content .message-bus .trace li.selected {
+            background: var(--highlight-selected-line);
+        }
+    </style>
+{% endblock %}
+
 {% block toolbar %}
     {% if collector.messages|length > 0 %}
         {% set status_color = collector.exceptionsCount ? 'red' %}
@@ -39,25 +77,6 @@
     </span>
 {% endblock %}
 
-{% block head %}
-    {{ parent() }}
-    <style>
-        .message-item thead th { position: relative; cursor: pointer; user-select: none; padding-right: 35px; }
-        .message-item tbody tr td:first-child { width: 170px; }
-
-        .message-item .label { float: right; padding: 1px 5px; opacity: .75; margin-left: 5px; }
-        .message-item .toggle-button { position: absolute; right: 6px; top: 6px; opacity: .5; pointer-events: none }
-        .message-item .icon svg { height: 24px; width: 24px; }
-
-        .message-item .sf-toggle-off .icon-close, .sf-toggle-on .icon-open { display: none; }
-        .message-item .sf-toggle-off .icon-open, .sf-toggle-on .icon-close { display: block; }
-
-        .message-bus .badge.status-some-errors { line-height: 16px; border-bottom: 2px solid #B0413E; }
-
-        .message-item tbody.sf-toggle-content.sf-toggle-visible { display: table-row-group; }
-    </style>
-{% endblock %}
-
 {% block panel %}
     <h2>Messages</h2>
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
index 595ea63175e68..4b9d79494a4c9 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
@@ -1,5 +1,28 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
+{% block head %}
+    {{ parent() }}
+
+    <style>
+        .empty-query-post-files {
+            display: flex;
+            justify-content: space-between;
+        }
+        .empty-query-post-files > div {
+            flex: 1;
+        }
+        .empty-query-post-files > div + div {
+            margin-left: 30px;
+        }
+        .empty-query-post-files h3 {
+            margin-top: 0;
+        }
+        .empty-query-post-files .empty {
+            margin-bottom: 0;
+        }
+    </style>
+{% endblock %}
+
 {% block toolbar %}
     {% set request_handler %}
         {{ _self.set_handler(collector.controller) }}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/serializer.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/serializer.html.twig
index 238444a0052ef..46100b46ca0c0 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/serializer.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/serializer.html.twig
@@ -1,5 +1,33 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
+{% block head %}
+    {{ parent() }}
+
+    <style>
+        #collector-content .sf-serializer {
+            margin-bottom: 2em;
+        }
+
+        #collector-content .sf-serializer .trace {
+            border: var(--border);
+            background: var(--page-background);
+            padding: 10px;
+            margin: 0.5em 0;
+            overflow: auto;
+        }
+        #collector-content .sf-serializer .trace {
+            font-size: 12px;
+        }
+        #collector-content .sf-serializer .trace li {
+            margin-bottom: 0;
+            padding: 0;
+        }
+        #collector-content .sf-serializer .trace li.selected {
+            background: var(--highlight-selected-line);
+        }
+    </style>
+{% endblock %}
+
 {% block toolbar %}
     {% if collector.handledCount > 0 %}
         {% set icon %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
index 57f85cdfe9ec3..c74ee256abb2e 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
@@ -1,5 +1,43 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
+{% block head %}
+    {{ parent() }}
+
+    <style>
+        #timeline-control {
+            background: var(--table-background);
+            box-shadow: var(--shadow);
+            margin: 1em 0;
+            padding: 10px;
+        }
+        #timeline-control label {
+            font-weight: bold;
+            margin-right: 1em;
+        }
+        #timeline-control input {
+            background: var(--metric-value-background);
+            font-size: 16px;
+            padding: 4px;
+            text-align: right;
+            width: 5em;
+        }
+        #timeline-control .help {
+            margin-left: 1em;
+        }
+
+        .sf-profiler-timeline .legends {
+            font-size: 12px;
+            line-height: 1.5em;
+        }
+        .sf-profiler-timeline .legends button {
+            color: var(--color-text);
+        }
+        .sf-profiler-timeline + p.help {
+            margin-top: 0;
+        }
+    </style>
+{% endblock %}
+
 {% block toolbar %}
     {% set has_time_events = collector.events|length > 0 %}
     {% set total_time = has_time_events ? '%.0f'|format(collector.duration) : 'n/a' %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
index f4626403a88d8..a54cc8ff414c4 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
@@ -1,5 +1,42 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
+{% block head %}
+    {{ parent() }}
+
+    <style>
+        #twig-dump pre {
+            font-size: var(--font-size-monospace);
+            line-height: 1.7;
+            background-color: var(--page-background);
+            border: var(--border);
+            border-radius: 6px;
+            padding: 15px;
+            box-shadow: 0 0 1px rgba(128, 128, 128, .2);
+        }
+        #twig-dump span {
+            border-radius: 2px;
+            padding: 1px 2px;
+        }
+        #twig-dump .status-error { background: transparent; color: var(--color-error); }
+        #twig-dump .status-warning { background: rgba(240, 181, 24, 0.3); }
+        #twig-dump .status-success { background: rgba(100, 189, 99, 0.2); }
+        #twig-dump .status-info { background: var(--info-background); }
+        .theme-dark #twig-dump .status-warning { color: var(--yellow-200); }
+        .theme-dark #twig-dump .status-success { color: var(--green-200); }
+
+        #twig-table tbody td {
+            position: relative;
+        }
+        #twig-table tbody td div {
+            margin: 0;
+        }
+        #twig-table .template-file-path {
+            color: var(--color-muted);
+            display: block;
+        }
+    </style>
+{% endblock %}
+
 {% block toolbar %}
     {% set time = collector.templatecount ? '%0.0f'|format(collector.time) : 'n/a' %}
     {% set icon %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/validator.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/validator.html.twig
index a473ac2372bac..daad8404e4cb3 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/validator.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/validator.html.twig
@@ -1,5 +1,34 @@
 {% extends '@WebProfiler/Profiler/layout.html.twig' %}
 
+{% block head %}
+    {{ parent() }}
+
+    <style>
+        #collector-content .sf-validator {
+            margin-bottom: 2em;
+        }
+
+        #collector-content .sf-validator .sf-validator-context,
+        #collector-content .sf-validator .trace {
+            border: var(--border);
+            background: var(--base-0);
+            padding: 10px;
+            margin: 0.5em 0;
+            overflow: auto;
+        }
+        #collector-content .sf-validator .trace {
+            font-size: 12px;
+        }
+        #collector-content .sf-validator .trace li {
+            margin-bottom: 0;
+            padding: 0;
+        }
+        #collector-content .sf-validator .trace li.selected {
+            background: var(--highlight-selected-line);
+        }
+    </style>
+{% endblock %}
+
 {% block toolbar %}
     {% if collector.violationsCount > 0 or collector.calls|length %}
         {% set status_color = collector.violationsCount ? 'red' %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
index 9f1b5fba66fc4..819b1cc7de7b0 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -11,6 +11,7 @@ button,hr,input{overflow:visible}progress,sub,sup{vertical-align:baseline}[type=
     --font-size-body: 14px;
     --font-size-monospace: 13px;
     --font-variant-ligatures-monospace: none;
+
     --summary-status-border-width: 6px;
 
     --white: #fff;
@@ -147,8 +148,6 @@ button,hr,input{overflow:visible}progress,sub,sup{vertical-align:baseline}[type=
     --tab-active-color: var(--color-text);
     --tab-disabled-background: #f5f5f5;
     --tab-disabled-color: #999;
-    --log-filter-active-num-color: #2563EB;
-    --log-timestamp-color: #555;
     --code-block-background: var(--gray-50);
     --metric-value-background: var(--page-background);
     --metric-border-color: var(--gray-300);
@@ -169,9 +168,6 @@ button,hr,input{overflow:visible}progress,sub,sup{vertical-align:baseline}[type=
     --shadow: 0px 0px 1px rgba(128, 128, 128, .2);
     --border: 1px solid #e0e0e0;
     --background-error: var(--color-error);
-    --mailer-email-table-wrapper-background: var(--gray-100);
-    --mailer-email-table-active-row-background: #dbeafe;
-    --mailer-email-table-active-row-color: var(--color-text);
 
     --highlight-variable: #e36209;
     --highlight-string: #22863a;
@@ -288,8 +284,6 @@ button,hr,input{overflow:visible}progress,sub,sup{vertical-align:baseline}[type=
     --tab-active-color: var(--gray-800);
     --tab-disabled-background: var(--page-background);
     --tab-disabled-color: var(--gray-400);
-    --log-filter-active-num-color: #2563EB;
-    --log-timestamp-color: #ccc;
     --code-block-background: var(--gray-900);
     --metric-value-background: var(--page-background);
     --metric-border-color: var(--gray-500);
@@ -310,9 +304,6 @@ button,hr,input{overflow:visible}progress,sub,sup{vertical-align:baseline}[type=
     --shadow: 0px 0px 1px rgba(32, 32, 32, .2);
     --border: 1px solid #666;
     --background-error: #b0413e;
-    --mailer-email-table-wrapper-background: var(--gray-900);
-    --mailer-email-table-active-row-background: var(--gray-300);
-    --mailer-email-table-active-row-color: var(--gray-800);
     --highlight-variable: #ffa657;
     --highlight-string: #7ee787;
     --highlight-comment: #8b949e;
@@ -466,11 +457,6 @@ input[type="radio"], input[type="checkbox"] {
     box-shadow: none;
 }
 
-time[data-render-as-date],
-time[data-render-as-time] {
-    white-space: nowrap;
-}
-
 /* Used to hide elements added for accessibility reasons (the !important modifier is needed here) */
 .visually-hidden {
     border: 0 !important;
@@ -673,7 +659,8 @@ table tbody td.num-col {
 .empty p {
     font-size: var(--font-size-body);
     max-width: 60ch;
-    margin: 1em auto;
+    margin-left: auto;
+    margin-right: auto;
     text-align: center;
 }
 .empty.empty-panel {
@@ -884,23 +871,6 @@ tr.status-warning td {
     color: var(--color-error);
 }
 
-{# Syntax highlighting
-   ========================================================================= #}
-.highlight pre {
-    margin: 0;
-    white-space: pre-wrap;
-}
-
-.highlight .keyword   { color: var(--highlight-keyword); font-weight: bold; }
-.highlight .word      { color: var(--color-text); }
-.highlight .variable  { color: var(--highlight-variable); }
-.highlight .symbol    { color: var(--color-text); }
-.highlight .comment   { color: var(--highlight-comment); }
-.highlight .backtick  { color: var(--color-muted); }
-.highlight .string    { color: var(--highlight-string); }
-.highlight .number    { color: var(--highlight-constant); font-weight: bold; }
-.highlight .error     { color: var(--highlight-error); }
-
 {# Icons
    ========================================================================= #}
 .sf-icon {
@@ -1471,72 +1441,6 @@ tr.status-warning td {
     box-shadow: var(--selected-badge-danger-shadow);
 }
 
-{# Timeline panel
-   ========================================================================= #}
-#timeline-control {
-    background: var(--table-background);
-    box-shadow: var(--shadow);
-    margin: 1em 0;
-    padding: 10px;
-}
-#timeline-control label {
-    font-weight: bold;
-    margin-right: 1em;
-}
-#timeline-control input {
-    background: var(--metric-value-background);
-    font-size: 16px;
-    padding: 4px;
-    text-align: right;
-    width: 5em;
-}
-#timeline-control .help {
-    margin-left: 1em;
-}
-
-.sf-profiler-timeline .legends {
-    font-size: 12px;
-    line-height: 1.5em;
-}
-.sf-profiler-timeline .legends button {
-    color: var(--color-text);
-}
-.sf-profiler-timeline + p.help {
-    margin-top: 0;
-}
-
-{# HttpClient panel
-   ========================================================================= #}
-.sf-profiler-httpclient-requests thead th {
-    vertical-align: top;
-}
-.sf-profiler-httpclient-requests .http-method {
-    border: 1px solid var(--header-status-request-method-color);
-    border-radius: 5px;
-    color: var(--header-status-request-method-color);
-    display: inline-block;
-    font-weight: 500;
-    line-height: 1;
-    margin-right: 6px;
-    padding: 2px 4px;
-    text-align: center;
-    white-space: nowrap;
-}
-.sf-profiler-httpclient-requests .status-response-status-code {
-    background: var(--gray-600);
-    border-radius: 4px;
-    color: var(--white);
-    display: inline-block;
-    font-size: 12px;
-    font-weight: bold;
-    margin-bottom: 2px;
-    padding: 1px 3px;
-}
-.sf-profiler-httpclient-requests .status-response-status-code.status-success { background: var(--header-success-status-code-background); color: var(--header-success-status-code-color); }
-.sf-profiler-httpclient-requests .status-response-status-code.status-warning { background: var(--header-warning-status-code-background); color: var(--header-warning-status-code-color); }
-.sf-profiler-httpclient-requests .status-response-status-code.status-error { background: var(--header-error-status-code-background); color: var(--header-error-status-code-color); }
-
-
 {# Tabbed navigation
    ========================================================================= #}
 .tab-navigation {
@@ -1558,10 +1462,8 @@ tr.status-warning td {
     background: transparent;
     border: 0;
     box-shadow: none;
-    color: var(--color-text);
     transition: box-shadow .05s ease-in, background-color .05s ease-in;
     cursor: pointer;
-    font-size: 14px;
     font-weight: 500;
     line-height: 1.4;
     margin: 0;
@@ -1682,59 +1584,7 @@ tr.status-warning td {
 .filter-list-choice li:before { content: '\2714\00a0'; color: transparent; }
 .filter-list-choice li.active:before { color: unset; }
 
-{# Twig panel
-   ========================================================================= #}
-#twig-dump pre {
-    font-size: var(--font-size-monospace);
-    line-height: 1.7;
-    background-color: var(--base-0);
-    border: var(--border);
-    border-radius: 6px;
-    padding: 15px;
-    box-shadow: 0 0 1px rgba(128, 128, 128, .2);
-}
-#twig-dump span {
-    border-radius: 2px;
-    padding: 1px 2px;
-}
-#twig-dump .status-error { background: transparent; color: var(--color-error); }
-#twig-dump .status-warning { background: rgba(240, 181, 24, 0.3); }
-#twig-dump .status-success { background: rgba(100, 189, 99, 0.2); }
-#twig-dump .status-info { background: var(--info-background); }
-.theme-dark #twig-dump .status-warning { color: var(--yellow-200); }
-.theme-dark #twig-dump .status-success { color: var(--green-200); }
-
-#twig-table tbody td {
-    position: relative;
-}
-#twig-table tbody td div {
-    margin: 0;
-}
-#twig-table .template-file-path {
-    color: var(--color-muted);
-    display: block;
-}
-
-{# Request panel
-   ========================================================================= #}
-.empty-query-post-files {
-    display: flex;
-    justify-content: space-between;
-}
-.empty-query-post-files > div {
-    flex: 1;
-}
-.empty-query-post-files > div + div {
-    margin-left: 30px;
-}
-.empty-query-post-files h3 {
-    margin-top: 0;
-}
-.empty-query-post-files .empty {
-    margin-bottom: 0;
-}
-
-{# Logger panel
+{# Badges
    ========================================================================= #}
 .badge {
     background: var(--badge-background);
@@ -1753,495 +1603,7 @@ tr.status-warning td {
     color: var(--badge-warning-color);
 }
 
-.log-filters {
-    display: flex;
-    flex-wrap: wrap;
-}
-.log-filters .log-filter {
-    flex-shrink: 0;
-    margin-right: 15px;
-    position: relative;
-}
-.log-filters .log-filter summary {
-    align-items: center;
-    background: var(--button-background);
-    border-radius: 6px;
-    border: 1px solid var(--button-border-color);
-    box-shadow: var(--button-box-shadow);
-    color: var(--button-color);
-    cursor: pointer;
-    display: flex;
-    font-size: 13px;
-    font-weight: 500;
-    padding: 4px 8px;
-    white-space: nowrap;
-}
-.log-filters .log-filter summary:active {
-    box-shadow: none;
-    transform: translateY(1px);
-}
-.log-filters .log-filter summary .icon {
-    height: 18px;
-    width: 18px;
-    margin: 0 7px 0 0;
-}
-.log-filters .log-filter summary svg {
-    height: 18px;
-    width: 18px;
-    opacity: 0.7;
-}
-.log-filters .log-filter summary svg {
-    stroke-width: 2;
-}
-.log-filters .log-filter summary .filter-active-num {
-    color: var(--log-filter-active-num-color);
-    font-weight: bold;
-    padding: 0 1px;
-}
-.log-filter .tab-navigation {
-    position: relative;
-}
-.log-filter .tab-navigation input[type="radio"] {
-    position: absolute;
-    pointer-events: none;
-    opacity: 0;
-}
-.tab-navigation input[type="radio"]:checked + .tab-control {
-    background-color: var(--tab-active-background);
-    border-radius: 6px;
-    box-shadow: inset 0 0 0 1.5px var(--tab-active-border-color);
-    color: var(--tab-active-color);
-    position: relative;
-    z-index: 1;
-}
-.theme-dark .tab-navigation input[type="radio"]:checked + .tab-control {
-    box-shadow: inset 0 0 0 1px var(--tab-border-color);
-}
-.tab-navigation input[type="radio"]:focus-visible + .tab-control {
-    outline: 1px solid var(--color-link);
-}
-.tab-navigation input[type="radio"]:checked + .tab-control + input[type="radio"] + .tab-control:before{
-    width: 0;
-}
-
-.log-filters .log-filter .log-filter-content {
-    background: var(--base-0);
-    border: 1px solid var(--table-border-color);
-    border-radius: 6px;
-    box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
-    padding: 15px;
-    position: absolute;
-    left: 0;
-    top: 32px;
-    max-width: 400px;
-    min-width: 200px;
-    z-index: 9999;
-}
-.log-filters .log-filter .log-filter-content .log-filter-option {
-    align-items: center;
-    display: flex;
-}
-.log-filter .filter-select-all-or-none {
-    margin-bottom: 10px;
-}
-.log-filter .filter-select-all-or-none button + button {
-    margin-left: 15px;
-}
-.log-filters .log-filter .log-filter-content .log-filter-option + .log-filter-option {
-    margin: 7px 0 0;
-}
-.log-filters .log-filter .log-filter-content .log-filter-option label {
-    cursor: pointer;
-    flex: 1;
-    padding-left: 10px;
-}
-
-table.logs {
-    border-bottom-width: 0;
-    border-collapse: collapse;
-}
-table.logs tr + tr td {
-    border-width: 1px 0 0;
-}
-table.logs .metadata {
-    display: block;
-    font-size: 12px;
-}
-.theme-dark tr.status-error td,
-.theme-dark tr.status-warning td { border-bottom: unset; border-top: unset; }
-
-table.logs .log-timestamp {
-    color: var(--log-timestamp-color);
-}
-table.logs .log-metadata {
-    margin: 8px 0 0;
-}
-table.logs .log-metadata > span {
-    display: inline-block;
-}
-table.logs .log-metadata > span + span {
-    margin-left: 10px;
-}
-table.logs .log-metadata .log-channel {
-    color: var(--base-1);
-    font-size: 13px;
-    font-weight: bold;
-}
-table.logs .log-metadata .badge {
-    background: var(--badge-light-background);
-    color: var(--badge-light-color);
-}
-table.logs .log-metadata .log-num-occurrences {
-    color: var(--color-muted);
-    font-size: 13px;
-}
-table.logs .log-metadata .context {
-    background: var(--code-block-background);
-    border-radius: 4px;
-    padding: 5px;
-}
-table.logs .log-metadata .context + .context {
-    margin-top: 10px;
-}
-.log-type-badge {
-    background: var(--badge-light-background);
-    box-shadow: none;
-    color: var(--badge-light-color);
-    display: inline-block;
-    font-family: var(--font-family-system);
-    margin-top: 5px;
-}
-.log-type-badge.badge-deprecation,
-.log-type-badge.badge-warning {
-    background: var(--badge-warning-background);
-    color: var(--badge-warning-color);
-}
-.log-type-badge.badge-error {
-    background: var(--badge-danger-background);
-    color: var(--badge-danger-color);
-}
-.log-type-badge.badge-silenced {
-    background: #EDE9FE;
-    color: #6D28D9;
-}
-.theme-dark .log-type-badge.badge-silenced {
-    background: #5B21B6;
-    color: #EDE9FE;
-}
-
-tr.log-status-warning > td:first-child,
-tr.log-status-error > td:first-child,
-tr.log-status-silenced > td:first-child {
-    position: relative;
-}
-tr.log-status-warning > td:first-child:before,
-tr.log-status-error > td:first-child:before,
-tr.log-status-silenced > td:first-child:before {
-    background: transparent;
-    border-radius: 0;
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 4px;
-    height: 100%;
-}
-tr.log-status-warning > td:first-child:before {
-    background: var(--yellow-400);
-}
-tr.log-status-error > td:first-child:before {
-    background: var(--red-400);
-}
-tr.log-status-silenced > td:first-child:before {
-    background: #a78bfa;
-}
-
-.container-compilation-logs {
-    background: var(--table-background);
-    border: 1px solid var(--base-2);
-    border-radius: 6px;
-    margin-top: 30px;
-    padding: 15px;
-}
-.container-compilation-logs summary {
-    cursor: pointer;
-}
-.container-compilation-logs summary h4 {
-    margin: 0 0 5px;
-}
-.container-compilation-logs summary p {
-    margin: 0;
-}
-
-{# Mailer panel
-   ========================================================================= #}
-.mailer-email-summary-table-wrapper {
-    background: var(--mailer-email-table-wrapper-background);
-    border-bottom: 4px double var(--table-border-color);
-    border-radius: inherit;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-    margin: 0 -9px 10px -9px;
-    padding-bottom: 10px;
-    transform: translateY(-9px);
-    max-height: 265px;
-    overflow-y: auto;
-}
-.mailer-email-summary-table,
-.mailer-email-summary-table tr,
-.mailer-email-summary-table td {
-    border: 0;
-    border-radius: inherit;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-    box-shadow: none;
-}
-.mailer-email-summary-table th {
-    color: var(--color-muted);
-    font-size: 13px;
-    padding: 4px 10px;
-}
-.mailer-email-summary-table tr td,
-.mailer-email-summary-table tr:last-of-type td {
-    border: solid var(--table-border-color);
-    border-width: 1px 0;
-}
-.mailer-email-summary-table-row {
-    margin: 5px 0;
-}
-.mailer-email-summary-table-row:hover {
-    cursor: pointer;
-}
-.mailer-email-summary-table-row.active {
-    background: var(--mailer-email-table-active-row-background);
-    color: var(--mailer-email-table-active-row-color);
-}
-.mailer-email-summary-table-row td {
-    font-family: var(--font-family-system);
-    font-size: inherit;
-}
-.mailer-email-details {
-    display: none;
-}
-.mailer-email-details.active {
-    display: block;
-}
-.mailer-transport-information {
-    border-bottom: 1px solid var(--form-input-border-color);
-    padding-bottom: 5px;
-    font-size: var(--font-size-body);
-    margin: 5px 0 10px 5px;
-}
-.mailer-transport-information .badge {
-    font-size: inherit;
-    font-weight: inherit;
-}
-.mailer-message-subject {
-    font-size: 21px;
-    font-weight: bold;
-    margin: 5px;
-}
-.mailer-message-headers {
-    margin-bottom: 10px;
-}
-.mailer-message-headers p {
-    font-size: var(--font-size-body);
-    margin: 2px 5px;
-}
-.mailer-message-header-secondary {
-    color: var(--color-muted);
-}
-.mailer-message-attachments-title {
-    align-items: center;
-    display: flex;
-    font-size: var(--font-size-body);
-    font-weight: 600;
-    margin-bottom: 10px;
-}
-.mailer-message-attachments-title svg {
-    color: var(--color-muted);
-    margin-right: 5px;
-    height: 18px;
-    width: 18px;
-}
-.mailer-message-attachments-title span {
-    font-weight: normal;
-    margin-left: 4px;
-}
-.mailer-message-attachments-list {
-    list-style: none;
-    margin: 0 0 5px 20px;
-    padding: 0;
-}
-.mailer-message-attachments-list li {
-    align-items: center;
-    display: flex;
-}
-.mailer-message-attachments-list li svg {
-    margin-right: 5px;
-    height: 18px;
-    width: 18px;
-}
-.mailer-message-attachments-list li a {
-    margin-left: 5px;
-}
-.mailer-email-body {
-    margin: 0;
-    padding: 6px 8px;
-}
-.mailer-empty-email-body {
-    background-image: url("data:image/svg+xml,%3csvg width='100%25' height='100%25' xmlns='http://www.w3.org/2000/svg'%3e%3crect width='100%25' height='100%25' fill='none' stroke='%23e5e5e5' stroke-width='4' stroke-dasharray='6%2c 14' stroke-dashoffset='0' stroke-linecap='square'/%3e%3c/svg%3e");
-    border-radius: 6px;
-    color: var(--color-muted);
-    margin: 1em 0 0;
-    padding: .5em 1em;
-}
-.theme-dark .mailer-empty-email-body {
-    background-image: url("data:image/svg+xml,%3csvg width='100%25' height='100%25' xmlns='http://www.w3.org/2000/svg'%3e%3crect width='100%25' height='100%25' fill='none' stroke='%23737373' stroke-width='4' stroke-dasharray='6%2c 14' stroke-dashoffset='0' stroke-linecap='square'/%3e%3c/svg%3e");
-}
-.mailer-empty-email-body p {
-    font-size: var(--font-size-body);
-    margin: 0;
-    padding: 0.5em 0;
-}
-
-.mailer-message-download-raw {
-    align-items: center;
-    display: flex;
-    padding: 5px 0 0 5px;
-}
-.mailer-message-download-raw svg {
-    height: 18px;
-    width: 18px;
-    margin-right: 3px;
-}
-
-{# Doctrine panel
-   ========================================================================= #}
-.sql-runnable {
-    background: var(--base-1);
-    margin: .5em 0;
-    padding: 1em;
-}
-.sql-explain {
-    overflow-x: auto;
-    max-width: 888px;
-}
-.width-full .sql-explain {
-    max-width: min-content;
-}
-.sql-explain table td, .sql-explain table tr {
-    word-break: normal;
-}
-.queries-table pre {
-    margin: 0;
-    white-space: pre-wrap;
-    -ms-word-break: break-all;
-    word-break: break-all;
-    word-break: break-word;
-    -webkit-hyphens: auto;
-    -moz-hyphens: auto;
-    hyphens: auto;
-}
-
-{# Security panel
-   ========================================================================= #}
-#collector-content .decision-log .voter_result td {
-    border-top-width: 1px;
-    border-bottom-width: 0;
-    padding-bottom: 0;
-}
-
-#collector-content .decision-log .voter_details td {
-    border-top-width: 0;
-    border-bottom-width: 1px;
-    padding-bottom: 0;
-}
-
-#collector-content .decision-log .voter_details table {
-    border: 0;
-    margin: 0;
-    box-shadow: unset;
-}
-
-#collector-content .decision-log .voter_details table td {
-    border: 0;
-    padding: 0 0 8px 0;
-}
-
-{# Validator panel
-   ========================================================================= #}
-
-#collector-content .sf-validator {
-    margin-bottom: 2em;
-}
-
-#collector-content .sf-validator .sf-validator-context,
-#collector-content .sf-validator .trace {
-    border: var(--border);
-    background: var(--base-0);
-    padding: 10px;
-    margin: 0.5em 0;
-    overflow: auto;
-}
-#collector-content .sf-validator .trace {
-    font-size: 12px;
-}
-#collector-content .sf-validator .trace li {
-    margin-bottom: 0;
-    padding: 0;
-}
-#collector-content .sf-validator .trace li.selected {
-    background: var(--highlight-selected-line);
-}
-
-{# Serializer panel
-   ========================================================================= #}
-
-#collector-content .sf-serializer {
-    margin-bottom: 2em;
-}
-
-#collector-content .sf-serializer .trace {
-    border: var(--border);
-    background: var(--base-0);
-    padding: 10px;
-    margin: 0.5em 0;
-    overflow: auto;
-}
-#collector-content .sf-serializer .trace {
-    font-size: 12px;
-}
-#collector-content .sf-serializer .trace li {
-    margin-bottom: 0;
-    padding: 0;
-}
-#collector-content .sf-serializer .trace li.selected {
-    background: var(--highlight-selected-line);
-}
-
-{# Messenger panel
-   ========================================================================= #}
-
-#collector-content .message-bus .trace {
-    border: var(--border);
-    background: var(--base-0);
-    padding: 10px;
-    margin: 0.5em 0;
-    overflow: auto;
-}
-#collector-content .message-bus .trace {
-    font-size: 12px;
-}
-#collector-content .message-bus .trace li {
-    margin-bottom: 0;
-    padding: 0;
-}
-#collector-content .message-bus .trace li.selected {
-    background: var(--highlight-selected-line);
-}
-
-{# Dump panel
+{# Dumped contents (used in many different panels
    ========================================================================= #}
 pre.sf-dump, pre.sf-dump .sf-dump-default {
     white-space: pre-wrap;
@@ -2299,93 +1661,85 @@ pre.sf-dump, pre.sf-dump .sf-dump-default {
     padding: 0;
 }
 
-{# Forms panel
-   ========================================================================= #}
-.form-type-class {
-    font-size: var(--font-size-body);
-    display: flex;
-    margin: 0 0 15px;
-}
-.form-type-class-label {
-    margin-right: 4px;
-}
-.form-type-class pre.sf-dump {
-    font-family: var(--font-family-system) !important;
-    font-size: var(--font-size-body) !important;
-    margin-left: 5px;
-}
-.form-type-class .sf-dump .sf-dump-str {
-    color: var(--color-link) !important;
-    text-decoration: underline;
-}
-.form-type-class .sf-dump .sf-dump-str:hover {
-    text-decoration: none;
+#collector-content pre.sf-dump, #collector-content .sf-dump code, #collector-content .sf-dump samp {
+    font-size: var(--font-size-monospace);
+    font-weight: normal;
 }
 
-{# Configuration panel
-   ========================================================================= #}
-.config-symfony-version-lts {
-    border: 0;
-    color: var(--color-muted);
-    font-size: 21px;
-    line-height: 33px;
-}
-.config-symfony-version-lts[title] {
-    text-decoration: none;
-}
-.config-symfony-version-status-badge {
-    background-color: var(--badge-background);
-    border-radius: 4px;
-    color: var(--badge-color);
-    display: inline-block;
-    font-size: 15px;
-    font-weight: bold;
-    margin: 10px 0 5px;
-    padding: 3px 7px;
-    white-space: nowrap;
-}
-.config-symfony-version-status-badge.status-success {
-    background-color: var(--badge-success-background);
-    color: var(--badge-success-color);
+#collector-content .sf-dump pre.sf-dump,
+#collector-content .sf-dump .trace {
+    background: var(--page-background);
 }
-.config-symfony-version-status-badge.status-warning {
-    background-color: var(--badge-warning-background);
-    color: var(--badge-warning-color);
+#collector-content pre.sf-dump,
+#collector-content .sf-dump-default {
+    color: var(--color-text);
 }
-.config-symfony-version-status-badge.status-error {
-    background-color: var(--badge-danger-background);
-    color: var(--badge-danger-color);
+#collector-content .sf-dump samp {
+    line-height: 1.7;
 }
-.config-symfony-version-roadmap-link {
-    display: inline-block;
-    margin: 10px 5px 5px;
+body.theme-light #collector-content .sf-dump-expanded { color: var(--color-text); }
+body.theme-light #collector-content .sf-dump-str { color: var(--highlight-string); }
+body.theme-light #collector-content .sf-dump-private,
+body.theme-light #collector-content .sf-dump-protected,
+body.theme-light #collector-content .sf-dump-public { color: var(--color-text); }
+body.theme-light #collector-content .sf-dump-note { color: #e36209; }
+body.theme-light #collector-content .sf-dump-meta { color: #6f42c1; }
+body.theme-light #collector-content .sf-dump-key { color: #067d17; }
+body.theme-light #collector-content .sf-dump-num,
+body.theme-light #collector-content .sf-dump-const { color: var(--highlight-constant); }
+body.theme-light #collector-content .sf-dump-ref { color: #6E6E6E; }
+body.theme-light #collector-content .sf-dump-ellipsis { color: var(--gray-600); max-width: 100em; }
+body.theme-light #collector-content .sf-dump-ellipsis-path { max-width: 5em; }
+body.theme-light #collector-content .sf-dump .trace li.selected {
+    background: rgba(255, 255, 153, 0.5);
 }
-.config-symfony-eol {
-    margin-top: 5px;
+body.theme-dark #collector-content .sf-dump-expanded { color: var(--color-text); }
+body.theme-dark #collector-content .sf-dump-str { color: var(--highlight-string); }
+body.theme-dark #collector-content .sf-dump-private,
+body.theme-dark #collector-content .sf-dump-protected,
+body.theme-dark #collector-content .sf-dump-public { color: var(--color-text); }
+body.theme-dark #collector-content .sf-dump-note { color: #ffa657; }
+body.theme-dark #collector-content .sf-dump-meta { color: #d2a8ff; }
+body.theme-dark #collector-content .sf-dump-key { color: #a5d6ff; }
+body.theme-dark #collector-content .sf-dump-num,
+body.theme-dark #collector-content .sf-dump-const { color: var(--highlight-constant); }
+body.theme-dark #collector-content .sf-dump-ref { color: var(--gray-400); }
+body.theme-dark #collector-content .sf-dump-ellipsis { color: var(--gray-300); max-width: 100em; }
+body.theme-dark #collector-content .sf-dump-ellipsis-path { max-width: 5em; }
+body.theme-dark #collector-content .sf-dump .trace li.selected {
+    background: rgba(255, 255, 153, 0.5);
 }
 
-{# Search Results page
+{# Doctrine panel
    ========================================================================= #}
-#search-results td {
-    font-family: var(--font-family-system);
-    vertical-align: middle;
+.sql-runnable {
+    background: var(--base-1);
+    margin: .5em 0;
+    padding: 1em;
 }
-
-#search-results .sf-search {
-
-    visibility: hidden;
-    margin-left: 2px;
+.sql-explain {
+    overflow-x: auto;
+    max-width: 888px;
 }
-#search-results tr:hover .sf-search {
-    visibility: visible;
+.width-full .sql-explain {
+    max-width: min-content;
 }
-#search-results .sf-search svg {
-    stroke-width: 3;
+.sql-explain table td, .sql-explain table tr {
+    word-break: normal;
+}
+.queries-table pre {
+    margin: 0;
+    white-space: pre-wrap;
+    -ms-word-break: break-all;
+    word-break: break-all;
+    word-break: break-word;
+    -webkit-hyphens: auto;
+    -moz-hyphens: auto;
+    hyphens: auto;
 }
 
 {# Small screens
    ========================================================================= #}
-
 .visible-small {
     display: none;
 }
@@ -2458,54 +1812,3 @@ body.width-full .container {
 @media (min-width: 1200px) {
     body.width-full .container { margin: 0 30px; }
 }
-
-{# VarDumper dumps
-   ========================================================================= #}
-#collector-content pre.sf-dump, #collector-content .sf-dump code, #collector-content .sf-dump samp {
-    font-size: var(--font-size-monospace);
-    font-weight: normal;
-}
-
-#collector-content .sf-dump pre.sf-dump,
-#collector-content .sf-dump .trace {
-    background: var(--page-background);
-}
-#collector-content pre.sf-dump,
-#collector-content .sf-dump-default {
-    color: var(--color-text);
-}
-#collector-content .sf-dump samp {
-    line-height: 1.7;
-}
-body.theme-light #collector-content .sf-dump-expanded { color: var(--color-text); }
-body.theme-light #collector-content .sf-dump-str { color: var(--highlight-string); }
-body.theme-light #collector-content .sf-dump-private,
-body.theme-light #collector-content .sf-dump-protected,
-body.theme-light #collector-content .sf-dump-public { color: var(--color-text); }
-body.theme-light #collector-content .sf-dump-note { color: #e36209; }
-body.theme-light #collector-content .sf-dump-meta { color: #6f42c1; }
-body.theme-light #collector-content .sf-dump-key { color: #067d17; }
-body.theme-light #collector-content .sf-dump-num,
-body.theme-light #collector-content .sf-dump-const { color: var(--highlight-constant); }
-body.theme-light #collector-content .sf-dump-ref { color: #6E6E6E; }
-body.theme-light #collector-content .sf-dump-ellipsis { color: var(--gray-600); max-width: 100em; }
-body.theme-light #collector-content .sf-dump-ellipsis-path { max-width: 5em; }
-body.theme-light #collector-content .sf-dump .trace li.selected {
-    background: rgba(255, 255, 153, 0.5);
-}
-body.theme-dark #collector-content .sf-dump-expanded { color: var(--color-text); }
-body.theme-dark #collector-content .sf-dump-str { color: var(--highlight-string); }
-body.theme-dark #collector-content .sf-dump-private,
-body.theme-dark #collector-content .sf-dump-protected,
-body.theme-dark #collector-content .sf-dump-public { color: var(--color-text); }
-body.theme-dark #collector-content .sf-dump-note { color: #ffa657; }
-body.theme-dark #collector-content .sf-dump-meta { color: #d2a8ff; }
-body.theme-dark #collector-content .sf-dump-key { color: #a5d6ff; }
-body.theme-dark #collector-content .sf-dump-num,
-body.theme-dark #collector-content .sf-dump-const { color: var(--highlight-constant); }
-body.theme-dark #collector-content .sf-dump-ref { color: var(--gray-400); }
-body.theme-dark #collector-content .sf-dump-ellipsis { color: var(--gray-300); max-width: 100em; }
-body.theme-dark #collector-content .sf-dump-ellipsis-path { max-width: 5em; }
-body.theme-dark #collector-content .sf-dump .trace li.selected {
-    background: rgba(255, 255, 153, 0.5);
-}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig
index 26fcff3d242d2..befa301a1508f 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/results.html.twig
@@ -6,6 +6,28 @@
     {%- endif -%}
 {% endmacro %}
 
+{% block head %}
+    {{ parent() }}
+
+    <style>
+        #search-results td {
+            font-family: var(--font-family-system);
+            vertical-align: middle;
+        }
+
+        #search-results .sf-search {
+            visibility: hidden;
+            margin-left: 2px;
+        }
+        #search-results tr:hover .sf-search {
+            visibility: visible;
+        }
+        #search-results .sf-search svg {
+            stroke-width: 3;
+        }
+    </style>
+{% endblock %}
+
 {% block summary %}
     <div class="status">
         <h2>Profile Search</h2>

From 4173c3884728cb1807acc0946652109091e54881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= <gabriel.ostrolucky@gmail.com>
Date: Tue, 13 Dec 2022 22:15:15 +0100
Subject: [PATCH 151/475] [Cache] Add Relay support

---
 .github/patch-types.php                       |    1 +
 .github/workflows/integration-tests.yml       |   10 +-
 .github/workflows/psalm.yml                   |    8 +
 .php-cs-fixer.dist.php                        |    1 +
 .../Component/Cache/Adapter/RedisAdapter.php  |    2 +-
 .../Cache/Adapter/RedisTagAwareAdapter.php    |   18 +-
 src/Symfony/Component/Cache/CHANGELOG.md      |    5 +
 .../Adapter/RelayAdapterSentinelTest.php      |   42 +
 .../Cache/Tests/Adapter/RelayAdapterTest.php  |   56 +
 .../Cache/Tests/Traits/RedisProxiesTest.php   |   36 +-
 .../Component/Cache/Traits/RedisTrait.php     |   80 +-
 .../Component/Cache/Traits/RelayProxy.php     | 1262 +++++++++++++++++
 12 files changed, 1478 insertions(+), 43 deletions(-)
 create mode 100644 src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterSentinelTest.php
 create mode 100644 src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterTest.php
 create mode 100644 src/Symfony/Component/Cache/Traits/RelayProxy.php

diff --git a/.github/patch-types.php b/.github/patch-types.php
index eaa085bfae9bb..811f74311eb86 100644
--- a/.github/patch-types.php
+++ b/.github/patch-types.php
@@ -54,6 +54,7 @@
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionIntersectionTypeFixture.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionUnionTypeWithIntersectionFixture.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyProxy/ReadOnlyClass.php'):
+        case false !== strpos($file, '/src/Symfony/Component/Cache/Traits/RelayProxy.php'):
             continue 2;
     }
 
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 171eab250982e..618763da4544e 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -134,11 +134,19 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           coverage: "none"
-          extensions: "json,couchbase-3.2.2,memcached,mongodb-1.12.0,redis,rdkafka,xsl,ldap"
+          extensions: "json,couchbase-3.2.2,memcached,mongodb-1.12.0,redis,rdkafka,xsl,ldap,msgpack,igbinary"
           ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
           php-version: "${{ matrix.php }}"
           tools: pecl
 
+      - name: Install Relay
+        run: |
+          curl -L "https://builds.r2.relay.so/dev/relay-dev-php${{ matrix.php }}-debian-x86-64.tar.gz" | tar xz
+          cd relay-dev-php${{ matrix.php }}-debian-x86-64
+          sudo cp relay.ini $(php-config --ini-dir)
+          sudo cp relay-pkg.so $(php-config --extension-dir)/relay.so
+          sudo sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" $(php-config --extension-dir)/relay.so
+
       - name: Display versions
         run: |
           php -r 'foreach (get_loaded_extensions() as $extension) echo $extension . " " . phpversion($extension) . PHP_EOL;'
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index 26d816ccb6c63..e4d8ccfe4c1b8 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -28,6 +28,14 @@ jobs:
           ini-values: "memory_limit=-1"
           coverage: none
 
+      - name: Install Relay
+        run: |
+          curl -L "https://builds.r2.relay.so/dev/relay-dev-php8.1-debian-x86-64.tar.gz" | tar xz
+          cd relay-dev-php8.1-debian-x86-64
+          sudo cp relay.ini $(php-config --ini-dir)
+          sudo cp relay-pkg.so $(php-config --extension-dir)/relay.so
+          sudo sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" $(php-config --extension-dir)/relay.so
+
       - name: Checkout target branch
         uses: actions/checkout@v3
         with:
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index db6a854c1f398..7245326249db2 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -67,6 +67,7 @@
             // stop removing spaces on the end of the line in strings
             ->notPath('Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php')
             // auto-generated proxies
+            ->notPath('Symfony/Component/Cache/Traits/RelayProxy.php')
             ->notPath('Symfony/Component/Cache/Traits/Redis5Proxy.php')
             ->notPath('Symfony/Component/Cache/Traits/Redis6Proxy.php')
             ->notPath('Symfony/Component/Cache/Traits/RedisCluster5Proxy.php')
diff --git a/src/Symfony/Component/Cache/Adapter/RedisAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisAdapter.php
index 9cb8d58991d79..d8e37b1d7b2f3 100644
--- a/src/Symfony/Component/Cache/Adapter/RedisAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/RedisAdapter.php
@@ -18,7 +18,7 @@ class RedisAdapter extends AbstractAdapter
 {
     use RedisTrait;
 
-    public function __construct(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+    public function __construct(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|\Relay\Relay $redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
     {
         $this->init($redis, $namespace, $defaultLifetime, $marshaller);
     }
diff --git a/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
index a004709ba504d..b14c26db80455 100644
--- a/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
@@ -16,6 +16,7 @@
 use Predis\Connection\Aggregate\ReplicationInterface;
 use Predis\Response\ErrorInterface;
 use Predis\Response\Status;
+use Relay\Relay;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\Exception\LogicException;
@@ -59,18 +60,19 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
     private string $redisEvictionPolicy;
     private string $namespace;
 
-    public function __construct(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+    public function __construct(\Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
     {
         if ($redis instanceof \Predis\ClientInterface && $redis->getConnection() instanceof ClusterInterface && !$redis->getConnection() instanceof PredisCluster) {
             throw new InvalidArgumentException(sprintf('Unsupported Predis cluster connection: only "%s" is, "%s" given.', PredisCluster::class, get_debug_type($redis->getConnection())));
         }
 
-        if (\defined('Redis::OPT_COMPRESSION') && \in_array($redis::class, [\Redis::class, \RedisArray::class, \RedisCluster::class], true)) {
-            $compression = $redis->getOption(\Redis::OPT_COMPRESSION);
+        $isRelay = $redis instanceof Relay;
+        if ($isRelay || \defined('Redis::OPT_COMPRESSION') && \in_array($redis::class, [\Redis::class, \RedisArray::class, \RedisCluster::class], true)) {
+            $compression = $redis->getOption($isRelay ? Relay::OPT_COMPRESSION : \Redis::OPT_COMPRESSION);
 
             foreach (\is_array($compression) ? $compression : [$compression] as $c) {
-                if (\Redis::COMPRESSION_NONE !== $c) {
-                    throw new InvalidArgumentException(sprintf('phpredis compression must be disabled when using "%s", use "%s" instead.', static::class, DeflateMarshaller::class));
+                if ($isRelay ? Relay::COMPRESSION_NONE : \Redis::COMPRESSION_NONE !== $c) {
+                    throw new InvalidArgumentException(sprintf('redis compression must be disabled when using "%s", use "%s" instead.', static::class, DeflateMarshaller::class));
                 }
             }
         }
@@ -154,7 +156,7 @@ protected function doDeleteYieldTags(array $ids): iterable
         });
 
         foreach ($results as $id => $result) {
-            if ($result instanceof \RedisException || $result instanceof ErrorInterface) {
+            if ($result instanceof \RedisException || $result instanceof \Relay\Exception || $result instanceof ErrorInterface) {
                 CacheItem::log($this->logger, 'Failed to delete key "{key}": '.$result->getMessage(), ['key' => substr($id, \strlen($this->namespace)), 'exception' => $result]);
 
                 continue;
@@ -221,7 +223,7 @@ protected function doInvalidate(array $tagIds): bool
         $results = $this->pipeline(function () use ($tagIds, $lua) {
             if ($this->redis instanceof \Predis\ClientInterface) {
                 $prefix = $this->redis->getOptions()->prefix ? $this->redis->getOptions()->prefix->getPrefix() : '';
-            } elseif (\is_array($prefix = $this->redis->getOption(\Redis::OPT_PREFIX) ?? '')) {
+            } elseif (\is_array($prefix = $this->redis->getOption($this->redis instanceof Relay ? Relay::OPT_PREFIX : \Redis::OPT_PREFIX) ?? '')) {
                 $prefix = current($prefix);
             }
 
@@ -242,7 +244,7 @@ protected function doInvalidate(array $tagIds): bool
 
         $success = true;
         foreach ($results as $id => $values) {
-            if ($values instanceof \RedisException || $values instanceof ErrorInterface) {
+            if ($values instanceof \RedisException || $values instanceof \Relay\Exception || $values instanceof ErrorInterface) {
                 CacheItem::log($this->logger, 'Failed to invalidate key "{key}": '.$values->getMessage(), ['key' => substr($id, \strlen($this->namespace)), 'exception' => $values]);
                 $success = false;
 
diff --git a/src/Symfony/Component/Cache/CHANGELOG.md b/src/Symfony/Component/Cache/CHANGELOG.md
index 902d0ef29cb24..635a9408176b9 100644
--- a/src/Symfony/Component/Cache/CHANGELOG.md
+++ b/src/Symfony/Component/Cache/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add support for Relay PHP extension for Redis
+
 6.1
 ---
 
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterSentinelTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterSentinelTest.php
new file mode 100644
index 0000000000000..60f506f931871
--- /dev/null
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterSentinelTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use PHPUnit\Framework\SkippedTestSuiteError;
+use Relay\Relay;
+use Relay\Sentinel;
+use Symfony\Component\Cache\Adapter\AbstractAdapter;
+
+/**
+ * @group integration
+ */
+class RelayAdapterSentinelTest extends AbstractRedisAdapterTest
+{
+    public static function setUpBeforeClass(): void
+    {
+        if (!class_exists(Sentinel::class)) {
+            throw new SkippedTestSuiteError('The Relay\Sentinel class is required.');
+        }
+        if (!$hosts = getenv('REDIS_SENTINEL_HOSTS')) {
+            throw new SkippedTestSuiteError('REDIS_SENTINEL_HOSTS env var is not defined.');
+        }
+        if (!$service = getenv('REDIS_SENTINEL_SERVICE')) {
+            throw new SkippedTestSuiteError('REDIS_SENTINEL_SERVICE env var is not defined.');
+        }
+
+        self::$redis = AbstractAdapter::createConnection(
+            'redis:?host['.str_replace(' ', ']&host[', $hosts).']',
+            ['redis_sentinel' => $service, 'prefix' => 'prefix_', 'class' => Relay::class],
+        );
+        self::assertInstanceOf(Relay::class, self::$redis);
+    }
+}
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterTest.php
new file mode 100644
index 0000000000000..e98fc9bcf69e1
--- /dev/null
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Tests\Adapter;
+
+use PHPUnit\Framework\SkippedTestSuiteError;
+use Relay\Relay;
+use Symfony\Component\Cache\Adapter\AbstractAdapter;
+use Symfony\Component\Cache\Adapter\RedisAdapter;
+use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Traits\RelayProxy;
+
+/**
+ * @requires extension relay
+ *
+ * @group integration
+ */
+class RelayAdapterTest extends AbstractRedisAdapterTest
+{
+    public static function setUpBeforeClass(): void
+    {
+        try {
+            new Relay(...explode(':', getenv('REDIS_HOST')));
+        } catch (\Relay\Exception $e) {
+            throw new SkippedTestSuiteError(getenv('REDIS_HOST').': '.$e->getMessage());
+        }
+        self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), ['lazy' => true, 'class' => Relay::class]);
+        self::assertInstanceOf(RelayProxy::class, self::$redis);
+    }
+
+    public function testCreateHostConnection()
+    {
+        $redis = RedisAdapter::createConnection('redis://'.getenv('REDIS_HOST').'?class=Relay\Relay');
+        $this->assertInstanceOf(Relay::class, $redis);
+        $this->assertTrue($redis->isConnected());
+        $this->assertSame(0, $redis->getDbNum());
+    }
+
+    public function testLazyConnection()
+    {
+        $redis = RedisAdapter::createConnection('redis://nonexistenthost?class=Relay\Relay&lazy=1');
+        $this->assertInstanceOf(RelayProxy::class, $redis);
+        // no exception until now
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Failed to resolve host address');
+        $redis->getHost(); // yep, only here exception is thrown
+    }
+}
diff --git a/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php b/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php
index 27fabf700af8a..dbfcef951cae7 100644
--- a/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php
+++ b/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php
@@ -12,15 +12,15 @@
 namespace Symfony\Component\Cache\Tests\Traits;
 
 use PHPUnit\Framework\TestCase;
+use Relay\Relay;
 use Symfony\Component\VarExporter\LazyProxyTrait;
 use Symfony\Component\VarExporter\ProxyHelper;
 
-/**
- * @requires extension redis
- */
 class RedisProxiesTest extends TestCase
 {
     /**
+     * @requires extension redis
+     *
      * @testWith ["Redis"]
      *           ["RedisCluster"]
      */
@@ -50,6 +50,36 @@ public function testRedis5Proxy($class)
     }
 
     /**
+     * @requires extension relay
+     */
+    public function testRelayProxy()
+    {
+        $proxy = file_get_contents(\dirname(__DIR__, 2).'/Traits/RelayProxy.php');
+        $proxy = substr($proxy, 0, 8 + strpos($proxy, "\n    ];"
10000
));
+        $methods = [];
+
+        foreach ((new \ReflectionClass(Relay::class))->getMethods() as $method) {
+            if ('reset' === $method->name || method_exists(LazyProxyTrait::class, $method->name) || $method->isStatic()) {
+                continue;
+            }
+            $return = $method->getReturnType() instanceof \ReflectionNamedType && 'void' === (string) $method->getReturnType() ? '' : 'return ';
+            $methods[] = "\n    ".ProxyHelper::exportSignature($method, false)."\n".<<<EOPHP
+                {
+                    {$return}\$this->lazyObjectReal->{$method->name}(...\\func_get_args());
+                }
+
+            EOPHP;
+        }
+
+        uksort($methods, 'strnatcmp');
+        $proxy .= implode('', $methods)."}\n";
+
+        $this->assertStringEqualsFile(\dirname(__DIR__, 2).'/Traits/RelayProxy.php', $proxy);
+    }
+
+    /**
+     * @requires extension redis
+     *
      * @testWith ["Redis", "redis"]
      *           ["RedisCluster", "redis_cluster"]
      */
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index 131b9f3268f1e..a226fad13bf7c 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -17,6 +17,8 @@
 use Predis\Connection\Aggregate\ReplicationInterface;
 use Predis\Response\ErrorInterface;
 use Predis\Response\Status;
+use Relay\Relay;
+use Relay\Sentinel;
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
@@ -45,10 +47,10 @@ trait RedisTrait
         'failover' => 'none',
         'ssl' => null, // see https://php.net/context.ssl
     ];
-    private \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis;
+    private \Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis;
     private MarshallerInterface $marshaller;
 
-    private function init(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis, string $namespace, int $defaultLifetime, ?MarshallerInterface $marshaller)
+    private function init(\Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis, string $namespace, int $defaultLifetime, ?MarshallerInterface $marshaller)
     {
         parent::__construct($namespace, $defaultLifetime);
 
@@ -80,7 +82,7 @@ private function init(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface $
      *
      * @throws InvalidArgumentException when the DSN is invalid
      */
-    public static function createConnection(#[\SensitiveParameter] string $dsn, array $options = []): \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface
+    public static function createConnection(#[\SensitiveParameter] string $dsn, array $options = []): \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|Relay
     {
         if (str_starts_with($dsn, 'redis:')) {
             $scheme = 'redis';
@@ -165,28 +167,39 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
 
         $params += $query + $options + self::$defaultConnectionOptions;
 
-        if (isset($params['redis_sentinel']) && !class_exists(\Predis\Client::class) && !class_exists(\RedisSentinel::class)) {
-            throw new CacheException('Redis Sentinel support requires the "predis/predis" package or the "redis" extension v5.2 or higher.');
+        if (isset($params['redis_sentinel']) && !class_exists(\Predis\Client::class) && !class_exists(\RedisSentinel::class) && !class_exists(Sentinel::class)) {
+            throw new CacheException('Redis Sentinel support requires one of: "predis/predis", "ext-redis >= 5.2", "ext-relay".');
         }
 
         if ($params['redis_cluster'] && isset($params['redis_sentinel'])) {
             throw new InvalidArgumentException('Cannot use both "redis_cluster" and "redis_sentinel" at the same time.');
         }
 
-        if (null === $params['class'] && \extension_loaded('redis')) {
-            $class = $params['redis_cluster'] ? \RedisCluster::class : (1 < \count($hosts) && !isset($params['redis_sentinel']) ? \RedisArray::class : \Redis::class);
-        } else {
-            $class = $params['class'] ?? \Predis\Client::class;
-
-            if (isset($params['redis_sentinel']) && !is_a($class, \Predis\Client::class, true) && !class_exists(\RedisSentinel::class)) {
-                throw new CacheException(sprintf('Cannot use Redis Sentinel: class "%s" does not extend "Predis\Client" and ext-redis >= 5.2 not found.', $class));
-            }
+        $class = $params['class'] ?? match (true) {
+            $params['redis_cluster'] => \extension_loaded('redis') ? \RedisCluster::class : \Predis\Client::class,
+            isset($params['redis_sentinel']) => match (true) {
+                \extension_loaded('redis') => \Redis::class,
+                \extension_loaded('relay') => Relay::class,
+                default => \Predis\Client::class,
+            },
+            1 < \count($hosts) && \extension_loaded('redis') => 1 < \count($hosts) ? \RedisArray::class : \Redis::class,
+            \extension_loaded('redis') => \Redis::class,
+            \extension_loaded('relay') => Relay::class,
+            default => \Predis\Client::class,
+        };
+
+        if (isset($params['redis_sentinel']) && !is_a($class, \Predis\Client::class, true) && !class_exists(\RedisSentinel::class) && !class_exists(Sentinel::class)) {
+            throw new CacheException(sprintf('Cannot use Redis Sentinel: class "%s" does not extend "Predis\Client" and neither ext-redis >= 5.2 nor ext-relay have been found.', $class));
         }
 
-        if (is_a($class, \Redis::class, true)) {
+        $isRedisExt = is_a($class, \Redis::class, true);
+        $isRelayExt = !$isRedisExt && is_a($class, Relay::class, true);
+
+        if ($isRedisExt || $isRelayExt) {
             $connect = $params['persistent'] || $params['persistent_id'] ? 'pconnect' : 'connect';
 
-            $initializer = static function () use ($class, $connect, $params, $auth, $hosts, $tls) {
+            $initializer = static function () use ($class, $isRedisExt, $connect, $params, $auth, $hosts, $tls) {
+                $sentinelClass = $isRedisExt ? \RedisSentinel::class : Sentinel::class;
                 $redis = new $class();
                 $hostIndex = 0;
                 do {
@@ -205,7 +218,7 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                     if (\defined('Redis::OPT_NULL_MULTIBULK_AS_NULL') && isset($params['auth'])) {
                         $extra = [$params['auth']];
                     }
-                    $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
+                    $sentinel = new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
 
                     if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
                         [$host, $port] = $address;
@@ -223,7 +236,7 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                     if (isset($params['auth'])) {
                         $extra['auth'] = $params['auth'];
                     }
-                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') ? [$extra] : []);
+                    @$redis->{$connect}($host, $port, (float) $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') || !$isRedisExt ? [$extra] : []);
 
                     set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
                     try {
@@ -243,17 +256,21 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                         throw new InvalidArgumentException('Redis connection failed: '.$e.'.');
                     }
 
-                    if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) {
-                        $redis->setOption(\Redis::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
+                    if (0 < $params['tcp_keepalive'] && (!$isRedisExt || \defined('Redis::OPT_TCP_KEEPALIVE'))) {
+                        $redis->setOption($isRedisExt ? \Redis::OPT_TCP_KEEPALIVE : Relay::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
                     }
-                } catch (\RedisException $e) {
+                } catch (\RedisException|\Relay\Exception $e) {
                     throw new InvalidArgumentException('Redis connection failed: '.$e->getMessage());
                 }
 
                 return $redis;
             };
 
-            $redis = $params['lazy'] ? RedisProxy::createLazyProxy($initializer) : $initializer();
+            if ($params['lazy']) {
+                $redis = $isRedisExt ? RedisProxy::createLazyProxy($initializer) : RelayProxy::createLazyProxy($initializer);
+            } else {
+                $redis = $initializer();
+            }
         } elseif (is_a($class, \RedisArray::class, true)) {
             foreach ($hosts as $i => $host) {
                 $hosts[$i] = match ($host['scheme']) {
@@ -271,11 +288,11 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                 throw new InvalidArgumentException('Redis connection failed: '.$e->getMessage());
             }
 
-            if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) {
-                $redis->setOption(\Redis::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
+            if (0 < $params['tcp_keepalive'] && (!$isRedisExt || \defined('Redis::OPT_TCP_KEEPALIVE'))) {
+                $redis->setOption($isRedisExt ? \Redis::OPT_TCP_KEEPALIVE : Relay::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
             }
         } elseif (is_a($class, \RedisCluster::class, true)) {
-            $initializer = static function () use ($class, $params, $hosts) {
+            $initializer = static function () use ($isRedisExt, $class, $params, $hosts) {
                 foreach ($hosts as $i => $host) {
                     $hosts[$i] = match ($host['scheme']) {
                         'tcp' => $host['host'].':'.$host['port'],
@@ -290,8 +307,8 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                     throw new InvalidArgumentException('Redis connection failed: '.$e->getMessage());
                 }
 
-                if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) {
-                    $redis->setOption(\Redis::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
+                if (0 < $params['tcp_keepalive'] && (!$isRedisExt || \defined('Redis::OPT_TCP_KEEPALIVE'))) {
+                    $redis->setOption($isRedisExt ? \Redis::OPT_TCP_KEEPALIVE : Relay::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
                 }
                 $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, match ($params['failover']) {
                     'error' => \RedisCluster::FAILOVER_ERROR,
@@ -343,7 +360,7 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                 $redis->getConnection()->setSentinelTimeout($params['timeout']);
             }
         } elseif (class_exists($class, false)) {
-            throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis", "RedisArray", "RedisCluster" nor "Predis\ClientInterface".', $class));
+            throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis", "RedisArray", "RedisCluster", "Relay\Relay" nor "Predis\ClientInterface".', $class));
         } else {
             throw new InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
         }
@@ -413,7 +430,10 @@ protected function doClear(string $namespace): bool
             $info = $host->info('Server');
             $info = !$info instanceof ErrorInterface ? $info['Server'] ?? $info : ['redis_version' => '2.0'];
 
-            if (!$host instanceof \Predis\ClientInterface) {
+            if ($host instanceof Relay) {
+                $prefix = Relay::SCAN_PREFIX & $host->getOption(Relay::OPT_SCAN) ? '' : $host->getOption(Relay::OPT_PREFIX);
+                $prefixLen = \strlen($host->getOption(Relay::OPT_PREFIX) ?? '');
+            } elseif (!$host instanceof \Predis\ClientInterface) {
                 $prefix = \defined('Redis::SCAN_PREFIX') && (\Redis::SCAN_PREFIX & $host->getOption(\Redis::OPT_SCAN)) ? '' : $host->getOption(\Redis::OPT_PREFIX);
                 $prefixLen = \strlen($host->getOption(\Redis::OPT_PREFIX) ?? '');
             }
@@ -549,7 +569,7 @@ private function pipeline(\Closure $generator, object $redis = null): \Generator
                 $results[$k] = $connections[$h][$c];
             }
         } else {
-            $redis->multi(\Redis::PIPELINE);
+            $redis->multi($redis instanceof Relay ? Relay::PIPELINE : \Redis::PIPELINE);
             foreach ($generator() as $command => $args) {
                 $redis->{$command}(...$args);
                 $ids[] = 'eval' === $command ? $args[1][0] : $args[0];
@@ -558,7 +578,7 @@ private function pipeline(\Closure $generator, object $redis = null): \Generator
         }
 
         if (!$redis instanceof \Predis\ClientInterface && 'eval' === $command && $redis->getLastError()) {
-            $e = new \RedisException($redis->getLastError());
+            $e = $redis instanceof Relay ? new \Relay\Exception($redis->getLastError()) : new \RedisException($redis->getLastError());
             $results = array_map(fn ($v) => false === $v ? $e : $v, (array) $results);
         }
 
diff --git a/src/Symfony/Component/Cache/Traits/RelayProxy.php b/src/Symfony/Component/Cache/Traits/RelayProxy.php
new file mode 100644
index 0000000000000..d458062163ada
--- /dev/null
+++ b/src/Symfony/Component/Cache/Traits/RelayProxy.php
@@ -0,0 +1,1262 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Cache\Traits;
+
+use Relay\Relay;
+use Symfony\Component\VarExporter\LazyObjectInterface;
+use Symfony\Component\VarExporter\LazyProxyTrait;
+use Symfony\Contracts\Service\ResetInterface;
+
+// Help opcache.preload discover always-needed symbols
+class_exists(\Symfony\Component\VarExporter\Internal\Hydrator::class);
+class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectRegistry::class);
+class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
+
+/**
+ * @internal
+ */
+class RelayProxy extends Relay implements ResetInterface, LazyObjectInterface
+{
+    use LazyProxyTrait {
+        resetLazyObject as reset;
+    }
+
+    private const LAZY_OBJECT_PROPERTY_SCOPES = [
+        'lazyObjectReal' => [self::class, 'lazyObjectReal', null],
+        "\0".self::class."\0lazyObjectReal" => [self::class, 'lazyObjectReal', null],
+    ];
+
+    public function __construct($host = null, $port = 6379, $connect_timeout = 0.0, $command_timeout = 0.0, #[\SensitiveParameter] $context = [], $database = 0)
+    {
+        return $this->lazyObjectReal->__construct(...\func_get_args());
+    }
+
+    public function connect($host, $port = 6379, $timeout = 0.0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0.0, #[\SensitiveParameter] $context = [], $database = 0): bool
+    {
+        return $this->lazyObjectReal->connect(...\func_get_args());
+    }
+
+    public function pconnect($host, $port = 6379, $timeout = 0.0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0.0, #[\SensitiveParameter] $context = [], $database = 0): bool
+    {
+        return $this->lazyObjectReal->pconnect(...\func_get_args());
+    }
+
+    public function close(): bool
+    {
+        return $this->lazyObjectReal->close(...\func_get_args());
+    }
+
+    public function pclose(): bool
+    {
+        return $this->lazyObjectReal->pclose(...\func_get_args());
+    }
+
+    public function listen($callback): bool
+    {
+        return $this->lazyObjectReal->listen(...\func_get_args());
+    }
+
+    public function onFlushed($callback): bool
+    {
+        return $this->lazyObjectReal->onFlushed(...\func_get_args());
+    }
+
+    public function onInvalidated($callback, $pattern = null): bool
+    {
+        return $this->lazyObjectReal->onInvalidated(...\func_get_args());
+    }
+
+    public function dispatchEvents(): false|int
+    {
+        return $this->lazyObjectReal->dispatchEvents(...\func_get_args());
+    }
+
+    public function getOption($option): mixed
+    {
+        return $this->lazyObjectReal->getOption(...\func_get_args());
+    }
+
+    public function option($option, $value = null): mixed
+    {
+        return $this->lazyObjectReal->option(...\func_get_args());
+    }
+
+    public function setOption($option, $value): bool
+    {
+        return $this->lazyObjectReal->setOption(...\func_get_args());
+    }
+
+    public function getTimeout(): false|float
+    {
+        return $this->lazyObjectReal->getTimeout(...\func_get_args());
+    }
+
+    public function timeout(): false|float
+    {
+        return $this->lazyObjectReal->timeout(...\func_get_args());
+    }
+
+    public function getReadTimeout(): false|float
+    {
+        return $this->lazyObjectReal->getReadTimeout(...\func_get_args());
+    }
+
+    public function readTimeout(): false|float
+    {
+        return $this->lazyObjectReal->readTimeout(...\func_get_args());
+    }
+
+    public function getBytes(): array
+    {
+        return $this->lazyObjectReal->getBytes(...\func_get_args());
+    }
+
+    public function bytes(): array
+    {
+        return $this->lazyObjectReal->bytes(...\func_get_args());
+    }
+
+    public function getHost(): false|string
+    {
+        return $this->lazyObjectReal->getHost(...\func_get_args());
+    }
+
+    public function isConnected(): bool
+    {
+        return $this->lazyObjectReal->isConnected(...\func_get_args());
+    }
+
+    public function getPort(): false|int
+    {
+        return $this->lazyObjectReal->getPort(...\func_get_args());
+    }
+
+    public function getAuth(): mixed
+    {
+        return $this->lazyObjectReal->getAuth(...\func_get_args());
+    }
+
+    public function getDbNum(): mixed
+    {
+        return $this->lazyObjectReal->getDbNum(...\func_get_args());
+    }
+
+    public function _serialize($value): mixed
+    {
+        return $this->lazyObjectReal->_serialize(...\func_get_args());
+    }
+
+    public function _unserialize($value): mixed
+    {
+        return $this->lazyObjectReal->_unserialize(...\func_get_args());
+    }
+
+    public function _compress($value): string
+    {
+        return $this->lazyObjectReal->_compress(...\func_get_args());
+    }
+
+    public function _uncompress($value): string
+    {
+        return $this->lazyObjectReal->_uncompress(...\func_get_args());
+    }
+
+    public function _pack($value): string
+    {
+        return $this->lazyObjectReal->_pack(...\func_get_args());
+    }
+
+    public function _unpack($value): mixed
+    {
+        return $this->lazyObjectReal->_unpack(...\func_get_args());
+    }
+
+    public function _prefix($value): string
+    {
+        return $this->lazyObjectReal->_prefix(...\func_get_args());
+    }
+
+    public function getLastError(): ?string
+    {
+        return $this->lazyObjectReal->getLastError(...\func_get_args());
+    }
+
+    public function clearLastError(): bool
+    {
+        return $this->lazyObjectReal->clearLastError(...\func_get_args());
+    }
+
+    public function endpointId(): false|string
+    {
+        return $this->lazyObjectReal->endpointId(...\func_get_args());
+    }
+
+    public function getPersistentID(): false|string
+    {
+        return $this->lazyObjectReal->getPersistentID(...\func_get_args());
+    }
+
+    public function socketId(): false|string
+    {
+        return $this->lazyObjectReal->socketId(...\func_get_args());
+    }
+
+    public function rawCommand($cmd, ...$args): mixed
+    {
+        return $this->lazyObjectReal->rawCommand(...\func_get_args());
+    }
+
+    public function select($db): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->select(...\func_get_args());
+    }
+
+    public function auth(#[\SensitiveParameter] $auth): bool
+    {
+        return $this->lazyObjectReal->auth(...\func_get_args());
+    }
+
+    public function info(...$sections): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->info(...\func_get_args());
+    }
+
+    public function flushdb($async = false): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->flushdb(...\func_get_args());
+    }
+
+    public function flushall($async = false): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->flushall(...\func_get_args());
+    }
+
+    public function fcall($name, $argv = [], $keys = [], $handler = null): mixed
+    {
+        return $this->lazyObjectReal->fcall(...\func_get_args());
+    }
+
+    public function fcall_ro($name, $argv = [], $keys = [], $handler = null): mixed
+    {
+        return $this->lazyObjectReal->fcall_ro(...\func_get_args());
+    }
+
+    public function function($op, ...$args): mixed
+    {
+        return $this->lazyObjectReal->function(...\func_get_args());
+    }
+
+    public function dbsize(): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->dbsize(...\func_get_args());
+    }
+
+    public function dump($key): \Relay\Relay|false|string
+    {
+        return $this->lazyObjectReal->dump(...\func_get_args());
+    }
+
+    public function replicaof($host = null, $port = 0): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->replicaof(...\func_get_args());
+    }
+
+    public function restore($key, $ttl, $value, $options = null): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->restore(...\func_get_args());
+    }
+
+    public function migrate($host, $port, $key, $dstdb, $timeout, $copy = false, $replace = false, #[\SensitiveParameter] $credentials = null): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->migrate(...\func_get_args());
+    }
+
+    public function copy($src, $dst, $options = null): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->copy(...\func_get_args());
+    }
+
+    public function echo($arg): \Relay\Relay|bool|string
+    {
+        return $this->lazyObjectReal->echo(...\func_get_args());
+    }
+
+    public function ping($arg = null): \Relay\Relay|bool|string
+    {
+        return $this->lazyObjectReal->ping(...\func_get_args());
+    }
+
+    public function idleTime(): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->idleTime(...\func_get_args());
+    }
+
+    public function randomkey(): \Relay\Relay|bool|null|string
+    {
+        return $this->lazyObjectReal->randomkey(...\func_get_args());
+    }
+
+    public function time(): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->time(...\func_get_args());
+    }
+
+    public function bgrewriteaof(): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->bgrewriteaof(...\func_get_args());
+    }
+
+    public function lastsave(): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->lastsave(...\func_get_args());
+    }
+
+    public function bgsave(): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->bgsave(...\func_get_args());
+    }
+
+    public function save(): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->save(...\func_get_args());
+    }
+
+    public function role(): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->role(...\func_get_args());
+    }
+
+    public function ttl($key): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->ttl(...\func_get_args());
+    }
+
+    public function pttl($key): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->pttl(...\func_get_args());
+    }
+
+    public function exists(...$keys): \Relay\Relay|bool|int
+    {
+        return $this->lazyObjectReal->exists(...\func_get_args());
+    }
+
+    public function eval($script, $args = [], $num_keys = 0): mixed
+    {
+        return $this->lazyObjectReal->eval(...\func_get_args());
+    }
+
+    public function eval_ro($script, $args = [], $num_keys = 0): mixed
+    {
+        return $this->lazyObjectReal->eval_ro(...\func_get_args());
+    }
+
+    public function evalsha($sha, $args = [], $num_keys = 0): mixed
+    {
+        return $this->lazyObjectReal->evalsha(...\func_get_args());
+    }
+
+    public function evalsha_ro($sha, $args = [], $num_keys = 0): mixed
+    {
+        return $this->lazyObjectReal->evalsha_ro(...\func_get_args());
+    }
+
+    public function client($operation, ...$args): mixed
+    {
+        return $this->lazyObjectReal->client(...\func_get_args());
+    }
+
+    public function geoadd($key, $lng, $lat, $member, ...$other_triples_and_options): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->geoadd(...\func_get_args());
+    }
+
+    public function geodist($key, $src, $dst, $unit = null): \Relay\Relay|false|float
+    {
+        return $this->lazyObjectReal->geodist(...\func_get_args());
+    }
+
+    public function geohash($key, $member, ...$other_members): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->geohash(...\func_get_args());
+    }
+
+    public function georadius($key, $lng, $lat, $radius, $unit, $options = []): mixed
+    {
+        return $this->lazyObjectReal->georadius(...\func_get_args());
+    }
+
+    public function georadiusbymember($key, $member, $radius, $unit, $options = []): mixed
+    {
+        return $this->lazyObjectReal->georadiusbymember(...\func_get_args());
+    }
+
+    public function georadiusbymember_ro($key, $member, $radius, $unit, $options = []): mixed
+    {
+        return $this->lazyObjectReal->georadiusbymember_ro(...\func_get_args());
+    }
+
+    public function georadius_ro($key, $lng, $lat, $radius, $unit, $options = []): mixed
+    {
+        return $this->lazyObjectReal->georadius_ro(...\func_get_args());
+    }
+
+    public function geosearch($key, $position, $shape, $unit, $options = []): \Relay\Relay|array
+    {
+        return $this->lazyObjectReal->geosearch(...\func_get_args());
+    }
+
+    public function geosearchstore($dst, $src, $position, $shape, $unit, $options = []): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->geosearchstore(...\func_get_args());
+    }
+
+    public function get($key): mixed
+    {
+        return $this->lazyObjectReal->get(...\func_get_args());
+    }
+
+    public function getset($key, $value): mixed
+    {
+        return $this->lazyObjectReal->getset(...\func_get_args());
+    }
+
+    public function getrange($key, $start, $end): \Relay\Relay|false|string
+    {
+        return $this->lazyObjectReal->getrange(...\func_get_args());
+    }
+
+    public function setrange($key, $start, $value): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->setrange(...\func_get_args());
+    }
+
+    public function getbit($key, $pos): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->getbit(...\func_get_args());
+    }
+
+    public function bitcount($key, $start = 0, $end = -1, $by_bit = false): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->bitcount(...\func_get_args());
+    }
+
+    public function config($operation, $key = null, $value = null): \Relay\Relay|array|bool
+    {
+        return $this->lazyObjectReal->config(...\func_get_args());
+    }
+
+    public function command(...$args): \Relay\Relay|array|false|int
+    {
+        return $this->lazyObjectReal->command(...\func_get_args());
+    }
+
+    public function bitop($operation, $dstkey, $srckey, ...$other_keys): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->bitop(...\func_get_args());
+    }
+
+    public function bitpos($key, $bit, $start = null, $end = null, $bybit = false): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->bitpos(...\func_get_args());
+    }
+
+    public function setbit($key, $pos, $val): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->setbit(...\func_get_args());
+    }
+
+    public function acl($cmd, ...$args): mixed
+    {
+        return $this->lazyObjectReal->acl(...\func_get_args());
+    }
+
+    public function append($key, $value): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->append(...\func_get_args());
+    }
+
+    public function set($key, $value, $options = null): mixed
+    {
+        return $this->lazyObjectReal->set(...\func_get_args());
+    }
+
+    public function getex($key, $options = null): mixed
+    {
+        return $this->lazyObjectReal->getex(...\func_get_args());
+    }
+
+    public function getdel($key): mixed
+    {
+        return $this->lazyObjectReal->getdel(...\func_get_args());
+    }
+
+    public function setex($key, $seconds, $value): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->setex(...\func_get_args());
+    }
+
+    public function pfadd($key, $elements): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->pfadd(...\func_get_args());
+    }
+
+    public function pfcount($key): \Relay\Relay|int
+    {
+        return $this->lazyObjectReal->pfcount(...\func_get_args());
+    }
+
+    public function pfmerge($dst, $srckeys): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->pfmerge(...\func_get_args());
+    }
+
+    public function psetex($key, $milliseconds, $value): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->psetex(...\func_get_args());
+    }
+
+    public function publish($channel, $message): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->publish(...\func_get_args());
+    }
+
+    public function setnx($key, $value): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->setnx(...\func_get_args());
+    }
+
+    public function mget($keys): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->mget(...\func_get_args());
+    }
+
+    public function move($key, $db): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->move(...\func_get_args());
+    }
+
+    public function mset($kvals): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->mset(...\func_get_args());
+    }
+
+    public function msetnx($kvals): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->msetnx(...\func_get_args());
+    }
+
+    public function rename($key, $newkey): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->rename(...\func_get_args());
+    }
+
+    public function renamenx($key, $newkey): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->renamenx(...\func_get_args());
+    }
+
+    public function del(...$keys): \Relay\Relay|bool|int
+    {
+        return $this->lazyObjectReal->del(...\func_get_args());
+    }
+
+    public function unlink(...$keys): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->unlink(...\func_get_args());
+    }
+
+    public function expire($key, $seconds, $mode = null): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->expire(...\func_get_args());
+    }
+
+    public function pexpire($key, $milliseconds): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->pexpire(...\func_get_args());
+    }
+
+    public function expireat($key, $timestamp): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->expireat(...\func_get_args());
+    }
+
+    public function expiretime($key): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->expiretime(...\func_get_args());
+    }
+
+    public function pexpireat($key, $timestamp_ms): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->pexpireat(...\func_get_args());
+    }
+
+    public function pexpiretime($key): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->pexpiretime(...\func_get_args());
+    }
+
+    public function persist($key): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->persist(...\func_get_args());
+    }
+
+    public function type($key): \Relay\Relay|bool|int|string
+    {
+        return $this->lazyObjectReal->type(...\func_get_args());
+    }
+
+    public function lmove($srckey, $dstkey, $srcpos, $dstpos): \Relay\Relay|false|null|string
+    {
+        return $this->lazyObjectReal->lmove(...\func_get_args());
+    }
+
+    public function blmove($srckey, $dstkey, $srcpos, $dstpos, $timeout): \Relay\Relay|false|null|string
+    {
+        return $this->lazyObjectReal->blmove(...\func_get_args());
+    }
+
+    public function lrange($key, $start, $stop): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->lrange(...\func_get_args());
+    }
+
+    public function lpush($key, $mem, ...$mems): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->lpush(...\func_get_args());
+    }
+
+    public function rpush($key, $mem, ...$mems): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->rpush(...\func_get_args());
+    }
+
+    public function lpushx($key, $mem, ...$mems): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->lpushx(...\func_get_args());
+    }
+
+    public function rpushx($key, $mem, ...$mems): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->rpushx(...\func_get_args());
+    }
+
+    public function lset($key, $index, $mem): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->lset(...\func_get_args());
+    }
+
+    public function lpop($key, $count = 1): mixed
+    {
+        return $this->lazyObjectReal->lpop(...\func_get_args());
+    }
+
+    public function lpos($key, $value, $options = null): \Relay\Relay|array|false|int|null
+    {
+        return $this->lazyObjectReal->lpos(...\func_get_args());
+    }
+
+    public function rpop($key, $count = 1): mixed
+    {
+        return $this->lazyObjectReal->rpop(...\func_get_args());
+    }
+
+    public function rpoplpush($source, $dest): mixed
+    {
+        return $this->lazyObjectReal->rpoplpush(...\func_get_args());
+    }
+
+    public function brpoplpush($source, $dest, $timeout): mixed
+    {
+        return $this->lazyObjectReal->brpoplpush(...\func_get_args());
+    }
+
+    public function blpop($key, $timeout_or_key, ...$extra_args): \Relay\Relay|array|false|null
+    {
+        return $this->lazyObjectReal->blpop(...\func_get_args());
+    }
+
+    public function blmpop($timeout, $keys, $from, $count = 1): \Relay\Relay|array|false|null
+    {
+        return $this->lazyObjectReal->blmpop(...\func_get_args());
+    }
+
+    public function bzmpop($timeout, $keys, $from, $count = 1): \Relay\Relay|array|false|null
+    {
+        return $this->lazyObjectReal->bzmpop(...\func_get_args());
+    }
+
+    public function lmpop($keys, $from, $count = 1): \Relay\Relay|array|false|null
+    {
+        return $this->lazyObjectReal->lmpop(...\func_get_args());
+    }
+
+    public function zmpop($keys, $from, $count = 1): \Relay\Relay|array|false|null
+    {
+        return $this->lazyObjectReal->zmpop(...\func_get_args());
+    }
+
+    public function brpop($key, $timeout_or_key, ...$extra_args): \Relay\Relay|array|false|null
+    {
+        return $this->lazyObjectReal->brpop(...\func_get_args());
+    }
+
+    public function bzpopmax($key, $timeout_or_key, ...$extra_args): \Relay\Relay|array|false|null
+    {
+        return $this->lazyObjectReal->bzpopmax(...\func_get_args());
+    }
+
+    public function bzpopmin($key, $timeout_or_key, ...$extra_args): \Relay\Relay|array|false|null
+    {
+        return $this->lazyObjectReal->bzpopmin(...\func_get_args());
+    }
+
+    public function object($op, $key): mixed
+    {
+        return $this->lazyObjectReal->object(...\func_get_args());
+    }
+
+    public function geopos($key, ...$members): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->geopos(...\func_get_args());
+    }
+
+    public function lrem($key, $mem, $count = 0): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->lrem(...\func_get_args());
+    }
+
+    public function lindex($key, $index): mixed
+    {
+        return $this->lazyObjectReal->lindex(...\func_get_args());
+    }
+
+    public function linsert($key, $op, $pivot, $element): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->linsert(...\func_get_args());
+    }
+
+    public function ltrim($key, $start, $end): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->ltrim(...\func_get_args());
+    }
+
+    public function hget($hash, $member): mixed
+    {
+        return $this->lazyObjectReal->hget(...\func_get_args());
+    }
+
+    public function hstrlen($hash, $member): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->hstrlen(...\func_get_args());
+    }
+
+    public function hgetall($hash): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->hgetall(...\func_get_args());
+    }
+
+    public function hkeys($hash): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->hkeys(...\func_get_args());
+    }
+
+    public function hvals($hash): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->hvals(...\func_get_args());
+    }
+
+    public function hmget($hash, $members): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->hmget(...\func_get_args());
+    }
+
+    public function hrandfield($hash, $options = null): \Relay\Relay|array|false|string
+    {
+        return $this->lazyObjectReal->hrandfield(...\func_get_args());
+    }
+
+    public function hmset($hash, $members): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->hmset(...\func_get_args());
+    }
+
+    public function hexists($hash, $member): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->hexists(...\func_get_args());
+    }
+
+    public function hsetnx($hash, $member, $value): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->hsetnx(...\func_get_args());
+    }
+
+    public function hset($key, $mem, $val, ...$kvals): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->hset(...\func_get_args());
+    }
+
+    public function hdel($key, $mem, ...$mems): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->hdel(...\func_get_args());
+    }
+
+    public function hincrby($key, $mem, $value): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->hincrby(...\func_get_args());
+    }
+
+    public function hincrbyfloat($key, $mem, $value): \Relay\Relay|bool|float
+    {
+        return $this->lazyObjectReal->hincrbyfloat(...\func_get_args());
+    }
+
+    public function incr($key, $by = 1): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->incr(...\func_get_args());
+    }
+
+    public function decr($key, $by = 1): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->decr(...\func_get_args());
+    }
+
+    public function incrby($key, $value): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->incrby(...\func_get_args());
+    }
+
+    public function decrby($key, $value): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->decrby(...\func_get_args());
+    }
+
+    public function incrbyfloat($key, $value): \Relay\Relay|false|float
+    {
+        return $this->lazyObjectReal->incrbyfloat(...\func_get_args());
+    }
+
+    public function sdiff($key, ...$other_keys): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->sdiff(...\func_get_args());
+    }
+
+    public function sdiffstore($key, ...$other_keys): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->sdiffstore(...\func_get_args());
+    }
+
+    public function sinter($key, ...$other_keys): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->sinter(...\func_get_args());
+    }
+
+    public function sintercard($keys, $limit = -1): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->sintercard(...\func_get_args());
+    }
+
+    public function sinterstore($key, ...$other_keys): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->sinterstore(...\func_get_args());
+    }
+
+    public function sunion($key, ...$other_keys): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->sunion(...\func_get_args());
+    }
+
+    public function sunionstore($key, ...$other_keys): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->sunionstore(...\func_get_args());
+    }
+
+    public function touch($key_or_array, ...$more_keys): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->touch(...\func_get_args());
+    }
+
+    public function pipeline(): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->pipeline(...\func_get_args());
+    }
+
+    public function multi($mode = 0): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->multi(...\func_get_args());
+    }
+
+    public function exec(): \Relay\Relay|array|bool
+    {
+        return $this->lazyObjectReal->exec(...\func_get_args());
+    }
+
+    public function wait($replicas, $timeout): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->wait(...\func_get_args());
+    }
+
+    public function watch($key, ...$other_keys): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->watch(...\func_get_args());
+    }
+
+    public function unwatch(): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->unwatch(...\func_get_args());
+    }
+
+    public function discard(): bool
+    {
+        return $this->lazyObjectReal->discard(...\func_get_args());
+    }
+
+    public function getMode($masked = false): int
+    {
+        return $this->lazyObjectReal->getMode(...\func_get_args());
+    }
+
+    public function clearBytes(): void
+    {
+        $this->lazyObjectReal->clearBytes(...\func_get_args());
+    }
+
+    public function scan(&$iterator, $match = null, $count = 0, $type = null): array|false
+    {
+        return $this->lazyObjectReal->scan(...\func_get_args());
+    }
+
+    public function hscan($key, &$iterator, $match = null, $count = 0): array|false
+    {
+        return $this->lazyObjectReal->hscan(...\func_get_args());
+    }
+
+    public function sscan($key, &$iterator, $match = null, $count = 0): array|false
+    {
+        return $this->lazyObjectReal->sscan(...\func_get_args());
+    }
+
+    public function zscan($key, &$iterator, $match = null, $count = 0): array|false
+    {
+        return $this->lazyObjectReal->zscan(...\func_get_args());
+    }
+
+    public function keys($pattern): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->keys(...\func_get_args());
+    }
+
+    public function slowlog($operation, ...$extra_args): \Relay\Relay|array|bool|int
+    {
+        return $this->lazyObjectReal->slowlog(...\func_get_args());
+    }
+
+    public function smembers($set): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->smembers(...\func_get_args());
+    }
+
+    public function sismember($set, $member): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->sismember(...\func_get_args());
+    }
+
+    public function smismember($set, ...$members): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->smismember(...\func_get_args());
+    }
+
+    public function srem($set, $member, ...$members): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->srem(...\func_get_args());
+    }
+
+    public function sadd($set, $member, ...$members): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->sadd(...\func_get_args());
+    }
+
+    public function sort($key, $options = []): \Relay\Relay|array|false|int
+    {
+        return $this->lazyObjectReal->sort(...\func_get_args());
+    }
+
+    public function sort_ro($key, $options = []): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->sort_ro(...\func_get_args());
+    }
+
+    public function smove($srcset, $dstset, $member): \Relay\Relay|bool
+    {
+        return $this->lazyObjectReal->smove(...\func_get_args());
+    }
+
+    public function spop($set, $count = 1): mixed
+    {
+        return $this->lazyObjectReal->spop(...\func_get_args());
+    }
+
+    public function srandmember($set, $count = 1): mixed
+    {
+        return $this->lazyObjectReal->srandmember(...\func_get_args());
+    }
+
+    public function scard($key): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->scard(...\func_get_args());
+    }
+
+    public function script($command, ...$args): mixed
+    {
+        return $this->lazyObjectReal->script(...\func_get_args());
+    }
+
+    public function strlen($key): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->strlen(...\func_get_args());
+    }
+
+    public function hlen($key): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->hlen(...\func_get_args());
+    }
+
+    public function llen($key): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->llen(...\func_get_args());
+    }
+
+    public function xack($key, $group, $ids): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->xack(...\func_get_args());
+    }
+
+    public function xadd($key, $id, $values, $maxlen = 0, $approx = false, $nomkstream = false): \Relay\Relay|false|string
+    {
+        return $this->lazyObjectReal->xadd(...\func_get_args());
+    }
+
+    public function xclaim($key, $group, $consumer, $min_idle, $ids, $options): \Relay\Relay|array|bool
+    {
+        return $this->lazyObjectReal->xclaim(...\func_get_args());
+    }
+
+    public function xautoclaim($key, $group, $consumer, $min_idle, $start, $count = -1, $justid = false): \Relay\Relay|array|bool
+    {
+        return $this->lazyObjectReal->xautoclaim(...\func_get_args());
+    }
+
+    public function xlen($key): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->xlen(...\func_get_args());
+    }
+
+    public function xgroup($operation, $key = null, $group = null, $id_or_consumer = null, $mkstream = false, $entries_read = -2): mixed
+    {
+        return $this->lazyObjectReal->xgroup(...\func_get_args());
+    }
+
+    public function xdel($key, $ids): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->xdel(...\func_get_args());
+    }
+
+    public function xinfo($operation, $arg1 = null, $arg2 = null, $count = -1): mixed
+    {
+        return $this->lazyObjectReal->xinfo(...\func_get_args());
+    }
+
+    public function xpending($key, $group, $start = null, $end = null, $count = -1, $consumer = null, $idle = 0): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->xpending(...\func_get_args());
+    }
+
+    public function xrange($key, $start, $end, $count = -1): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->xrange(...\func_get_args());
+    }
+
+    public function xrevrange($key, $end, $start, $count = -1): \Relay\Relay|array|bool
+    {
+        return $this->lazyObjectReal->xrevrange(...\func_get_args());
+    }
+
+    public function xread($streams, $count = -1, $block = -1): \Relay\Relay|array|bool|null
+    {
+        return $this->lazyObjectReal->xread(...\func_get_args());
+    }
+
+    public function xreadgroup($group, $consumer, $streams, $count = 1, $block = 1): \Relay\Relay|array|bool|null
+    {
+        return $this->lazyObjectReal->xreadgroup(...\func_get_args());
+    }
+
+    public function xtrim($key, $threshold, $approx = false, $minid = false, $limit = -1): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->xtrim(...\func_get_args());
+    }
+
+    public function zadd($key, ...$args): mixed
+    {
+        return $this->lazyObjectReal->zadd(...\func_get_args());
+    }
+
+    public function zrandmember($key, $options = null): mixed
+    {
+        return $this->lazyObjectReal->zrandmember(...\func_get_args());
+    }
+
+    public function zrange($key, $start, $end, $options = null): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->zrange(...\func_get_args());
+    }
+
+    public function zrevrange($key, $start, $end, $options = null): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->zrevrange(...\func_get_args());
+    }
+
+    public function zrangebyscore($key, $start, $end, $options = null): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->zrangebyscore(...\func_get_args());
+    }
+
+    public function zrevrangebyscore($key, $start, $end, $options = null): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->zrevrangebyscore(...\func_get_args());
+    }
+
+    public function zrangestore($dst, $src, $start, $end, $options = null): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zrangestore(...\func_get_args());
+    }
+
+    public function zrangebylex($key, $min, $max, $offset = -1, $count = -1): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->zrangebylex(...\func_get_args());
+    }
+
+    public function zrevrangebylex($key, $max, $min, $offset = -1, $count = -1): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->zrevrangebylex(...\func_get_args());
+    }
+
+    public function zrank($key, $rank): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zrank(...\func_get_args());
+    }
+
+    public function zrevrank($key, $rank): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zrevrank(...\func_get_args());
+    }
+
+    public function zrem($key, ...$args): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zrem(...\func_get_args());
+    }
+
+    public function zremrangebylex($key, $min, $max): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zremrangebylex(...\func_get_args());
+    }
+
+    public function zremrangebyrank($key, $start, $end): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zremrangebyrank(...\func_get_args());
+    }
+
+    public function zremrangebyscore($key, $min, $max): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zremrangebyscore(...\func_get_args());
+    }
+
+    public function zcard($key): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zcard(...\func_get_args());
+    }
+
+    public function zcount($key, $min, $max): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zcount(...\func_get_args());
+    }
+
+    public function zdiff($keys, $options = null): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->zdiff(...\func_get_args());
+    }
+
+    public function zdiffstore($dst, $keys): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zdiffstore(...\func_get_args());
+    }
+
+    public function zincrby($key, $score, $mem): \Relay\Relay|false|float
+    {
+        return $this->lazyObjectReal->zincrby(...\func_get_args());
+    }
+
+    public function zlexcount($key, $min, $max): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zlexcount(...\func_get_args());
+    }
+
+    public function zmscore($key, ...$mems): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->zmscore(...\func_get_args());
+    }
+
+    public function zscore($key, $member): \Relay\Relay|false|float
+    {
+        return $this->lazyObjectReal->zscore(...\func_get_args());
+    }
+
+    public function zinter($keys, $weights = null, $options = null): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->zinter(...\func_get_args());
+    }
+
+    public function zintercard($keys, $limit = -1): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zintercard(...\func_get_args());
+    }
+
+    public function zinterstore($dst, $keys, $weights = null, $options = null): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zinterstore(...\func_get_args());
+    }
+
+    public function zunion($keys, $weights = null, $options = null): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->zunion(...\func_get_args());
+    }
+
+    public function zunionstore($dst, $keys, $weights = null, $options = null): \Relay\Relay|false|int
+    {
+        return $this->lazyObjectReal->zunionstore(...\func_get_args());
+    }
+
+    public function zpopmin($key, $count = 1): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->zpopmin(...\func_get_args());
+    }
+
+    public function zpopmax($key, $count = 1): \Relay\Relay|array|false
+    {
+        return $this->lazyObjectReal->zpopmax(...\func_get_args());
+    }
+
+    public function _getKeys()
+    {
+        return $this->lazyObjectReal->_getKeys(...\func_get_args());
+    }
+}

From a4c2ca83bc47a6811b501fc203e31dd4a83d16ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= <gabriel.ostrolucky@gmail.com>
Date: Wed, 14 Dec 2022 19:58:03 +0100
Subject: [PATCH 152/475] [Lock] Accept Relay connection

---
 src/Symfony/Component/Lock/CHANGELOG.md       |  1 +
 .../Component/Lock/Store/RedisStore.php       |  5 ++-
 .../Component/Lock/Store/StoreFactory.php     |  2 +
 .../Tests/Store/AbstractRedisStoreTest.php    |  7 ++--
 .../Lock/Tests/Store/RelayStoreTest.php       | 41 +++++++++++++++++++
 5 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 src/Symfony/Component/Lock/Tests/Store/RelayStoreTest.php

diff --git a/src/Symfony/Component/Lock/CHANGELOG.md b/src/Symfony/Component/Lock/CHANGELOG.md
index cc5528ffe188a..d5e1103f9e00e 100644
--- a/src/Symfony/Component/Lock/CHANGELOG.md
+++ b/src/Symfony/Component/Lock/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Create migration for lock table when DoctrineDbalStore is used
+ * Add support for Relay PHP extension for Redis
 
 6.0
 ---
diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php
index 3b3267a5acb6c..4b29e0f1996ab 100644
--- a/src/Symfony/Component/Lock/Store/RedisStore.php
+++ b/src/Symfony/Component/Lock/Store/RedisStore.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Lock\Store;
 
 use Predis\Response\ServerException;
+use Relay\Relay;
 use Symfony\Component\Lock\Exception\InvalidTtlException;
 use Symfony\Component\Lock\Exception\LockConflictedException;
 use Symfony\Component\Lock\Exception\LockStorageException;
@@ -35,7 +36,7 @@ class RedisStore implements SharedLockStoreInterface
      * @param float $initialTtl The expiration delay of locks in seconds
      */
     public function __construct(
-        private \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis,
+        private \Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis,
         private float $initialTtl = 300.0,
     ) {
         if ($initialTtl <= 0) {
@@ -226,7 +227,7 @@ public function exists(Key $key): bool
 
     private function evaluate(string $script, string $resource, array $args): mixed
     {
-        if ($this->redis instanceof \Redis || $this->redis instanceof \RedisCluster) {
+        if ($this->redis instanceof \Redis || $this->redis instanceof Relay || $this->redis instanceof \RedisCluster) {
             $this->redis->clearLastError();
             $result = $this->redis->eval($script, array_merge([$resource], $args), 1);
             if (null !== $err = $this->redis->getLastError()) {
diff --git a/src/Symfony/Component/Lock/Store/StoreFactory.php b/src/Symfony/Component/Lock/Store/StoreFactory.php
index f93dcd086c363..7e962ed55da18 100644
--- a/src/Symfony/Component/Lock/Store/StoreFactory.php
+++ b/src/Symfony/Component/Lock/Store/StoreFactory.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Lock\Store;
 
 use Doctrine\DBAL\Connection;
+use Relay\Relay;
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
 use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\PersistingStoreInterface;
@@ -27,6 +28,7 @@ public static function createStore(#[\SensitiveParameter] object|string $connect
     {
         switch (true) {
             case $connection instanceof \Redis:
+            case $connection instanceof Relay:
             case $connection instanceof \RedisArray:
             case $connection instanceof \RedisCluster:
             case $connection instanceof \Predis\ClientInterface:
diff --git a/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php
index 08e5280ad13a9..19563bd24ea8f 100644
--- a/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
+use Relay\Relay;
 use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\Exception\LockConflictedException;
 use Symfony\Component\Lock\Key;
@@ -29,7 +30,7 @@ protected function getClockDelay()
         return 250000;
     }
 
-    abstract protected function getRedisConnection(): \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface;
+    abstract protected function getRedisConnection(): \Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface;
 
     public function getStore(): PersistingStoreInterface
     {
@@ -85,7 +86,7 @@ public function exists(Key $key)
 
     private function evaluate(string $script, string $resource, array $args)
     {
-        if ($this->redis instanceof \Redis || $this->redis instanceof \RedisCluster) {
+        if ($this->redis instanceof \Redis || $this->redis instanceof Relay || $this->redis instanceof \RedisCluster) {
             return $this->redis->eval($script, array_merge([$resource], $args), 1);
         }
 
@@ -97,7 +98,7 @@ private function evaluate(string $script, string $resource, array $args)
             return $this->redis->eval(...array_merge([$script, 1, $resource], $args));
         }
 
-        throw new InvalidArgumentException(sprintf('"%s()" expects being initialized with a Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, get_debug_type($this->redis)));
+        throw new InvalidArgumentException(sprintf('"%s()" expects being initialized with a Redis, Relay, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, get_debug_type($this->redis)));
     }
 
     private function getUniqueToken(Key $key): string
diff --git a/src/Symfony/Component/Lock/Tests/Store/RelayStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RelayStoreTest.php
new file mode 100644
index 0000000000000..1c6657a5d7159
--- /dev/null
+++ b/src/Symfony/Component/Lock/Tests/Store/RelayStoreTest.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Store;
+
+use PHPUnit\Framework\SkippedTestSuiteError;
+use Relay\Relay;
+use Symfony\Component\Lock\Tests\Store\AbstractRedisStoreTest;
+use Symfony\Component\Lock\Tests\Store\SharedLockStoreTestTrait;
+
+/**
+ * @requires extension relay
+ *
+ * @group integration
+ */
+class RelayStoreTest extends AbstractRedisStoreTest
+{
+    use SharedLockStoreTestTrait;
+
+    public static function setUpBeforeClass(): void
+    {
+        try {
+            new Relay(...explode(':', getenv('REDIS_HOST')));
+        } catch (\Relay\Exception $e) {
+            throw new SkippedTestSuiteError($e->getMessage());
+        }
+    }
+
+    protected function getRedisConnection(): Relay
+    {
+        return new Relay(...explode(':', getenv('REDIS_HOST')));
+    }
+}

From 0366a32a5d5c33a7cc25f7f287a6b1ba737a55ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= <gabriel.ostrolucky@gmail.com>
Date: Wed, 14 Dec 2022 20:24:34 +0100
Subject: [PATCH 153/475] [HttpFoundation] Accept Relay connection

---
 .../Component/HttpFoundation/CHANGELOG.md     |  1 +
 .../Storage/Handler/RedisSessionHandler.php   |  3 +-
 .../Storage/Handler/SessionHandlerFactory.php |  2 ++
 .../AbstractRedisSessionHandlerTestCase.php   |  4 ++-
 .../Handler/RelaySessionHandlerTest.php       | 28 +++++++++++++++++++
 5 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RelaySessionHandlerTest.php

diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index 208f466d749b8..8e70070fc8723 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Add `ParameterBag::getEnum()`
  * Create migration for session table when pdo handler is used
+ * Add support for Relay PHP extension for Redis
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
index c4f1e0216e6cf..b696eee4b7d1f 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 use Predis\Response\ErrorInterface;
+use Relay\Relay;
 
 /**
  * Redis based session storage handler based on the Redis class
@@ -39,7 +40,7 @@ class RedisSessionHandler extends AbstractSessionHandler
      * @throws \InvalidArgumentException When unsupported client or options are passed
      */
     public function __construct(
-        private \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis,
+        private \Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis,
         array $options = [],
     ) {
         if ($diff = array_diff(array_keys($options), ['prefix', 'ttl'])) {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php
index 33aaa7df5f60a..dbbe7dc880e23 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 use Doctrine\DBAL\DriverManager;
+use Relay\Relay;
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
 
 /**
@@ -32,6 +33,7 @@ public static function createHandler(object|string $connection, array $options =
 
         switch (true) {
             case $connection instanceof \Redis:
+            case $connection instanceof Relay:
             case $connection instanceof \RedisArray:
             case $connection instanceof \RedisCluster:
             case $connection instanceof \Predis\ClientInterface:
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
index e5937b7df6494..e0c030310709d 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
@@ -12,10 +12,12 @@
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
 use PHPUnit\Framework\TestCase;
+use Relay\Relay;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler;
 
 /**
  * @requires extension redis
+ *
  * @group time-sensitive
  */
 abstract class AbstractRedisSessionHandlerTestCase extends TestCase
@@ -32,7 +34,7 @@ abstract class AbstractRedisSessionHandlerTestCase extends TestCase
      */
     protected $redisClient;
 
-    abstract protected function createRedisClient(string $host): \Redis|\RedisArray|\RedisCluster|\Predis\Client;
+    abstract protected function createRedisClient(string $host): \Redis|Relay|\RedisArray|\RedisCluster|\Predis\Client;
 
     protected function setUp(): void
     {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RelaySessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RelaySessionHandlerTest.php
new file mode 100
10000
644
index 0000000000000..76553f96d3375
--- /dev/null
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RelaySessionHandlerTest.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Session\Storage\Handler;
+
+use Relay\Relay;
+use Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler\AbstractRedisSessionHandlerTestCase;
+
+/**
+ * @requires extension relay
+ *
+ * @group integration
+ */
+class RelaySessionHandlerTest extends AbstractRedisSessionHandlerTestCase
+{
+    protected function createRedisClient(string $host): Relay
+    {
+        return new Relay(...explode(':', $host));
+    }
+}

From 1d7b4093991257f7ece5b1abc18f7b5f3de9e098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= <gabriel.ostrolucky@gmail.com>
Date: Wed, 14 Dec 2022 20:44:00 +0100
Subject: [PATCH 154/475] [Semaphore] Accept Relay connection

---
 src/Symfony/Component/Semaphore/CHANGELOG.md  |  5 +++
 .../Component/Semaphore/Store/RedisStore.php  |  5 ++-
 .../Semaphore/Store/StoreFactory.php          |  3 +-
 .../Tests/Store/AbstractRedisStoreTest.php    |  3 +-
 .../Semaphore/Tests/Store/RelayStoreTest.php  | 40 +++++++++++++++++++
 5 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php

diff --git a/src/Symfony/Component/Semaphore/CHANGELOG.md b/src/Symfony/Component/Semaphore/CHANGELOG.md
index f53fc9dc2a2cf..c92b74aba72ae 100644
--- a/src/Symfony/Component/Semaphore/CHANGELOG.md
+++ b/src/Symfony/Component/Semaphore/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add support for Relay PHP extension for Redis
+
 5.3
 ---
 
diff --git a/src/Symfony/Component/Semaphore/Store/RedisStore.php b/src/Symfony/Component/Semaphore/Store/RedisStore.php
index 0b3652c5d9c11..f1c6fcc30edd9 100644
--- a/src/Symfony/Component/Semaphore/Store/RedisStore.php
+++ b/src/Symfony/Component/Semaphore/Store/RedisStore.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Semaphore\Store;
 
+use Relay\Relay;
 use Symfony\Component\Semaphore\Exception\InvalidArgumentException;
 use Symfony\Component\Semaphore\Exception\SemaphoreAcquiringException;
 use Symfony\Component\Semaphore\Exception\SemaphoreExpiredException;
@@ -26,7 +27,7 @@
 class RedisStore implements PersistingStoreInterface
 {
     public function __construct(
-        private \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis,
+        private \Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis,
     ) {
     }
 
@@ -157,7 +158,7 @@ public function exists(Key $key): bool
 
     private function evaluate(string $script, string $resource, array $args): mixed
     {
-        if ($this->redis instanceof \Redis || $this->redis instanceof \RedisCluster) {
+        if ($this->redis instanceof \Redis || $this->redis instanceof Relay || $this->redis instanceof \RedisCluster) {
             return $this->redis->eval($script, array_merge([$resource], $args), 1);
         }
 
diff --git a/src/Symfony/Component/Semaphore/Store/StoreFactory.php b/src/Symfony/Component/Semaphore/Store/StoreFactory.php
index eb77431c39030..639298bab2453 100644
--- a/src/Symfony/Component/Semaphore/Store/StoreFactory.php
+++ b/src/Symfony/Component/Semaphore/Store/StoreFactory.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Semaphore\Store;
 
+use Relay\Relay;
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
 use Symfony\Component\Semaphore\Exception\InvalidArgumentException;
 use Symfony\Component\Semaphore\PersistingStoreInterface;
@@ -26,6 +27,7 @@ public static function createStore(#[\SensitiveParameter] object|string $connect
     {
         switch (true) {
             case $connection instanceof \Redis:
+            case $connection instanceof Relay:
             case $connection instanceof \RedisArray:
             case $connection instanceof \RedisCluster:
             case $connection instanceof \Predis\ClientInterface:
@@ -33,7 +35,6 @@ public static function createStore(#[\SensitiveParameter] object|string $connect
 
             case !\is_string($connection):
                 throw new InvalidArgumentException(sprintf('Unsupported Connection: "%s".', $connection::class));
-
             case str_starts_with($connection, 'redis://'):
             case str_starts_with($connection, 'rediss://'):
                 if (!class_exists(AbstractAdapter::class)) {
diff --git a/src/Symfony/Component/Semaphore/Tests/Store/AbstractRedisStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/AbstractRedisStoreTest.php
index 4952f880f6a32..a7de9357a2373 100644
--- a/src/Symfony/Component/Semaphore/Tests/Store/AbstractRedisStoreTest.php
+++ b/src/Symfony/Component/Semaphore/Tests/Store/AbstractRedisStoreTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Semaphore\Tests\Store;
 
+use Relay\Relay;
 use Symfony\Component\Semaphore\PersistingStoreInterface;
 use Symfony\Component\Semaphore\Store\RedisStore;
 
@@ -19,7 +20,7 @@
  */
 abstract class AbstractRedisStoreTest extends AbstractStoreTest
 {
-    abstract protected function getRedisConnection(): \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface;
+    abstract protected function getRedisConnection(): \Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface;
 
     public function getStore(): PersistingStoreInterface
     {
diff --git a/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php
new file mode 100644
index 0000000000000..694e0b4b7b983
--- /dev/null
+++ b/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Semaphore\Tests\Store;
+
+use PHPUnit\Framework\SkippedTestSuiteError;
+use Relay\Relay;
+
+/**
+ * @requires extension relay
+ */
+class RelayStoreTest extends AbstractRedisStoreTest
+{
+    protected function setUp(): void
+    {
+        $this->getRedisConnection()->flushDB();
+    }
+
+    public static function setUpBeforeClass(): void
+    {
+        try {
+            new Relay(...explode(':', getenv('REDIS_HOST')));
+        } catch (\Relay\Exception $e) {
+            throw new SkippedTestSuiteError($e->getMessage());
+        }
+    }
+
+    protected function getRedisConnection(): Relay
+    {
+        return new Relay(...explode(':', getenv('REDIS_HOST')));
+    }
+}

From 327969e6b190106022b2dc08ff6b994c4696bc27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= <gadelat@gmail.com>
Date: Sun, 18 Dec 2022 02:01:04 +0100
Subject: [PATCH 155/475] [redis-messenger] Add Relay support

---
 .../Messenger/Bridge/Redis/CHANGELOG.md       |  5 +++
 .../Transport/RedisExtIntegrationTest.php     | 17 +++++---
 .../Transport/RelayExtIntegrationTest.php     | 28 ++++++++++++
 .../Bridge/Redis/Transport/Connection.php     | 43 ++++++++++---------
 4 files changed, 68 insertions(+), 25 deletions(-)
 create mode 100644 src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RelayExtIntegrationTest.php

diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/CHANGELOG.md b/src/Symfony/Component/Messenger/Bridge/Redis/CHANGELOG.md
index 410e6eeaee302..640ed7f9a8515 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/CHANGELOG.md
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add support for Relay PHP extension for Redis
+
 6.1
 ---
 
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
index 5ac0dbb5fc668..4117b14785b3c 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
@@ -12,12 +12,14 @@
 namespace Symfony\Component\Messenger\Bridge\Redis\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
+use Relay\Relay;
 use Symfony\Component\Messenger\Bridge\Redis\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\Redis\Transport\Connection;
 use Symfony\Component\Messenger\Exception\TransportException;
 
 /**
  * @requires extension redis
+ *
  * @group time-sensitive
  * @group integration
  */
@@ -258,7 +260,7 @@ public function testLazyCluster()
 
     public function testLazy()
     {
-        $redis = new \Redis();
+        $redis = $this->createRedisClient();
         $connection = Connection::fromDsn('redis://localhost/messenger-lazy?lazy=1', [], $redis);
 
         $connection->add('1', []);
@@ -275,7 +277,7 @@ public function testLazy()
 
     public function testDbIndex()
     {
-        $redis = new \Redis();
+        $redis = $this->createRedisClient();
 
         Connection::fromDsn('redis://localhost/queue?dbindex=2', [], $redis);
 
@@ -296,7 +298,7 @@ public function testFromDsnWithMultipleHosts()
 
     public function testJsonError()
     {
-        $redis = new \Redis();
+        $redis = $this->createRedisClient();
         $connection = Connection::fromDsn('redis://localhost/json-error', [], $redis);
         try {
             $connection->add("\xB1\x31", []);
@@ -308,7 +310,7 @@ public function testJsonError()
 
     public function testGetNonBlocking()
     {
-        $redis = new \Redis();
+        $redis = $this->createRedisClient();
 
         $connection = Connection::fromDsn('redis://localhost/messenger-getnonblocking', ['sentinel_master' => null], $redis);
 
@@ -321,7 +323,7 @@ public function testGetNonBlocking()
 
     public function testGetAfterReject()
     {
-        $redis = new \Redis();
+        $redis = $this->createRedisClient();
         $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget', ['sentinel_master' => null], $redis);
 
         $connection->add('1', []);
@@ -380,4 +382,9 @@ private function skipIfRedisClusterUnavailable()
             self::markTestSkipped($e->getMessage());
         }
     }
+
+    protected function createRedisClient(): \Redis|Relay
+    {
+        return new \Redis();
+    }
 }
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RelayExtIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RelayExtIntegrationTest.php
new file mode 100644
index 0000000000000..bd33434a064c8
--- /dev/null
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RelayExtIntegrationTest.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Messenger\Bridge\Redis\Tests\Transport;
+
+use Relay\Relay;
+
+/**
+ * @requires extension relay
+ *
+ * @group time-sensitive
+ * @group integration
+ */
+class RelayExtIntegrationTest extends RedisExtIntegrationTest
+{
+    protected function createRedisClient(): \Redis|Relay
+    {
+        return new Relay();
+    }
+}
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
index 481dc5d64bba8..837480de209f4 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Messenger\Bridge\Redis\Transport;
 
+use Relay\Relay;
+use Relay\Sentinel;
 use Symfony\Component\Messenger\Exception\InvalidArgumentException;
 use Symfony\Component\Messenger\Exception\LogicException;
 use Symfony\Component\Messenger\Exception\TransportException;
@@ -43,7 +45,7 @@ class Connection
         'claim_interval' => 60000, // Interval by which pending/abandoned messages should be checked
         'lazy' => false,
         'auth' => null,
-        'serializer' => \Redis::SERIALIZER_PHP,
+        'serializer' => 1, // see \Redis::SERIALIZER_PHP,
         'sentinel_master' => null, // String, master to look for (optional, default is NULL meaning Sentinel support is disabled)
         'timeout' => 0.0, // Float, value in seconds (optional, default is 0 meaning unlimited)
         'read_timeout' => 0.0, //  Float, value in seconds (optional, default is 0 meaning unlimited)
@@ -52,7 +54,7 @@ class Connection
         'ssl' => null, // see https://php.net/context.ssl
     ];
 
-    private \Redis|\RedisCluster|\Closure $redis;
+    private \Redis|Relay|\RedisCluster|\Closure $redis;
     private string $stream;
     private string $queue;
     private string $group;
@@ -66,7 +68,7 @@ class Connection
     private bool $deleteAfterReject;
     private bool $couldHavePendingMessages = true;
 
-    public function __construct(array $options, \Redis|\RedisCluster $redis = null)
+    public function __construct(array $options, \Redis|Relay|\RedisCluster $redis = null)
     {
         if (version_compare(phpversion('redis'), '4.3.0', '<')) {
             throw new LogicException('The redis transport requires php-redis 4.3.0 or higher.');
@@ -78,8 +80,8 @@ public function __construct(array $options, \Redis|\RedisCluster $redis = null)
         $auth = $options['auth'];
         $sentinelMaster = $options['sentinel_master'];
 
-        if (null !== $sentinelMaster && !class_exists(\RedisSentinel::class)) {
-            throw new InvalidArgumentException('Redis Sentinel support requires the "redis" extension v5.2 or higher.');
+        if (null !== $sentinelMaster && !class_exists(\RedisSentinel::class) && !class_exists(Sentinel::class)) {
+            throw new InvalidArgumentException('Redis Sentinel support requires ext-redis>=5.2, or ext-relay.');
         }
 
         if (null !== $sentinelMaster && ($redis instanceof \RedisCluster || \is_array($host))) {
@@ -91,7 +93,8 @@ public function __construct(array $options, \Redis|\RedisCluster $redis = null)
             $this->redis = static fn () => self::initializeRedisCluster($redis, $hosts, $auth, $options);
         } else {
             if (null !== $sentinelMaster) {
-                $sentinelClient = new \RedisSentinel($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);
+                $sentinelClass = \extension_loaded('redis') ? \RedisSentinel::class : Sentinel::class;
+                $sentinelClient = new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);
 
                 if (!$address = $sentinelClient->getMasterAddrByName($sentinelMaster)) {
                     throw new InvalidArgumentException(sprintf('Failed to retrieve master information from master name "%s" and address "%s:%d".', $sentinelMaster, $host, $port));
@@ -100,7 +103,7 @@ public function __construct(array $options, \Redis|\RedisCluster $redis = null)
                 [$host, $port] = $address;
             }
 
-            $this->redis = static fn () => self::initializeRedis($redis ?? new \Redis(), $host, $port, $auth, $options);
+            $this->redis = static fn () => self::initializeRedis($redis ?? (\extension_loaded('redis') ? new \Redis() : new Relay()), $host, $port, $auth, $options);
         }
 
         if (!$options['lazy']) {
@@ -128,12 +131,12 @@ public function __construct(array $options, \Redis|\RedisCluster $redis = null)
     /**
      * @param string|string[]|null $auth
      */
-    private static function initializeRedis(\Redis $redis, string $host, int $port, string|array|null $auth, array $params): \Redis
+    private static function initializeRedis(\Redis|Relay $redis, string $host, int $port, string|array|null $auth, array $params): \Redis|Relay
     {
         $connect = isset($params['persistent_id']) ? 'pconnect' : 'connect';
-        $redis->{$connect}($host, $port, $params['timeout'], $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') ? [['stream' => $params['ssl'] ?? null]] : []);
+        $redis->{$connect}($host, $port, $params['timeout'], $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...(\defined('Redis::SCAN_PREFIX') || \extension_loaded('relay')) ? [['stream' => $params['ssl'] ?? null]] : []);
 
-        $redis->setOption(\Redis::OPT_SERIALIZER, $params['serializer']);
+        $redis->setOption($redis instanceof \Redis ? \Redis::OPT_SERIALIZER : Relay::OPT_SERIALIZER, $params['serializer']);
 
         if (null !== $auth && !$redis->auth($auth)) {
             throw new InvalidArgumentException('Redis connection failed: '.$redis->getLastError());
@@ -157,7 +160,7 @@ private static function initializeRedisCluster(?\RedisCluster $redis, array $hos
         return $redis;
     }
 
-    public static function fromDsn(#[\SensitiveParameter] string $dsn, array $options = [], \Redis|\RedisCluster $redis = null): self
+    public static function fromDsn(#[\SensitiveParameter] string $dsn, array $options = [], \Redis|Relay|\RedisCluster $redis = null): self
     {
         if (!str_contains($dsn, ',')) {
             $parsedUrl = self::parseDsn($dsn, $options);
@@ -265,7 +268,7 @@ private function claimOldPendingMessages()
             // This could soon be optimized with https://github.com/antirez/redis/issues/5212 or
             // https://github.com/antirez/redis/issues/6256
             $pendingMessages = $this->getRedis()->xpending($this->stream, $this->group, '-', '+', 1);
-        } catch (\RedisException $e) {
+        } catch (\RedisException|\Relay\Exception $e) {
             throw new TransportException($e->getMessage(), 0, $e);
         }
 
@@ -294,7 +297,7 @@ private function claimOldPendingMessages()
                 );
 
                 $this->couldHavePendingMessages = true;
-            } catch (\RedisException $e) {
+            } catch (\RedisException|\Relay\Exception $e) {
                 throw new TransportException($e->getMessage(), 0, $e);
             }
         }
@@ -352,7 +355,7 @@ public function get(): ?array
                 [$this->stream => $messageId],
                 1
             );
-        } catch (\RedisException $e) {
+        } catch (\RedisException|\Relay\Exception $e) {
             throw new TransportException($e->getMessage(), 0, $e);
         }
 
@@ -390,7 +393,7 @@ public function ack(string $id): void
             if ($this->deleteAfterAck) {
                 $acknowledged = $redis->xdel($this->stream, [$id]);
             }
-        } catch (\RedisException $e) {
+        } catch (\RedisException|\Relay\Exception $e) {
             throw new TransportException($e->getMessage(), 0, $e);
         }
 
@@ -411,7 +414,7 @@ public function reject(string $id): void
             if ($this->deleteAfterReject) {
                 $deleted = $redis->xdel($this->stream, [$id]) && $deleted;
             }
-        } catch (\RedisException $e) {
+        } catch (\RedisException|\Relay\Exception $e) {
             throw new TransportException($e->getMessage(), 0, $e);
         }
 
@@ -474,7 +477,7 @@ public function add(string $body, array $headers, int $delayInMs = 0): string
 
                 $id = $added;
             }
-        } catch (\RedisException $e) {
+        } catch (\RedisException|\Relay\Exception $e) {
             if ($error = $redis->getLastError() ?: null) {
                 $redis->clearLastError();
             }
@@ -497,7 +500,7 @@ public function setup(): void
 
         try {
             $redis->xgroup('CREATE', $this->stream, $this->group, 0, true);
-        } catch (\RedisException $e) {
+        } catch (\RedisException|\Relay\Exception $e) {
             throw new TransportException($e->getMessage(), 0, $e);
         }
 
@@ -600,7 +603,7 @@ private function rawCommand(string $command, ...$arguments): mixed
             } else {
                 $result = $redis->rawCommand($command, $this->queue, ...$arguments);
             }
-        } catch (\RedisException $e) {
+        } catch (\RedisException|\Relay\Exception $e) {
             throw new TransportException($e->getMessage(), 0, $e);
         }
 
@@ -614,7 +617,7 @@ private function rawCommand(string $command, ...$arguments): mixed
         return $result;
     }
 
-    private function getRedis(): \Redis|\RedisCluster
+    private function getRedis(): \Redis|Relay|\RedisCluster
     {
         if ($this->redis instanceof \Closure) {
             $this->redis = ($this->redis)();

From c1e5035163ff580207e5f1b3db1c743b4964efbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= <gadelat@gmail.com>
Date: Sun, 18 Dec 2022 15:47:23 +0100
Subject: [PATCH 156/475] [VarDumper] Add Relay support

---
 src/Symfony/Component/VarDumper/CHANGELOG.md  |  1 +
 .../VarDumper/Caster/RedisCaster.php          | 23 ++++++++++---------
 .../VarDumper/Cloner/AbstractCloner.php       |  1 +
 .../Tests/Caster/RedisCasterTest.php          | 22 +++++++++++++-----
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/Symfony/Component/VarDumper/CHANGELOG.md b/src/Symfony/Component/VarDumper/CHANGELOG.md
index c5abeee346a06..3b29f419dc32d 100644
--- a/src/Symfony/Component/VarDumper/CHANGELOG.md
+++ b/src/Symfony/Component/VarDumper/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Add caster for `WeakMap`
  * Add support of named arguments to `dd()` and `dump()` to display the argument name
+ * Add support for `Relay\Relay`
 
 6.2
 ---
diff --git a/src/Symfony/Component/VarDumper/Caster/RedisCaster.php b/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
index eac25a12a8b56..f88c72a40cf86 100644
--- a/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\VarDumper\Caster;
 
+use Relay\Relay;
 use Symfony\Component\VarDumper\Cloner\Stub;
 
 /**
@@ -23,15 +24,15 @@
 class RedisCaster
 {
     private const SERIALIZERS = [
-        \Redis::SERIALIZER_NONE => 'NONE',
-        \Redis::SERIALIZER_PHP => 'PHP',
+        0 => 'NONE', // Redis::SERIALIZER_NONE
+        1 => 'PHP', // Redis::SERIALIZER_PHP
         2 => 'IGBINARY', // Optional Redis::SERIALIZER_IGBINARY
     ];
 
     private const MODES = [
-        \Redis::ATOMIC => 'ATOMIC',
-        \Redis::MULTI => 'MULTI',
-        \Redis::PIPELINE => 'PIPELINE',
+        0 => 'ATOMIC', // Redis::ATOMIC
+        1 => 'MULTI', // Redis::MULTI
+        2 => 'PIPELINE', // Redis::PIPELINE
     ];
 
     private const COMPRESSION_MODES = [
@@ -46,7 +47,7 @@ class RedisCaster
         \RedisCluster::FAILOVER_DISTRIBUTE_SLAVES => 'DISTRIBUTE_SLAVES',
     ];
 
-    public static function castRedis(\Redis $c, array $a, Stub $stub, bool $isNested)
+    public static function castRedis(\Redis|Relay $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
@@ -102,9 +103,9 @@ public static function castRedisCluster(\RedisCluster $c, array $a, Stub $stub,
         return $a;
     }
 
-    private static function getRedisOptions(\Redis|\RedisArray|\RedisCluster $redis, array $options = []): EnumStub
+    private static function getRedisOptions(\Redis|Relay|\RedisArray|\RedisCluster $redis, array $options = []): EnumStub
     {
-        $serializer = $redis->getOption(\Redis::OPT_SERIALIZER);
+        $serializer = $redis->getOption(\defined('Redis::OPT_SERIALIZER') ? \Redis::OPT_SERIALIZER : 1);
         if (\is_array($serializer)) {
             foreach ($serializer as &$v) {
                 if (isset(self::SERIALIZERS[$v])) {
@@ -136,11 +137,11 @@ private static function getRedisOptions(\Redis|\RedisArray|\RedisCluster $redis,
         }
 
         $options += [
-            'TCP_KEEPALIVE' => \defined('Redis::OPT_TCP_KEEPALIVE') ? $redis->getOption(\Redis::OPT_TCP_KEEPALIVE) : 0,
-            'READ_TIMEOUT' => $redis->getOption(\Redis::OPT_READ_TIMEOUT),
+            'TCP_KEEPALIVE' => \defined('Redis::OPT_TCP_KEEPALIVE') ? $redis->getOption(\Redis::OPT_TCP_KEEPALIVE) : Relay::OPT_TCP_KEEPALIVE,
+            'READ_TIMEOUT' => $redis->getOption(\defined('Redis::OPT_READ_TIMEOUT') ? \Redis::OPT_READ_TIMEOUT : Relay::OPT_READ_TIMEOUT),
             'COMPRESSION' => $compression,
             'SERIALIZER' => $serializer,
-            'PREFIX' => $redis->getOption(\Redis::OPT_PREFIX),
+            'PREFIX' => $redis->getOption(\defined('Redis::OPT_PREFIX') ? \Redis::OPT_PREFIX : Relay::OPT_PREFIX),
             'SCAN' => $retry,
         ];
 
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
index bcd3013716e9e..599c59ecf6e54 100644
--- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -130,6 +130,7 @@ abstract class AbstractCloner implements ClonerInterface
         'WeakReference' => ['Symfony\Component\VarDumper\Caster\SplCaster', 'castWeakReference'],
 
         'Redis' => ['Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedis'],
+        'Relay\Relay' => ['Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedis'],
         'RedisArray' => ['Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedisArray'],
         'RedisCluster' => ['Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedisCluster'],
 
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/RedisCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/RedisCasterTest.php
index 058b95d0d0ab6..3d56584a5640e 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/RedisCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/RedisCasterTest.php
@@ -16,13 +16,15 @@
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
- * @requires extension redis
  * @group integration
  */
 class RedisCasterTest extends TestCase
 {
     use VarDumperTestTrait;
 
+    /**
+     * @requires extension redis
+     */
     public function testNotConnected()
     {
         $redis = new \Redis();
@@ -36,10 +38,18 @@ public function testNotConnected()
         $this->assertDumpMatchesFormat($xCast, $redis);
     }
 
-    public function testConnected()
+    /**
+     * @testWith ["Redis"]
+     *           ["Relay\\Relay"]
+     */
+    public function testConnected(string $class)
     {
+        if (!class_exists($class)) {
+            self::markTestSkipped(sprintf('"%s" class required', $class));
+        }
+
         $redisHost = explode(':', getenv('REDIS_HOST')) + [1 => 6379];
-        $redis = new \Redis();
+        $redis = new $class;
         try {
             $redis->connect(...$redisHost);
         } catch (\Exception $e) {
@@ -47,7 +57,7 @@ public function testConnected()
         }
 
         $xCast = <<<EODUMP
-Redis {%A
+%a {%A
   isConnected: true
   host: "{$redisHost[0]}"
   port: {$redisHost[1]}
@@ -56,9 +66,9 @@ public function testConnected()
   dbNum: 0
   timeout: 0.0
   lastError: null
-  persistentId: null
+  persistentId: %a
   options: {
-    TCP_KEEPALIVE: 0
+    TCP_KEEPALIVE: %a
     READ_TIMEOUT: 0.0
     COMPRESSION: NONE
     SERIALIZER: NONE

From a51b7faa120b82699f5e21440ea8614759eaa327 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Thu, 19 Jan 2023 13:18:20 +0100
Subject: [PATCH 157/475] Introduce stub for Voter

---
 .../Security/Core/Authorization/Voter/Voter.php       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/Voter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/Voter.php
index 6ac75993101ff..1f76a42eaf1b8 100644
--- a/src/Symfony/Component/Security/Core/Authorization/Voter/Voter.php
+++ b/src/Symfony/Component/Security/Core/Authorization/Voter/Voter.php
@@ -18,6 +18,9 @@
  *
  * @author Roman Marintšenko <inoryy@gmail.com>
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ *
+ * @template TAttribute of string
+ * @template TSubject of mixed
  */
 abstract class Voter implements VoterInterface, CacheableVoterInterface
 {
@@ -74,13 +77,19 @@ public function supportsType(string $subjectType): bool
     /**
      * Determines if the attribute and subject are supported by this voter.
      *
-     * @param $subject The subject to secure, e.g. an object the user wants to access or any other PHP type
+     * @param mixed $subject The subject to secure, e.g. an object the user wants to access or any other PHP type
+     *
+     * @psalm-assert-if-true TSubject $subject
+     * @psalm-assert-if-true TAttribute $attribute
      */
     abstract protected function supports(string $attribute, mixed $subject): bool;
 
     /**
      * Perform a single access check operation on a given attribute, subject and token.
      * It is safe to assume that $attribute and $subject already passed the "supports()" method check.
+     *
+     * @param TAttribute $attribute
+     * @param TSubject   $subject
      */
     abstract protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token): bool;
 }

From 743f95b95779ae0fb5bf54c220f722bbec2a39c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Wed, 25 Jan 2023 14:51:48 +0100
Subject: [PATCH 158/475] [FrameworkBundle] Register alias for argument for
 workflow services with workflow name only

---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md                  | 1 +
 .../FrameworkBundle/DependencyInjection/FrameworkExtension.php   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 3179f5ab526c1..67e0dbe1ceb22 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -12,6 +12,7 @@ CHANGELOG
  * Deprecate `framework:exceptions` tag, unwrap it and replace `framework:exception` tags' `name` attribute by `class`
  * Deprecate the `notifier.logger_notification_listener` service, use the `notifier.notification_logger_listener` service instead
  * Allow setting private services with the test container
+ * Register alias for argument for workflow services with workflow name only
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 551f02dc66299..358ec36f10bea 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1006,6 +1006,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             $container->setDefinition($workflowId, $workflowDefinition);
             $container->setDefinition(sprintf('%s.definition', $workflowId), $definitionDefinition);
             $container->registerAliasForArgument($workflowId, WorkflowInterface::class, $name.'.'.$type);
+            $container->registerAliasForArgument($workflowId, WorkflowInterface::class, $name);
 
             // Validate Workflow
             if ('state_machine' === $workflow['type']) {

From defd51dfafda3da843fb45adb2ed22124128a84d Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Thu, 19 Jan 2023 09:36:02 +0100
Subject: [PATCH 159/475] [Config] Allow enum values in EnumNode

---
 .../Config/Builder/ConfigBuilderGenerator.php |  2 +-
 src/Symfony/Component/Config/CHANGELOG.md     |  5 +++
 .../Definition/Dumper/XmlReferenceDumper.php  |  4 +-
 .../Definition/Dumper/YamlReferenceDumper.php |  2 +-
 .../Component/Config/Definition/EnumNode.php  | 37 +++++++++++++++++--
 .../Tests/Builder/Fixtures/PrimitiveTypes.php |  3 +-
 .../Symfony/Config/PrimitiveTypesConfig.php   |  2 +-
 .../Dumper/XmlReferenceDumperTest.php         |  2 +-
 .../Dumper/YamlReferenceDumperTest.php        |  2 +-
 .../Config/Tests/Definition/EnumNodeTest.php  | 21 ++++++++---
 .../Configuration/ExampleConfiguration.php    |  3 +-
 .../Config/Tests/Fixtures/TestEnum.php        | 10 +++++
 .../Config/Tests/Fixtures/TestEnum2.php       | 10 +++++
 13 files changed, 86 insertions(+), 17 deletions(-)
 create mode 100644 src/Symfony/Component/Config/Tests/Fixtures/TestEnum.php
 create mode 100644 src/Symfony/Component/Config/Tests/Fixtures/TestEnum2.php

diff --git a/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php b/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
index d7b8dd04432ab..2f00a99beb02e 100644
--- a/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
+++ b/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
@@ -426,7 +426,7 @@ private function getComment(BaseNode $node): string
             }
 
             if ($node instanceof EnumNode) {
-                $comment .= sprintf(' * @param ParamConfigurator|%s $value', implode('|', array_unique(array_map(fn ($a) => var_export($a, true), $node->getValues()))))."\n";
+                $comment .= sprintf(' * @param ParamConfigurator|%s $value', implode('|', array_unique(array_map(fn ($a) => !$a instanceof \UnitEnum ? var_export($a, true) : '\\'.ltrim(var_export($a, true), '\\'), $node->getValues()))))."\n";
             } else {
                 $parameterTypes = $this->getParameterTypes($node);
                 $comment .= ' * @param ParamConfigurator|'.implode('|', $parameterTypes).' $value'."\n";
diff --git a/src/Symfony/Component/Config/CHANGELOG.md b/src/Symfony/Component/Config/CHANGELOG.md
index 0fac3a8a550c7..094d5abba0637 100644
--- a/src/Symfony/Component/Config/CHANGELOG.md
+++ b/src/Symfony/Component/Config/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Allow enum values in `EnumNode`
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
index eb8fce4385e6b..980fb74fe453c 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
@@ -107,7 +107,7 @@ private function writeNode(NodeInterface $node, int $depth = 0, bool $root = fal
                             FloatNode::class,
                             IntegerNode::class => 'numeric value',
                             BooleanNode::class => 'true|false',
-                            EnumNode::class => implode('|', array_unique(array_map('json_encode', $prototype->getValues()))),
+                            EnumNode::class => $prototype->getPermissibleValues('|'),
                             default => 'value',
                         };
                     }
@@ -149,7 +149,7 @@ private function writeNode(NodeInterface $node, int $depth = 0, bool $root = fal
                 }
 
                 if ($child instanceof EnumNode) {
-                    $comments[] = 'One of '.implode('; ', array_unique(array_map('json_encode', $child->getValues())));
+                    $comments[] = 'One of '.$child->getPermissibleValues('; ');
                 }
 
                 if (\count($comments)) {
diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
index 04cb38c20b451..053a201065d91 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -98,7 +98,7 @@ private function writeNode(NodeInterface $node, NodeInterface $parentNode = null
                 }
             }
         } elseif ($node instanceof EnumNode) {
-            $comments[] = 'One of '.implode('; ', array_unique(array_map('json_encode', $node->getValues())));
+            $comments[] = 'One of '.$node->getPermissibleValues('; ');
             $default = $node->hasDefaultValue() ? Inline::dump($node->getDefaultValue()) : '~';
         } elseif (VariableNode::class === $node::class && \is_array($example)) {
             // If there is an array example, we are sure we dont need to print a default value
diff --git a/src/Symfony/Component/Config/Definition/EnumNode.php b/src/Symfony/Component/Config/Definition/EnumNode.php
index 771813c70b8a9..4b494d00ace57 100644
--- a/src/Symfony/Component/Config/Definition/EnumNode.php
+++ b/src/Symfony/Component/Config/Definition/EnumNode.php
@@ -29,8 +29,16 @@ public function __construct(?string $name, NodeInterface $parent = null, array $
         }
 
         foreach ($values as $value) {
-            if (null !== $value && !\is_scalar($value)) {
-                throw new \InvalidArgumentException(sprintf('"%s" only supports scalar or null values, "%s" given.', __CLASS__, get_debug_type($value)));
+            if (null === $value || \is_scalar($value)) {
+                continue;
+            }
+
+            if (!$value instanceof \UnitEnum) {
+                throw new \InvalidArgumentException(sprintf('"%s" only supports scalar, enum, or null values, "%s" given.', __CLASS__, get_debug_type($value)));
+            }
+
+            if ($value::class !== ($enumClass ??= $value::class)) {
+                throw new \InvalidArgumentException(sprintf('"%s" only supports one type of enum, "%s" and "%s" passed.', __CLASS__, $enumClass, $value::class));
             }
         }
 
@@ -43,12 +51,35 @@ public function getValues()
         return $this->values;
     }
 
+    /**
+     * @internal
+     */
+    public function getPermissibleValues(string $separator): string
+    {
+        return implode($separator, array_unique(array_map(static function (mixed $value): string {
+            if (!$value instanceof \UnitEnum) {
+                return json_encode($value);
+            }
+
+            return ltrim(var_export($value, true), '\\');
+        }, $this->values)));
+    }
+
+    protected function validateType(mixed $value)
+    {
+        if ($value instanceof \UnitEnum) {
+            return;
+        }
+
+        parent::validateType($value);
+    }
+
     protected function finalizeValue(mixed $value): mixed
     {
         $value = parent::finalizeValue($value);
 
         if (!\in_array($value, $this->values, true)) {
-            $ex = new InvalidConfigurationException(sprintf('The value %s is not allowed for path "%s". Permissible values: %s', json_encode($value), $this->getPath(), implode(', ', array_unique(array_map('json_encode', $this->values)))));
+            $ex = new InvalidConfigurationException(sprintf('The value %s is not allowed for path "%s". Permissible values: %s', json_encode($value), $this->getPath(), $this->getPermissibleValues(', ')));
             $ex->setPath($this->getPath());
 
             throw $ex;
diff --git a/src/Symfony/Component/Config/Tests/Builder/Fixtures/PrimitiveTypes.php b/src/Symfony/Component/Config/Tests/Builder/Fixtures/PrimitiveTypes.php
index 6ffcf5a4ef533..6b0dbd72fc921 100644
--- a/src/Symfony/Component/Config/Tests/Builder/Fixtures/PrimitiveTypes.php
+++ b/src/Symfony/Component/Config/Tests/Builder/Fixtures/PrimitiveTypes.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\Config\Tests\Fixtures\TestEnum;
 
 class PrimitiveTypes implements ConfigurationInterface
 {
@@ -23,7 +24,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         $rootNode
             ->children()
                 ->booleanNode('boolean_node')->end()
-                ->enumNode('enum_node')->values(['foo', 'bar', 'baz'])->end()
+                ->enumNode('enum_node')->values(['foo', 'bar', 'baz', TestEnum::Bar])->end()
                 ->floatNode('float_node')->end()
                 ->integerNode('integer_node')->end()
                 ->scalarNode('scalar_node')->end()
diff --git a/src/Symfony/Component/Config/Tests/Builder/Fixtures/PrimitiveTypes/Symfony/Config/PrimitiveTypesConfig.php b/src/Symfony/Component/Config/Tests/Builder/Fixtures/PrimitiveTypes/Symfony/Config/PrimitiveTypesConfig.php
index 6701d472cec04..b34e0413b8a23 100644
--- a/src/Symfony/Component/Config/Tests/Builder/Fixtures/PrimitiveTypes/Symfony/Config/PrimitiveTypesConfig.php
+++ b/src/Symfony/Component/Config/Tests/Builder/Fixtures/PrimitiveTypes/Symfony/Config/PrimitiveTypesConfig.php
@@ -33,7 +33,7 @@ public function booleanNode($value): static
 
     /**
      * @default null
-     * @param ParamConfigurator|'foo'|'bar'|'baz' $value
+     * @param ParamConfigurator|'foo'|'bar'|'baz'|\Symfony\Component\Config\Tests\Fixtures\TestEnum::Bar $value
      * @return $this
      */
     public function enumNode($value): static
diff --git a/src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php b/src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
index 520d25666a1c0..e6ce07588f9d0 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
@@ -41,7 +41,7 @@ private function getConfigurationAsString()
 <!-- scalar-deprecated: Deprecated (Since vendor/package 1.1: The child node "scalar_deprecated" at path "acme_root" is deprecated.) -->
 <!-- scalar-deprecated-with-message: Deprecated (Since vendor/package 1.1: Deprecation custom message for "scalar_deprecated_with_message" at "acme_root") -->
 <!-- enum-with-default: One of "this"; "that" -->
-<!-- enum: One of "this"; "that" -->
+<!-- enum: One of "this"; "that"; Symfony\Component\Config\Tests\Fixtures\TestEnum::Ccc -->
 <!-- variable: Example: foo, bar -->
 <config
     boolean="true"
diff --git a/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php b/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
index 7d8c2d951897f..cbe5b3c67d74c 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
@@ -102,7 +102,7 @@ private function getConfigurationAsString(): string
     scalar_deprecated_with_message: ~ # Deprecated (Since vendor/package 1.1: Deprecation custom message for "scalar_deprecated_with_message" at "acme_root")
     node_with_a_looong_name: ~
     enum_with_default:    this # One of "this"; "that"
-    enum:                 ~ # One of "this"; "that"
+    enum:                 ~ # One of "this"; "that"; Symfony\Component\Config\Tests\Fixtures\TestEnum::Ccc
 
     # some info
     array:
diff --git a/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
index 86bc045eeca0f..f71a09cd14a1c 100644
--- a/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
@@ -14,13 +14,16 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Definition\EnumNode;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
+use Symfony\Component\Config\Tests\Fixtures\TestEnum;
+use Symfony\Component\Config\Tests\Fixtures\TestEnum2;
 
 class EnumNodeTest extends TestCase
 {
     public function testFinalizeValue()
     {
-        $node = new EnumNode('foo', null, ['foo', 'bar']);
+        $node = new EnumNode('foo', null, ['foo', 'bar', TestEnum::Bar]);
         $this->assertSame('foo', $node->finalize('foo'));
+        $this->assertSame(TestEnum::Bar, $node->finalize(TestEnum::Bar));
     }
 
     public function testConstructionWithNoValues()
@@ -51,8 +54,8 @@ public function testConstructionWithNullName()
     public function testFinalizeWithInvalidValue()
     {
         $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('The value "foobar" is not allowed for path "foo". Permissible values: "foo", "bar"');
-        $node = new EnumNode('foo', null, ['foo', 'bar']);
+        $this->expectExceptionMessage('The value "foobar" is not allowed for path "foo". Permissible values: "foo", "bar", Symfony\Component\Config\Tests\Fixtures\TestEnum::Foo');
+        $node = new EnumNode('foo', null, ['foo', 'bar', TestEnum::Foo]);
         $node->finalize('foobar');
     }
 
@@ -80,11 +83,19 @@ public function testSameStringCoercedValuesAreDifferent()
         $this->assertNull($node->finalize(null));
     }
 
-    public function testNonScalarOrNullValueThrows()
+    public function testNonScalarOrEnumOrNullValueThrows()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('"Symfony\Component\Config\Definition\EnumNode" only supports scalar or null values, "stdClass" given.');
+        $this->expectExceptionMessage('"Symfony\Component\Config\Definition\EnumNode" only supports scalar, enum, or null values, "stdClass" given.');
 
         new EnumNode('ccc', null, [new \stdClass()]);
     }
+
+    public function testTwoDifferentEnumsThrows()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('"Symfony\Component\Config\Definition\EnumNode" only supports one type of enum, "Symfony\Component\Config\Tests\Fixtures\TestEnum" and "Symfony\Component\Config\Tests\Fixtures\TestEnum2" passed.');
+
+        new EnumNode('ccc', null, [...TestEnum::cases(), TestEnum2::Ccc]);
+    }
 }
diff --git a/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php b/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
index 126008831796a..bdf6d80bff443 100644
--- a/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
+++ b/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\Config\Tests\Fixtures\TestEnum;
 
 class ExampleConfiguration implements ConfigurationInterface
 {
@@ -38,7 +39,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->scalarNode('scalar_deprecated_with_message')->setDeprecated('vendor/package', '1.1', 'Deprecation custom message for "%node%" at "%path%"')->end()
                 ->scalarNode('node_with_a_looong_name')->end()
                 ->enumNode('enum_with_default')->values(['this', 'that'])->defaultValue('this')->end()
-                ->enumNode('enum')->values(['this', 'that'])->end()
+                ->enumNode('enum')->values(['this', 'that', TestEnum::Ccc])->end()
                 ->arrayNode('array')
                     ->info('some info')
                     ->canBeUnset()
diff --git a/src/Symfony/Component/Config/Tests/Fixtures/TestEnum.php b/src/Symfony/Component/Config/Tests/Fixtures/TestEnum.php
new file mode 100644
index 0000000000000..d019749f37ee0
--- /dev/null
+++ b/src/Symfony/Component/Config/Tests/Fixtures/TestEnum.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\Config\Tests\Fixtures;
+
+enum TestEnum
+{
+    case Foo;
+    case Bar;
+    case Ccc;
+}
diff --git a/src/Symfony/Component/Config/Tests/Fixtures/TestEnum2.php b/src/Symfony/Component/Config/Tests/Fixtures/TestEnum2.php
new file mode 100644
index 0000000000000..2e1189bb6f17c
--- /dev/null
+++ b/src/Symfony/Component/Config/Tests/Fixtures/TestEnum2.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\Config\Tests\Fixtures;
+
+enum TestEnum2
+{
+    case Foo;
+    case Bar;
+    case Ccc;
+}

From b735e0a4ef2edae252f71e76d3c5671cb8377daa Mon Sep 17 00:00:00 2001
From: Adrien Roches <rochesadrien@gmail.com>
Date: Wed, 18 Jan 2023 15:05:54 +0100
Subject: [PATCH 160/475] [DependencyInjection] Add missing template notation
 on ServiceLocator

---
 src/Symfony/Component/DependencyInjection/ServiceLocator.php | 3 +++
 src/Symfony/Component/ErrorHandler/DebugClassLoader.php      | 4 ++--
 src/Symfony/Contracts/Service/ServiceProviderInterface.php   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/ServiceLocator.php b/src/Symfony/Component/DependencyInjection/ServiceLocator.php
index 3560ce3ccdd0e..fbb94fd97cfd1 100644
--- a/src/Symfony/Component/DependencyInjection/ServiceLocator.php
+++ b/src/Symfony/Component/DependencyInjection/ServiceLocator.php
@@ -23,6 +23,9 @@
 /**
  * @author Robin Chalas <robin.chalas@gmail.com>
  * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @template-covariant T of mixed
+ * @implements ServiceProviderInterface<T>
  */
 class ServiceLocator implements ServiceProviderInterface, \Countable
 {
diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
index 561a7aa0bf3be..ad7e20694a75c 100644
--- a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
+++ b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -384,7 +384,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
 
         // Detect annotations on the class
         if ($doc = $this->parsePhpDoc($refl)) {
-            $classIsTemplate = isset($doc['template']);
+            $classIsTemplate = isset($doc['template']) || isset($doc['template-covariant']);
 
             foreach (['final', 'deprecated', 'internal'] as $annotation) {
                 if (null !== $description = $doc[$annotation][0] ?? null) {
@@ -531,7 +531,7 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
             // To read method annotations
             $doc = $this->parsePhpDoc($method);
 
-            if (($classIsTemplate || isset($doc['template'])) && $method->hasReturnType()) {
+            if (($classIsTemplate || isset($doc['template']) || isset($doc['template-covariant'])) && $method->hasReturnType()) {
                 unset($doc['return']);
             }
 
diff --git a/src/Symfony/Contracts/Service/ServiceProviderInterface.php b/src/Symfony/Contracts/Service/ServiceProviderInterface.php
index a28fd82ea49a4..c05e4bfe7bc35 100644
--- a/src/Symfony/Contracts/Service/ServiceProviderInterface.php
+++ b/src/Symfony/Contracts/Service/ServiceProviderInterface.php
@@ -19,7 +19,7 @@
  * @author Nicolas Grekas <p@tchwork.com>
  * @author Mateusz Sip <mateusz.sip@gmail.com>
  *
- * @template T of mixed
+ * @template-covariant T of mixed
  */
 interface ServiceProviderInterface extends ContainerInterface
 {

From 2f490ac31f83fe030f1606f0bfb3b13eb2a633d4 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Tue, 17 Jan 2023 11:00:01 +0100
Subject: [PATCH 161/475] [HttpFoundation] Improve return type of Header::all

---
 src/Symfony/Component/HttpFoundation/HeaderBag.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
index 0883024b3b50b..eb96b9dd93458 100644
--- a/src/Symfony/Component/HttpFoundation/HeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -63,7 +63,7 @@ public function __toString(): string
      *
      * @param string|null $key The name of the headers to return or null to get them all
      *
-     * @return array<string, array<int, string|null>>|array<int, string|null>
+     * @return ($key is null ? array<string, array<int, string|null>> : array<int, string|null>)
      */
     public function all(string $key = null): array
     {

From c5407ce64e93206d62b3b2ca3d42ba8f6be46e06 Mon Sep 17 00:00:00 2001
From: Mathieu <math.lechat@gmail.com>
Date: Wed, 18 Jan 2023 13:47:51 +0100
Subject: [PATCH 162/475] [SecurityBundle] Make firewalls event dispatcher
 traceable on debug mode

---
 .../Bundle/SecurityBundle/CHANGELOG.md        |  1 +
 ...eFirewallsEventDispatcherTraceablePass.php | 70 ++++++++++++++++++
 .../Bundle/SecurityBundle/SecurityBundle.php  |  4 +
 ...ewallsEventDispatcherTraceablePassTest.php | 73 +++++++++++++++++++
 4 files changed, 148 insertions(+)
 create mode 100644 src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePass.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePassTest.php

diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index def296d23df5e..f71cea472f7de 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
  * Modify "icon.svg" to improve accessibility for blind/low vision users
  * Make `Security::login()` return the authenticator response
  * Deprecate the `security.firewalls.logout.csrf_token_generator` config option, use `security.firewalls.logout.csrf_token_manager` instead
+ * Make firewalls event dispatcher traceable on debug mode
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePass.php
new file mode 100644
index 0000000000000..ee231a9398839
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePass.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
+
+/**
+ * @author Mathieu Lechat <mathieu.lechat@les-tilleuls.coop>
+ */
+class MakeFirewallsEventDispatcherTraceablePass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->has('event_dispatcher') || !$container->hasParameter('security.firewalls')) {
+            return;
+        }
+
+        if (!$container->getParameter('kernel.debug') || !$container->has('debug.stopwatch')) {
+            return;
+        }
+
+        $dispatchersId = [];
+
+        foreach ($container->getParameter('security.firewalls') as $firewallName) {
+            $dispatcherId = 'security.event_dispatcher.'.$firewallName;
+
+            if (!$container->has($dispatcherId)) {
+                continue;
+            }
+
+            $dispatchersId[$dispatcherId] = 'debug.'.$dispatcherId;
+
+            $container->register($dispatchersId[$dispatcherId], TraceableEventDispatcher::class)
+                ->setDecoratedService($dispatcherId)
+                ->setArguments([
+                    new Reference($dispatchersId[$dispatcherId].'.inner'),
+                    new Reference('debug.stopwatch'),
+                    new Reference('logger', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                    new Reference('request_stack', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                ]);
+        }
+
+        foreach (['kernel.event_subscriber', 'kernel.event_listener'] as $tagName) {
+            foreach ($container->findTaggedServiceIds($tagName) as $taggedServiceId => $tags) {
+                $taggedServiceDefinition = $container->findDefinition($taggedServiceId);
+                $taggedServiceDefinition->clearTag($tagName);
+
+                foreach ($tags as $tag) {
+                    if ($dispatcherId = $tag['dispatcher'] ?? null) {
+                        $tag['dispatcher'] = $dispatchersId[$dispatcherId] ?? $dispatcherId;
+                    }
+                    $taggedServiceDefinition->addTag($tagName, $tag);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
index 3d90b1690a589..317a6e11d1211 100644
--- a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
+++ b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
@@ -15,6 +15,7 @@
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\AddSecurityVotersPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\AddSessionDomainConstraintPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\CleanRememberMeVerifierPass;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\MakeFirewallsEventDispatcherTraceablePass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterCsrfFeaturesPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterEntryPointPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterGlobalSecurityEventListenersPass;
@@ -92,5 +93,8 @@ public function build(ContainerBuilder $container)
             AuthenticationEvents::ALIASES,
             SecurityEvents::ALIASES
         )));
+
+        // must be registered before DecoratorServicePass
+        $container->addCompilerPass(new MakeFirewallsEventDispatcherTraceablePass(), PassConfig::TYPE_OPTIMIZE, 10);
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePassTest.php
new file mode 100644
index 0000000000000..e156a2f6f51d4
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePassTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension;
+use Symfony\Bundle\SecurityBundle\SecurityBundle;
+use Symfony\Component\DependencyInjection\Compiler\DecoratorServicePass;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\Stopwatch\Stopwatch;
+
+class MakeFirewallsEventDispatcherTraceablePassTest extends TestCase
+{
+    private $container;
+
+    protected function setUp(): void
+    {
+        $this->container = new ContainerBuilder();
+        $this->container->register('request_stack', \stdClass::class);
+        $this->container->register('event_dispatcher', EventDispatcher::class);
+        $this->container->register('debug.stopwatch', Stopwatch::class);
+
+        $this->container->registerExtension(new SecurityExtension());
+        $this->container->loadFromExtension('security', [
+            'firewalls' => ['main' => ['pattern' => '/', 'http_basic' => true]],
+        ]);
+
+        $this->container->addCompilerPass(new DecoratorServicePass(), PassConfig::TYPE_OPTIMIZE);
+        $this->container->getCompilerPassConfig()->setRemovingPasses([]);
+        $this->container->getCompilerPassConfig()->setAfterRemovingPasses([]);
+
+        $securityBundle = new SecurityBundle();
+        $securityBundle->build($this->container);
+    }
+
+    public function testEventDispatcherIsDecoratedOnDebugMode()
+    {
+        $this->container->setParameter('kernel.debug', true);
+
+        $this->container->compile();
+
+        $dispatcherDefinition = $this->container->findDefinition('security.event_dispatcher.main');
+
+        $this->assertSame(TraceableEventDispatcher::class, $dispatcherDefinition->getClass());
+        $this->assertSame(
+            [['name' => 'security.event_dispatcher.main']],
+            $dispatcherDefinition->getTag('event_dispatcher.dispatcher')
+        );
+    }
+
+    public function testEventDispatcherIsNotDecoratedOnNonDebugMode()
+    {
+        $this->container->setParameter('kernel.debug', false);
+
+        $this->container->compile();
+
+        $dispatcherDefinition = $this->container->findDefinition('security.event_dispatcher.main');
+
+        $this->assertSame(EventDispatcher::class, $dispatcherDefinition->getClass());
+    }
+}

From 990841528a66243d03028ddc582cac00bf8e2a50 Mon Sep 17 00:00:00 2001
From: Alexandre parent <alexandreparent_dev@outlook.com>
Date: Tue, 26 Jul 2022 11:02:10 -0400
Subject: [PATCH 163/475] [DependencyInjection] Allow attribute
 autoconfiguration on static methods

---
 .../AttributeAutoconfigurationPass.php        |  2 +-
 .../Tests/Compiler/IntegrationTest.php        | 23 +++++++++++++++++++
 .../Tests/Fixtures/StaticMethodTag.php        | 22 ++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/StaticMethodTag.php

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php
index 645214bd467f0..c57b78d3f58e7 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php
@@ -120,7 +120,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
 
         if ($this->methodAttributeConfigurators || $this->parameterAttributeConfigurators) {
             foreach ($classReflector->getMethods(\ReflectionMethod::IS_PUBLIC) as $methodReflector) {
-                if ($methodReflector->isStatic() || $methodReflector->isConstructor() || $methodReflector->isDestructor()) {
+                if ($methodReflector->isConstructor() || $methodReflector->isDestructor()) {
                     continue;
                 }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
index e7fcac4623f84..c9364395f71de 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
@@ -47,6 +47,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\LocatorConsumerWithDefaultIndexMethodAndWithDefaultPriorityMethod;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\LocatorConsumerWithDefaultPriorityMethod;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\LocatorConsumerWithoutIndex;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\StaticMethodTag;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedConsumerWithExclude;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedService1;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedService2;
@@ -1025,6 +1026,28 @@ static function (ChildDefinition $definition) {
         self::assertTrue($service->hasBeenConfigured);
     }
 
+    public function testAttributeAutoconfigurationOnStaticMethod()
+    {
+        $container = new ContainerBuilder();
+        $container->registerAttributeForAutoconfiguration(
+            CustomMethodAttribute::class,
+            static function (ChildDefinition $d, CustomMethodAttribute $a, \ReflectionMethod $_r) {
+                $d->addTag('custom_tag', ['attribute' => $a->someAttribute]);
+            }
+        );
+
+        $container->register('service', StaticMethodTag::class)
+            ->setPublic(true)
+            ->setAutoconfigured(true);
+
+        $container->compile();
+
+        $definition = $container->getDefinition('service');
+        self::assertEquals([['attribute' => 'static']], $definition->getTag('custom_tag'));
+
+        $container->get('service');
+    }
+
     public function testTaggedIteratorAndLocatorWithExclude()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/StaticMethodTag.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/StaticMethodTag.php
new file mode 100644
index 0000000000000..d5362d849cf38
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/StaticMethodTag.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
10000

+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Attribute\CustomMethodAttribute;
+
+final class StaticMethodTag
+{
+    #[CustomMethodAttribute('static')]
+    public static function method(): void
+    {
+    }
+}

From 9ab243547f5c3b4540e162ef2d7e451547767289 Mon Sep 17 00:00:00 2001
From: tourze <tourze@users.noreply.github.com>
Date: Sun, 20 Nov 2022 00:26:40 +0800
Subject: [PATCH 164/475] [Cache] Compatible with aliyun redis instance

Some cloud provider's redis instance is just compatible in common use command, but not some special command.
Just like aliyun redis instance, doc: https://help.aliyun.com/document_detail/26342.html
It based on redis protocol, but not really like the redis I know...

I found that `$host->info('Memory')` will return false/null sometime, so and more safe check will be better for those special redis server.
---
 src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
index 01128eb150714..cf826f106570e 100644
--- a/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
@@ -292,13 +292,13 @@ private function getRedisEvictionPolicy(): string
         foreach ($hosts as $host) {
             $info = $host->info('Memory');
 
-            if ($info instanceof ErrorInterface) {
+            if (false === $info || null === $info || $info instanceof ErrorInterface) {
                 continue;
             }
 
             $info = $info['Memory'] ?? $info;
 
-            return $this->redisEvictionPolicy = $info['maxmemory_policy'];
+            return $this->redisEvictionPolicy = $info['maxmemory_policy'] ?? '';
         }
 
         return $this->redisEvictionPolicy = '';

From 6936845476d5c276f53caf5a16ed6134173c61b8 Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Wed, 21 Dec 2022 22:37:25 +0100
Subject: [PATCH 165/475] [VarDumper] Display invisible characters

---
 src/Symfony/Component/VarDumper/CHANGELOG.md        |  1 +
 .../Component/VarDumper/Dumper/CliDumper.php        |  9 +++++++++
 .../Component/VarDumper/Dumper/HtmlDumper.php       |  8 +++++++-
 .../VarDumper/Tests/Dumper/CliDumperTest.php        |  3 ++-
 .../VarDumper/Tests/Dumper/HtmlDumperTest.php       |  3 ++-
 .../Component/VarDumper/Tests/Fixtures/dumb-var.php | 13 +++++++++++--
 6 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/VarDumper/CHANGELOG.md b/src/Symfony/Component/VarDumper/CHANGELOG.md
index 3b29f419dc32d..9329875010537 100644
--- a/src/Symfony/Component/VarDumper/CHANGELOG.md
+++ b/src/Symfony/Component/VarDumper/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * Add caster for `WeakMap`
  * Add support of named arguments to `dd()` and `dump()` to display the argument name
  * Add support for `Relay\Relay`
+ * Add display of invisible characters
 
 6.2
 ---
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
index c52ac4dbfcbf8..7d6810e44050a 100644
--- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -51,6 +51,7 @@ class CliDumper extends AbstractDumper
         "\r" => '\r',
         "\033" => '\e',
     ];
+    protected static $unicodeCharsRx = "/[\u{00A0}\u{00AD}\u{034F}\u{061C}\u{115F}\u{1160}\u{17B4}\u{17B5}\u{180E}\u{2000}-\u{200F}\u{202F}\u{205F}\u{2060}-\u{2064}\u{206A}-\u{206F}\u{3000}\u{2800}\u{3164}\u{FEFF}\u{FFA0}\u{1D159}\u{1D173}-\u{1D17A}]/u";
 
     protected $collapseNextHash = false;
     protected $expandNextHash = false;
@@ -450,6 +451,14 @@ protected function style(string $style, string $value, array $attr = []): string
             return $s.$endCchr;
         }, $value, -1, $cchrCount);
 
+        if (!($attr['binary'] ?? false)) {
+            $value = preg_replace_callback(static::$unicodeCharsRx, function ($c) use (&$cchrCount, $startCchr, $endCchr) {
+                ++$cchrCount;
+
+                return $startCchr.'\u{'.strtoupper(dechex(mb_ord($c[0]))).'}'.$endCchr;
+            }, $value);
+        }
+
         if ($this->colors) {
             if ($cchrCount && "\033" === $value[0]) {
                 $value = substr($value, \strlen($startCchr));
diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
index c818c919c43b1..0cc7baabb6c51 100644
--- a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
@@ -862,7 +862,6 @@ protected function style(string $style, string $value, array $attr = []): string
         } elseif ('private' === $style) {
             $style .= sprintf(' title="Private property defined in class:&#10;`%s`"', esc($this->utf8Encode($attr['class'])));
         }
-        $map = static::$controlCharsMap;
 
         if (isset($attr['ellipsis'])) {
             $class = 'sf-dump-ellipsis';
@@ -881,6 +880,7 @@ protected function style(string $style, string $value, array $attr = []): string
             }
         }
 
+        $map = static::$controlCharsMap;
         $v = "<span class=sf-dump-{$style}>".preg_replace_callback(static::$controlCharsRx, function ($c) use ($map) {
             $s = $b = '<span class="sf-dump-default';
             $c = $c[$i = 0];
@@ -903,6 +903,12 @@ protected function style(string $style, string $value, array $attr = []): string
             return $s.'</span>';
         }, $v).'</span>';
 
+        if (!($attr['binary'] ?? false)) {
+            $v = preg_replace_callback(static::$unicodeCharsRx, function ($c) {
+                return '<span class="sf-dump-default>\u{'.strtoupper(dechex(mb_ord($c[0]))).'}</span>';
+            }, $v);
+        }
+
         if (isset($attr['file']) && $href = $this->getSourceLink($attr['file'], $attr['line'] ?? 0)) {
             $attr['href'] = $href;
         }
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
index b4780cfe92b9c..4993ee32415d9 100644
--- a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
@@ -51,7 +51,7 @@ public function testGet()
 
         $this->assertStringMatchesFormat(
             <<<EOTXT
-array:24 [
+array:25 [
   "number" => 1
   0 => &1 null
   "const" => 1.1
@@ -66,6 +66,7 @@ public function testGet()
     é\\x01test\\t\\n
     ing
     """
+  "bo\\u{FEFF}m" => "te\\u{FEFF}st"
   "[]" => []
   "res" => stream resource {@{$res}
 %A  wrapper_type: "plainfile"
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php
index 1fd98640312e0..e48ed5e08b088 100644
--- a/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php
@@ -54,7 +54,7 @@ public function testGet()
 
         $this->assertStringMatchesFormat(
             <<<EOTXT
-<foo></foo><bar><span class=sf-dump-note>array:24</span> [<samp data-depth=1 class=sf-dump-expanded>
+<foo></foo><bar><span class=sf-dump-note>array:25</span> [<samp data-depth=1 class=sf-dump-expanded>
   "<span class=sf-dump-key>number</span>" => <span class=sf-dump-num>1</span>
   <span class=sf-dump-key>0</span> => <a class=sf-dump-ref href=#{$dumpId}-ref01 title="2 occurrences">&amp;1</a> <span class=sf-dump-const>null</span>
   "<span class=sf-dump-key>const</span>" => <span class=sf-dump-num>1.1</span>
@@ -69,6 +69,7 @@ public function testGet()
     <span class=sf-dump-str title="11 binary or non-UTF-8 characters">&#233;<span class="sf-dump-default">\\x01</span>test<span class="sf-dump-default">\\t</span><span class="sf-dump-default sf-dump-ns">\\n</span></span>
     <span class=sf-dump-str title="11 binary or non-UTF-8 characters">ing</span>
     """
+  "<span class=sf-dump-key>bo<span class="sf-dump-default>\\u{FEFF}</span>m</span>" => "<span class=sf-dump-str title="5 characters">te<span class="sf-dump-default>\\u{FEFF}</span>st</span>"
   "<span class=sf-dump-key>[]</span>" => []
   "<span class=sf-dump-key>res</span>" => <span class=sf-dump-note>stream resource</span> <a class=sf-dump-ref>@{$res}</a><samp data-depth=2 class=sf-dump-compact>
 %A  <span class=sf-dump-meta>wrapper_type</span>: "<span class=sf-dump-str title="9 characters">plainfile</span>"
diff --git a/src/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php b/src/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php
index fc48012f4d13f..3896f31026d67 100644
--- a/src/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php
+++ b/src/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\VarDumper\Tests\Fixture;
 
 if (!class_exists(\Symfony\Component\VarDumper\Tests\Fixture\DumbFoo::class)) {
@@ -17,8 +26,8 @@ class DumbFoo
 
 $var = [
     'number' => 1, null,
-    'const' => 1.1, true, false, NAN, INF, -INF, PHP_INT_MAX,
-    'str' => "déjà\n", "\xE9\x01test\t\ning",
+    'const' => 1.1, true, false, \NAN, \INF, -\INF, \PHP_INT_MAX,
+    'str' => "déjà\n", "\xE9\x01test\t\ning", "bo\u{feff}m" => "te\u{feff}st",
     '[]' => [],
     'res' => $g,
     'obj' => $foo,

From b377c121bf4b40c64ebeefb9b856a28b8c1910ed Mon Sep 17 00:00:00 2001
From: HypeMC <hypemc@gmail.com>
Date: Sat, 21 Jan 2023 14:00:36 +0100
Subject: [PATCH 166/475] [Serializer] Replace the
 MissingConstructorArgumentsException class with
 MissingConstructorArgumentException

---
 .github/expected-missing-return-types.diff    |  2 +-
 UPGRADE-6.3.md                                |  5 +++
 src/Symfony/Component/Serializer/CHANGELOG.md |  1 +
 .../MissingConstructorArgumentException.php   | 41 +++++++++++++++++++
 .../MissingConstructorArgumentsException.php  | 10 +++++
 .../Normalizer/AbstractNormalizer.php         |  8 ++--
 .../Normalizer/AbstractObjectNormalizer.php   |  6 +--
 .../ConstructorArgumentsTestTrait.php         | 13 ++++--
 8 files changed, 74 insertions(+), 12 deletions(-)
 create mode 100644 src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentException.php

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index c248018a4b9f6..22d5cf09bcf22 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -929,7 +929,7 @@ index 12c778cb80..4ad55fb3e1 100644
      {
          $ignoredAttributes = $context[self::IGNORED_ATTRIBUTES] ?? $this->defaultContext[self::IGNORED_ATTRIBUTES];
 @@ -311,5 +311,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
-      * @throws MissingConstructorArgumentsException
+      * @throws MissingConstructorArgumentException
       */
 -    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null)
 +    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object
diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 89caa851669a4..9b9918aec2116 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -66,3 +66,8 @@ Validator
 ---------
 
  * Implementing the `ConstraintViolationInterface` without implementing the `getConstraint()` method is deprecated
+
+Serializer
+----------
+
+ * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
index d7799bb50236f..19eaa6a9cb8a4 100644
--- a/src/Symfony/Component/Serializer/CHANGELOG.md
+++ b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add `XmlEncoder::SAVE_OPTIONS` context option
+ * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
 
 6.2
 ---
diff --git a/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentException.php b/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentException.php
new file mode 100644
index 0000000000000..3fdfaf605869e
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentException.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+class MissingConstructorArgumentException extends MissingConstructorArgumentsException
+{
+    private string $class;
+    private string $missingArgument;
+
+    /**
+     * @param class-string $class
+     */
+    public function __construct(string $class, string $missingArgument, int $code = 0, \Throwable $previous = null)
+    {
+        $this->class = $class;
+        $this->missingArgument = $missingArgument;
+
+        $message = sprintf('Cannot create an instance of "%s" from serialized data because its constructor requires parameter "%s" to be present.', $class, $missingArgument);
+
+        parent::__construct($message, $code, $previous, [$missingArgument]);
+    }
+
+    public function getClass(): string
+    {
+        return $this->class;
+    }
+
+    public function getMissingArgument(): string
+    {
+        return $this->missingArgument;
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentsException.php b/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentsException.php
index fe984a291f074..a5a71d00cf62a 100644
--- a/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentsException.php
+++ b/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentsException.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Serializer\Exception;
 
 /**
+ * @deprecated since Symfony 6.3, use {@see MissingConstructorArgumentException} instead
+ *
  * @author Maxime VEBER <maxime.veber@nekland.fr>
  */
 class MissingConstructorArgumentsException extends RuntimeException
@@ -23,16 +25,24 @@ class MissingConstructorArgumentsException extends RuntimeException
 
     public function __construct(string $message, int $code = 0, \Throwable $previous = null, array $missingArguments = [])
     {
+        if (!$this instanceof MissingConstructorArgumentException) {
+            trigger_deprecation('symfony/serializer', '6.3', 'The "%s" class is deprecated, use "%s" instead.', __CLASS__, MissingConstructorArgumentException::class);
+        }
+
         $this->missingArguments = $missingArguments;
 
         parent::__construct($message, $code, $previous);
     }
 
     /**
+     * @deprecated since Symfony 6.3, use {@see MissingConstructorArgumentException::getMissingArgument()} instead
+     *
      * @return string[]
      */
     public function getMissingConstructorArguments(): array
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "%s::getMissingArgument()" instead.', __METHOD__, MissingConstructorArgumentException::class);
+
         return $this->missingArguments;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
index 829e178407bd2..52e985815bf99 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Serializer\Exception\CircularReferenceException;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Exception\MissingConstructorArgumentsException;
+use Symfony\Component\Serializer\Exception\MissingConstructorArgumentException;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Exception\RuntimeException;
 use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
@@ -308,7 +308,7 @@ protected function getConstructor(array &$data, string $class, array &$context,
      * @return object
      *
      * @throws RuntimeException
-     * @throws MissingConstructorArgumentsException
+     * @throws MissingConstructorArgumentException
      */
     protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null)
     {
@@ -381,7 +381,7 @@ protected function instantiateObject(array &$data, string $class, array &$contex
                     $params[] = null;
                 } else {
                     if (!isset($context['not_normalizable_value_exceptions'])) {
-                        throw new MissingConstructorArgumentsException(sprintf('Cannot create an instance of "%s" from serialized data because its constructor requires parameter "%s" to be present.', $class, $constructorParameter->name), 0, null, [$constructorParameter->name]);
+                        throw new MissingConstructorArgumentException($class, $constructorParameter->name);
                     }
 
                     $exception = NotNormalizableValueException::createForUnexpectedDataType(
@@ -425,7 +425,7 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara
             }
         } catch (\ReflectionException $e) {
             throw new RuntimeException(sprintf('Could not determine the class of the parameter "%s".', $parameterName), 0, $e);
-        } catch (MissingConstructorArgumentsException $e) {
+        } catch (MissingConstructorArgumentException $e) {
             if (!$parameter->getType()->allowsNull()) {
                 throw $e;
             }
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 7c4c5fb41bd49..4a02c05a80fef 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -22,7 +22,7 @@
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
 use Symfony\Component\Serializer\Exception\ExtraAttributesException;
 use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Exception\MissingConstructorArgumentsException;
+use Symfony\Component\Serializer\Exception\MissingConstructorArgumentException;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
@@ -417,7 +417,7 @@ abstract protected function setAttributeValue(object $object, string $attribute,
      *
      * @throws NotNormalizableValueException
      * @throws ExtraAttributesException
-     * @throws MissingConstructorArgumentsException
+     * @throws MissingConstructorArgumentException
      * @throws LogicException
      */
     private function validateAndDenormalize(array $types, string $currentClass, string $attribute, mixed $data, ?string $format, array $context): mixed
@@ -565,7 +565,7 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
                 }
 
                 $extraAttributesException ??= $e;
-            } catch (MissingConstructorArgumentsException $e) {
+            } catch (MissingConstructorArgumentException $e) {
                 if (!$isUnionType) {
                     throw $e;
                 }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php
index 306c571f9c59d..9489136be2cb9 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Serializer\Tests\Normalizer\Features;
 
-use Symfony\Component\Serializer\Exception\MissingConstructorArgumentsException;
+use Symfony\Component\Serializer\Exception\MissingConstructorArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Tests\Fixtures\NotSerializedConstructorArgumentDummy;
 
@@ -63,8 +63,13 @@ public function testConstructorWithMissingData()
 
         $normalizer = $this->getDenormalizerForConstructArguments();
 
-        $this->expectException(MissingConstructorArgumentsException::class);
-        $this->expectExceptionMessage('Cannot create an instance of "'.ConstructorArgumentsObject::class.'" from serialized data because its constructor requires parameter "bar" to be present.');
-        $normalizer->denormalize($data, ConstructorArgumentsObject::class);
+        try {
+            $normalizer->denormalize($data, ConstructorArgumentsObject::class);
+            self::fail(sprintf('Failed asserting that exception of type "%s" is thrown.', MissingConstructorArgumentException::class));
+        } catch (MissingConstructorArgumentException $e) {
+            self::assertSame(sprintf('Cannot create an instance of "%s" from serialized data because its constructor requires parameter "bar" to be present.', ConstructorArgumentsObject::class), $e->getMessage());
+            self::assertSame(ConstructorArgumentsObject::class, $e->getClass());
+            self::assertSame('bar', $e->getMissingArgument());
+        }
     }
 }

From b2b0a751c736207c552d3bec53328800fa365d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= <gabriel.ostrolucky@gmail.com>
Date: Fri, 27 Jan 2023 08:53:39 +0100
Subject: [PATCH 167/475] Utilize shivammathur/setup-php to install Relay
 extension

This is possible since https://github.com/shivammathur/setup-php/releases/tag/2.24.0
---
 .github/workflows/integration-tests.yml | 10 +---------
 .github/workflows/psalm.yml             | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 618763da4544e..b9e050206afe6 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -134,19 +134,11 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           coverage: "none"
-          extensions: "json,couchbase-3.2.2,memcached,mongodb-1.12.0,redis,rdkafka,xsl,ldap,msgpack,igbinary"
+          extensions: "json,couchbase-3.2.2,memcached,mongodb-1.12.0,redis,rdkafka,xsl,ldap,relay-dev"
           ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
           php-version: "${{ matrix.php }}"
           tools: pecl
 
-      - name: Install Relay
-        run: |
-          curl -L "https://builds.r2.relay.so/dev/relay-dev-php${{ matrix.php }}-debian-x86-64.tar.gz" | tar xz
-          cd relay-dev-php${{ matrix.php }}-debian-x86-64
-          sudo cp relay.ini $(php-config --ini-dir)
-          sudo cp relay-pkg.so $(php-config --extension-dir)/relay.so
-          sudo sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" $(php-config --extension-dir)/relay.so
-
       - name: Display versions
         run: |
           php -r 'foreach (get_loaded_extensions() as $extension) echo $extension . " " . phpversion($extension) . PHP_EOL;'
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index e4d8ccfe4c1b8..77c1006a718a0 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -24,18 +24,10 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.1'
-          extensions: "json,couchbase,memcached,mongodb,redis,xsl,ldap,dom"
+          extensions: "json,couchbase,memcached,mongodb,redis,xsl,ldap,dom,relay"
           ini-values: "memory_limit=-1"
           coverage: none
 
-      - name: Install Relay
-        run: |
-          curl -L "https://builds.r2.relay.so/dev/relay-dev-php8.1-debian-x86-64.tar.gz" | tar xz
-          cd relay-dev-php8.1-debian-x86-64
-          sudo cp relay.ini $(php-config --ini-dir)
-          sudo cp relay-pkg.so $(php-config --extension-dir)/relay.so
-          sudo sed -i "s/00000000-0000-0000-0000-000000000000/$(cat /proc/sys/kernel/random/uuid)/" $(php-config --extension-dir)/relay.so
-
       - name: Checkout target branch
         uses: actions/checkout@v3
         with:

From a4a1909cf4e9eef0c21092ef90f82bdda28c3b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= <gabriel.ostrolucky@gmail.com>
Date: Fri, 27 Jan 2023 18:49:45 +0100
Subject: [PATCH 168/475] CI: Use stable version of relay

---
 .github/workflows/integration-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index b9e050206afe6..623a74cd77248 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -134,7 +134,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           coverage: "none"
-          extensions: "json,couchbase-3.2.2,memcached,mongodb-1.12.0,redis,rdkafka,xsl,ldap,relay-dev"
+          extensions: "json,couchbase-3.2.2,memcached,mongodb-1.12.0,redis,rdkafka,xsl,ldap,relay"
           ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
           php-version: "${{ matrix.php }}"
           tools: pecl

From 9aded06c0cb5cf0b5c5cd98650a49f7cff55d60e Mon Sep 17 00:00:00 2001
From: Allison Guilhem <allison.guilhem@gmail.com>
Date: Tue, 24 Jan 2023 21:26:13 +0100
Subject: [PATCH 169/475] [HttpFoundation] inject SessionHandler in
 PdoSessionHandlerSchemaSubscriber

---
 .../PdoSessionHandlerSchemaSubscriber.php     | 20 ++++++++++---------
 .../PdoSessionHandlerSchemaSubscriberTest.php |  2 +-
 .../Storage/Handler/PdoSessionHandler.php     |  7 +++++--
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php
index a14a800cbb260..a2be4582bf421 100644
--- a/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php
@@ -16,22 +16,24 @@
 
 final class PdoSessionHandlerSchemaSubscriber extends AbstractSchemaSubscriber
 {
-    private iterable $pdoSessionHandlers;
+    private PdoSessionHandler $sessionHandler;
 
-    /**
-     * @param iterable<mixed, PdoSessionHandler> $pdoSessionHandlers
-     */
-    public function __construct(iterable $pdoSessionHandlers)
+    public function __construct(\SessionHandlerInterface $sessionHandler)
     {
-        $this->pdoSessionHandlers = $pdoSessionHandlers;
+        if ($sessionHandler instanceof PdoSessionHandler) {
+            $this->sessionHandler = $sessionHandler;
+        }
+    }
+
+    public function getSubscribedEvents(): array
+    {
+        return isset($this->sessionHandler) ? parent::getSubscribedEvents() : [];
     }
 
     public function postGenerateSchema(GenerateSchemaEventArgs $event): void
     {
         $connection = $event->getEntityManager()->getConnection();
 
-        foreach ($this->pdoSessionHandlers as $pdoSessionHandler) {
-            $pdoSessionHandler->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));
-        }
+        $this->sessionHandler->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php
index 0e1f743803526..627848c0bcc0a 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php
@@ -36,7 +36,7 @@ public function testPostGenerateSchemaPdo()
             ->method('configureSchema')
             ->with($schema, fn () => true);
 
-        $subscriber = new PdoSessionHandlerSchemaSubscriber([$pdoSessionHandler]);
+        $subscriber = new PdoSessionHandlerSchemaSubscriber($pdoSessionHandler);
         $subscriber->postGenerateSchema($event);
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
index 84b3e336fbdd2..d6e60a729e7ec 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -178,9 +178,12 @@ public function __construct(#[\SensitiveParameter] \PDO|string $pdoOrDsn = null,
         $this->ttl = $options['ttl'] ?? null;
     }
 
-    public function configureSchema(Schema $schema, \Closure $isSameDatabase): void
+    /**
+     * Adds the Table to the Schema if it doesn't exist.
+     */
+    public function configureSchema(Schema $schema, \Closure $isSameDatabase = null): void
     {
-        if ($schema->hasTable($this->table) || !$isSameDatabase($this->getConnection()->exec(...))) {
+        if ($schema->hasTable($this->table) || ($isSameDatabase && !$isSameDatabase($this->getConnection()->exec(...)))) {
             return;
         }
 

From 1a67728665332d39c1fc9cbbbde2da8b4cb90778 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 31 Jan 2023 18:55:36 +0100
Subject: [PATCH 170/475] [HttpFoundation] Fix defining expiry index in
 PdoSessionHandler::configureSchema()

---
 .../Session/Storage/Handler/PdoSessionHandler.php              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
index d6e60a729e7ec..bc7b22850d8ca 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -225,6 +225,7 @@ public function configureSchema(Schema $schema, \Closure $isSameDatabase = null)
                 throw new \DomainException(sprintf('Creating the session table is currently not implemented for PDO driver "%s".', $this->driver));
         }
         $table->setPrimaryKey([$this->idCol]);
+        $table->addIndex([$this->lifetimeCol], $this->lifetimeCol.'_idx');
     }
 
     /**
@@ -259,7 +260,7 @@ public function createTable()
 
         try {
             $this->pdo->exec($sql);
-            $this->pdo->exec("CREATE INDEX expiry ON $this->table ($this->lifetimeCol)");
+            $this->pdo->exec("CREATE INDEX {$this->lifetimeCol}_idx ON $this->table ($this->lifetimeCol)");
         } catch (\PDOException $e) {
             $this->rollback();
 

From 4fcb8b50df91b6039be0a404162e6f8ff2300e86 Mon Sep 17 00:00:00 2001
From: Alexis Lefebvre <alexislefebvre+github@gmail.com>
Date: Tue, 31 Jan 2023 23:27:15 +0100
Subject: [PATCH 171/475] remove unused parameter transitionId in MermaidDumper

---
 src/Symfony/Component/Workflow/Dumper/MermaidDumper.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Symfony/Component/Workflow/Dumper/MermaidDumper.php b/src/Symfony/Component/Workflow/Dumper/MermaidDumper.php
index da11298ec9fe8..27b8dd0f4ea09 100644
--- a/src/Symfony/Component/Workflow/Dumper/MermaidDumper.php
+++ b/src/Symfony/Component/Workflow/Dumper/MermaidDumper.php
@@ -105,7 +105,6 @@ public function dump(Definition $definition, Marking $marking = null, array $opt
                         $transitionOutput = $this->styleStatemachineTransition(
                             $from,
                             $to,
-                            $transitionId,
                             $transitionLabel,
                             $transitionMeta
                         );
@@ -211,7 +210,6 @@ private function validateTransitionType(string $transitionType): void
     private function styleStatemachineTransition(
         string $from,
         string $to,
-        int $transitionId,
         string $transitionLabel,
         array $transitionMeta
     ): array {

From f3ab66e0b3e83da459003fe081ab3aca8c0a023c Mon Sep 17 00:00:00 2001
From: Dane Powell <git@danepowell.com>
Date: Sat, 14 Jan 2023 10:09:00 -0800
Subject: [PATCH 172/475] [Console] Add ReStructuredText descriptor

---
 src/Symfony/Component/Console/CHANGELOG.md    |   1 +
 .../Descriptor/ReStructuredTextDescriptor.php | 272 ++++++++++++++++++
 .../Console/Helper/DescriptorHelper.php       |   2 +
 .../Console/Tests/Command/HelpCommandTest.php |   2 +-
 .../Console/Tests/Command/ListCommandTest.php |   2 +-
 .../ReStructuredTextDescriptorTest.php        |  45 +++
 .../Console/Tests/Fixtures/application_1.rst  | 135 +++++++++
 .../Console/Tests/Fixtures/application_2.rst  | 216 ++++++++++++++
 .../Tests/Fixtures/application_mbstring.rst   | 178 ++++++++++++
 .../Console/Tests/Fixtures/command_1.rst      |  17 ++
 .../Console/Tests/Fixtures/command_2.rst      |  30 ++
 .../Tests/Fixtures/command_mbstring.rst       |  30 ++
 .../Tests/Fixtures/input_argument_1.rst       |   1 +
 .../Tests/Fixtures/input_argument_2.rst       |   1 +
 .../Tests/Fixtures/input_argument_3.rst       |   1 +
 .../Tests/Fixtures/input_argument_4.rst       |   1 +
 .../input_argument_with_default_inf_value.rst |   1 +
 .../Fixtures/input_argument_with_style.rst    |   1 +
 .../Tests/Fixtures/input_definition_1.rst     |   0
 .../Tests/Fixtures/input_definition_2.rst     |   4 +
 .../Tests/Fixtures/input_definition_3.rst     |  11 +
 .../Tests/Fixtures/input_definition_4.rst     |  16 ++
 .../Console/Tests/Fixtures/input_option_1.rst |   8 +
 .../Console/Tests/Fixtures/input_option_2.rst |  10 +
 .../Console/Tests/Fixtures/input_option_3.rst |  10 +
 .../Console/Tests/Fixtures/input_option_4.rst |  10 +
 .../Console/Tests/Fixtures/input_option_5.rst |  12 +
 .../Console/Tests/Fixtures/input_option_6.rst |  10 +
 .../input_option_with_default_inf_value.rst   |  10 +
 .../Fixtures/input_option_with_style.rst      |  10 +
 .../input_option_with_style_array.rst         |  10 +
 .../Tests/Helper/DescriptorHelperTest.php     |   1 +
 32 files changed, 1056 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Descriptor/ReStructuredTextDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/ReStructuredTextDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_1.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_2.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_mbstring.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_1.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_2.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_mbstring.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_4.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_default_inf_value.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_1.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_2.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_3.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_4.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_5.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_6.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_with_default_inf_value.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.rst
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.rst

diff --git a/src/Symfony/Component/Console/CHANGELOG.md b/src/Symfony/Component/Console/CHANGELOG.md
index 0e010fae62ef0..ac55afccd0701 100644
--- a/src/Symfony/Component/Console/CHANGELOG.md
+++ b/src/Symfony/Component/Console/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Remove `exit` call in `Application` signal handlers. Commands will no longer be automatically interrupted after receiving signal other than `SIGUSR1` or `SIGUSR2`
  * Add `ProgressBar::setPlaceholderFormatter` to set a placeholder attached to a instance, instead of being global.
+ * Add `ReStructuredTextDescriptor`
 
 6.2
 ---
diff --git a/src/Symfony/Component/Console/Descriptor/ReStructuredTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/ReStructuredTextDescriptor.php
new file mode 100644
index 0000000000000..d4423fd3483ea
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/ReStructuredTextDescriptor.php
@@ -0,0 +1,272 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\Helper;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\String\UnicodeString;
+
+class ReStructuredTextDescriptor extends Descriptor
+{
+    // <h1>
+    private string $partChar = '=';
+    // <h2>
+    private string $chapterChar = '-';
+    // <h3>
+    private string $sectionChar = '~';
+    // <h4>
+    private string $subsectionChar = '.';
+    // <h5>
+    private string $subsubsectionChar = '^';
+    // <h6>
+    private string $paragraphsChar = '"';
+
+    private array $visibleNamespaces = [];
+
+    public function describe(OutputInterface $output, object $object, array $options = []): void
+    {
+        $decorated = $output->isDecorated();
+        $output->setDecorated(false);
+
+        parent::describe($output, $object, $options);
+
+        $output->setDecorated($decorated);
+    }
+
+    /**
+     * Override parent method to set $decorated = true.
+     */
+    protected function write(string $content, bool $decorated = true): void
+    {
+        parent::write($content, $decorated);
+    }
+
+    protected function describeInputArgument(InputArgument $argument, array $options = []): void
+    {
+        $this->write(
+            $argument->getName() ?: '<none>'."\n".str_repeat($this->paragraphsChar, Helper::width($argument->getName()))."\n\n"
+                .($argument->getDescription() ? preg_replace('/\s*[\r\n]\s*/', "\n", $argument->getDescription())."\n\n" : '')
+                .'- **Is required**: '.($argument->isRequired() ? 'yes' : 'no')."\n"
+                .'- **Is array**: '.($argument->isArray() ? 'yes' : 'no')."\n"
+                .'- **Default**: ``'.str_replace("\n", '', var_export($argument->getDefault(), true)).'``'
+        );
+    }
+
+    protected function describeInputOption(InputOption $option, array $options = []): void
+    {
+        $name = '\-\-'.$option->getName();
+        if ($option->isNegatable()) {
+            $name .= '|\-\-no-'.$option->getName();
+        }
+        if ($option->getShortcut()) {
+            $name .= '|-'.str_replace('|', '|-', $option->getShortcut());
+        }
+
+        $optionDescription = $option->getDescription() ? preg_replace('/\s*[\r\n]\s*/', "\n\n", $option->getDescription())."\n\n" : '';
+        $optionDescription = (new UnicodeString($optionDescription))->ascii();
+        $this->write(
+            $name."\n".str_repeat($this->paragraphsChar, Helper::width($name))."\n\n"
+            .$optionDescription
+            .'- **Accept value**: '.($option->acceptValue() ? 'yes' : 'no')."\n"
+            .'- **Is value required**: '.($option->isValueRequired() ? 'yes' : 'no')."\n"
+            .'- **Is multiple**: '.($option->isArray() ? 'yes' : 'no')."\n"
+            .'- **Is negatable**: '.($option->isNegatable() ? 'yes' : 'no')."\n"
+            .'- **Default**: ``'.str_replace("\n", '', var_export($option->getDefault(), true)).'``'."\n"
+        );
+    }
+
+    protected function describeInputDefinition(InputDefinition $definition, array $options = []): void
+    {
+        if ($showArguments = ((bool) $definition->getArguments())) {
+            $this->write("Arguments\n".str_repeat($this->subsubsectionChar, 9))."\n\n";
+            foreach ($definition->getArguments() as $argument) {
+                $this->write("\n\n");
+                $this->describeInputArgument($argument);
+            }
+        }
+
+        if ($nonDefaultOptions = $this->getNonDefaultOptions($definition)) {
+            if ($showArguments) {
+                $this->write("\n\n");
+            }
+
+            $this->write("Options\n".str_repeat($this->subsubsectionChar, 7)."\n\n");
+            foreach ($nonDefaultOptions as $option) {
+                $this->describeInputOption($option);
+                $this->write("\n");
+            }
+        }
+    }
+
+    protected function describeCommand(Command $command, array $options = []): void
+    {
+        if ($options['short'] ?? false) {
+            $this->write(
+                '``'.$command->getName()."``\n"
+                .str_repeat($this->subsectionChar, Helper::width($command->getName()))."\n\n"
+                .($command->getDescription() ? $command->getDescription()."\n\n" : '')
+                ."Usage\n".str_repeat($this->paragraphsChar, 5)."\n\n"
+                .array_reduce($command->getAliases(), static fn ($carry, $usage) => $carry.'- ``'.$usage.'``'."\n")
+            );
+
+            return;
+        }
+
+        $command->mergeApplicationDefinition(false);
+
+        foreach ($command->getAliases() as $alias) {
+            $this->write('.. _'.$alias.":\n\n");
+        }
+        $this->write(
+            $command->getName()."\n"
+            .str_repeat($this->subsectionChar, Helper::width($command->getName()))."\n\n"
+            .($command->getDescription() ? $command->getDescription()."\n\n" : '')
+            ."Usage\n".str_repeat($this->subsubsectionChar, 5)."\n\n"
+            .array_reduce(array_merge([$command->getSynopsis()], $command->getAliases(), $command->getUsages()), static fn ($carry, $usage) => $carry.'- ``'.$usage.'``'."\n")
+        );
+
+        if ($help = $command->getProcessedHelp()) {
+            $this->write("\n");
+            $this->write($help);
+        }
+
+        $definition = $command->getDefinition();
+        if ($definition->getOptions() || $definition->getArguments()) {
+            $this->write("\n\n");
+            $this->describeInputDefinition($definition);
+        }
+    }
+
+    protected function describeApplication(Application $application, array $options = []): void
+    {
+        $description = new ApplicationDescription($application, $options['namespace'] ?? null);
+        $title = $this->getApplicationTitle($application);
+
+        $this->write($title."\n".str_repeat($this->partChar, Helper::width($title)));
+        $this->createTableOfContents($description, $application);
+        $this->describeCommands($application, $options);
+    }
+
+    private function getApplicationTitle(Application $application): string
+    {
+        if ('UNKNOWN' === $application->getName()) {
+            return 'Console Tool';
+        }
+        if ('UNKNOWN' !== $application->getVersion()) {
+            return sprintf('%s %s', $application->getName(), $application->getVersion());
+        }
+
+        return $application->getName();
+    }
+
+    private function describeCommands($application, array $options): void
+    {
+        $title = 'Commands';
+        $this->write("\n\n$title\n".str_repeat($this->chapterChar, Helper::width($title))."\n\n");
+        foreach ($this->visibleNamespaces as $namespace) {
+            if ('_global' === $namespace) {
+                $commands = $application->all('');
+                $this->write('Global'."\n".str_repeat($this->sectionChar, Helper::width('Global'))."\n\n");
+            } else {
+                $commands = $application->all($namespace);
+                $this->write($namespace."\n".str_repeat($this->sectionChar, Helper::width($namespace))."\n\n");
+            }
+
+            foreach ($this->removeAliasesAndHiddenCommands($commands) as $command) {
+                $this->describeCommand($command, $options);
+                $this->write("\n\n");
+            }
+        }
+    }
+
+    private function createTableOfContents(ApplicationDescription $description, Application $application): void
+    {
+        $this->setVisibleNamespaces($description);
+        $chapterTitle = 'Table of Contents';
+        $this->write("\n\n$chapterTitle\n".str_repeat($this->chapterChar, Helper::width($chapterTitle))."\n\n");
+        foreach ($this->visibleNamespaces as $namespace) {
+            if ('_global' === $namespace) {
+                $commands = $application->all('');
+            } else {
+                $commands = $application->all($namespace);
+                $this->write("\n\n");
+                $this->write($namespace."\n".str_repeat($this->sectionChar, Helper::width($namespace))."\n\n");
+            }
+            $commands = $this->removeAliasesAndHiddenCommands($commands);
+
+            $this->write("\n\n");
+            $this->write(implode("\n", array_map(static fn ($commandName) => sprintf('- `%s`_', $commandName), array_keys($commands))));
+        }
+    }
+
+    private function getNonDefaultOptions(InputDefinition $definition): array
+    {
+        $globalOptions = [
+            'help',
+            'quiet',
+            'verbose',
+            'version',
+            'ansi',
+            'no-interaction',
+        ];
+        $nonDefaultOptions = [];
+        foreach ($definition->getOptions() as $option) {
+            // Skip global options.
+            if (!\in_array($option->getName(), $globalOptions)) {
+                $nonDefaultOptions[] = $option;
+            }
+        }
+
+        return $nonDefaultOptions;
+    }
+
+    private function setVisibleNamespaces(ApplicationDescription $description): void
+    {
+        $commands = $description->getCommands();
+        foreach ($description->getNamespaces() as $namespace) {
+            try {
+                $namespaceCommands = $namespace['commands'];
+                foreach ($namespaceCommands as $key => $commandName) {
+                    if (!\array_key_exists($commandName, $commands)) {
+                        // If the array key does not exist, then this is an alias.
+                        unset($namespaceCommands[$key]);
+                    } elseif ($commands[$commandName]->isHidden()) {
+                        unset($namespaceCommands[$key]);
+                    }
+                }
+                if (!$namespaceCommands) {
+                    // If the namespace contained only aliases or hidden commands, skip the namespace.
+                    continue;
+                }
+            } catch (\Exception) {
+            }
+            $this->visibleNamespaces[] = $namespace['id'];
+        }
+    }
+
+    private function removeAliasesAndHiddenCommands(array $commands): array
+    {
+        foreach ($commands as $key => $command) {
+            if ($command->isHidden() || \in_array($key, $command->getAliases(), true)) {
+                unset($commands[$key]);
+            }
+        }
+        unset($commands['completion']);
+
+        return $commands;
+    }
+}
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index 3015ff08d2c04..7189ff446e5d7 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Console\Descriptor\DescriptorInterface;
 use Symfony\Component\Console\Descriptor\JsonDescriptor;
 use Symfony\Component\Console\Descriptor\MarkdownDescriptor;
+use Symfony\Component\Console\Descriptor\ReStructuredTextDescriptor;
 use Symfony\Component\Console\Descriptor\TextDescriptor;
 use Symfony\Component\Console\Descriptor\XmlDescriptor;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
@@ -38,6 +39,7 @@ public function __construct()
             ->register('xml', new XmlDescriptor())
             ->register('json', new JsonDescriptor())
             ->register('md', new MarkdownDescriptor())
+            ->register('rst', new ReStructuredTextDescriptor())
         ;
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
index 0e8a7f4f7fd1a..4fed2303a9426 100644
--- a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
@@ -87,7 +87,7 @@ public function provideCompletionSuggestions()
     {
         yield 'option --format' => [
             ['--format', ''],
-            ['txt', 'xml', 'json', 'md'],
+            ['txt', 'xml', 'json', 'md', 'rst'],
         ];
 
         yield 'nothing' => [
diff --git a/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php b/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php
index 0f78cf7ee3202..bb7520feade07 100644
--- a/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php
@@ -131,7 +131,7 @@ public function provideCompletionSuggestions()
     {
         yield 'option --format' => [
             ['--format', ''],
-            ['txt', 'xml', 'json', 'md'],
+            ['txt', 'xml', 'json', 'md', 'rst'],
         ];
 
         yield 'namespace' => [
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/ReStructuredTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/ReStructuredTextDescriptorTest.php
new file mode 100644
index 0000000000000..6179b1760d808
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/ReStructuredTextDescriptorTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor;
+
+use Symfony\Component\Console\Descriptor\ReStructuredTextDescriptor;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorApplicationMbString;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorCommandMbString;
+
+class ReStructuredTextDescriptorTest extends AbstractDescriptorTest
+{
+    public function getDescribeCommandTestData()
+    {
+        return $this->getDescriptionTestData(array_merge(
+            ObjectsProvider::getCommands(),
+            ['command_mbstring' => new DescriptorCommandMbString()]
+        ));
+    }
+
+    public function getDescribeApplicationTestData()
+    {
+        return $this->getDescriptionTestData(array_merge(
+            ObjectsProvider::getApplications(),
+            ['application_mbstring' => new DescriptorApplicationMbString()]
+        ));
+    }
+
+    protected function getDescriptor()
+    {
+        return new ReStructuredTextDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'rst';
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.rst b/src/Symfony/Component/Console/Tests/Fixtures/application_1.rst
new file mode 100644
index 0000000000000..5da38d0ff8dc0
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.rst
@@ -0,0 +1,135 @@
+Console Tool
+============
+
+Table of Contents
+-----------------
+
+
+
+- `help`_
+- `list`_
+
+Commands
+--------
+
+Global
+~~~~~~
+
+help
+....
+
+Display help for a command
+
+Usage
+^^^^^
+
+- ``help [--format FORMAT] [--raw] [--] [<command_name>]``
+
+The help command displays help for a given command:
+
+  %%PHP_SELF%% help list
+
+You can also output the help in other formats by using the --format option:
+
+  %%PHP_SELF%% help --format=xml list
+
+To display the list of available commands, please use the list command.
+
+Arguments
+^^^^^^^^^
+
+command_name
+
+Options
+^^^^^^^
+
+\-\-format
+""""""""""
+
+The output format (txt, xml, json, or md)
+
+- **Accept value**: yes
+- **Is value required**: yes
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``'txt'``
+
+\-\-raw
+"""""""
+
+To output raw command help
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
+
+
+
+list
+....
+
+List commands
+
+Usage
+^^^^^
+
+- ``list [--raw] [--format FORMAT] [--short] [--] [<namespace>]``
+
+The list command lists all commands:
+
+  %%PHP_SELF%% list
+
+You can also display the commands for a specific namespace:
+
+  %%PHP_SELF%% list test
+
+You can also output the information in other formats by using the --format option:
+
+  %%PHP_SELF%% list --format=xml
+
+It's also possible to get raw list of commands (useful for embedding command runner):
+
+  %%PHP_SELF%% list --raw
+
+Arguments
+^^^^^^^^^
+
+namespace
+
+Options
+^^^^^^^
+
+\-\-raw
+"""""""
+
+To output raw command list
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
+
+\-\-format
+""""""""""
+
+The output format (txt, xml, json, or md)
+
+- **Accept value**: yes
+- **Is value required**: yes
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``'txt'``
+
+\-\-short
+"""""""""
+
+To skip describing commands' arguments
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.rst b/src/Symfony/Component/Console/Tests/Fixtures/application_2.rst
new file mode 100644
index 0000000000000..6426b62bd0428
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.rst
@@ -0,0 +1,216 @@
+My Symfony application v1.0
+===========================
+
+Table of Contents
+-----------------
+
+
+
+- `help`_
+- `list`_
+
+descriptor
+~~~~~~~~~~
+
+
+
+- `descriptor:command1`_
+- `descriptor:command2`_
+- `descriptor:command4`_
+
+Commands
+--------
+
+Global
+~~~~~~
+
+help
+....
+
+Display help for a command
+
+Usage
+^^^^^
+
+- ``help [--format FORMAT] [--raw] [--] [<command_name>]``
+
+The help command displays help for a given command:
+
+  %%PHP_SELF%% help list
+
+You can also output the help in other formats by using the --format option:
+
+  %%PHP_SELF%% help --format=xml list
+
+To display the list of available commands, please use the list command.
+
+Arguments
+^^^^^^^^^
+
+command_name
+
+Options
+^^^^^^^
+
+\-\-format
+""""""""""
+
+The output format (txt, xml, json, or md)
+
+- **Accept value**: yes
+- **Is value required**: yes
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``'txt'``
+
+\-\-raw
+"""""""
+
+To output raw command help
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
+
+
+
+list
+....
+
+List commands
+
+Usage
+^^^^^
+
+- ``list [--raw] [--format FORMAT] [--short] [--] [<namespace>]``
+
+The list command lists all commands:
+
+  %%PHP_SELF%% list
+
+You can also display the commands for a specific namespace:
+
+  %%PHP_SELF%% list test
+
+You can also output the information in other formats by using the --format option:
+
+  %%PHP_SELF%% list --format=xml
+
+It's also possible to get raw list of commands (useful for embedding command runner):
+
+  %%PHP_SELF%% list --raw
+
+Arguments
+^^^^^^^^^
+
+namespace
+
+Options
+^^^^^^^
+
+\-\-raw
+"""""""
+
+To output raw command list
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
+
+\-\-format
+""""""""""
+
+The output format (txt, xml, json, or md)
+
+- **Accept value**: yes
+- **Is value required**: yes
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``'txt'``
+
+\-\-short
+"""""""""
+
+To skip describing commands' arguments
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
+
+
+
+descriptor
+~~~~~~~~~~
+
+.. _alias1:
+
+.. _alias2:
+
+descriptor:command1
+...................
+
+command 1 description
+
+Usage
+^^^^^
+
+- ``descriptor:command1``
+- ``alias1``
+- ``alias2``
+
+command 1 help
+
+
+
+descriptor:command2
+...................
+
+command 2 description
+
+Usage
+^^^^^
+
+- ``descriptor:command2 [-o|--option_name] [--] <argument_name>``
+- ``descriptor:command2 -o|--option_name <argument_name>``
+- ``descriptor:command2 <argument_name>``
+
+command 2 help
+
+Arguments
+^^^^^^^^^
+
+argument_name
+
+Options
+^^^^^^^
+
+\-\-option_name|-o
+""""""""""""""""""
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
+
+
+
+.. _descriptor:alias_command4:
+
+.. _command4:descriptor:
+
+descriptor:command4
+...................
+
+Usage
+^^^^^
+
+- ``descriptor:command4``
+- ``descriptor:alias_command4``
+- ``command4:descriptor``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_mbstring.rst b/src/Symfony/Component/Console/Tests/Fixtures/application_mbstring.rst
new file mode 100644
index 0000000000000..3ea1ebfd50f23
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_mbstring.rst
@@ -0,0 +1,178 @@
+MbString åpplicätion
+====================
+
+Table of Contents
+-----------------
+
+
+
+- `help`_
+- `list`_
+
+descriptor
+~~~~~~~~~~
+
+
+
+- `descriptor:åèä`_
+
+Commands
+--------
+
+Global
+~~~~~~
+
+help
+....
+
+Display help for a command
+
+Usage
+^^^^^
+
+- ``help [--format FORMAT] [--raw] [--] [<command_name>]``
+
+The help command displays help for a given command:
+
+  %%PHP_SELF%% help list
+
+You can also output the help in other formats by using the --format option:
+
+  %%PHP_SELF%% help --format=xml list
+
+To display the list of available commands, please use the list command.
+
+Arguments
+^^^^^^^^^
+
+command_name
+
+Options
+^^^^^^^
+
+\-\-format
+""""""""""
+
+The output format (txt, xml, json, or md)
+
+- **Accept value**: yes
+- **Is value required**: yes
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``'txt'``
+
+\-\-raw
+"""""""
+
+To output raw command help
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
+
+
+
+list
+....
+
+List commands
+
+Usage
+^^^^^
+
+- ``list [--raw] [--format FORMAT] [--short] [--] [<namespace>]``
+
+The list command lists all commands:
+
+  %%PHP_SELF%% list
+
+You can also display the commands for a specific namespace:
+
+  %%PHP_SELF%% list test
+
+You can also output the information in other formats by using the --format option:
+
+  %%PHP_SELF%% list --format=xml
+
+It's also possible to get raw list of commands (useful for embedding command runner):
+
+  %%PHP_SELF%% list --raw
+
+Arguments
+^^^^^^^^^
+
+namespace
+
+Options
+^^^^^^^
+
+\-\-raw
+"""""""
+
+To output raw command list
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
+
+\-\-format
+""""""""""
+
+The output format (txt, xml, json, or md)
+
+- **Accept value**: yes
+- **Is value required**: yes
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``'txt'``
+
+\-\-short
+"""""""""
+
+To skip describing commands' arguments
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
+
+
+
+descriptor
+~~~~~~~~~~
+
+descriptor:åèä
+..............
+
+command åèä description
+
+Usage
+^^^^^
+
+- ``descriptor:åèä [-o|--option_åèä] [--] <argument_åèä>``
+- ``descriptor:åèä -o|--option_name <argument_name>``
+- ``descriptor:åèä <argument_name>``
+
+command åèä help
+
+Arguments
+^^^^^^^^^
+
+argument_åèä
+
+Options
+^^^^^^^
+
+\-\-option_åèä|-o
+"""""""""""""""""
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_1.rst b/src/Symfony/Component/Console/Tests/Fixtures/command_1.rst
new file mode 100644
index 0000000000000..a4d93a3dc22ce
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_1.rst
@@ -0,0 +1,17 @@
+.. _alias1:
+
+.. _alias2:
+
+descriptor:command1
+...................
+
+command 1 description
+
+Usage
+^^^^^
+
+- ``descriptor:command1``
+- ``alias1``
+- ``alias2``
+
+command 1 help
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_2.rst b/src/Symfony/Component/Console/Tests/Fixtures/command_2.rst
new file mode 100644
index 0000000000000..3744aad788e9e
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_2.rst
@@ -0,0 +1,30 @@
+descriptor:command2
+...................
+
+command 2 description
+
+Usage
+^^^^^
+
+- ``descriptor:command2 [-o|--option_name] [--] <argument_name>``
+- ``descriptor:command2 -o|--option_name <argument_name>``
+- ``descriptor:command2 <argument_name>``
+
+command 2 help
+
+Arguments
+^^^^^^^^^
+
+argument_name
+
+Options
+^^^^^^^
+
+\-\-option_name|-o
+""""""""""""""""""
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_mbstring.rst b/src/Symfony/Component/Console/Tests/Fixtures/command_mbstring.rst
new file mode 100644
index 0000000000000..d61163c2dda7c
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_mbstring.rst
@@ -0,0 +1,30 @@
+descriptor:åèä
+..............
+
+command åèä description
+
+Usage
+^^^^^
+
+- ``descriptor:åèä [-o|--option_åèä] [--] <argument_åèä>``
+- ``descriptor:åèä -o|--option_name <argument_name>``
+- ``descriptor:åèä <argument_name>``
+
+command åèä help
+
+Arguments
+^^^^^^^^^
+
+argument_åèä
+
+Options
+^^^^^^^
+
+\-\-option_åèä|-o
+"""""""""""""""""
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.rst
new file mode 100644
index 0000000000000..4db1cd215ae8a
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.rst
@@ -0,0 +1 @@
+argument_name
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.rst
new file mode 100644
index 0000000000000..4db1cd215ae8a
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.rst
@@ -0,0 +1 @@
+argume
10000
nt_name
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.rst
new file mode 100644
index 0000000000000..4db1cd215ae8a
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.rst
@@ -0,0 +1 @@
+argument_name
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_4.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_4.rst
new file mode 100644
index 0000000000000..4db1cd215ae8a
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_4.rst
@@ -0,0 +1 @@
+argument_name
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_default_inf_value.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_default_inf_value.rst
new file mode 100644
index 0000000000000..4db1cd215ae8a
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_default_inf_value.rst
@@ -0,0 +1 @@
+argument_name
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.rst
new file mode 100644
index 0000000000000..4db1cd215ae8a
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.rst
@@ -0,0 +1 @@
+argument_name
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.rst
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.rst
new file mode 100644
index 0000000000000..0f5b76018be27
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.rst
@@ -0,0 +1,4 @@
+Arguments
+^^^^^^^^^
+
+argument_name
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.rst
new file mode 100644
index 0000000000000..1a5e9b1ad04d5
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.rst
@@ -0,0 +1,11 @@
+Options
+^^^^^^^
+
+\-\-option_name|-o
+""""""""""""""""""
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.rst
new file mode 100644
index 0000000000000..1c65681ab0b4e
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.rst
@@ -0,0 +1,16 @@
+Arguments
+^^^^^^^^^
+
+argument_name
+
+Options
+^^^^^^^
+
+\-\-option_name|-o
+""""""""""""""""""
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.rst
new file mode 100644
index 0000000000000..93662791f33a1
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.rst
@@ -0,0 +1,8 @@
+\-\-option_name|-o
+""""""""""""""""""
+
+- **Accept value**: no
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``false``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.rst
new file mode 100644
index 0000000000000..0a8a14c66638a
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.rst
@@ -0,0 +1,10 @@
+\-\-option_name|-o
+""""""""""""""""""
+
+option description
+
+- **Accept value**: yes
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``'default_value'``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.rst
new file mode 100644
index 0000000000000..45374910c15f8
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.rst
@@ -0,0 +1,10 @@
+\-\-option_name|-o
+""""""""""""""""""
+
+option description
+
+- **Accept value**: yes
+- **Is value required**: yes
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``NULL``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.rst
new file mode 100644
index 0000000000000..fe81fc1fe9355
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.rst
@@ -0,0 +1,10 @@
+\-\-option_name|-o
+""""""""""""""""""
+
+option description
+
+- **Accept value**: yes
+- **Is value required**: no
+- **Is multiple**: yes
+- **Is negatable**: no
+- **Default**: ``array ()``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_5.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_option_5.rst
new file mode 100644
index 0000000000000..c2b6a4cd70948
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_5.rst
@@ -0,0 +1,12 @@
+\-\-option_name|-o
+""""""""""""""""""
+
+multiline
+
+option description
+
+- **Accept value**: yes
+- **Is value required**: yes
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``NULL``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_6.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_option_6.rst
new file mode 100644
index 0000000000000..748cad7202252
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_6.rst
@@ -0,0 +1,10 @@
+\-\-option_name|-o|-O
+"""""""""""""""""""""
+
+option with multiple shortcuts
+
+- **Accept value**: yes
+- **Is value required**: yes
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``NULL``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_default_inf_value.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_default_inf_value.rst
new file mode 100644
index 0000000000000..8a99db1babeb4
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_default_inf_value.rst
@@ -0,0 +1,10 @@
+\-\-option_name|-o
+""""""""""""""""""
+
+option description
+
+- **Accept value**: yes
+- **Is value required**: no
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``INF``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.rst
new file mode 100644
index 0000000000000..47a9886eedf2b
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.rst
@@ -0,0 +1,10 @@
+\-\-option_name|-o
+""""""""""""""""""
+
+option description
+
+- **Accept value**: yes
+- **Is value required**: yes
+- **Is multiple**: no
+- **Is negatable**: no
+- **Default**: ``'style'``
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.rst b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.rst
new file mode 100644
index 0000000000000..29a822e56331d
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.rst
@@ -0,0 +1,10 @@
+\-\-option_name|-o
+""""""""""""""""""
+
+option description
+
+- **Accept value**: yes
+- **Is value required**: yes
+- **Is multiple**: yes
+- **Is negatable**: no
+- **Default**: ``array (  0 => 'Hello',  1 => 'world',)``
diff --git a/src/Symfony/Component/Console/Tests/Helper/DescriptorHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/DescriptorHelperTest.php
index 97bae77c51fcc..57435a3e7f1d1 100644
--- a/src/Symfony/Component/Console/Tests/Helper/DescriptorHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/DescriptorHelperTest.php
@@ -24,6 +24,7 @@ public function testGetFormats()
             'xml',
             'json',
             'md',
+            'rst',
         ];
         $this->assertSame($expectedFormats, $helper->getFormats());
     }

From bd695366bb3d9ee69080089100a06f2153e4f68e Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Thu, 2 Feb 2023 08:48:58 +0100
Subject: [PATCH 173/475] Fix LICENSE year

---
 src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE   | 2 +-
 src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE    | 2 +-
 src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE  | 2 +-
 src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE    | 2 +-
 src/Symfony/Component/Notifier/Bridge/PagerDuty/LICENSE   | 2 +-
 src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE       | 2 +-
 src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE | 2 +-
 src/Symfony/Component/Notifier/Bridge/Termii/LICENSE      | 2 +-
 src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE b/src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE
index 074eb2b39259e..733c826ebcd63 100644
--- a/src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022-2023 Fabien Potencier
+Copyright (c) 2022-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE b/src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE
index 074eb2b39259e..733c826ebcd63 100644
--- a/src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022-2023 Fabien Potencier
+Copyright (c) 2022-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE b/src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE
index 074eb2b39259e..733c826ebcd63 100644
--- a/src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022-2023 Fabien Potencier
+Copyright (c) 2022-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE b/src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE
index 074eb2b39259e..733c826ebcd63 100644
--- a/src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022-2023 Fabien Potencier
+Copyright (c) 2022-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/LICENSE b/src/Symfony/Component/Notifier/Bridge/PagerDuty/LICENSE
index f961401699b27..3ed9f412ce53d 100644
--- a/src/Symfony/Component/Notifier/Bridge/PagerDuty/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2023 Fabien Potencier
+Copyright (c) 2023-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE b/src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE
index 074eb2b39259e..733c826ebcd63 100644
--- a/src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022-2023 Fabien Potencier
+Copyright (c) 2022-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE b/src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE
index 074eb2b39259e..733c826ebcd63 100644
--- a/src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022-2023 Fabien Potencier
+Copyright (c) 2022-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/LICENSE b/src/Symfony/Component/Notifier/Bridge/Termii/LICENSE
index 074eb2b39259e..733c826ebcd63 100644
--- a/src/Symfony/Component/Notifier/Bridge/Termii/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022-2023 Fabien Potencier
+Copyright (c) 2022-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE b/src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE
index 074eb2b39259e..733c826ebcd63 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022-2023 Fabien Potencier
+Copyright (c) 2022-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From c021ce79e8d32b14a29d7e69b41ff517e41497b6 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 2 Feb 2023 09:11:04 +0100
Subject: [PATCH 174/475] [Security] Return 403 instead of 500 when no firewall
 is defined

---
 .../EventListener/ErrorListener.php           | 30 +++++++++++--------
 .../Tests/EventListener/ErrorListenerTest.php | 11 ++++++-
 .../Core/Exception/AccessDeniedException.php  |  3 ++
 .../Exception/AuthenticationException.php     |  2 ++
 .../Exception/NotAnEntryPointException.php    |  3 ++
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
index 2e8b75afcf585..dadd32dda867d 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
@@ -71,15 +71,17 @@ public function logKernelException(ExceptionEvent $event)
         // There's no specific status code defined in the configuration for this exception
         if (!$throwable instanceof HttpExceptionInterface) {
             $class = new \ReflectionClass($throwable);
-            $attributes = $class->getAttributes(WithHttpStatus::class, \ReflectionAttribute::IS_INSTANCEOF);
 
-            if ($attributes) {
-                /** @var WithHttpStatus $instance */
-                $instance = $attributes[0]->newInstance();
+            do {
+                if ($attributes = $class->getAttributes(WithHttpStatus::class, \ReflectionAttribute::IS_INSTANCEOF)) {
+                    /** @var WithHttpStatus $instance */
+                    $instance = $attributes[0]->newInstance();
 
-                $throwable = new HttpException($instance->statusCode, $throwable->getMessage(), $throwable, $instance->headers);
-                $event->setThrowable($throwable);
-            }
+                    $throwable = new HttpException($instance->statusCode, $throwable->getMessage(), $throwable, $instance->headers);
+                    $event->setThrowable($throwable);
+                    break;
+                }
+            } while ($class = $class->getParentClass());
         }
 
         $e = FlattenException::createFromThrowable($throwable);
@@ -185,14 +187,16 @@ private function resolveLogLevel(\Throwable $throwable): string
             }
         }
 
-        $attributes = (new \ReflectionClass($throwable))->getAttributes(WithLogLevel::class);
+        $class = new \ReflectionClass($throwable);
 
-        if ($attributes) {
-            /** @var WithLogLevel $instance */
-            $instance = $attributes[0]->newInstance();
+        do {
+            if ($attributes = $class->getAttributes(WithLogLevel::class)) {
+                /** @var WithLogLevel $instance */
+                $instance = $attributes[0]->newInstance();
 
-            return $instance->level;
-        }
+                return $instance->level;
+            }
+        } while ($class = $class->getParentClass());
 
         if (!$throwable instanceof HttpExceptionInterface || $throwable->getStatusCode() >= 500) {
             return LogLevel::CRITICAL;
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
index d99f0b439174b..7f6d0bea2abf5 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
@@ -123,7 +123,7 @@ public function testHandleWithLoggerAndCustomConfiguration()
     public function testHandleWithLogLevelAttribute()
     {
         $request = new Request();
-        $event = new ExceptionEvent(new TestKernel(), $request, HttpKernelInterface::MAIN_REQUEST, new WarningWithLogLevelAttribute());
+        $event = new ExceptionEvent(new TestKernel(), $request, HttpKernelInterface::MAIN_REQUEST, new ChildOfWarningWithLogLevelAttribute());
         $logger = new TestLogger();
         $l = new ErrorListener('not used', $logger);
 
@@ -280,6 +280,7 @@ public static function exceptionWithAttributeProvider()
     {
         yield [new WithCustomUserProvidedAttribute(), 208, ['name' => 'value']];
         yield [new WithGeneralAttribute(), 412, ['some' => 'thing']];
+        yield [new ChildOfWithGeneralAttribute(), 412, ['some' => 'thing']];
     }
 }
 
@@ -341,7 +342,15 @@ class WithGeneralAttribute extends \Exception
 {
 }
 
+class ChildOfWithGeneralAttribute extends WithGeneralAttribute
+{
+}
+
 #[WithLogLevel(LogLevel::WARNING)]
 class WarningWithLogLevelAttribute extends \Exception
 {
 }
+
+class ChildOfWarningWithLogLevelAttribute extends WarningWithLogLevelAttribute
+{
+}
diff --git a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
index 79fb6eb668960..126149049bda1 100644
--- a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
+++ b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
@@ -11,11 +11,14 @@
 
 namespace Symfony\Component\Security\Core\Exception;
 
+use Symfony\Component\HttpKernel\Attribute\WithHttpStatus;
+
 /**
  * AccessDeniedException is thrown when the account has not the required role.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
+#[WithHttpStatus(403)]
 class AccessDeniedException extends RuntimeException
 {
     private array $attributes = [];
diff --git a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
index 298bc78cd9b3f..69ac3d6ec4a4d 100644
--- a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
+++ b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Security\Core\Exception;
 
+use Symfony\Component\HttpKernel\Attribute\WithHttpStatus;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
@@ -19,6 +20,7 @@
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Alexander <iam.asm89@gmail.com>
  */
+#[WithHttpStatus(401)]
 class AuthenticationException extends RuntimeException
 {
     /** @internal */
diff --git a/src/Symfony/Component/Security/Http/EntryPoint/Exception/NotAnEntryPointException.php b/src/Symfony/Component/Security/Http/EntryPoint/Exception/NotAnEntryPointException.php
index e421dcf0cd67b..80a6fb6e8f456 100644
--- a/src/Symfony/Component/Security/Http/EntryPoint/Exception/NotAnEntryPointException.php
+++ b/src/Symfony/Component/Security/Http/EntryPoint/Exception/NotAnEntryPointException.php
@@ -11,12 +11,15 @@
 
 namespace Symfony\Component\Security\Http\EntryPoint\Exception;
 
+use Symfony\Component\HttpKernel\Attribute\WithHttpStatus;
+
 /**
  * Thrown by generic decorators when a decorated authenticator does not implement
  * {@see AuthenticationEntryPointInterface}.
  *
  * @author Robin Chalas <robin.chalas@gmail.com>
  */
+#[WithHttpStatus(401)]
 class NotAnEntryPointException extends \RuntimeException
 {
 }

From 0127ef47036096ca3e148fdf75a0100aaa5411b5 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Thu, 2 Feb 2023 17:49:29 +0100
Subject: [PATCH 175/475] [WebProfilerBundle] Remove obsolete elements and
 attributes

---
 .../Resources/views/Collector/form.html.twig           | 10 +++++-----
 .../Resources/views/Collector/logger.html.twig         |  4 ++--
 .../Resources/views/Collector/notifier.html.twig       |  2 +-
 .../Resources/views/Collector/time.html.twig           |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
index 7f389405141ab..fb5b8b7dadaff 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -587,7 +587,7 @@
         <table>
             <thead>
             <tr>
-                <th width="180">Property</th>
+                <th style="width: 180px">Property</th>
                 <th>Value</th>
             </tr>
             </thead>
@@ -630,7 +630,7 @@
         <table>
             <thead>
             <tr>
-                <th width="180">Property</th>
+                <th style="width: 180px">Property</th>
                 <th>Value</th>
             </tr>
             </thead>
@@ -673,7 +673,7 @@
         <table>
             <thead>
             <tr>
-                <th width="180">Option</th>
+                <th style="width: 180px">Option</th>
                 <th>Passed Value</th>
                 <th>Resolved Value</th>
             </tr>
@@ -708,7 +708,7 @@
     <table>
         <thead>
         <tr>
-            <th width="180">Option</th>
+            <th style="width: 180px">Option</th>
             <th>Value</th>
         </tr>
         </thead>
@@ -727,7 +727,7 @@
     <table>
         <thead>
         <tr>
-            <th width="180">Variable</th>
+            <th style="width: 180px">Variable</th>
             <th>Value</th>
         </tr>
         </thead>
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
index d826993ee7ce8..19c187f069d4c 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -41,7 +41,7 @@
             transform: translateY(1px);
         }
         .log-filters .log-filter summary .icon {
-            height: 18px;mai
+            height: 18px;
             width: 18px;
             margin: 0 7px 0 0;
         }
@@ -336,7 +336,7 @@
 
         <table class="logs">
             <colgroup>
-                <col width="140px">
+                <col style="width: 140px">
                 <col>
             </colgroup>
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/notifier.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/notifier.html.twig
index b0c9219b02b79..f72f56b69ea64 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/notifier.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/notifier.html.twig
@@ -29,7 +29,7 @@
 
 {% block head %}
     {{ parent() }}
-    <style type="text/css">
+    <style>
         /* utility classes */
         .m-t-0 { margin-top: 0 !important; }
         .m-t-10 { margin-top: 10px !important; }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
index c74ee256abb2e..2fb4e0a848f35 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
@@ -180,7 +180,7 @@
     </pattern>
   </defs>
 </svg>
-<style type="text/css">
+<style>
 {{ include('@WebProfiler/Collector/time.css.twig') }}
 </style>
 <script>

From 8afb4c7702a47045ad2cc03bea962b6e591d2361 Mon Sep 17 00:00:00 2001
From: Dustin Wilson <dustin@dustinwilson.com>
Date: Mon, 30 Jan 2023 22:23:35 -0600
Subject: [PATCH 176/475] [Yaml] Feature #48920  Allow milliseconds and
 microseconds in dates

---
 src/Symfony/Component/Yaml/Inline.php         | 28 ++++++++---
 .../Component/Yaml/Tests/DumperTest.php       | 46 +++++++++++++++++++
 .../Component/Yaml/Tests/InlineTest.php       |  5 +-
 .../Component/Yaml/Tests/ParserTest.php       |  9 ++++
 4 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index 2f33429910065..54da91ef48d90 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -110,7 +110,16 @@ public static function dump(mixed $value, int $flags = 0): string
 
                 return self::dumpNull($flags);
             case $value instanceof \DateTimeInterface:
-                return $value->format('c');
+                $length = \strlen(rtrim($value->format('u'), '0'));
+                if (0 === $length) {
+                    $format = 'c';
+                } elseif ($length < 4) {
+                    $format = 'Y-m-d\TH:i:s.vP';
+                } else {
+                    $format = 'Y-m-d\TH:i:s.uP';
+                }
+
+                return $value->format($format);
             case $value instanceof \UnitEnum:
                 return sprintf('!php/const %s::%s', $value::class, $value->name);
             case \is_object($value):
@@ -712,15 +721,20 @@ private static function evaluateScalar(string $scalar, int $flags, array &$refer
                             return $time;
                         }
 
-                        try {
-                            if (false !== $scalar = $time->getTimestamp()) {
-                                return $scalar;
+                        $length = \strlen(rtrim($time->format('u'), '0'));
+                        if (0 === $length) {
+                            try {
+                                if (false !== $scalar = $time->getTimestamp()) {
+                                    return $scalar;
+                                }
+                            } catch (\ValueError) {
+                                // no-op
                             }
-                        } catch (\ValueError) {
-                            // no-op
+
+                            return (int) $time->format('U');
                         }
 
-                        return $time->format('U');
+                        return (float) $time->format('U.u');
                 }
         }
 
diff --git a/src/Symfony/Component/Yaml/Tests/DumperTest.php b/src/Symfony/Component/Yaml/Tests/DumperTest.php
index 47c0aa3578b29..54ffa37e77180 100644
--- a/src/Symfony/Component/Yaml/Tests/DumperTest.php
+++ b/src/Symfony/Component/Yaml/Tests/DumperTest.php
@@ -922,6 +922,52 @@ public function testDumpIdeographicSpaces()
         ], 2));
     }
 
+    /**
+     * @dataProvider getDateTimeData
+     */
+    public function testDumpDateTime(array $input, string $expected)
+    {
+        $this->assertSame($expected, rtrim($this->dumper->dump($input, 1)));
+    }
+
+    public function getDateTimeData()
+    {
+        yield 'Date without subsecond precision' => [
+            ['date' => new \DateTimeImmutable('2023-01-24T01:02:03Z')],
+            'date: 2023-01-24T01:02:03+00:00',
+        ];
+
+        yield 'Date with one digit for milliseconds' => [
+            ['date' => new \DateTimeImmutable('2023-01-24T01:02:03.4Z')],
+            'date: 2023-01-24T01:02:03.400+00:00',
+        ];
+
+        yield 'Date with two digits for milliseconds' => [
+            ['date' => new \DateTimeImmutable('2023-01-24T01:02:03.45Z')],
+            'date: 2023-01-24T01:02:03.450+00:00',
+        ];
+
+        yield 'Date with full milliseconds' => [
+            ['date' => new \DateTimeImmutable('2023-01-24T01:02:03.456Z')],
+            'date: 2023-01-24T01:02:03.456+00:00',
+        ];
+
+        yield 'Date with four digits for microseconds' => [
+            ['date' => new \DateTimeImmutable('2023-01-24T01:02:03.4567Z')],
+            'date: 2023-01-24T01:02:03.456700+00:00',
+        ];
+
+        yield 'Date with five digits for microseconds' => [
+            ['date' => new \DateTimeImmutable('2023-01-24T01:02:03.45678Z')],
+            'date: 2023-01-24T01:02:03.456780+00:00',
+        ];
+
+        yield 'Date with full microseconds' => [
+            ['date' => new \DateTimeImmutable('2023-01-24T01:02:03.456789Z')],
+            'date: 2023-01-24T01:02:03.456789+00:00',
+        ];
+    }
+
     private function assertSameData($expected, $actual)
     {
         $this->assertEquals($expected, $actual);
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
index 46d30f12044e5..dc21c4dde70dd 100644
--- a/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -563,9 +563,10 @@ public function getTestsForDump()
     /**
      * @dataProvider getTimestampTests
      */
-    public function testParseTimestampAsUnixTimestampByDefault(string $yaml, int $year, int $month, int $day, int $hour, int $minute, int $second)
+    public function testParseTimestampAsUnixTimestampByDefault(string $yaml, int $year, int $month, int $day, int $hour, int $minute, int $second, int $microsecond)
     {
-        $this->assertSame(gmmktime($hour, $minute, $second, $month, $day, $year), Inline::parse($yaml));
+        $expectedDate = (new \DateTimeImmutable($yaml))->format('U');
+        $this->assertSame($microsecond ? (float) "$expectedDate.$microsecond" : (int) $expectedDate, Inline::parse($yaml));
     }
 
     /**
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 148a139be1206..4cddeca1c733e 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1541,6 +1541,15 @@ public function getInvalidBinaryData()
         ];
     }
 
+    public function testParseDateWithSubseconds()
+    {
+        $yaml = <<<'EOT'
+date: 2002-12-14T01:23:45.670000Z
+EOT;
+
+        $this->assertSameData(['date' => 1039829025.67], $this->parser->parse($yaml));
+    }
+
     public function testParseDateAsMappingValue()
     {
         $yaml = <<<'EOT'

From ee5ccef03a02cb887ae6502ba2c4c34ba9c97832 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Sat, 4 Feb 2023 16:44:32 +0100
Subject: [PATCH 177/475] Misc code improvements and optimizations

---
 .../Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php | 2 +-
 .../Component/DependencyInjection/Loader/XmlFileLoader.php      | 2 +-
 src/Symfony/Component/Validator/Constraints/Cidr.php            | 2 +-
 src/Symfony/Component/Yaml/Dumper.php                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
index a4f34ce4dc6d9..bf2d6347daa38 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -145,7 +145,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $format = $input->getOption('format');
         $xliffVersion = '1.2';
 
-        if (\in_array($format, array_keys(self::FORMATS), true)) {
+        if (array_key_exists($format, self::FORMATS)) {
             [$format, $xliffVersion] = self::FORMATS[$format];
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index bbe04d7c75011..9bf4955d15ece 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -737,7 +737,7 @@ private function validateAlias(\DOMElement $alias, string $file)
             if (!$child instanceof \DOMElement || self::NS !== $child->namespaceURI) {
                 continue;
             }
-            if (!\in_array($child->localName, ['deprecated'], true)) {
+            if ('deprecated' !== $child->localName) {
                 throw new InvalidArgumentException(sprintf('Invalid child element "%s" defined for alias "%s" in "%s".', $child->localName, $alias->getAttribute('id'), $file));
             }
         }
diff --git a/src/Symfony/Component/Validator/Constraints/Cidr.php b/src/Symfony/Component/Validator/Constraints/Cidr.php
index c40669e824dba..ea28afeac29a2 100644
--- a/src/Symfony/Component/Validator/Constraints/Cidr.php
+++ b/src/Symfony/Component/Validator/Constraints/Cidr.php
@@ -66,7 +66,7 @@ public function __construct(
     ) {
         $this->version = $version ?? $options['version'] ?? $this->version;
 
-        if (!\in_array($this->version, array_keys(self::NET_MAXES))) {
+        if (!array_key_exists($this->version, self::NET_MAXES)) {
             throw new ConstraintDefinitionException(sprintf('The option "version" must be one of "%s".', implode('", "', array_keys(self::NET_MAXES))));
         }
 
diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php
index 19001e7c295a6..51b35a38e9f40 100644
--- a/src/Symfony/Component/Yaml/Dumper.php
+++ b/src/Symfony/Component/Yaml/Dumper.php
@@ -146,7 +146,7 @@ private function dumpTaggedValue(TaggedValue $value, int $inline, int $indent, i
     {
         $output = sprintf('%s!%s', $prefix ? $prefix.' ' : '', $value->getTag());
 
-        if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && false !== strpos($value->getValue(), "\n") && false === strpos($value->getValue(), "\r\n")) {
+        if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && str_contains($value->getValue(), "\n") && !str_contains($value->getValue(), "\r\n")) {
             // If the first line starts with a space character, the spec requires a blockIndicationIndicator
             // http://www.yaml.org/spec/1.2/spec.html#id2793979
             $blockIndentationIndicator = (' ' === substr($value->getValue(), 0, 1)) ? (string) $this->indentation : '';

From 7b7e8597d8fc574889ba545957286d5f79f7e8bd Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Sat, 4 Feb 2023 16:27:38 +0100
Subject: [PATCH 178/475] [Lock] Fix some typos in MongoDbStore

---
 UPGRADE-6.3.md                                |  5 ++++
 src/Symfony/Component/Lock/CHANGELOG.md       |  1 +
 .../Component/Lock/Store/MongoDbStore.php     | 23 ++++++++++++-------
 src/Symfony/Component/Lock/composer.json      |  3 ++-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 89caa851669a4..a590656924b29 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -48,6 +48,11 @@ HttpKernel
 
  * Deprecate parameters `container.dumper.inline_factories` and `container.dumper.inline_class_loader`, use `.container.dumper.inline_factories` and `.container.dumper.inline_class_loader` instead
 
+Lock
+----
+
+ * Deprecate the `gcProbablity` option to fix a typo in its name, use the `gcProbability` option instead
+
 Messenger
 ---------
 
diff --git a/src/Symfony/Component/Lock/CHANGELOG.md b/src/Symfony/Component/Lock/CHANGELOG.md
index d5e1103f9e00e..41a68fdabcbcf 100644
--- a/src/Symfony/Component/Lock/CHANGELOG.md
+++ b/src/Symfony/Component/Lock/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Create migration for lock table when DoctrineDbalStore is used
  * Add support for Relay PHP extension for Redis
+ * Renamed the `gcProbablity` option to `gcProbability` to fix a typo in its name
 
 6.0
 ---
diff --git a/src/Symfony/Component/Lock/Store/MongoDbStore.php b/src/Symfony/Component/Lock/Store/MongoDbStore.php
index f4e98d55f4591..792bcff7f64a8 100644
--- a/src/Symfony/Component/Lock/Store/MongoDbStore.php
+++ b/src/Symfony/Component/Lock/Store/MongoDbStore.php
@@ -64,7 +64,7 @@ class MongoDbStore implements PersistingStoreInterface
      * @throws InvalidTtlException      When the initial ttl is not valid
      *
      * Options:
-     *      gcProbablity:  Should a TTL Index be created expressed as a probability from 0.0 to 1.0 [default: 0.001]
+     *      gcProbability: Should a TTL Index be created expressed as a probability from 0.0 to 1.0 [default: 0.001]
      *      database:      The name of the database [required when $mongo is a Client]
      *      collection:    The name of the collection [required when $mongo is a Client]
      *      uriOptions:    Array of uri options. [used when $mongo is a URI]
@@ -78,9 +78,9 @@ class MongoDbStore implements PersistingStoreInterface
      *
      * @see https://docs.mongodb.com/php-library/current/reference/method/MongoDBClient__construct/
      *
-     * If gcProbablity is set to a value greater than 0.0 there is a chance
+     * If gcProbability is set to a value greater than 0.0 there is a chance
      * this store will attempt to create a TTL index on self::save().
-     * If you prefer to create your TTL Index manually you can set gcProbablity
+     * If you prefer to create your TTL Index manually you can set gcProbability
      * to 0.0 and optionally leverage
      * self::createTtlIndex(int $expireAfterSeconds = 0).
      *
@@ -90,8 +90,15 @@ class MongoDbStore implements PersistingStoreInterface
      */
     public function __construct(Collection|Client|string $mongo, array $options = [], float $initialTtl = 300.0)
     {
+        if (isset($options['gcProbablity'])) {
+            trigger_deprecation('symfony/lock', '6.3', 'The "gcProbablity" option (notice the typo in its name) is deprecated in "%s"; use the "gcProbability" option instead.', __CLASS__);
+
+            $options['gcProbability'] = $options['gcProbablity'];
+            unset($options['gcProbablity']);
+        }
+
         $this->options = array_merge([
-            'gcProbablity' => 0.001,
+            'gcProbability' => 0.001,
             'database' => null,
             'collection' => null,
             'uriOptions' => [],
@@ -117,8 +124,8 @@ public function __construct(Collection|Client|string $mongo, array $options = []
             }
         }
 
-        if ($this->options['gcProbablity'] < 0.0 || $this->options['gcProbablity'] > 1.0) {
-            throw new InvalidArgumentException(sprintf('"%s()" gcProbablity must be a float from 0.0 to 1.0, "%f" given.', __METHOD__, $this->options['gcProbablity']));
+        if ($this->options['gcProbability'] < 0.0 || $this->options['gcProbability'] > 1.0) {
+            throw new InvalidArgumentException(sprintf('"%s()" gcProbability must be a float from 0.0 to 1.0, "%f" given.', __METHOD__, $this->options['gcProbability']));
         }
 
         if ($this->initialTtl <= 0) {
@@ -159,7 +166,7 @@ private function skimUri(string $uri): string
     /**
      * Creates a TTL index to automatically remove expired locks.
      *
-     * If the gcProbablity option is set higher than 0.0 (defaults to 0.001);
+     * If the gcProbability option is set higher than 0.0 (defaults to 0.001);
      * there is a chance this will be called on self::save().
      *
      * Otherwise; this should be called once manually during database setup.
@@ -212,7 +219,7 @@ public function save(Key $key)
             throw new LockAcquiringException('Failed to acquire lock.', 0, $e);
         }
 
-        if ($this->options['gcProbablity'] > 0.0 && (1.0 === $this->options['gcProbablity'] || (random_int(0, \PHP_INT_MAX) / \PHP_INT_MAX) <= $this->options['gcProbablity'])) {
+        if ($this->options['gcProbability'] > 0.0 && (1.0 === $this->options['gcProbability'] || (random_int(0, \PHP_INT_MAX) / \PHP_INT_MAX) <= $this->options['gcProbability'])) {
             $this->createTtlIndex();
         }
 
diff --git a/src/Symfony/Component/Lock/composer.json b/src/Symfony/Component/Lock/composer.json
index c7611dc6c7da4..c0034f311a685 100644
--- a/src/Symfony/Component/Lock/composer.json
+++ b/src/Symfony/Component/Lock/composer.json
@@ -17,7 +17,8 @@
     ],
     "require": {
         "php": ">=8.1",
-        "psr/log": "^1|^2|^3"
+        "psr/log": "^1|^2|^3",
+        "symfony/deprecation-contracts": "^2.5|^3"
     },
     "require-dev": {
         "doctrine/dbal": "^2.13|^3.0",

From f4c546d4c8cafb65868394e788e254caec58d352 Mon Sep 17 00:00:00 2001
From: Takashi Kanemoto <ttskch@gmail.com>
Date: Sun, 5 Feb 2023 17:27:55 +0900
Subject: [PATCH 179/475] [TwigBridge] Improve form_errors of bootstrap5 form
 theme

---
 .../views/Form/bootstrap_5_layout.html.twig   |  2 +-
 ...AbstractBootstrap5HorizontalLayoutTest.php | 12 +++---
 .../AbstractBootstrap5LayoutTest.php          | 37 +++++++++++++++----
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig
index 252b95e4f3293..cb5a60e079861 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig
@@ -353,7 +353,7 @@
 {%- block form_errors -%}
     {%- if errors|length > 0 -%}
         {%- for error in errors -%}
-            <div class="invalid-feedback d-block">{{ error.message }}</div>
+            <div class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">{{ error.message }}</div>
         {%- endfor -%}
     {%- endif %}
 {%- endblock form_errors %}
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTest.php
index e6a8846c4b127..ffae59e660e5b 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTest.php
@@ -28,9 +28,9 @@ abstract class AbstractBootstrap5HorizontalLayoutTest extends AbstractBootstrap5
 {
     public function testRow()
     {
-        $form = $this->factory->createNamed('name', TextType::class);
-        $form->addError(new FormError('[trans]Error![/trans]'));
-        $html = $this->renderRow($form->createView());
+        $form = $this->factory->createNamed('')->add('name', TextType::class);
+        $form->get('name')->addError(new FormError('[trans]Error![/trans]'));
+        $html = $this->renderRow($form->get('name')->createView());
 
         $this->assertMatchesXpath($html,
             '/div
@@ -55,9 +55,9 @@ public function testRow()
 
     public function testRowWithCustomClass()
     {
-        $form = $this->factory->createNamed('name', TextType::class);
-        $form->addError(new FormError('[trans]Error![/trans]'));
-        $html = $this->renderRow($form->createView(), [
+        $form = $this->factory->createNamed('')->add('name', TextType::class);
+        $form->get('name')->addError(new FormError('[trans]Error![/trans]'));
+        $html = $this->renderRow($form->get('name')->createView(), [
             'row_attr' => [
                 'class' => 'mb-5',
             ],
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php
index e85ad797f7a24..dcb76b19dbe36 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php
@@ -40,9 +40,9 @@ abstract class AbstractBootstrap5LayoutTest extends AbstractBootstrap4LayoutTest
 {
     public function testRow()
     {
-        $form = $this->factory->createNamed('name', TextType::class);
-        $form->addError(new FormError('[trans]Error![/trans]'));
-        $html = $this->renderRow($form->createView());
+        $form = $this->factory->createNamed('')->add('name', TextType::class);
+        $form->get('name')->addError(new FormError('[trans]Error![/trans]'));
+        $html = $this->renderRow($form->get('name')->createView());
 
         $this->assertMatchesXpath($html,
             '/div
@@ -61,9 +61,9 @@ public function testRow()
 
     public function testRowWithCustomClass()
     {
-        $form = $this->factory->createNamed('name', TextType::class);
-        $form->addError(new FormError('[trans]Error![/trans]'));
-        $html = $this->renderRow($form->createView(), [
+        $form = $this->factory->createNamed('')->add('name', TextType::class);
+        $form->get('name')->addError(new FormError('[trans]Error![/trans]'));
+        $html = $this->renderRow($form->get('name')->createView(), [
             'row_attr' => [
                 'class' => 'mb-5',
             ],
@@ -309,11 +309,34 @@ public function testHelpHtmlIsTrue()
 
     public function testErrors()
     {
-        $form = $this->factory->createNamed('name', TextType::class);
+        self::markTestSkipped('This method has been split into testRootErrors() and testRowErrors().');
+    }
+
+    public function testRootErrors()
+    {
+        $form = $this->factory->createNamed('');
         $form->addError(new FormError('[trans]Error 1[/trans]'));
         $form->addError(new FormError('[trans]Error 2[/trans]'));
         $html = $this->renderErrors($form->createView());
 
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="alert alert-danger d-block"]
+    [.="[trans]Error 1[/trans]"]
+    /following-sibling::div
+    [@class="alert alert-danger d-block"]
+    [.="[trans]Error 2[/trans]"]
+'
+        );
+    }
+
+    public function testRowErrors()
+    {
+        $form = $this->factory->createNamed('')->add('name', TextType::class);
+        $form->get('name')->addError(new FormError('[trans]Error 1[/trans]'));
+        $form->get('name')->addError(new FormError('[trans]Error 2[/trans]'));
+        $html = $this->renderErrors($form->get('name')->createView());
+
         $this->assertMatchesXpath($html,
             '/div
     [@class="invalid-feedback d-block"]

From 1abaec475b03ba32f36fa49d2eea6d0bcd1c62c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Mon, 6 Feb 2023 15:44:30 +0100
Subject: [PATCH 180/475] [Intl] fix script to update emoji list + build the
 list

---
 .../data/transliterator/emoji/emoji-strip.php | 46 +++++++++----------
 .../Component/Intl/Resources/emoji/Makefile   |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-strip.php b/src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-strip.php
index a6d1d78ae9adf..a65bcb5272d38 100644
--- a/src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-strip.php
+++ b/src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-strip.php
@@ -2270,6 +2270,16 @@
     '🫴🏽' => '',
     '🫴🏾' => '',
     '🫴🏿' => '',
+    '🫷🏻' => '',
+    '🫷🏼' => '',
+    '🫷🏽' => '',
+    '🫷🏾' => '',
+    '🫷🏿' => '',
+    '🫸🏻' => '',
+    '🫸🏼' => '',
+    '🫸🏽' => '',
+    '🫸🏾' => '',
+    '🫸🏿' => '',
     '👌🏻' => '',
     '👌🏼' => '',
     '👌🏽' => '',
@@ -2417,16 +2427,6 @@
     '🙏🏽' => '',
     '🙏🏾' => '',
     '🙏🏿' => '',
-    '🫷🏻' => '',
-    '🫷🏼' => '',
-    '🫷🏽' => '',
-    '🫷🏾' => '',
-    '🫷🏿' => '',
-    '🫸🏻' => '',
-    '🫸🏼' => '',
-    '🫸🏽' => '',
-    '🫸🏾' => '',
-    '🫸🏿' => '',
     '✍️' => '',
     '✍🏻' => '',
     '✍🏼' => '',
@@ -3472,7 +3472,6 @@
     '🙈' => '',
     '🙉' => '',
     '🙊' => '',
-    '💋' => '',
     '💌' => '',
     '💘' => '',
     '💝' => '',
@@ -3485,17 +3484,18 @@
     '❣' => '',
     '💔' => '',
     '❤' => '',
+    '🩷' => '',
     '🧡' => '',
     '💛' => '',
     '💚' => '',
     '💙' => '',
-    '💜' => '',
     '🩵' => '',
-    '🩶' => '',
-    '🩷' => '',
+    '💜' => '',
     '🤎' => '',
     '🖤' => '',
+    '🩶' => '',
     '🤍' => '',
+    '💋' => '',
     '💯' => '',
     '💢' => '',
     '💥' => '',
@@ -3503,7 +3503,6 @@
     '💦' => '',
     '💨' => '',
     '🕳' => '',
-    '💣' => '',
     '💬' => '',
     '🗨' => '',
     '🗯' => '',
@@ -3518,6 +3517,8 @@
     '🫲' => '',
     '🫳' => '',
     '🫴' => '',
+    '🫷' => '',
+    '🫸' => '',
     '👌' => '',
     '🤌' => '',
     '🤏' => '',
@@ -3547,8 +3548,6 @@
     '🤲' => '',
     '🤝' => '',
     '🙏' => '',
-    '🫷' => '',
-    '🫸' => '',
     '✍' => '',
     '💅' => '',
     '🤳' => '',
@@ -3821,6 +3820,7 @@
     '🍃' => '',
     '🪹' => '',
     '🪺' => '',
+    '🍄' => '',
     '🍇' => '',
     '🍈' => '',
     '🍉' => '',
@@ -3852,7 +3852,6 @@
     '🥦' => '',
     '🧄' => '',
     '🧅' => '',
-    '🍄' => '',
     '🥜' => '',
     '🫘' => '',
     '🌰' => '',
@@ -4230,11 +4229,10 @@
     '🎯' => '',
     '🪀' => '',
     '🪁' => '',
+    '🔫' => '',
     '🎱' => '',
     '🔮' => '',
     '🪄' => '',
-    '🧿' => '',
-    '🪬' => '',
     '🎮' => '',
     '🕹' => '',
     '🎰' => '',
@@ -4280,7 +4278,6 @@
     '👙' => '',
     '👚' => '',
     '🪭' => '',
-    '🪮' => '',
     '👛' => '',
     '👜' => '',
     '👝' => '',
@@ -4295,6 +4292,7 @@
     '👡' => '',
     '🩰' => '',
     '👢' => '',
+    '🪮' => '',
     '👑' => '',
     '👒' => '',
     '🎩' => '',
@@ -4454,7 +4452,7 @@
     '🛠' => '',
     '🗡' => '',
     '⚔' => '',
-    '🔫' => '',
+    '💣' => '',
     '🪃' => '',
     '🏹' => '',
     '🛡' => '',
@@ -4515,6 +4513,8 @@
     '⚰' => '',
     '🪦' => '',
     '⚱' => '',
+    '🧿' => '',
+    '🪬' => '',
     '🗿' => '',
     '🪧' => '',
     '🪪' => '',
@@ -4613,9 +4613,9 @@
     '🔅' => '',
     '🔆' => '',
     '📶' => '',
+    '🛜' => '',
     '📳' => '',
     '📴' => '',
-    '🛜' => '',
     '♀' => '',
     '♂' => '',
     '⚧' => '',
diff --git a/src/Symfony/Component/Intl/Resources/emoji/Makefile b/src/Symfony/Component/Intl/Resources/emoji/Makefile
index 8e3e900f29b4b..aa6d0c30a7005 100644
--- a/src/Symfony/Component/Intl/Resources/emoji/Makefile
+++ b/src/Symfony/Component/Intl/Resources/emoji/Makefile
@@ -5,7 +5,7 @@ update: ## Update sources
 	@composer update
 	@curl https://api.github.com/emojis > vendor/github-emojis.json
 	@curl https://raw.githubusercontent.com/iamcal/emoji-data/master/emoji.json > vendor/slack-emojis.json
-	@curl https://unicode.org/Public/emoji/latest/emoji-test.txt > vendor/emoji-test.txt
+	@curl -L https://unicode.org/Public/emoji/latest/emoji-test.txt > vendor/emoji-test.txt
 
 build: ## Build rules
 	@./build.php

From cb3db968e4701a1aa06bc2f5984e0255b0219189 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 6 Feb 2023 06:06:48 +0100
Subject: [PATCH 181/475] [PHPUnit 10] Use `TestCase` suffix for abstract tests
 in `/Tests/`

---
 .../Tests/Form/Type/EntityTypeTest.php        |  4 +--
 src/Symfony/Bridge/Doctrine/composer.json     |  4 +--
 ...actBootstrap3HorizontalLayoutTestCase.php} |  2 +-
 ...p => AbstractBootstrap3LayoutTestCase.php} |  4 +--
 ...actBootstrap4HorizontalLayoutTestCase.php} |  2 +-
 ...p => AbstractBootstrap4LayoutTestCase.php} |  2 +-
 ...actBootstrap5HorizontalLayoutTestCase.php} |  2 +-
 ...p => AbstractBootstrap5LayoutTestCase.php} |  2 +-
 ...xtensionBootstrap3HorizontalLayoutTest.php |  2 +-
 .../FormExtensionBootstrap3LayoutTest.php     |  2 +-
 ...xtensionBootstrap4HorizontalLayoutTest.php |  2 +-
 .../FormExtensionBootstrap4LayoutTest.php     |  2 +-
 ...xtensionBootstrap5HorizontalLayoutTest.php |  2 +-
 .../FormExtensionBootstrap5LayoutTest.php     |  2 +-
 .../Extension/FormExtensionDivLayoutTest.php  |  4 +--
 .../FormExtensionTableLayoutTest.php          |  4 +--
 src/Symfony/Bridge/Twig/composer.json         |  4 +--
 ...est.php => AbstractDescriptorTestCase.php} |  2 +-
 .../Console/Descriptor/JsonDescriptorTest.php |  2 +-
 .../Descriptor/MarkdownDescriptorTest.php     |  2 +-
 .../Console/Descriptor/TextDescriptorTest.php |  2 +-
 .../Console/Descriptor/XmlDescriptorTest.php  |  2 +-
 .../Fixtures/php/workflow_not_valid.php       |  4 +--
 .../php/workflow_with_guard_expression.php    |  4 +--
 ...th_multiple_transitions_with_same_name.php |  4 +--
 .../workflow_with_no_events_to_dispatch.php   |  4 +--
 ...flow_with_specified_events_to_dispatch.php |  4 +--
 ...flow_with_support_and_support_strategy.php |  4 +--
 .../Fixtures/php/workflows.php                |  8 ++---
 .../php/workflows_explicitly_enabled.php      |  4 +--
 ...ows_explicitly_enabled_named_workflows.php |  4 +--
 .../Fixtures/xml/workflow_not_valid.xml       |  2 +-
 .../xml/workflow_with_guard_expression.xml    |  2 +-
 ...th_multiple_transitions_with_same_name.xml |  2 +-
 .../workflow_with_no_events_to_dispatch.xml   |  2 +-
 ...flow_with_specified_events_to_dispatch.xml |  2 +-
 ...flow_with_support_and_support_strategy.xml |  2 +-
 .../Fixtures/xml/workflows.xml                |  6 ++--
 .../xml/workflows_explicitly_enabled.xml      |  2 +-
 ...ows_explicitly_enabled_named_workflows.xml |  2 +-
 .../Fixtures/yml/workflow_not_valid.yml       |  2 +-
 .../yml/workflow_with_guard_expression.yml    |  2 +-
 ...th_multiple_transitions_with_same_name.yml |  2 +-
 .../workflow_with_no_events_to_dispatch.yml   |  2 +-
 ...flow_with_specified_events_to_dispatch.yml |  2 +-
 ...flow_with_support_and_support_strategy.yml |  2 +-
 .../Fixtures/yml/workflows.yml                |  6 ++--
 .../yml/workflows_explicitly_enabled.yml      |  2 +-
 ...ows_explicitly_enabled_named_workflows.yml |  2 +-
 ...est.php => FrameworkExtensionTestCase.php} |  2 +-
 .../PhpFrameworkExtensionTest.php             |  2 +-
 .../XmlFrameworkExtensionTest.php             |  2 +-
 .../YamlFrameworkExtensionTest.php            |  2 +-
 ...p => AbstractAttributeRoutingTestCase.php} |  2 +-
 .../Functional/AnnotatedControllerTest.php    |  2 +-
 .../Tests/Functional/Psr4RoutingTest.php      |  2 +-
 ....php => CompleteConfigurationTestCase.php} |  2 +-
 .../PhpCompleteConfigurationTest.php          |  2 +-
 .../XmlCompleteConfigurationTest.php          |  2 +-
 .../YamlCompleteConfigurationTest.php         |  2 +-
 ...t.php => AbstractRedisAdapterTestCase.php} |  2 +-
 .../Adapter/PredisAdapterSentinelTest.php     |  2 +-
 .../Cache/Tests/Adapter/PredisAdapterTest.php |  2 +-
 .../Adapter/PredisClusterAdapterTest.php      |  2 +-
 .../Adapter/PredisRedisClusterAdapterTest.php |  2 +-
 .../ProxyAdapterAndRedisAdapterTest.php       |  2 +-
 .../Adapter/RedisAdapterSentinelTest.php      |  2 +-
 .../Cache/Tests/Adapter/RedisAdapterTest.php  |  2 +-
 .../Tests/Adapter/RedisArrayAdapterTest.php   |  2 +-
 .../Tests/Adapter/RedisClusterAdapterTest.php |  2 +-
 .../Adapter/RelayAdapterSentinelTest.php      |  2 +-
 .../Cache/Tests/Adapter/RelayAdapterTest.php  |  2 +-
 ...est.php => AbstractDescriptorTestCase.php} |  2 +-
 .../Tests/Descriptor/JsonDescriptorTest.php   |  2 +-
 .../Descriptor/MarkdownDescriptorTest.php     |  2 +-
 .../ReStructuredTextDescriptorTest.php        |  2 +-
 .../Tests/Descriptor/TextDescriptorTest.php   |  2 +-
 .../Tests/Descriptor/XmlDescriptorTest.php    |  2 +-
 ...php => AbstractQuestionHelperTestCase.php} |  2 +-
 .../Tests/Helper/QuestionHelperTest.php       |  2 +-
 .../Helper/SymfonyQuestionHelperTest.php      |  2 +-
 ...tNodeTest.php => AbstractNodeTestCase.php} |  2 +-
 .../Tests/Node/AttributeNodeTest.php          |  2 +-
 .../CssSelector/Tests/Node/ClassNodeTest.php  |  2 +-
 .../Tests/Node/CombinedSelectorNodeTest.php   |  2 +-
 .../Tests/Node/ElementNodeTest.php            |  2 +-
 .../Tests/Node/FunctionNodeTest.php           |  2 +-
 .../CssSelector/Tests/Node/HashNodeTest.php   |  2 +-
 .../Tests/Node/NegationNodeTest.php           |  2 +-
 .../CssSelector/Tests/Node/PseudoNodeTest.php |  2 +-
 .../Tests/Node/SelectorNodeTest.php           |  2 +-
 ...erTest.php => AbstractHandlerTestCase.php} |  2 +-
 .../Parser/Handler/CommentHandlerTest.php     |  2 +-
 .../Tests/Parser/Handler/HashHandlerTest.php  |  2 +-
 .../Parser/Handler/IdentifierHandlerTest.php  |  2 +-
 .../Parser/Handler/NumberHandlerTest.php      |  2 +-
 .../Parser/Handler/StringHandlerTest.php      |  2 +-
 .../Parser/Handler/WhitespaceHandlerTest.php  |  2 +-
 ...erTest.php => AbstractCrawlerTestCase.php} |  2 +-
 .../Tests/Html5ParserCrawlerTest.php          |  2 +-
 .../Tests/NativeParserCrawlerTest.php         |  2 +-
 ...tNodeTest.php => AbstractNodeTestCase.php} |  2 +-
 .../Tests/Node/ArrayNodeTest.php              |  2 +-
 .../Tests/Node/BinaryNodeTest.php             |  2 +-
 .../Tests/Node/ConditionalNodeTest.php        |  2 +-
 .../Tests/Node/ConstantNodeTest.php           |  2 +-
 .../Tests/Node/FunctionNodeTest.php           |  2 +-
 .../Tests/Node/GetAttrNodeTest.php            |  2 +-
 .../Tests/Node/NameNodeTest.php               |  2 +-
 .../Tests/Node/UnaryNodeTest.php              |  2 +-
 ...Test.php => AbstractDivLayoutTestCase.php} |  2 +-
 ...outTest.php => AbstractLayoutTestCase.php} |  2 +-
 ...php => AbstractRequestHandlerTestCase.php} |  2 +-
 ...st.php => AbstractTableLayoutTestCase.php} |  2 +-
 ...est.php => AbstractChoiceListTestCase.php} |  2 +-
 .../Tests/ChoiceList/ArrayChoiceListTest.php  |  2 +-
 ...est.php => AbstractDescriptorTestCase.php} |  2 +-
 .../Console/Descriptor/JsonDescriptorTest.php |  2 +-
 .../Console/Descriptor/TextDescriptorTest.php |  2 +-
 ...hp => BaseDateTimeTransformerTestCase.php} |  2 +-
 .../DateTimeToArrayTransformerTest.php        |  2 +-
 ...imeToHtml5LocalDateTimeTransformerTest.php |  2 +-
 ...teTimeToLocalizedStringTransformerTest.php |  2 +-
 .../DateTimeToRfc3339TransformerTest.php      |  2 +-
 .../DateTimeToStringTransformerTest.php       |  2 +-
 .../DateTimeToTimestampTransformerTest.php    |  2 +-
 ...MergeCollectionListenerArrayObjectTest.php |  2 +-
 .../MergeCollectionListenerArrayTest.php      |  2 +-
 ...ollectionListenerCustomArrayObjectTest.php |  2 +-
 ...hp => MergeCollectionListenerTestCase.php} |  2 +-
 ...{BaseTypeTest.php => BaseTypeTestCase.php} |  2 +-
 .../Extension/Core/Type/ButtonTypeTest.php    |  2 +-
 .../Extension/Core/Type/CheckboxTypeTest.php  |  2 +-
 .../Extension/Core/Type/ChoiceTypeTest.php    |  2 +-
 .../Core/Type/CollectionTypeTest.php          |  2 +-
 .../Extension/Core/Type/ColorTypeTest.php     |  2 +-
 .../Extension/Core/Type/CountryTypeTest.php   |  2 +-
 .../Extension/Core/Type/CurrencyTypeTest.php  |  2 +-
 .../Core/Type/DateIntervalTypeTest.php        |  2 +-
 .../Extension/Core/Type/DateTimeTypeTest.php  |  2 +-
 .../Extension/Core/Type/DateTypeTest.php      |  2 +-
 .../Extension/Core/Type/EnumTypeTest.php      |  4 +--
 .../Extension/Core/Type/FileTypeTest.php      |  2 +-
 .../Extension/Core/Type/FormTypeTest.php      |  2 +-
 .../Extension/Core/Type/IntegerTypeTest.php   |  2 +-
 .../Extension/Core/Type/LanguageTypeTest.php  |  2 +-
 .../Extension/Core/Type/LocaleTypeTest.php    |  2 +-
 .../Extension/Core/Type/MoneyTypeTest.php     |  2 +-
 .../Extension/Core/Type/NumberTypeTest.php    |  2 +-
 .../Extension/Core/Type/PasswordTypeTest.php  |  2 +-
 .../Extension/Core/Type/RepeatedTypeTest.php  |  2 +-
 .../Extension/Core/Type/TextTypeTest.php      |  2 +-
 .../Extension/Core/Type/TimeTypeTest.php      |  2 +-
 .../Extension/Core/Type/TimezoneTypeTest.php  |  2 +-
 .../Extension/Core/Type/UlidTypeTest.php      |  2 +-
 .../Extension/Core/Type/UuidTypeTest.php      |  2 +-
 .../Extension/Core/Type/WeekTypeTest.php      |  2 +-
 .../HttpFoundationRequestHandlerTest.php      |  4 +--
 ...php => BaseValidatorExtensionTestCase.php} |  2 +-
 .../BirthdayTypeValidatorExtensionTest.php    |  2 +-
 .../CheckboxTypeValidatorExtensionTest.php    |  2 +-
 .../Type/ChoiceTypeValidatorExtensionTest.php |  2 +-
 .../CollectionTypeValidatorExtensionTest.php  |  2 +-
 .../Type/ColorTypeValidatorExtensionTest.php  |  2 +-
 .../CountryTypeValidatorExtensionTest.php     |  2 +-
 .../CurrencyTypeValidatorExtensionTest.php    |  2 +-
 ...DateIntervalTypeValidatorExtensionTest.php |  2 +-
 .../DateTimeTypeValidatorExtensionTest.php    |  2 +-
 .../Type/DateTypeValidatorExtensionTest.php   |  2 +-
 .../Type/EmailTypeValidatorExtensionTest.php  |  2 +-
 .../Type/FileTypeValidatorExtensionTest.php   |  2 +-
 .../Type/FormTypeValidatorExtensionTest.php   |  2 +-
 .../Type/HiddenTypeValidatorExtensionTest.php |  2 +-
 .../IntegerTypeValidatorExtensionTest.php     |  2 +-
 .../LanguageTypeValidatorExtensionTest.php    |  2 +-
 .../Type/LocaleTypeValidatorExtensionTest.php |  2 +-
 .../Type/MoneyTypeValidatorExtensionTest.php  |  2 +-
 .../Type/NumberTypeValidatorExtensionTest.php |  2 +-
 .../PasswordTypeValidatorExtensionTest.php    |  2 +-
 .../PercentTypeValidatorExtensionTest.php     |  2 +-
 .../Type/RadioTypeValidatorExtensionTest.php  |  2 +-
 .../Type/RangeTypeValidatorExtensionTest.php  |  2 +-
 .../RepeatedTypeValidatorExtensionTest.php    |  2 +-
 .../Type/SearchTypeValidatorExtensionTest.php |  2 +-
 .../Type/SubmitTypeValidatorExtensionTest.php |  2 +-
 .../Type/TelTypeValidatorExtensionTest.php    |  2 +-
 .../Type/TimeTypeValidatorExtensionTest.php   |  2 +-
 .../TimezoneTypeValidatorExtensionTest.php    |  2 +-
 .../Type/UrlTypeValidatorExtensionTest.php    |  2 +-
 ...verridden_option_with_default_closures.txt |  2 +-
 .../Form/Tests/NativeRequestHandlerTest.php   |  2 +-
 src/Symfony/Component/Form/composer.json      |  4 +--
 ...est.php => AbstractRedisStoreTestCase.php} |  2 +-
 ...toreTest.php => AbstractStoreTestCase.php} |  2 +-
 .../Tests/Store/BlockingStoreTestTrait.php    |  2 +-
 .../Lock/Tests/Store/CombinedStoreTest.php    |  2 +-
 .../Store/DoctrineDbalPostgreSqlStoreTest.php |  2 +-
 .../Tests/Store/DoctrineDbalStoreTest.php     |  2 +-
 .../Tests/Store/ExpiringStoreTestTrait.php    |  2 +-
 .../Lock/Tests/Store/FlockStoreTest.php       |  2 +-
 .../Lock/Tests/Store/InMemoryStoreTest.php    |  2 +-
 .../Lock/Tests/Store/MemcachedStoreTest.php   |  2 +-
 .../Lock/Tests/Store/MongoDbStoreTest.php     |  2 +-
 .../Lock/Tests/Store/PdoStoreTest.php         |  2 +-
 .../Lock/Tests/Store/PostgreSqlStoreTest.php  |  2 +-
 .../Lock/Tests/Store/PredisStoreTest.php      |  2 +-
 .../Lock/Tests/Store/RedisArrayStoreTest.php  |  2 +-
 .../Tests/Store/RedisClusterStoreTest.php     |  2 +-
 .../Lock/Tests/Store/RedisStoreTest.php       |  2 +-
 .../Lock/Tests/Store/RelayStoreTest.php       |  4 +--
 .../Lock/Tests/Store/SemaphoreStoreTest.php   |  2 +-
 .../Tests/Store/SharedLockStoreTestTrait.php  |  2 +-
 .../Tests/Store/UnserializableTestTrait.php   |  2 +-
 .../Lock/Tests/Store/ZookeeperStoreTest.php   |  2 +-
 ...hp => AbstractMimeTypeGuesserTestCase.php} |  2 +-
 .../Tests/FileBinaryMimeTypeGuesserTest.php   |  2 +-
 .../Tests/FileinfoMimeTypeGuesserTest.php     |  2 +-
 .../Component/Mime/Tests/MimeTypesTest.php    |  2 +-
 ...> PropertyAccessorArrayAccessTestCase.php} |  2 +-
 .../Tests/PropertyAccessorArrayObjectTest.php |  2 +-
 .../Tests/PropertyAccessorArrayTest.php       |  2 +-
 ...=> PropertyAccessorCollectionTestCase.php} | 30 +++++++++----------
 ...yAccessorNonTraversableArrayObjectTest.php |  2 +-
 ...ertyAccessorTraversableArrayObjectTest.php |  2 +-
 ...p => AbstractAnnotationLoaderTestCase.php} |  2 +-
 ....php => AnnotationClassLoaderTestCase.php} |  2 +-
 ...notationClassLoaderWithAnnotationsTest.php |  2 +-
 ...nnotationClassLoaderWithAttributesTest.php |  2 +-
 .../Loader/AnnotationDirectoryLoaderTest.php  |  2 +-
 .../Tests/Loader/AnnotationFileLoaderTest.php |  2 +-
 .../Tests/Loader/DirectoryLoaderTest.php      |  2 +-
 ....php => UserPasswordValid
10000
atorTestCase.php} |  2 +-
 ...est.php => AbstractRedisStoreTestCase.php} |  2 +-
 ...toreTest.php => AbstractStoreTestCase.php} |  2 +-
 .../Semaphore/Tests/Store/PredisStoreTest.php |  2 +-
 .../Tests/Store/RedisArrayStoreTest.php       |  2 +-
 .../Tests/Store/RedisClusterStoreTest.php     |  2 +-
 .../Semaphore/Tests/Store/RedisStoreTest.php  |  2 +-
 .../Semaphore/Tests/Store/RelayStoreTest.php  |  2 +-
 ...rTest.php => AnnotationLoaderTestCase.php} |  2 +-
 .../AnnotationLoaderWithAttributesTest.php    |  2 +-
 ...ationLoaderWithDoctrineAnnotationsTest.php |  2 +-
 ...Test.php => AbstractOperationTestCase.php} |  2 +-
 .../Tests/Catalogue/MergeOperationTest.php    |  2 +-
 .../Tests/Catalogue/TargetOperationTest.php   |  2 +-
 .../CollectionValidatorArrayObjectTest.php    |  2 +-
 .../CollectionValidatorArrayTest.php          |  2 +-
 ...llectionValidatorCustomArrayObjectTest.php |  2 +-
 ...st.php => CollectionValidatorTestCase.php} |  2 +-
 .../Constraints/CountValidatorArrayTest.php   |  2 +-
 .../CountValidatorCountableTest.php           |  2 +-
 ...torTest.php => CountValidatorTestCase.php} |  2 +-
 .../Constraints/FileValidatorObjectTest.php   |  2 +-
 .../Constraints/FileValidatorPathTest.php     |  2 +-
 ...atorTest.php => FileValidatorTestCase.php} |  2 +-
 255 files changed, 294 insertions(+), 294 deletions(-)
 rename src/Symfony/Bridge/Twig/Tests/Extension/{AbstractBootstrap3HorizontalLayoutTest.php => AbstractBootstrap3HorizontalLayoutTestCase.php} (98%)
 rename src/Symfony/Bridge/Twig/Tests/Extension/{AbstractBootstrap3LayoutTest.php => AbstractBootstrap3LayoutTestCase.php} (99%)
 rename src/Symfony/Bridge/Twig/Tests/Extension/{AbstractBootstrap4HorizontalLayoutTest.php => AbstractBootstrap4HorizontalLayoutTestCase.php} (98%)
 rename src/Symfony/Bridge/Twig/Tests/Extension/{AbstractBootstrap4LayoutTest.php => AbstractBootstrap4LayoutTestCase.php} (99%)
 rename src/Symfony/Bridge/Twig/Tests/Extension/{AbstractBootstrap5HorizontalLayoutTest.php => AbstractBootstrap5HorizontalLayoutTestCase.php} (99%)
 rename src/Symfony/Bridge/Twig/Tests/Extension/{AbstractBootstrap5LayoutTest.php => AbstractBootstrap5LayoutTestCase.php} (99%)
 rename src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/{AbstractDescriptorTest.php => AbstractDescriptorTestCase.php} (99%)
 rename src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/{FrameworkExtensionTest.php => FrameworkExtensionTestCase.php} (99%)
 rename src/Symfony/Bundle/FrameworkBundle/Tests/Functional/{AbstractAttributeRoutingTest.php => AbstractAttributeRoutingTestCase.php} (95%)
 rename src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/{CompleteConfigurationTest.php => CompleteConfigurationTestCase.php} (99%)
 rename src/Symfony/Component/Cache/Tests/Adapter/{AbstractRedisAdapterTest.php => AbstractRedisAdapterTestCase.php} (96%)
 rename src/Symfony/Component/Console/Tests/Descriptor/{AbstractDescriptorTest.php => AbstractDescriptorTestCase.php} (98%)
 rename src/Symfony/Component/Console/Tests/Helper/{AbstractQuestionHelperTest.php => AbstractQuestionHelperTestCase.php} (93%)
 rename src/Symfony/Component/CssSelector/Tests/Node/{AbstractNodeTest.php => AbstractNodeTestCase.php} (94%)
 rename src/Symfony/Component/CssSelector/Tests/Parser/Handler/{AbstractHandlerTest.php => AbstractHandlerTestCase.php} (97%)
 rename src/Symfony/Component/DomCrawler/Tests/{AbstractCrawlerTest.php => AbstractCrawlerTestCase.php} (99%)
 rename src/Symfony/Component/ExpressionLanguage/Tests/Node/{AbstractNodeTest.php => AbstractNodeTestCase.php} (95%)
 rename src/Symfony/Component/Form/Tests/{AbstractDivLayoutTest.php => AbstractDivLayoutTestCase.php} (99%)
 rename src/Symfony/Component/Form/Tests/{AbstractLayoutTest.php => AbstractLayoutTestCase.php} (99%)
 rename src/Symfony/Component/Form/Tests/{AbstractRequestHandlerTest.php => AbstractRequestHandlerTestCase.php} (99%)
 rename src/Symfony/Component/Form/Tests/{AbstractTableLayoutTest.php => AbstractTableLayoutTestCase.php} (99%)
 rename src/Symfony/Component/Form/Tests/ChoiceList/{AbstractChoiceListTest.php => AbstractChoiceListTestCase.php} (98%)
 rename src/Symfony/Component/Form/Tests/Console/Descriptor/{AbstractDescriptorTest.php => AbstractDescriptorTestCase.php} (99%)
 rename src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/{BaseDateTimeTransformerTest.php => BaseDateTimeTransformerTestCase.php} (95%)
 rename src/Symfony/Component/Form/Tests/Extension/Core/EventListener/{MergeCollectionListenerTest.php => MergeCollectionListenerTestCase.php} (99%)
 rename src/Symfony/Component/Form/Tests/Extension/Core/Type/{BaseTypeTest.php => BaseTypeTestCase.php} (99%)
 rename src/Symfony/Component/Form/Tests/Extension/Validator/Type/{BaseValidatorExtensionTest.php => BaseValidatorExtensionTestCase.php} (97%)
 rename src/Symfony/Component/Lock/Tests/Store/{AbstractRedisStoreTest.php => AbstractRedisStoreTestCase.php} (97%)
 rename src/Symfony/Component/Lock/Tests/Store/{AbstractStoreTest.php => AbstractStoreTestCase.php} (98%)
 rename src/Symfony/Component/Mime/Tests/{AbstractMimeTypeGuesserTest.php => AbstractMimeTypeGuesserTestCase.php} (98%)
 rename src/Symfony/Component/PropertyAccess/Tests/{PropertyAccessorArrayAccessTest.php => PropertyAccessorArrayAccessTestCase.php} (97%)
 rename src/Symfony/Component/PropertyAccess/Tests/{PropertyAccessorCollectionTest.php => PropertyAccessorCollectionTestCase.php} (82%)
 rename src/Symfony/Component/Routing/Tests/Loader/{AbstractAnnotationLoaderTest.php => AbstractAnnotationLoaderTestCase.php} (92%)
 rename src/Symfony/Component/Routing/Tests/Loader/{AnnotationClassLoaderTest.php => AnnotationClassLoaderTestCase.php} (99%)
 rename src/Symfony/Component/Security/Core/Tests/Validator/Constraints/{UserPasswordValidatorTest.php => UserPasswordValidatorTestCase.php} (98%)
 rename src/Symfony/Component/Semaphore/Tests/Store/{AbstractRedisStoreTest.php => AbstractRedisStoreTestCase.php} (90%)
 rename src/Symfony/Component/Semaphore/Tests/Store/{AbstractStoreTest.php => AbstractStoreTestCase.php} (99%)
 rename src/Symfony/Component/Serializer/Tests/Mapping/Loader/{AnnotationLoaderTest.php => AnnotationLoaderTestCase.php} (99%)
 rename src/Symfony/Component/Translation/Tests/Catalogue/{AbstractOperationTest.php => AbstractOperationTestCase.php} (97%)
 rename src/Symfony/Component/Validator/Tests/Constraints/{CollectionValidatorTest.php => CollectionValidatorTestCase.php} (99%)
 rename src/Symfony/Component/Validator/Tests/Constraints/{CountValidatorTest.php => CountValidatorTestCase.php} (99%)
 rename src/Symfony/Component/Validator/Tests/Constraints/{FileValidatorTest.php => FileValidatorTestCase.php} (99%)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
index f6e924af0f11e..4cb721f612ffa 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -35,12 +35,12 @@
 use Symfony\Component\Form\Exception\RuntimeException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Form\Forms;
-use Symfony\Component\Form\Tests\Extension\Core\Type\BaseTypeTest;
+use Symfony\Component\Form\Tests\Extension\Core\Type\BaseTypeTestCase;
 use Symfony\Component\Form\Tests\Extension\Core\Type\FormTypeTest;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 
-class EntityTypeTest extends BaseTypeTest
+class EntityTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Bridge\Doctrine\Form\Type\EntityType';
 
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 9d16c12e3273d..530063c43201e 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -29,7 +29,7 @@
         "symfony/cache": "^5.4|^6.0",
         "symfony/config": "^5.4|^6.0",
         "symfony/dependency-injection": "^6.2",
-        "symfony/form": "^5.4.9|^6.0.9",
+        "symfony/form": "^6.3",
         "symfony/http-kernel": "^6.2",
         "symfony/messenger": "^5.4|^6.0",
         "symfony/doctrine-messenger": "^5.4|^6.0",
@@ -57,7 +57,7 @@
         "phpunit/phpunit": "<5.4.3",
         "symfony/cache": "<5.4",
         "symfony/dependency-injection": "<6.2",
-        "symfony/form": "<5.4",
+        "symfony/form": "<6.3",
         "symfony/http-foundation": "<6.3",
         "symfony/http-kernel": "<6.2",
         "symfony/messenger": "<5.4",
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTestCase.php
similarity index 98%
rename from src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php
rename to src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTestCase.php
index c4874c3407092..e79b0c3141e9e 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTestCase.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bridge\Twig\Tests\Extension;
 
-abstract class AbstractBootstrap3HorizontalLayoutTest extends AbstractBootstrap3LayoutTest
+abstract class AbstractBootstrap3HorizontalLayoutTestCase extends AbstractBootstrap3LayoutTestCase
 {
     public function testLabelOnForm()
     {
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
similarity index 99%
rename from src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
rename to src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
index 9f1626bd52dd8..aa88d7bb5e21e 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
@@ -13,9 +13,9 @@
 
 use Symfony\Component\Form\Extension\Core\Type\PercentType;
 use Symfony\Component\Form\FormError;
-use Symfony\Component\Form\Tests\AbstractLayoutTest;
+use Symfony\Component\Form\Tests\AbstractLayoutTestCase;
 
-abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
+abstract class AbstractBootstrap3LayoutTestCase extends AbstractLayoutTestCase
 {
     public function testLabelOnForm()
     {
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTestCase.php
similarity index 98%
rename from src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php
rename to src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTestCase.php
index 1ef14ecf4dc0f..ce8a733665854 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTestCase.php
@@ -18,7 +18,7 @@
  *
  * @author Hidde Wieringa <hidde@hiddewieringa.nl>
  */
-abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4LayoutTest
+abstract class AbstractBootstrap4HorizontalLayoutTestCase extends AbstractBootstrap4LayoutTestCase
 {
     public function testRow()
     {
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTestCase.php
similarity index 99%
rename from src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
rename to src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTestCase.php
index af303e49ca3e8..08b4bbe78c965 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTestCase.php
@@ -28,7 +28,7 @@
  *
  * @author Hidde Wieringa <hidde@hiddewieringa.nl>
  */
-abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
+abstract class AbstractBootstrap4LayoutTestCase extends AbstractBootstrap3LayoutTestCase
 {
     public function testRow()
     {
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTestCase.php
similarity index 99%
rename from src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTest.php
rename to src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTestCase.php
index ffae59e660e5b..428d5a435dfae 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTestCase.php
@@ -24,7 +24,7 @@
  *
  * @author Romain Monteil <monteil.romain@gmail.com>
  */
-abstract class AbstractBootstrap5HorizontalLayoutTest extends AbstractBootstrap5LayoutTest
+abstract class AbstractBootstrap5HorizontalLayoutTestCase extends AbstractBootstrap5LayoutTestCase
 {
     public function testRow()
     {
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTestCase.php
similarity index 99%
rename from src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php
rename to src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTestCase.php
index dcb76b19dbe36..1057dc775c272 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTestCase.php
@@ -36,7 +36,7 @@
  *
  * @author Romain Monteil <monteil.romain@gmail.com>
  */
-abstract class AbstractBootstrap5LayoutTest extends AbstractBootstrap4LayoutTest
+abstract class AbstractBootstrap5LayoutTestCase extends AbstractBootstrap4LayoutTestCase
 {
     public function testRow()
     {
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
index a0953a2d9f346..e746a267105e2 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
@@ -21,7 +21,7 @@
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 
-class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3HorizontalLayoutTest
+class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3HorizontalLayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
index a3a6c751a0718..2b7e186c0d5cd 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
@@ -21,7 +21,7 @@
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 
-class FormExtensionBootstrap3LayoutTest extends AbstractBootstrap3LayoutTest
+class FormExtensionBootstrap3LayoutTest extends AbstractBootstrap3LayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
index 33e1862afd74a..f95e678440b4d 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
@@ -26,7 +26,7 @@
  *
  * @author Hidde Wieringa <hidde@hiddewieringa.nl>
  */
-class FormExtensionBootstrap4HorizontalLayoutTest extends AbstractBootstrap4HorizontalLayoutTest
+class FormExtensionBootstrap4HorizontalLayoutTest extends AbstractBootstrap4HorizontalLayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
index 00fee10edb2fc..2d0ca9fabab21 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
@@ -26,7 +26,7 @@
  *
  * @author Hidde Wieringa <hidde@hiddewieringa.nl>
  */
-class FormExtensionBootstrap4LayoutTest extends AbstractBootstrap4LayoutTest
+class FormExtensionBootstrap4LayoutTest extends AbstractBootstrap4LayoutTestCase
 {
     use RuntimeLoaderProvider;
     /**
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.php
index ef924884a4751..d6d2c3c2ecb06 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.php
@@ -26,7 +26,7 @@
  *
  * @author Romain Monteil <monteil.romain@gmail.com>
  */
-class FormExtensionBootstrap5HorizontalLayoutTest extends AbstractBootstrap5HorizontalLayoutTest
+class FormExtensionBootstrap5HorizontalLayoutTest extends AbstractBootstrap5HorizontalLayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php
index ed69ca81c3375..94174615a0ce0 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap5LayoutTest.php
@@ -28,7 +28,7 @@
  *
  * @author Romain Monteil <monteil.romain@gmail.com>
  */
-class FormExtensionBootstrap5LayoutTest extends AbstractBootstrap5LayoutTest
+class FormExtensionBootstrap5LayoutTest extends AbstractBootstrap5LayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
index cae1a1c6e6b4d..1ceae9f74b9e5 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -18,12 +18,12 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Form\FormRenderer;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\Tests\AbstractDivLayoutTest;
+use Symfony\Component\Form\Tests\AbstractDivLayoutTestCase;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 
-class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
+class FormExtensionDivLayoutTest extends AbstractDivLayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
index 7b75be234da3a..c0a7a9e8a8002 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -17,12 +17,12 @@
 use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
 use Symfony\Component\Form\FormRenderer;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\Tests\AbstractTableLayoutTest;
+use Symfony\Component\Form\Tests\AbstractTableLayoutTestCase;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 
-class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
+class FormExtensionTableLayoutTest extends AbstractTableLayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index f44efbc417e7a..1639803cc993c 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -28,7 +28,7 @@
         "symfony/asset": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
         "symfony/finder": "^5.4|^6.0",
-        "symfony/form": "^6.1",
+        "symfony/form": "^6.3",
         "symfony/html-sanitizer": "^6.1",
         "symfony/http-foundation": "^5.4|^6.0",
         "symfony/http-kernel": "^6.2",
@@ -57,7 +57,7 @@
         "phpdocumentor/reflection-docblock": "<3.2.2",
         "phpdocumentor/type-resolver": "<1.4.0",
         "symfony/console": "<5.4",
-        "symfony/form": "<6.1",
+        "symfony/form": "<6.3",
         "symfony/http-foundation": "<5.4",
         "symfony/http-kernel": "<6.2",
         "symfony/mime": "<6.2",
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
similarity index 99%
rename from src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
rename to src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
index 774caff0ebcf3..03cd8c7628f2d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
@@ -24,7 +24,7 @@
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
-abstract class AbstractDescriptorTest extends TestCase
+abstract class AbstractDescriptorTestCase extends TestCase
 {
     private $colSize;
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/JsonDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/JsonDescriptorTest.php
index 723b45b008940..296737a923547 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/JsonDescriptorTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/JsonDescriptorTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Bundle\FrameworkBundle\Console\Descriptor\JsonDescriptor;
 
-class JsonDescriptorTest extends AbstractDescriptorTest
+class JsonDescriptorTest extends AbstractDescriptorTestCase
 {
     protected static function getDescriptor()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/MarkdownDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/MarkdownDescriptorTest.php
index 596ba474708bc..1a653b835a3d9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/MarkdownDescriptorTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/MarkdownDescriptorTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Bundle\FrameworkBundle\Console\Descriptor\MarkdownDescriptor;
 
-class MarkdownDescriptorTest extends AbstractDescriptorTest
+class MarkdownDescriptorTest extends AbstractDescriptorTestCase
 {
     protected static function getDescriptor()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/TextDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/TextDescriptorTest.php
index cc011e6517858..55e410597344a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/TextDescriptorTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/TextDescriptorTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
 use Symfony\Component\Routing\Route;
 
-class TextDescriptorTest extends AbstractDescriptorTest
+class TextDescriptorTest extends AbstractDescriptorTestCase
 {
     private static $fileLinkFormatter = null;
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/XmlDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/XmlDescriptorTest.php
index 286f49be40f50..5b263b8171716 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/XmlDescriptorTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/XmlDescriptorTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Bundle\FrameworkBundle\Console\Descriptor\XmlDescriptor;
 
-class XmlDescriptorTest extends AbstractDescriptorTest
+class XmlDescriptorTest extends AbstractDescriptorTestCase
 {
     protected static function getDescriptor()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_not_valid.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_not_valid.php
index efb5767a3b535..c70631e77f572 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_not_valid.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_not_valid.php
@@ -1,6 +1,6 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
 
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
@@ -8,7 +8,7 @@
         'my_workflow' => [
             'type' => 'state_machine',
             'supports' => [
-                FrameworkExtensionTest::class,
+                FrameworkExtensionTestCase::class,
             ],
             'places' => [
                 'first',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php
index 37a1d7ac73007..bf9e56161d89b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_guard_expression.php
@@ -1,6 +1,6 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
 
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
@@ -8,7 +8,7 @@
         'article' => [
             'type' => 'workflow',
             'supports' => [
-                FrameworkExtensionTest::class,
+                FrameworkExtensionTestCase::class,
             ],
             'initial_marking' => ['draft'],
             'places' => [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php
index 2ba2b3491c705..bb55be79018a6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php
@@ -1,6 +1,6 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
 
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
@@ -8,7 +8,7 @@
         'article' => [
             'type' => 'workflow',
             'supports' => [
-                FrameworkExtensionTest::class,
+                FrameworkExtensionTestCase::class,
             ],
             'initial_marking' => ['draft'],
             'places' => [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_no_events_to_dispatch.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_no_events_to_dispatch.php
index 81fe174b1b2a3..b1ccc416dc6c2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_no_events_to_dispatch.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_no_events_to_dispatch.php
@@ -1,6 +1,6 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
 
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
@@ -12,7 +12,7 @@
                 'property' => 'state',
             ],
             'supports' => [
-                FrameworkExtensionTest::class,
+                FrameworkExtensionTestCase::class,
             ],
             'events_to_dispatch' => [],
             'places' => [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_specified_events_to_dispatch.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_specified_events_to_dispatch.php
index 1c434cd99c4ee..945db87a09bb3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_specified_events_to_dispatch.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_specified_events_to_dispatch.php
@@ -1,6 +1,6 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
 
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
@@ -12,7 +12,7 @@
                 'property' => 'state',
             ],
             'supports' => [
-                FrameworkExtensionTest::class,
+                FrameworkExtensionTestCase::class,
             ],
             'events_to_dispatch' => [
                 'workflow.leave',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.php
index 120bb364722dc..1443d3128315c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_support_and_support_strategy.php
@@ -1,6 +1,6 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
 
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
@@ -8,7 +8,7 @@
         'my_workflow' => [
             'type' => 'workflow',
             'supports' => [
-                FrameworkExtensionTest::class,
+                FrameworkExtensionTestCase::class,
             ],
             'support_strategy' => 'foobar',
             'places' => [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows.php
index 5cdb2563ac2b1..209d10184b045 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows.php
@@ -1,6 +1,6 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
 
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
@@ -8,7 +8,7 @@
         'article' => [
             'type' => 'workflow',
             'supports' => [
-                FrameworkExtensionTest::class,
+                FrameworkExtensionTestCase::class,
             ],
             'initial_marking' => ['draft'],
             'metadata' => [
@@ -44,7 +44,7 @@
         ],
         'pull_request' => [
             'supports' => [
-                FrameworkExtensionTest::class,
+                FrameworkExtensionTestCase::class,
             ],
             'initial_marking' => 'start',
             'metadata' => [
@@ -103,7 +103,7 @@
                 'service' => 'workflow_service',
             ],
             'supports' => [
-                FrameworkExtensionTest::class,
+                FrameworkExtensionTestCase::class,
             ],
             'places' => [
                 ['name' => 'first'],
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php
index 624389dd9ceac..8da47f9f36609 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled.php
@@ -1,6 +1,6 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
 
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
@@ -8,7 +8,7 @@
         'enabled' => true,
         'foo' => [
             'type' => 'workflow',
-            'supports' => [FrameworkExtensionTest::class],
+            'supports' => [FrameworkExtensionTestCase::class],
             'initial_marking' => ['bar'],
             'places' => ['bar', 'baz'],
             'transitions' => [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php
index 21ad8f6f42413..440e47e1b7285 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows_explicitly_enabled_named_workflows.php
@@ -1,6 +1,6 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest;
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase;
 
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
@@ -8,7 +8,7 @@
         'enabled' => true,
         'workflows' => [
             'type' => 'workflow',
-            'supports' => [FrameworkExtensionTest::class],
+            'supports' => [FrameworkExtensionTestCase::class],
             'initial_marking' => ['bar'],
             'places' => ['bar', 'baz'],
             'transitions' => [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_not_valid.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_not_valid.xml
index 12bc1b463b68d..88fb256d55630 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_not_valid.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_not_valid.xml
@@ -8,7 +8,7 @@
 
     <framework:config http-method-override="false">
         <framework:workflow name="my_workflow" type="state_machine">
-            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:place name="first" />
             <framework:place name="middle" />
             <framework:place name="last" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml
index 1a953f96352e6..a1f489497198f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_guard_expression.xml
@@ -9,7 +9,7 @@
     <framework:config http-method-override="false">
         <framework:workflow name="article" type="workflow">
             <framework:initial-marking>draft</framework:initial-marking>
-            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:place>draft</framework:place>
             <framework:place>wait_for_journalist</framework:place>
             <framework:place>approved_by_journalist</framework:place>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml
index 3bf4657eccac3..cf610b6443a26 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml
@@ -9,7 +9,7 @@
     <framework:config http-method-override="false">
         <framework:workflow name="article" type="workflow">
             <framework:initial-marking>draft</framework:initial-marking>
-            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:place name="draft" />
             <framework:place name="wait_for_journalist" />
             <framework:place name="approved_by_journalist" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_no_events_to_dispatch.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_no_events_to_dispatch.xml
index 4fc6a02341fd1..577613699ddc0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_no_events_to_dispatch.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_no_events_to_dispatch.xml
@@ -10,7 +10,7 @@
         <framework:workflow name="my_workflow" type="state_machine">
             <framework:initial-marking>one</framework:initial-marking>
             <framework:marking-store type="method" property="state" />
-            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:event-to-dispatch></framework:event-to-dispatch>
             <framework:place name="one" />
             <framework:place name="two" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_specified_events_to_dispatch.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_specified_events_to_dispatch.xml
index 48091a9b01184..219ffe87c5a8c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_specified_events_to_dispatch.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_specified_events_to_dispatch.xml
@@ -10,7 +10,7 @@
         <framework:workflow name="my_workflow" type="state_machine">
             <framework:initial-marking>one</framework:initial-marking>
             <framework:marking-store type="method" property="state" />
-            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:event-to-dispatch>workflow.leave</framework:event-to-dispatch>
             <framework:event-to-dispatch>workflow.completed</framework:event-to-dispatch>
             <framework:place name="one" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml
index 139259826af2e..6491e172bcf42 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_support_and_support_strategy.xml
@@ -8,7 +8,7 @@
 
     <framework:config http-method-override="false">
         <framework:workflow name="my_workflow" support-strategy="foobar" type="workflow">
-            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:place name="first" />
             <framework:place name="last" />
             <framework:transition name="foobar">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
index 5e9f1d1bff700..067206ff11921 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
@@ -11,7 +11,7 @@
             <framework:audit-trail enabled="true"/>
             <framework:initial-marking>draft</framework:initial-marking>
             <framework:marking-store type="method" property="state" />
-            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:place name="draft" />
             <framework:place name="wait_for_journalist" />
             <framework:place name="approved_by_journalist" />
@@ -45,7 +45,7 @@
         <framework:workflow name="pull_request">
             <framework:audit-trail enabled="false"/>
             <framework:initial-marking>start</framework:initial-marking>
-            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:place name="start">
                 <framework:metadata>
                     <framework:title>place start title</framework:title>
@@ -96,7 +96,7 @@
 
         <framework:workflow name="service_marking_store_workflow" type="workflow">
             <framework:marking-store service="workflow_service"/>
-            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <!-- Simple format -->
             <framework:place>first</framework:place>
             <framework:place>last</framework:place>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml
index a3d7f8bfa623b..226c09814c2f2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled.xml
@@ -7,7 +7,7 @@
 
     <framework:config http-method-override="false">
         <framework:workflow enabled="true" name="foo" type="workflow" initial-marking="bar">
-            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:place>bar</framework:place>
             <framework:place>baz</framework:place>
             <framework:transition name="bar_baz">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml
index 3569297c45784..59d91e76da315 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows_explicitly_enabled_named_workflows.xml
@@ -8,7 +8,7 @@
     <framework:config http-method-override="false">
         <framework:workflow enabled="true" name="workflows" type="workflow">
             <framework:initial-marking>bar</framework:initial-marking>
-            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
+            <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:place>bar</framework:place>
             <framework:place>baz</framework:place>
             <framework:transition name="bar_baz">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_not_valid.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_not_valid.yml
index 29eeb8e9ad18d..f651f087936b8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_not_valid.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_not_valid.yml
@@ -4,7 +4,7 @@ framework:
         my_workflow:
             type: state_machine
             supports:
-                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
             places: [first, middle, last]
             transitions:
                 go:
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_guard_expression.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_guard_expression.yml
index 6855c013053b2..7d56712d47b53 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_guard_expression.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_guard_expression.yml
@@ -4,7 +4,7 @@ framework:
         article:
             type: workflow
             supports:
-                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
             initial_marking: [draft]
             places:
                 - draft
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_multiple_transitions_with_same_name.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_multiple_transitions_with_same_name.yml
index 384bd47170bfa..38f066fffa173 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_multiple_transitions_with_same_name.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_multiple_transitions_with_same_name.yml
@@ -4,7 +4,7 @@ framework:
         article:
             type: workflow
             supports:
-                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
             initial_marking: [draft]
             places:
                 - draft
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_no_events_to_dispatch.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_no_events_to_dispatch.yml
index c511543df056d..7686463c42884 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_no_events_to_dispatch.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_no_events_to_dispatch.yml
@@ -9,7 +9,7 @@ framework:
                 type: method
                 property: state
             supports:
-                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
             places:
                 - one
                 - two
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_specified_events_to_dispatch.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_specified_events_to_dispatch.yml
index 703195b557664..1d6067fbc0180 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_specified_events_to_dispatch.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_specified_events_to_dispatch.yml
@@ -9,7 +9,7 @@ framework:
                 type: method
                 property: state
             supports:
-                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
             places:
                 - one
                 - two
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_support_and_support_strategy.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_support_and_support_strategy.yml
index a57bc555b6fb7..bab7d22a464a4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_support_and_support_strategy.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_support_and_support_strategy.yml
@@ -4,7 +4,7 @@ framework:
         my_workflow:
             type: workflow
             supports:
-                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
             support_strategy: foobar
             places:
                 - first
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml
index ff1b926b09997..f0f57d89e236e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml
@@ -4,7 +4,7 @@ framework:
         article:
             type: workflow
             supports:
-                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
             initial_marking: [draft]
             metadata:
                 title: article workflow
@@ -32,7 +32,7 @@ framework:
                     to: [published]
         pull_request:
             supports:
-                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
             initial_marking: start
             metadata:
                 title: workflow title
@@ -75,7 +75,7 @@ framework:
             marking_store:
                 service: workflow_service
             supports:
-                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
             places:
                 - { name: first }
                 - { name: last }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled.yml
index 1ee334125e3d1..c4bfbe3e31310 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled.yml
@@ -6,7 +6,7 @@ framework:
             foo:
                 type: workflow
                 supports:
-                    - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+                    - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
                 initial_marking: [bar]
                 places:
                     - bar
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled_named_workflows.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled_named_workflows.yml
index 0dcfc93a1c209..24d8f17416c04 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled_named_workflows.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows_explicitly_enabled_named_workflows.yml
@@ -5,7 +5,7 @@ framework:
         workflows:
             type: workflow
             supports:
-                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
             initial_marking: [bar]
             places:
                 - bar
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
similarity index 99%
rename from src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
rename to src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
index e3416357c162b..a2621f7f1bbf8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -85,7 +85,7 @@
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\TagAwareCacheInterface;
 
-abstract class FrameworkExtensionTest extends TestCase
+abstract class FrameworkExtensionTestCase extends TestCase
 {
     use ExpectDeprecationTrait;
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
index a904c4c86ee90..5daeaa14ec28e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
@@ -18,7 +18,7 @@
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 use Symfony\Component\Workflow\Exception\InvalidDefinitionException;
 
-class PhpFrameworkExtensionTest extends FrameworkExtensionTest
+class PhpFrameworkExtensionTest extends FrameworkExtensionTestCase
 {
     protected function loadFromFile(ContainerBuilder $container, $file)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
index 131bb07f0c657..944e19709e5b1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
-class XmlFrameworkExtensionTest extends FrameworkExtensionTest
+class XmlFrameworkExtensionTest extends FrameworkExtensionTestCase
 {
     protected function loadFromFile(ContainerBuilder $container, $file)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/YamlFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/YamlFrameworkExtensionTest.php
index 457467aa11d77..cb5a0a5e16f6f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/YamlFrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/YamlFrameworkExtensionTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-class YamlFrameworkExtensionTest extends FrameworkExtensionTest
+class YamlFrameworkExtensionTest extends FrameworkExtensionTestCase
 {
     protected function loadFromFile(ContainerBuilder $container, $file)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractAttributeRoutingTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractAttributeRoutingTestCase.php
similarity index 95%
rename from src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractAttributeRoutingTest.php
rename to src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractAttributeRoutingTestCase.php
index 8f8747bfff495..436d84c44bae4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractAttributeRoutingTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AbstractAttributeRoutingTestCase.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\HttpFoundation\Request;
 
-abstract class AbstractAttributeRoutingTest extends AbstractWebTestCase
+abstract class AbstractAttributeRoutingTestCase extends AbstractWebTestCase
 {
     /**
      * @dataProvider getRoutes
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AnnotatedControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AnnotatedControllerTest.php
index 631d75bb50dff..9ca913748d5b3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AnnotatedControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AnnotatedControllerTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-class AnnotatedControllerTest extends AbstractAttributeRoutingTest
+class AnnotatedControllerTest extends AbstractAttributeRoutingTestCase
 {
     protected function getTestCaseApp(): string
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Psr4RoutingTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Psr4RoutingTest.php
index 0d0d715c9d0b4..811a99a112c0c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Psr4RoutingTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Psr4RoutingTest.php
@@ -14,7 +14,7 @@
 /**
  * @requires function Symfony\Component\Routing\Loader\Psr4DirectoryLoader::__construct
  */
-final class Psr4RoutingTest extends AbstractAttributeRoutingTest
+final class Psr4RoutingTest extends AbstractAttributeRoutingTestCase
 {
     protected function getTestCaseApp(): string
     {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTestCase.php
similarity index 99%
rename from src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
rename to src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTestCase.php
index 8c521c8a03414..f89700c871268 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTestCase.php
@@ -35,7 +35,7 @@
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\CsrfTokenBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge;
 
-abstract class CompleteConfigurationTest extends TestCase
+abstract class CompleteConfigurationTestCase extends TestCase
 {
     abstract protected function getLoader(ContainerBuilder $container);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/PhpCompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/PhpCompleteConfigurationTest.php
index 846d01d5337ca..c4297c7b9c0e1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/PhpCompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/PhpCompleteConfigurationTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
-class PhpCompleteConfigurationTest extends CompleteConfigurationTest
+class PhpCompleteConfigurationTest extends CompleteConfigurationTestCase
 {
     protected function getLoader(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/XmlCompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/XmlCompleteConfigurationTest.php
index 00006a756a2ec..eccfabef77950 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/XmlCompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/XmlCompleteConfigurationTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
-class XmlCompleteConfigurationTest extends CompleteConfigurationTest
+class XmlCompleteConfigurationTest extends CompleteConfigurationTestCase
 {
     protected function getLoader(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/YamlCompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/YamlCompleteConfigurationTest.php
index 8e3954a057daf..4fd2d44e117c1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/YamlCompleteConfigurationTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/YamlCompleteConfigurationTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-class YamlCompleteConfigurationTest extends CompleteConfigurationTest
+class YamlCompleteConfigurationTest extends CompleteConfigurationTestCase
 {
     protected function getLoader(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php
similarity index 96%
rename from src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
rename to src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php
index a1e8d19edc5cc..10382178c8375 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php
@@ -15,7 +15,7 @@
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 
-abstract class AbstractRedisAdapterTest extends AdapterTestCas
10000
e
+abstract class AbstractRedisAdapterTestCase extends AdapterTestCase
 {
     protected $skippedTests = [
         'testExpiration' => 'Testing expiration slows down the test suite',
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterSentinelTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterSentinelTest.php
index a3d0cf36253c4..c3145b9e27f71 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterSentinelTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterSentinelTest.php
@@ -17,7 +17,7 @@
 /**
  * @group integration
  */
-class PredisAdapterSentinelTest extends AbstractRedisAdapterTest
+class PredisAdapterSentinelTest extends AbstractRedisAdapterTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php
index 28a2ca48724ab..28077e36e8f94 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisAdapterTest.php
@@ -17,7 +17,7 @@
 /**
  * @group integration
  */
-class PredisAdapterTest extends AbstractRedisAdapterTest
+class PredisAdapterTest extends AbstractRedisAdapterTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php
index 936c04aad49fb..c64384bb7a293 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php
@@ -14,7 +14,7 @@
 /**
  * @group integration
  */
-class PredisClusterAdapterTest extends AbstractRedisAdapterTest
+class PredisClusterAdapterTest extends AbstractRedisAdapterTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
index 4367ce0bfa510..3337272a34ad1 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
@@ -17,7 +17,7 @@
 /**
  * @group integration
  */
-class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTest
+class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php
index 37282e8fceee8..1f800e19d1cdf 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php
@@ -20,7 +20,7 @@
 /**
  * @group integration
  */
-class ProxyAdapterAndRedisAdapterTest extends AbstractRedisAdapterTest
+class ProxyAdapterAndRedisAdapterTest extends AbstractRedisAdapterTestCase
 {
     protected $skippedTests = [
         'testPrune' => 'RedisAdapter does not implement PruneableInterface.',
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
index 5291580c4ce7e..a4c2487a00b1f 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
@@ -19,7 +19,7 @@
 /**
  * @group integration
  */
-class RedisAdapterSentinelTest extends AbstractRedisAdapterTest
+class RedisAdapterSentinelTest extends AbstractRedisAdapterTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
index 3caaa28774ec8..f5473ace79bfe 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterTest.php
@@ -20,7 +20,7 @@
 /**
  * @group integration
  */
-class RedisAdapterTest extends AbstractRedisAdapterTest
+class RedisAdapterTest extends AbstractRedisAdapterTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php
index f9d481dba781f..58ca31441f5fb 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php
@@ -16,7 +16,7 @@
 /**
  * @group integration
  */
-class RedisArrayAdapterTest extends AbstractRedisAdapterTest
+class RedisArrayAdapterTest extends AbstractRedisAdapterTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php
index fca50690aef5e..d054a5834fc5e 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RedisClusterAdapterTest.php
@@ -21,7 +21,7 @@
 /**
  * @group integration
  */
-class RedisClusterAdapterTest extends AbstractRedisAdapterTest
+class RedisClusterAdapterTest extends AbstractRedisAdapterTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterSentinelTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterSentinelTest.php
index 60f506f931871..c52fab66f1f28 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterSentinelTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterSentinelTest.php
@@ -19,7 +19,7 @@
 /**
  * @group integration
  */
-class RelayAdapterSentinelTest extends AbstractRedisAdapterTest
+class RelayAdapterSentinelTest extends AbstractRedisAdapterTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterTest.php
index e98fc9bcf69e1..a3dad2b3ade03 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/RelayAdapterTest.php
@@ -23,7 +23,7 @@
  *
  * @group integration
  */
-class RelayAdapterTest extends AbstractRedisAdapterTest
+class RelayAdapterTest extends AbstractRedisAdapterTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTestCase.php
similarity index 98%
rename from src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
rename to src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTestCase.php
index 2095266965ef7..b97c3ccaa9940 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTestCase.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\BufferedOutput;
 
-abstract class AbstractDescriptorTest extends TestCase
+abstract class AbstractDescriptorTestCase extends TestCase
 {
     /** @dataProvider getDescribeInputArgumentTestData */
     public function testDescribeInputArgument(InputArgument $argument, $expectedDescription)
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
index baaa992752336..201bd8faca3f2 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Console\Descriptor\JsonDescriptor;
 
-class JsonDescriptorTest extends AbstractDescriptorTest
+class JsonDescriptorTest extends AbstractDescriptorTestCase
 {
     protected function getDescriptor()
     {
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
index a8f11cb4aeb46..f577027c28bfd 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Console\Tests\Fixtures\DescriptorApplicationMbString;
 use Symfony\Component\Console\Tests\Fixtures\DescriptorCommandMbString;
 
-class MarkdownDescriptorTest extends AbstractDescriptorTest
+class MarkdownDescriptorTest extends AbstractDescriptorTestCase
 {
     public function getDescribeCommandTestData()
     {
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/ReStructuredTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/ReStructuredTextDescriptorTest.php
index 6179b1760d808..0541c9abea3de 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/ReStructuredTextDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/ReStructuredTextDescriptorTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Console\Tests\Fixtures\DescriptorApplicationMbString;
 use Symfony\Component\Console\Tests\Fixtures\DescriptorCommandMbString;
 
-class ReStructuredTextDescriptorTest extends AbstractDescriptorTest
+class ReStructuredTextDescriptorTest extends AbstractDescriptorTestCase
 {
     public function getDescribeCommandTestData()
     {
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
index 26bbd907a73dd..cb04d6a8a6b7f 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\Console\Tests\Fixtures\DescriptorApplicationMbString;
 use Symfony\Component\Console\Tests\Fixtures\DescriptorCommandMbString;
 
-class TextDescriptorTest extends AbstractDescriptorTest
+class TextDescriptorTest extends AbstractDescriptorTestCase
 {
     public function getDescribeCommandTestData()
     {
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php
index 59a5d1ed8a2a5..76c5aab3e1dca 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Console\Descriptor\XmlDescriptor;
 
-class XmlDescriptorTest extends AbstractDescriptorTest
+class XmlDescriptorTest extends AbstractDescriptorTestCase
 {
     protected function getDescriptor()
     {
diff --git a/src/Symfony/Component/Console/Tests/Helper/AbstractQuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/AbstractQuestionHelperTestCase.php
similarity index 93%
rename from src/Symfony/Component/Console/Tests/Helper/AbstractQuestionHelperTest.php
rename to src/Symfony/Component/Console/Tests/Helper/AbstractQuestionHelperTestCase.php
index 3da1216244432..66f45c27f0a4c 100644
--- a/src/Symfony/Component/Console/Tests/Helper/AbstractQuestionHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/AbstractQuestionHelperTestCase.php
@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\StreamableInputInterface;
 
-abstract class AbstractQuestionHelperTest extends TestCase
+abstract class AbstractQuestionHelperTestCase extends TestCase
 {
     protected function createStreamableInputInterfaceMock($stream = null, $interactive = true)
     {
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
index 59f8c7598f963..5e15c6ba9cef9 100644
--- a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -30,7 +30,7 @@
 /**
  * @group tty
  */
-class QuestionHelperTest extends AbstractQuestionHelperTest
+class QuestionHelperTest extends AbstractQuestionHelperTestCase
 {
     public function testAskChoice()
     {
diff --git a/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
index d32fbc2a58d93..2af0b199c07f0 100644
--- a/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -23,7 +23,7 @@
 /**
  * @group tty
  */
-class SymfonyQuestionHelperTest extends AbstractQuestionHelperTest
+class SymfonyQuestionHelperTest extends AbstractQuestionHelperTestCase
 {
     public function testAskChoice()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/AbstractNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/AbstractNodeTestCase.php
similarity index 94%
rename from src/Symfony/Component/CssSelector/Tests/Node/AbstractNodeTest.php
rename to src/Symfony/Component/CssSelector/Tests/Node/AbstractNodeTestCase.php
index 595551338061e..5519dce8392a4 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/AbstractNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/AbstractNodeTestCase.php
@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\CssSelector\Node\NodeInterface;
 
-abstract class AbstractNodeTest extends TestCase
+abstract class AbstractNodeTestCase extends TestCase
 {
     /** @dataProvider getToStringConversionTestData */
     public function testToStringConversion(NodeInterface $node, $representation)
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/AttributeNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/AttributeNodeTest.php
index 4d60074061f07..c42449120aead 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/AttributeNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/AttributeNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Node\AttributeNode;
 use Symfony\Component\CssSelector\Node\ElementNode;
 
-class AttributeNodeTest extends AbstractNodeTest
+class AttributeNodeTest extends AbstractNodeTestCase
 {
     public function getToStringConversionTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/ClassNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/ClassNodeTest.php
index aa80c92792f39..f6af741979d18 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/ClassNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/ClassNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Node\ClassNode;
 use Symfony\Component\CssSelector\Node\ElementNode;
 
-class ClassNodeTest extends AbstractNodeTest
+class ClassNodeTest extends AbstractNodeTestCase
 {
     public function getToStringConversionTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/CombinedSelectorNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/CombinedSelectorNodeTest.php
index 435eaa6aa6981..b47fc651a574e 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/CombinedSelectorNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/CombinedSelectorNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Node\CombinedSelectorNode;
 use Symfony\Component\CssSelector\Node\ElementNode;
 
-class CombinedSelectorNodeTest extends AbstractNodeTest
+class CombinedSelectorNodeTest extends AbstractNodeTestCase
 {
     public function getToStringConversionTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/ElementNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/ElementNodeTest.php
index e0797ff09cf5a..170645ee459c0 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/ElementNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/ElementNodeTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\CssSelector\Node\ElementNode;
 
-class ElementNodeTest extends AbstractNodeTest
+class ElementNodeTest extends AbstractNodeTestCase
 {
     public function getToStringConversionTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/FunctionNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/FunctionNodeTest.php
index 0932393e1aa10..8579f8c58876d 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/FunctionNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/FunctionNodeTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\CssSelector\Node\FunctionNode;
 use Symfony\Component\CssSelector\Parser\Token;
 
-class FunctionNodeTest extends AbstractNodeTest
+class FunctionNodeTest extends AbstractNodeTestCase
 {
     public function getToStringConversionTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/HashNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/HashNodeTest.php
index ad6765b8625c4..eb6de45bb4321 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/HashNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/HashNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Node\ElementNode;
 use Symfony\Component\CssSelector\Node\HashNode;
 
-class HashNodeTest extends AbstractNodeTest
+class HashNodeTest extends AbstractNodeTestCase
 {
     public function getToStringConversionTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/NegationNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/NegationNodeTest.php
index 90b684ceec8b4..6bca18bae6f62 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/NegationNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/NegationNodeTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\CssSelector\Node\ElementNode;
 use Symfony\Component\CssSelector\Node\NegationNode;
 
-class NegationNodeTest extends AbstractNodeTest
+class NegationNodeTest extends AbstractNodeTestCase
 {
     public function getToStringConversionTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/PseudoNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/PseudoNodeTest.php
index 4e78776c02a41..366836d4651cc 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/PseudoNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/PseudoNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Node\ElementNode;
 use Symfony\Component\CssSelector\Node\PseudoNode;
 
-class PseudoNodeTest extends AbstractNodeTest
+class PseudoNodeTest extends AbstractNodeTestCase
 {
     public function getToStringConversionTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Node/SelectorNodeTest.php b/src/Symfony/Component/CssSelector/Tests/Node/SelectorNodeTest.php
index 85e3bdac3fdef..4d1518ae39208 100644
--- a/src/Symfony/Component/CssSelector/Tests/Node/SelectorNodeTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Node/SelectorNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Node\ElementNode;
 use Symfony\Component\CssSelector\Node\SelectorNode;
 
-class SelectorNodeTest extends AbstractNodeTest
+class SelectorNodeTest extends AbstractNodeTestCase
 {
     public function getToStringConversionTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/AbstractHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/AbstractHandlerTestCase.php
similarity index 97%
rename from src/Symfony/Component/CssSelector/Tests/Parser/Handler/AbstractHandlerTest.php
rename to src/Symfony/Component/CssSelector/Tests/Parser/Handler/AbstractHandlerTestCase.php
index 8afc7ae8e2646..1f642efb64faf 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/AbstractHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/AbstractHandlerTestCase.php
@@ -19,7 +19,7 @@
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
-abstract class AbstractHandlerTest extends TestCase
+abstract class AbstractHandlerTestCase extends TestCase
 {
     /** @dataProvider getHandleValueTestData */
     public function testHandleValue($value, Token $expectedToken, $remainingContent)
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/CommentHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/CommentHandlerTest.php
index de400478d8a0e..59eaeba7f68ab 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/CommentHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/CommentHandlerTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\CssSelector\Parser\Token;
 use Symfony\Component\CssSelector\Parser\TokenStream;
 
-class CommentHandlerTest extends AbstractHandlerTest
+class CommentHandlerTest extends AbstractHandlerTestCase
 {
     /** @dataProvider getHandleValueTestData */
     public function testHandleValue($value, Token $unusedArgument, $remainingContent)
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/HashHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/HashHandlerTest.php
index 9444f5106f33d..a156305ea8616 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/HashHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/HashHandlerTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 
-class HashHandlerTest extends AbstractHandlerTest
+class HashHandlerTest extends AbstractHandlerTestCase
 {
     public function getHandleValueTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/IdentifierHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/IdentifierHandlerTest.php
index c54ba537b8a27..3bc35a9180861 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/IdentifierHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/IdentifierHandlerTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 
-class IdentifierHandlerTest extends AbstractHandlerTest
+class IdentifierHandlerTest extends AbstractHandlerTestCase
 {
     public function getHandleValueTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/NumberHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/NumberHandlerTest.php
index b43d369421840..07a601871b49f 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/NumberHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/NumberHandlerTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\CssSelector\Parser\Token;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 
-class NumberHandlerTest extends AbstractHandlerTest
+class NumberHandlerTest extends AbstractHandlerTestCase
 {
     public function getHandleValueTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/StringHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/StringHandlerTest.php
index baa72735ff165..133ae38524355 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/StringHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/StringHandlerTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 
-class StringHandlerTest extends AbstractHandlerTest
+class StringHandlerTest extends AbstractHandlerTestCase
 {
     public function getHandleValueTestData()
     {
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/WhitespaceHandlerTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/WhitespaceHandlerTest.php
index 67509ef135473..7a1b893af847a 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/Handler/WhitespaceHandlerTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/Handler/WhitespaceHandlerTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Parser\Handler\WhitespaceHandler;
 use Symfony\Component\CssSelector\Parser\Token;
 
-class WhitespaceHandlerTest extends AbstractHandlerTest
+class WhitespaceHandlerTest extends AbstractHandlerTestCase
 {
     public function getHandleValueTestData()
     {
diff --git a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php
similarity index 99%
rename from src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
rename to src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php
index 51f38e9c698b9..9cd009eab59d7 100644
--- a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php
@@ -17,7 +17,7 @@
 use Symfony\Component\DomCrawler\Image;
 use Symfony\Component\DomCrawler\Link;
 
-abstract class AbstractCrawlerTest extends TestCase
+abstract class AbstractCrawlerTestCase extends TestCase
 {
     abstract public static function getDoctype(): string;
 
diff --git a/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php
index 05a1e79b7fcbf..1b3f0962abb03 100644
--- a/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\DomCrawler\Tests;
 
-class Html5ParserCrawlerTest extends AbstractCrawlerTest
+class Html5ParserCrawlerTest extends AbstractCrawlerTestCase
 {
     public static function getDoctype(): string
     {
diff --git a/src/Symfony/Component/DomCrawler/Tests/NativeParserCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/NativeParserCrawlerTest.php
index c0cac9e8b603f..c61d9354b0371 100644
--- a/src/Symfony/Component/DomCrawler/Tests/NativeParserCrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/NativeParserCrawlerTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\DomCrawler\Tests;
 
-class NativeParserCrawlerTest extends AbstractCrawlerTest
+class NativeParserCrawlerTest extends AbstractCrawlerTestCase
 {
     public static function getDoctype(): string
     {
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTestCase.php
similarity index 95%
rename from src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTest.php
rename to src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTestCase.php
index 81625c54dc496..7521788835144 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/AbstractNodeTestCase.php
@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\ExpressionLanguage\Compiler;
 
-abstract class AbstractNodeTest extends TestCase
+abstract class AbstractNodeTestCase extends TestCase
 {
     /**
      * @dataProvider getEvaluateData
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ArrayNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ArrayNodeTest.php
index db0651309ec35..fcd76364c38e7 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ArrayNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ArrayNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\ExpressionLanguage\Node\ArrayNode;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 
-class ArrayNodeTest extends AbstractNodeTest
+class ArrayNodeTest extends AbstractNodeTestCase
 {
     public function testSerialization()
     {
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
index 67d7f726c4121..610c6b0dd289b 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
@@ -19,7 +19,7 @@
 use Symfony\Component\ExpressionLanguage\Node\NameNode;
 use Symfony\Component\ExpressionLanguage\SyntaxError;
 
-class BinaryNodeTest extends AbstractNodeTest
+class BinaryNodeTest extends AbstractNodeTestCase
 {
     use ExpectDeprecationTrait;
 
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConditionalNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConditionalNodeTest.php
index 497b6d05237b1..4555429bfee59 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConditionalNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConditionalNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\ExpressionLanguage\Node\ConditionalNode;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 
-class ConditionalNodeTest extends AbstractNodeTest
+class ConditionalNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConstantNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConstantNodeTest.php
index 2d0a55e86c7bf..f1b10041d0e44 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConstantNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/ConstantNodeTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 
-class ConstantNodeTest extends AbstractNodeTest
+class ConstantNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/FunctionNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/FunctionNodeTest.php
index cff73141bda53..aa667f7e4212e 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/FunctionNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/FunctionNodeTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\ExpressionLanguage\Node\FunctionNode;
 use Symfony\Component\ExpressionLanguage\Node\Node;
 
-class FunctionNodeTest extends AbstractNodeTest
+class FunctionNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/GetAttrNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/GetAttrNodeTest.php
index 15cbe05e52e58..df8eceaae912e 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/GetAttrNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/GetAttrNodeTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\ExpressionLanguage\Node\GetAttrNode;
 use Symfony\Component\ExpressionLanguage\Node\NameNode;
 
-class GetAttrNodeTest extends AbstractNodeTest
+class GetAttrNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/NameNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/NameNodeTest.php
index f0f60d1574174..661466f7fd2e9 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/NameNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/NameNodeTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\ExpressionLanguage\Node\NameNode;
 
-class NameNodeTest extends AbstractNodeTest
+class NameNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/UnaryNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/UnaryNodeTest.php
index bb7cea5a5bf29..7da4be718201a 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/Node/UnaryNodeTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/Node/UnaryNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 use Symfony\Component\ExpressionLanguage\Node\UnaryNode;
 
-class UnaryNodeTest extends AbstractNodeTest
+class UnaryNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {
diff --git a/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractDivLayoutTestCase.php
similarity index 99%
rename from src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
rename to src/Symfony/Component/Form/Tests/AbstractDivLayoutTestCase.php
index 23b90ebf7629c..32468895d901b 100644
--- a/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractDivLayoutTestCase.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Security\Csrf\CsrfToken;
 
-abstract class AbstractDivLayoutTest extends AbstractLayoutTest
+abstract class AbstractDivLayoutTestCase extends AbstractLayoutTestCase
 {
     public function testRow()
     {
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
similarity index 99%
rename from src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
rename to src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
index 58e853e111e5a..f1ca19a2d4d26 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
@@ -23,7 +23,7 @@
 use Symfony\Contracts\Translation\TranslatableInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-abstract class AbstractLayoutTest extends FormIntegrationTestCase
+abstract class AbstractLayoutTestCase extends FormIntegrationTestCase
 {
     use VersionAwareTest;
 
diff --git a/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php b/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTestCase.php
similarity index 99%
rename from src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
rename to src/Symfony/Component/Form/Tests/AbstractRequestHandlerTestCase.php
index 1d33451d45293..15a0f0352270b 100644
--- a/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTestCase.php
@@ -27,7 +27,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class AbstractRequestHandlerTest extends TestCase
+abstract class AbstractRequestHandlerTestCase extends TestCase
 {
     /**
      * @var RequestHandlerInterface
diff --git a/src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractTableLayoutTestCase.php
similarity index 99%
rename from src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php
rename to src/Symfony/Component/Form/Tests/AbstractTableLayoutTestCase.php
index 5ce77a7f8aec4..09d669129fce9 100644
--- a/src/Symfony/Component/Form/Tests/AbstractTableLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractTableLayoutTestCase.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Security\Csrf\CsrfToken;
 
-abstract class AbstractTableLayoutTest extends AbstractLayoutTest
+abstract class AbstractTableLayoutTestCase extends AbstractLayoutTestCase
 {
     public function testRow()
     {
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/AbstractChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/AbstractChoiceListTestCase.php
similarity index 98%
rename from src/Symfony/Component/Form/Tests/ChoiceList/AbstractChoiceListTest.php
rename to src/Symfony/Component/Form/Tests/ChoiceList/AbstractChoiceListTestCase.php
index d2aac23e3afaf..dd55bfcff0555 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/AbstractChoiceListTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/AbstractChoiceListTestCase.php
@@ -17,7 +17,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class AbstractChoiceListTest extends TestCase
+abstract class AbstractChoiceListTestCase extends TestCase
 {
     /**
      * @var ChoiceListInterface
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
index 5dc2e5db909eb..835085a7acb5f 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/ArrayChoiceListTest.php
@@ -17,7 +17,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class ArrayChoiceListTest extends AbstractChoiceListTest
+class ArrayChoiceListTest extends AbstractChoiceListTestCase
 {
     private $object;
 
diff --git a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
similarity index 99%
rename from src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
rename to src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
index 15532929419ae..3fea781b6c617 100644
--- a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
@@ -26,7 +26,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Csrf\CsrfTokenManager;
 
-abstract class AbstractDescriptorTest extends TestCase
+abstract class AbstractDescriptorTestCase extends TestCase
 {
     private $colSize;
 
diff --git a/src/Symfony/Component/Form/Tests/Console/Descriptor/JsonDescriptorTest.php b/src/Symfony/Component/Form/Tests/Console/Descriptor/JsonDescriptorTest.php
index c035be6bcd9cf..4545ee2b01659 100644
--- a/src/Symfony/Component/Form/Tests/Console/Descriptor/JsonDescriptorTest.php
+++ b/src/Symfony/Component/Form/Tests/Console/Descriptor/JsonDescriptorTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Form\Console\Descriptor\JsonDescriptor;
 
-class JsonDescriptorTest extends AbstractDescriptorTest
+class JsonDescriptorTest extends AbstractDescriptorTestCase
 {
     protected function getDescriptor()
     {
diff --git a/src/Symfony/Component/Form/Tests/Console/Descriptor/TextDescriptorTest.php b/src/Symfony/Component/Form/Tests/Console/Descriptor/TextDescriptorTest.php
index c970eba96e62f..575783c74ace4 100644
--- a/src/Symfony/Component/Form/Tests/Console/Descriptor/TextDescriptorTest.php
+++ b/src/Symfony/Component/Form/Tests/Console/Descriptor/TextDescriptorTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Form\Console\Descriptor\TextDescriptor;
 
-class TextDescriptorTest extends AbstractDescriptorTest
+class TextDescriptorTest extends AbstractDescriptorTestCase
 {
     protected function getDescriptor()
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTestCase.php
similarity index 95%
rename from src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
rename to src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTestCase.php
index e3f101a8aac96..7e86f2c069118 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTestCase.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Form\Exception\InvalidArgumentException;
 use Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer;
 
-abstract class BaseDateTimeTransformerTest extends TestCase
+abstract class BaseDateTimeTransformerTestCase extends TestCase
 {
     public function testConstructFailsIfInputTimezoneIsInvalid()
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
index 3aafbec88a4ec..08e05c58405f2 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;
 
-class DateTimeToArrayTransformerTest extends BaseDateTimeTransformerTest
+class DateTimeToArrayTransformerTest extends BaseDateTimeTransformerTestCase
 {
     public function testTransform()
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
index 6e6e66afb1861..6a3475dd3ee2b 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToHtml5LocalDateTimeTransformer;
 use Symfony\Component\Form\Tests\Extension\Core\DataTransformer\Traits\DateTimeEqualsTrait;
 
-class DateTimeToHtml5LocalDateTimeTransformerTest extends BaseDateTimeTransformerTest
+class DateTimeToHtml5LocalDateTimeTransformerTest extends BaseDateTimeTransformerTestCase
 {
     use DateTimeEqualsTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
index 2212bcf99ef7e..fe829a4299901 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Form\Tests\Extension\Core\DataTransformer\Traits\DateTimeEqualsTrait;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class DateTimeToLocalizedStringTransformerTest extends BaseDateTimeTransformerTest
+class DateTimeToLocalizedStringTransformerTest extends BaseDateTimeTransformerTestCase
 {
     use DateTimeEqualsTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
index 0412dc321a0f6..90d1c538f20a9 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToRfc3339Transformer;
 use Symfony\Component\Form\Tests\Extension\Core\DataTransformer\Traits\DateTimeEqualsTrait;
 
-class DateTimeToRfc3339TransformerTest extends BaseDateTimeTransformerTest
+class DateTimeToRfc3339TransformerTest extends BaseDateTimeTransformerTestCase
 {
     use DateTimeEqualsTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
index 4bdfff1ed053b..1ca6078688599 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
 
-class DateTimeToStringTransformerTest extends BaseDateTimeTransformerTest
+class DateTimeToStringTransformerTest extends BaseDateTimeTransformerTestCase
 {
     public function dataProvider(): array
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php
index 7a84153a73834..bf662d6464bef 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
 
-class DateTimeToTimestampTransformerTest extends BaseDateTimeTransformerTest
+class DateTimeToTimestampTransformerTest extends BaseDateTimeTransformerTestCase
 {
     public function testTransform()
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerArrayObjectTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerArrayObjectTest.php
index 5de0ea607a7d6..47db5a0acddce 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerArrayObjectTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerArrayObjectTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormFactoryBuilder;
 
-class MergeCollectionListenerArrayObjectTest extends MergeCollectionListenerTest
+class MergeCollectionListenerArrayObjectTest extends MergeCollectionListenerTestCase
 {
     protected function getData(array $data)
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerArrayTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerArrayTest.php
index 4f19a3ff8e777..df382a0b50f81 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerArrayTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerArrayTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormFactoryBuilder;
 
-class MergeCollectionListenerArrayTest extends MergeCollectionListenerTest
+class MergeCollectionListenerArrayTest extends MergeCollectionListenerTestCase
 {
     protected function getData(array $data)
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerCustomArrayObjectTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerCustomArrayObjectTest.php
index 4be3b4babae98..a13a6c071a956 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerCustomArrayObjectTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerCustomArrayObjectTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\Form\FormFactoryBuilder;
 use Symfony\Component\Form\Tests\Fixtures\CustomArrayObject;
 
-class MergeCollectionListenerCustomArrayObjectTest extends MergeCollectionListenerTest
+class MergeCollectionListenerCustomArrayObjectTest extends MergeCollectionListenerTestCase
 {
     protected function getData(array $data)
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTestCase.php
similarity index 99%
rename from src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
rename to src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTestCase.php
index 4cb0970ababd2..b9ca39c93b518 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTestCase.php
@@ -16,7 +16,7 @@
 use Symfony\Component\Form\Extension\Core\EventListener\MergeCollectionListener;
 use Symfony\Component\Form\FormEvent;
 
-abstract class MergeCollectionListenerTest extends TestCase
+abstract class MergeCollectionListenerTestCase extends TestCase
 {
     protected $form;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTestCase.php
similarity index 99%
rename from src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
rename to src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTestCase.php
index 3303e6a5c78ce..e86bf9e41ed13 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTestCase.php
@@ -17,7 +17,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class BaseTypeTest extends TypeTestCase
+abstract class BaseTypeTestCase extends TypeTestCase
 {
     use VersionAwareTest;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php
index dcff028026482..afb5f820827d8 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php
@@ -19,7 +19,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class ButtonTypeTest extends BaseTypeTest
+class ButtonTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\ButtonType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
index 95ef611b1c2b7..6f8402126ff49 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 
-class CheckboxTypeTest extends BaseTypeTest
+class CheckboxTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CheckboxType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
index 8bf3dc23594db..c9a47f3520415 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 
-class ChoiceTypeTest extends BaseTypeTest
+class ChoiceTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\ChoiceType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
index 9df4eede1e482..211b14a2703d7 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Form\Tests\Fixtures\AuthorType;
 use Symfony\Component\Form\Tests\Fixtures\BlockPrefixedFooTextType;
 
-class CollectionTypeTest extends BaseTypeTest
+class CollectionTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CollectionType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ColorTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ColorTypeTest.php
index cfe7f0c527ce3..cd514d152a4e7 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ColorTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ColorTypeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\ColorType;
 use Symfony\Component\Form\FormError;
 
-final class ColorTypeTest extends BaseTypeTest
+final class ColorTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = ColorType::class;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
index 9572f3418c418..57146e1ecfa28 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class CountryTypeTest extends BaseTypeTest
+class CountryTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CountryType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php
index 8cccfd32bd3db..51aaf6b372af0 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class CurrencyTypeTest extends BaseTypeTest
+class CurrencyTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\CurrencyType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
index efbb47bea5014..3d8f87228735f 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateIntervalTypeTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormInterface;
 
-class DateIntervalTypeTest extends BaseTypeTest
+class DateIntervalTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = DateIntervalType::class;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
index 12b6939a68b02..d35c189da0f22 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormInterface;
 
-class DateTimeTypeTest extends BaseTypeTest
+class DateTimeTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateTimeType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
index 62a12289cb301..f875345f1b76f 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -17,7 +17,7 @@
 use Symfony\Component\Intl\Util\IntlTestHelper;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 
-class DateTypeTest extends BaseTypeTest
+class DateTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\DateType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/EnumTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/EnumTypeTest.php
index 9eb89442ea6a3..61eb45689500c 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/EnumTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/EnumTypeTest.php
@@ -12,14 +12,14 @@
 namespace Extension\Core\Type;
 
 use Symfony\Component\Form\Extension\Core\Type\EnumType;
-use Symfony\Component\Form\Tests\Extension\Core\Type\BaseTypeTest;
+use Symfony\Component\Form\Tests\Extension\Core\Type\BaseTypeTestCase;
 use Symfony\Component\Form\Tests\Fixtures\Answer;
 use Symfony\Component\Form\Tests\Fixtures\Number;
 use Symfony\Component\Form\Tests\Fixtures\Suit;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 
-class EnumTypeTest extends BaseTypeTest
+class EnumTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = EnumType::class;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
index 5ca5267430681..a893d6d622a8a 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
@@ -19,7 +19,7 @@
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\Translation\IdentityTranslator;
 
-class FileTypeTest extends BaseTypeTest
+class FileTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\FileType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
index b4bca1513083d..0c307a3b761e4 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
@@ -62,7 +62,7 @@ public function setReferenceCopy($reference)
     }
 }
 
-class FormTypeTest extends BaseTypeTest
+class FormTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\FormType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
index 15cf308d990dd..6d03ebf6cf284 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class IntegerTypeTest extends BaseTypeTest
+class IntegerTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\IntegerType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php
index 4946aca29e7f9..e214e0afd4346 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Form\Exception\LogicException;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class LanguageTypeTest extends BaseTypeTest
+class LanguageTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\LanguageType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
index 8d3eaea363a58..8486b6656bd6f 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class LocaleTypeTest extends BaseTypeTest
+class LocaleTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\LocaleType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php
index 94f47706ab1c6..c65629d946818 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class MoneyTypeTest extends BaseTypeTest
+class MoneyTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\MoneyType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
index 0cf482a9d8a49..f289fa6978db5 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class NumberTypeTest extends BaseTypeTest
+class NumberTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\NumberType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php
index 29756f17b9abc..8d428a26a52b1 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
-class PasswordTypeTest extends BaseTypeTest
+class PasswordTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\PasswordType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
index 60d565787699a..2d200ede19ec8 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Form\Tests\Fixtures\NotMappedType;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 
-class RepeatedTypeTest extends BaseTypeTest
+class RepeatedTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\RepeatedType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php
index 3f8fbe7725ffc..7b30fe31a140e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
-class TextTypeTest extends BaseTypeTest
+class TextTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\TextType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
index 991d9c23fe865..ba5b935c7b3c0 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 
-class TimeTypeTest extends BaseTypeTest
+class TimeTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\TimeType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
index 669f0d9e5725d..9966b40438aa2 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Form\Exception\LogicException;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
-class TimezoneTypeTest extends BaseTypeTest
+class TimezoneTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\TimezoneType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UlidTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UlidTypeTest.php
index 4f61992cb64a6..5ed324e8239fc 100644
--- a/src/Symfony/Component/Form/Tests/Extens
10000
ion/Core/Type/UlidTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UlidTypeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\UlidType;
 use Symfony\Component\Uid\Ulid;
 
-final class UlidTypeTest extends BaseTypeTest
+final class UlidTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = UlidType::class;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UuidTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UuidTypeTest.php
index 9b9bfb2d2a14e..90043356dab47 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UuidTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UuidTypeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\UuidType;
 use Symfony\Component\Uid\Uuid;
 
-final class UuidTypeTest extends BaseTypeTest
+final class UuidTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = UuidType::class;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/WeekTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/WeekTypeTest.php
index 7d0dc1958ba92..68cadba570c91 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/WeekTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/WeekTypeTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Form\FormError;
 
-class WeekTypeTest extends BaseTypeTest
+class WeekTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\WeekType';
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php b/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php
index 69be3777cca37..4aacf904d5a5c 100644
--- a/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php
@@ -13,14 +13,14 @@
 
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
-use Symfony\Component\Form\Tests\AbstractRequestHandlerTest;
+use Symfony\Component\Form\Tests\AbstractRequestHandlerTestCase;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class HttpFoundationRequestHandlerTest extends AbstractRequestHandlerTest
+class HttpFoundationRequestHandlerTest extends AbstractRequestHandlerTestCase
 {
     public function testRequestShouldNotBeNull()
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTestCase.php
similarity index 97%
rename from src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
rename to src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTestCase.php
index 4b69dfe886c8f..2ade3b844b54a 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTestCase.php
@@ -18,7 +18,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class BaseValidatorExtensionTest extends TypeTestCase
+abstract class BaseValidatorExtensionTestCase extends TypeTestCase
 {
     public function testValidationGroupNullByDefault()
     {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BirthdayTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BirthdayTypeValidatorExtensionTest.php
index 8beaaf6e58408..7ef39bde14d13 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BirthdayTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BirthdayTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\BirthdayType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class BirthdayTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class BirthdayTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CheckboxTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CheckboxTypeValidatorExtensionTest.php
index 6617389a1cdee..361c0539c3290 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CheckboxTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CheckboxTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class CheckboxTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class CheckboxTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/ChoiceTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/ChoiceTypeValidatorExtensionTest.php
index e8c3c94bf8d79..3f4db70fd560f 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/ChoiceTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/ChoiceTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class ChoiceTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class ChoiceTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CollectionTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CollectionTypeValidatorExtensionTest.php
index 34105251c3913..c6f11c24aa8f0 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CollectionTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CollectionTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class CollectionTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class CollectionTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/ColorTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/ColorTypeValidatorExtensionTest.php
index 51567835c147f..766beeec0539b 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/ColorTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/ColorTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\ColorType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class ColorTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class ColorTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CountryTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CountryTypeValidatorExtensionTest.php
index 1470b49c6c775..c8b2bd34244be 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CountryTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CountryTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\CountryType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class CountryTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class CountryTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CurrencyTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CurrencyTypeValidatorExtensionTest.php
index b340de93a1825..134be31154837 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CurrencyTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/CurrencyTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\CurrencyType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class CurrencyTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class CurrencyTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateIntervalTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateIntervalTypeValidatorExtensionTest.php
index 634af5696a927..ea2f4998c0e17 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateIntervalTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateIntervalTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\DateIntervalType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class DateIntervalTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class DateIntervalTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTimeTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTimeTypeValidatorExtensionTest.php
index 973e86d66dc10..a8206e40c322b 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTimeTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTimeTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class DateTimeTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class DateTimeTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTypeValidatorExtensionTest.php
index fe76eaf97feda..32594430dc5d8 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class DateTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class DateTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/EmailTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/EmailTypeValidatorExtensionTest.php
index e8de05ae05d4a..89e69749c3bcc 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/EmailTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/EmailTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class EmailTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class EmailTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FileTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FileTypeValidatorExtensionTest.php
index 7cda446bb8575..84045d6ade3ce 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FileTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FileTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\FileType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class FileTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class FileTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
index 30db508520260..3b4cd77396c60 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
@@ -28,7 +28,7 @@
 use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
 use Symfony\Component\Validator\Validation;
 
-class FormTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class FormTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/HiddenTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/HiddenTypeValidatorExtensionTest.php
index 955027ff09972..83de73f996084 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/HiddenTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/HiddenTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class HiddenTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class HiddenTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/IntegerTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/IntegerTypeValidatorExtensionTest.php
index e66400327402a..0621d6d8d071c 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/IntegerTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/IntegerTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class IntegerTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class IntegerTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/LanguageTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/LanguageTypeValidatorExtensionTest.php
index e29e837e0c790..9343a9a123d4c 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/LanguageTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/LanguageTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\LanguageType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class LanguageTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class LanguageTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/LocaleTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/LocaleTypeValidatorExtensionTest.php
index 83f7c762f25fa..e2e948b5db1d2 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/LocaleTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/LocaleTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\LocaleType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class LocaleTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class LocaleTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/MoneyTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/MoneyTypeValidatorExtensionTest.php
index 5d62c63852cd9..e457a4b2a7a78 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/MoneyTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/MoneyTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\MoneyType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class MoneyTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class MoneyTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/NumberTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/NumberTypeValidatorExtensionTest.php
index 11efbde9636b5..6e886cecdc643 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/NumberTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/NumberTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class NumberTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class NumberTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/PasswordTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/PasswordTypeValidatorExtensionTest.php
index 489d87283b7a8..5ddc0d4cb0f3e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/PasswordTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/PasswordTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class PasswordTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class PasswordTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/PercentTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/PercentTypeValidatorExtensionTest.php
index 2ac42f674fa96..d4317eb17ae1d 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/PercentTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/PercentTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\PercentType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class PercentTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class PercentTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/RadioTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/RadioTypeValidatorExtensionTest.php
index cc489c90aa022..c6ac73544c9db 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/RadioTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/RadioTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\RadioType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class RadioTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class RadioTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/RangeTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/RangeTypeValidatorExtensionTest.php
index eba6049e95fc6..0ace71097776b 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/RangeTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/RangeTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\RangeType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class RangeTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class RangeTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/RepeatedTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/RepeatedTypeValidatorExtensionTest.php
index 445e60c6c270c..99c521682b580 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/RepeatedTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/RepeatedTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class RepeatedTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class RepeatedTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SearchTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SearchTypeValidatorExtensionTest.php
index d362c8cfe620c..14d4350e5a312 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SearchTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SearchTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\SearchType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class SearchTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class SearchTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php
index c347c89bce3b9..42aeb609bf184 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/SubmitTypeValidatorExtensionTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class SubmitTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class SubmitTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TelTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TelTypeValidatorExtensionTest.php
index 7d7f5307bfd0e..ff6ec95c83ac9 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TelTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TelTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\TelType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class TelTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class TelTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TimeTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TimeTypeValidatorExtensionTest.php
index 2b48de4d19e9a..09893b98a1e1e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TimeTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TimeTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\TimeType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class TimeTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class TimeTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TimezoneTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TimezoneTypeValidatorExtensionTest.php
index f66d4d4229f8b..3ee0f5d2029ae 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TimezoneTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TimezoneTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\TimezoneType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class TimezoneTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class TimezoneTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UrlTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UrlTypeValidatorExtensionTest.php
index cb85fde39ac38..e6314a3c59a29 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UrlTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UrlTypeValidatorExtensionTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Form\Extension\Core\Type\UrlType;
 use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
 
-class UrlTypeValidatorExtensionTest extends BaseValidatorExtensionTest
+class UrlTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 {
     use ValidatorExtensionTrait;
 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt
index 043a1dbc27399..cedca25a606e6 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt
@@ -14,7 +14,7 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (empty_data)
                        line: %s 
                      },                 %s 
                      Closure%s{%A
-                       file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"%w
+                       file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTestCase.php"%w
                        line: %s 
                      }                  %s 
                    ]                    %s 
diff --git a/src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php b/src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php
index 8bbf0793ff89d..e698138376b6f 100644
--- a/src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php
+++ b/src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php
@@ -17,7 +17,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class NativeRequestHandlerTest extends AbstractRequestHandlerTest
+class NativeRequestHandlerTest extends AbstractRequestHandlerTestCase
 {
     private static $serverBackup;
 
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
index e859bf2c7fd62..4fc6eb72da2ee 100644
--- a/src/Symfony/Component/Form/composer.json
+++ b/src/Symfony/Component/Form/composer.json
@@ -47,13 +47,13 @@
         "phpunit/phpunit": "<5.4.3",
         "symfony/console": "<5.4",
         "symfony/dependency-injection": "<5.4",
-        "symfony/doctrine-bridge": "<5.4",
+        "symfony/doctrine-bridge": "<6.3",
         "symfony/error-handler": "<5.4",
         "symfony/framework-bundle": "<5.4",
         "symfony/http-kernel": "<5.4",
         "symfony/translation": "<5.4",
         "symfony/translation-contracts": "<2.5",
-        "symfony/twig-bridge": "<5.4"
+        "symfony/twig-bridge": "<6.3"
     },
     "suggest": {
         "symfony/validator": "For form validation.",
diff --git a/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTestCase.php
similarity index 97%
rename from src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php
rename to src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTestCase.php
index 19563bd24ea8f..ecfd6cb17c42c 100644
--- a/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTestCase.php
@@ -21,7 +21,7 @@
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-abstract class AbstractRedisStoreTest extends AbstractStoreTest
+abstract class AbstractRedisStoreTestCase extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/AbstractStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/AbstractStoreTestCase.php
similarity index 98%
rename from src/Symfony/Component/Lock/Tests/Store/AbstractStoreTest.php
rename to src/Symfony/Component/Lock/Tests/Store/AbstractStoreTestCase.php
index 4ac11e00da790..fdd3e39a6a371 100644
--- a/src/Symfony/Component/Lock/Tests/Store/AbstractStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/AbstractStoreTestCase.php
@@ -19,7 +19,7 @@
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-abstract class AbstractStoreTest extends TestCase
+abstract class AbstractStoreTestCase extends TestCase
 {
     abstract protected function getStore(): PersistingStoreInterface;
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/BlockingStoreTestTrait.php b/src/Symfony/Component/Lock/Tests/Store/BlockingStoreTestTrait.php
index 27c86681c135b..c26d71e37fb53 100644
--- a/src/Symfony/Component/Lock/Tests/Store/BlockingStoreTestTrait.php
+++ b/src/Symfony/Component/Lock/Tests/Store/BlockingStoreTestTrait.php
@@ -21,7 +21,7 @@
 trait BlockingStoreTestTrait
 {
     /**
-     * @see AbstractStoreTest::getStore()
+     * @see AbstractStoreTestCase::getStore()
      *
      * @return PersistingStoreInterface
      */
diff --git a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
index 28d4afcad41b1..594037df3359a 100644
--- a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
@@ -26,7 +26,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  * @group integration
  */
-class CombinedStoreTest extends AbstractStoreTest
+class CombinedStoreTest extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
     use SharedLockStoreTestTrait;
diff --git a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalPostgreSqlStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalPostgreSqlStoreTest.php
index bf688c29d077a..afe5c4870fc29 100644
--- a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalPostgreSqlStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalPostgreSqlStoreTest.php
@@ -26,7 +26,7 @@
  * @requires extension pdo_pgsql
  * @group integration
  */
-class DoctrineDbalPostgreSqlStoreTest extends AbstractStoreTest
+class DoctrineDbalPostgreSqlStoreTest extends AbstractStoreTestCase
 {
     use BlockingStoreTestTrait;
     use SharedLockStoreTestTrait;
diff --git a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php
index 63e4cf8572d76..aa442ae8ab6fb 100644
--- a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php
@@ -27,7 +27,7 @@ class_exists(\Doctrine\DBAL\Platforms\PostgreSqlPlatform::class);
  *
  * @requires extension pdo_sqlite
  */
-class DoctrineDbalStoreTest extends AbstractStoreTest
+class DoctrineDbalStoreTest extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php b/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php
index bf75d69c169c8..27a8406f768e4 100644
--- a/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php
+++ b/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php
@@ -30,7 +30,7 @@ trait ExpiringStoreTestTrait
     abstract protected function getClockDelay();
 
     /**
-     * @see AbstractStoreTest::getStore()
+     * @see AbstractStoreTestCase::getStore()
      */
     abstract protected function getStore();
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/FlockStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/FlockStoreTest.php
index 246cd9ff59c2e..b116cbf81b0d2 100644
--- a/src/Symfony/Component/Lock/Tests/Store/FlockStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/FlockStoreTest.php
@@ -19,7 +19,7 @@
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-class FlockStoreTest extends AbstractStoreTest
+class FlockStoreTest extends AbstractStoreTestCase
 {
     use BlockingStoreTestTrait;
     use SharedLockStoreTestTrait;
diff --git a/src/Symfony/Component/Lock/Tests/Store/InMemoryStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/InMemoryStoreTest.php
index 88f2188694f9b..96b900ffe8f5e 100644
--- a/src/Symfony/Component/Lock/Tests/Store/InMemoryStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/InMemoryStoreTest.php
@@ -17,7 +17,7 @@
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-class InMemoryStoreTest extends AbstractStoreTest
+class InMemoryStoreTest extends AbstractStoreTestCase
 {
     use SharedLockStoreTestTrait;
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
index d9184972dbdd4..d67732e1f5721 100644
--- a/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/MemcachedStoreTest.php
@@ -23,7 +23,7 @@
  * @requires extension memcached
  * @group integration
  */
-class MemcachedStoreTest extends AbstractStoreTest
+class MemcachedStoreTest extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php
index 7cd78d10326ba..57ac960a53aff 100644
--- a/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php
@@ -25,7 +25,7 @@
  * @requires extension mongodb
  * @group integration
  */
-class MongoDbStoreTest extends AbstractStoreTest
+class MongoDbStoreTest extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php
index 3f19e91487e01..f90e5b4014c68 100644
--- a/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php
@@ -23,7 +23,7 @@
  *
  * @group integration
  */
-class PdoStoreTest extends AbstractStoreTest
+class PdoStoreTest extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/PostgreSqlStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PostgreSqlStoreTest.php
index e362b84c9c2af..b90dd7427e6d2 100644
--- a/src/Symfony/Component/Lock/Tests/Store/PostgreSqlStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/PostgreSqlStoreTest.php
@@ -23,7 +23,7 @@
  * @requires extension pdo_pgsql
  * @group integration
  */
-class PostgreSqlStoreTest extends AbstractStoreTest
+class PostgreSqlStoreTest extends AbstractStoreTestCase
 {
     use BlockingStoreTestTrait;
     use SharedLockStoreTestTrait;
diff --git a/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php
index b1a596e98006c..9c55013fb3b58 100644
--- a/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/PredisStoreTest.php
@@ -17,7 +17,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  * @group integration
  */
-class PredisStoreTest extends AbstractRedisStoreTest
+class PredisStoreTest extends AbstractRedisStoreTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php
index 1d3d54de002ca..6965c1bd4d9ab 100644
--- a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php
@@ -19,7 +19,7 @@
  * @requires extension redis
  * @group integration
  */
-class RedisArrayStoreTest extends AbstractRedisStoreTest
+class RedisArrayStoreTest extends AbstractRedisStoreTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisClusterStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisClusterStoreTest.php
index 7e9ef4727a85e..e24f629b0772c 100644
--- a/src/Symfony/Component/Lock/Tests/Store/RedisClusterStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/RedisClusterStoreTest.php
@@ -19,7 +19,7 @@
  * @requires extension redis
  * @group integration
  */
-class RedisClusterStoreTest extends AbstractRedisStoreTest
+class RedisClusterStoreTest extends AbstractRedisStoreTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php
index 5d9a7851d8473..c1cf337283f1c 100644
--- a/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php
@@ -21,7 +21,7 @@
  * @requires extension redis
  * @group integration
  */
-class RedisStoreTest extends AbstractRedisStoreTest
+class RedisStoreTest extends AbstractRedisStoreTestCase
 {
     use SharedLockStoreTestTrait;
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/RelayStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RelayStoreTest.php
index 1c6657a5d7159..56b103be47c11 100644
--- a/src/Symfony/Component/Lock/Tests/Store/RelayStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/RelayStoreTest.php
@@ -13,7 +13,7 @@
 
 use PHPUnit\Framework\SkippedTestSuiteError;
 use Relay\Relay;
-use Symfony\Component\Lock\Tests\Store\AbstractRedisStoreTest;
+use Symfony\Component\Lock\Tests\Store\AbstractRedisStoreTestCase;
 use Symfony\Component\Lock\Tests\Store\SharedLockStoreTestTrait;
 
 /**
@@ -21,7 +21,7 @@
  *
  * @group integration
  */
-class RelayStoreTest extends AbstractRedisStoreTest
+class RelayStoreTest extends AbstractRedisStoreTestCase
 {
     use SharedLockStoreTestTrait;
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/SemaphoreStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/SemaphoreStoreTest.php
index d64b08383823a..c6106e445fdd2 100644
--- a/src/Symfony/Component/Lock/Tests/Store/SemaphoreStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/SemaphoreStoreTest.php
@@ -20,7 +20,7 @@
  *
  * @requires extension sysvsem
  */
-class SemaphoreStoreTest extends AbstractStoreTest
+class SemaphoreStoreTest extends AbstractStoreTestCase
 {
     use BlockingStoreTestTrait;
     use UnserializableTestTrait;
diff --git a/src/Symfony/Component/Lock/Tests/Store/SharedLockStoreTestTrait.php b/src/Symfony/Component/Lock/Tests/Store/SharedLockStoreTestTrait.php
index 498191beea9c3..c6e0ce66acf46 100644
--- a/src/Symfony/Component/Lock/Tests/Store/SharedLockStoreTestTrait.php
+++ b/src/Symfony/Component/Lock/Tests/Store/SharedLockStoreTestTrait.php
@@ -21,7 +21,7 @@
 trait SharedLockStoreTestTrait
 {
     /**
-     * @see AbstractStoreTest::getStore()
+     * @see AbstractStoreTestCase::getStore()
      *
      * @return PersistingStoreInterface
      */
diff --git a/src/Symfony/Component/Lock/Tests/Store/UnserializableTestTrait.php b/src/Symfony/Component/Lock/Tests/Store/UnserializableTestTrait.php
index 6a9cf0bd49477..0c5569b3dcdab 100644
--- a/src/Symfony/Component/Lock/Tests/Store/UnserializableTestTrait.php
+++ b/src/Symfony/Component/Lock/Tests/Store/UnserializableTestTrait.php
@@ -21,7 +21,7 @@
 trait UnserializableTestTrait
 {
     /**
-     * @see AbstractStoreTest::getStore()
+     * @see AbstractStoreTestCase::getStore()
      *
      * @return PersistingStoreInterface
      */
diff --git a/src/Symfony/Component/Lock/Tests/Store/ZookeeperStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/ZookeeperStoreTest.php
index 50a671cebf953..c11706a53c4e2 100644
--- a/src/Symfony/Component/Lock/Tests/Store/ZookeeperStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/ZookeeperStoreTest.php
@@ -21,7 +21,7 @@
  * @requires extension zookeeper
  * @group integration
  */
-class ZookeeperStoreTest extends AbstractStoreTest
+class ZookeeperStoreTest extends AbstractStoreTestCase
 {
     use UnserializableTestTrait;
 
diff --git a/src/Symfony/Component/Mime/Tests/AbstractMimeTypeGuesserTest.php b/src/Symfony/Component/Mime/Tests/AbstractMimeTypeGuesserTestCase.php
similarity index 98%
rename from src/Symfony/Component/Mime/Tests/AbstractMimeTypeGuesserTest.php
rename to src/Symfony/Component/Mime/Tests/AbstractMimeTypeGuesserTestCase.php
index fb9ad1ef1458c..ed12d6df67efd 100644
--- a/src/Symfony/Component/Mime/Tests/AbstractMimeTypeGuesserTest.php
+++ b/src/Symfony/Component/Mime/Tests/AbstractMimeTypeGuesserTestCase.php
@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mime\MimeTypeGuesserInterface;
 
-abstract class AbstractMimeTypeGuesserTest extends TestCase
+abstract class AbstractMimeTypeGuesserTestCase extends TestCase
 {
     public static function tearDownAfterClass(): void
     {
diff --git a/src/Symfony/Component/Mime/Tests/FileBinaryMimeTypeGuesserTest.php b/src/Symfony/Component/Mime/Tests/FileBinaryMimeTypeGuesserTest.php
index 5d225038d4336..eae27fd517681 100644
--- a/src/Symfony/Component/Mime/Tests/FileBinaryMimeTypeGuesserTest.php
+++ b/src/Symfony/Component/Mime/Tests/FileBinaryMimeTypeGuesserTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Mime\FileBinaryMimeTypeGuesser;
 use Symfony\Component\Mime\MimeTypeGuesserInterface;
 
-class FileBinaryMimeTypeGuesserTest extends AbstractMimeTypeGuesserTest
+class FileBinaryMimeTypeGuesserTest extends AbstractMimeTypeGuesserTestCase
 {
     protected function getGuesser(): MimeTypeGuesserInterface
     {
diff --git a/src/Symfony/Component/Mime/Tests/FileinfoMimeTypeGuesserTest.php b/src/Symfony/Component/Mime/Tests/FileinfoMimeTypeGuesserTest.php
index d2e6930a4b9c3..0d7815c99d362 100644
--- a/src/Symfony/Component/Mime/Tests/FileinfoMimeTypeGuesserTest.php
+++ b/src/Symfony/Component/Mime/Tests/FileinfoMimeTypeGuesserTest.php
@@ -17,7 +17,7 @@
 /**
  * @requires extension fileinfo
  */
-class FileinfoMimeTypeGuesserTest extends AbstractMimeTypeGuesserTest
+class FileinfoMimeTypeGuesserTest extends AbstractMimeTypeGuesserTestCase
 {
     protected function getGuesser(): MimeTypeGuesserInterface
     {
diff --git a/src/Symfony/Component/Mime/Tests/MimeTypesTest.php b/src/Symfony/Component/Mime/Tests/MimeTypesTest.php
index 2d2cac205c5e2..e6d4173704535 100644
--- a/src/Symfony/Component/Mime/Tests/MimeTypesTest.php
+++ b/src/Symfony/Component/Mime/Tests/MimeTypesTest.php
@@ -18,7 +18,7 @@
 /**
  * @requires extension fileinfo
  */
-class MimeTypesTest extends AbstractMimeTypeGuesserTest
+class MimeTypesTest extends AbstractMimeTypeGuesserTestCase
 {
     protected function getGuesser(): MimeTypeGuesserInterface
     {
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTestCase.php
similarity index 97%
rename from src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTest.php
rename to src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTestCase.php
index 89f89280f647b..b1b3f63d1c30e 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTestCase.php
@@ -16,7 +16,7 @@
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 
-abstract class PropertyAccessorArrayAccessTest extends TestCase
+abstract class PropertyAccessorArrayAccessTestCase extends TestCase
 {
     /**
      * @var PropertyAccessor
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayObjectTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayObjectTest.php
index 83858956f2193..9d836561d577b 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayObjectTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayObjectTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\PropertyAccess\Tests;
 
-class PropertyAccessorArrayObjectTest extends PropertyAccessorCollectionTest
+class PropertyAccessorArrayObjectTest extends PropertyAccessorCollectionTestCase
 {
     protected static function getContainer(array $array)
     {
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayTest.php
index 16a283d3d372a..304b823ebf127 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\PropertyAccess\Tests;
 
-class PropertyAccessorArrayTest extends PropertyAccessorCollectionTest
+class PropertyAccessorArrayTest extends PropertyAccessorCollectionTestCase
 {
     protected static function getContainer(array $array)
     {
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTestCase.php
similarity index 82%
rename from src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
rename to src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTestCase.php
index 2daf260fd8014..016d69422a2b4 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTestCase.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
 
-class PropertyAccessorCollectionTest_Car
+class PropertyAccessorCollectionTestCase_Car
 {
     private $axes;
 
@@ -45,7 +45,7 @@ public function getAxes()
     }
 }
 
-class PropertyAccessorCollectionTest_CarOnlyAdder
+class PropertyAccessorCollectionTestCase_CarOnlyAdder
 {
     public function addAxis($axis)
     {
@@ -56,7 +56,7 @@ public function getAxes()
     }
 }
 
-class PropertyAccessorCollectionTest_CarOnlyRemover
+class PropertyAccessorCollectionTestCase_CarOnlyRemover
 {
     public function removeAxis($axis)
     {
@@ -67,14 +67,14 @@ public function getAxes()
     }
 }
 
-class PropertyAccessorCollectionTest_CarNoAdderAndRemover
+class PropertyAccessorCollectionTestCase_CarNoAdderAndRemover
 {
     public function getAxes()
     {
     }
 }
 
-class PropertyAccessorCollectionTest_CompositeCar
+class PropertyAccessorCollectionTestCase_CompositeCar
 {
     public function getStructure()
     {
@@ -85,7 +85,7 @@ public function setStructure($structure)
     }
 }
 
-class PropertyAccessorCollectionTest_CarStructure
+class PropertyAccessorCollectionTestCase_CarStructure
 {
     public function addAxis($axis)
     {
@@ -100,7 +100,7 @@ public function getAxes()
     }
 }
 
-abstract class PropertyAccessorCollectionTest extends PropertyAccessorArrayAccessTest
+abstract class PropertyAccessorCollectionTestCase extends PropertyAccessorArrayAccessTestCase
 {
     public function testSetValueCallsAdderAndRemoverForCollections()
     {
@@ -111,7 +111,7 @@ public function testSetValueCallsAdderAndRemoverForCollections()
 
         // Don't use a mock in order to test whether the collections are
         // modified while iterating them
-        $car = new PropertyAccessorCollectionTest_Car($axesBefore);
+        $car = new PropertyAccessorCollectionTestCase_Car($axesBefore);
 
         $this->propertyAccessor->setValue($car, 'axes', $axesMerged);
 
@@ -151,7 +151,7 @@ public function testSetValueCallsAdderAndRemoverForNestedCollections()
     public function testSetValueFailsIfNoAdderNorRemoverFound()
     {
         $this->expectException(NoSuchPropertyException::class);
-        $this->expectExceptionMessageMatches('/Could not determine access type for property "axes" in class "Mock_PropertyAccessorCollectionTest_CarNoAdderAndRemover_[^"]*"./');
+        $this->expectExceptionMessageMatches('/Could not determine access type for property "axes" in class "Mock_PropertyAccessorCollectionTestCase_CarNoAdderAndRemover_[^"]*"./');
         $car = $this->createMock(__CLASS__.'_CarNoAdderAndRemover');
         $axesBefore = $this->getContainer([1 => 'second', 3 => 'fourth']);
         $axesAfter = $this->getContainer([0 => 'first', 1 => 'second', 2 => 'third']);
@@ -165,33 +165,33 @@ public function testSetValueFailsIfNoAdderNorRemoverFound()
 
     public function testIsWritableReturnsTrueIfAdderAndRemoverExists()
     {
-        $car = new PropertyAccessorCollectionTest_Car();
+        $car = new PropertyAccessorCollectionTestCase_Car();
         $this->assertTrue($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testIsWritableReturnsFalseIfOnlyAdderExists()
     {
-        $car = new PropertyAccessorCollectionTest_CarOnlyAdder();
+        $car = new PropertyAccessorCollectionTestCase_CarOnlyAdder();
         $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testIsWritableReturnsFalseIfOnlyRemoverExists()
     {
-        $car = new PropertyAccessorCollectionTest_CarOnlyRemover();
+        $car = new PropertyAccessorCollectionTestCase_CarOnlyRemover();
         $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()
     {
-        $car = new PropertyAccessorCollectionTest_CarNoAdderAndRemover();
+        $car = new PropertyAccessorCollectionTestCase_CarNoAdderAndRemover();
         $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testSetValueFailsIfAdderAndRemoverExistButValueIsNotTraversable()
     {
         $this->expectException(NoSuchPropertyException::class);
-        $this->expectExceptionMessageMatches('/The property "axes" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\PropertyAccessorCollectionTest_Car" can be defined with the methods "addAxis\(\)", "removeAxis\(\)" but the new value must be an array or an instance of \\\Traversable\./');
-        $car = new PropertyAccessorCollectionTest_Car();
+        $this->expectExceptionMessageMatches('/The property "axes" in class "Symfony\\\Component\\\PropertyAccess\\\Tests\\\PropertyAccessorCollectionTestCase_Car" can be defined with the methods "addAxis\(\)", "removeAxis\(\)" but the new value must be an array or an instance of \\\Traversable\./');
+        $car = new PropertyAccessorCollectionTestCase_Car();
 
         $this->propertyAccessor->setValue($car, 'axes', 'Not an array or Traversable');
     }
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorNonTraversableArrayObjectTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorNonTraversableArrayObjectTest.php
index 96fb72c70a436..5c01079e13a77 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorNonTraversableArrayObjectTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorNonTraversableArrayObjectTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\PropertyAccess\Tests\Fixtures\NonTraversableArrayObject;
 
-class PropertyAccessorNonTraversableArrayObjectTest extends PropertyAccessorArrayAccessTest
+class PropertyAccessorNonTraversableArrayObjectTest extends PropertyAccessorArrayAccessTestCase
 {
     protected static function getContainer(array $array)
     {
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTraversableArrayObjectTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTraversableArrayObjectTest.php
index 4fdcb191b16a2..bfd52fab05671 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTraversableArrayObjectTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTraversableArrayObjectTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\PropertyAccess\Tests\Fixtures\TraversableArrayObject;
 
-class PropertyAccessorTraversableArrayObjectTest extends PropertyAccessorCollectionTest
+class PropertyAccessorTraversableArrayObjectTest extends PropertyAccessorCollectionTestCase
 {
     protected static function getContainer(array $array)
     {
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AbstractAnnotationLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AbstractAnnotationLoaderTestCase.php
similarity index 92%
rename from src/Symfony/Component/Routing/Tests/Loader/AbstractAnnotationLoaderTest.php
rename to src/Symfony/Component/Routing/Tests/Loader/AbstractAnnotationLoaderTestCase.php
index fea06e51dcdc0..e743ef2e35d50 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AbstractAnnotationLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AbstractAnnotationLoaderTestCase.php
@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Loader\AnnotationClassLoader;
 
-abstract class AbstractAnnotationLoaderTest extends TestCase
+abstract class AbstractAnnotationLoaderTestCase extends TestCase
 {
     public function getReader()
     {
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTestCase.php
similarity index 99%
rename from src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
rename to src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTestCase.php
index 8221fe127a087..48bbd9d523084 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTestCase.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Routing\Loader\AnnotationClassLoader;
 use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\AbstractClassController;
 
-abstract class AnnotationClassLoaderTest extends TestCase
+abstract class AnnotationClassLoaderTestCase extends TestCase
 {
     /**
      * @var AnnotationClassLoader
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php
index 2af4032ad28ef..3988d4354a0d2 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Routing\Loader\AnnotationClassLoader;
 use Symfony\Component\Routing\Route;
 
-class AnnotationClassLoaderWithAnnotationsTest extends AnnotationClassLoaderTest
+class AnnotationClassLoaderWithAnnotationsTest extends AnnotationClassLoaderTestCase
 {
     protected function setUp(string $env = null): void
     {
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAttributesTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAttributesTest.php
index 75263944fb1d3..d613ba09b298b 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAttributesTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderWithAttributesTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Routing\Loader\AnnotationClassLoader;
 use Symfony\Component\Routing\Route;
 
-class AnnotationClassLoaderWithAttributesTest extends AnnotationClassLoaderTest
+class AnnotationClassLoaderWithAttributesTest extends AnnotationClassLoaderTestCase
 {
     protected function setUp(string $env = null): void
     {
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
index 62c4c4426c6c3..5a7bc8cbbda53 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
 
-class AnnotationDirectoryLoaderTest extends AbstractAnnotationLoaderTest
+class AnnotationDirectoryLoaderTest extends AbstractAnnotationLoaderTestCase
 {
     protected $loader;
     protected $reader;
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
index 2ea13d732b10a..473368156382f 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Loader\AnnotationFileLoader;
 
-class AnnotationFileLoaderTest extends AbstractAnnotationLoaderTest
+class AnnotationFileLoaderTest extends AbstractAnnotationLoaderTestCase
 {
     protected $loader;
     protected $reader;
diff --git a/src/Symfony/Component/Routing/Tests/Loader/DirectoryLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/DirectoryLoaderTest.php
index 184d5089bc633..d4f2fd3263b48 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/DirectoryLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/DirectoryLoaderTest.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Routing\Loader\YamlFileLoader;
 use Symfony\Component\Routing\RouteCollection;
 
-class DirectoryLoaderTest extends AbstractAnnotationLoaderTest
+class DirectoryLoaderTest extends AbstractAnnotationLoaderTestCase
 {
     private $loader;
     private $reader;
diff --git a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTestCase.php
similarity index 98%
rename from src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
rename to src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTestCase.php
index d7c63792399f9..fa2e4f9d5f6ee 100644
--- a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTestCase.php
@@ -25,7 +25,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class UserPasswordValidatorTest extends ConstraintValidatorTestCase
+abstract class UserPasswordValidatorTestCase extends ConstraintValidatorTestCase
 {
     private const PASSWORD = 's3Cr3t';
     private const SALT = '^S4lt$';
diff --git a/src/Symfony/Component/Semaphore/Tests/Store/AbstractRedisStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/AbstractRedisStoreTestCase.php
similarity index 90%
rename from src/Symfony/Component/Semaphore/Tests/Store/AbstractRedisStoreTest.php
rename to src/Symfony/Component/Semaphore/Tests/Store/AbstractRedisStoreTestCase.php
index a7de9357a2373..f68ab7f5f3289 100644
--- a/src/Symfony/Component/Semaphore/Tests/Store/AbstractRedisStoreTest.php
+++ b/src/Symfony/Component/Semaphore/Tests/Store/AbstractRedisStoreTestCase.php
@@ -18,7 +18,7 @@
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-abstract class AbstractRedisStoreTest extends AbstractStoreTest
+abstract class AbstractRedisStoreTestCase extends AbstractStoreTestCase
 {
     abstract protected function getRedisConnection(): \Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface;
 
diff --git a/src/Symfony/Component/Semaphore/Tests/Store/AbstractStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/AbstractStoreTestCase.php
similarity index 99%
rename from src/Symfony/Component/Semaphore/Tests/Store/AbstractStoreTest.php
rename to src/Symfony/Component/Semaphore/Tests/Store/AbstractStoreTestCase.php
index 999b0ea8c83f2..82efd9c34071a 100644
--- a/src/Symfony/Component/Semaphore/Tests/Store/AbstractStoreTest.php
+++ b/src/Symfony/Component/Semaphore/Tests/Store/AbstractStoreTestCase.php
@@ -21,7 +21,7 @@
  * @author Jérémy Derussé <jeremy@derusse.com>
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  */
-abstract class AbstractStoreTest extends TestCase
+abstract class AbstractStoreTestCase extends TestCase
 {
     abstract protected function getStore(): PersistingStoreInterface;
 
diff --git a/src/Symfony/Component/Semaphore/Tests/Store/PredisStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/PredisStoreTest.php
index 133c774ea2db5..cf15d711f0a2d 100644
--- a/src/Symfony/Component/Semaphore/Tests/Store/PredisStoreTest.php
+++ b/src/Symfony/Component/Semaphore/Tests/Store/PredisStoreTest.php
@@ -16,7 +16,7 @@
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
-class PredisStoreTest extends AbstractRedisStoreTest
+class PredisStoreTest extends AbstractRedisStoreTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Semaphore/Tests/Store/RedisArrayStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/RedisArrayStoreTest.php
index 7526648d7b03a..a60a8af3c8e8b 100644
--- a/src/Symfony/Component/Semaphore/Tests/Store/RedisArrayStoreTest.php
+++ b/src/Symfony/Component/Semaphore/Tests/Store/RedisArrayStoreTest.php
@@ -18,7 +18,7 @@
  *
  * @requires extension redis
  */
-class RedisArrayStoreTest extends AbstractRedisStoreTest
+class RedisArrayStoreTest extends AbstractRedisStoreTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Semaphore/Tests/Store/RedisClusterStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/RedisClusterStoreTest.php
index cd0eb91f8388c..5f6cfa5459b38 100644
--- a/src/Symfony/Component/Semaphore/Tests/Store/RedisClusterStoreTest.php
+++ b/src/Symfony/Component/Semaphore/Tests/Store/RedisClusterStoreTest.php
@@ -18,7 +18,7 @@
  *
  * @requires extension redis
  */
-class RedisClusterStoreTest extends AbstractRedisStoreTest
+class RedisClusterStoreTest extends AbstractRedisStoreTestCase
 {
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Semaphore/Tests/Store/RedisStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/RedisStoreTest.php
index ccd74cb5635b9..1e64b52814885 100644
--- a/src/Symfony/Component/Semaphore/Tests/Store/RedisStoreTest.php
+++ b/src/Symfony/Component/Semaphore/Tests/Store/RedisStoreTest.php
@@ -18,7 +18,7 @@
  *
  * @requires extension redis
  */
-class RedisStoreTest extends AbstractRedisStoreTest
+class RedisStoreTest extends AbstractRedisStoreTestCase
 {
     protected function setUp(): void
     {
diff --git a/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php
index 694e0b4b7b983..02b5512f8fdd1 100644
--- a/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php
+++ b/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php
@@ -17,7 +17,7 @@
 /**
  * @requires extension relay
  */
-class RelayStoreTest extends AbstractRedisStoreTest
+c
10000
lass RelayStoreTest extends AbstractRedisStoreTestCase
 {
     protected function setUp(): void
     {
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTestCase.php
similarity index 99%
rename from src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php
rename to src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTestCase.php
index 0747ca3f54c7a..de7accd844b32 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTestCase.php
@@ -25,7 +25,7 @@
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-abstract class AnnotationLoaderTest extends TestCase
+abstract class AnnotationLoaderTestCase extends TestCase
 {
     use ContextMappingTestTrait;
 
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderWithAttributesTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderWithAttributesTest.php
index 0983620b8bbe6..89e94b66302b8 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderWithAttributesTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderWithAttributesTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
 
-class AnnotationLoaderWithAttributesTest extends AnnotationLoaderTest
+class AnnotationLoaderWithAttributesTest extends AnnotationLoaderTestCase
 {
     protected function createLoader(): AnnotationLoader
     {
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderWithDoctrineAnnotationsTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderWithDoctrineAnnotationsTest.php
index 37675a49d94ac..cfb1547c503cd 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderWithDoctrineAnnotationsTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderWithDoctrineAnnotationsTest.php
@@ -14,7 +14,7 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
 
-class AnnotationLoaderWithDoctrineAnnotationsTest extends AnnotationLoaderTest
+class AnnotationLoaderWithDoctrineAnnotationsTest extends AnnotationLoaderTestCase
 {
     protected function createLoader(): AnnotationLoader
     {
diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/AbstractOperationTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/AbstractOperationTestCase.php
similarity index 97%
rename from src/Symfony/Component/Translation/Tests/Catalogue/AbstractOperationTest.php
rename to src/Symfony/Component/Translation/Tests/Catalogue/AbstractOperationTestCase.php
index 30fc1171ede60..d6b67d27b53c8 100644
--- a/src/Symfony/Component/Translation/Tests/Catalogue/AbstractOperationTest.php
+++ b/src/Symfony/Component/Translation/Tests/Catalogue/AbstractOperationTestCase.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\MessageCatalogueInterface;
 
-abstract class AbstractOperationTest extends TestCase
+abstract class AbstractOperationTestCase extends TestCase
 {
     public function testGetEmptyDomains()
     {
diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php
index 1c9bcbc265571..d5bfc0e12bef2 100644
--- a/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php
+++ b/src/Symfony/Component/Translation/Tests/Catalogue/MergeOperationTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\MessageCatalogueInterface;
 
-class MergeOperationTest extends AbstractOperationTest
+class MergeOperationTest extends AbstractOperationTestCase
 {
     public function testGetMessagesFromSingleDomain()
     {
diff --git a/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php b/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php
index 6f4de858870dc..1b376394eaa1b 100644
--- a/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php
+++ b/src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\MessageCatalogueInterface;
 
-class TargetOperationTest extends AbstractOperationTest
+class TargetOperationTest extends AbstractOperationTestCase
 {
     public function testGetMessagesFromSingleDomain()
     {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorArrayObjectTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorArrayObjectTest.php
index a3c4b3340ec70..da68d42d9c0d2 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorArrayObjectTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorArrayObjectTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
-class CollectionValidatorArrayObjectTest extends CollectionValidatorTest
+class CollectionValidatorArrayObjectTest extends CollectionValidatorTestCase
 {
     public function prepareTestData(array $contents)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorArrayTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorArrayTest.php
index 7517d0ce340e4..993a870714d75 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorArrayTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorArrayTest.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
-class CollectionValidatorArrayTest extends CollectionValidatorTest
+class CollectionValidatorArrayTest extends CollectionValidatorTestCase
 {
     public function prepareTestData(array $contents)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorCustomArrayObjectTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorCustomArrayObjectTest.php
index 3d4c29681bf47..bfb9af29a8bb0 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorCustomArrayObjectTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorCustomArrayObjectTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Validator\Tests\Fixtures\CustomArrayObject;
 
-class CollectionValidatorCustomArrayObjectTest extends CollectionValidatorTest
+class CollectionValidatorCustomArrayObjectTest extends CollectionValidatorTestCase
 {
     public function prepareTestData(array $contents)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTestCase.php
similarity index 99%
rename from src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
rename to src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTestCase.php
index a98379a80986d..92260e96693da 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTestCase.php
@@ -20,7 +20,7 @@
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
-abstract class CollectionValidatorTest extends ConstraintValidatorTestCase
+abstract class CollectionValidatorTestCase extends ConstraintValidatorTestCase
 {
     protected function createValidator(): CollectionValidator
     {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorArrayTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorArrayTest.php
index 5f562e7445f8f..cc258cfca1cff 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorArrayTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorArrayTest.php
@@ -14,7 +14,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class CountValidatorArrayTest extends CountValidatorTest
+class CountValidatorArrayTest extends CountValidatorTestCase
 {
     protected function createCollection(array $content)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorCountableTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorCountableTest.php
index 7d46967bde483..276076e885f6e 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorCountableTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorCountableTest.php
@@ -16,7 +16,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class CountValidatorCountableTest extends CountValidatorTest
+class CountValidatorCountableTest extends CountValidatorTestCase
 {
     protected function createCollection(array $content)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTestCase.php
similarity index 99%
rename from src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
rename to src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTestCase.php
index ae71acd1e3dfb..3ffe3a7e4d1d6 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTestCase.php
@@ -20,7 +20,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-abstract class CountValidatorTest extends ConstraintValidatorTestCase
+abstract class CountValidatorTestCase extends ConstraintValidatorTestCase
 {
     protected function createValidator(): CountValidator
     {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorObjectTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorObjectTest.php
index f35f93b1797d6..932b45cbc1a9f 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorObjectTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorObjectTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\HttpFoundation\File\File;
 
-class FileValidatorObjectTest extends FileValidatorTest
+class FileValidatorObjectTest extends FileValidatorTestCase
 {
     protected function getFile($filename)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php
index dfd82f15ccf4d..9a89688016de3 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Validator\Constraints\File;
 
-class FileValidatorPathTest extends FileValidatorTest
+class FileValidatorPathTest extends FileValidatorTestCase
 {
     protected function getFile($filename)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php
similarity index 99%
rename from src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
rename to src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php
index c42cd45c7787f..b001f0565804d 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
-abstract class FileValidatorTest extends ConstraintValidatorTestCase
+abstract class FileValidatorTestCase extends ConstraintValidatorTestCase
 {
     protected $path;
 

From e474b7699b3ab1831f4e52efaee5de65a41620f7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 7 Feb 2023 11:19:03 +0100
Subject: [PATCH 182/475] Fix merge

---
 .../Tests/Descriptor/ReStructuredTextDescriptorTest.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Console/Tests/Descriptor/ReStructuredTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/ReStructuredTextDescriptorTest.php
index b5d164c34d398..137270f954cdf 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/ReStructuredTextDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/ReStructuredTextDescriptorTest.php
@@ -19,7 +19,7 @@ class ReStructuredTextDescriptorTest extends AbstractDescriptorTestCase
 {
     public static function getDescribeCommandTestData()
     {
-        return $this->getDescriptionTestData(array_merge(
+        return self::getDescriptionTestData(array_merge(
             ObjectsProvider::getCommands(),
             ['command_mbstring' => new DescriptorCommandMbString()]
         ));
@@ -27,7 +27,7 @@ public static function getDescribeCommandTestData()
 
     public static function getDescribeApplicationTestData()
     {
-        return $this->getDescriptionTestData(array_merge(
+        return self::getDescriptionTestData(array_merge(
             ObjectsProvider::getApplications(),
             ['application_mbstring' => new DescriptorApplicationMbString()]
         ));

From 5cdf81c82280d4b3a7068217b002ae28ab8e193c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 7 Feb 2023 17:40:03 +0100
Subject: [PATCH 183/475] [Cache] Sync RelayProxy with latest lazy-proxy
 changes

---
 .github/workflows/unit-tests.yml              |   2 +-
 .../Cache/Tests/Traits/RedisProxiesTest.php   |  10 +-
 .../Component/Cache/Traits/RelayProxy.php     | 505 +++++++++---------
 .../Tests/Store/AbstractStoreTestCase.php     |   2 +-
 4 files changed, 266 insertions(+), 253 deletions(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 327e1ec701b4c..4e174ca64c587 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -21,7 +21,7 @@ jobs:
     name: Tests
 
     env:
-      extensions: amqp,apcu,igbinary,intl,mbstring,memcached,redis
+      extensions: amqp,apcu,igbinary,intl,mbstring,memcached,redis,relay
 
     strategy:
       matrix:
diff --git a/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php b/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php
index bafcc167671e8..75ac588bbd125 100644
--- a/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php
+++ b/src/Symfony/Component/Cache/Tests/Traits/RedisProxiesTest.php
@@ -56,21 +56,27 @@ public function testRedis5Proxy($class)
 
     /**
      * @requires extension relay
+     * @requires PHP 8.2
      */
     public function testRelayProxy()
     {
         $proxy = file_get_contents(\dirname(__DIR__, 2).'/Traits/RelayProxy.php');
-        $proxy = substr($proxy, 0, 8 + strpos($proxy, "\n    ];"));
+        $proxy = substr($proxy, 0, 4 + strpos($proxy, '[];'));
         $methods = [];
 
         foreach ((new \ReflectionClass(Relay::class))->getMethods() as $method) {
             if ('reset' === $method->name || method_exists(LazyProxyTrait::class, $method->name) || $method->isStatic()) {
                 continue;
             }
+            $args = [];
+            foreach ($method->getParameters() as $param) {
+                $args[] = ($param->isVariadic() ? '...' : '').'$'.$param->name;
+            }
+            $args = implode(', ', $args);
             $return = $method->getReturnType() instanceof \ReflectionNamedType && 'void' === (string) $method->getReturnType() ? '' : 'return ';
             $methods[] = "\n    ".ProxyHelper::exportSignature($method, false)."\n".<<<EOPHP
                 {
-                    {$return}\$this->lazyObjectReal->{$method->name}(...\\func_get_args());
+                    {$return}(\$this->lazyObjectState->realInstance ??= (\$this->lazyObjectState->initializer)())->{$method->name}({$args});
                 }
 
             EOPHP;
diff --git a/src/Symfony/Component/Cache/Traits/RelayProxy.php b/src/Symfony/Component/Cache/Traits/RelayProxy.php
index d458062163ada..32dee4ac1e9e7 100644
--- a/src/Symfony/Component/Cache/Traits/RelayProxy.php
+++ b/src/Symfony/Component/Cache/Traits/RelayProxy.php
@@ -30,1233 +30,1240 @@ class RelayProxy extends Relay implements ResetInterface, LazyObjectInterface
         resetLazyObject as reset;
     }
 
-    private const LAZY_OBJECT_PROPERTY_SCOPES = [
-        'lazyObjectReal' => [self::class, 'lazyObjectReal', null],
-        "\0".self::class."\0lazyObjectReal" => [self::class, 'lazyObjectReal', null],
-    ];
+    private const LAZY_OBJECT_PROPERTY_SCOPES = [];
 
     public function __construct($host = null, $port = 6379, $connect_timeout = 0.0, $command_timeout = 0.0, #[\SensitiveParameter] $context = [], $database = 0)
     {
-        return $this->lazyObjectReal->__construct(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->__construct($host, $port, $connect_timeout, $command_timeout, $context, $database);
     }
 
     public function connect($host, $port = 6379, $timeout = 0.0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0.0, #[\SensitiveParameter] $context = [], $database = 0): bool
     {
-        return $this->lazyObjectReal->connect(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->connect($host, $port, $timeout, $persistent_id, $retry_interval, $read_timeout, $context, $database);
     }
 
     public function pconnect($host, $port = 6379, $timeout = 0.0, $persistent_id = null, $retry_interval = 0, $read_timeout = 0.0, #[\SensitiveParameter] $context = [], $database = 0): bool
     {
-        return $this->lazyObjectReal->pconnect(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pconnect($host, $port, $timeout, $persistent_id, $retry_interval, $read_timeout, $context, $database);
     }
 
     public function close(): bool
     {
-        return $this->lazyObjectReal->close(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->close();
     }
 
     public function pclose(): bool
     {
-        return $this->lazyObjectReal->pclose(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pclose();
     }
 
     public function listen($callback): bool
     {
-        return $this->lazyObjectReal->listen(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->listen($callback);
     }
 
     public function onFlushed($callback): bool
     {
-        return $this->lazyObjectReal->onFlushed(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->onFlushed($callback);
     }
 
     public function onInvalidated($callback, $pattern = null): bool
     {
-        return $this->lazyObjectReal->onInvalidated(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->onInvalidated($callback, $pattern);
     }
 
     public function dispatchEvents(): false|int
     {
-        return $this->lazyObjectReal->dispatchEvents(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->dispatchEvents();
     }
 
     public function getOption($option): mixed
     {
-        return $this->lazyObjectReal->getOption(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getOption($option);
     }
 
     public function option($option, $value = null): mixed
     {
-        return $this->lazyObjectReal->option(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->option($option, $value);
     }
 
     public function setOption($option, $value): bool
     {
-        return $this->lazyObjectReal->setOption(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->setOption($option, $value);
+    }
+
+    public function addIgnorePatterns(...$pattern): int
+    {
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->addIgnorePatterns(...$pattern);
+    }
+
+    public function addAllowPatterns(...$pattern): int
+    {
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->addAllowPatterns(...$pattern);
     }
 
     public function getTimeout(): false|float
     {
-        return $this->lazyObjectReal->getTimeout(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getTimeout();
     }
 
     public function timeout(): false|float
     {
-        return $this->lazyObjectReal->timeout(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->timeout();
     }
 
     public function getReadTimeout(): false|float
     {
-        return $this->lazyObjectReal->getReadTimeout(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getReadTimeout();
     }
 
     public function readTimeout(): false|float
     {
-        return $this->lazyObjectReal->readTimeout(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->readTimeout();
     }
 
     public function getBytes(): array
     {
-        return $this->lazyObjectReal->getBytes(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getBytes();
     }
 
     public function bytes(): array
     {
-        return $this->lazyObjectReal->bytes(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bytes();
     }
 
     public function getHost(): false|string
     {
-        return $this->lazyObjectReal->getHost(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getHost();
     }
 
     public function isConnected(): bool
     {
-        return $this->lazyObjectReal->isConnected(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->isConnected();
     }
 
     public function getPort(): false|int
     {
-        return $this->lazyObjectReal->getPort(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getPort();
     }
 
     public function getAuth(): mixed
     {
-        return $this->lazyObjectReal->getAuth(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getAuth();
     }
 
     public function getDbNum(): mixed
     {
-        return $this->lazyObjectReal->getDbNum(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getDbNum();
     }
 
     public function _serialize($value): mixed
     {
-        return $this->lazyObjectReal->_serialize(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->_serialize($value);
     }
 
     public function _unserialize($value): mixed
     {
-        return $this->lazyObjectReal->_unserialize(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->_unserialize($value);
     }
 
     public function _compress($value): string
     {
-        return $this->lazyObjectReal->_compress(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->_compress($value);
     }
 
     public function _uncompress($value): string
     {
-        return $this->lazyObjectReal->_uncompress(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->_uncompress($value);
     }
 
     public function _pack($value): string
     {
-        return $this->lazyObjectReal->_pack(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->_pack($value);
     }
 
     public function _unpack($value): mixed
     {
-        return $this->lazyObjectReal->_unpack(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->_unpack($value);
     }
 
     public function _prefix($value): string
     {
-        return $this->lazyObjectReal->_prefix(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->_prefix($value);
     }
 
     public function getLastError(): ?string
     {
-        return $this->lazyObjectReal->getLastError(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getLastError();
     }
 
     public function clearLastError(): bool
     {
-        return $this->lazyObjectReal->clearLastError(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->clearLastError();
     }
 
     public function endpointId(): false|string
     {
-        return $this->lazyObjectReal->endpointId(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->endpointId();
     }
 
     public function getPersistentID(): false|string
     {
-        return $this->lazyObjectReal->getPersistentID(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getPersistentID();
     }
 
     public function socketId(): false|string
     {
-        return $this->lazyObjectReal->socketId(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->socketId();
     }
 
     public function rawCommand($cmd, ...$args): mixed
     {
-        return $this->lazyObjectReal->rawCommand(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->rawCommand($cmd, ...$args);
     }
 
     public function select($db): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->select(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->select($db);
     }
 
     public function auth(#[\SensitiveParameter] $auth): bool
     {
-        return $this->lazyObjectReal->auth(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->auth($auth);
     }
 
     public function info(...$sections): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->info(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->info(...$sections);
     }
 
     public function flushdb($async = false): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->flushdb(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->flushdb($async);
     }
 
     public function flushall($async = false): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->flushall(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->flushall($async);
     }
 
     public function fcall($name, $argv = [], $keys = [], $handler = null): mixed
     {
-        return $this->lazyObjectReal->fcall(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->fcall($name, $argv, $keys, $handler);
     }
 
     public function fcall_ro($name, $argv = [], $keys = [], $handler = null): mixed
     {
-        return $this->lazyObjectReal->fcall_ro(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->fcall_ro($name, $argv, $keys, $handler);
     }
 
     public function function($op, ...$args): mixed
     {
-        return $this->lazyObjectReal->function(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->function($op, ...$args);
     }
 
     public function dbsize(): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->dbsize(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->dbsize();
     }
 
     public function dump($key): \Relay\Relay|false|string
     {
-        return $this->lazyObjectReal->dump(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->dump($key);
     }
 
     public function replicaof($host = null, $port = 0): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->replicaof(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->replicaof($host, $port);
     }
 
     public function restore($key, $ttl, $value, $options = null): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->restore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->restore($key, $ttl, $value, $options);
     }
 
     public function migrate($host, $port, $key, $dstdb, $timeout, $copy = false, $replace = false, #[\SensitiveParameter] $credentials = null): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->migrate(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->migrate($host, $port, $key, $dstdb, $timeout, $copy, $replace, $credentials);
     }
 
     public function copy($src, $dst, $options = null): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->copy(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->copy($src, $dst, $options);
     }
 
     public function echo($arg): \Relay\Relay|bool|string
     {
-        return $this->lazyObjectReal->echo(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->echo($arg);
     }
 
     public function ping($arg = null): \Relay\Relay|bool|string
     {
-        return $this->lazyObjectReal->ping(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ping($arg);
     }
 
     public function idleTime(): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->idleTime(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->idleTime();
     }
 
     public function randomkey(): \Relay\Relay|bool|null|string
     {
-        return $this->lazyObjectReal->randomkey(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->randomkey();
     }
 
     public function time(): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->time(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->time();
     }
 
     public function bgrewriteaof(): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->bgrewriteaof(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgrewriteaof();
     }
 
     public function lastsave(): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->lastsave(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lastsave();
     }
 
     public function bgsave(): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->bgsave(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgsave();
     }
 
     public function save(): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->save(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->save();
     }
 
     public function role(): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->role(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->role();
     }
 
     public function ttl($key): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->ttl(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ttl($key);
     }
 
     public function pttl($key): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->pttl(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pttl($key);
     }
 
     public function exists(...$keys): \Relay\Relay|bool|int
     {
-        return $this->lazyObjectReal->exists(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->exists(...$keys);
     }
 
     public function eval($script, $args = [], $num_keys = 0): mixed
     {
-        return $this->lazyObjectReal->eval(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->eval($script, $args, $num_keys);
     }
 
     public function eval_ro($script, $args = [], $num_keys = 0): mixed
     {
-        return $this->lazyObjectReal->eval_ro(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->eval_ro($script, $args, $num_keys);
     }
 
     public function evalsha($sha, $args = [], $num_keys = 0): mixed
     {
-        return $this->lazyObjectReal->evalsha(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->evalsha($sha, $args, $num_keys);
     }
 
     public function evalsha_ro($sha, $args = [], $num_keys = 0): mixed
     {
-        return $this->lazyObjectReal->evalsha_ro(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->evalsha_ro($sha, $args, $num_keys);
     }
 
     public function client($operation, ...$args): mixed
     {
-        return $this->lazyObjectReal->client(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->client($operation, ...$args);
     }
 
     public function geoadd($key, $lng, $lat, $member, ...$other_triples_and_options): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->geoadd(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geoadd($key, $lng, $lat, $member, ...$other_triples_and_options);
     }
 
     public function geodist($key, $src, $dst, $unit = null): \Relay\Relay|false|float
     {
-        return $this->lazyObjectReal->geodist(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geodist($key, $src, $dst, $unit);
     }
 
     public function geohash($key, $member, ...$other_members): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->geohash(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geohash($key, $member, ...$other_members);
     }
 
     public function georadius($key, $lng, $lat, $radius, $unit, $options = []): mixed
     {
-        return $this->lazyObjectReal->georadius(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->georadius($key, $lng, $lat, $radius, $unit, $options);
     }
 
     public function georadiusbymember($key, $member, $radius, $unit, $options = []): mixed
     {
-        return $this->lazyObjectReal->georadiusbymember(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->georadiusbymember($key, $member, $radius, $unit, $options);
     }
 
     public function georadiusbymember_ro($key, $member, $radius, $unit, $options = []): mixed
     {
-        return $this->lazyObjectReal->georadiusbymember_ro(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->georadiusbymember_ro($key, $member, $radius, $unit, $options);
     }
 
     public function georadius_ro($key, $lng, $lat, $radius, $unit, $options = []): mixed
     {
-        return $this->lazyObjectReal->georadius_ro(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->georadius_ro($key, $lng, $lat, $radius, $unit, $options);
     }
 
     public function geosearch($key, $position, $shape, $unit, $options = []): \Relay\Relay|array
     {
-        return $this->lazyObjectReal->geosearch(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geosearch($key, $position, $shape, $unit, $options);
     }
 
     public function geosearchstore($dst, $src, $position, $shape, $unit, $options = []): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->geosearchstore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geosearchstore($dst, $src, $position, $shape, $unit, $options);
     }
 
     public function get($key): mixed
     {
-        return $this->lazyObjectReal->get(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->get($key);
     }
 
     public function getset($key, $value): mixed
     {
-        return $this->lazyObjectReal->getset(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getset($key, $value);
     }
 
     public function getrange($key, $start, $end): \Relay\Relay|false|string
     {
-        return $this->lazyObjectReal->getrange(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getrange($key, $start, $end);
     }
 
     public function setrange($key, $start, $value): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->setrange(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->setrange($key, $start, $value);
     }
 
     public function getbit($key, $pos): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->getbit(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getbit($key, $pos);
     }
 
     public function bitcount($key, $start = 0, $end = -1, $by_bit = false): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->bitcount(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bitcount($key, $start, $end, $by_bit);
     }
 
     public function config($operation, $key = null, $value = null): \Relay\Relay|array|bool
     {
-        return $this->lazyObjectReal->config(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->config($operation, $key, $value);
     }
 
     public function command(...$args): \Relay\Relay|array|false|int
     {
-        return $this->lazyObjectReal->command(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->command(...$args);
     }
 
     public function bitop($operation, $dstkey, $srckey, ...$other_keys): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->bitop(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bitop($operation, $dstkey, $srckey, ...$other_keys);
     }
 
     public function bitpos($key, $bit, $start = null, $end = null, $bybit = false): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->bitpos(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bitpos($key, $bit, $start, $end, $bybit);
     }
 
     public function setbit($key, $pos, $val): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->setbit(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->setbit($key, $pos, $val);
     }
 
     public function acl($cmd, ...$args): mixed
     {
-        return $this->lazyObjectReal->acl(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->acl($cmd, ...$args);
     }
 
     public function append($key, $value): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->append(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->append($key, $value);
     }
 
     public function set($key, $value, $options = null): mixed
     {
-        return $this->lazyObjectReal->set(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->set($key, $value, $options);
     }
 
     public function getex($key, $options = null): mixed
     {
-        return $this->lazyObjectReal->getex(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getex($key, $options);
     }
 
     public function getdel($key): mixed
     {
-        return $this->lazyObjectReal->getdel(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getdel($key);
     }
 
     public function setex($key, $seconds, $value): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->setex(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->setex($key, $seconds, $value);
     }
 
     public function pfadd($key, $elements): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->pfadd(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pfadd($key, $elements);
     }
 
     public function pfcount($key): \Relay\Relay|int
     {
-        return $this->lazyObjectReal->pfcount(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pfcount($key);
     }
 
     public function pfmerge($dst, $srckeys): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->pfmerge(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pfmerge($dst, $srckeys);
     }
 
     public function psetex($key, $milliseconds, $value): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->psetex(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->psetex($key, $milliseconds, $value);
     }
 
     public function publish($channel, $message): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->publish(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->publish($channel, $message);
     }
 
     public function setnx($key, $value): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->setnx(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->setnx($key, $value);
     }
 
     public function mget($keys): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->mget(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->mget($keys);
     }
 
     public function move($key, $db): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->move(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->move($key, $db);
     }
 
     public function mset($kvals): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->mset(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->mset($kvals);
     }
 
     public function msetnx($kvals): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->msetnx(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->msetnx($kvals);
     }
 
     public function rename($key, $newkey): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->rename(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->rename($key, $newkey);
     }
 
     public function renamenx($key, $newkey): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->renamenx(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->renamenx($key, $newkey);
     }
 
     public function del(...$keys): \Relay\Relay|bool|int
     {
-        return $this->lazyObjectReal->del(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->del(...$keys);
     }
 
     public function unlink(...$keys): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->unlink(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->unlink(...$keys);
     }
 
     public function expire($key, $seconds, $mode = null): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->expire(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->expire($key, $seconds, $mode);
     }
 
     public function pexpire($key, $milliseconds): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->pexpire(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pexpire($key, $milliseconds);
     }
 
     public function expireat($key, $timestamp): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->expireat(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->expireat($key, $timestamp);
     }
 
     public function expiretime($key): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->expiretime(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->expiretime($key);
     }
 
     public function pexpireat($key, $timestamp_ms): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->pexpireat(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pexpireat($key, $timestamp_ms);
     }
 
     public function pexpiretime($key): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->pexpiretime(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pexpiretime($key);
     }
 
     public function persist($key): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->persist(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->persist($key);
     }
 
     public function type($key): \Relay\Relay|bool|int|string
     {
-        return $this->lazyObjectReal->type(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->type($key);
     }
 
     public function lmove($srckey, $dstkey, $srcpos, $dstpos): \Relay\Relay|false|null|string
     {
-        return $this->lazyObjectReal->lmove(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lmove($srckey, $dstkey, $srcpos, $dstpos);
     }
 
     public function blmove($srckey, $dstkey, $srcpos, $dstpos, $timeout): \Relay\Relay|false|null|string
     {
-        return $this->lazyObjectReal->blmove(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->blmove($srckey, $dstkey, $srcpos, $dstpos, $timeout);
     }
 
     public function lrange($key, $start, $stop): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->lrange(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lrange($key, $start, $stop);
     }
 
     public function lpush($key, $mem, ...$mems): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->lpush(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lpush($key, $mem, ...$mems);
     }
 
     public function rpush($key, $mem, ...$mems): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->rpush(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->rpush($key, $mem, ...$mems);
     }
 
     public function lpushx($key, $mem, ...$mems): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->lpushx(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lpushx($key, $mem, ...$mems);
     }
 
     public function rpushx($key, $mem, ...$mems): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->rpushx(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->rpushx($key, $mem, ...$mems);
     }
 
     public function lset($key, $index, $mem): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->lset(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lset($key, $index, $mem);
     }
 
     public function lpop($key, $count = 1): mixed
     {
-        return $this->lazyObjectReal->lpop(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lpop($key, $count);
     }
 
     public function lpos($key, $value, $options = null): \Relay\Relay|array|false|int|null
     {
-        return $this->lazyObjectReal->lpos(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lpos($key, $value, $options);
     }
 
     public function rpop($key, $count = 1): mixed
     {
-        return $this->lazyObjectReal->rpop(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->rpop($key, $count);
     }
 
     public function rpoplpush($source, $dest): mixed
     {
-        return $this->lazyObjectReal->rpoplpush(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->rpoplpush($source, $dest);
     }
 
     public function brpoplpush($source, $dest, $timeout): mixed
     {
-        return $this->lazyObjectReal->brpoplpush(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->brpoplpush($source, $dest, $timeout);
     }
 
     public function blpop($key, $timeout_or_key, ...$extra_args): \Relay\Relay|array|false|null
     {
-        return $this->lazyObjectReal->blpop(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->blpop($key, $timeout_or_key, ...$extra_args);
     }
 
     public function blmpop($timeout, $keys, $from, $count = 1): \Relay\Relay|array|false|null
     {
-        return $this->lazyObjectReal->blmpop(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->blmpop($timeout, $keys, $from, $count);
     }
 
     public function bzmpop($timeout, $keys, $from, $count = 1): \Relay\Relay|array|false|null
     {
-        return $this->lazyObjectReal->bzmpop(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bzmpop($timeout, $keys, $from, $count);
     }
 
     public function lmpop($keys, $from, $count = 1): \Relay\Relay|array|false|null
     {
-        return $this->lazyObjectReal->lmpop(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lmpop($keys, $from, $count);
     }
 
     public function zmpop($keys, $from, $count = 1): \Relay\Relay|array|false|null
     {
-        return $this->lazyObjectReal->zmpop(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zmpop($keys, $from, $count);
     }
 
     public function brpop($key, $timeout_or_key, ...$extra_args): \Relay\Relay|array|false|null
     {
-        return $this->lazyObjectReal->brpop(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->brpop($key, $timeout_or_key, ...$extra_args);
     }
 
     public function bzpopmax($key, $timeout_or_key, ...$extra_args): \Relay\Relay|array|false|null
     {
-        return $this->lazyObjectReal->bzpopmax(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bzpopmax($key, $timeout_or_key, ...$extra_args);
     }
 
     public function bzpopmin($key, $timeout_or_key, ...$extra_args): \Relay\Relay|array|false|null
     {
-        return $this->lazyObjectReal->bzpopmin(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bzpopmin($key, $timeout_or_key, ...$extra_args);
     }
 
     public function object($op, $key): mixed
     {
-        return $this->lazyObjectReal->object(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->object($op, $key);
     }
 
     public function geopos($key, ...$members): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->geopos(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->geopos($key, ...$members);
     }
 
     public function lrem($key, $mem, $count = 0): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->lrem(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lrem($key, $mem, $count);
     }
 
     public function lindex($key, $index): mixed
     {
-        return $this->lazyObjectReal->lindex(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lindex($key, $index);
     }
 
     public function linsert($key, $op, $pivot, $element): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->linsert(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->linsert($key, $op, $pivot, $element);
     }
 
     public function ltrim($key, $start, $end): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->ltrim(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->ltrim($key, $start, $end);
     }
 
     public function hget($hash, $member): mixed
     {
-        return $this->lazyObjectReal->hget(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hget($hash, $member);
     }
 
     public function hstrlen($hash, $member): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->hstrlen(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hstrlen($hash, $member);
     }
 
     public function hgetall($hash): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->hgetall(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hgetall($hash);
     }
 
     public function hkeys($hash): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->hkeys(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hkeys($hash);
     }
 
     public function hvals($hash): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->hvals(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hvals($hash);
     }
 
     public function hmget($hash, $members): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->hmget(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hmget($hash, $members);
     }
 
     public function hrandfield($hash, $options = null): \Relay\Relay|array|false|string
     {
-        return $this->lazyObjectReal->hrandfield(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hrandfield($hash, $options);
     }
 
     public function hmset($hash, $members): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->hmset(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hmset($hash, $members);
     }
 
     public function hexists($hash, $member): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->hexists(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hexists($hash, $member);
     }
 
     public function hsetnx($hash, $member, $value): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->hsetnx(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hsetnx($hash, $member, $value);
     }
 
     public function hset($key, $mem, $val, ...$kvals): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->hset(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hset($key, $mem, $val, ...$kvals);
     }
 
     public function hdel($key, $mem, ...$mems): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->hdel(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hdel($key, $mem, ...$mems);
     }
 
     public function hincrby($key, $mem, $value): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->hincrby(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hincrby($key, $mem, $value);
     }
 
     public function hincrbyfloat($key, $mem, $value): \Relay\Relay|bool|float
     {
-        return $this->lazyObjectReal->hincrbyfloat(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hincrbyfloat($key, $mem, $value);
     }
 
     public function incr($key, $by = 1): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->incr(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->incr($key, $by);
     }
 
     public function decr($key, $by = 1): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->decr(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->decr($key, $by);
     }
 
     public function incrby($key, $value): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->incrby(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->incrby($key, $value);
     }
 
     public function decrby($key, $value): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->decrby(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->decrby($key, $value);
     }
 
     public function incrbyfloat($key, $value): \Relay\Relay|false|float
     {
-        return $this->lazyObjectReal->incrbyfloat(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->incrbyfloat($key, $value);
     }
 
     public function sdiff($key, ...$other_keys): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->sdiff(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sdiff($key, ...$other_keys);
     }
 
     public function sdiffstore($key, ...$other_keys): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->sdiffstore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sdiffstore($key, ...$other_keys);
     }
 
     public function sinter($key, ...$other_keys): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->sinter(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sinter($key, ...$other_keys);
     }
 
     public function sintercard($keys, $limit = -1): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->sintercard(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sintercard($keys, $limit);
     }
 
     public function sinterstore($key, ...$other_keys): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->sinterstore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sinterstore($key, ...$other_keys);
     }
 
     public function sunion($key, ...$other_keys): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->sunion(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sunion($key, ...$other_keys);
     }
 
     public function sunionstore($key, ...$other_keys): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->sunionstore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sunionstore($key, ...$other_keys);
     }
 
     public function touch($key_or_array, ...$more_keys): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->touch(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->touch($key_or_array, ...$more_keys);
     }
 
     public function pipeline(): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->pipeline(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pipeline();
     }
 
     public function 
10000
multi($mode = 0): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->multi(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->multi($mode);
     }
 
     public function exec(): \Relay\Relay|array|bool
     {
-        return $this->lazyObjectReal->exec(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->exec();
     }
 
     public function wait($replicas, $timeout): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->wait(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->wait($replicas, $timeout);
     }
 
     public function watch($key, ...$other_keys): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->watch(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->watch($key, ...$other_keys);
     }
 
     public function unwatch(): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->unwatch(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->unwatch();
     }
 
     public function discard(): bool
     {
-        return $this->lazyObjectReal->discard(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->discard();
     }
 
     public function getMode($masked = false): int
     {
-        return $this->lazyObjectReal->getMode(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->getMode($masked);
     }
 
     public function clearBytes(): void
     {
-        $this->lazyObjectReal->clearBytes(...\func_get_args());
+        ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->clearBytes();
     }
 
     public function scan(&$iterator, $match = null, $count = 0, $type = null): array|false
     {
-        return $this->lazyObjectReal->scan(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->scan($iterator, $match, $count, $type);
     }
 
     public function hscan($key, &$iterator, $match = null, $count = 0): array|false
     {
-        return $this->lazyObjectReal->hscan(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hscan($key, $iterator, $match, $count);
     }
 
     public function sscan($key, &$iterator, $match = null, $count = 0): array|false
     {
-        return $this->lazyObjectReal->sscan(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sscan($key, $iterator, $match, $count);
     }
 
     public function zscan($key, &$iterator, $match = null, $count = 0): array|false
     {
-        return $this->lazyObjectReal->zscan(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zscan($key, $iterator, $match, $count);
     }
 
     public function keys($pattern): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->keys(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->keys($pattern);
     }
 
     public function slowlog($operation, ...$extra_args): \Relay\Relay|array|bool|int
     {
-        return $this->lazyObjectReal->slowlog(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->slowlog($operation, ...$extra_args);
     }
 
     public function smembers($set): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->smembers(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->smembers($set);
     }
 
     public function sismember($set, $member): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->sismember(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sismember($set, $member);
     }
 
     public function smismember($set, ...$members): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->smismember(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->smismember($set, ...$members);
     }
 
     public function srem($set, $member, ...$members): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->srem(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->srem($set, $member, ...$members);
     }
 
     public function sadd($set, $member, ...$members): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->sadd(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sadd($set, $member, ...$members);
     }
 
     public function sort($key, $options = []): \Relay\Relay|array|false|int
     {
-        return $this->lazyObjectReal->sort(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sort($key, $options);
     }
 
     public function sort_ro($key, $options = []): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->sort_ro(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sort_ro($key, $options);
     }
 
     public function smove($srcset, $dstset, $member): \Relay\Relay|bool
     {
-        return $this->lazyObjectReal->smove(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->smove($srcset, $dstset, $member);
     }
 
     public function spop($set, $count = 1): mixed
     {
-        return $this->lazyObjectReal->spop(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->spop($set, $count);
     }
 
     public function srandmember($set, $count = 1): mixed
     {
-        return $this->lazyObjectReal->srandmember(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->srandmember($set, $count);
     }
 
     public function scard($key): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->scard(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->scard($key);
     }
 
     public function script($command, ...$args): mixed
     {
-        return $this->lazyObjectReal->script(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->script($command, ...$args);
     }
 
     public function strlen($key): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->strlen(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->strlen($key);
     }
 
     public function hlen($key): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->hlen(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hlen($key);
     }
 
     public function llen($key): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->llen(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->llen($key);
     }
 
     public function xack($key, $group, $ids): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->xack(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xack($key, $group, $ids);
     }
 
     public function xadd($key, $id, $values, $maxlen = 0, $approx = false, $nomkstream = false): \Relay\Relay|false|string
     {
-        return $this->lazyObjectReal->xadd(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xadd($key, $id, $values, $maxlen, $approx, $nomkstream);
     }
 
     public function xclaim($key, $group, $consumer, $min_idle, $ids, $options): \Relay\Relay|array|bool
     {
-        return $this->lazyObjectReal->xclaim(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xclaim($key, $group, $consumer, $min_idle, $ids, $options);
     }
 
     public function xautoclaim($key, $group, $consumer, $min_idle, $start, $count = -1, $justid = false): \Relay\Relay|array|bool
     {
-        return $this->lazyObjectReal->xautoclaim(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xautoclaim($key, $group, $consumer, $min_idle, $start, $count, $justid);
     }
 
     public function xlen($key): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->xlen(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xlen($key);
     }
 
     public function xgroup($operation, $key = null, $group = null, $id_or_consumer = null, $mkstream = false, $entries_read = -2): mixed
     {
-        return $this->lazyObjectReal->xgroup(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xgroup($operation, $key, $group, $id_or_consumer, $mkstream, $entries_read);
     }
 
     public function xdel($key, $ids): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->xdel(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xdel($key, $ids);
     }
 
     public function xinfo($operation, $arg1 = null, $arg2 = null, $count = -1): mixed
     {
-        return $this->lazyObjectReal->xinfo(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xinfo($operation, $arg1, $arg2, $count);
     }
 
     public function xpending($key, $group, $start = null, $end = null, $count = -1, $consumer = null, $idle = 0): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->xpending(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xpending($key, $group, $start, $end, $count, $consumer, $idle);
     }
 
     public function xrange($key, $start, $end, $count = -1): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->xrange(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xrange($key, $start, $end, $count);
     }
 
     public function xrevrange($key, $end, $start, $count = -1): \Relay\Relay|array|bool
     {
-        return $this->lazyObjectReal->xrevrange(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xrevrange($key, $end, $start, $count);
     }
 
     public function xread($streams, $count = -1, $block = -1): \Relay\Relay|array|bool|null
     {
-        return $this->lazyObjectReal->xread(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xread($streams, $count, $block);
     }
 
     public function xreadgroup($group, $consumer, $streams, $count = 1, $block = 1): \Relay\Relay|array|bool|null
     {
-        return $this->lazyObjectReal->xreadgroup(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xreadgroup($group, $consumer, $streams, $count, $block);
     }
 
     public function xtrim($key, $threshold, $approx = false, $minid = false, $limit = -1): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->xtrim(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->xtrim($key, $threshold, $approx, $minid, $limit);
     }
 
     public function zadd($key, ...$args): mixed
     {
-        return $this->lazyObjectReal->zadd(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zadd($key, ...$args);
     }
 
     public function zrandmember($key, $options = null): mixed
     {
-        return $this->lazyObjectReal->zrandmember(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrandmember($key, $options);
     }
 
     public function zrange($key, $start, $end, $options = null): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->zrange(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrange($key, $start, $end, $options);
     }
 
     public function zrevrange($key, $start, $end, $options = null): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->zrevrange(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrevrange($key, $start, $end, $options);
     }
 
     public function zrangebyscore($key, $start, $end, $options = null): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->zrangebyscore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrangebyscore($key, $start, $end, $options);
     }
 
     public function zrevrangebyscore($key, $start, $end, $options = null): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->zrevrangebyscore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrevrangebyscore($key, $start, $end, $options);
     }
 
     public function zrangestore($dst, $src, $start, $end, $options = null): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zrangestore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrangestore($dst, $src, $start, $end, $options);
     }
 
     public function zrangebylex($key, $min, $max, $offset = -1, $count = -1): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->zrangebylex(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrangebylex($key, $min, $max, $offset, $count);
     }
 
     public function zrevrangebylex($key, $max, $min, $offset = -1, $count = -1): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->zrevrangebylex(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrevrangebylex($key, $max, $min, $offset, $count);
     }
 
     public function zrank($key, $rank): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zrank(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrank($key, $rank);
     }
 
     public function zrevrank($key, $rank): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zrevrank(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrevrank($key, $rank);
     }
 
     public function zrem($key, ...$args): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zrem(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrem($key, ...$args);
     }
 
     public function zremrangebylex($key, $min, $max): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zremrangebylex(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zremrangebylex($key, $min, $max);
     }
 
     public function zremrangebyrank($key, $start, $end): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zremrangebyrank(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zremrangebyrank($key, $start, $end);
     }
 
     public function zremrangebyscore($key, $min, $max): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zremrangebyscore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zremrangebyscore($key, $min, $max);
     }
 
     public function zcard($key): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zcard(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zcard($key);
     }
 
     public function zcount($key, $min, $max): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zcount(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zcount($key, $min, $max);
     }
 
     public function zdiff($keys, $options = null): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->zdiff(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zdiff($keys, $options);
     }
 
     public function zdiffstore($dst, $keys): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zdiffstore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zdiffstore($dst, $keys);
     }
 
     public function zincrby($key, $score, $mem): \Relay\Relay|false|float
     {
-        return $this->lazyObjectReal->zincrby(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zincrby($key, $score, $mem);
     }
 
     public function zlexcount($key, $min, $max): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zlexcount(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zlexcount($key, $min, $max);
     }
 
     public function zmscore($key, ...$mems): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->zmscore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zmscore($key, ...$mems);
     }
 
     public function zscore($key, $member): \Relay\Relay|false|float
     {
-        return $this->lazyObjectReal->zscore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zscore($key, $member);
     }
 
     public function zinter($keys, $weights = null, $options = null): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->zinter(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zinter($keys, $weights, $options);
     }
 
     public function zintercard($keys, $limit = -1): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zintercard(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zintercard($keys, $limit);
     }
 
     public function zinterstore($dst, $keys, $weights = null, $options = null): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zinterstore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zinterstore($dst, $keys, $weights, $options);
     }
 
     public function zunion($keys, $weights = null, $options = null): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->zunion(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zunion($keys, $weights, $options);
     }
 
     public function zunionstore($dst, $keys, $weights = null, $options = null): \Relay\Relay|false|int
     {
-        return $this->lazyObjectReal->zunionstore(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zunionstore($dst, $keys, $weights, $options);
     }
 
     public function zpopmin($key, $count = 1): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->zpopmin(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zpopmin($key, $count);
     }
 
     public function zpopmax($key, $count = 1): \Relay\Relay|array|false
     {
-        return $this->lazyObjectReal->zpopmax(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zpopmax($key, $count);
     }
 
     public function _getKeys()
     {
-        return $this->lazyObjectReal->_getKeys(...\func_get_args());
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->_getKeys();
     }
 }
diff --git a/src/Symfony/Component/Semaphore/Tests/Store/AbstractStoreTestCase.php b/src/Symfony/Component/Semaphore/Tests/Store/AbstractStoreTestCase.php
index 82efd9c34071a..4cd89458f5d92 100644
--- a/src/Symfony/Component/Semaphore/Tests/Store/AbstractStoreTestCase.php
+++ b/src/Symfony/Component/Semaphore/Tests/Store/AbstractStoreTestCase.php
@@ -204,7 +204,7 @@ public function testPutOffExpirationWhenSaveHasNotBeenCalled()
         $key1 = new Key(__METHOD__, 4, 2);
 
         $this->expectException(SemaphoreExpiredException::class);
-        $this->expectExceptionMessage('The semaphore "Symfony\Component\Semaphore\Tests\Store\AbstractStoreTest::testPutOffExpirationWhenSaveHasNotBeenCalled" has expired: the script returns a positive number.');
+        $this->expectExceptionMessage('The semaphore "Symfony\Component\Semaphore\Tests\Store\AbstractStoreTestCase::testPutOffExpirationWhenSaveHasNotBeenCalled" has expired: the script returns a positive number.');
 
         $store->putOffExpiration($key1, 20);
     }

From 79f694c91279709f855a03f348588b4f31e63789 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Tue, 7 Feb 2023 22:39:52 +0100
Subject: [PATCH 184/475] [FrameworkBundle] Fix symfony/dom-crawler conflict

---
 src/Symfony/Bundle/FrameworkBundle/composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 21574402c3594..6f81c313b0c54 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -79,8 +79,8 @@
         "symfony/clock": "<6.3",
         "symfony/console": "<5.4",
         "symfony/dotenv": "<5.4",
-        "symfony/dom-crawler": "<5.4",
-        "symfony/http-client": "<6.3",
+        "symfony/dom-crawler": "<6.3",
+        "symfony/http-client": "<5.4",
         "symfony/form": "<5.4",
         "symfony/lock": "<5.4",
         "symfony/mailer": "<5.4",

From 8929b8e19293a76302da07b44d1c6943d0710d63 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Tue, 7 Feb 2023 22:57:52 +0100
Subject: [PATCH 185/475] Remove some dead code

---
 .../DependencyInjection/FrameworkExtension.php         |  4 ----
 src/Symfony/Component/Yaml/Command/LintCommand.php     |  4 ----
 .../Component/Yaml/Tests/Command/LintCommandTest.php   | 10 ----------
 3 files changed, 18 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 358ec36f10bea..47f311fe97bd2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2396,10 +2396,6 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
 
     private function registerRetryableHttpClient(array $options, string $name, ContainerBuilder $container)
     {
-        if (!class_exists(RetryableHttpClient::class)) {
-            throw new LogicException('Support for retrying failed requests requires symfony/http-client 5.2 or higher, try upgrading.');
-        }
-
         if (null !== $options['retry_strategy']) {
             $retryStrategy = new Reference($options['retry_strategy']);
         } else {
diff --git a/src/Symfony/Component/Yaml/Command/LintCommand.php b/src/Symfony/Component/Yaml/Command/LintCommand.php
index 565a276fdbdb8..70f68c51d7313 100644
--- a/src/Symfony/Component/Yaml/Command/LintCommand.php
+++ b/src/Symfony/Component/Yaml/Command/LintCommand.php
@@ -91,10 +91,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $this->format = $input->getOption('format');
         $flags = $input->getOption('parse-tags');
 
-        if ('github' === $this->format && !class_exists(GithubActionReporter::class)) {
-            throw new \InvalidArgumentException('The "github" format is only available since "symfony/console" >= 5.3.');
-        }
-
         if (null === $this->format) {
             // Autodetect format according to CI environment
             $this->format = class_exists(GithubActionReporter::class) && GithubActionReporter::isGithubActionEnvironment() ? 'github' : 'txt';
diff --git a/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php b/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php
index d160f7b52f3cd..2e2ed7e7a9c2a 100644
--- a/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php
+++ b/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php
@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\CI\GithubActionReporter;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
@@ -68,11 +67,6 @@ public function testLintIncorrectFile()
 
     public function testLintIncorrectFileWithGithubFormat()
     {
-        if (!class_exists(GithubActionReporter::class)) {
-            $this->expectException(\InvalidArgumentException::class);
-            $this->expectExceptionMessage('The "github" format is only available since "symfony/console" >= 5.3.');
-        }
-
         $incorrectContent = <<<YAML
 foo:
 bar
@@ -82,10 +76,6 @@ public function testLintIncorrectFileWithGithubFormat()
 
         $tester->execute(['filename' => $filename, '--format' => 'github'], ['decorated' => false]);
 
-        if (!class_exists(GithubActionReporter::class)) {
-            return;
-        }
-
         self::assertEquals(1, $tester->getStatusCode(), 'Returns 1 in case of error');
         self::assertStringMatchesFormat('%A::error file=%s,line=2,col=0::Unable to parse at line 2 (near "bar")%A', trim($tester->getDisplay()));
     }

From d840ec22abdc829560a2a86a4e3a6027b1aa1d5a Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Thu, 9 Feb 2023 18:28:49 +0100
Subject: [PATCH 186/475] Use xxh128 instead of md5

---
 src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php       | 2 +-
 .../Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php  | 2 +-
 src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php   | 4 ++--
 src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php  | 4 ++--
 src/Symfony/Component/Config/Resource/DirectoryResource.php   | 2 +-
 src/Symfony/Component/Config/Resource/GlobResource.php        | 2 +-
 .../Component/Config/Resource/ReflectionClassResource.php     | 2 +-
 .../Config/ContainerParametersResource.php                    | 2 +-
 .../ParameterBag/EnvPlaceholderParameterBag.php               | 4 ++--
 .../Tests/Config/ContainerParametersResourceTest.php          | 2 +-
 src/Symfony/Component/HttpClient/Internal/AmpClientState.php  | 2 +-
 .../HttpKernel/DataCollector/LoggerDataCollector.php          | 2 +-
 .../Component/Intl/Transliterator/EmojiTransliterator.php     | 2 +-
 src/Symfony/Component/Lock/Store/SemaphoreStore.php           | 2 +-
 .../Component/Notifier/Bridge/Twitter/TwitterTransport.php    | 2 +-
 src/Symfony/Component/Security/Csrf/CsrfTokenManager.php      | 2 +-
 .../Component/Security/Http/Firewall/SwitchUserListener.php   | 2 +-
 .../Serializer/NameConverter/MetadataAwareNameConverter.php   | 2 +-
 .../Serializer/Normalizer/AbstractObjectNormalizer.php        | 2 +-
 src/Symfony/Component/VarDumper/Cloner/VarCloner.php          | 2 +-
 20 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
index 973f693237598..dd90a0dac877f 100644
--- a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -309,7 +309,7 @@ public function warmUp(array $values): array
                 $value = str_replace("\n", "\n    ", $value);
                 $value = "static function () {\n    return {$value};\n}";
             }
-            $hash = hash('md5', $value);
+            $hash = hash('xxh128', $value);
 
             if (null === $id = $dumpedMap[$hash] ?? null) {
                 $id = $dumpedMap[$hash] = \count($dumpedMap);
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php
index 7f91101eb5b97..2b6467e35906f 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php
@@ -27,7 +27,7 @@ public function testLongKey()
         $cache->expects($this->exactly(2))
             ->method('doHave')
             ->withConsecutive(
-                [$this->equalTo('----------:nWfzGiCgLczv3SSUzXL3kg:')],
+                [$this->equalTo('----------:z5XrNUPebf0nPxQwjc6C1A:')],
                 [$this->equalTo('----------:---------------------------------------')]
             )->willReturn(false);
 
diff --git a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
index 5616d3662dcbb..368307b382544 100644
--- a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
+++ b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
@@ -353,8 +353,8 @@ private function getId(mixed $key)
             return $this->namespace.$this->namespaceVersion.$key;
         }
         if (\strlen($id = $this->namespace.$this->namespaceVersion.$key) > $this->maxIdLength) {
-            // Use MD5 to favor speed over security, which is not an issue here
-            $this->ids[$key] = $id = substr_replace(base64_encode(hash('md5', $key, true)), static::NS_SEPARATOR, -(\strlen($this->namespaceVersion) + 2));
+            // Use xxh128 to favor speed over security, which is not an issue here
+            $this->ids[$key] = $id = substr_replace(base64_encode(hash('xxh128', $key, true)), static::NS_SEPARATOR, -(\strlen($this->namespaceVersion) + 2));
             $id = $this->namespace.$this->namespaceVersion.$id;
         }
 
diff --git a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
index 1182d0c095fc4..c70859a4efff3 100644
--- a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
+++ b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
@@ -112,8 +112,8 @@ private function write(string $file, string $data, int $expiresAt = null)
 
     private function getFile(string $id, bool $mkdir = false, string $directory = null)
     {
-        // Use MD5 to favor speed over security, which is not an issue here
-        $hash = str_replace('/', '-', base64_encode(hash('md5', static::class.$id, true)));
+        // Use xxh128 to favor speed over security, which is not an issue here
+        $hash = str_replace('/', '-', base64_encode(hash('xxh128', static::class.$id, true)));
         $dir = ($directory ?? $this->directory).strtoupper($hash[0].\DIRECTORY_SEPARATOR.$hash[1].\DIRECTORY_SEPARATOR);
 
         if ($mkdir && !is_dir($dir)) {
diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/Resource/DirectoryResource.php
index b95ae2c194f87..7560cd3b34aed 100644
--- a/src/Symfony/Component/Config/Resource/DirectoryResource.php
+++ b/src/Symfony/Component/Config/Resource/DirectoryResource.php
@@ -43,7 +43,7 @@ public function __construct(string $resource, string $pattern = null)
 
     public function __toString(): string
     {
-        return md5(serialize([$this->resource, $this->pattern]));
+        return hash('xxh128', serialize([$this->resource, $this->pattern]));
     }
 
     public function getResource(): string
diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
index fde1dcb87d274..78e09d9284992 100644
--- a/src/Symfony/Component/Config/Resource/GlobResource.php
+++ b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -200,7 +200,7 @@ public function getIterator(): \Traversable
 
     private function computeHash(): string
     {
-        $hash = hash_init('md5');
+        $hash = hash_init('xxh128');
 
         foreach ($this->getIterator() as $path => $info) {
             hash_update($hash, $path."\n");
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
index c8d685dbef28c..0180b687237cd 100644
--- a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
+++ b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -105,7 +105,7 @@ private function computeHash(): string
             // the class does not exist anymore
             return false;
         }
-        $hash = hash_init('md5');
+        $hash = hash_init('xxh128');
 
         foreach ($this->generateSignature($this->classReflector) as $info) {
             hash_update($hash, $info);
diff --git a/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResource.php b/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResource.php
index c69abf1190c9a..b066b5ffc9e2f 100644
--- a/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResource.php
+++ b/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResource.php
@@ -34,7 +34,7 @@ public function __construct(array $parameters)
 
     public function __toString(): string
     {
-        return 'container_parameters_'.md5(serialize($this->parameters));
+        return 'container_parameters_'.hash('xxh128', serialize($this->parameters));
     }
 
     public function getParameters(): array
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
index 14277f86c2512..be6f481dd4420 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -48,7 +48,7 @@ public function get(string $name): array|bool|string|int|float|\UnitEnum|null
                 throw new RuntimeException(sprintf('The default value of an env() parameter must be a string or null, but "%s" given to "%s".', get_debug_type($defaultValue), $name));
             }
 
-            $uniqueName = md5($name.'_'.self::$counter++);
+            $uniqueName = hash('xxh128', $name.'_'.self::$counter++);
             $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.\\', '____'), $uniqueName);
             $this->envPlaceholders[$env][$placeholder] = $placeholder;
 
@@ -66,7 +66,7 @@ public function getEnvPlaceholderUniquePrefix(): string
         if (!isset($this->envPlaceholderUniquePrefix)) {
             $reproducibleEntropy = unserialize(serialize($this->parameters));
             array_walk_recursive($reproducibleEntropy, function (&$v) { $v = null; });
-            $this->envPlaceholderUniquePrefix = 'env_'.substr(md5(serialize($reproducibleEntropy)), -16);
+            $this->envPlaceholderUniquePrefix = 'env_'.substr(hash('xxh128', serialize($reproducibleEntropy)), -16);
         }
 
         return $this->envPlaceholderUniquePrefix;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceTest.php b/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceTest.php
index a5591589097fc..35422ce4224c1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Config/ContainerParametersResourceTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
 
     public function testToString()
     {
-        $this->assertSame('container_parameters_9893d3133814ab03cac3490f36dece77', (string) $this->resource);
+        $this->assertSame('container_parameters_f2f012423c221eddf6c9a6305f965327', (string) $this->resource);
     }
 
     public function testSerializeUnserialize()
diff --git a/src/Symfony/Component/HttpClient/Internal/AmpClientState.php b/src/Symfony/Component/HttpClient/Internal/AmpClientState.php
index 2360a7f87d0e5..a83176629b9d3 100644
--- a/src/Symfony/Component/HttpClient/Internal/AmpClientState.php
+++ b/src/Symfony/Component/HttpClient/Internal/AmpClientState.php
@@ -128,7 +128,7 @@ private function getClient(array $options): array
             'proxy' => $options['proxy'],
         ];
 
-        $key = md5(serialize($options));
+        $key = hash('xxh128', serialize($options));
 
         if (isset($this->clients[$key])) {
             return $this->clients[$key];
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
index b6448ba5edda5..6a02486b45301 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -259,7 +259,7 @@ private function sanitizeLogs(array $logs)
                 continue;
             }
 
-            $errorId = md5("{$exception->getSeverity()}/{$exception->getLine()}/{$exception->getFile()}\0{$message}", true);
+            $errorId = hash('xxh128', "{$exception->getSeverity()}/{$exception->getLine()}/{$exception->getFile()}\0{$message}", true);
 
             if (isset($sanitizedLogs[$errorId])) {
                 ++$sanitizedLogs[$errorId]['errorCount'];
diff --git a/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php b/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
index 3b6d53a93cde2..bb52943ecabe2 100644
--- a/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
+++ b/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
@@ -110,7 +110,7 @@ public function transliterate(string $string, int $start = 0, int $end = -1): st
             static $cookie;
             static $transliterator;
 
-            $cookie ??= md5(random_bytes(8));
+            $cookie ??= hash('xxh128', random_bytes(8));
             $this->transliterator ??= clone $transliterator ??= \Transliterator::createFromRules('[:any:]* > '.$cookie);
 
             if (false === $result = $this->transliterator->transliterate($string, $start, $end)) {
diff --git a/src/Symfony/Component/Lock/Store/SemaphoreStore.php b/src/Symfony/Component/Lock/Store/SemaphoreStore.php
index ba63f641270b5..ba2443ea2d02e 100644
--- a/src/Symfony/Component/Lock/Store/SemaphoreStore.php
+++ b/src/Symfony/Component/Lock/Store/SemaphoreStore.php
@@ -56,7 +56,7 @@ private function lock(Key $key, bool $blocking)
             return;
         }
 
-        $keyId = unpack('i', md5($key, true))[1];
+        $keyId = unpack('i', hash('xxh128', $key, true))[1];
         $resource = @sem_get($keyId);
         $acquired = $resource && @sem_acquire($resource, !$blocking);
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransport.php b/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransport.php
index b5f450b92eae5..9a5317ad0526f 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/TwitterTransport.php
@@ -83,7 +83,7 @@ public function request(string $method, string $url, array $options): ResponseIn
 
         $oauth = [
             'oauth_consumer_key' => $this->apiKey,
-            'oauth_nonce' => self::$nonce = md5(self::$nonce ??= random_bytes(16)),
+            'oauth_nonce' => self::$nonce = hash('xxh128', self::$nonce ??= random_bytes(16)),
             'oauth_signature_method' => 'HMAC-SHA1',
             'oauth_timestamp' => time(),
             'oauth_token' => $this->accessToken,
diff --git a/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php b/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php
index 335eaa08b586b..2c856f2adee43 100644
--- a/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php
+++ b/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php
@@ -112,7 +112,7 @@ private function randomize(string $value): string
         $key = random_bytes(32);
         $value = $this->xor($value, $key);
 
-        return sprintf('%s.%s.%s', substr(md5($key), 0, 1 + (\ord($key[0]) % 32)), rtrim(strtr(base64_encode($key), '+/', '-_'), '='), rtrim(strtr(base64_encode($value), '+/', '-_'), '='));
+        return sprintf('%s.%s.%s', substr(hash('xxh128', $key), 0, 1 + (\ord($key[0]) % 32)), rtrim(strtr(base64_encode($key), '+/', '-_'), '='), rtrim(strtr(base64_encode($value), '+/', '-_'), '='));
     }
 
     private function derandomize(string $value): string
diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
index 9aa41adb0cdbc..5e882f78ee209 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
@@ -151,7 +151,7 @@ private function attemptSwitchUser(Request $request, string $username): ?TokenIn
         }
 
         $currentUsername = $token->getUserIdentifier();
-        $nonExistentUsername = '_'.md5(random_bytes(8).$username);
+        $nonExistentUsername = '_'.hash('xxh128', random_bytes(8).$username);
 
         // To protect against user enumeration via timing measurements
         // we always load both successfully and unsuccessfully
diff --git a/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php b/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php
index 920e81869561e..881d334bd94f2 100644
--- a/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php
+++ b/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php
@@ -142,6 +142,6 @@ private function getCacheKey(string $class, array $context): string
             return $class.'-'.$context['cache_key'];
         }
 
-        return $class.md5(serialize($context[AbstractNormalizer::GROUPS] ?? []));
+        return $class.hash('xxh128', serialize($context[AbstractNormalizer::GROUPS] ?? []));
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 7c4c5fb41bd49..e64cfc8802ec1 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -730,7 +730,7 @@ private function getCacheKey(?string $format, array $context): bool|string
         unset($context['cache_key']); // avoid artificially different keys
 
         try {
-            return md5($format.serialize([
+            return hash('xxh128', $format.serialize([
                 'context' => $context,
                 'ignored' => $context[self::IGNORED_ATTRIBUTES] ?? $this->defaultContext[self::IGNORED_ATTRIBUTES],
             ]));
diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
index 4068c7c386305..4f5c347155b2a 100644
--- a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
@@ -41,7 +41,7 @@ protected function doClone(mixed $var): array
         $stub = null;                   // Stub capturing the main properties of an original item value
                                         // or null if the original value is used directly
 
-        $gid = self::$gid ??= md5(random_bytes(6)); // Unique string used to detect the special $GLOBALS variable
+        $gid = self::$gid ??= hash('xxh128', random_bytes(6)); // Unique string used to detect the special $GLOBALS variable
         $arrayStub = new Stub();
         $arrayStub->type = Stub::TYPE_ARRAY;
         $fromObjCast = false;

From 7c99a1f131f4c793a393b18ebad77f8ff19ac618 Mon Sep 17 00:00:00 2001
From: maxbeckers <beckers.maximilian@gmail.com>
Date: Fri, 10 Feb 2023 14:00:48 +0100
Subject: [PATCH 187/475] [Validator] LuhnValidator code optimization

---
 .../Validator/Constraints/LuhnValidator.php   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Symfony/Component/Validator/Constraints/LuhnValidator.php b/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
index 781d3bda70108..75b12aa681693 100644
--- a/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
@@ -60,23 +60,23 @@ public function validate(mixed $value, Constraint $constraint)
         $checkSum = 0;
         $length = \strlen($value);
 
-        // Starting with the last digit and walking left, add every second
-        // digit to the check sum
-        // e.g. 7  9  9  2  7  3  9  8  7  1  3
-        //      ^     ^     ^     ^     ^     ^
-        //    = 7  +  9  +  7  +  9  +  7  +  3
-        for ($i = $length - 1; $i >= 0; $i -= 2) {
-            $checkSum += $value[$i];
-        }
-
-        // Starting with the second last digit and walking left, double every
-        // second digit and add it to the check sum
-        // For doubles greater than 9, sum the individual digits
-        // e.g. 7  9  9  2  7  3  9  8  7  1  3
-        //         ^     ^     ^     ^     ^
-        //    =    1+8 + 4  +  6  +  1+6 + 2
-        for ($i = $length - 2; $i >= 0; $i -= 2) {
-            $checkSum += array_sum(str_split((int) $value[$i] * 2));
+        for ($i = $length - 1; $i >= 0; --$i) {
+            if (($i % 2) ^ ($length % 2)) {
+                // Starting with the last digit and walking left, add every second
+                // digit to the check sum
+                // e.g. 7  9  9  2  7  3  9  8  7  1  3
+                //      ^     ^     ^     ^     ^     ^
+                //    = 7  +  9  +  7  +  9  +  7  +  3
+                $checkSum += (int) $value[$i];
+            } else {
+                // Starting with the second last digit and walking left, double every
+                // second digit and add it to the check sum
+                // For doubles greater than 9, sum the individual digits
+                // e.g. 7  9  9  2  7  3  9  8  7  1  3
+                //         ^     ^     ^     ^     ^
+                //    =    1+8 + 4  +  6  +  1+6 + 2
+                $checkSum += (((int) (2 * $value[$i] / 10)) + (2 * $value[$i]) % 10);
+            }
         }
 
         if (0 === $checkSum || 0 !== $checkSum % 10) {

From ff86922a6d12decec3d220ab750f4ddb90cad1ad Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Mon, 6 Feb 2023 19:56:42 +0100
Subject: [PATCH 188/475] [Messenger] Allow passing a string instead of an
 array in `TransportNamesStamp`

---
 src/Symfony/Component/Messenger/CHANGELOG.md             | 1 +
 .../Component/Messenger/Stamp/TransportNamesStamp.php    | 7 +++++--
 .../Messenger/Tests/Stamp/TransportNamesStampTest.php    | 9 +++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
index e0aa2610d33d2..b60f066320d64 100644
--- a/src/Symfony/Component/Messenger/CHANGELOG.md
+++ b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
    `Symfony\Component\Messenger\Transport\InMemoryTransportFactory` in favor of
    `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport` and
    `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransportFactory`
+ * Allow passing a string instead of an array in `TransportNamesStamp`
 
 6.2
 ---
diff --git a/src/Symfony/Component/Messenger/Stamp/TransportNamesStamp.php b/src/Symfony/Component/Messenger/Stamp/TransportNamesStamp.php
index 6eaab7ad54441..63fd0f9f04302 100644
--- a/src/Symfony/Component/Messenger/Stamp/TransportNamesStamp.php
+++ b/src/Symfony/Component/Messenger/Stamp/TransportNamesStamp.php
@@ -16,11 +16,14 @@
  */
 final class TransportNamesStamp implements StampInterface
 {
+    private array $transports;
+
     /**
-     * @param string[] $transports Transport names to be used for the message
+     * @param string[]|string $transports Transport names to be used for the message
      */
-    public function __construct(private array $transports)
+    public function __construct(array|string $transports)
     {
+        $this->transports = (array) $transports;
     }
 
     public function getTransportNames(): array
diff --git a/src/Symfony/Component/Messenger/Tests/Stamp/TransportNamesStampTest.php b/src/Symfony/Component/Messenger/Tests/Stamp/TransportNamesStampTest.php
index 4e4308ebc4c2d..c08a91daa5cca 100644
--- a/src/Symfony/Component/Messenger/Tests/Stamp/TransportNamesStampTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Stamp/TransportNamesStampTest.php
@@ -27,4 +27,13 @@ public function testGetSenders()
             $this->assertSame($sender, $stampSenders[$key]);
         }
     }
+
+    public function testGetIndividualSender()
+    {
+        $stamp = new TransportNamesStamp('first_transport');
+        $stampSenders = $stamp->getTransportNames();
+
+        $this->assertCount(1, $stampSenders);
+        $this->assertSame('first_transport', $stampSenders[0]);
+    }
 }

From 2ebb18177d92e4b6520773ba7cbfd8f3a1601da2 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 10 Feb 2023 11:34:36 +0100
Subject: [PATCH 189/475] [Notifier] Introduce FromNotificationInterface

---
 src/Symfony/Component/Notifier/CHANGELOG.md   |  5 +++++
 .../Notifier/Message/ChatMessage.php          |  2 +-
 .../Notifier/Message/EmailMessage.php         | 13 +++++++++--
 .../Message/FromNotificationInterface.php     | 22 +++++++++++++++++++
 .../Notifier/Message/PushMessage.php          |  2 +-
 .../Component/Notifier/Message/SmsMessage.php | 13 +++++++++--
 6 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 src/Symfony/Component/Notifier/Message/FromNotificationInterface.php

diff --git a/src/Symfony/Component/Notifier/CHANGELOG.md b/src/Symfony/Component/Notifier/CHANGELOG.md
index 470bc7498a442..99e21a00a5b27 100644
--- a/src/Symfony/Component/Notifier/CHANGELOG.md
+++ b/src/Symfony/Component/Notifier/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Introduce `FromNotificationInterface` for `MessageInterface` implementations
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Notifier/Message/ChatMessage.php b/src/Symfony/Component/Notifier/Message/ChatMessage.php
index 6a16280d032d7..66fbe6924725f 100644
--- a/src/Symfony/Component/Notifier/Message/ChatMessage.php
+++ b/src/Symfony/Component/Notifier/Message/ChatMessage.php
@@ -16,7 +16,7 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class ChatMessage implements MessageInterface
+class ChatMessage implements MessageInterface, FromNotificationInterface
 {
     private ?string $transport = null;
     private string $subject;
diff --git a/src/Symfony/Component/Notifier/Message/EmailMessage.php b/src/Symfony/Component/Notifier/Message/EmailMessage.php
index 427885f19320f..62fe4c8f97a44 100644
--- a/src/Symfony/Component/Notifier/Message/EmailMessage.php
+++ b/src/Symfony/Component/Notifier/Message/EmailMessage.php
@@ -23,10 +23,11 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class EmailMessage implements MessageInterface
+class EmailMessage implements MessageInterface, FromNotificationInterface
 {
     private RawMessage $message;
     private ?Envelope $envelope;
+    private ?Notification $notification = null;
 
     public function __construct(RawMessage $message, Envelope $envelope = null)
     {
@@ -59,7 +60,10 @@ public static function fromNotification(Notification $notification, EmailRecipie
             }
         }
 
-        return new self($email);
+        $message = new self($email);
+        $message->notification = $notification;
+
+        return $message;
     }
 
     public function getMessage(): RawMessage
@@ -118,4 +122,9 @@ public function getTransport(): ?string
     {
         return $this->message instanceof Email ? $this->message->getHeaders()->getHeaderBody('X-Transport') : null;
     }
+
+    public function getNotification(): ?Notification
+    {
+        return $this->notification;
+    }
 }
diff --git a/src/Symfony/Component/Notifier/Message/FromNotificationInterface.php b/src/Symfony/Component/Notifier/Message/FromNotificationInterface.php
new file mode 100644
index 0000000000000..b9ed7543ad50c
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Message/FromNotificationInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Message;
+
+use Symfony\Component\Notifier\Notification\Notification;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+interface FromNotificationInterface
+{
+    public function getNotification(): ?Notification;
+}
diff --git a/src/Symfony/Component/Notifier/Message/PushMessage.php b/src/Symfony/Component/Notifier/Message/PushMessage.php
index 063e8e9cb6d2f..21f71b58bc266 100644
--- a/src/Symfony/Component/Notifier/Message/PushMessage.php
+++ b/src/Symfony/Component/Notifier/Message/PushMessage.php
@@ -16,7 +16,7 @@
 /**
  * @author Tomas Norkūnas <norkunas.tom@gmail.com>
  */
-class PushMessage implements MessageInterface
+class PushMessage implements MessageInterface, FromNotificationInterface
 {
     private $transport;
     private $subject;
diff --git a/src/Symfony/Component/Notifier/Message/SmsMessage.php b/src/Symfony/Component/Notifier/Message/SmsMessage.php
index 7a0ef9ac6d096..a8d774755dfff 100644
--- a/src/Symfony/Component/Notifier/Message/SmsMessage.php
+++ b/src/Symfony/Component/Notifier/Message/SmsMessage.php
@@ -18,13 +18,14 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class SmsMessage implements MessageInterface
+class SmsMessage implements MessageInterface, FromNotificationInterface
 {
     private ?string $transport = null;
     private string $subject;
     private string $phone;
     private string $from;
     private ?MessageOptionsInterface $options;
+    private ?Notification $notification = null;
 
     public function __construct(string $phone, string $subject, string $from = '', MessageOptionsInterface $options = null)
     {
@@ -40,7 +41,10 @@ public function __construct(string $phone, string $subject, string $from = '', M
 
     public static function fromNotification(Notification $notification, SmsRecipientInterface $recipient): self
     {
-        return new self($recipient->getPhone(), $notification->getSubject());
+        $message = new self($recipient->getPhone(), $notification->getSubject());
+        $message->notification = $notification;
+
+        return $message;
     }
 
     /**
@@ -126,4 +130,9 @@ public function getOptions(): ?MessageOptionsInterface
     {
         return $this->options;
     }
+
+    public function getNotification(): ?Notification
+    {
+        return $this->notification;
+    }
 }

From 8b14052fec49a0925fd59707cbb4a0dfffa5683c Mon Sep 17 00:00:00 2001
From: Kamil Szalewski <kamil@szalewski.pl>
Date: Mon, 6 Feb 2023 15:04:33 +0100
Subject: [PATCH 190/475] Smsapi - Make "from" optional

---
 .../Notifier/Bridge/Smsapi/CHANGELOG.md       |  5 ++
 .../Notifier/Bridge/Smsapi/README.md          |  2 +-
 .../Bridge/Smsapi/SmsapiTransport.php         | 46 +++++++++++++------
 .../Bridge/Smsapi/SmsapiTransportFactory.php  |  2 +-
 .../Tests/SmsapiTransportFactoryTest.php      | 14 +++---
 .../Smsapi/Tests/SmsapiTransportTest.php      | 16 ++++---
 6 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Smsapi/CHANGELOG.md
index 68c0caed08013..46e95397df4e0 100644
--- a/src/Symfony/Component/Notifier/Bridge/Smsapi/CHANGELOG.md
+++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Changing the option `from` to optional to enable sending "eco" messages
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/README.md b/src/Symfony/Component/Notifier/Bridge/Smsapi/README.md
index 55b7a67643b0b..5c562fdff4004 100644
--- a/src/Symfony/Component/Notifier/Bridge/Smsapi/README.md
+++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/README.md
@@ -12,7 +12,7 @@ SMSAPI_DSN=smsapi://TOKEN@default?from=FROM&fast=FAST&test=TEST
 
 where:
  - `TOKEN` is your API Token (OAuth)
- - `FROM` is the sender name
+ - `FROM` is the sender name (default ""), skip this field to use the cheapest "eco" shipping method.
  - `FAST` setting this parameter to "1" (default "0") will result in sending message with the highest priority which ensures the quickest possible time of delivery. Attention! Fast messages cost more than normal messages.
  - `TEST` setting this parameter to "1" (default "0") will result in sending message in test mode (message is validated, but not sent).
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransport.php b/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransport.php
index b62528b007c39..b596b5b46638e 100644
--- a/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransport.php
@@ -30,11 +30,11 @@ final class SmsapiTransport extends AbstractTransport
     protected const HOST = 'api.smsapi.pl';
 
     private string $authToken;
-    private string $from;
+    private string $from = '';
     private bool $fast = false;
     private bool $test = false;
 
-    public function __construct(#[\SensitiveParameter] string $authToken, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(#[\SensitiveParameter] string $authToken, string $from = '', HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
     {
         $this->authToken = $authToken;
         $this->from = $from;
@@ -64,14 +64,25 @@ public function setTest(bool $test): static
 
     public function __toString(): string
     {
-        $dsn = sprintf('smsapi://%s?from=%s', $this->getEndpoint(), $this->from);
+        $dsn = sprintf('smsapi://%s', $this->getEndpoint());
+        $params = [];
+
+        if ('' !== $this->from) {
+            $params['from'] = $this->from;
+        }
 
         if ($this->fast) {
-            $dsn .= sprintf('&fast=%d', (int) $this->fast);
+            $params['fast'] = (int) $this->fast;
         }
 
         if ($this->test) {
-            $dsn .= sprintf('&test=%d', (int) $this->test);
+            $params['test'] = (int) $this->test;
+        }
+
+        $query = http_build_query($params, '', '&');
+
+        if ('' !== $query) {
+            $dsn .= sprintf('?%s', $query);
         }
 
         return $dsn;
@@ -88,20 +99,27 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
+        // default request body
+        $body = [
+            'to' => $message->getPhone(),
+            'message' => $message->getSubject(),
+            'fast' => $this->fast,
+            'format' => 'json',
+            'encoding' => 'utf-8',
+            'test' => $this->test,
+        ];
+
         $from = $message->getFrom() ?: $this->from;
 
+        // if from is not empty add it to request body
+        if ('' !== $from) {
+            $body['from'] = $from;
+        }
+
         $endpoint = sprintf('https://%s/sms.do', $this->getEndpoint());
         $response = $this->client->request('POST', $endpoint, [
             'auth_bearer' => $this->authToken,
-            'body' => [
-                'from' => $from,
-                'to' => $message->getPhone(),
-                'message' => $message->getSubject(),
-                'fast' => $this->fast,
-                'format' => 'json',
-                'encoding' => 'utf-8',
-                'test' => $this->test,
-            ],
+            'body' => $body,
         ]);
 
         try {
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransportFactory.php
index 44be35a12f62b..69cfcdc657d21 100644
--- a/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransportFactory.php
+++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransportFactory.php
@@ -29,7 +29,7 @@ public function create(Dsn $dsn): SmsapiTransport
         }
 
         $authToken = $this->getUser($dsn);
-        $from = $dsn->getRequiredOption('from');
+        $from = $dsn->getOption('from', '');
         $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
         $fast = filter_var($dsn->getOption('fast', false), \FILTER_VALIDATE_BOOL);
         $test = filter_var($dsn->getOption('test', false), \FILTER_VALIDATE_BOOL);
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php
index 264c0d7ec9fb7..89a802e7de1bc 100644
--- a/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php
@@ -23,6 +23,11 @@ public function createFactory(): SmsapiTransportFactory
 
     public function createProvider(): iterable
     {
+        yield [
+            'smsapi://host.test',
+            'smsapi://token@host.test',
+        ];
+
         yield [
             'smsapi://host.test?from=testFrom',
             'smsapi://token@host.test?from=testFrom',
@@ -71,6 +76,9 @@ public function createProvider(): iterable
 
     public function supportsProvider(): iterable
     {
+        yield [true, 'smsapi://host'];
+        yield [true, 'smsapi://host?fast=1'];
+        yield [true, 'smsapi://host?test=1'];
         yield [true, 'smsapi://host?from=testFrom'];
         yield [true, 'smsapi://host?from=testFrom&fast=1'];
         yield [true, 'smsapi://host?from=testFrom&test=1'];
@@ -82,14 +90,8 @@ public function incompleteDsnProvider(): iterable
         yield 'missing token' => ['smsapi://host.test?from=testFrom'];
     }
 
-    public function missingRequiredOptionProvider(): iterable
-    {
-        yield 'missing option: from' => ['smsapi://token@host'];
-    }
-
     public function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://token@host?from=testFrom'];
-        yield ['somethingElse://token@host']; // missing "from" option
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportTest.php
index 73213d8907a0a..1dd25203a7633 100644
--- a/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportTest.php
@@ -23,17 +23,21 @@
 
 final class SmsapiTransportTest extends TransportTestCase
 {
-    public function createTransport(HttpClientInterface $client = null, bool $fast = false, bool $test = false): SmsapiTranspo
17AE
rt
+    public function createTransport(HttpClientInterface $client = null, string $from = '', bool $fast = false, bool $test = false): SmsapiTransport
     {
-        return (new SmsapiTransport('testToken', 'testFrom', $client ?? $this->createMock(HttpClientInterface::class)))->setHost('test.host')->setFast($fast)->setTest($test);
+        return (new SmsapiTransport('testToken', $from, $client ?? $this->createMock(HttpClientInterface::class)))->setHost('test.host')->setFast($fast)->setTest($test);
     }
 
     public function toStringProvider(): iterable
     {
-        yield ['smsapi://test.host?from=testFrom', $this->createTransport()];
-        yield ['smsapi://test.host?from=testFrom&fast=1', $this->createTransport(null, true)];
-        yield ['smsapi://test.host?from=testFrom&test=1', $this->createTransport(null, false, true)];
-        yield ['smsapi://test.host?from=testFrom&fast=1&test=1', $this->createTransport(null, true, true)];
+        yield ['smsapi://test.host', $this->createTransport()];
+        yield ['smsapi://test.host?fast=1', $this->createTransport(null, '', true)];
+        yield ['smsapi://test.host?test=1', $this->createTransport(null, '', false, true)];
+        yield ['smsapi://test.host?fast=1&test=1', $this->createTransport(null, '', true, true)];
+        yield ['smsapi://test.host?from=testFrom', $this->createTransport(null, 'testFrom')];
+        yield ['smsapi://test.host?from=testFrom&fast=1', $this->createTransport(null, 'testFrom', true)];
+        yield ['smsapi://test.host?from=testFrom&test=1', $this->createTransport(null, 'testFrom', false, true)];
+        yield ['smsapi://test.host?from=testFrom&fast=1&test=1', $this->createTransport(null, 'testFrom', true, true)];
     }
 
     public function supportedMessagesProvider(): iterable

From d5342874d3a1c38b19105c814858da0db4804f8e Mon Sep 17 00:00:00 2001
From: Alan Poulain <contact@alanpoulain.eu>
Date: Fri, 10 Feb 2023 19:45:16 +0100
Subject: [PATCH 191/475] feat(property-access): allow escaping in PropertyPath

---
 .../Component/PropertyAccess/CHANGELOG.md     |  5 ++++
 .../Component/PropertyAccess/PropertyPath.php |  8 ++++--
 .../PropertyAccess/Tests/PropertyPathTest.php | 28 +++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/PropertyAccess/CHANGELOG.md b/src/Symfony/Component/PropertyAccess/CHANGELOG.md
index 64df40fed5170..a48ed823ccde4 100644
--- a/src/Symfony/Component/PropertyAccess/CHANGELOG.md
+++ b/src/Symfony/Component/PropertyAccess/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Allow escaping `.` and `[` with `\` in `PropertyPath`
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/PropertyAccess/PropertyPath.php b/src/Symfony/Component/PropertyAccess/PropertyPath.php
index 341891316dedc..bf79bb307f105 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyPath.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyPath.php
@@ -95,7 +95,7 @@ public function __construct(self|string $propertyPath)
         $remaining = $propertyPath;
 
         // first element is evaluated differently - no leading dot for properties
-        $pattern = '/^(([^\.\[]++)|\[([^\]]++)\])(.*)/';
+        $pattern = '/^(((?:[^\\\\.\[]|\\\\.)++)|\[([^\]]++)\])(.*)/';
 
         while (preg_match($pattern, $remaining, $matches)) {
             if ('' !== $matches[2]) {
@@ -114,11 +114,15 @@ public function __construct(self|string $propertyPath)
                 $this->isNullSafe[] = false;
             }
 
+            $element = preg_replace('/\\\([.[])/', '$1', $element);
+            if (str_ends_with($element, '\\\\')) {
+                $element = substr($element, 0, -1);
+            }
             $this->elements[] = $element;
 
             $position += \strlen($matches[1]);
             $remaining = $matches[4];
-            $pattern = '/^(\.([^\.|\[]++)|\[([^\]]++)\])(.*)/';
+            $pattern = '/^(\.((?:[^\\\\.\[]|\\\\.)++)|\[([^\]]++)\])(.*)/';
         }
 
         if ('' !== $remaining) {
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php
index c7724318a0b7e..a1b37d5c4a5ca 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php
@@ -78,6 +78,34 @@ public function testGetParentWithDot()
         $this->assertEquals(new PropertyPath('grandpa.parent'), $propertyPath->getParent());
     }
 
+    public function testGetElementsWithEscapedDot()
+    {
+        $propertyPath = new PropertyPath('grandpa\.parent.child');
+
+        $this->assertEquals(['grandpa.parent', 'child'], $propertyPath->getElements());
+    }
+
+    public function testGetElementsWithEscapedArray()
+    {
+        $propertyPath = new PropertyPath('grandpa\[parent][child]');
+
+        $this->assertEquals(['grandpa[parent]', 'child'], $propertyPath->getElements());
+    }
+
+    public function testGetElementsWithDoubleEscapedDot()
+    {
+        $propertyPath = new PropertyPath('grandpa\\\.par\ent.\\\child');
+
+        $this->assertEquals(['grandpa\\', 'par\ent', '\\\child'], $propertyPath->getElements());
+    }
+
+    public function testGetElementsWithDoubleEscapedArray()
+    {
+        $propertyPath = new PropertyPath('grandpa\\\[par\ent][\\\child]');
+
+        $this->assertEquals(['grandpa\\', 'par\ent', '\\\child'], $propertyPath->getElements());
+    }
+
     public function testGetParentWithIndex()
     {
         $propertyPath = new PropertyPath('grandpa.parent[child]');

From 5a52dd8816a477affbbb33ab38a7adbe43c8d942 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sat, 11 Feb 2023 17:05:06 +0100
Subject: [PATCH 192/475] Fix test

---
 src/Symfony/Component/Notifier/Bridge/Twitter/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json b/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json
i
F41A
ndex 83b1a91258a0b..a3ba07d0aed26 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/http-client": "^5.4|^6.0",
+        "symfony/http-client": "^5.4.21|^6.2.7",
         "symfony/notifier": "^6.2"
     },
     "require-dev": {

From d2cf15d1ff60c694c1b61a4e999cdfd808970d54 Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Sun, 12 Feb 2023 11:19:44 +0100
Subject: [PATCH 193/475] [Filesystem] Remove always true condition

---
 src/Symfony/Component/Filesystem/Filesystem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index 1ca852d29feac..9cad1b79b778a 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -208,7 +208,7 @@ private static function doRemove(array $files, bool $isRecursive): void
     public function chmod(string|iterable $files, int $mode, int $umask = 0000, bool $recursive = false)
     {
         foreach ($this->toIterable($files) as $file) {
-            if (\is_int($mode) && !self::box('chmod', $file, $mode & ~$umask)) {
+            if (!self::box('chmod', $file, $mode & ~$umask)) {
                 throw new IOException(sprintf('Failed to chmod file "%s": ', $file).self::$lastError, 0, null, $file);
             }
             if ($recursive && is_dir($file) && !is_link($file)) {

From 13114ec5d42307e53a6586aeccb1192e84579dfc Mon Sep 17 00:00:00 2001
From: Titouan Galopin <titouan@selency.com>
Date: Sun, 12 Feb 2023 12:59:13 +0100
Subject: [PATCH 194/475] [HtmlSanitizer] Remove experimental status

---
 src/Symfony/Component/HtmlSanitizer/HtmlSanitizer.php           | 2 --
 src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php     | 2 --
 src/Symfony/Component/HtmlSanitizer/HtmlSanitizerInterface.php  | 2 --
 .../Component/HtmlSanitizer/Parser/MastermindsParser.php        | 2 --
 src/Symfony/Component/HtmlSanitizer/Parser/ParserInterface.php  | 2 --
 .../Visitor/AttributeSanitizer/AttributeSanitizerInterface.php  | 2 --
 .../Visitor/AttributeSanitizer/UrlAttributeSanitizer.php        | 2 +-
 .../Component/HtmlSanitizer/Visitor/Node/BlockedNode.php        | 2 --
 .../Component/HtmlSanitizer/Visitor/Node/DocumentNode.php       | 2 --
 src/Symfony/Component/HtmlSanitizer/Visitor/Node/Node.php       | 2 --
 .../Component/HtmlSanitizer/Visitor/Node/NodeInterface.php      | 2 --
 src/Symfony/Component/HtmlSanitizer/Visitor/Node/TextNode.php   | 2 --
 12 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizer.php b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizer.php
index 2f4947256602e..fb668921a8643 100644
--- a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizer.php
+++ b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizer.php
@@ -19,8 +19,6 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
- *
- * @experimental
  */
 final class HtmlSanitizer implements HtmlSanitizerInterface
 {
diff --git a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php
index 34576ca9d95cf..aba306748b7cf 100644
--- a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php
+++ b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerConfig.php
@@ -16,8 +16,6 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
- *
- * @experimental
  */
 class HtmlSanitizerConfig
 {
diff --git a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerInterface.php b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerInterface.php
index 559bcb6a46a98..f68d9944f51e8 100644
--- a/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerInterface.php
+++ b/src/Symfony/Component/HtmlSanitizer/HtmlSanitizerInterface.php
@@ -18,8 +18,6 @@
  * ({@see https://wicg.github.io/sanitizer-api/}).
  *
  * @author Titouan Galopin <galopintitouan@gmail.com>
- *
- * @experimental
  */
 interface HtmlSanitizerInterface
 {
diff --git a/src/Symfony/Component/HtmlSanitizer/Parser/MastermindsParser.php b/src/Symfony/Component/HtmlSanitizer/Parser/MastermindsParser.php
index f9752fc04901f..b49849bd23d27 100644
--- a/src/Symfony/Component/HtmlSanitizer/Parser/MastermindsParser.php
+++ b/src/Symfony/Component/HtmlSanitizer/Parser/MastermindsParser.php
@@ -15,8 +15,6 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
- *
- * @experimental
  */
 final class MastermindsParser implements ParserInterface
 {
diff --git a/src/Symfony/Component/HtmlSanitizer/Parser/ParserInterface.php b/src/Symfony/Component/HtmlSanitizer/Parser/ParserInterface.php
index 50d56fad6d3be..1a12b450c6d3c 100644
--- a/src/Symfony/Component/HtmlSanitizer/Parser/ParserInterface.php
+++ b/src/Symfony/Component/HtmlSanitizer/Parser/ParserInterface.php
@@ -15,8 +15,6 @@
  * Transforms an untrusted HTML input string into a DOM tree.
  *
  * @author Titouan Galopin <galopintitouan@gmail.com>
- *
- * @experimental
  */
 interface ParserInterface
 {
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/AttributeSanitizer/AttributeSanitizerInterface.php b/src/Symfony/Component/HtmlSanitizer/Visitor/AttributeSanitizer/AttributeSanitizerInterface.php
index c4daa1d17fbe3..92e983e87f1b5 100644
--- a/src/Symfony/Component/HtmlSanitizer/Visitor/AttributeSanitizer/AttributeSanitizerInterface.php
+++ b/src/Symfony/Component/HtmlSanitizer/Visitor/AttributeSanitizer/AttributeSanitizerInterface.php
@@ -17,8 +17,6 @@
  * Implements attribute-specific sanitization logic.
  *
  * @author Titouan Galopin <galopintitouan@gmail.com>
- *
- * @experimental
  */
 interface AttributeSanitizerInterface
 {
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/AttributeSanitizer/UrlAttributeSanitizer.php b/src/Symfony/Component/HtmlSanitizer/Visitor/AttributeSanitizer/UrlAttributeSanitizer.php
index 2d5c5f0b975db..a3dbf2f098663 100644
--- a/src/Symfony/Component/HtmlSanitizer/Visitor/AttributeSanitizer/UrlAttributeSanitizer.php
+++ b/src/Symfony/Component/HtmlSanitizer/Visitor/AttributeSanitizer/UrlAttributeSanitizer.php
@@ -15,7 +15,7 @@
 use Symfony\Component\HtmlSanitizer\TextSanitizer\UrlSanitizer;
 
 /**
- * @experimental
+ * @author Titouan Galopin <galopintitouan@gmail.com>
  */
 final class UrlAttributeSanitizer implements AttributeSanitizerInterface
 {
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/BlockedNode.php b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/BlockedNode.php
index d438313d4ec76..8376f6664873f 100644
--- a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/BlockedNode.php
+++ b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/BlockedNode.php
@@ -13,8 +13,6 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
- *
- * @experimental
  */
 final class BlockedNode implements NodeInterface
 {
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/DocumentNode.php b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/DocumentNode.php
index d5ef5363015e7..17037f84da7c1 100644
--- a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/DocumentNode.php
+++ b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/DocumentNode.php
@@ -13,8 +13,6 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
- *
- * @experimental
  */
 final class DocumentNode implements NodeInterface
 {
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/Node.php b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/Node.php
index 8a4e5c32aa7ac..46a6b17a443de 100644
--- a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/Node.php
+++ b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/Node.php
@@ -15,8 +15,6 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
- *
- * @experimental
  */
 final class Node implements NodeInterface
 {
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/NodeInterface.php b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/NodeInterface.php
index 27d9da7ed97ac..53c69c0875096 100644
--- a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/NodeInterface.php
+++ b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/NodeInterface.php
@@ -17,8 +17,6 @@
  * Once the sanitization is done, nodes are rendered into the final output string.
  *
  * @author Titouan Galopin <galopintitouan@gmail.com>
- *
- * @experimental
  */
 interface NodeInterface
 {
diff --git a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/TextNode.php b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/TextNode.php
index f06b7ccdf47d1..d4378adc19d5b 100644
--- a/src/Symfony/Component/HtmlSanitizer/Visitor/Node/TextNode.php
+++ b/src/Symfony/Component/HtmlSanitizer/Visitor/Node/TextNode.php
@@ -15,8 +15,6 @@
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
- *
- * @experimental
  */
 final class TextNode implements NodeInterface
 {

From e23d8be24d6bc2609186ec97d544a49cc3023432 Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Mon, 13 Feb 2023 00:00:11 +0100
Subject: [PATCH 195/475] Add missing PHPdoc return types

---
 .github/expected-missing-return-types.diff    | 2114 ++++++++++++++++-
 .github/patch-types.php                       |    1 +
 .../DataCollector/DoctrineDataCollector.php   |    3 +
 .../Security/UserProvider/EntityFactory.php   |    3 +
 .../Bridge/PhpUnit/ClassExistsMock.php        |   12 +
 src/Symfony/Bridge/PhpUnit/ClockMock.php      |   18 +
 src/Symfony/Bridge/PhpUnit/DnsMock.php        |    6 +
 .../FrameworkBundle/Secrets/AbstractVault.php |    3 +
 .../Debug/TraceableFirewallListener.php       |    3 +
 .../Security/Factory/AbstractFactory.php      |   13 +-
 .../Security/UserProvider/InMemoryFactory.php |    3 +
 .../Security/UserProvider/LdapFactory.php     |    3 +
 .../Security/FirewallContext.php              |    9 +
 .../Component/Cache/Adapter/ApcuAdapter.php   |    3 +
 .../Cache/Adapter/MemcachedAdapter.php        |    3 +
 .../Cache/Adapter/PhpFilesAdapter.php         |    6 +
 .../Cache/Adapter/TraceableAdapter.php        |    6 +
 .../Definition/Dumper/XmlReferenceDumper.php  |    3 +
 .../Definition/Dumper/YamlReferenceDumper.php |    3 +
 .../Component/Config/Definition/EnumNode.php  |    3 +
 .../FileLocatorFileNotFoundException.php      |    3 +
 .../Config/Exception/LoaderLoadException.php  |    3 +
 .../Component/Config/Util/XmlUtils.php        |    3 +
 .../Component/Console/Helper/Helper.php       |    6 +
 .../Component/Console/Question/Question.php   |    3 +
 .../Component/Console/Style/OutputStyle.php   |    3 +
 .../Argument/TaggedIteratorArgument.php       |    3 +
 .../Exception/AutowiringFailedException.php   |    3 +
 .../ParameterCircularReferenceException.php   |    3 +
 .../Exception/ParameterNotFoundException.php  |    9 +
 .../ServiceCircularReferenceException.php     |    6 +
 .../Exception/ServiceNotFoundException.php    |    9 +
 .../DependencyInjection/TypedReference.php    |    3 +
 .../Component/ExpressionLanguage/Compiler.php |    3 +
 .../ExpressionLanguage/Node/FunctionNode.php  |    3 +
 .../ExpressionLanguage/Node/Node.php          |   12 +
 .../ExpressionLanguage/ParsedExpression.php   |    3 +
 .../Component/ExpressionLanguage/Parser.php   |   14 +
 src/Symfony/Component/Form/ButtonBuilder.php  |    6 +
 .../Component/Form/FormConfigBuilder.php      |   63 +
 .../Form/FormConfigBuilderInterface.php       |    2 +
 .../Component/HttpClient/HttpClientTrait.php  |    2 +
 .../Component/HttpFoundation/HeaderBag.php    |    3 +
 .../HttpFoundation/ResponseHeaderBag.php      |    5 +
 .../DataCollector/RequestDataCollector.php    |   36 +
 .../DataCollector/RouterDataCollector.php     |    3 +
 .../Fragment/InlineFragmentRenderer.php       |    3 +
 .../Component/HttpKernel/HttpCache/Store.php  |    3 +
 .../HttpKernel/HttpKernelBrowser.php          |    3 +
 .../Profiler/FileProfilerStorage.php          |    3 +
 .../Component/Intl/Resources/bin/common.php   |    9 +
 .../Ldap/Adapter/EntryManagerInterface.php    |   10 +
 .../Ldap/Adapter/ExtLdap/EntryManager.php     |   36 +-
 .../Component/Lock/Store/MemcachedStore.php   |    3 +
 .../Exception/ValidationFailedException.php   |    3 +
 .../Messenger/Stamp/HandlerArgumentsStamp.php |    3 +
 .../Exception/ProcessTimedOutException.php    |    6 +
 src/Symfony/Component/Process/InputStream.php |    2 +
 .../Component/Routing/Annotation/Route.php    |   27 +
 .../Routing/Loader/AnnotationClassLoader.php  |    6 +
 .../Routing/Matcher/TraceableUrlMatcher.php   |    3 +
 .../Voter/RoleHierarchyVoter.php              |    3 +
 .../Core/Authorization/Voter/RoleVoter.php    |    3 +
 .../Core/Event/AuthenticationEvent.php        |    3 +
 .../Serializer/Annotation/MaxDepth.php        |    3 +
 .../Component/Translation/Translator.php      |    3 +
 .../Validator/Constraints/IsbnValidator.php   |    6 +
 .../Exception/InvalidOptionsException.php     |    3 +
 .../Exception/MissingOptionsException.php     |    3 +
 .../Validator/Mapping/MemberMetadata.php      |    3 +
 .../Component/VarDumper/Caster/AmqpCaster.php |   15 +
 .../Component/VarDumper/Caster/DOMCaster.php  |   45 +
 .../Component/VarDumper/Caster/DateCaster.php |   12 +
 .../VarDumper/Caster/DoctrineCaster.php       |    9 +
 .../VarDumper/Caster/ExceptionCaster.php      |   21 +
 .../VarDumper/Caster/FiberCaster.php          |    3 +
 .../Component/VarDumper/Caster/IntlCaster.php |   15 +
 .../VarDumper/Caster/MemcachedCaster.php      |    3 +
 .../Component/VarDumper/Caster/PdoCaster.php  |    6 +
 .../VarDumper/Caster/PgSqlCaster.php          |    9 +
 .../VarDumper/Caster/ProxyManagerCaster.php   |    3 +
 .../VarDumper/Caster/RdKafkaCaster.php        |   30 +
 .../VarDumper/Caster/RedisCaster.php          |    9 +
 .../VarDumper/Caster/ReflectionCaster.php     |   45 +
 .../VarDumper/Caster/ResourceCaster.php       |   15 +
 .../Component/VarDumper/Caster/SplCaster.php  |   30 +
 .../Component/VarDumper/Caster/StubCaster.php |   12 +
 .../VarDumper/Caster/SymfonyCaster.php        |   18 +
 .../VarDumper/Caster/XmlReaderCaster.php      |    3 +
 .../VarDumper/Caster/XmlResourceCaster.php    |    3 +
 .../Component/VarDumper/Server/Connection.php |    3 +
 .../VarExporter/Internal/Hydrator.php         |    3 +
 .../EventListener/GuardExpression.php         |    6 +
 .../Exception/TransitionException.php         |    3 +
 src/Symfony/Component/Workflow/Marking.php    |    6 +
 .../Service/ServiceSubscriberTraitTest.php    |    3 +
 96 files changed, 2886 insertions(+), 24 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index c248018a4b9f6..cdd739519fc73 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -6,6 +6,50 @@ head=$(sed '/^diff /Q' .github/expected-missing-return-types.diff)
 (echo "$head" && echo && git diff -U2 src/) > .github/expected-missing-return-types.diff
 git checkout composer.json src/
 
+diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+index 96c346846c..57a229c4d4 100644
+--- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
++++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+@@ -111,5 +111,5 @@ class DoctrineDataCollector extends DataCollector
+      * @return int
+      */
+-    public function getQueryCount()
++    public function getQueryCount(): int
+     {
+         return array_sum(array_map('count', $this->data['queries']));
+diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
+index e3dcea3398..c72d24cc9d 100644
+--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
++++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
+@@ -47,5 +47,5 @@ class EntityFactory implements UserProviderFactoryInterface
+      * @return string
+      */
+-    public function getKey()
++    public function getKey(): string
+     {
+         return $this->key;
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php
+index ccb61b1286..700d0f22d4 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php
+@@ -23,5 +23,5 @@ use Symfony\Component\HttpKernel\DataCollector\RouterDataCollector as BaseRouter
+ class RouterDataCollector extends BaseRouterDataCollector
+ {
+-    public function guessRoute(Request $request, mixed $controller)
++    public function guessRoute(Request $request, mixed $controller): string
+     {
+         if (\is_array($controller)) {
+diff --git a/src/Symfony/Bundle/FrameworkBundle/Secrets/AbstractVault.php b/src/Symfony/Bundle/FrameworkBundle/Secrets/AbstractVault.php
+index b3eb0c6bc3..c47152f219 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/Secrets/AbstractVault.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Secrets/AbstractVault.php
+@@ -44,5 +44,5 @@ abstract class AbstractVault
+      * @return string
+      */
+-    protected function getPrettyPath(string $path)
++    protected function getPrettyPath(string $path): string
+     {
+         return str_replace(getcwd().\DIRECTORY_SEPARATOR, '', $path);
 diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
 index bb5560a7b5..be86cbf98e 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -17,6 +61,107 @@ index bb5560a7b5..be86cbf98e 100644
 +    protected static function getContainer(): Container
      {
          if (!static::$booted) {
+diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
+index 0e40e39851..0c3b145111 100644
+--- a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
++++ b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
+@@ -32,5 +32,5 @@ final class TraceableFirewallListener extends FirewallListener
+      * @return array
+      */
+-    public function getWrappedListeners()
++    public function getWrappedListeners(): array
+     {
+         return $this->wrappedListeners;
+diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
+index fd2b18bb50..91f223d29b 100644
+--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
++++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
+@@ -76,5 +76,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
+      * @return string
+      */
+-    protected function createAuthenticationSuccessHandler(ContainerBuilder $container, string $id, array $config)
++    protected function createAuthenticationSuccessHandler(ContainerBuilder $container, string $id, array $config): string
+     {
+         $successHandlerId = $this->getSuccessHandlerId($id);
+@@ -98,5 +98,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
+      * @return string
+      */
+-    protected function createAuthenticationFailureHandler(ContainerBuilder $container, string $id, array $config)
++    protected function createAuthenticationFailureHandler(ContainerBuilder $container, string $id, array $config): string
+     {
+         $id = $this->getFailureHandlerId($id);
+@@ -118,5 +118,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
+      * @return string
+      */
+-    protected function getSuccessHandlerId(string $id)
++    protected function getSuccessHandlerId(string $id): string
+     {
+         return 'security.authentication.success_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());
+@@ -126,5 +126,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
+      * @return string
+      */
+-    protected function getFailureHandlerId(string $id)
++    protected function getFailureHandlerId(string $id): string
+     {
+         return 'security.authentication.failure_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());
+diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
+index 32208a6e3b..3a9064dadf 100644
+--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
++++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
+@@ -41,5 +41,5 @@ class InMemoryFactory implements UserProviderFactoryInterface
+      * @return string
+      */
+-    public function getKey()
++    public function getKey(): string
+     {
+         return 'memory';
+diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
+index d54ebf7738..f2a74ec902 100644
+--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
++++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
+@@ -44,5 +44,5 @@ class LdapFactory implements UserProviderFactoryInterface
+      * @return string
+      */
+-    public function getKey()
++    public function getKey(): string
+     {
+         return 'ldap';
+diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
+index 5077c6768d..bd741840f4 100644
+--- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
++++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
+@@ -42,5 +42,5 @@ class FirewallContext
+      * @return FirewallConfig|null
+      */
+-    public function getConfig()
++    public function getConfig(): ?FirewallConfig
+     {
+         return $this->config;
+@@ -58,5 +58,5 @@ class FirewallContext
+      * @return ExceptionListener|null
+      */
+-    public function getExceptionListener()
++    public function getExceptionListener(): ?ExceptionListener
+     {
+         return $this->exceptionListener;
+@@ -66,5 +66,5 @@ class FirewallContext
+      * @return LogoutListener|null
+      */
+-    public function getLogoutListener()
++    public function getLogoutListener(): ?LogoutListener
+     {
+         return $this->logoutListener;
+diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
+index 3b379f59d4..7bf45f08c2 100644
+--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
++++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
+@@ -447,5 +447,5 @@ class ProfilerControllerTest extends WebTestCase
+      * @return MockObject&DumpDataCollector
+      */
+-    private function createDumpDataCollector(): MockObject
++    private function createDumpDataCollector(): MockObject&DumpDataCollector
+     {
+         $dumpDataCollector = $this->createMock(DumpDataCollector::class);
 diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 index b27ca37529..5b80175850 100644
 --- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
@@ -49,6 +194,64 @@ index b27ca37529..5b80175850 100644
 +    protected function filterResponse(object $response): Response
      {
          return $response;
+diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
+index 3dc93fd541..8a7df7a19b 100644
+--- a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
+@@ -51,5 +51,5 @@ class ApcuAdapter extends AbstractAdapter
+      * @return bool
+      */
+-    public static function isSupported()
++    public static function isSupported(): bool
+     {
+         return \function_exists('apcu_fetch') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOL);
+diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
+index dc25a395a3..a56e1b74ce 100644
+--- a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
+@@ -78,5 +78,5 @@ class MemcachedAdapter extends AbstractAdapter
+      * @return bool
+      */
+-    public static function isSupported()
++    public static function isSupported(): bool
+     {
+         return \extension_loaded('memcached') && version_compare(phpversion('memcached'), '3.1.6', '>=');
+diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
+index d104530c0d..a1845d3ae9 100644
+--- a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
+@@ -58,5 +58,5 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
+      * @return bool
+      */
+-    public static function isSupported()
++    public static function isSupported(): bool
+     {
+         self::$startTime ??= $_SERVER['REQUEST_TIME'] ?? time();
+@@ -281,5 +281,5 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
+      * @return bool
+      */
+-    protected function doUnlink(string $file)
++    protected function doUnlink(string $file): bool
+     {
+         unset(self::$valuesCache[$file]);
+diff --git a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
+index 18f7ba0fb0..7f37cb6d9b 100644
+--- a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
+@@ -215,5 +215,5 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
+      * @return array
+      */
+-    public function getCalls()
++    public function getCalls(): array
+     {
+         return $this->calls;
+@@ -233,5 +233,5 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
+      * @return TraceableAdapterEvent
+      */
+-    protected function start(string $name)
++    protected function start(string $name): TraceableAdapterEvent
+     {
+         $this->calls[] = $event = new TraceableAdapterEvent();
 diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
 index 7cda0bc7d8..b2311826f4 100644
 --- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
@@ -70,6 +273,61 @@ index 7b5d443fe6..d64ae0d024 100644
 -    public function getConfigTreeBuilder();
 +    public function getConfigTreeBuilder(): TreeBuilder;
  }
+diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
+index 2f07f31d0a..17601dbec4 100644
+--- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
++++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
+@@ -40,5 +40,5 @@ class XmlReferenceDumper
+      * @return string
+      */
+-    public function dumpNode(NodeInterface $node, string $namespace = null)
++    public function dumpNode(NodeInterface $node, string $namespace = null): string
+     {
+         $this->reference = '';
+diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
+index 4621e6b1dc..96316277b3 100644
+--- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
++++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
+@@ -65,5 +65,5 @@ class YamlReferenceDumper
+      * @return string
+      */
+-    public function dumpNode(NodeInterface $node)
++    public function dumpNode(NodeInterface $node): string
+     {
+         $this->reference = '';
+diff --git a/src/Symfony/Component/Config/Definition/EnumNode.php b/src/Symfony/Component/Config/Definition/EnumNode.php
+index 683096949d..bce1cecc29 100644
+--- a/src/Symfony/Component/Config/Definition/EnumNode.php
++++ b/src/Symfony/Component/Config/Definition/EnumNode.php
+@@ -50,5 +50,5 @@ class EnumNode extends ScalarNode
+      * @return array
+      */
+-    public function getValues()
++    public function getValues(): array
+     {
+         return $this->values;
+diff --git a/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php b/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php
+index c5173ae580..1f5aa3616e 100644
+--- a/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php
++++ b/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php
+@@ -31,5 +31,5 @@ class FileLocatorFileNotFoundException extends \InvalidArgumentException
+      * @return array
+      */
+-    public function getPaths()
++    public function getPaths(): array
+     {
+         return $this->paths;
+diff --git a/src/Symfony/Component/Config/Exception/LoaderLoadException.php b/src/Symfony/Component/Config/Exception/LoaderLoadException.php
+index 57afd6a8db..3d662340ea 100644
+--- a/src/Symfony/Component/Config/Exception/LoaderLoadException.php
++++ b/src/Symfony/Component/Config/Exception/LoaderLoadException.php
+@@ -80,5 +80,5 @@ class LoaderLoadException extends \Exception
+      * @return string
+      */
+-    protected function varToString(mixed $var)
++    protected function varToString(mixed $var): string
+     {
+         if (\is_object($var)) {
 diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php
 index ab18232db1..bc5af7f89c 100644
 --- a/src/Symfony/Component/Config/FileLocator.php
@@ -155,8 +413,19 @@ index 6b1c6c5fbe..bb80ed461e 100644
 -    public function isFresh(ResourceInterface $resource, int $timestamp);
 +    public function isFresh(ResourceInterface $resource, int $timestamp): bool;
  }
+diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
+index cc024da461..00b79e915f 100644
+--- a/src/Symfony/Component/Config/Util/XmlUtils.php
++++ b/src/Symfony/Component/Config/Util/XmlUtils.php
+@@ -242,5 +242,5 @@ class XmlUtils
+      * @return array
+      */
+-    protected static function getXmlErrors(bool $internalErrors)
++    protected static function getXmlErrors(bool $internalErrors): array
+     {
+         $errors = [];
 diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
-index 3a3d4da744..0a825fc1ee 100644
+index 40c7035af4..9b7cad07b8 100644
 --- a/src/Symfony/Component/Console/Application.php
 +++ b/src/Symfony/Component/Console/Application.php
 @@ -215,5 +215,5 @@ class Application implements ResetInterface
@@ -166,28 +435,28 @@ index 3a3d4da744..0a825fc1ee 100644
 +    public function doRun(InputInterface $input, OutputInterface $output): int
      {
          if (true === $input->hasParameterOption(['--version', '-V'], true)) {
-@@ -462,5 +462,5 @@ class Application implements ResetInterface
+@@ -464,5 +464,5 @@ class Application implements ResetInterface
       * @return string
       */
 -    public function getLongVersion()
 +    public function getLongVersion(): string
      {
          if ('UNKNOWN' !== $this->getName()) {
-@@ -505,5 +505,5 @@ class Application implements ResetInterface
+@@ -507,5 +507,5 @@ class Application implements ResetInterface
       * @return Command|null
       */
 -    public function add(Command $command)
 +    public function add(Command $command): ?Command
      {
          $this->init();
-@@ -542,5 +542,5 @@ class Application implements ResetInterface
+@@ -544,5 +544,5 @@ class Application implements ResetInterface
       * @throws CommandNotFoundException When given command name does not exist
       */
 -    public function get(string $name)
 +    public function get(string $name): Command
      {
          $this->init();
-@@ -649,5 +649,5 @@ class Application implements ResetInterface
+@@ -651,5 +651,5 @@ class Application implements ResetInterface
       * @throws CommandNotFoundException When command name is incorrect or ambiguous
       */
 -    public function find(string $name)
@@ -201,7 +470,7 @@ index 3a3d4da744..0a825fc1ee 100644
 +    public function all(string $namespace = null): array
      {
          $this->init();
-@@ -968,5 +968,5 @@ class Application implements ResetInterface
+@@ -966,5 +966,5 @@ class Application implements ResetInterface
       * @return int 0 if everything went fine, or an error code
       */
 -    protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)
@@ -254,6 +523,24 @@ index 746cd27e79..52c61429cf 100644
 -    public function formatAndWrap(?string $message, int $width);
 +    public function formatAndWrap(?string $message, int $width): string;
  }
+diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
+index 8e56f2b571..8a629f7565 100644
+--- a/src/Symfony/Component/Console/Helper/Helper.php
++++ b/src/Symfony/Component/Console/Helper/Helper.php
+@@ -121,5 +121,5 @@ abstract class Helper implements HelperInterface
+      * @return string
+      */
+-    public static function formatMemory(int $memory)
++    public static function formatMemory(int $memory): string
+     {
+         if ($memory >= 1024 * 1024 * 1024) {
+@@ -141,5 +141,5 @@ abstract class Helper implements HelperInterface
+      * @return string
+      */
+-    public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string)
++    public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string): string
+     {
+         $isDecorated = $formatter->isDecorated();
 diff --git a/src/Symfony/Component/Console/Helper/HelperInterface.php b/src/Symfony/Component/Console/Helper/HelperInterface.php
 index 2762cdf05c..737334268a 100644
 --- a/src/Symfony/Component/Console/Helper/HelperInterface.php
@@ -300,6 +587,39 @@ index 3af991a76f..742e2508f3 100644
 +    public function getOption(string $name): mixed;
  
      /**
+diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
+index e1f981bc1e..f701cb549d 100644
+--- a/src/Symfony/Component/Console/Question/Question.php
++++ b/src/Symfony/Component/Console/Question/Question.php
+@@ -269,5 +269,5 @@ class Question
+      * @return bool
+      */
+-    protected function isAssoc(array $array)
++    protected function isAssoc(array $array): bool
+     {
+         return (bool) \count(array_filter(array_keys($array), 'is_string'));
+diff --git a/src/Symfony/Component/Console/Style/OutputStyle.php b/src/Symfony/Component/Console/Style/OutputStyle.php
+index 74d885d131..3de806a60e 100644
+--- a/src/Symfony/Component/Console/Style/OutputStyle.php
++++ b/src/Symfony/Component/Console/Style/OutputStyle.php
+@@ -104,5 +104,5 @@ abstract class OutputStyle implements OutputInterface, StyleInterface
+      * @return OutputInterface
+      */
+-    protected function getErrorOutput()
++    protected function getErrorOutput(): OutputInterface
+     {
+         if (!$this->output instanceof ConsoleOutputInterface) {
+diff --git a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
+index b4e982c457..521a9531f8 100644
+--- a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
++++ b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
+@@ -56,5 +56,5 @@ class TaggedIteratorArgument extends IteratorArgument
+      * @return string
+      */
+-    public function getTag()
++    public function getTag(): string
+     {
+         return $this->tag;
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
 index 08bab02ee4..1181f0795e 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
@@ -312,10 +632,10 @@ index 08bab02ee4..1181f0795e 100644
      {
          if (\is_array($value)) {
 diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
-index 9c830e77c8..e530cafb43 100644
+index ff10702229..d98f26f82b 100644
 --- a/src/Symfony/Component/DependencyInjection/Container.php
 +++ b/src/Symfony/Component/DependencyInjection/Container.php
-@@ -109,5 +109,5 @@ class Container implements ContainerInterface, ResetInterface
+@@ -115,5 +115,5 @@ class Container implements ContainerInterface, ResetInterface
       * @throws ParameterNotFoundException if the parameter is not defined
       */
 -    public function getParameter(string $name)
@@ -333,6 +653,96 @@ index 9e97fb71fc..1cda97c611 100644
 +    public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null;
  
      public function hasParameter(string $name): bool;
+diff --git a/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php b/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php
+index 5f22fa53b6..2ebf0e385d 100644
+--- a/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php
++++ b/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php
+@@ -71,5 +71,5 @@ class AutowiringFailedException extends RuntimeException
+      * @return string
+      */
+-    public function getServiceId()
++    public function getServiceId(): string
+     {
+         return $this->serviceId;
+diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php
+index 9fc3b50b62..a6c1469c2d 100644
+--- a/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php
++++ b/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php
+@@ -31,5 +31,5 @@ class ParameterCircularReferenceException extends RuntimeException
+      * @return array
+      */
+-    public function getParameters()
++    public function getParameters(): array
+     {
+         return $this->parameters;
+diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
+index 89966648f7..fa80eb75ee 100644
+--- a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
++++ b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
+@@ -75,5 +75,5 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
+      * @return string
+      */
+-    public function getKey()
++    public function getKey(): string
+     {
+         return $this->key;
+@@ -83,5 +83,5 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
+      * @return string|null
+      */
+-    public function getSourceId()
++    public function getSourceId(): ?string
+     {
+         return $this->sourceId;
+@@ -91,5 +91,5 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
+      * @return string|null
+      */
+-    public function getSourceKey()
++    public function getSourceKey(): ?string
+     {
+         return $this->sourceKey;
+diff --git a/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php b/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php
+index d62c22567b..085d5fa167 100644
+--- a/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php
++++ b/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php
+@@ -33,5 +33,5 @@ class ServiceCircularReferenceException extends RuntimeException
+      * @return string
+      */
+-    public function getServiceId()
++    public function getServiceId(): string
+     {
+         return $this->serviceId;
+@@ -41,5 +41,5 @@ class ServiceCircularReferenceException extends RuntimeException
+      * @return array
+      */
+-    public function getPath()
++    public function getPath(): array
+     {
+         return $this->path;
+diff --git a/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php
+index d56db7727f..90da421299 100644
+--- a/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php
++++ b/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php
+@@ -54,5 +54,5 @@ class ServiceNotFoundException extends InvalidArgumentException implements NotFo
+      * @return string
+      */
+-    public function getId()
++    public function getId(): string
+     {
+         return $this->id;
+@@ -62,5 +62,5 @@ class ServiceNotFoundException extends InvalidArgumentException implements NotFo
+      * @return string|null
+      */
+-    public function getSourceId()
++    public function getSourceId(): ?string
+     {
+         return $this->sourceId;
+@@ -70,5 +70,5 @@ class ServiceNotFoundException extends InvalidArgumentException implements NotFo
+      * @return array
+      */
+-    public function getAlternatives()
++    public function getAlternatives(): array
+     {
+         return $this->alternatives;
 diff --git a/src/Symfony/Component/DependencyInjection/Extension/ConfigurationExtensionInterface.php b/src/Symfony/Component/DependencyInjection/Extension/ConfigurationExtensionInterface.php
 index a42967f4da..4e86e16f9d 100644
 --- a/src/Symfony/Component/DependencyInjection/Extension/ConfigurationExtensionInterface.php
@@ -401,6 +811,17 @@ index f4c6b29258..1402331f9e 100644
 -    public function instantiateProxy(ContainerInterface $container, Definition $definition, string $id, callable $realInstantiator);
 +    public function instantiateProxy(ContainerInterface $container, Definition $definition, string $id, callable $realInstantiator): object;
  }
+diff --git a/src/Symfony/Component/DependencyInjection/TypedReference.php b/src/Symfony/Component/DependencyInjection/TypedReference.php
+index 9b431cd65b..5fdb0643cd 100644
+--- a/src/Symfony/Component/DependencyInjection/TypedReference.php
++++ b/src/Symfony/Component/DependencyInjection/TypedReference.php
+@@ -41,5 +41,5 @@ class TypedReference extends Reference
+      * @return string
+      */
+-    public function getType()
++    public function getType(): string
+     {
+         return $this->type;
 diff --git a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php b/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
 index 2085e428e9..ca0d6964e5 100644
 --- a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
@@ -411,6 +832,17 @@ index 2085e428e9..ca0d6964e5 100644
 -    public static function getSubscribedEvents();
 +    public static function getSubscribedEvents(): array;
  }
+diff --git a/src/Symfony/Component/ExpressionLanguage/Compiler.php b/src/Symfony/Component/ExpressionLanguage/Compiler.php
+index 66471d29ff..98f2f1eab2 100644
+--- a/src/Symfony/Component/ExpressionLanguage/Compiler.php
++++ b/src/Symfony/Component/ExpressionLanguage/Compiler.php
+@@ -67,5 +67,5 @@ class Compiler implements ResetInterface
+      * @return string
+      */
+-    public function subcompile(Node\Node $node)
++    public function subcompile(Node\Node $node): string
+     {
+         $current = $this->source;
 diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionFunctionProviderInterface.php b/src/Symfony/Component/ExpressionLanguage/ExpressionFunctionProviderInterface.php
 index 479aeef880..272954c082 100644
 --- a/src/Symfony/Component/ExpressionLanguage/ExpressionFunctionProviderInterface.php
@@ -421,6 +853,211 @@ index 479aeef880..272954c082 100644
 -    public function getFunctions();
 +    public function getFunctions(): array;
  }
+diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
+index e1a3169b00..e5dc5bfe21 100644
+--- a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
++++ b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
+@@ -45,5 +45,5 @@ class ArrayNode extends Node
+     }
+ 
+-    public function evaluate(array $functions, array $values)
++    public function evaluate(array $functions, array $values): mixed
+     {
+         $result = [];
+diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
+index 0b31c66ded..e798ef8f2f 100644
+--- a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
++++ b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
+@@ -93,5 +93,5 @@ class BinaryNode extends Node
+     }
+ 
+-    public function evaluate(array $functions, array $values)
++    public function evaluate(array $functions, array $values): mixed
+     {
+         $operator = $this->attributes['operator'];
+diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
+index ba78a2848e..f805b5655e 100644
+--- a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
++++ b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
+@@ -41,5 +41,5 @@ class ConditionalNode extends Node
+     }
+ 
+-    public function evaluate(array $functions, array $values)
++    public function evaluate(array $functions, array $values): mixed
+     {
+         if ($this->nodes['expr1']->evaluate($functions, $values)) {
+diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
+index 869e350dc9..f1c1ad5bd3 100644
+--- a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
++++ b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
+@@ -39,5 +39,5 @@ class ConstantNode extends Node
+     }
+ 
+-    public function evaluate(array $functions, array $values)
++    public function evaluate(array $functions, array $values): mixed
+     {
+         return $this->attributes['value'];
+diff --git a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
+index 06078da305..cc11697293 100644
+--- a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
++++ b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
+@@ -41,5 +41,5 @@ class FunctionNode extends Node
+     }
+ 
+-    public function evaluate(array $functions, array $values)
++    public function evaluate(array $functions, array $values): mixed
+     {
+         $arguments = [$values];
+@@ -54,5 +54,5 @@ class FunctionNode extends Node
+      * @return array
+      */
+-    public function toArray()
++    public function toArray(): array
+     {
+         $array = [];
+diff --git a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
+index e9b10c3295..7aefd9bb84 100644
+--- a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
++++ b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
+@@ -66,5 +66,5 @@ class GetAttrNode extends Node
+     }
+ 
+-    public function evaluate(array $functions, array $values)
++    public function evaluate(array $functions, array $values): mixed
+     {
+         switch ($this->attributes['type']) {
+diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
+index e017e967a1..8ea5bcf28c 100644
+--- a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
++++ b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
+@@ -34,5 +34,5 @@ class NameNode extends Node
+     }
+ 
+-    public function evaluate(array $functions, array $values)
++    public function evaluate(array $functions, array $values): mixed
+     {
+         return $values[$this->attributes['name']];
+diff --git a/src/Symfony/Component/ExpressionLanguage/Node/Node.php b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
+index eb5046c9bf..ef142d3787 100644
+--- a/src/Symfony/Component/ExpressionLanguage/Node/Node.php
++++ b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
+@@ -68,5 +68,5 @@ class Node
+      * @return mixed
+      */
+-    public function evaluate(array $functions, array $values)
++    public function evaluate(array $functions, array $values): mixed
+     {
+         $results = [];
+@@ -86,5 +86,5 @@ class Node
+      * @return string
+      */
+-    public function dump()
++    public function dump(): string
+     {
+         $dump = '';
+@@ -100,5 +100,5 @@ class Node
+      * @return string
+      */
+-    protected function dumpString(string $value)
++    protected function dumpString(string $value): string
+     {
+         return sprintf('"%s"', addcslashes($value, "\0\t\"\\"));
+@@ -108,5 +108,5 @@ class Node
+      * @return bool
+      */
+-    protected function isHash(array $value)
++    protected function isHash(array $value): bool
+     {
+         $expectedKey = 0;
+diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php
+index 3e59ef8676..b6371df241 100644
+--- a/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php
++++ b/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php
+@@ -37,5 +37,5 @@ class NullCoalesceNode extends Node
+     }
+ 
+-    public function evaluate(array $functions, array $values)
++    public function evaluate(array $functions, array $values): mixed
+     {
+         if ($this->nodes['expr1'] instanceof GetAttrNode) {
+diff --git a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
+index 9e30d848eb..ee82938d8a 100644
+--- a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
++++ b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
+@@ -46,5 +46,5 @@ class UnaryNode extends Node
+     }
+ 
+-    public function evaluate(array $functions, array $values)
++    public function evaluate(array $functions, array $values): mixed
+     {
+         $value = $this->nodes['node']->evaluate($functions, $values);
+diff --git a/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php b/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php
+index 239624ec2c..3b497d5ccf 100644
+--- a/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php
++++ b/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php
+@@ -33,5 +33,5 @@ class ParsedExpression extends Expression
+      * @return Node
+      */
+-    public function getNodes()
++    public function getNodes(): Node
+     {
+         return $this->nodes;
+diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
+index 92585a574c..96c62f8521 100644
+--- a/src/Symfony/Component/ExpressionLanguage/Parser.php
++++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
+@@ -178,5 +178,5 @@ class Parser
+      * @return Node\Node
+      */
+-    protected function parseConditionalExpression(Node\Node $expr)
++    protected function parseConditionalExpression(Node\Node $expr): Node\Node
+     {
+         while ($this->stream->current->test(Token::PUNCTUATION_TYPE, '??')) {
+@@ -277,5 +277,5 @@ class Parser
+      * @return Node\ArrayNode
+      */
+-    public function parseArrayExpression()
++    public function parseArrayExpression(): Node\ArrayNode
+     {
+         $this->stream->expect(Token::PUNCTUATION_TYPE, '[', 'An array element was expected');
+@@ -304,5 +304,5 @@ class Parser
+      * @return Node\ArrayNode
+      */
+-    public function parseHashExpression()
++    public function parseHashExpression(): Node\ArrayNode
+     {
+         $this->stream->expect(Token::PUNCTUATION_TYPE, '{', 'A hash element was expected');
+@@ -351,5 +351,5 @@ class Parser
+      * @return Node\GetAttrNode|Node\Node
+      */
+-    public function parsePostfixExpression(Node\Node $node)
++    public function parsePostfixExpression(Node\Node $node): Node\GetAttrNode|Node\Node
+     {
+         $token = $this->stream->current;
+@@ -414,5 +414,5 @@ class Parser
+      * @return Node\Node
+      */
+-    public function parseArguments()
++    public function parseArguments(): Node\Node
+     {
+         $args = [];
+diff --git a/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php b/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php
+index 56207b0985..133a3a1061 100644
+--- a/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php
++++ b/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php
+@@ -12,4 +12,5 @@
+ namespace Symfony\Component\ExpressionLanguage;
+ 
++use Symfony\Component\ExpressionLanguage\Node\Node;
+ /**
+  * Represents an already parsed expression.
+@@ -31,5 +32,5 @@ class SerializedParsedExpression extends ParsedExpression
+     }
+ 
+-    public function getNodes()
++    public function getNodes(): Node
+     {
+         return unserialize($this->nodes);
 diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php
 index 5d3c1a8480..7eb6bba474 100644
 --- a/src/Symfony/Component/Form/AbstractExtension.php
@@ -467,6 +1104,17 @@ index da401930d7..15d6219259 100644
 +    public function getParent(): ?string
      {
          return FormType::class;
+diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
+index 9cc32888e1..0fa604ceec 100644
+--- a/src/Symfony/Component/Form/ButtonBuilder.php
++++ b/src/Symfony/Component/Form/ButtonBuilder.php
+@@ -327,5 +327,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setFormFactory(FormFactoryInterface $formFactory)
++    public function setFormFactory(FormFactoryInterface $formFactory): static
+     {
+         throw new BadMethodCallException('Buttons do not support form factories.');
 diff --git a/src/Symfony/Component/Form/DataTransformerInterface.php b/src/Symfony/Component/Form/DataTransformerInterface.php
 index 85fb99d218..6cc654f681 100644
 --- a/src/Symfony/Component/Form/DataTransformerInterface.php
@@ -484,6 +1132,28 @@ index 85fb99d218..6cc654f681 100644
 -    public function reverseTransform(mixed $value);
 +    public function reverseTransform(mixed $value): mixed;
  }
+diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
+index 0220399758..0839a42daf 100644
+--- a/src/Symfony/Component/Form/FormConfigBuilder.php
++++ b/src/Symfony/Component/Form/FormConfigBuilder.php
+@@ -537,5 +537,5 @@ class FormConfigBuilder implements FormConfigBuilderInterface
+      * @return $this
+      */
+-    public function setFormFactory(FormFactoryInterface $formFactory)
++    public function setFormFactory(FormFactoryInterface $formFactory): static
+     {
+         if ($this->locked) {
+diff --git a/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
+index 09b9149801..6b22b9f9e8 100644
+--- a/src/Symfony/Component/Form/FormConfigBuilderInterface.php
++++ b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
+@@ -209,5 +209,5 @@ interface FormConfigBuilderInterface extends FormConfigInterface
+      * @return $this
+      */
+-    public function setFormFactory(FormFactoryInterface $formFactory);
++    public function setFormFactory(FormFactoryInterface $formFactory): static;
+ 
+     /**
 diff --git a/src/Symfony/Component/Form/FormRendererEngineInterface.php b/src/Symfony/Component/Form/FormRendererEngineInterface.php
 index aa249270a0..3c9d04ff9a 100644
 --- a/src/Symfony/Component/Form/FormRendererEngineInterface.php
@@ -542,6 +1212,46 @@ index 2b9066a511..1c9e9f5a26 100644
 -    public function getParent();
 +    public function getParent(): ?string;
  }
+diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
+index 38c544b4b1..9945f480d2 100644
+--- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
++++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
+@@ -558,5 +558,5 @@ trait HttpClientTrait
+      * @return string
+      */
+-    private static function removeDotSegments(string $path)
++    private static function removeDotSegments(string $path): string
+     {
+         $result = '';
+diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
+index b7be1b3827..c5f6098eea 100644
+--- a/src/Symfony/Component/HttpFoundation/HeaderBag.php
++++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php
+@@ -258,5 +258,5 @@ class HeaderBag implements \IteratorAggregate, \Countable
+      * @return string
+      */
+-    protected function getCacheControlHeader()
++    protected function getCacheControlHeader(): string
+     {
+         ksort($this->cacheControl);
+diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
+index 203a8b278d..e26bb42b22 100644
+--- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
++++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
+@@ -59,5 +59,5 @@ class ResponseHeaderBag extends HeaderBag
+      * @return array
+      */
+-    public function allPreserveCaseWithoutCookies()
++    public function allPreserveCaseWithoutCookies(): array
+     {
+         $headers = $this->allPreserveCase();
+@@ -231,5 +231,5 @@ class ResponseHeaderBag extends HeaderBag
+      * @return string
+      */
+-    public function makeDisposition(string $disposition, string $filename, string $filenameFallback = '')
++    public function makeDisposition(string $disposition, string $filename, string $filenameFallback = ''): string
+     {
+         return HeaderUtils::makeDisposition($disposition, $filename, $filenameFallback);
 diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php
 index 1f1740b7e2..22dc8ea26a 100644
 --- a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php
@@ -583,8 +1293,118 @@ index 1cb865fd66..f6f4efe7a7 100644
 -    public function getName();
 +    public function getName(): string;
  }
+diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+index fa62bc7de4..ca8f57ac2f 100644
+--- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
++++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+@@ -199,5 +199,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
+      * @return ParameterBag
+      */
+-    public function getRequestRequest()
++    public function getRequestRequest(): ParameterBag
+     {
+         return new ParameterBag($this->data['request_request']->getValue());
+@@ -207,5 +207,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
+      * @return ParameterBag
+      */
+-    public function getRequestQuery()
++    public function getRequestQuery(): ParameterBag
+     {
+         return new ParameterBag($this->data['request_query']->getValue());
+@@ -215,5 +215,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
+      * @return ParameterBag
+      */
+-    public function getRequestFiles()
++    public function getRequestFiles(): ParameterBag
+     {
+         return new ParameterBag($this->data['request_files']->getValue());
+@@ -223,5 +223,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
+      * @return ParameterBag
+      */
+-    public function getRequestHeaders()
++    public function getRequestHeaders(): ParameterBag
+     {
+         return new ParameterBag($this->data['request_headers']->getValue());
+@@ -231,5 +231,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
+      * @return ParameterBag
+      */
+-    public function getRequestServer(bool $raw = false)
++    public function getRequestServer(bool $raw = false): ParameterBag
+     {
+         return new ParameterBag($this->data['request_server']->getValue($raw));
+@@ -239,5 +239,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
+      * @return ParameterBag
+      */
+-    public function getRequestCookies(bool $raw = false)
++    public function getRequestCookies(bool $raw = false): ParameterBag
+     {
+         return new ParameterBag($this->data['request_cookies']->getValue($raw));
+@@ -247,5 +247,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
+      * @return ParameterBag
+      */
+-    public function getRequestAttributes()
++    public function getRequestAttributes(): ParameterBag
+     {
+         return new ParameterBag($this->data['request_attributes']->getValue());
+@@ -255,5 +255,5 @@ class RequestDataColl
F438
ector extends DataCollector implements EventSubscriberInter
+      * @return ParameterBag
+      */
+-    public function getResponseHeaders()
++    public function getResponseHeaders(): ParameterBag
+     {
+         return new ParameterBag($this->data['response_headers']->getValue());
+@@ -263,5 +263,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
+      * @return ParameterBag
+      */
+-    public function getResponseCookies()
++    public function getResponseCookies(): ParameterBag
+     {
+         return new ParameterBag($this->data['response_cookies']->getValue());
+@@ -301,5 +301,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
+      * @return bool
+      */
+-    public function isJsonRequest()
++    public function isJsonRequest(): bool
+     {
+         return 1 === preg_match('{^application/(?:\w+\++)*json$}i', $this->data['request_headers']['content-type']);
+@@ -309,5 +309,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
+      * @return string|null
+      */
+-    public function getPrettyJson()
++    public function getPrettyJson(): ?string
+     {
+         $decoded = json_decode($this->getContent());
+@@ -344,5 +344,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
+      * @return ParameterBag
+      */
+-    public function getDotenvVars()
++    public function getDotenvVars(): ParameterBag
+     {
+         return new ParameterBag($this->data['dotenv_vars']->getValue());
+diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
+index d894b7e74c..f0d6d32f0a 100644
+--- a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
++++ b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
+@@ -63,5 +63,5 @@ class RouterDataCollector extends DataCollector
+      * @return string
+      */
+-    protected function guessRoute(Request $request, string|object|array $controller)
++    protected function guessRoute(Request $request, string|object|array $controller): string
+     {
+         return 'n/a';
+diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
+index 3650d1700d..055b57fc77 100644
+--- a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
++++ b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
+@@ -107,5 +107,5 @@ class InlineFragmentRenderer extends RoutableFragmentRenderer
+      * @return Request
+      */
+-    protected function createSubRequest(string $uri, Request $request)
++    protected function createSubRequest(string $uri, Request $request): Request
+     {
+         $cookies = $request->cookies->all();
 diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
-index bf2d6efb63..ae9c354971 100644
+index f77a99e0ff..a6829efa75 100644
 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
 +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
 @@ -457,5 +457,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
@@ -594,8 +1414,19 @@ index bf2d6efb63..ae9c354971 100644
 +    protected function forward(Request $request, bool $catch = false, Response $entry = null): Response
      {
          $this->surrogate?->addSurrogateCapability($request);
+diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
+index facd20b942..c7a3fefc59 100644
+--- a/src/Symfony/Component/HttpKernel/HttpCache/Store.php
++++ b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
+@@ -417,5 +417,5 @@ class Store implements StoreInterface
+      * @return string
+      */
+-    public function getPath(string $key)
++    public function getPath(string $key): string
+     {
+         return $this->root.\DIRECTORY_SEPARATOR.substr($key, 0, 2).\DIRECTORY_SEPARATOR.substr($key, 2, 2).\DIRECTORY_SEPARATOR.substr($key, 4, 2).\DIRECTORY_SEPARATOR.substr($key, 6);
 diff --git a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
-index 0938617169..f4b9c76218 100644
+index 3077ed0398..8b971d9196 100644
 --- a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
 +++ b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
 @@ -59,5 +59,5 @@ class HttpKernelBrowser extends AbstractBrowser
@@ -612,6 +1443,13 @@ index 0938617169..f4b9c76218 100644
 +    protected function getScript(object $request): string
      {
          $kernel = var_export(serialize($this->kernel), true);
+@@ -114,5 +114,5 @@ EOF;
+      * @return string
+      */
+-    protected function getHandleScript()
++    protected function getHandleScript(): string
+     {
+         return <<<'EOF'
 diff --git a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
 index 84452ae71f..f70165d25f 100644
 --- a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
@@ -630,6 +1468,115 @@ index 84452ae71f..f70165d25f 100644
 +    public function countErrors(Request $request = null): int;
  
      /**
+diff --git a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
+index 3add13d5e9..12880be7b0 100644
+--- a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
++++ b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
+@@ -246,5 +246,5 @@ class FileProfilerStorage implements ProfilerStorageInterface
+      * @return Profile
+      */
+-    protected function createProfileFromData(string $token, array $data, Profile $parent = null)
++    protected function createProfileFromData(string $token, array $data, Profile $parent = null): Profile
+     {
+         $profile = new Profile($token);
+diff --git a/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php b/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
+index 9b356b10b2..68942b21dc 100644
+--- a/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
++++ b/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
+@@ -31,5 +31,5 @@ interface EntryManagerInterface
+      * @throws LdapException
+      */
+-    public function add(Entry $entry);
++    public function add(Entry $entry): static;
+ 
+     /**
+@@ -41,5 +41,5 @@ interface EntryManagerInterface
+      * @throws LdapException
+      */
+-    public function update(Entry $entry);
++    public function update(Entry $entry): static;
+ 
+     /**
+@@ -51,5 +51,5 @@ interface EntryManagerInterface
+      * @throws LdapException
+      */
+-    public function move(Entry $entry, string $newParent);
++    public function move(Entry $entry, string $newParent): static;
+ 
+     /**
+@@ -61,5 +61,5 @@ interface EntryManagerInterface
+      * @throws LdapException
+      */
+-    public function rename(Entry $entry, string $newRdn, bool $removeOldRdn = true);
++    public function rename(Entry $entry, string $newRdn, bool $removeOldRdn = true): static;
+ 
+     /**
+@@ -71,4 +71,4 @@ interface EntryManagerInterface
+      * @throws LdapException
+      */
+-    public function remove(Entry $entry);
++    public function remove(Entry $entry): static;
+ }
+diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
+index e919a1152a..7fa97f3be1 100644
+--- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
++++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
+@@ -35,5 +35,5 @@ class EntryManager implements EntryManagerInterface
+      * @return $this
+      */
+-    public function add(Entry $entry)
++    public function add(Entry $entry): static
+     {
+         $con = $this->getConnectionResource();
+@@ -49,5 +49,5 @@ class EntryManager implements EntryManagerInterface
+      * @return $this
+      */
+-    public function update(Entry $entry)
++    public function update(Entry $entry): static
+     {
+         $con = $this->getConnectionResource();
+@@ -63,5 +63,5 @@ class EntryManager implements EntryManagerInterface
+      * @return $this
+      */
+-    public function remove(Entry $entry)
++    public function remove(Entry $entry): static
+     {
+         $con = $this->getConnectionResource();
+@@ -82,5 +82,5 @@ class EntryManager implements EntryManagerInterface
+      * @throws LdapException
+      */
+-    public function addAttributeValues(Entry $entry, string $attribute, array $values)
++    public function addAttributeValues(Entry $entry, string $attribute, array $values): static
+     {
+         $con = $this->getConnectionResource();
+@@ -101,5 +101,5 @@ class EntryManager implements EntryManagerInterface
+      * @throws LdapException
+      */
+-    public function removeAttributeValues(Entry $entry, string $attribute, array $values)
++    public function removeAttributeValues(Entry $entry, string $attribute, array $values): static
+     {
+         $con = $this->getConnectionResource();
+@@ -112,5 +112,5 @@ class EntryManager implements EntryManagerInterface
+     }
+ 
+-    public function rename(Entry $entry, string $newRdn, bool $removeOldRdn = true)
++    public function rename(Entry $entry, string $newRdn, bool $removeOldRdn = true): static
+     {
+         $con = $this->getConnectionResource();
+@@ -131,5 +131,5 @@ class EntryManager implements EntryManagerInterface
+      * @throws LdapException     if an error is thrown during the rename operation
+      */
+-    public function move(Entry $entry, string $newParent)
++    public function move(Entry $entry, string $newParent): static
+     {
+         $con = $this->getConnectionResource();
+@@ -165,5 +165,5 @@ class EntryManager implements EntryManagerInterface
+      * @throws UpdateOperationException in case of an error
+      */
+-    public function applyOperations(string $dn, iterable $operations)
++    public function applyOperations(string $dn, iterable $operations): static
+     {
+         $operationsMapped = [];
 diff --git a/src/Symfony/Component/Lock/LockFactory.php b/src/Symfony/Component/Lock/LockFactory.php
 index 125b6eae50..ac327e8981 100644
 --- a/src/Symfony/Component/Lock/LockFactory.php
@@ -648,6 +1595,17 @@ index 125b6eae50..ac327e8981 100644
 +    public function createLockFromKey(Key $key, ?float $ttl = 300.0, bool $autoRelease = true): SharedLockInterface
      {
          $lock = new Lock($key, $this->store, $ttl, $autoRelease);
+diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php
+index c9b0fbde05..f9b08d008b 100644
+--- a/src/Symfony/Component/Lock/Store/MemcachedStore.php
++++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php
+@@ -34,5 +34,5 @@ class MemcachedStore implements PersistingStoreInterface
+      * @return bool
+      */
+-    public static function isSupported()
++    public static function isSupported(): bool
+     {
+         return \extension_loaded('memcached');
 diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php
 index c8ba7f9c73..f36408603d 100644
 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php
@@ -659,10 +1617,32 @@ index c8ba7f9c73..f36408603d 100644
 +    private function getReceiver(): MessageCountAwareInterface&ReceiverInterface
      {
          return $this->receiver ??= new AmazonSqsReceiver($this->connection, $this->serializer);
-diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
-index e22265f1dc..af4856ca05 100644
---- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
-+++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+diff --git a/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php b/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
+index 0e91372f62..20a62a7e74 100644
+--- a/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
++++ b/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
+@@ -33,5 +33,5 @@ class ValidationFailedException extends RuntimeException
+      * @return object
+      */
+-    public function getViolatingMessage()
++    public function getViolatingMessage(): object
+     {
+         return $this->violatingMessage;
+diff --git a/src/Symfony/Component/Messenger/Stamp/HandlerArgumentsStamp.php b/src/Symfony/Component/Messenger/Stamp/HandlerArgumentsStamp.php
+index 3dcdacf88f..f12f6c9437 100644
+--- a/src/Symfony/Component/Messenger/Stamp/HandlerArgumentsStamp.php
++++ b/src/Symfony/Component/Messenger/Stamp/HandlerArgumentsStamp.php
+@@ -25,5 +25,5 @@ final class HandlerArgumentsStamp implements NonSendableStampInterface
+      * @return array
+      */
+-    public function getAdditionalArguments()
++    public function getAdditionalArguments(): array
+     {
+         return $this->additionalArguments;
+diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+index b429812176..21aec2b9e8 100644
+--- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
++++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
 @@ -486,5 +486,5 @@ class OptionsResolver implements Options
       * @throws AccessException           If called from a lazy option or normalizer
       */
@@ -698,6 +1678,35 @@ index e22265f1dc..af4856ca05 100644
 +    public function addAllowedTypes(string $option, string|array $allowedTypes): static
      {
          if ($this->locked) {
+diff --git a/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php b/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
+index 27ce7fd430..708e611502 100644
+--- a/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
++++ b/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
+@@ -47,5 +47,5 @@ class ProcessTimedOutException extends RuntimeException
+      * @return bool
+      */
+-    public function isGeneralTimeout()
++    public function isGeneralTimeout(): bool
+     {
+         return self::TYPE_GENERAL === $this->timeoutType;
+@@ -55,5 +55,5 @@ class ProcessTimedOutException extends RuntimeException
+      * @return bool
+      */
+-    public function isIdleTimeout()
++    public function isIdleTimeout(): bool
+     {
+         return self::TYPE_IDLE === $this->timeoutType;
+diff --git a/src/Symfony/Component/Process/InputStream.php b/src/Symfony/Component/Process/InputStream.php
+index d703660868..c3e41ca00c 100644
+--- a/src/Symfony/Component/Process/InputStream.php
++++ b/src/Symfony/Component/Process/InputStream.php
+@@ -66,5 +66,5 @@ class InputStream implements \IteratorAggregate
+      * @return bool
+      */
+-    public function isClosed()
++    public function isClosed(): bool
+     {
+         return !$this->open;
 diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php b/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php
 index 11f6ed405b..53e7b33451 100644
 --- a/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php
@@ -780,8 +1789,75 @@ index 6da0bcb4c8..16e9765b1d 100644
 -    public function getTypes(string $class, string $property, array $context = []);
 +    public function getTypes(string $class, string $property, array $context = []): ?array;
  }
+diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
+index 974215a097..1516d9df79 100644
+--- a/src/Symfony/Component/Routing/Annotation/Route.php
++++ b/src/Symfony/Component/Routing/Annotation/Route.php
+@@ -85,5 +85,5 @@ class Route
+      * @return string|null
+      */
+-    public function getPath()
++    public function getPath(): ?string
+     {
+         return $this->path;
+@@ -108,5 +108,5 @@ class Route
+      * @return string|null
+      */
+-    public function getHost()
++    public function getHost(): ?string
+     {
+         return $this->host;
+@@ -121,5 +121,5 @@ class Route
+      * @return string|null
+      */
+-    public function getName()
++    public function getName(): ?string
+     {
+         return $this->name;
+@@ -134,5 +134,5 @@ class Route
+      * @return array
+      */
+-    public function getRequirements()
++    public function getRequirements(): array
+     {
+         return $this->requirements;
+@@ -147,5 +147,5 @@ class Route
+      * @return array
+      */
+-    public function getOptions()
++    public function getOptions(): array
+     {
+         return $this->options;
+@@ -160,5 +160,5 @@ class Route
+      * @return array
+      */
+-    public function getDefaults()
++    public function getDefaults(): array
+     {
+         return $this->defaults;
+@@ -173,5 +173,5 @@ class Route
+      * @return array
+      */
+-    public function getSchemes()
++    public function getSchemes(): array
+     {
+         return $this->schemes;
+@@ -186,5 +186,5 @@ class Route
+      * @return array
+      */
+-    public function getMethods()
++    public function getMethods(): array
+     {
+         return $this->methods;
+@@ -199,5 +199,5 @@ class Route
+      * @return string|null
+      */
+-    public function getCondition()
++    public function getCondition(): ?string
+     {
+         return $this->condition;
 diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
-index b63dc5c85e..e53bb49369 100644
+index f390b2066c..6808e48778 100644
 --- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
 +++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
 @@ -244,5 +244,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
@@ -791,6 +1867,31 @@ index b63dc5c85e..e53bb49369 100644
 +    protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method): string
      {
          $name = str_replace('\\', '_', $class->name).'_'.$method->name;
+@@ -259,5 +259,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+      * @return array
+      */
+-    protected function getGlobals(\ReflectionClass $class)
++    protected function getGlobals(\ReflectionClass $class): array
+     {
+         $globals = $this->resetGlobals();
+@@ -344,5 +344,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+      * @return Route
+      */
+-    protected function createRoute(string $path, array $defaults, array $requirements, array $options, ?string $host, array $schemes, array $methods, ?string $condition)
++    protected function createRoute(string $path, array $defaults, array $requirements, array $options, ?string $host, array $schemes, array $methods, ?string $condition): Route
+     {
+         return new Route($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
+diff --git a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
+index b682040b5a..b054cb2daf 100644
+--- a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
++++ b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
+@@ -33,5 +33,5 @@ class TraceableUrlMatcher extends UrlMatcher
+      * @return array
+      */
+-    public function getTraces(string $pathinfo)
++    public function getTraces(string $pathinfo): array
+     {
+         $this->traces = [];
 diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
 index f7f2454062..73fbc8eb54 100644
 --- a/src/Symfony/Component/Routing/Router.php
@@ -823,6 +1924,28 @@ index 9b32fdce31..fbbd65d8b7 100644
 +    public function loadTokenBySeries(string $series): PersistentTokenInterface;
  
      /**
+diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php
+index c8db1485e0..34bf5a5763 100644
+--- a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php
++++ b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php
+@@ -35,5 +35,5 @@ class RoleHierarchyVoter extends RoleVoter
+      * @return array
+      */
+-    protected function extractRoles(TokenInterface $token)
++    protected function extractRoles(TokenInterface $token): array
+     {
+         return $this->roleHierarchy->getReachableRoleNames($token->getRoleNames());
+diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php
+index 70dddcfff9..15ac44eae8 100644
+--- a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php
++++ b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php
+@@ -62,5 +62,5 @@ class RoleVoter implements CacheableVoterInterface
+      * @return array
+      */
+-    protected function extractRoles(TokenInterface $token)
++    protected function extractRoles(TokenInterface $token): array
+     {
+         return $token->getRoleNames();
 diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php b/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php
 index ba52c8ea65..e879a84982 100644
 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php
@@ -833,11 +1956,22 @@ index ba52c8ea65..e879a84982 100644
 -    public function vote(TokenInterface $token, mixed $subject, array $attributes);
 +    public function vote(TokenInterface $token, mixed $subject, array $attributes): int;
  }
+diff --git a/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php b/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php
+index 054dd95728..e6704119b2 100644
+--- a/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php
++++ b/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php
+@@ -32,5 +32,5 @@ class AuthenticationEvent extends Event
+      * @return TokenInterface
+      */
+-    public function getAuthenticationToken()
++    public function getAuthenticationToken(): TokenInterface
+     {
+         return $this->authenticationToken;
 diff --git a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
-index 298bc78cd9..3ef4176dd8 100644
+index 69ac3d6ec4..d96c7d038d 100644
 --- a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
 +++ b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
-@@ -89,5 +89,5 @@ class AuthenticationException extends RuntimeException
+@@ -91,5 +91,5 @@ class AuthenticationException extends RuntimeException
       * @return string
       */
 -    public function getMessageKey()
@@ -893,6 +2027,17 @@ index 480ea8ad6b..fa43d6a6e9 100644
 -    public function getListeners(Request $request);
 +    public function getListeners(Request $request): array;
  }
+diff --git a/src/Symfony/Component/Serializer/Annotation/MaxDepth.php b/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
+index 43785b292a..df3453cedb 100644
+--- a/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
++++ b/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
+@@ -36,5 +36,5 @@ class MaxDepth
+      * @return int
+      */
+-    public function getMaxDepth()
++    public function getMaxDepth(): int
+     {
+         return $this->maxDepth;
 diff --git a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php
 index 84a84ad1f3..6f66b6d32a 100644
 --- a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php
@@ -911,7 +2056,7 @@ index 84a84ad1f3..6f66b6d32a 100644
 +    public function supportsDecoding(string $format): bool;
  }
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
-index 12c778cb80..4ad55fb3e1 100644
+index 829e178407..1ac8101771 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 @@ -210,5 +210,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
@@ -936,7 +2081,7 @@ index 12c778cb80..4ad55fb3e1 100644
      {
          if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
-index 7c4c5fb41b..840dd2bcdb 100644
+index e64cfc8802..112b74b07a 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 @@ -139,10 +139,10 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
@@ -1046,6 +2191,17 @@ index 4c088b94f9..86107a636d 100644
 -    abstract protected function extractFromDirectory(string|array $resource);
 +    abstract protected function extractFromDirectory(string|array $resource): iterable;
  }
+diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
+index 54977283cc..ddcf594055 100644
+--- a/src/Symfony/Component/Translation/Translator.php
++++ b/src/Symfony/Component/Translation/Translator.php
+@@ -370,5 +370,5 @@ EOF
+      * @return array
+      */
+-    protected function computeFallbackLocales(string $locale)
++    protected function computeFallbackLocales(string $locale): array
+     {
+         $this->parentLocales ??= json_decode(file_get_contents(__DIR__.'/Resources/data/parents.json'), true);
 diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php
 index ee1d68c78f..9baaabb04c 100644
 --- a/src/Symfony/Component/Validator/Constraint.php
@@ -1078,19 +2234,864 @@ index ee1d68c78f..9baaabb04c 100644
 +    public function getTargets(): string|array
      {
          return self::PROPERTY_CONSTRAINT;
+diff --git a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
+index da14aed66b..38a010dfcd 100644
+--- a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
+@@ -96,5 +96,5 @@ class IsbnValidator extends ConstraintValidator
+      * @return string|bool
+      */
+-    protected function validateIsbn10(string $isbn)
++    protected function validateIsbn10(string $isbn): string|bool
+     {
+         // Choose an algorithm so that ERROR_INVALID_CHARACTERS is preferred
+@@ -139,5 +139,5 @@ class IsbnValidator extends ConstraintValidator
+      * @return string|bool
+      */
+-    protected function validateIsbn13(string $isbn)
++    protected function validateIsbn13(string $isbn): string|bool
+     {
+         // Error priority:
+diff --git a/src/Symfony/Component/Validator/Exception/InvalidOptionsException.php b/src/Symfony/Component/Validator/Exception/InvalidOptionsException.php
+index 8a4fba25d0..6165250ee3 100644
+--- a/src/Symfony/Component/Validator/Exception/InvalidOptionsException.php
++++ b/src/Symfony/Component/Validator/Exception/InvalidOptionsException.php
+@@ -26,5 +26,5 @@ class InvalidOptionsException extends ValidatorException
+      * @return array
+      */
+-    public function getOptions()
++    public function getOptions(): array
+     {
+         return $this->options;
+diff --git a/src/Symfony/Component/Validator/Exception/MissingOptionsException.php b/src/Symfony/Component/Validator/Exception/MissingOptionsException.php
+index a7eda1457d..28630f205f 100644
+--- a/src/Symfony/Component/Validator/Exception/MissingOptionsException.php
++++ b/src/Symfony/Component/Validator/Exception/MissingOptionsException.php
+@@ -26,5 +26,5 @@ class MissingOptionsException extends ValidatorException
+      * @return array
+      */
+-    public function getOptions()
++    public function getOptions(): array
+     {
+         return $this->options;
+diff --git a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
+index 1749dd78d2..250b46bdd3 100644
+--- a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
++++ b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
+@@ -97,5 +97,5 @@ abstract class MemberMetadata extends GenericMetadata implements PropertyMetadat
+      * @return string
+      */
+-    public function getClassName()
++    public function getClassName(): string
+     {
+         return $this->class;
 diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
-index d9bb9bd390..b981038042 100644
+index edac8395df..f3998dc4dd 100644
 --- a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
 +++ b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
-@@ -301,5 +301,5 @@ abstract class ConstraintValidatorTestCase extends TestCase
+@@ -295,5 +295,5 @@ abstract class ConstraintValidatorTestCase extends TestCase
       * @psalm-return T
       */
 -    abstract protected function createValidator();
 +    abstract protected function createValidator(): ConstraintValidatorInterface;
  }
  
+diff --git a/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php b/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
+index 22026f46a7..52b1ef696b 100644
+--- a/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
+@@ -50,5 +50,5 @@ class AmqpCaster
+      * @return array
+      */
+-    public static function castConnection(\AMQPConnection $c, array $a, Stub $stub, bool $isNested)
++    public static function castConnection(\AMQPConnection $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -86,5 +86,5 @@ class AmqpCaster
+      * @return array
+      */
+-    public static function castChannel(\AMQPChannel $c, array $a, Stub $stub, bool $isNested)
++    public static function castChannel(\AMQPChannel $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -112,5 +112,5 @@ class AmqpCaster
+      * @return array
+      */
+-    public static function castQueue(\AMQPQueue $c, array $a, Stub $stub, bool $isNested)
++    public static function castQueue(\AMQPQueue $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -138,5 +138,5 @@ class AmqpCaster
+      * @return array
+      */
+-    public static function castExchange(\AMQPExchange $c, array $a, Stub $stub, bool $isNested)
++    public static function castExchange(\AMQPExchange $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -169,5 +169,5 @@ class AmqpCaster
+      * @return array
+      */
+-    public static function castEnvelope(\AMQPEnvelope $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
++    public static function castEnvelope(\AMQPEnvelope $c, array $a, Stub $stub, bool $isNested, int $filter = 0): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+diff --git a/src/Symfony/Component/VarDumper/Caster/DOMCaster.php b/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
+index d2d3fc1294..c28829f4e2 100644
+--- a/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
+@@ -67,5 +67,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castException(\DOMException $e, array $a, Stub $stub, bool $isNested)
++    public static function castException(\DOMException $e, array $a, Stub $stub, bool $isNested): array
+     {
+         $k = Caster::PREFIX_PROTECTED.'code';
+@@ -80,5 +80,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castLength($dom, array $a, Stub $stub, bool $isNested)
++    public static function castLength($dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -92,5 +92,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castImplementation(\DOMImplementation $dom, array $a, Stub $stub, bool $isNested)
++    public static function castImplementation(\DOMImplementation $dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -105,5 +105,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castNode(\DOMNode $dom, array $a, Stub $stub, bool $isNested)
++    public static function castNode(\DOMNode $dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -132,5 +132,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castNameSpaceNode(\DOMNameSpaceNode $dom, array $a, Stub $stub, bool $isNested)
++    public static function castNameSpaceNode(\DOMNameSpaceNode $dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -151,5 +151,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, bool $isNested, int $filter = 0)
++    public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, bool $isNested, int $filter = 0): array
+     {
+         $a += [
+@@ -188,5 +188,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castCharacterData(\DOMCharacterData $dom, array $a, Stub $stub, bool $isNested)
++    public static function castCharacterData(\DOMCharacterData $dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -201,5 +201,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castAttr(\DOMAttr $dom, array $a, Stub $stub, bool $isNested)
++    public static function castAttr(\DOMAttr $dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -217,5 +217,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castElement(\DOMElement $dom, array $a, Stub $stub, bool $isNested)
++    public static function castElement(\DOMElement $dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -230,5 +230,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castText(\DOMText $dom, array $a, Stub $stub, bool $isNested)
++    public static function castText(\DOMText $dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -242,5 +242,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castDocumentType(\DOMDocumentType $dom, array $a, Stub $stub, bool $isNested)
++    public static function castDocumentType(\DOMDocumentType $dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -259,5 +259,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castNotation(\DOMNotation $dom, array $a, Stub $stub, bool $isNested)
++    public static function castNotation(\DOMNotation $dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -272,5 +272,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castEntity(\DOMEntity $dom, array $a, Stub $stub, bool $isNested)
++    public static function castEntity(\DOMEntity $dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -289,5 +289,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castProcessingInstruction(\DOMProcessingInstruction $dom, array $a, Stub $stub, bool $isNested)
++    public static function castProcessingInstruction(\DOMProcessingInstruction $dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -302,5 +302,5 @@ class DOMCaster
+      * @return array
+      */
+-    public static function castXPath(\DOMXPath $dom, array $a, Stub $stub, bool $isNested)
++    public static function castXPath(\DOMXPath $dom, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+diff --git a/src/Symfony/Component/VarDumper/Caster/DateCaster.php b/src/Symfony/Component/VarDumper/Caster/DateCaster.php
+index 1394a78132..ee8471c88f 100644
+--- a/src/Symfony/Component/VarDumper/Caster/DateCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/DateCaster.php
+@@ -28,5 +28,5 @@ class DateCaster
+      * @return array
+      */
+-    public static function castDateTime(\DateTimeInterface $d, array $a, Stub $stub, bool $isNested, int $filter)
++    public static function castDateTime(\DateTimeInterface $d, array $a, Stub $stub, bool $isNested, int $filter): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -54,5 +54,5 @@ class DateCaster
+      * @return array
+      */
+-    public static function castInterval(\DateInterval $interval, array $a, Stub $stub, bool $isNested, int $filter)
++    public static function castInterval(\DateInterval $interval, array $a, Stub $stub, bool $isNested, int $filter): array
+     {
+         $now = new \DateTimeImmutable('@0', new \DateTimeZone('UTC'));
+@@ -86,5 +86,5 @@ class DateCaster
+      * @return array
+      */
+-    public static function castTimeZone(\DateTimeZone $timeZone, array $a, Stub $stub, bool $isNested, int $filter)
++    public static function castTimeZone(\DateTimeZone $timeZone, array $a, Stub $stub, bool $isNested, int $filter): array
+     {
+         $location = $timeZone->getLocation();
+@@ -100,5 +100,5 @@ class DateCaster
+      * @return array
+      */
+-    public static function castPeriod(\DatePeriod $p, array $a, Stub $stub, bool $isNested, int $filter)
++    public static function castPeriod(\DatePeriod $p, array $a, Stub $stub, bool $isNested, int $filter): array
+     {
+         $dates = [];
+diff --git a/src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php b/src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php
+index 3120c3d919..0ac928f2ca 100644
+--- a/src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php
+@@ -29,5 +29,5 @@ class DoctrineCaster
+      * @return array
+      */
+-    public static function castCommonProxy(CommonProxy $proxy, array $a, Stub $stub, bool $isNested)
++    public static function castCommonProxy(CommonProxy $proxy, array $a, Stub $stub, bool $isNested): array
+     {
+         foreach (['__cloner__', '__initializer__'] as $k) {
+@@ -44,5 +44,5 @@ class DoctrineCaster
+      * @return array
+      */
+-    public static function castOrmProxy(OrmProxy $proxy, array $a, Stub $stub, bool $isNested)
++    public static function castOrmProxy(OrmProxy $proxy, array $a, Stub $stub, bool $isNested): array
+     {
+         foreach (['_entityPersister', '_identifier'] as $k) {
+@@ -59,5 +59,5 @@ class DoctrineCaster
+      * @return array
+      */
+-    public static function castPersistentCollection(PersistentCollection $coll, array $a, Stub $stub, bool $isNested)
++    public static function castPersistentCollection(PersistentCollection $coll, array $a, Stub $stub, bool $isNested): array
+     {
+         foreach (['snapshot', 'association', 'typeClass'] as $k) {
+diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
+index c58e74a50a..dfd381cccf 100644
+--- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
+@@ -50,5 +50,5 @@ class ExceptionCaster
+      * @return array
+      */
+-    public static function castError(\Error $e, array $a, Stub $stub, bool $isNested, int $filter = 0)
++    public static function castError(\Error $e, array $a, Stub $stub, bool $isNested, int $filter = 0): array
+     {
+         return self::filterExceptionArray($stub->class, $a, "\0Error\0", $filter);
+@@ -58,5 +58,5 @@ class ExceptionCaster
+      * @return array
+      */
+-    public static function castException(\Exception $e, array $a, Stub $stub, bool $isNested, int $filter = 0)
++    public static function castException(\Exception $e, array $a, Stub $stub, bool $isNested, int $filter = 0): array
+     {
+         return self::filterExceptionArray($stub->class, $a, "\0Exception\0", $filter);
+@@ -66,5 +66,5 @@ class ExceptionCaster
+      * @return array
+      */
+-    public static function castErrorException(\ErrorException $e, array $a, Stub $stub, bool $isNested)
++    public static function castErrorException(\ErrorException $e, array $a, Stub $stub, bool $isNested): array
+     {
+         if (isset($a[$s = Caster::PREFIX_PROTECTED.'severity'], self::$errorTypes[$a[$s]])) {
+@@ -78,5 +78,5 @@ class ExceptionCaster
+      * @return array
+      */
+-    public static function castThrowingCasterException(ThrowingCasterException $e, array $a, Stub $stub, bool $isNested)
++    public static function castThrowingCasterException(ThrowingCasterException $e, array $a, Stub $stub, bool $isNested): array
+     {
+         $trace = Caster::PREFIX_VIRTUAL.'trace';
+@@ -99,5 +99,5 @@ class ExceptionCaster
+      * @return array
+      */
+-    public static function castSilencedErrorContext(SilencedErrorContext $e, array $a, Stub $stub, bool $isNested)
++    public static function castSilencedErrorContext(SilencedErrorContext $e, array $a, Stub $stub, bool $isNested): array
+     {
+         $sPrefix = "\0".SilencedErrorContext::class."\0";
+@@ -129,5 +129,5 @@ class ExceptionCaster
+      * @return array
+      */
+-    public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, bool $isNested)
++    public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, bool $isNested): array
+     {
+         if (!$isNested) {
+@@ -206,5 +206,5 @@ class ExceptionCaster
+      * @return array
+      */
+-    public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, bool $isNested)
++    public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, bool $isNested): array
+     {
+         if (!$isNested) {
+diff --git a/src/Symfony/Component/VarDumper/Caster/FiberCaster.php b/src/Symfony/Component/VarDumper/Caster/FiberCaster.php
+index b797dbd634..ce8deb48d5 100644
+--- a/src/Symfony/Component/VarDumper/Caster/FiberCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/FiberCaster.php
+@@ -24,5 +24,5 @@ final class FiberCaster
+      * @return array
+      */
+-    public static function castFiber(\Fiber $fiber, array $a, Stub $stub, bool $isNested, int $filter = 0)
++    public static function castFiber(\Fiber $fiber, array $a, Stub $stub, bool $isNested, int $filter = 0): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+diff --git a/src/Symfony/Component/VarDumper/Caster/IntlCaster.php b/src/Symfony/Component/VarDumper/Caster/IntlCaster.php
+index a4590f4b5a..d2a22bfe38 100644
+--- a/src/Symfony/Component/VarDumper/Caster/IntlCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/IntlCaster.php
+@@ -25,5 +25,5 @@ class IntlCaster
+      * @return array
+      */
+-    public static function castMessageFormatter(\MessageFormatter $c, array $a, Stub $stub, bool $isNested)
++    public static function castMessageFormatter(\MessageFormatter $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -38,5 +38,5 @@ class IntlCaster
+      * @return array
+      */
+-    public static function castNumberFormatter(\NumberFormatter $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
++    public static function castNumberFormatter(\NumberFormatter $c, array $a, Stub $stub, bool $isNested, int $filter = 0): array
+     {
+         $a += [
+@@ -118,5 +118,5 @@ class IntlCaster
+      * @return array
+      */
+-    public static function castIntlTimeZone(\IntlTimeZone $c, array $a, Stub $stub, bool $isNested)
++    public static function castIntlTimeZone(\IntlTimeZone $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -138,5 +138,5 @@ class IntlCaster
+      * @return array
+      */
+-    public static function castIntlCalendar(\IntlCalendar $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
++    public static function castIntlCalendar(\IntlCalendar $c, array $a, Stub $stub, bool $isNested, int $filter = 0): array
+     {
+         $a += [
+@@ -158,5 +158,5 @@ class IntlCaster
+      * @return array
+      */
+-    public static function castIntlDateFormatter(\IntlDateFormatter $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
++    public static function castIntlDateFormatter(\IntlDateFormatter $c, array $a, Stub $stub, bool $isNested, int $filter = 0): array
+     {
+         $a += [
+diff --git a/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php b/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php
+index 2f161e8cb3..cc99a62e95 100644
+--- a/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php
+@@ -27,5 +27,5 @@ class MemcachedCaster
+      * @return array
+      */
+-    public static function castMemcached(\Memcached $c, array $a, Stub $stub, bool $isNested)
++    public static function castMemcached(\Memcached $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+diff --git a/src/Symfony/Component/VarDumper/Caster/PdoCaster.php b/src/Symfony/Component/VarDumper/Caster/PdoCaster.php
+index d68eae2166..fab45ad4d8 100644
+--- a/src/Symfony/Component/VarDumper/Caster/PdoCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/PdoCaster.php
+@@ -63,5 +63,5 @@ class PdoCaster
+      * @return array
+      */
+-    public static function castPdo(\PDO $c, array $a, Stub $stub, bool $isNested)
++    public static function castPdo(\PDO $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $attr = [];
+@@ -115,5 +115,5 @@ class PdoCaster
+      * @return array
+      */
+-    public static function castPdoStatement(\PDOStatement $c, array $a, Stub $stub, bool $isNested)
++    public static function castPdoStatement(\PDOStatement $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+diff --git a/src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php b/src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php
+index 0d8b3d919b..0e5627631d 100644
+--- a/src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php
+@@ -73,5 +73,5 @@ class PgSqlCaster
+      * @return array
+      */
+-    public static function castLargeObject($lo, array $a, Stub $stub, bool $isNested)
++    public static function castLargeObject($lo, array $a, Stub $stub, bool $isNested): array
+     {
+         $a['seek position'] = pg_lo_tell($lo);
+@@ -83,5 +83,5 @@ class PgSqlCaster
+      * @return array
+      */
+-    public static function castLink($link, array $a, Stub $stub, bool $isNested)
++    public static function castLink($link, array $a, Stub $stub, bool $isNested): array
+     {
+         $a['status'] = pg_connection_status($link);
+@@ -118,5 +118,5 @@ class PgSqlCaster
+      * @return array
+      */
+-    public static function castResult($result, array $a, Stub $stub, bool $isNested)
++    public static function castResult($result, array $a, Stub $stub, bool $isNested): array
+     {
+         $a['num rows'] = pg_num_rows($result);
+diff --git a/src/Symfony/Component/VarDumper/Caster/ProxyManagerCaster.php b/src/Symfony/Component/VarDumper/Caster/ProxyManagerCaster.php
+index eb6c88db6a..df608c2714 100644
+--- a/src/Symfony/Component/VarDumper/Caster/ProxyManagerCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/ProxyManagerCaster.php
+@@ -25,5 +25,5 @@ class ProxyManagerCaster
+      * @return array
+      */
+-    public static function castProxy(ProxyInterface $c, array $a, Stub $stub, bool $isNested)
++    public static function castProxy(ProxyInterface $c, array $a, Stub $stub, bool $isNested): array
+     {
+         if ($parent = get_parent_class($c)) {
+diff --git a/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php b/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php
+index 9e91592bd2..94cda7358f 100644
+--- a/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php
+@@ -55,5 +55,5 @@ class RdKafkaCaster
+      * @return array
+      */
+-    public static function castTopic(Topic $c, array $a, Stub $stub, bool $isNested)
++    public static function castTopic(Topic $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -69,5 +69,5 @@ class RdKafkaCaster
+      * @return array
+      */
+-    public static function castTopicPartition(TopicPartition $c, array $a)
++    public static function castTopicPartition(TopicPartition $c, array $a): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -85,5 +85,5 @@ class RdKafkaCaster
+      * @return array
+      */
+-    public static function castMessage(Message $c, array $a, Stub $stub, bool $isNested)
++    public static function castMessage(Message $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -99,5 +99,5 @@ class RdKafkaCaster
+      * @return array
+      */
+-    public static function castConf(Conf $c, array $a, Stub $stub, bool $isNested)
++    public static function castConf(Conf $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -113,5 +113,5 @@ class RdKafkaCaster
+      * @return array
+      */
+-    public static function castTopicConf(TopicConf $c, array $a, Stub $stub, bool $isNested)
++    public static function castTopicConf(TopicConf $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -140,5 +140,5 @@ class RdKafkaCaster
+      * @return array
+      */
+-    public static function castCollectionMetadata(CollectionMetadata $c, array $a, Stub $stub, bool $isNested)
++    public static function castCollectionMetadata(CollectionMetadata $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += iterator_to_array($c);
+@@ -150,5 +150,5 @@ class RdKafkaCaster
+      * @return array
+      */
+-    public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub, bool $isNested)
++    public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -165,5 +165,5 @@ class RdKafkaCaster
+      * @return array
+      */
+-    public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stub $stub, bool $isNested)
++    public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -181,5 +181,5 @@ class RdKafkaCaster
+      * @return array
+      */
+-    public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stub, bool $isNested)
++    public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -197,5 +197,5 @@ class RdKafkaCaster
+      * @return array
+      */
+-    private static function extractMetadata(KafkaConsumer|\RdKafka $c)
++    private static function extractMetadata(KafkaConsumer|\RdKafka $c): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+diff --git a/src/Symfony/Component/VarDumper/Caster/RedisCaster.php b/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
+index 6ff046754d..2b9382f1a7 100644
+--- a/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
+@@ -51,5 +51,5 @@ class RedisCaster
+      * @return array
+      */
+-    public static function castRedis(\Redis|Relay $c, array $a, Stub $stub, bool $isNested)
++    public static function castRedis(\Redis|Relay $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -80,5 +80,5 @@ class RedisCaster
+      * @return array
+      */
+-    public static function castRedisArray(\RedisArray $c, array $a, Stub $stub, bool $isNested)
++    public static function castRedisArray(\RedisArray $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -95,5 +95,5 @@ class RedisCaster
+      * @return array
+      */
+-    public static function castRedisCluster(\RedisCluster $c, array $a, Stub $stub, bool $isNested)
++    public static function castRedisCluster(\RedisCluster $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
+index 0569278cff..7314dc2825 100644
+--- a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
+@@ -39,5 +39,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castClosure(\Closure $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
++    public static function castClosure(\Closure $c, array $a, Stub $stub, bool $isNested, int $filter = 0): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -78,5 +78,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function unsetClosureFileInfo(\Closure $c, array $a)
++    public static function unsetClosureFileInfo(\Closure $c, array $a): array
+     {
+         unset($a[Caster::PREFIX_VIRTUAL.'file'], $a[Caster::PREFIX_VIRTUAL.'line']);
+@@ -102,5 +102,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castType(\ReflectionType $c, array $a, Stub $stub, bool $isNested)
++    public static function castType(\ReflectionType $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -127,5 +127,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castAttribute(\ReflectionAttribute $c, array $a, Stub $stub, bool $isNested)
++    public static function castAttribute(\ReflectionAttribute $c, array $a, Stub $stub, bool $isNested): array
+     {
+         self::addMap($a, $c, [
+@@ -140,5 +140,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castReflectionGenerator(\ReflectionGenerator $c, array $a, Stub $stub, bool $isNested)
++    public static function castReflectionGenerator(\ReflectionGenerator $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -178,5 +178,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castClass(\ReflectionClass $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
++    public static function castClass(\ReflectionClass $c, array $a, Stub $stub, bool $isNested, int $filter = 0): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -212,5 +212,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
++    public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, array $a, Stub $stub, bool $isNested, int $filter = 0): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -273,5 +273,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castClassConstant(\ReflectionClassConstant $c, array $a, Stub $stub, bool $isNested)
++    public static function castClassConstant(\ReflectionClassConstant $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $a[Caster::PREFIX_VIRTUAL.'modifiers'] = implode(' ', \Reflection::getModifierNames($c->getModifiers()));
+@@ -286,5 +286,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castMethod(\ReflectionMethod $c, array $a, Stub $stub, bool $isNested)
++    public static function castMethod(\ReflectionMethod $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $a[Caster::PREFIX_VIRTUAL.'modifiers'] = implode(' ', \Reflection::getModifierNames($c->getModifiers()));
+@@ -296,5 +296,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castParameter(\ReflectionParameter $c, array $a, Stub $stub, bool $isNested)
++    public static function castParameter(\ReflectionParameter $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -339,5 +339,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castProperty(\ReflectionProperty $c, array $a, Stub $stub, bool $isNested)
++    public static function castProperty(\ReflectionProperty $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $a[Caster::PREFIX_VIRTUAL.'modifiers'] = implode(' ', \Reflection::getModifierNames($c->getModifiers()));
+@@ -352,5 +352,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castReference(\ReflectionReference $c, array $a, Stub $stub, bool $isNested)
++    public static function castReference(\ReflectionReference $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $a[Caster::PREFIX_VIRTUAL.'id'] = $c->getId();
+@@ -362,5 +362,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castExtension(\ReflectionExtension $c, array $a, Stub $stub, bool $isNested)
++    public static function castExtension(\ReflectionExtension $c, array $a, Stub $stub, bool $isNested): array
+     {
+         self::addMap($a, $c, [
+@@ -381,5 +381,5 @@ class ReflectionCaster
+      * @return array
+      */
+-    public static function castZendExtension(\ReflectionZendExtension $c, array $a, Stub $stub, bool $isNested)
++    public static function castZendExtension(\ReflectionZendExtension $c, array $a, Stub $stub, bool $isNested): array
+     {
+         self::addMap($a, $c, [
+@@ -396,5 +396,5 @@ class ReflectionCaster
+      * @return string
+      */
+-    public static function getSignature(array $a)
++    public static function getSignature(array $a): string
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+diff --git a/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php b/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
+index f8c5344617..adf3cf07c2 100644
+--- a/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
+@@ -31,5 +31,5 @@ class ResourceCaster
+      * @return array
+      */
+-    public static function castDba($dba, array $a, Stub $stub, bool $isNested)
++    public static function castDba($dba, array $a, Stub $stub, bool $isNested): array
+     {
+         $list = dba_list();
+@@ -42,5 +42,5 @@ class ResourceCaster
+      * @return array
+      */
+-    public static function castProcess($process, array $a, Stub $stub, bool $isNested)
++    public static function castProcess($process, array $a, Stub $stub, bool $isNested): array
+     {
+         return proc_get_status($process);
+@@ -60,5 +60,5 @@ class ResourceCaster
+      * @return array
+      */
+-    public static function castStreamContext($stream, array $a, Stub $stub, bool $isNested)
++    public static function castStreamContext($stream, array $a, Stub $stub, bool $isNested): array
+     {
+         return @stream_context_get_params($stream) ?: $a;
+@@ -68,5 +68,5 @@ class ResourceCaster
+      * @return array
+      */
+-    public static function castGd($gd, array $a, Stub $stub, bool $isNested)
++    public static function castGd($gd, array $a, Stub $stub, bool $isNested): array
+     {
+         $a['size'] = imagesx($gd).'x'.imagesy($gd);
+@@ -79,5 +79,5 @@ class ResourceCaster
+      * @return array
+      */
+-    public static function castOpensslX509($h, array $a, Stub $stub, bool $isNested)
++    public static function castOpensslX509($h, array $a, Stub $stub, bool $isNested): array
+     {
+         $stub->cut = -1;
+diff --git a/src/Symfony/Component/VarDumper/Caster/SplCaster.php b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
+index ea86cb4988..9b84f08439 100644
+--- a/src/Symfony/Component/VarDumper/Caster/SplCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
+@@ -33,5 +33,5 @@ class SplCaster
+      * @return array
+      */
+-    public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, bool $isNested)
++    public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, bool $isNested): array
+     {
+         return self::castSplArray($c, $a, $stub, $isNested);
+@@ -41,5 +41,5 @@ class SplCaster
+      * @return array
+      */
+-    public static function castArrayIterator(\ArrayIterator $c, array $a, Stub $stub, bool $isNested)
++    public static function castArrayIterator(\ArrayIterator $c, array $a, Stub $stub, bool $isNested): array
+     {
+         return self::castSplArray($c, $a, $stub, $isNested);
+@@ -49,5 +49,5 @@ class SplCaster
+      * @return array
+      */
+-    public static function castHeap(\Iterator $c, array $a, Stub $stub, bool $isNested)
++    public static function castHeap(\Iterator $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $a += [
+@@ -61,5 +61,5 @@ class SplCaster
+      * @return array
+      */
+-    public static function castDoublyLinkedList(\SplDoublyLinkedList $c, array $a, Stub $stub, bool $isNested)
++    public static function castDoublyLinkedList(\SplDoublyLinkedList $c, array $a, Stub $stub, bo
10000
ol $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -79,5 +79,5 @@ class SplCaster
+      * @return array
+      */
+-    public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, bool $isNested)
++    public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, bool $isNested): array
+     {
+         static $map = [
+@@ -158,5 +158,5 @@ class SplCaster
+      * @return array
+      */
+-    public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, bool $isNested)
++    public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, bool $isNested): array
+     {
+         static $map = [
+@@ -198,5 +198,5 @@ class SplCaster
+      * @return array
+      */
+-    public static function castObjectStorage(\SplObjectStorage $c, array $a, Stub $stub, bool $isNested)
++    public static function castObjectStorage(\SplObjectStorage $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $storage = [];
+@@ -222,5 +222,5 @@ class SplCaster
+      * @return array
+      */
+-    public static function castOuterIterator(\OuterIterator $c, array $a, Stub $stub, bool $isNested)
++    public static function castOuterIterator(\OuterIterator $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $a[Caster::PREFIX_VIRTUAL.'innerIterator'] = $c->getInnerIterator();
+@@ -232,5 +232,5 @@ class SplCaster
+      * @return array
+      */
+-    public static function castWeakReference(\WeakReference $c, array $a, Stub $stub, bool $isNested)
++    public static function castWeakReference(\WeakReference $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $a[Caster::PREFIX_VIRTUAL.'object'] = $c->get();
+@@ -242,5 +242,5 @@ class SplCaster
+      * @return array
+      */
+-    public static function castWeakMap(\WeakMap $c, array $a, Stub $stub, bool $isNested)
++    public static function castWeakMap(\WeakMap $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $map = [];
+diff --git a/src/Symfony/Component/VarDumper/Caster/StubCaster.php b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
+index 3fef05696f..2ed2fd10cb 100644
+--- a/src/Symfony/Component/VarDumper/Caster/StubCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
+@@ -26,5 +26,5 @@ class StubCaster
+      * @return array
+      */
+-    public static function castStub(Stub $c, array $a, Stub $stub, bool $isNested)
++    public static function castStub(Stub $c, array $a, Stub $stub, bool $isNested): array
+     {
+         if ($isNested) {
+@@ -55,5 +55,5 @@ class StubCaster
+      * @return array
+      */
+-    public static function cutInternals($obj, array $a, Stub $stub, bool $isNested)
++    public static function cutInternals($obj, array $a, Stub $stub, bool $isNested): array
+     {
+         if ($isNested) {
+@@ -69,5 +69,5 @@ class StubCaster
+      * @return array
+      */
+-    public static function castEnum(EnumStub $c, array $a, Stub $stub, bool $isNested)
++    public static function castEnum(EnumStub $c, array $a, Stub $stub, bool $isNested): array
+     {
+         if ($isNested) {
+@@ -95,5 +95,5 @@ class StubCaster
+      * @return array
+      */
+-    public static function castScalar(ScalarStub $scalarStub, array $a, Stub $stub)
++    public static function castScalar(ScalarStub $scalarStub, array $a, Stub $stub): array
+     {
+         $stub->type = Stub::TYPE_SCALAR;
+diff --git a/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php b/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php
+index ebc00f90ec..f8ba45a7f0 100644
+--- a/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php
+@@ -35,5 +35,5 @@ class SymfonyCaster
+      * @return array
+      */
+-    public static function castRequest(Request $request, array $a, Stub $stub, bool $isNested)
++    public static function castRequest(Request $request, array $a, Stub $stub, bool $isNested): array
+     {
+         $clone = null;
+@@ -53,5 +53,5 @@ class SymfonyCaster
+      * @return array
+      */
+-    public static function castHttpClient($client, array $a, Stub $stub, bool $isNested)
++    public static function castHttpClient($client, array $a, Stub $stub, bool $isNested): array
+     {
+         $multiKey = sprintf("\0%s\0multi", $client::class);
+@@ -66,5 +66,5 @@ class SymfonyCaster
+      * @return array
+      */
+-    public static function castHttpClientResponse($response, array $a, Stub $stub, bool $isNested)
++    public static function castHttpClientResponse($response, array $a, Stub $stub, bool $isNested): array
+     {
+         $stub->cut += \count($a);
+@@ -81,5 +81,5 @@ class SymfonyCaster
+      * @return array
+      */
+-    public static function castLazyObjectState($state, array $a, Stub $stub, bool $isNested)
++    public static function castLazyObjectState($state, array $a, Stub $stub, bool $isNested): array
+     {
+         if (!$isNested) {
+@@ -109,5 +109,5 @@ class SymfonyCaster
+      * @return array
+      */
+-    public static function castUuid(Uuid $uuid, array $a, Stub $stub, bool $isNested)
++    public static function castUuid(Uuid $uuid, array $a, Stub $stub, bool $isNested): array
+     {
+         $a[Caster::PREFIX_VIRTUAL.'toBase58'] = $uuid->toBase58();
+@@ -125,5 +125,5 @@ class SymfonyCaster
+      * @return array
+      */
+-    public static function castUlid(Ulid $ulid, array $a, Stub $stub, bool $isNested)
++    public static function castUlid(Ulid $ulid, array $a, Stub $stub, bool $isNested): array
+     {
+         $a[Caster::PREFIX_VIRTUAL.'toBase58'] = $ulid->toBase58();
+diff --git a/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php b/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php
+index d802bbf2a1..cdf0cc7474 100644
+--- a/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php
+@@ -47,5 +47,5 @@ class XmlReaderCaster
+      * @return array
+      */
+-    public static function castXmlReader(\XMLReader $reader, array $a, Stub $stub, bool $isNested)
++    public static function castXmlReader(\XMLReader $reader, array $a, Stub $stub, bool $isNested): array
+     {
+         try {
+diff --git a/src/Symfony/Component/VarDumper/Caster/XmlResourceCaster.php b/src/Symfony/Component/VarDumper/Caster/XmlResourceCaster.php
+index 0cf42584a0..e2807c7001 100644
+--- a/src/Symfony/Component/VarDumper/Caster/XmlResourceCaster.php
++++ b/src/Symfony/Component/VarDumper/Caster/XmlResourceCaster.php
+@@ -51,5 +51,5 @@ class XmlResourceCaster
+      * @return array
+      */
+-    public static function castXml($h, array $a, Stub $stub, bool $isNested)
++    public static function castXml($h, array $a, Stub $stub, bool $isNested): array
+     {
+         $a['current_byte_index'] = xml_get_current_byte_index($h);
 diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
-index 57c229eb14..b9aa92fcb7 100644
+index ae12ec414a..971280f868 100644
 --- a/src/Symfony/Component/VarExporter/Internal/Exporter.php
 +++ b/src/Symfony/Component/VarExporter/Internal/Exporter.php
 @@ -36,5 +36,5 @@ class Exporter
@@ -1100,6 +3101,17 @@ index 57c229eb14..b9aa92fcb7 100644
 +    public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount, &$valuesAreStatic): array
      {
          $refs = $values;
+diff --git a/src/Symfony/Component/VarExporter/Internal/Hydrator.php b/src/Symfony/Component/VarExporter/Internal/Hydrator.php
+index f665f6ee15..429db33d19 100644
+--- a/src/Symfony/Component/VarExporter/Internal/Hydrator.php
++++ b/src/Symfony/Component/VarExporter/Internal/Hydrator.php
+@@ -258,5 +258,5 @@ class Hydrator
+      * @return array
+      */
+-    public static function getPropertyScopes($class)
++    public static function getPropertyScopes($class): array
+     {
+         $propertyScopes = [];
 diff --git a/src/Symfony/Component/Workflow/Event/Event.php b/src/Symfony/Component/Workflow/Event/Event.php
 index cd7fab7896..b340eba38e 100644
 --- a/src/Symfony/Component/Workflow/Event/Event.php
@@ -1132,3 +3144,61 @@ index cd7fab7896..b340eba38e 100644
 +    public function getWorkflowName(): string
      {
          return $this->workflow->getName();
+diff --git a/src/Symfony/Component/Workflow/EventListener/GuardExpression.php b/src/Symfony/Component/Workflow/EventListener/GuardExpression.php
+index 23e830cac4..2b119f2db8 100644
+--- a/src/Symfony/Component/Workflow/EventListener/GuardExpression.php
++++ b/src/Symfony/Component/Workflow/EventListener/GuardExpression.php
+@@ -28,5 +28,5 @@ class GuardExpression
+      * @return Transition
+      */
+-    public function getTransition()
++    public function getTransition(): Transition
+     {
+         return $this->transition;
+@@ -36,5 +36,5 @@ class GuardExpression
+      * @return string
+      */
+-    public function getExpression()
++    public function getExpression(): string
+     {
+         return $this->expression;
+diff --git a/src/Symfony/Component/Workflow/Exception/TransitionException.php b/src/Symfony/Component/Workflow/Exception/TransitionException.php
+index 890d8e244b..d074936253 100644
+--- a/src/Symfony/Component/Workflow/Exception/TransitionException.php
++++ b/src/Symfony/Component/Workflow/Exception/TransitionException.php
+@@ -38,5 +38,5 @@ class TransitionException extends LogicException
+      * @return object
+      */
+-    public function getSubject()
++    public function getSubject(): object
+     {
+         return $this->subject;
+diff --git a/src/Symfony/Component/Workflow/Marking.php b/src/Symfony/Component/Workflow/Marking.php
+index dba7c3dcfb..dce66ea6b9 100644
+--- a/src/Symfony/Component/Workflow/Marking.php
++++ b/src/Symfony/Component/Workflow/Marking.php
+@@ -45,5 +45,5 @@ class Marking
+      * @return bool
+      */
+-    public function has(string $place)
++    public function has(string $place): bool
+     {
+         return isset($this->places[$place]);
+@@ -53,5 +53,5 @@ class Marking
+      * @return array
+      */
+-    public function getPlaces()
++    public function getPlaces(): array
+     {
+         return $this->places;
+diff --git a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
+index cfe1c09b6e..de62f635f9 100644
+--- a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
++++ b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
+@@ -80,5 +80,5 @@ class ParentTestService
+      * @return ContainerInterface|null
+      */
+-    public function setContainer(ContainerInterface $container)
++    public function setContainer(ContainerInterface $container): ?ContainerInterface
+     {
+         return $container;
diff --git a/.github/patch-types.php b/.github/patch-types.php
index 811f74311eb86..3b73a071a61f2 100644
--- a/.github/patch-types.php
+++ b/.github/patch-types.php
@@ -53,6 +53,7 @@
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/NotLoadableClass.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionIntersectionTypeFixture.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionUnionTypeWithIntersectionFixture.php'):
+        case false !== strpos($file, '/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyGhost/ReadOnlyClass.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyProxy/ReadOnlyClass.php'):
         case false !== strpos($file, '/src/Symfony/Component/Cache/Traits/RelayProxy.php'):
             continue 2;
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
index f0f2b65ac3f15..96c346846cd40 100644
--- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -107,6 +107,9 @@ public function getConnections()
         return $this->data['connections'];
     }
 
+    /**
+     * @return int
+     */
     public function getQueryCount()
     {
         return array_sum(array_map('count', $this->data['queries']));
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
index 73d5a9d654d4f..e3dcea33989ad 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
@@ -43,6 +43,9 @@ public function create(ContainerBuilder $container, string $id, array $config)
         ;
     }
 
+    /**
+     * @return string
+     */
     public function getKey()
     {
         return $this->key;
diff --git a/src/Symfony/Bridge/PhpUnit/ClassExistsMock.php b/src/Symfony/Bridge/PhpUnit/ClassExistsMock.php
index d79624ec5fdde..fd8c90b4afd91 100644
--- a/src/Symfony/Bridge/PhpUnit/ClassExistsMock.php
+++ b/src/Symfony/Bridge/PhpUnit/ClassExistsMock.php
@@ -41,6 +41,9 @@ public static function withMockedEnums(array $enums)
         self::$classes += $enums;
     }
 
+    /**
+     * @return bool
+     */
     public static function class_exists($name, $autoload = true)
     {
         $name = ltrim($name, '\\');
@@ -48,6 +51,9 @@ public static function class_exists($name, $autoload = true)
         return isset(self::$classes[$name]) ? (bool) self::$classes[$name] : \class_exists($name, $autoload);
     }
 
+    /**
+     * @return bool
+     */
     public static function interface_exists($name, $autoload = true)
     {
         $name = ltrim($name, '\\');
@@ -55,6 +61,9 @@ public static function interface_exists($name, $autoload = true)
         return isset(self::$classes[$name]) ? (bool) self::$classes[$name] : \interface_exists($name, $autoload);
     }
 
+    /**
+     * @return bool
+     */
     public static function trait_exists($name, $autoload = true)
     {
         $name = ltrim($name, '\\');
@@ -62,6 +71,9 @@ public static function trait_exists($name, $autoload = true)
         return isset(self::$classes[$name]) ? (bool) self::$classes[$name] : \trait_exists($name, $autoload);
     }
 
+    /**
+     * @return bool
+     */
     public static function enum_exists($name, $autoload = true)
     {
         $name = ltrim($name, '\\');
diff --git a/src/Symfony/Bridge/PhpUnit/ClockMock.php b/src/Symfony/Bridge/PhpUnit/ClockMock.php
index 7ec22ccd85cb3..3c1a722c06026 100644
--- a/src/Symfony/Bridge/PhpUnit/ClockMock.php
+++ b/src/Symfony/Bridge/PhpUnit/ClockMock.php
@@ -19,6 +19,9 @@ class ClockMock
 {
     private static $now;
 
+    /**
+     * @return bool|null
+     */
     public static function withClockMock($enable = null)
     {
         if (null === $enable) {
@@ -30,6 +33,9 @@ public static function withClockMock($enable = null)
         return null;
     }
 
+    /**
+     * @return int
+     */
     public static function time()
     {
         if (null === self::$now) {
@@ -39,6 +45,9 @@ public static function time()
         return (int) self::$now;
     }
 
+    /**
+     * @return int
+     */
     public static function sleep($s)
     {
         if (null === self::$now) {
@@ -72,6 +81,9 @@ public static function microtime($asFloat = false)
         return sprintf('%0.6f00 %d', self::$now - (int) self::$now, (int) self::$now);
     }
 
+    /**
+     * @return string
+     */
     public static function date($format, $timestamp = null)
     {
         if (null === $timestamp) {
@@ -81,6 +93,9 @@ public static function date($format, $timestamp = null)
         return \date($format, $timestamp);
     }
 
+    /**
+     * @return string
+     */
     public static function gmdate($format, $timestamp = null)
     {
         if (null === $timestamp) {
@@ -90,6 +105,9 @@ public static function gmdate($format, $timestamp = null)
         return \gmdate($format, $timestamp);
     }
 
+    /**
+     * @return array|int|float
+     */
     public static function hrtime($asNumber = false)
     {
         $ns = (self::$now - (int) self::$now) * 1000000000;
diff --git a/src/Symfony/Bridge/PhpUnit/DnsMock.php b/src/Symfony/Bridge/PhpUnit/DnsMock.php
index 642da0a6dfcde..080f5a73b4976 100644
--- a/src/Symfony/Bridge/PhpUnit/DnsMock.php
+++ b/src/Symfony/Bridge/PhpUnit/DnsMock.php
@@ -42,6 +42,9 @@ public static function withMockedHosts(array $hosts)
         self::$hosts = $hosts;
     }
 
+    /**
+     * @return bool
+     */
     public static function checkdnsrr($hostname, $type = 'MX')
     {
         if (!self::$hosts) {
@@ -63,6 +66,9 @@ public static function checkdnsrr($hostname, $type = 'MX')
         return false;
     }
 
+    /**
+     * @return bool
+     */
     public static function getmxrr($hostname, &$mxhosts, &$weight = null)
     {
         if (!self::$hosts) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Secrets/AbstractVault.php b/src/Symfony/Bundle/FrameworkBundle/Secrets/AbstractVault.php
index cfa4bab13c3a6..b3eb0c6bc337c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Secrets/AbstractVault.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Secrets/AbstractVault.php
@@ -40,6 +40,9 @@ protected function validateName(string $name): void
         }
     }
 
+    /**
+     * @return string
+     */
     protected function getPrettyPath(string $path)
     {
         return str_replace(getcwd().\DIRECTORY_SEPARATOR, '', $path);
diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
index 45eae8f605202..0e40e398510a2 100644
--- a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
+++ b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
@@ -28,6 +28,9 @@ final class TraceableFirewallListener extends FirewallListener
     private array $wrappedListeners = [];
     private array $authenticatorsInfo = [];
 
+    /**
+     * @return array
+     */
     public function getWrappedListeners()
     {
         return $this->wrappedListeners;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
index 6a34fe7efb703..fd2b18bb50f08 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * AbstractFactory is the base class for all classes inheriting from
@@ -73,6 +72,9 @@ public function addConfiguration(NodeDefinition $node)
         }
     }
 
+    /**
+     * @return string
+     */
     protected function createAuthenticationSuccessHandler(ContainerBuilder $container, string $id, array $config)
     {
         $successHandlerId = $this->getSuccessHandlerId($id);
@@ -92,6 +94,9 @@ protected function createAuthenticationSuccessHandler(ContainerBuilder $containe
         return $successHandlerId;
     }
 
+    /**
+     * @return string
+     */
     protected function createAuthenticationFailureHandler(ContainerBuilder $container, string $id, array $config)
     {
         $id = $this->getFailureHandlerId($id);
@@ -109,11 +114,17 @@ protected function createAuthenticationFailureHandler(ContainerBuilder $containe
         return $id;
     }
 
+    /**
+     * @return string
+     */
     protected function getSuccessHandlerId(string $id)
     {
         return 'security.authentication.success_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());
     }
 
+    /**
+     * @return string
+     */
     protected function getFailureHandlerId(string $id)
     {
         return 'security.authentication.failure_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
index 0c8a730d1c6d4..32208a6e3b359 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
@@ -37,6 +37,9 @@ public function create(ContainerBuilder $container, string $id, array $config)
         $definition->addArgument($users);
     }
 
+    /**
+     * @return string
+     */
     public function getKey()
     {
         return 'memory';
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
index 670a848d0ebd4..d54ebf7738167 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
@@ -40,6 +40,9 @@ public function create(ContainerBuilder $container, string $id, array $config)
         ;
     }
 
+    /**
+     * @return string
+     */
     public function getKey()
     {
         return 'ldap';
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
index a81f6d8983113..5077c6768d95e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
+++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
@@ -38,6 +38,9 @@ public function __construct(iterable $listeners, ExceptionListener $exceptionLis
         $this->config = $config;
     }
 
+    /**
+     * @return FirewallConfig|null
+     */
     public function getConfig()
     {
         return $this->config;
@@ -51,11 +54,17 @@ public function getListeners(): iterable
         return $this->listeners;
     }
 
+    /**
+     * @return ExceptionListener|null
+     */
     public function getExceptionListener()
     {
         return $this->exceptionListener;
     }
 
+    /**
+     * @return LogoutListener|null
+     */
     public function getLogoutListener()
     {
         return $this->logoutListener;
diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
index bf336604d06bf..3dc93fd541f57 100644
--- a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
@@ -47,6 +47,9 @@ public function __construct(string $namespace = '', int $defaultLifetime = 0, st
         $this->marshaller = $marshaller;
     }
 
+    /**
+     * @return bool
+     */
     public static function isSupported()
     {
         return \function_exists('apcu_fetch') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOL);
diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
index eafb31f9f955f..dc25a395a3272 100644
--- a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
@@ -74,6 +74,9 @@ public function __construct(\Memcached $client, string $namespace = '', int $def
         $this->marshaller = $marshaller ?? new DefaultMarshaller();
     }
 
+    /**
+     * @return bool
+     */
     public static function isSupported()
     {
         return \extension_loaded('memcached') && version_compare(phpversion('memcached'), '3.1.6', '>=');
diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
index fa4c0aca09c34..d104530c0d337 100644
--- a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
@@ -54,6 +54,9 @@ public function __construct(string $namespace = '', int $defaultLifetime = 0, st
         };
     }
 
+    /**
+     * @return bool
+     */
     public static function isSupported()
     {
         self::$startTime ??= $_SERVER['REQUEST_TIME'] ?? time();
@@ -274,6 +277,9 @@ protected function doDelete(array $ids): bool
         return $this->doCommonDelete($ids);
     }
 
+    /**
+     * @return bool
+     */
     protected function doUnlink(string $file)
     {
         unset(self::$valuesCache[$file]);
diff --git a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
index a99819962e7f1..18f7ba0fb0a05 100644
--- a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
@@ -211,6 +211,9 @@ public function delete(string $key): bool
         }
     }
 
+    /**
+     * @return array
+     */
     public function getCalls()
     {
         return $this->calls;
@@ -226,6 +229,9 @@ public function getPool(): AdapterInterface
         return $this->pool;
     }
 
+    /**
+     * @return TraceableAdapterEvent
+     */
     protected function start(string $name)
     {
         $this->calls[] = $event = new TraceableAdapterEvent();
diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
index 980fb74fe453c..2f07f31d0a2af 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
@@ -36,6 +36,9 @@ public function dump(ConfigurationInterface $configuration, string $namespace =
         return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree(), $namespace);
     }
 
+    /**
+     * @return string
+     */
     public function dumpNode(NodeInterface $node, string $namespace = null)
     {
         $this->reference = '';
diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
index 053a201065d91..4621e6b1dc683 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -61,6 +61,9 @@ public function dumpAtPath(ConfigurationInterface $configuration, string $path)
         return $this->dumpNode($node);
     }
 
+    /**
+     * @return string
+     */
     public function dumpNode(NodeInterface $node)
     {
         $this->reference = '';
diff --git a/src/Symfony/Component/Config/Definition/EnumNode.php b/src/Symfony/Component/Config/Definition/EnumNode.php
index 4b494d00ace57..683096949df64 100644
--- a/src/Symfony/Component/Config/Definition/EnumNode.php
+++ b/src/Symfony/Component/Config/Definition/EnumNode.php
@@ -46,6 +46,9 @@ public function __construct(?string $name, NodeInterface $parent = null, array $
         $this->values = $values;
     }
 
+    /**
+     * @return array
+     */
     public function getValues()
     {
         return $this->values;
diff --git a/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php b/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php
index 92700c1ab2165..c5173ae58065b 100644
--- a/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php
+++ b/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php
@@ -27,6 +27,9 @@ public function __construct(string $message = '', int $code = 0, \Throwable $pre
         $this->paths = $paths;
     }
 
+    /**
+     * @return array
+     */
     public function getPaths()
     {
         return $this->paths;
diff --git a/src/Symfony/Component/Config/Exception/LoaderLoadException.php b/src/Symfony/Component/Config/Exception/LoaderLoadException.php
index 5f9bfbc0726d5..57afd6a8dbcf7 100644
--- a/src/Symfony/Component/Config/Exception/LoaderLoadException.php
+++ b/src/Symfony/Component/Config/Exception/LoaderLoadException.php
@@ -76,6 +76,9 @@ public function __construct(mixed $resource, string $sourceResource = null, int
         parent::__construct($message, $code, $previous);
     }
 
+    /**
+     * @return string
+     */
     protected function varToString(mixed $var)
     {
         if (\is_object($var)) {
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
index a1b1d29e60ca8..cc024da46194e 100644
--- a/src/Symfony/Component/Config/Util/XmlUtils.php
+++ b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -238,6 +238,9 @@ public static function phpize(string|\Stringable $value): mixed
         }
     }
 
+    /**
+     * @return array
+     */
     protected static function getXmlErrors(bool $internalErrors)
     {
         $errors = [];
diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
index 920196e0fecbe..8e56f2b57191f 100644
--- a/src/Symfony/Component/Console/Helper/Helper.php
+++ b/src/Symfony/Component/Console/Helper/Helper.php
@@ -117,6 +117,9 @@ public static function formatTime(int|float $secs)
         }
     }
 
+    /**
+     * @return string
+     */
     public static function formatMemory(int $memory)
     {
         if ($memory >= 1024 * 1024 * 1024) {
@@ -134,6 +137,9 @@ public static function formatMemory(int $memory)
         return sprintf('%d B', $memory);
     }
 
+    /**
+     * @return string
+     */
     public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string)
     {
         $isDecorated = $formatter->isDecorated();
diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
index 58b09c3543456..e1f981bc1e90d 100644
--- a/src/Symfony/Component/Console/Question/Question.php
+++ b/src/Symfony/Component/Console/Question/Question.php
@@ -265,6 +265,9 @@ public function getNormalizer(): ?callable
         return $this->normalizer;
     }
 
+    /**
+     * @return bool
+     */
     protected function isAssoc(array $array)
     {
         return (bool) \count(array_filter(array_keys($array), 'is_string'));
diff --git a/src/Symfony/Component/Console/Style/OutputStyle.php b/src/Symfony/Component/Console/Style/OutputStyle.php
index b694bb53a7ab0..74d885d131d6c 100644
--- a/src/Symfony/Component/Console/Style/OutputStyle.php
+++ b/src/Symfony/Component/Console/Style/OutputStyle.php
@@ -100,6 +100,9 @@ public function isDebug(): bool
         return $this->output->isDebug();
     }
 
+    /**
+     * @return OutputInterface
+     */
     protected function getErrorOutput()
     {
         if (!$this->output instanceof ConsoleOutputInterface) {
diff --git a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
index bfe9787f7c9bd..b4e982c457307 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
@@ -52,6 +52,9 @@ public function __construct(string $tag, string $indexAttribute = null, string $
         $this->excludeSelf = $excludeSelf;
     }
 
+    /**
+     * @return string
+     */
     public function getTag()
     {
         return $this->tag;
diff --git a/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php b/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php
index a3d4d9dda9f57..5f22fa53b6b08 100644
--- a/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php
+++ b/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php
@@ -67,6 +67,9 @@ public function getMessageCallback(): ?\Closure
         return $this->messageCallback;
     }
 
+    /**
+     * @return string
+     */
     public function getServiceId()
     {
         return $this->serviceId;
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php
index b26335dc5d471..9fc3b50b624a0 100644
--- a/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php
+++ b/src/Symfony/Component/DependencyInjection/Exception/ParameterCircularReferenceException.php
@@ -27,6 +27,9 @@ public function __construct(array $parameters, \Throwable $previous = null)
         $this->parameters = $parameters;
     }
 
+    /**
+     * @return array
+     */
     public function getParameters()
     {
         return $this->parameters;
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
index e8f593187e9a7..89966648f7247 100644
--- a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
+++ b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
@@ -71,16 +71,25 @@ public function updateRepr()
         }
     }
 
+    /**
+     * @return string
+     */
     public function getKey()
     {
         return $this->key;
     }
 
+    /**
+     * @return string|null
+     */
     public function getSourceId()
     {
         return $this->sourceId;
     }
 
+    /**
+     * @return string|null
+     */
     public function getSourceKey()
     {
         return $this->sourceKey;
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php b/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php
index feff376553755..d62c22567baa7 100644
--- a/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php
+++ b/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php
@@ -29,11 +29,17 @@ public function __construct(string $serviceId, array $path, \Throwable $previous
         $this->path = $path;
     }
 
+    /**
+     * @return string
+     */
     public function getServiceId()
     {
         return $this->serviceId;
     }
 
+    /**
+     * @return array
+     */
     public function getPath()
     {
         return $this->path;
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php
index 183a110eec8b6..d56db7727f577 100644
--- a/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php
+++ b/src/Symfony/Component/DependencyInjection/Exception/ServiceNotFoundException.php
@@ -50,16 +50,25 @@ public function __construct(string $id, string $sourceId = null, \Throwable $pre
         $this->alternatives = $alternatives;
     }
 
+    /**
+     * @return string
+     */
     public function getId()
     {
         return $this->id;
     }
 
+    /**
+     * @return string|null
+     */
     public function getSourceId()
     {
         return $this->sourceId;
     }
 
+    /**
+     * @return array
+     */
     public function getAlternatives()
     {
         return $this->alternatives;
diff --git a/src/Symfony/Component/DependencyInjection/TypedReference.php b/src/Symfony/Component/DependencyInjection/TypedReference.php
index 4c1e1c3f0c114..9b431cd65b73b 100644
--- a/src/Symfony/Component/DependencyInjection/TypedReference.php
+++ b/src/Symfony/Component/DependencyInjection/TypedReference.php
@@ -37,6 +37,9 @@ public function __construct(string $id, string $type, int $invalidBehavior = Con
         $this->attributes = $attributes;
     }
 
+    /**
+     * @return string
+     */
     public function getType()
     {
         return $this->type;
diff --git a/src/Symfony/Component/ExpressionLanguage/Compiler.php b/src/Symfony/Component/ExpressionLanguage/Compiler.php
index b52d41ee67f90..66471d29ff033 100644
--- a/src/Symfony/Component/ExpressionLanguage/Compiler.php
+++ b/src/Symfony/Component/ExpressionLanguage/Compiler.php
@@ -63,6 +63,9 @@ public function compile(Node\Node $node): static
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function subcompile(Node\Node $node)
     {
         $current = $this->source;
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
index 37b5982091ad3..06078da305107 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
@@ -50,6 +50,9 @@ public function evaluate(array $functions, array $values)
         return $functions[$this->attributes['name']]['evaluator'](...$arguments);
     }
 
+    /**
+     * @return array
+     */
     public function toArray()
     {
         $array = [];
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/Node.php b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
index 9b725174c6ea2..eb5046c9bf59f 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/Node.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
@@ -64,6 +64,9 @@ public function compile(Compiler $compiler)
         }
     }
 
+    /**
+     * @return mixed
+     */
     public function evaluate(array $functions, array $values)
     {
         $results = [];
@@ -79,6 +82,9 @@ public function toArray()
         throw new \BadMethodCallException(sprintf('Dumping a "%s" instance is not supported yet.', static::class));
     }
 
+    /**
+     * @return string
+     */
     public function dump()
     {
         $dump = '';
@@ -90,11 +96,17 @@ public function dump()
         return $dump;
     }
 
+    /**
+     * @return string
+     */
     protected function dumpString(string $value)
     {
         return sprintf('"%s"', addcslashes($value, "\0\t\"\\"));
     }
 
+    /**
+     * @return bool
+     */
     protected function isHash(array $value)
     {
         $expectedKey = 0;
diff --git a/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php b/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php
index ca684ccd5f10a..239624ec2ccc4 100644
--- a/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php
+++ b/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php
@@ -29,6 +29,9 @@ public function __construct(string $expression, Node $nodes)
         $this->nodes = $nodes;
     }
 
+    /**
+     * @return Node
+     */
     public function getNodes()
     {
         return $this->nodes;
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
index 0580b55d46e5b..92585a574c723 100644
--- a/src/Symfony/Component/ExpressionLanguage/Parser.php
+++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -174,6 +174,9 @@ protected function getPrimary()
         return $this->parsePrimaryExpression();
     }
 
+    /**
+     * @return Node\Node
+     */
     protected function parseConditionalExpression(Node\Node $expr)
     {
         while ($this->stream->current->test(Token::PUNCTUATION_TYPE, '??')) {
@@ -270,6 +273,9 @@ public function parsePrimaryExpression()
         return $this->parsePostfixExpression($node);
     }
 
+    /**
+     * @return Node\ArrayNode
+     */
     public function parseArrayExpression()
     {
         $this->stream->expect(Token::PUNCTUATION_TYPE, '[', 'An array element was expected');
@@ -294,6 +300,9 @@ public function parseArrayExpression()
         return $node;
     }
 
+    /**
+     * @return Node\ArrayNode
+     */
     public function parseHashExpression()
     {
         $this->stream->expect(Token::PUNCTUATION_TYPE, '{', 'A hash element was expected');
@@ -338,6 +347,9 @@ public function parseHashExpression()
         return $node;
     }
 
+    /**
+     * @return Node\GetAttrNode|Node\Node
+     */
     public function parsePostfixExpression(Node\Node $node)
     {
         $token = $this->stream->current;
@@ -398,6 +410,8 @@ public function parsePostfixExpression(Node\Node $node)
 
     /**
      * Parses arguments.
+     *
+     * @return Node\Node
      */
     public function parseArguments()
     {
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
index bfba1d6cd0970..9cc32888e1d68 100644
--- a/src/Symfony/Component/Form/ButtonBuilder.php
+++ b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -173,6 +173,9 @@ public function resetModelTransformers(): static
         throw new BadMethodCallException('Buttons do not support data transformers.');
     }
 
+    /**
+     * @return $this
+     */
     public function setAttribute(string $name, mixed $value): static
     {
         $this->attributes[$name] = $value;
@@ -180,6 +183,9 @@ public function setAttribute(string $name, mixed $value): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setAttributes(array $attributes): static
     {
         $this->attributes = $attributes;
diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
index e18db7ed8e320..0220399758d0b 100644
--- a/src/Symfony/Component/Form/FormConfigBuilder.php
+++ b/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -316,6 +316,9 @@ public function getIsEmptyCallback(): ?callable
         return $this->isEmptyCallback;
     }
 
+    /**
+     * @return $this
+     */
     public function setAttribute(string $name, mixed $value): static
     {
         if ($this->locked) {
@@ -327,6 +330,9 @@ public function setAttribute(string $name, mixed $value): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setAttributes(array $attributes): static
     {
         if ($this->locked) {
@@ -338,6 +344,9 @@ public function setAttributes(array $attributes): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setDataMapper(DataMapperInterface $dataMapper = null): static
     {
         if (1 > \func_num_args()) {
@@ -352,6 +361,9 @@ public function setDataMapper(DataMapperInterface $dataMapper = null): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setDisabled(bool $disabled): static
     {
         if ($this->locked) {
@@ -363,6 +375,9 @@ public function setDisabled(bool $disabled): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setEmptyData(mixed $emptyData): static
     {
         if ($this->locked) {
@@ -374,6 +389,9 @@ public function setEmptyData(mixed $emptyData): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setErrorBubbling(bool $errorBubbling): static
     {
         if ($this->locked) {
@@ -385,6 +403,9 @@ public function setErrorBubbling(bool $errorBubbling): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setRequired(bool $required): static
     {
         if ($this->locked) {
@@ -396,6 +417,9 @@ public function setRequired(bool $required): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setPropertyPath(string|PropertyPathInterface|null $propertyPath): static
     {
         if ($this->locked) {
@@ -411,6 +435,9 @@ public function setPropertyPath(string|PropertyPathInterface|null $propertyPath)
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setMapped(bool $mapped): static
     {
         if ($this->locked) {
@@ -422,6 +449,9 @@ public function setMapped(bool $mapped): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setByReference(bool $byReference): static
     {
         if ($this->locked) {
@@ -433,6 +463,9 @@ public function setByReference(bool $byReference): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setInheritData(bool $inheritData): static
     {
         if ($this->locked) {
@@ -444,6 +477,9 @@ public function setInheritData(bool $inheritData): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setCompound(bool $compound): static
     {
         if ($this->locked) {
@@ -455,6 +491,9 @@ public function setCompound(bool $compound): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setType(ResolvedFormTypeInterface $type): static
     {
         if ($this->locked) {
@@ -466,6 +505,9 @@ public function setType(ResolvedFormTypeInterface $type): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setData(mixed $data): static
     {
         if ($this->locked) {
@@ -477,6 +519,9 @@ public function setData(mixed $data): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setDataLocked(bool $locked): static
     {
         if ($this->locked) {
@@ -488,6 +533,9 @@ public function setDataLocked(bool $locked): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setFormFactory(FormFactoryInterface $formFactory)
     {
         if ($this->locked) {
@@ -499,6 +547,9 @@ public function setFormFactory(FormFactoryInterface $formFactory)
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setAction(string $action): static
     {
         if ($this->locked) {
@@ -510,6 +561,9 @@ public function setAction(string $action): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setMethod(string $method): static
     {
         if ($this->locked) {
@@ -521,6 +575,9 @@ public function setMethod(string $method): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setRequestHandler(RequestHandlerInterface $requestHandler): static
     {
         if ($this->locked) {
@@ -532,6 +589,9 @@ public function setRequestHandler(RequestHandlerInterface $requestHandler): stat
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function setAutoInitialize(bool $initialize): static
     {
         if ($this->locked) {
@@ -556,6 +616,9 @@ public function getFormConfig(): FormConfigInterface
         return $config;
     }
 
+    /**
+     * @return $this
+     */
     public function setIsEmptyCallback(?callable $isEmptyCallback): static
     {
         $this->isEmptyCallback = null === $isEmptyCallback ? null : $isEmptyCallback(...);
diff --git a/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
index 84f40d3711f6b..09b91498013a6 100644
--- a/src/Symfony/Component/Form/FormConfigBuilderInterface.php
+++ b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
@@ -205,6 +205,8 @@ public function setDataLocked(bool $locked): static;
 
     /**
      * Sets the form factory used for creating new forms.
+     *
+     * @return $this
      */
     public function setFormFactory(FormFactoryInterface $formFactory);
 
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
index 059a853540ec2..38c544b4b1234 100644
--- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
+++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -554,6 +554,8 @@ private static function parseUrl(string $url, array $query = [], array $allowedS
      * Removes dot-segments from a path.
      *
      * @see https://tools.ietf.org/html/rfc3986#section-5.2.4
+     *
+     * @return string
      */
     private static function removeDotSegments(string $path)
     {
diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
index eb96b9dd93458..b7be1b3827059 100644
--- a/src/Symfony/Component/HttpFoundation/HeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -254,6 +254,9 @@ public function count(): int
         return \count($this->headers);
     }
 
+    /**
+     * @return string
+     */
     protected function getCacheControlHeader()
     {
         ksort($this->cacheControl);
diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
index 9e8c5793a7668..203a8b278d9c4 100644
--- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
@@ -55,6 +55,9 @@ public function allPreserveCase(): array
         return $headers;
     }
 
+    /**
+     * @return array
+     */
     public function allPreserveCaseWithoutCookies()
     {
         $headers = $this->allPreserveCase();
@@ -224,6 +227,8 @@ public function clearCookie(string $name, ?string $path = '/', string $domain =
 
     /**
      * @see HeaderUtils::makeDisposition()
+     *
+     * @return string
      */
     public function makeDisposition(string $disposition, string $filename, string $filenameFallback = '')
     {
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
index cdfa081d8b971..fa62bc7de4056 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -195,46 +195,73 @@ public function getPathInfo()
         return $this->data['path_info'];
     }
 
+    /**
+     * @return ParameterBag
+     */
     public function getRequestRequest()
     {
         return new ParameterBag($this->data['request_request']->getValue());
     }
 
+    /**
+     * @return ParameterBag
+     */
     public function getRequestQuery()
     {
         return new ParameterBag($this->data['request_query']->getValue());
     }
 
+    /**
+     * @return ParameterBag
+     */
     public function getRequestFiles()
     {
         return new ParameterBag($this->data['request_files']->getValue());
     }
 
+    /**
+     * @return ParameterBag
+     */
     public function getRequestHeaders()
     {
         return new ParameterBag($this->data['request_headers']->getValue());
     }
 
+    /**
+     * @return ParameterBag
+     */
     public function getRequestServer(bool $raw = false)
     {
         return new ParameterBag($this->data['request_server']->getValue($raw));
     }
 
+    /**
+     * @return ParameterBag
+     */
     public function getRequestCookies(bool $raw = false)
     {
         return new ParameterBag($this->data['request_cookies']->getValue($raw));
     }
 
+    /**
+     * @return ParameterBag
+     */
     public function getRequestAttributes()
     {
         return new ParameterBag($this->data['request_attributes']->getValue());
     }
 
+    /**
+     * @return ParameterBag
+     */
     public function getResponseHeaders()
     {
         return new ParameterBag($this->data['response_headers']->getValue());
     }
 
+    /**
+     * @return ParameterBag
+     */
     public function getResponseCookies()
     {
         return new ParameterBag($this->data['response_cookies']->getValue());
@@ -270,11 +297,17 @@ public function getContent()
         return $this->data['content'];
     }
 
+    /**
+     * @return bool
+     */
     public function isJsonRequest()
     {
         return 1 === preg_match('{^application/(?:\w+\++)*json$}i', $this->data['request_headers']['content-type']);
     }
 
+    /**
+     * @return string|null
+     */
     public function getPrettyJson()
     {
         $decoded = json_decode($this->getContent());
@@ -307,6 +340,9 @@ public function getLocale()
         return $this->data['locale'];
     }
 
+    /**
+     * @return ParameterBag
+     */
     public function getDotenvVars()
     {
         return new ParameterBag($this->data['dotenv_vars']->getValue());
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
index 3c9f2142f493d..d894b7e74c9e4 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
@@ -59,6 +59,9 @@ public function reset()
         ];
     }
 
+    /**
+     * @return string
+     */
     protected function guessRoute(Request $request, string|object|array $controller)
     {
         return 'n/a';
diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
index 0e53768ee9a13..3650d1700d662 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
@@ -103,6 +103,9 @@ public function render(string|ControllerReference $uri, Request $request, array
         }
     }
 
+    /**
+     * @return Request
+     */
     protected function createSubRequest(string $uri, Request $request)
     {
         $cookies = $request->cookies->all();
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
index 01d010b812a0d..facd20b94240e 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Store.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -413,6 +413,9 @@ private function save(string $key, string $data, bool $overwrite = true): bool
         return true;
     }
 
+    /**
+     * @return string
+     */
     public function getPath(string $key)
     {
         return $this->root.\DIRECTORY_SEPARATOR.substr($key, 0, 2).\DIRECTORY_SEPARATOR.substr($key, 2, 2).\DIRECTORY_SEPARATOR.substr($key, 4, 2).\DIRECTORY_SEPARATOR.substr($key, 6);
diff --git a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
index 0938617169bc1..3077ed0398164 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
@@ -110,6 +110,9 @@ protected function getScript(object $request)
         return $code.$this->getHandleScript();
     }
 
+    /**
+     * @return string
+     */
     protected function getHandleScript()
     {
         return <<<'EOF'
diff --git a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
index 9e8c27b26e682..3add13d5e9149 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
@@ -242,6 +242,9 @@ protected function readLineFromFile($file): mixed
         return '' === $line ? null : $line;
     }
 
+    /**
+     * @return Profile
+     */
     protected function createProfileFromData(string $token, array $data, Profile $parent = null)
     {
         $profile = new Profile($token);
diff --git a/src/Symfony/Component/Intl/Resources/bin/common.php b/src/Symfony/Component/Intl/Resources/bin/common.php
index 7f5d6cce0c412..6cbab2524508c 100644
--- a/src/Symfony/Component/Intl/Resources/bin/common.php
+++ b/src/Symfony/Component/Intl/Resources/bin/common.php
@@ -24,6 +24,9 @@ function bailout(string $message)
     exit(1);
 }
 
+/**
+ * @return string
+ */
 function strip_minor_versions(string $version)
 {
     preg_match('/^(?P<version>[0-9]\.[0-9]|[0-9]{2,})/', $version, $matches);
@@ -31,6 +34,9 @@ function strip_minor_versions(string $version)
     return $matches['version'];
 }
 
+/**
+ * @return string
+ */
 function centered(string $text)
 {
     $padding = (int) ((LINE_WIDTH - strlen($text)) / 2);
@@ -57,6 +63,9 @@ function run(string $command)
     }
 }
 
+/**
+ * @return string|null
+ */
 function get_icu_version_from_genrb(string $genrb)
 {
     exec($genrb.' --version - 2>&1', $output, $status);
diff --git a/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php b/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
index aa23efde449d9..9b356b10b2169 100644
--- a/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
+++ b/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
@@ -25,6 +25,8 @@ interface EntryManagerInterface
     /**
      * Adds a new entry in the Ldap server.
      *
+     * @return $this
+     *
      * @throws NotBoundException
      * @throws LdapException
      */
@@ -33,6 +35,8 @@ public function add(Entry $entry);
     /**
      * Updates an entry from the Ldap server.
      *
+     * @return $this
+     *
      * @throws NotBoundException
      * @throws LdapException
      */
@@ -41,6 +45,8 @@ public function update(Entry $entry);
     /**
      * Moves an entry on the Ldap server.
      *
+     * @return $this
+     *
      * @throws NotBoundException
      * @throws LdapException
      */
@@ -49,6 +55,8 @@ public function move(Entry $entry, string $newParent);
     /**
      * Renames an entry on the Ldap server.
      *
+     * @return $this
+     *
      * @throws NotBoundException
      * @throws LdapException
      */
@@ -57,6 +65,8 @@ public function rename(Entry $entry, string $newRdn, bool $removeOldRdn = true);
     /**
      * Removes an entry from the Ldap server.
      *
+     * @return $this
+     *
      * @throws NotBoundException
      * @throws LdapException
      */
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
index bffab0e5b032b..e919a1152a121 100644
--- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
+++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Ldap\Adapter\ExtLdap;
 
+use LDAP\Connection as LDAPConnection;
 use Symfony\Component\Ldap\Adapter\EntryManagerInterface;
 use Symfony\Component\Ldap\Entry;
 use Symfony\Component\Ldap\Exception\LdapException;
@@ -30,6 +31,9 @@ public function __construct(Connection $connection)
         $this->connection = $connection;
     }
 
+    /**
+     * @return $this
+     */
     public function add(Entry $entry)
     {
         $con = $this->getConnectionResource();
@@ -41,6 +45,9 @@ public function add(Entry $entry)
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function update(Entry $entry)
     {
         $con = $this->getConnectionResource();
@@ -48,8 +55,13 @@ public function update(Entry $entry)
         if (!@ldap_modify($con, $entry->getDn(), $entry->getAttributes())) {
             throw new LdapException(sprintf('Could not update entry "%s": ', $entry->getDn()).ldap_error($con), ldap_errno($con));
         }
+
+        return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function remove(Entry $entry)
     {
         $con = $this->getConnectionResource();
@@ -57,11 +69,15 @@ public function remove(Entry $entry)
         if (!@ldap_delete($con, $entry->getDn())) {
             throw new LdapException(sprintf('Could not remove entry "%s": ', $entry->getDn()).ldap_error($con), ldap_errno($con));
         }
+
+        return $this;
     }
 
     /**
      * Adds values to an entry's multi-valued attribute from the LDAP server.
      *
+     * @return $this
+     *
      * @throws NotBoundException
      * @throws LdapException
      */
@@ -72,11 +88,15 @@ public function addAttributeValues(Entry $entry, string $attribute, array $value
         if (!@ldap_mod_add($con, $entry->getDn(), [$attribute => $values])) {
             throw new LdapException(sprintf('Could not add values to entry "%s", attribute "%s": ', $entry->getDn(), $attribute).ldap_error($con), ldap_errno($con));
         }
+
+        return $this;
     }
 
     /**
      * Removes values from an entry's multi-valued attribute from the LDAP server.
      *
+     * @return $this
+     *
      * @throws NotBoundException
      * @throws LdapException
      */
@@ -87,6 +107,8 @@ public function removeAttributeValues(Entry $entry, string $attribute, array $va
         if (!@ldap_mod_del($con, $entry->getDn(), [$attribute => $values])) {
             throw new LdapException(sprintf('Could not remove values from entry "%s", attribute "%s": ', $entry->getDn(), $attribute).ldap_error($con), ldap_errno($con));
         }
+
+        return $this;
     }
 
     public function rename(Entry $entry, string $newRdn, bool $removeOldRdn = true)
@@ -96,11 +118,15 @@ public function rename(Entry $entry, string $newRdn, bool $removeOldRdn = true)
         if (!@ldap_rename($con, $entry->getDn(), $newRdn, '', $removeOldRdn)) {
             throw new LdapException(sprintf('Could not rename entry "%s" to "%s": ', $entry->getDn(), $newRdn).ldap_error($con), ldap_errno($con));
         }
+
+        return $this;
     }
 
     /**
      * Moves an entry on the Ldap server.
      *
+     * @return $this
+     *
      * @throws NotBoundException if the connection has not been previously bound
      * @throws LdapException     if an error is thrown during the rename operation
      */
@@ -112,10 +138,14 @@ public function move(Entry $entry, string $newParent)
         if (!@ldap_rename($con, $entry->getDn(), $rdn, $newParent, true)) {
             throw new LdapException(sprintf('Could not move entry "%s" to "%s": ', $entry->getDn(), $newParent).ldap_error($con), ldap_errno($con));
         }
+
+        return $this;
     }
 
     /**
      * Get the connection resource, but first check if the connection is bound.
+     *
+     * @return resource|LDAPConnection
      */
     private function getConnectionResource()
     {
@@ -130,9 +160,11 @@ private function getConnectionResource()
     /**
      * @param iterable<int, UpdateOperation> $operations An array or iterable of UpdateOperation instances
      *
+     * @return $this
+     *
      * @throws UpdateOperationException in case of an error
      */
-    public function applyOperations(string $dn, iterable $operations): void
+    public function applyOperations(string $dn, iterable $operations)
     {
         $operationsMapped = [];
         foreach ($operations as $modification) {
@@ -143,6 +175,8 @@ public function applyOperations(string $dn, iterable $operations): void
         if (!@ldap_modify_batch($con, $dn, $operationsMapped)) {
             throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": ', $dn).ldap_error($con), ldap_errno($con));
         }
+
+        return $this;
     }
 
     private function parseRdnFromEntry(Entry $entry): string
diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php
index 66058148daa16..c9b0fbde056a7 100644
--- a/src/Symfony/Component/Lock/Store/MemcachedStore.php
+++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php
@@ -30,6 +30,9 @@ class MemcachedStore implements PersistingStoreInterface
     private int $initialTtl;
     private bool $useExtendedReturn;
 
+    /**
+     * @return bool
+     */
     public static function isSupported()
     {
         return \extension_loaded('memcached');
diff --git a/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php b/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
index 782355d99cd25..0e91372f62d7e 100644
--- a/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
+++ b/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
@@ -29,6 +29,9 @@ public function __construct(object $violatingMessage, ConstraintViolationListInt
         parent::__construct(sprintf('Message of type "%s" failed validation.', $this->violatingMessage::class));
     }
 
+    /**
+     * @return object
+     */
     public function getViolatingMessage()
     {
         return $this->violatingMessage;
diff --git a/src/Symfony/Component/Messenger/Stamp/HandlerArgumentsStamp.php b/src/Symfony/Component/Messenger/Stamp/HandlerArgumentsStamp.php
index d8142394508b4..3dcdacf88f580 100644
--- a/src/Symfony/Component/Messenger/Stamp/HandlerArgumentsStamp.php
+++ b/src/Symfony/Component/Messenger/Stamp/HandlerArgumentsStamp.php
@@ -21,6 +21,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @return array
+     */
     public function getAdditionalArguments()
     {
         return $this->additionalArguments;
diff --git a/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php b/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
index b052d72cb0020..27ce7fd43082b 100644
--- a/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
+++ b/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
@@ -43,11 +43,17 @@ public function getProcess()
         return $this->process;
     }
 
+    /**
+     * @return bool
+     */
     public function isGeneralTimeout()
     {
         return self::TYPE_GEN
10000
ERAL === $this->timeoutType;
     }
 
+    /**
+     * @return bool
+     */
     public function isIdleTimeout()
     {
         return self::TYPE_IDLE === $this->timeoutType;
diff --git a/src/Symfony/Component/Process/InputStream.php b/src/Symfony/Component/Process/InputStream.php
index b8682baeb820c..d703660868d97 100644
--- a/src/Symfony/Component/Process/InputStream.php
+++ b/src/Symfony/Component/Process/InputStream.php
@@ -62,6 +62,8 @@ public function close()
 
     /**
      * Tells whether the write buffer is closed or not.
+     *
+     * @return bool
      */
     public function isClosed()
     {
diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
index a9ab5f3c9fc4a..974215a097fbe 100644
--- a/src/Symfony/Component/Routing/Annotation/Route.php
+++ b/src/Symfony/Component/Routing/Annotation/Route.php
@@ -81,6 +81,9 @@ public function setPath(string $path)
         $this->path = $path;
     }
 
+    /**
+     * @return string|null
+     */
     public function getPath()
     {
         return $this->path;
@@ -101,6 +104,9 @@ public function setHost(string $pattern)
         $this->host = $pattern;
     }
 
+    /**
+     * @return string|null
+     */
     public function getHost()
     {
         return $this->host;
@@ -111,6 +117,9 @@ public function setName(string $name)
         $this->name = $name;
     }
 
+    /**
+     * @return string|null
+     */
     public function getName()
     {
         return $this->name;
@@ -121,6 +130,9 @@ public function setRequirements(array $requirements)
         $this->requirements = $requirements;
     }
 
+    /**
+     * @return array
+     */
     public function getRequirements()
     {
         return $this->requirements;
@@ -131,6 +143,9 @@ public function setOptions(array $options)
         $this->options = $options;
     }
 
+    /**
+     * @return array
+     */
     public function getOptions()
     {
         return $this->options;
@@ -141,6 +156,9 @@ public function setDefaults(array $defaults)
         $this->defaults = $defaults;
     }
 
+    /**
+     * @return array
+     */
     public function getDefaults()
     {
         return $this->defaults;
@@ -151,6 +169,9 @@ public function setSchemes(array|string $schemes)
         $this->schemes = (array) $schemes;
     }
 
+    /**
+     * @return array
+     */
     public function getSchemes()
     {
         return $this->schemes;
@@ -161,6 +182,9 @@ public function setMethods(array|string $methods)
         $this->methods = (array) $methods;
     }
 
+    /**
+     * @return array
+     */
     public function getMethods()
     {
         return $this->methods;
@@ -171,6 +195,9 @@ public function setCondition(?string $condition)
         $this->condition = $condition;
     }
 
+    /**
+     * @return string|null
+     */
     public function getCondition()
     {
         return $this->condition;
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
index b63dc5c85e665..f390b2066c7b0 100644
--- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -255,6 +255,9 @@ protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMetho
         return $name;
     }
 
+    /**
+     * @return array
+     */
     protected function getGlobals(\ReflectionClass $class)
     {
         $globals = $this->resetGlobals();
@@ -337,6 +340,9 @@ private function resetGlobals(): array
         ];
     }
 
+    /**
+     * @return Route
+     */
     protected function createRoute(string $path, array $defaults, array $requirements, array $options, ?string $host, array $schemes, array $methods, ?string $condition)
     {
         return new Route($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
diff --git a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
index 0f0cb3fd9e6a2..b682040b5a44d 100644
--- a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
+++ b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
@@ -29,6 +29,9 @@ class TraceableUrlMatcher extends UrlMatcher
 
     protected $traces;
 
+    /**
+     * @return array
+     */
     public function getTraces(string $pathinfo)
     {
         $this->traces = [];
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php
index 18ef2413f95c6..c8db1485e0513 100644
--- a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php
+++ b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php
@@ -31,6 +31,9 @@ public function __construct(RoleHierarchyInterface $roleHierarchy, string $prefi
         parent::__construct($prefix);
     }
 
+    /**
+     * @return array
+     */
     protected function extractRoles(TokenInterface $token)
     {
         return $this->roleHierarchy->getReachableRoleNames($token->getRoleNames());
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php
index 8e8d7181ae934..70dddcfff92e2 100644
--- a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php
+++ b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php
@@ -58,6 +58,9 @@ public function supportsType(string $subjectType): bool
         return true;
     }
 
+    /**
+     * @return array
+     */
     protected function extractRoles(TokenInterface $token)
     {
         return $token->getRoleNames();
diff --git a/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php b/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php
index 1b9269fe58c52..054dd9572812f 100644
--- a/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php
+++ b/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php
@@ -28,6 +28,9 @@ public function __construct(TokenInterface $token)
         $this->authenticationToken = $token;
     }
 
+    /**
+     * @return TokenInterface
+     */
     public function getAuthenticationToken()
     {
         return $this->authenticationToken;
diff --git a/src/Symfony/Component/Serializer/Annotation/MaxDepth.php b/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
index 7ecefb8e39a4a..43785b292a4fb 100644
--- a/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
+++ b/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
@@ -32,6 +32,9 @@ public function __construct(private int $maxDepth)
         }
     }
 
+    /**
+     * @return int
+     */
     public function getMaxDepth()
     {
         return $this->maxDepth;
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
index 08eba7f51dab2..54977283cc100 100644
--- a/src/Symfony/Component/Translation/Translator.php
+++ b/src/Symfony/Component/Translation/Translator.php
@@ -366,6 +366,9 @@ private function loadFallbackCatalogues(string $locale): void
         }
     }
 
+    /**
+     * @return array
+     */
     protected function computeFallbackLocales(string $locale)
     {
         $this->parentLocales ??= json_decode(file_get_contents(__DIR__.'/Resources/data/parents.json'), true);
diff --git a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
index 29c2979ec0c8c..da14aed66b5d8 100644
--- a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
@@ -92,6 +92,9 @@ public function validate(mixed $value, Constraint $constraint)
         }
     }
 
+    /**
+     * @return string|bool
+     */
     protected function validateIsbn10(string $isbn)
     {
         // Choose an algorithm so that ERROR_INVALID_CHARACTERS is preferred
@@ -132,6 +135,9 @@ protected function validateIsbn10(string $isbn)
         return 0 === $checkSum % 11 ? true : Isbn::CHECKSUM_FAILED_ERROR;
     }
 
+    /**
+     * @return string|bool
+     */
     protected function validateIsbn13(string $isbn)
     {
         // Error priority:
diff --git a/src/Symfony/Component/Validator/Exception/InvalidOptionsException.php b/src/Symfony/Component/Validator/Exception/InvalidOptionsException.php
index 13a21770d2f8b..8a4fba25d0810 100644
--- a/src/Symfony/Component/Validator/Exception/InvalidOptionsException.php
+++ b/src/Symfony/Component/Validator/Exception/InvalidOptionsException.php
@@ -22,6 +22,9 @@ public function __construct(string $message, array $options)
         $this->options = $options;
     }
 
+    /**
+     * @return array
+     */
     public function getOptions()
     {
         return $this->options;
diff --git a/src/Symfony/Component/Validator/Exception/MissingOptionsException.php b/src/Symfony/Component/Validator/Exception/MissingOptionsException.php
index 19dd9b26ea7f0..a7eda1457d55b 100644
--- a/src/Symfony/Component/Validator/Exception/MissingOptionsException.php
+++ b/src/Symfony/Component/Validator/Exception/MissingOptionsException.php
@@ -22,6 +22,9 @@ public function __construct(string $message, array $options)
         $this->options = $options;
     }
 
+    /**
+     * @return array
+     */
     public function getOptions()
     {
         return $this->options;
diff --git a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
index a32cd19966f03..1749dd78d2631 100644
--- a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
+++ b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
@@ -93,6 +93,9 @@ public function getName(): string
         return $this->name;
     }
 
+    /**
+     * @return string
+     */
     public function getClassName()
     {
         return $this->class;
diff --git a/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php b/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
index dc3b62198af1f..22026f46a7c51 100644
--- a/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
@@ -46,6 +46,9 @@ class AmqpCaster
         \AMQP_EX_TYPE_HEADERS => 'AMQP_EX_TYPE_HEADERS',
     ];
 
+    /**
+     * @return array
+     */
     public static function castConnection(\AMQPConnection $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -79,6 +82,9 @@ public static function castConnection(\AMQPConnection $c, array $a, Stub $stub,
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castChannel(\AMQPChannel $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -102,6 +108,9 @@ public static function castChannel(\AMQPChannel $c, array $a, Stub $stub, bool $
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castQueue(\AMQPQueue $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -125,6 +134,9 @@ public static function castQueue(\AMQPQueue $c, array $a, Stub $stub, bool $isNe
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castExchange(\AMQPExchange $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -153,6 +165,9 @@ public static function castExchange(\AMQPExchange $c, array $a, Stub $stub, bool
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castEnvelope(\AMQPEnvelope $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
diff --git a/src/Symfony/Component/VarDumper/Caster/DOMCaster.php b/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
index 8b770b8ae3874..d2d3fc1294442 100644
--- a/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
@@ -63,6 +63,9 @@ class DOMCaster
         \XML_NAMESPACE_DECL_NODE => 'XML_NAMESPACE_DECL_NODE',
     ];
 
+    /**
+     * @return array
+     */
     public static function castException(\DOMException $e, array $a, Stub $stub, bool $isNested)
     {
         $k = Caster::PREFIX_PROTECTED.'code';
@@ -73,6 +76,9 @@ public static function castException(\DOMException $e, array $a, Stub $stub, boo
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castLength($dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -82,6 +88,9 @@ public static function castLength($dom, array $a, Stub $stub, bool $isNested)
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castImplementation(\DOMImplementation $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -92,6 +101,9 @@ public static function castImplementation(\DOMImplementation $dom, array $a, Stu
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castNode(\DOMNode $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -116,6 +128,9 @@ public static function castNode(\DOMNode $dom, array $a, Stub $stub, bool $isNes
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castNameSpaceNode(\DOMNameSpaceNode $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -132,6 +147,9 @@ public static function castNameSpaceNode(\DOMNameSpaceNode $dom, array $a, Stub
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, bool $isNested, int $filter = 0)
     {
         $a += [
@@ -166,6 +184,9 @@ public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, boo
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castCharacterData(\DOMCharacterData $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -176,6 +197,9 @@ public static function castCharacterData(\DOMCharacterData $dom, array $a, Stub
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castAttr(\DOMAttr $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -189,6 +213,9 @@ public static function castAttr(\DOMAttr $dom, array $a, Stub $stub, bool $isNes
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castElement(\DOMElement $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -199,6 +226,9 @@ public static function castElement(\DOMElement $dom, array $a, Stub $stub, bool
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castText(\DOMText $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -208,6 +238,9 @@ public static function castText(\DOMText $dom, array $a, Stub $stub, bool $isNes
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castDocumentType(\DOMDocumentType $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -222,6 +255,9 @@ public static function castDocumentType(\DOMDocumentType $dom, array $a, Stub $s
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castNotation(\DOMNotation $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -232,6 +268,9 @@ public static function castNotation(\DOMNotation $dom, array $a, Stub $stub, boo
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castEntity(\DOMEntity $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -246,6 +285,9 @@ public static function castEntity(\DOMEntity $dom, array $a, Stub $stub, bool $i
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castProcessingInstruction(\DOMProcessingInstruction $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -256,6 +298,9 @@ public static function castProcessingInstruction(\DOMProcessingInstruction $dom,
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castXPath(\DOMXPath $dom, array $a, Stub $stub, bool $isNested)
     {
         $a += [
diff --git a/src/Symfony/Component/VarDumper/Caster/DateCaster.php b/src/Symfony/Component/VarDumper/Caster/DateCaster.php
index 07e8c5ea8cf55..1394a78132a17 100644
--- a/src/Symfony/Component/VarDumper/Caster/DateCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/DateCaster.php
@@ -24,6 +24,9 @@ class DateCaster
 {
     private const PERIOD_LIMIT = 3;
 
+    /**
+     * @return array
+     */
     public static function castDateTime(\DateTimeInterface $d, array $a, Stub $stub, bool $isNested, int $filter)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -47,6 +50,9 @@ public static function castDateTime(\DateTimeInterface $d, array $a, Stub $stub,
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castInterval(\DateInterval $interval, array $a, Stub $stub, bool $isNested, int $filter)
     {
         $now = new \DateTimeImmutable('@0', new \DateTimeZone('UTC'));
@@ -76,6 +82,9 @@ private static function formatInterval(\DateInterval $i): string
         return $i->format(rtrim($format));
     }
 
+    /**
+     * @return array
+     */
     public static function castTimeZone(\DateTimeZone $timeZone, array $a, Stub $stub, bool $isNested, int $filter)
     {
         $location = $timeZone->getLocation();
@@ -87,6 +96,9 @@ public static function castTimeZone(\DateTimeZone $timeZone, array $a, Stub $stu
         return $filter & Caster::EXCLUDE_VERBOSE ? $z : $z + $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castPeriod(\DatePeriod $p, array $a, Stub $stub, bool $isNested, int $filter)
     {
         $dates = [];
diff --git a/src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php b/src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php
index 129b2cb47b989..3120c3d91968d 100644
--- a/src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php
@@ -25,6 +25,9 @@
  */
 class DoctrineCaster
 {
+    /**
+     * @return array
+     */
     public static function castCommonProxy(CommonProxy $proxy, array $a, Stub $stub, bool $isNested)
     {
         foreach (['__cloner__', '__initializer__'] as $k) {
@@ -37,6 +40,9 @@ public static function castCommonProxy(CommonProxy $proxy, array $a, Stub $stub,
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castOrmProxy(OrmProxy $proxy, array $a, Stub $stub, bool $isNested)
     {
         foreach (['_entityPersister', '_identifier'] as $k) {
@@ -49,6 +55,9 @@ public static function castOrmProxy(OrmProxy $proxy, array $a, Stub $stub, bool
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castPersistentCollection(PersistentCollection $coll, array $a, Stub $stub, bool $isNested)
     {
         foreach (['snapshot', 'association', 'typeClass'] as $k) {
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
index 80a91ead0c4ec..c58e74a50a7ad 100644
--- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -46,16 +46,25 @@ class ExceptionCaster
 
     private static array $framesCache = [];
 
+    /**
+     * @return array
+     */
     public static function castError(\Error $e, array $a, Stub $stub, bool $isNested, int $filter = 0)
     {
         return self::filterExceptionArray($stub->class, $a, "\0Error\0", $filter);
     }
 
+    /**
+     * @return array
+     */
     public static function castException(\Exception $e, array $a, Stub $stub, bool $isNested, int $filter = 0)
     {
         return self::filterExceptionArray($stub->class, $a, "\0Exception\0", $filter);
     }
 
+    /**
+     * @return array
+     */
     public static function castErrorException(\ErrorException $e, array $a, Stub $stub, bool $isNested)
     {
         if (isset($a[$s = Caster::PREFIX_PROTECTED.'severity'], self::$errorTypes[$a[$s]])) {
@@ -65,6 +74,9 @@ public static function castErrorException(\ErrorException $e, array $a, Stub $st
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castThrowingCasterException(ThrowingCasterException $e, array $a, Stub $stub, bool $isNested)
     {
         $trace = Caster::PREFIX_VIRTUAL.'trace';
@@ -83,6 +95,9 @@ public static function castThrowingCasterException(ThrowingCasterException $e, a
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castSilencedErrorContext(SilencedErrorContext $e, array $a, Stub $stub, bool $isNested)
     {
         $sPrefix = "\0".SilencedErrorContext::class."\0";
@@ -110,6 +125,9 @@ public static function castSilencedErrorContext(SilencedErrorContext $e, array $
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, bool $isNested)
     {
         if (!$isNested) {
@@ -184,6 +202,9 @@ public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, boo
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, bool $isNested)
     {
         if (!$isNested) {
diff --git a/src/Symfony/Component/VarDumper/Caster/FiberCaster.php b/src/Symfony/Component/VarDumper/Caster/FiberCaster.php
index c74a9e59c4fa2..b797dbd634056 100644
--- a/src/Symfony/Component/VarDumper/Caster/FiberCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/FiberCaster.php
@@ -20,6 +20,9 @@
  */
 final class FiberCaster
 {
+    /**
+     * @return array
+     */
     public static function castFiber(\Fiber $fiber, array $a, Stub $stub, bool $isNested, int $filter = 0)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
diff --git a/src/Symfony/Component/VarDumper/Caster/IntlCaster.php b/src/Symfony/Component/VarDumper/Caster/IntlCaster.php
index 1ed91d4d6a243..a4590f4b5a905 100644
--- a/src/Symfony/Component/VarDumper/Caster/IntlCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/IntlCaster.php
@@ -21,6 +21,9 @@
  */
 class IntlCaster
 {
+    /**
+     * @return array
+     */
     public static function castMessageFormatter(\MessageFormatter $c, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -31,6 +34,9 @@ public static function castMessageFormatter(\MessageFormatter $c, array $a, Stub
         return self::castError($c, $a);
     }
 
+    /**
+     * @return array
+     */
     public static function castNumberFormatter(\NumberFormatter $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
     {
         $a += [
@@ -108,6 +114,9 @@ public static function castNumberFormatter(\NumberFormatter $c, array $a, Stub $
         return self::castError($c, $a);
     }
 
+    /**
+     * @return array
+     */
     public static function castIntlTimeZone(\IntlTimeZone $c, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -125,6 +134,9 @@ public static function castIntlTimeZone(\IntlTimeZone $c, array $a, Stub $stub,
         return self::castError($c, $a);
     }
 
+    /**
+     * @return array
+     */
     public static function castIntlCalendar(\IntlCalendar $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
     {
         $a += [
@@ -142,6 +154,9 @@ public static function castIntlCalendar(\IntlCalendar $c, array $a, Stub $stub,
         return self::castError($c, $a);
     }
 
+    /**
+     * @return array
+     */
     public static function castIntlDateFormatter(\IntlDateFormatter $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
     {
         $a += [
diff --git a/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php b/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php
index bc1fd63faa25c..2f161e8cb3210 100644
--- a/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php
@@ -23,6 +23,9 @@ class MemcachedCaster
     private static array $optionConstants;
     private static array $defaultOptions;
 
+    /**
+     * @return array
+     */
     public static function castMemcached(\Memcached $c, array $a, Stub $stub, bool $isNested)
     {
         $a += [
diff --git a/src/Symfony/Component/VarDumper/Caster/PdoCaster.php b/src/Symfony/Component/VarDumper/Caster/PdoCaster.php
index 0372a63014fcf..d68eae2166631 100644
--- a/src/Symfony/Component/VarDumper/Caster/PdoCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/PdoCaster.php
@@ -59,6 +59,9 @@ class PdoCaster
         ],
     ];
 
+    /**
+     * @return array
+     */
     public static function castPdo(\PDO $c, array $a, Stub $stub, bool $isNested)
     {
         $attr = [];
@@ -108,6 +111,9 @@ public static function castPdo(\PDO $c, array $a, Stub $stub, bool $isNested)
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castPdoStatement(\PDOStatement $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
diff --git a/src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php b/src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php
index d8e5b525341fc..0d8b3d919b009 100644
--- a/src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php
@@ -69,6 +69,9 @@ class PgSqlCaster
         'function' => \PGSQL_DIAG_SOURCE_FUNCTION,
     ];
 
+    /**
+     * @return array
+     */
     public static function castLargeObject($lo, array $a, Stub $stub, bool $isNested)
     {
         $a['seek position'] = pg_lo_tell($lo);
@@ -76,6 +79,9 @@ public static function castLargeObject($lo, array $a, Stub $stub, bool $isNested
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castLink($link, array $a, Stub $stub, bool $isNested)
     {
         $a['status'] = pg_connection_status($link);
@@ -108,6 +114,9 @@ public static function castLink($link, array $a, Stub $stub, bool $isNested)
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castResult($result, array $a, Stub $stub, bool $isNested)
     {
         $a['num rows'] = pg_num_rows($result);
diff --git a/src/Symfony/Component/VarDumper/Caster/ProxyManagerCaster.php b/src/Symfony/Component/VarDumper/Caster/ProxyManagerCaster.php
index e7120191fec10..eb6c88db6a943 100644
--- a/src/Symfony/Component/VarDumper/Caster/ProxyManagerCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ProxyManagerCaster.php
@@ -21,6 +21,9 @@
  */
 class ProxyManagerCaster
 {
+    /**
+     * @return array
+     */
     public static function castProxy(ProxyInterface $c, array $a, Stub $stub, bool $isNested)
     {
         if ($parent = get_parent_class($c)) {
diff --git a/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php b/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php
index 82b8c8affb057..9e91592bd2655 100644
--- a/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php
@@ -51,6 +51,9 @@ public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub,
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castTopic(Topic $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -62,6 +65,9 @@ public static function castTopic(Topic $c, array $a, Stub $stub, bool $isNested)
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castTopicPartition(TopicPartition $c, array $a)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -75,6 +81,9 @@ public static function castTopicPartition(TopicPartition $c, array $a)
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castMessage(Message $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -86,6 +95,9 @@ public static function castMessage(Message $c, array $a, Stub $stub, bool $isNes
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castConf(Conf $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -97,6 +109,9 @@ public static function castConf(Conf $c, array $a, Stub $stub, bool $isNested)
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castTopicConf(TopicConf $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -121,6 +136,9 @@ public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, bool $isNe
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castCollectionMetadata(CollectionMetadata $c, array $a, Stub $stub, bool $isNested)
     {
         $a += iterator_to_array($c);
@@ -128,6 +146,9 @@ public static function castCollectionMetadata(CollectionMetadata $c, array $a, S
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -140,6 +161,9 @@ public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub,
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -153,6 +177,9 @@ public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stu
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -166,6 +193,9 @@ public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stu
         return $a;
     }
 
+    /**
+     * @return array
+     */
     private static function extractMetadata(KafkaConsumer|\RdKafka $c)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
diff --git a/src/Symfony/Component/VarDumper/Caster/RedisCaster.php b/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
index f88c72a40cf86..6ff046754d88b 100644
--- a/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/RedisCaster.php
@@ -47,6 +47,9 @@ class RedisCaster
         \RedisCluster::FAILOVER_DISTRIBUTE_SLAVES => 'DISTRIBUTE_SLAVES',
     ];
 
+    /**
+     * @return array
+     */
     public static function castRedis(\Redis|Relay $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -73,6 +76,9 @@ public static function castRedis(\Redis|Relay $c, array $a, Stub $stub, bool $is
         ];
     }
 
+    /**
+     * @return array
+     */
     public static function castRedisArray(\RedisArray $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -85,6 +91,9 @@ public static function castRedisArray(\RedisArray $c, array $a, Stub $stub, bool
         ];
     }
 
+    /**
+     * @return array
+     */
     public static function castRedisCluster(\RedisCluster $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
index f6c8c7410aed1..0569278cffb5f 100644
--- a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@@ -35,6 +35,9 @@ class ReflectionCaster
         'isVariadic' => 'isVariadic',
     ];
 
+    /**
+     * @return array
+     */
     public static function castClosure(\Closure $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -71,6 +74,9 @@ public static function castClosure(\Closure $c, array $a, Stub $stub, bool $isNe
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function unsetClosureFileInfo(\Closure $c, array $a)
     {
         unset($a[Caster::PREFIX_VIRTUAL.'file'], $a[Caster::PREFIX_VIRTUAL.'line']);
@@ -92,6 +98,9 @@ public static function castGenerator(\Generator $c, array $a, Stub $stub, bool $
         return self::castReflectionGenerator($reflectionGenerator, $a, $stub, $isNested);
     }
 
+    /**
+     * @return array
+     */
     public static function castType(\ReflectionType $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -114,6 +123,9 @@ public static function castType(\ReflectionType $c, array $a, Stub $stub, bool $
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castAttribute(\ReflectionAttribute $c, array $a, Stub $stub, bool $isNested)
     {
         self::addMap($a, $c, [
@@ -124,6 +136,9 @@ public static function castAttribute(\ReflectionAttribute $c, array $a, Stub $st
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castReflectionGenerator(\ReflectionGenerator $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -159,6 +174,9 @@ public static function castReflectionGenerator(\ReflectionGenerator $c, array $a
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castClass(\ReflectionClass $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -190,6 +208,9 @@ public static function castClass(\ReflectionClass $c, array $a, Stub $stub, bool
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, array $a, Stub $stub, bool $isNested, int $filter = 0)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -248,6 +269,9 @@ public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, arra
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castClassConstant(\ReflectionClassConstant $c, array $a, Stub $stub, bool $isNested)
     {
         $a[Caster::PREFIX_VIRTUAL.'modifiers'] = implode(' ', \Reflection::getModifierNames($c->getModifiers()));
@@ -258,6 +282,9 @@ public static function castClassConstant(\ReflectionClassConstant $c, array $a,
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castMethod(\ReflectionMethod $c, array $a, Stub $stub, bool $isNested)
     {
         $a[Caster::PREFIX_VIRTUAL.'modifiers'] = implode(' ', \Reflection::getModifierNames($c->getModifiers()));
@@ -265,6 +292,9 @@ public static function castMethod(\ReflectionMethod $c, array $a, Stub $stub, bo
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castParameter(\ReflectionParameter $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -305,6 +335,9 @@ public static function castParameter(\ReflectionParameter $c, array $a, Stub $st
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castProperty(\ReflectionProperty $c, array $a, Stub $stub, bool $isNested)
     {
         $a[Caster::PREFIX_VIRTUAL.'modifiers'] = implode(' ', \Reflection::getModifierNames($c->getModifiers()));
@@ -315,6 +348,9 @@ public static function castProperty(\ReflectionProperty $c, array $a, Stub $stub
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castReference(\ReflectionReference $c, array $a, Stub $stub, bool $isNested)
     {
         $a[Caster::PREFIX_VIRTUAL.'id'] = $c->getId();
@@ -322,6 +358,9 @@ public static function castReference(\ReflectionReference $c, array $a, Stub $st
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castExtension(\ReflectionExtension $c, array $a, Stub $stub, bool $isNested)
     {
         self::addMap($a, $c, [
@@ -338,6 +377,9 @@ public static function castExtension(\ReflectionExtension $c, array $a, Stub $st
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castZendExtension(\ReflectionZendExtension $c, array $a, Stub $stub, bool $isNested)
     {
         self::addMap($a, $c, [
@@ -350,6 +392,9 @@ public static function castZendExtension(\ReflectionZendExtension $c, array $a,
         return $a;
     }
 
+    /**
+     * @return string
+     */
     public static function getSignature(array $a)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
diff --git a/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php b/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
index 6db234e86999c..f8c5344617206 100644
--- a/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
@@ -27,6 +27,9 @@ public static function castCurl(\CurlHandle $h, array $a, Stub $stub, bool $isNe
         return curl_getinfo($h);
     }
 
+    /**
+     * @return array
+     */
     public static function castDba($dba, array $a, Stub $stub, bool $isNested)
     {
         $list = dba_list();
@@ -35,6 +38,9 @@ public static function castDba($dba, array $a, Stub $stub, bool $isNested)
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castProcess($process, array $a, Stub $stub, bool $isNested)
     {
         return proc_get_status($process);
@@ -50,11 +56,17 @@ public static function castStream($stream, array $a, Stub $stub, bool $isNested)
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castStreamContext($stream, array $a, Stub $stub, bool $isNested)
     {
         return @stream_context_get_params($stream) ?: $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castGd($gd, array $a, Stub $stub, bool $isNested)
     {
         $a['size'] = imagesx($gd).'x'.imagesy($gd);
@@ -63,6 +75,9 @@ public static function castGd($gd, array $a, Stub $stub, bool $isNested)
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castOpensslX509($h, array $a, Stub $stub, bool $isNested)
     {
         $stub->cut = -1;
diff --git a/src/Symfony/Component/VarDumper/Caster/SplCaster.php b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
index 72ac5dce9d38c..ea86cb49885c1 100644
--- a/src/Symfony/Component/VarDumper/Caster/SplCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/SplCaster.php
@@ -29,16 +29,25 @@ class SplCaster
         \SplFileObject::READ_CSV => 'READ_CSV',
     ];
 
+    /**
+     * @return array
+     */
     public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, bool $isNested)
     {
         return self::castSplArray($c, $a, $stub, $isNested);
     }
 
+    /**
+     * @return array
+     */
     public static function castArrayIterator(\ArrayIterator $c, array $a, Stub $stub, bool $isNested)
     {
         return self::castSplArray($c, $a, $stub, $isNested);
     }
 
+    /**
+     * @return array
+     */
     public static function castHeap(\Iterator $c, array $a, Stub $stub, bool $isNested)
     {
         $a += [
@@ -48,6 +57,9 @@ public static function castHeap(\Iterator $c, array $a, Stub $stub, bool $isNest
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castDoublyLinkedList(\SplDoublyLinkedList $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -63,6 +75,9 @@ public static function castDoublyLinkedList(\SplDoublyLinkedList $c, array $a, S
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, bool $isNested)
     {
         static $map = [
@@ -139,6 +154,9 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, bool
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, bool $isNested)
     {
         static $map = [
@@ -176,6 +194,9 @@ public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, b
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castObjectStorage(\SplObjectStorage $c, array $a, Stub $stub, bool $isNested)
     {
         $storage = [];
@@ -197,6 +218,9 @@ public static function castObjectStorage(\SplObjectStorage $c, array $a, Stub $s
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castOuterIterator(\OuterIterator $c, array $a, Stub $stub, bool $isNested)
     {
         $a[Caster::PREFIX_VIRTUAL.'innerIterator'] = $c->getInnerIterator();
@@ -204,6 +228,9 @@ public static function castOuterIterator(\OuterIterator $c, array $a, Stub $stub
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castWeakReference(\WeakReference $c, array $a, Stub $stub, bool $isNested)
     {
         $a[Caster::PREFIX_VIRTUAL.'object'] = $c->get();
@@ -211,6 +238,9 @@ public static function castWeakReference(\WeakReference $c, array $a, Stub $stub
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castWeakMap(\WeakMap $c, array $a, Stub $stub, bool $isNested)
     {
         $map = [];
diff --git a/src/Symfony/Component/VarDumper/Caster/StubCaster.php b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
index 9318ad1f59e2f..3fef05696f038 100644
--- a/src/Symfony/Component/VarDumper/Caster/StubCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
@@ -22,6 +22,9 @@
  */
 class StubCaster
 {
+    /**
+     * @return array
+     */
     public static function castStub(Stub $c, array $a, Stub $stub, bool $isNested)
     {
         if ($isNested) {
@@ -48,6 +51,9 @@ public static function castCutArray(CutArrayStub $c, array $a, Stub $stub, bool
         return $isNested ? $c->preservedSubset : $a;
     }
 
+    /**
+     * @return array
+     */
     public static function cutInternals($obj, array $a, Stub $stub, bool $isNested)
     {
         if ($isNested) {
@@ -59,6 +65,9 @@ public static function cutInternals($obj, array $a, Stub $stub, bool $isNested)
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castEnum(EnumStub $c, array $a, Stub $stub, bool $isNested)
     {
         if ($isNested) {
@@ -82,6 +91,9 @@ public static function castEnum(EnumStub $c, array $a, Stub $stub, bool $isNeste
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castScalar(ScalarStub $scalarStub, array $a, Stub $stub)
     {
         $stub->type = Stub::TYPE_SCALAR;
diff --git a/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php b/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php
index 3b13666cc194b..ebc00f90ec8ab 100644
--- a/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/SymfonyCaster.php
@@ -31,6 +31,9 @@ class SymfonyCaster
         'format' => 'getRequestFormat',
     ];
 
+    /**
+     * @return array
+     */
     public static function castRequest(Request $request, array $a, Stub $stub, bool $isNested)
     {
         $clone = null;
@@ -46,6 +49,9 @@ public static function castRequest(Request $request, array $a, Stub $stub, bool
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castHttpClient($client, array $a, Stub $stub, bool $isNested)
     {
         $multiKey = sprintf("\0%s\0multi", $client::class);
@@ -56,6 +62,9 @@ public static function castHttpClient($client, array $a, Stub $stub, bool $isNes
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castHttpClientResponse($response, array $a, Stub $stub, bool $isNested)
     {
         $stub->cut += \count($a);
@@ -68,6 +77,9 @@ public static function castHttpClientResponse($response, array $a, Stub $stub, b
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castLazyObjectState($state, array $a, Stub $stub, bool $isNested)
     {
         if (!$isNested) {
@@ -93,6 +105,9 @@ public static function castLazyObjectState($state, array $a, Stub $stub, bool $i
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castUuid(Uuid $uuid, array $a, Stub $stub, bool $isNested)
     {
         $a[Caster::PREFIX_VIRTUAL.'toBase58'] = $uuid->toBase58();
@@ -106,6 +121,9 @@ public static function castUuid(Uuid $uuid, array $a, Stub $stub, bool $isNested
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castUlid(Ulid $ulid, array $a, Stub $stub, bool $isNested)
     {
         $a[Caster::PREFIX_VIRTUAL.'toBase58'] = $ulid->toBase58();
diff --git a/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php b/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php
index 506746b4680e8..d802bbf2a107f 100644
--- a/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/XmlReaderCaster.php
@@ -43,6 +43,9 @@ class XmlReaderCaster
         \XMLReader::XML_DECLARATION => 'XML_DECLARATION',
     ];
 
+    /**
+     * @return array
+     */
     public static function castXmlReader(\XMLReader $reader, array $a, Stub $stub, bool $isNested)
     {
         try {
diff --git a/src/Symfony/Component/VarDumper/Caster/XmlResourceCaster.php b/src/Symfony/Component/VarDumper/Caster/XmlResourceCaster.php
index ba55fcedd909d..0cf42584a07be 100644
--- a/src/Symfony/Component/VarDumper/Caster/XmlResourceCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/XmlResourceCaster.php
@@ -47,6 +47,9 @@ class XmlResourceCaster
         \XML_ERROR_EXTERNAL_ENTITY_HANDLING => 'XML_ERROR_EXTERNAL_ENTITY_HANDLING',
     ];
 
+    /**
+     * @return array
+     */
     public static function castXml($h, array $a, Stub $stub, bool $isNested)
     {
         $a['current_byte_index'] = xml_get_current_byte_index($h);
diff --git a/src/Symfony/Component/VarDumper/Server/Connection.php b/src/Symfony/Component/VarDumper/Server/Connection.php
index 97b5b94f3cf7b..23fa456bdef99 100644
--- a/src/Symfony/Component/VarDumper/Server/Connection.php
+++ b/src/Symfony/Component/VarDumper/Server/Connection.php
@@ -87,6 +87,9 @@ private static function nullErrorHandler(int $t, string $m)
         // no-op
     }
 
+    /**
+     * @psalm-return false|resource
+     */
     private function createSocket()
     {
         set_error_handler([self::class, 'nullErrorHandler']);
diff --git a/src/Symfony/Component/VarExporter/Internal/Hydrator.php b/src/Symfony/Component/VarExporter/Internal/Hydrator.php
index a1eac3d9e15a8..f665f6ee15c6e 100644
--- a/src/Symfony/Component/VarExporter/Internal/Hydrator.php
+++ b/src/Symfony/Component/VarExporter/Internal/Hydrator.php
@@ -254,6 +254,9 @@ public static function getSimpleHydrator($class)
         };
     }
 
+    /**
+     * @return array
+     */
     public static function getPropertyScopes($class)
     {
         $propertyScopes = [];
diff --git a/src/Symfony/Component/Workflow/EventListener/GuardExpression.php b/src/Symfony/Component/Workflow/EventListener/GuardExpression.php
index 9fb152567bff9..23e830cac4804 100644
--- a/src/Symfony/Component/Workflow/EventListener/GuardExpression.php
+++ b/src/Symfony/Component/Workflow/EventListener/GuardExpression.php
@@ -24,11 +24,17 @@ public function __construct(Transition $transition, string $expression)
         $this->expression = $expression;
     }
 
+    /**
+     * @return Transition
+     */
     public function getTransition()
     {
         return $this->transition;
     }
 
+    /**
+     * @return string
+     */
     public function getExpression()
     {
         return $this->expression;
diff --git a/src/Symfony/Component/Workflow/Exception/TransitionException.php b/src/Symfony/Component/Workflow/Exception/TransitionException.php
index d493e22343f39..890d8e244b5d9 100644
--- a/src/Symfony/Component/Workflow/Exception/TransitionException.php
+++ b/src/Symfony/Component/Workflow/Exception/TransitionException.php
@@ -34,6 +34,9 @@ public function __construct(object $subject, string $transitionName, WorkflowInt
         $this->context = $context;
     }
 
+    /**
+     * @return object
+     */
     public function getSubject()
     {
         return $this->subject;
diff --git a/src/Symfony/Component/Workflow/Marking.php b/src/Symfony/Component/Workflow/Marking.php
index 36deb2d4086c6..dba7c3dcfbf54 100644
--- a/src/Symfony/Component/Workflow/Marking.php
+++ b/src/Symfony/Component/Workflow/Marking.php
@@ -41,11 +41,17 @@ public function unmark(string $place)
         unset($this->places[$place]);
     }
 
+    /**
+     * @return bool
+     */
     public function has(string $place)
     {
         return isset($this->places[$place]);
     }
 
+    /**
+     * @return array
+     */
     public function getPlaces()
     {
         return $this->places;
diff --git a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
index a4b2eccd899e9..06340a61bb398 100644
--- a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
+++ b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
@@ -76,6 +76,9 @@ public function aParentService(): Service1
     {
     }
 
+    /**
+     * @return ContainerInterface|null
+     */
     public function setContainer(ContainerInterface $container)
     {
         return $container;

From 384c9a6040460e10d12e927755647062e5c96ba1 Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Mon, 13 Feb 2023 00:00:27 +0100
Subject: [PATCH 196/475] Add PHP types to private methods and functions

---
 .github/expected-missing-return-types.diff    | 120 +++++++-----------
 ...gisterEventListenersAndSubscribersPass.php |   2 +-
 .../Constraints/UniqueEntityValidator.php     |   2 +-
 .../PhpUnit/DeprecationErrorHandler.php       |   2 +-
 .../DeprecationErrorHandler/Configuration.php |  70 +++-------
 .../DeprecationErrorHandler/Deprecation.php   |   2 +-
 .../DeprecationGroup.php                      |   8 +-
 .../DeprecationNotice.php                     |   4 +-
 .../Bridge/Twig/Command/LintCommand.php       |   4 +-
 .../Twig/DataCollector/TwigDataCollector.php  |  18 +--
 .../Command/AbstractConfigCommand.php         |   2 +-
 .../Console/Descriptor/Descriptor.php         |  28 ++--
 .../Console/Descriptor/JsonDescriptor.php     |  26 ++--
 .../Console/Descriptor/MarkdownDescriptor.php |  22 ++--
 .../Console/Descriptor/TextDescriptor.php     |  28 ++--
 .../Console/Descriptor/XmlDescriptor.php      |  28 ++--
 .../DependencyInjection/SecurityExtension.php |   4 +-
 .../Twig/WebProfilerExtension.php             |   6 +-
 src/Symfony/Component/Asset/UrlPackage.php    |   2 +-
 .../DependencyInjection/CachePoolPass.php     |   4 +-
 .../Cache/Traits/AbstractAdapterTrait.php     |   2 +-
 .../Cache/Traits/FilesystemCommonTrait.php    |   7 +-
 .../Component/Config/Loader/FileLoader.php    |   2 +-
 .../Component/Console/Helper/Table.php        |   2 +-
 .../Component/CssSelector/Parser/Reader.php   |   9 +-
 .../ErrorRenderer/HtmlErrorRenderer.php       |   8 +-
 .../ExpressionLanguage/Node/ArgumentsNode.php |   4 +-
 .../ExpressionLanguage/Node/ArrayNode.php     |  12 +-
 .../ExpressionLanguage/Node/BinaryNode.php    |   6 +-
 .../Node/ConditionalNode.php                  |   4 +-
 .../ExpressionLanguage/Node/ConstantNode.php  |   6 +-
 .../ExpressionLanguage/Node/GetAttrNode.php   |   9 +-
 .../ExpressionLanguage/Node/NameNode.php      |   6 +-
 .../Node/NullCoalesceNode.php                 |   6 +-
 .../Form/Console/Descriptor/Descriptor.php    |  16 +--
 .../Console/Descriptor/JsonDescriptor.php     |  10 +-
 .../Console/Descriptor/TextDescriptor.php     |   6 +-
 .../Form/Extension/Core/Type/ChoiceType.php   |   4 +-
 .../Form/Extension/Core/Type/DateType.php     |   8 +-
 .../Form/Extension/Core/Type/FileType.php     |   4 +-
 .../DataCollector/LoggerDataCollector.php     |   2 +-
 .../HttpKernel/Debug/FileLinkFormatter.php    |   5 +-
 .../Data/Generator/AbstractDataGenerator.php  |   2 +-
 .../Data/Generator/CurrencyDataGenerator.php  |   4 +-
 .../Data/Generator/LanguageDataGenerator.php  |   4 +-
 .../Data/Generator/RegionDataGenerator.php    |   6 +-
 .../Data/Generator/ScriptDataGenerator.php    |   4 +-
 .../Data/Generator/TimezoneDataGenerator.php  |   4 +-
 .../Util/ArrayAccessibleResourceBundle.php    |   4 +-
 .../DataCollector/MessengerDataCollector.php  |   2 +-
 src/Symfony/Component/Mime/Email.php          |   5 +-
 src/Symfony/Component/Process/Process.php     |   2 +-
 .../Component/RateLimiter/Policy/Window.php   |   2 +-
 .../Matcher/Dumper/StaticPrefixCollection.php |   4 +-
 src/Symfony/Component/Routing/Route.php       |   2 +-
 .../Core/User/InMemoryUserProvider.php        |   8 +-
 .../Authenticator/JsonLoginAuthenticator.php  |   2 +-
 .../Security/Http/Firewall/AccessListener.php |   2 +-
 .../ClassDiscriminatorFromClassMetadata.php   |   2 +-
 .../Translation/Command/XliffLintCommand.php  |   4 +-
 .../TranslationDataCollector.php              |   6 +-
 .../Translation/Dumper/IcuResFileDumper.php   |   2 +-
 .../Translation/Dumper/PoFileDumper.php       |   2 +-
 .../Translation/Dumper/XliffFileDumper.php    |   4 +-
 .../Translation/Extractor/PhpExtractor.php    |   2 +-
 .../Resources/bin/translation-status.php      |   6 +-
 .../Test/ConstraintValidatorTestCase.php      |   8 +-
 .../Component/VarDumper/Dumper/HtmlDumper.php |   2 +-
 .../Workflow/Dumper/MermaidDumper.php         |  19 +--
 .../Component/Yaml/Command/LintCommand.php    |   2 +-
 70 files changed, 294 insertions(+), 342 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index cdd739519fc73..ab6b6b4cf122f 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -252,6 +252,17 @@ index 18f7ba0fb0..7f37cb6d9b 100644
 +    protected function start(string $name): TraceableAdapterEvent
      {
          $this->calls[] = $event = new TraceableAdapterEvent();
+diff --git a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
+index 2ee96e9b37..f49ed24f68 100644
+--- a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
++++ b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
+@@ -81,5 +81,5 @@ trait FilesystemCommonTrait
+      * @return bool
+      */
+-    protected function doUnlink(string $file)
++    protected function doUnlink(string $file): bool
+     {
+         return @unlink($file);
 diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
 index 7cda0bc7d8..b2311826f4 100644
 --- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
@@ -350,7 +361,7 @@ index e3ca1d49c4..526d350484 100644
 +    public function locate(string $name, string $currentPath = null, bool $first = true): string|array;
  }
 diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
-index 30034e55a5..d6a57be190 100644
+index 3f06f0c38c..ce0fd1d76d 100644
 --- a/src/Symfony/Component/Config/Loader/FileLoader.php
 +++ b/src/Symfony/Component/Config/Loader/FileLoader.php
 @@ -67,5 +67,5 @@ abstract class FileLoader extends Loader
@@ -552,7 +563,7 @@ index 2762cdf05c..737334268a 100644
 +    public function getName(): string;
  }
 diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
-index 893b3192e9..94822ed191 100644
+index 7d31794be3..1c311aded2 100644
 --- a/src/Symfony/Component/Console/Helper/Table.php
 +++ b/src/Symfony/Component/Console/Helper/Table.php
 @@ -193,5 +193,5 @@ class Table
@@ -609,6 +620,17 @@ index 74d885d131..3de806a60e 100644
 +    protected function getErrorOutput(): OutputInterface
      {
          if (!$this->output instanceof ConsoleOutputInterface) {
+diff --git a/src/Symfony/Component/CssSelector/Parser/Reader.php b/src/Symfony/Component/CssSelector/Parser/Reader.php
+index 7f6ae7a600..d79db02567 100644
+--- a/src/Symfony/Component/CssSelector/Parser/Reader.php
++++ b/src/Symfony/Component/CssSelector/Parser/Reader.php
+@@ -57,5 +57,5 @@ class Reader
+      * @return int|false
+      */
+-    public function getOffset(string $string): int|bool
++    public function getOffset(string $string): int|false
+     {
+         $position = strpos($this->source, $string, $this->position);
 diff --git a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
 index b4e982c457..521a9531f8 100644
 --- a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
@@ -853,30 +875,8 @@ index 479aeef880..272954c082 100644
 -    public function getFunctions();
 +    public function getFunctions(): array;
  }
-diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
-index e1a3169b00..e5dc5bfe21 100644
---- a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
-+++ b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
-@@ -45,5 +45,5 @@ class ArrayNode extends Node
-     }
- 
--    public function evaluate(array $functions, array $values)
-+    public function evaluate(array $functions, array $values): mixed
-     {
-         $result = [];
-diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
-index 0b31c66ded..e798ef8f2f 100644
---- a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
-+++ b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
-@@ -93,5 +93,5 @@ class BinaryNode extends Node
-     }
- 
--    public function evaluate(array $functions, array $values)
-+    public function evaluate(array $functions, array $values): mixed
-     {
-         $operator = $this->attributes['operator'];
 diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
-index ba78a2848e..f805b5655e 100644
+index fec02abaae..7d02544275 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
 +++ b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
 @@ -41,5 +41,5 @@ class ConditionalNode extends Node
@@ -886,17 +886,6 @@ index ba78a2848e..f805b5655e 100644
 +    public function evaluate(array $functions, array $values): mixed
      {
          if ($this->nodes['expr1']->evaluate($functions, $values)) {
-diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
-index 869e350dc9..f1c1ad5bd3 100644
---- a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
-+++ b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
-@@ -39,5 +39,5 @@ class ConstantNode extends Node
-     }
- 
--    public function evaluate(array $functions, array $values)
-+    public function evaluate(array $functions, array $values): mixed
-     {
-         return $this->attributes['value'];
 diff --git a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
 index 06078da305..cc11697293 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
@@ -915,28 +904,6 @@ index 06078da305..cc11697293 100644
 +    public function toArray(): array
      {
          $array = [];
-diff --git a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
-index e9b10c3295..7aefd9bb84 100644
---- a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
-+++ b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
-@@ -66,5 +66,5 @@ class GetAttrNode extends Node
-     }
- 
--    public function evaluate(array $functions, array $values)
-+    public function evaluate(array $functions, array $values): mixed
-     {
-         switch ($this->attributes['type']) {
-diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
-index e017e967a1..8ea5bcf28c 100644
---- a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
-+++ b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
-@@ -34,5 +34,5 @@ class NameNode extends Node
-     }
- 
--    public function evaluate(array $functions, array $values)
-+    public function evaluate(array $functions, array $values): mixed
-     {
-         return $values[$this->attributes['name']];
 diff --git a/src/Symfony/Component/ExpressionLanguage/Node/Node.php b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
 index eb5046c9bf..ef142d3787 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Node/Node.php
@@ -969,17 +936,6 @@ index eb5046c9bf..ef142d3787 100644
 +    protected function isHash(array $value): bool
      {
          $expectedKey = 0;
-diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php
-index 3e59ef8676..b6371df241 100644
---- a/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php
-+++ b/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php
-@@ -37,5 +37,5 @@ class NullCoalesceNode extends Node
-     }
- 
--    public function evaluate(array $functions, array $values)
-+    public function evaluate(array $functions, array $values): mixed
-     {
-         if ($this->nodes['expr1'] instanceof GetAttrNode) {
 diff --git a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
 index 9e30d848eb..ee82938d8a 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
@@ -1392,6 +1348,17 @@ index d894b7e74c..f0d6d32f0a 100644
 +    protected function guessRoute(Request $request, string|object|array $controller): string
      {
          return 'n/a';
+diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
+index fcb100859f..8bf3ef09d5 100644
+--- a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
++++ b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
+@@ -53,5 +53,5 @@ class FileLinkFormatter
+      * @return string|false
+      */
+-    public function format(string $file, int $line): string|bool
++    public function format(string $file, int $line): string|false
+     {
+         if ($fmt = $this->getFileLinkFormat()) {
 diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
 index 3650d1700d..055b57fc77 100644
 --- a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
@@ -1978,6 +1945,17 @@ index 69ac3d6ec4..d96c7d038d 100644
 +    public function getMessageKey(): string
      {
          return 'An authentication exception occurred.';
+diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
+index b4ffa1dcd4..dd3c58a6d0 100644
+--- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
++++ b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
+@@ -98,5 +98,5 @@ class InMemoryUserProvider implements UserProviderInterface
+      * @return InMemoryUser change return type on 7.0
+      */
+-    private function getUser(string $username): UserInterface
++    private function getUser(string $username): InMemoryUser
+     {
+         if (!isset($this->users[strtolower($username)])) {
 diff --git a/src/Symfony/Component/Security/Core/User/UserProviderInterface.php b/src/Symfony/Component/Security/Core/User/UserProviderInterface.php
 index ec90d413fa..9f1401aa91 100644
 --- a/src/Symfony/Component/Security/Core/User/UserProviderInterface.php
@@ -2286,7 +2264,7 @@ index 1749dd78d2..250b46bdd3 100644
      {
          return $this->class;
 diff --git a/src/Symfony/Comp
10000
onent/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
-index edac8395df..f3998dc4dd 100644
+index 1b2457707f..5811aa8106 100644
 --- a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
 +++ b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
 @@ -295,5 +295,5 @@ abstract class ConstraintValidatorTestCase extends TestCase
@@ -3192,7 +3170,7 @@ index dba7c3dcfb..dce66ea6b9 100644
      {
          return $this->places;
 diff --git a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
-index cfe1c09b6e..de62f635f9 100644
+index 06340a61bb..2654d15b9a 100644
 --- a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
 +++ b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
 @@ -80,5 +80,5 @@ class ParentTestService
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
index 30d0fb37ced80..bf68ec0dcc109 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -124,7 +124,7 @@ private function addTaggedServices(ContainerBuilder $container): array
         return $listenerRefs;
     }
 
-    private function getEventManagerDef(ContainerBuilder $container, string $name)
+    private function getEventManagerDef(ContainerBuilder $container, string $name): Definition
     {
         if (!isset($this->eventManagers[$name])) {
             $this->eventManagers[$name] = $container->getDefinition(sprintf($this->managerTemplate, $name));
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
index 71d73d88a4a44..2363cf1cfe162 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -193,7 +193,7 @@ public function validate(mixed $entity, Constraint $constraint)
             ->addViolation();
     }
 
-    private function formatWithIdentifiers(ObjectManager $em, ClassMetadata $class, mixed $value)
+    private function formatWithIdentifiers(ObjectManager $em, ClassMetadata $class, mixed $value): string
     {
         if (!\is_object($value) || $value instanceof \DateTimeInterface) {
             return $this->formatValue($value, self::PRETTY_DATE);
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
index 36c0960868dad..f40cea0140f7c 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -354,7 +354,7 @@ private function displayDeprecations($groups, $configuration)
         }
     }
 
-    private static function getPhpUnitErrorHandler()
+    private static function getPhpUnitErrorHandler(): callable
     {
         if (!$eh = self::$errorHandler) {
             if (class_exists(Handler::class)) {
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php
index 45d1ed7ce9940..850630ab7169f 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php
@@ -154,20 +154,15 @@ private function __construct(array $thresholds = [], $regex = '', $verboseOutput
         $this->logFile = $logFile;
     }
 
-    /**
-     * @return bool
-     */
-    public function isEnabled()
+    public function isEnabled(): bool
     {
         return $this->enabled;
     }
 
     /**
      * @param DeprecationGroup[] $deprecationGroups
-     *
-     * @return bool
      */
-    public function tolerates(array $deprecationGroups)
+    public function tolerates(array $deprecationGroups): bool
     {
         $grandTotal = 0;
 
@@ -229,10 +224,7 @@ public function toleratesForGroup(string $groupName, array $deprecationGroups):
         return true;
     }
 
-    /**
-     * @return bool
-     */
-    public function isBaselineDeprecation(Deprecation $deprecation)
+    public function isBaselineDeprecation(Deprecation $deprecation): bool
     {
         if ($deprecation->isLegacy()) {
             return false;
@@ -260,20 +252,17 @@ public function isBaselineDeprecation(Deprecation $deprecation)
         return $result;
     }
 
-    /**
-     * @return bool
-     */
-    public function isGeneratingBaseline()
+    public function isGeneratingBaseline(): bool
     {
         return $this->generateBaseline;
     }
 
-    public function getBaselineFile()
+    public function getBaselineFile(): string
     {
         return $this->baselineFile;
     }
 
-    public function writeBaseline()
+    public function writeBaseline(): void
     {
         $map = [];
         foreach ($this->baselineDeprecations as $location => $messages) {
@@ -290,36 +279,28 @@ public function writeBaseline()
 
     /**
      * @param string $message
-     *
-     * @return bool
      */
-    public function shouldDisplayStackTrace($message)
+    public function shouldDisplayStackTrace($message): bool
     {
         return '' !== $this->regex && preg_match($this->regex, $message);
     }
 
-    /**
-     * @return bool
-     */
-    public function isInRegexMode()
+    public function isInRegexMode(): bool
     {
         return '' !== $this->regex;
     }
 
-    /**
-     * @return bool
-     */
-    public function verboseOutput($group)
+    public function verboseOutput($group): bool
     {
         return $this->verboseOutput[$group];
     }
 
-    public function shouldWriteToLogFile()
+    public function shouldWriteToLogFile(): bool
     {
         return null !== $this->logFile;
     }
 
-    public function getLogFile()
+    public function getLogFile(): ?string
     {
         return $this->logFile;
     }
@@ -327,10 +308,8 @@ public function getLogFile()
     /**
      * @param string $serializedConfiguration an encoded string, for instance
      *                                        max[total]=1234&max[indirect]=42
-     *
-     * @return self
      */
-    public static function fromUrlEncodedString($serializedConfiguration)
+    public static function fromUrlEncodedString($serializedConfiguration): self
     {
         parse_str($serializedConfiguration, $normalizedConfiguration);
         foreach (array_keys($normalizedConfiguration) as $key) {
@@ -376,10 +355,7 @@ public static function fromUrlEncodedString($serializedConfiguration)
         );
     }
 
-    /**
-     * @return self
-     */
-    public static function inDisabledMode()
+    public static function inDisabledMode(): self
     {
         $configuration = new self();
         $configuration->enabled = false;
@@ -387,18 +363,12 @@ public static function inDisabledMode()
         return $configuration;
     }
 
-    /**
-     * @return self
-     */
-    public static function inStrictMode()
+    public static function inStrictMode(): self
     {
         return new self(['total' => 0]);
     }
 
-    /**
-     * @return self
-     */
-    public static function inWeakMode()
+    public static function inWeakMode(): self
     {
         $verboseOutput = [];
         foreach (['unsilenced', 'direct', 'indirect', 'self', 'other'] as $group) {
@@ -408,18 +378,12 @@ public static function inWeakMode()
         return new self([], '', $verboseOutput);
     }
 
-    /**
-     * @return self
-     */
-    public static function fromNumber($upperBound)
+    public static function fromNumber($upperBound): self
     {
         return new self(['total' => $upperBound]);
     }
 
-    /**
-     * @return self
-     */
-    public static function fromRegex($regex)
+    public static function fromRegex($regex): self
     {
         return new self([], $regex);
     }
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
index e014104d3f012..e18d9b1a289f2 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
@@ -356,7 +356,7 @@ private static function getVendors()
         return self::$vendors;
     }
 
-    private static function addSourcePathsFromPrefixes(array $prefixesByNamespace, array $paths)
+    private static function addSourcePathsFromPrefixes(array $prefixesByNamespace, array $paths): array
     {
         foreach ($prefixesByNamespace as $prefixes) {
             foreach ($prefixes as $prefix) {
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/DeprecationGroup.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/DeprecationGroup.php
index 6ad2b84ea3fd6..23b95e19fc3d4 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/DeprecationGroup.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/DeprecationGroup.php
@@ -50,20 +50,18 @@ public function addNotice()
 
     /**
      * @param string $message
-     *
-     * @return DeprecationNotice
      */
-    private function deprecationNotice($message)
+    private function deprecationNotice($message): DeprecationNotice
     {
         return $this->deprecationNotices[$message] ?? $this->deprecationNotices[$message] = new DeprecationNotice();
     }
 
-    public function count()
+    public function count(): int
     {
         return $this->count;
     }
 
-    public function notices()
+    public function notices(): array
     {
         return $this->deprecationNotices;
     }
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/DeprecationNotice.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/DeprecationNotice.php
index 854bbd4d26333..7cb77b8927498 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/DeprecationNotice.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/DeprecationNotice.php
@@ -37,12 +37,12 @@ public function addProceduralOccurrence()
         ++$this->count;
     }
 
-    public function getCountsByCaller()
+    public function getCountsByCaller(): array
     {
         return $this->countsByCaller;
     }
 
-    public function count()
+    public function count(): int
     {
         return $this->count;
     }
diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
index 54f4e233b884d..1429f4ffcd9e4 100644
--- a/src/Symfony/Bridge/Twig/Command/LintCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/LintCommand.php
@@ -179,7 +179,7 @@ private function display(InputInterface $input, OutputInterface $output, Symfony
         };
     }
 
-    private function displayTxt(OutputInterface $output, SymfonyStyle $io, array $filesInfo, bool $errorAsGithubAnnotations = false)
+    private function displayTxt(OutputInterface $output, SymfonyStyle $io, array $filesInfo, bool $errorAsGithubAnnotations = false): int
     {
         $errors = 0;
         $githubReporter = $errorAsGithubAnnotations ? new GithubActionReporter($output) : null;
@@ -254,7 +254,7 @@ private function renderException(SymfonyStyle $output, string $template, Error $
         }
     }
 
-    private function getContext(string $template, int $line, int $context = 3)
+    private function getContext(string $template, int $line, int $context = 3): array
     {
         $lines = explode("\n", $template);
 
diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
index a8da618bc0738..2366433f4eebd 100644
--- a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
+++ b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
@@ -78,37 +78,37 @@ public function lateCollect()
         $templateFinder($this->profile);
     }
 
-    public function getTime()
+    public function getTime(): int
     {
         return $this->getProfile()->getDuration() * 1000;
     }
 
-    public function getTemplateCount()
+    public function getTemplateCount(): int
     {
         return $this->getComputedData('template_count');
     }
 
-    public function getTemplatePaths()
+    public function getTemplatePaths(): array
     {
         return $this->data['template_paths'];
     }
 
-    public function getTemplates()
+    public function getTemplates(): array
     {
         return $this->getComputedData('templates');
     }
 
-    public function getBlockCount()
+    public function getBlockCount(): int
     {
         return $this->getComputedData('block_count');
     }
 
-    public function getMacroCount()
+    public function getMacroCount(): int
     {
         return $this->getComputedData('macro_count');
     }
 
-    public function getHtmlCallGraph()
+    public function getHtmlCallGraph(): Markup
     {
         $dumper = new HtmlDumper();
         $dump = $dumper->dump($this->getProfile());
@@ -129,7 +129,7 @@ public function getHtmlCallGraph()
         return new Markup($dump, 'UTF-8');
     }
 
-    public function getProfile()
+    public function getProfile(): Profile
     {
         return $this->profile ??= unserialize($this->data['profile'], ['allowed_classes' => ['Twig_Profiler_Profile', Profile::class]]);
     }
@@ -141,7 +141,7 @@ private function getComputedData(string $index)
         return $this->computed[$index];
     }
 
-    private function computeData(Profile $profile)
+    private function computeData(Profile $profile): array
     {
         $data = [
             'template_count' => 0,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
index 5c392895eb31f..5774a7c6f5906 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
@@ -129,7 +129,7 @@ public function validateConfiguration(ExtensionInterface $extension, mixed $conf
         }
     }
 
-    private function initializeBundles()
+    private function initializeBundles(): array
     {
         // Re-build bundle manually to initialize DI extensions that can be extended by other bundles in their build() method
         // as this method is not called when the container is loaded from the cache.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
index 49c7ddea1fdfa..807f8d1bc8c21 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -38,7 +38,7 @@ abstract class Descriptor implements DescriptorInterface
      */
     protected $output;
 
-    public function describe(OutputInterface $output, mixed $object, array $options = [])
+    public function describe(OutputInterface $output, mixed $object, array $options = []): void
     {
         $this->output = $output;
 
@@ -73,18 +73,18 @@ protected function getOutput(): OutputInterface
         return $this->output;
     }
 
-    protected function write(string $content, bool $decorated = false)
+    protected function write(string $content, bool $decorated = false): void
     {
         $this->output->write($content, false, $decorated ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW);
     }
 
-    abstract protected function describeRouteCollection(RouteCollection $routes, array $options = []);
+    abstract protected function describeRouteCollection(RouteCollection $routes, array $options = []): void;
 
-    abstract protected function describeRoute(Route $route, array $options = []);
+    abstract protected function describeRoute(Route $route, array $options = []): void;
 
-    abstract protected function describeContainerParameters(ParameterBag $parameters, array $options = []);
+    abstract protected function describeContainerParameters(ParameterBag $parameters, array $options = []): void;
 
-    abstract protected function describeContainerTags(ContainerBuilder $builder, array $options = []);
+    abstract protected function describeContainerTags(ContainerBuilder $builder, array $options = []): void;
 
     /**
      * Describes a container service by its name.
@@ -94,7 +94,7 @@ abstract protected function describeContainerTags(ContainerBuilder $builder, arr
      *
      * @param Definition|Alias|object $service
      */
-    abstract protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null);
+    abstract protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null): void;
 
     /**
      * Describes container services.
@@ -102,17 +102,17 @@ abstract protected function describeContainerService(object $service, array $opt
      * Common options are:
      * * tag: filters described services by given tag
      */
-    abstract protected function describeContainerServices(ContainerBuilder $builder, array $options = []);
+    abstract protected function describeContainerServices(ContainerBuilder $builder, array $options = []): void;
 
     abstract protected function describeContainerDeprecations(ContainerBuilder $builder, array $options = []): void;
 
-    abstract protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $builder = null);
+    abstract protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $builder = null): void;
 
-    abstract protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null);
+    abstract protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null): void;
 
-    abstract protected function describeContainerParameter(mixed $parameter, array $options = []);
+    abstract protected function describeContainerParameter(mixed $parameter, array $options = []): void;
 
-    abstract protected function describeContainerEnvVars(array $envs, array $options = []);
+    abstract protected function describeContainerEnvVars(array $envs, array $options = []): void;
 
     /**
      * Describes event dispatcher listeners.
@@ -214,7 +214,7 @@ protected function findDefinitionsByTag(ContainerBuilder $builder, bool $showHid
         return $definitions;
     }
 
-    protected function sortParameters(ParameterBag $parameters)
+    protected function sortParameters(ParameterBag $parameters): array
     {
         $parameters = $parameters->all();
         ksort($parameters);
@@ -222,7 +222,7 @@ protected function sortParameters(ParameterBag $parameters)
         return $parameters;
     }
 
-    protected function sortServiceIds(array $serviceIds)
+    protected function sortServiceIds(array $serviceIds): array
     {
         asort($serviceIds);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
index f8970832989c0..5806fd32f8ad8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -32,7 +32,7 @@
  */
 class JsonDescriptor extends Descriptor
 {
-    protected function describeRouteCollection(RouteCollection $routes, array $options = [])
+    protected function describeRouteCollection(RouteCollection $routes, array $options = []): void
     {
         $data = [];
         foreach ($routes->all() as $name => $route) {
@@ -42,17 +42,17 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
         $this->writeData($data, $options);
     }
 
-    protected function describeRoute(Route $route, array $options = [])
+    protected function describeRoute(Route $route, array $options = []): void
     {
         $this->writeData($this->getRouteData($route), $options);
     }
 
-    protected function describeContainerParameters(ParameterBag $parameters, array $options = [])
+    protected function describeContainerParameters(ParameterBag $parameters, array $options = []): void
     {
         $this->writeData($this->sortParameters($parameters), $options);
     }
 
-    protected function describeContainerTags(ContainerBuilder $builder, array $options = [])
+    protected function describeContainerTags(ContainerBuilder $builder, array $options = []): void
     {
         $showHidden = isset($options['show_hidden']) && $options['show_hidden'];
         $data = [];
@@ -67,7 +67,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
         $this->writeData($data, $options);
     }
 
-    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null): void
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -82,7 +82,7 @@ protected function describeContainerService(object $service, array $options = []
         }
     }
 
-    protected function describeContainerServices(ContainerBuilder $builder, array $options = [])
+    protected function describeContainerServices(ContainerBuilder $builder, array $options = []): void
     {
         $serviceIds = isset($options['tag']) && $options['tag']
             ? $this->sortTaggedServicesByPriority($builder->findTaggedServiceIds($options['tag']))
@@ -115,12 +115,12 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
         $this->writeData($data, $options);
     }
 
-    protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $builder = null): void
     {
         $this->writeData($this->getContainerDefinitionData($definition, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments'], $builder, $options['id'] ?? null), $options);
     }
 
-    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null): void
     {
         if (!$builder) {
             $this->writeData($this->getContainerAliasData($alias), $options);
@@ -134,24 +134,24 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
         );
     }
 
-    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
+    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = []): void
     {
         $this->writeData($this->getEventDispatcherListenersData($eventDispatcher, $options), $options);
     }
 
-    protected function describeCallable(mixed $callable, array $options = [])
+    protected function describeCallable(mixed $callable, array $options = []): void
     {
         $this->writeData($this->getCallableData($callable), $options);
     }
 
-    protected function describeContainerParameter(mixed $parameter, array $options = [])
+    protected function describeContainerParameter(mixed $parameter, array $options = []): void
     {
         $key = $options['parameter'] ?? '';
 
         $this->writeData([$key => $parameter], $options);
     }
 
-    protected function describeContainerEnvVars(array $envs, array $options = [])
+    protected function describeContainerEnvVars(array $envs, array $options = []): void
     {
         throw new LogicException('Using the JSON format to debug environment variables is not supported.');
     }
@@ -180,7 +180,7 @@ protected function describeContainerDeprecations(ContainerBuilder $builder, arra
         $this->writeData(['remainingCount' => $remainingCount, 'deprecations' => $formattedLogs], $options);
     }
 
-    private function writeData(array $data, array $options)
+    private function writeData(array $data, array $options): void
     {
         $flags = $options['json_encoding'] ?? 0;
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
index 164543eebb234..1424001c5e81b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -29,7 +29,7 @@
  */
 class MarkdownDescriptor extends Descriptor
 {
-    protected function describeRouteCollection(RouteCollection $routes, array $options = [])
+    protected function describeRouteCollection(RouteCollection $routes, array $options = []): void
     {
         $first = true;
         foreach ($routes->all() as $name => $route) {
@@ -43,7 +43,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
         $this->write("\n");
     }
 
-    protected function describeRoute(Route $route, array $options = [])
+    protected function describeRoute(Route $route, array $options = []): void
     {
         $output = '- Path: '.$route->getPath()
             ."\n".'- Path Regex: '.$route->compile()->getRegex()
@@ -66,7 +66,7 @@ protected function describeRoute(Route $route, array $options = [])
         $this->write("\n");
     }
 
-    protected function describeContainerParameters(ParameterBag $parameters, array $options = [])
+    protected function describeContainerParameters(ParameterBag $parameters, array $options = []): void
     {
         $this->write("Container parameters\n====================\n");
         foreach ($this->sortParameters($parameters) as $key => $value) {
@@ -74,7 +74,7 @@ protected function describeContainerParameters(ParameterBag $parameters, array $
         }
     }
 
-    protected function describeContainerTags(ContainerBuilder $builder, array $options = [])
+    protected function describeContainerTags(ContainerBuilder $builder, array $options = []): void
     {
         $showHidden = isset($options['show_hidden']) && $options['show_hidden'];
         $this->write("Container tags\n==============");
@@ -88,7 +88,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
         }
     }
 
-    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null): void
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -132,7 +132,7 @@ protected function describeContainerDeprecations(ContainerBuilder $builder, arra
         }
     }
 
-    protected function describeContainerServices(ContainerBuilder $builder, array $options = [])
+    protected function describeContainerServices(ContainerBuilder $builder, array $options = []): void
     {
         $showHidden = isset($options['show_hidden']) && $options['show_hidden'];
 
@@ -193,7 +193,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
         }
     }
 
-    protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $builder = null): void
     {
         $output = '';
 
@@ -263,7 +263,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
         $this->write(isset($options['id']) ? sprintf("### %s\n\n%s\n", $options['id'], $output) : $output);
     }
 
-    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null): void
     {
         $output = '- Service: `'.$alias.'`'
             ."\n".'- Public: '.($alias->isPublic() && !$alias->isPrivate() ? 'yes' : 'no');
@@ -284,17 +284,17 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
         $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]), $builder);
     }
 
-    protected function describeContainerParameter(mixed $parameter, array $options = [])
+    protected function describeContainerParameter(mixed $parameter, array $options = []): void
     {
         $this->write(isset($options['parameter']) ? sprintf("%s\n%s\n\n%s", $options['parameter'], str_repeat('=', \strlen($options['parameter'])), $this->formatParameter($parameter)) : $parameter);
     }
 
-    protected function describeContainerEnvVars(array $envs, array $options = [])
+    protected function describeContainerEnvVars(array $envs, array $options = []): void
     {
         throw new LogicException('Using the markdown format to debug environment variables is not supported.');
     }
 
-    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
+    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = []): void
     {
         $event = $options['event'] ?? null;
         $dispatcherServiceName = $options['dispatcher_service_name'] ?? null;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
index 04bd75c3facab..a0d749899b609 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -44,7 +44,7 @@ public function __construct(FileLinkFormatter $fileLinkFormatter = null)
         $this->fileLinkFormatter = $fileLinkFormatter;
     }
 
-    protected function describeRouteCollection(RouteCollection $routes, array $options = [])
+    protected function describeRouteCollection(RouteCollection $routes, array $options = []): void
     {
         $showControllers = isset($options['show_controllers']) && $options['show_controllers'];
 
@@ -81,7 +81,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
         }
     }
 
-    protected function describeRoute(Route $route, array $options = [])
+    protected function describeRoute(Route $route, array $options = []): void
     {
         $defaults = $route->getDefaults();
         if (isset($defaults['_controller'])) {
@@ -112,7 +112,7 @@ protected function describeRoute(Route $route, array $options = [])
         $table->render();
     }
 
-    protected function describeContainerParameters(ParameterBag $parameters, array $options = [])
+    protected function describeContainerParameters(ParameterBag $parameters, array $options = []): void
     {
         $tableHeaders = ['Parameter', 'Value'];
 
@@ -125,7 +125,7 @@ protected function describeContainerParameters(ParameterBag $parameters, array $
         $options['output']->table($tableHeaders, $tableRows);
     }
 
-    protected function describeContainerTags(ContainerBuilder $builder, array $options = [])
+    protected function describeContainerTags(ContainerBuilder $builder, array $options = []): void
     {
         $showHidden = isset($options['show_hidden']) && $options['show_hidden'];
 
@@ -141,7 +141,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
         }
     }
 
-    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null): void
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -162,7 +162,7 @@ protected function describeContainerService(object $service, array $options = []
         }
     }
 
-    protected function describeContainerServices(ContainerBuilder $builder, array $options = [])
+    protected function describeContainerServices(ContainerBuilder $builder, array $options = []): void
     {
         $showHidden = isset($options['show_hidden']) && $options['show_hidden'];
         $showTag = $options['tag'] ?? null;
@@ -251,7 +251,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
         $options['output']->table($tableHeaders, $tableRows);
     }
 
-    protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $builder = null): void
     {
         if (isset($options['id'])) {
             $options['output']->title(sprintf('Information for Service "<info>%s</info>"', $options['id']));
@@ -390,7 +390,7 @@ protected function describeContainerDeprecations(ContainerBuilder $builder, arra
         $options['output']->listing($formattedLogs);
     }
 
-    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null): void
     {
         if ($alias->isPublic() && !$alias->isPrivate()) {
             $options['output']->comment(sprintf('This service is a <info>public</info> alias for the service <info>%s</info>', (string) $alias));
@@ -405,7 +405,7 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
         $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]), $builder);
     }
 
-    protected function describeContainerParameter(mixed $parameter, array $options = [])
+    protected function describeContainerParameter(mixed $parameter, array $options = []): void
     {
         $options['output']->table(
             ['Parameter', 'Value'],
@@ -415,7 +415,7 @@ protected function describeContainerParameter(mixed $parameter, array $options =
         ]);
     }
 
-    protected function describeContainerEnvVars(array $envs, array $options = [])
+    protected function describeContainerEnvVars(array $envs, array $options = []): void
     {
         $dump = new Dumper($this->output);
         $options['output']->title('Symfony Container Environment Variables');
@@ -477,7 +477,7 @@ protected function describeContainerEnvVars(array $envs, array $options = [])
         }
     }
 
-    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
+    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = []): void
     {
         $event = $options['event'] ?? null;
         $dispatcherServiceName = $options['dispatcher_service_name'] ?? null;
@@ -509,12 +509,12 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
         }
     }
 
-    protected function describeCallable(mixed $callable, array $options = [])
+    protected function describeCallable(mixed $callable, array $options = []): void
     {
         $this->writeText($this->formatCallable($callable), $options);
     }
 
-    private function renderEventListenerTable(EventDispatcherInterface $eventDispatcher, string $event, array $eventListeners, SymfonyStyle $io)
+    private function renderEventListenerTable(EventDispatcherInterface $eventDispatcher, string $event, array $eventListeners, SymfonyStyle $io): void
     {
         $tableHeaders = ['Order', 'Callable', 'Priority'];
         $tableRows = [];
@@ -629,7 +629,7 @@ private function formatCallable(mixed $callable): string
         throw new \InvalidArgumentException('Callable is not describable.');
     }
 
-    private function writeText(string $content, array $options = [])
+    private function writeText(string $content, array $options = []): void
     {
         $this->write(
             isset($options['raw_text']) && $options['raw_text'] ? strip_tags($content) : $content,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
index 0a530c61da4bd..cec6239618a4a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -33,27 +33,27 @@
  */
 class XmlDescriptor extends Descriptor
 {
-    protected function describeRouteCollection(RouteCollection $routes, array $options = [])
+    protected function describeRouteCollection(RouteCollection $routes, array $options = []): void
     {
         $this->writeDocument($this->getRouteCollectionDocument($routes));
     }
 
-    protected function describeRoute(Route $route, array $options = [])
+    protected function describeRoute(Route $route, array $options = []): void
     {
         $this->writeDocument($this->getRouteDocument($route, $options['name'] ?? null));
     }
 
-    protected function describeContainerParameters(ParameterBag $parameters, array $options = [])
+    protected function describeContainerParameters(ParameterBag $parameters, array $options = []): void
     {
         $this->writeDocument($this->getContainerParametersDocument($parameters));
     }
 
-    protected function describeContainerTags(ContainerBuilder $builder, array $options = [])
+    protected function describeContainerTags(ContainerBuilder $builder, array $options = []): void
     {
         $this->writeDocument($this->getContainerTagsDocument($builder, isset($options['show_hidden']) && $options['show_hidden']));
     }
 
-    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null): void
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -62,17 +62,17 @@ protected function describeContainerService(object $service, array $options = []
         $this->writeDocument($this->getContainerServiceDocument($service, $options['id'], $builder, isset($options['show_arguments']) && $options['show_arguments']));
     }
 
-    protected function describeContainerServices(ContainerBuilder $builder, array $options = [])
+    protected function describeContainerServices(ContainerBuilder $builder, array $options = []): void
     {
         $this->writeDocument($this->getContainerServicesDocument($builder, $options['tag'] ?? null, isset($options['show_hidden']) && $options['show_hidden'], isset($options['show_arguments']) && $options['show_arguments'], $options['filter'] ?? null, $options['id'] ?? null));
     }
 
-    protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $builder = null): void
     {
         $this->writeDocument($this->getContainerDefinitionDocument($definition, $options['id'] ?? null, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments'], $builder));
     }
 
-    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null): void
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($dom->importNode($this->getContainerAliasDocument($alias, $options['id'] ?? null)->childNodes->item(0), true));
@@ -88,22 +88,22 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
         $this->writeDocument($dom);
     }
 
-    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
+    protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = []): void
     {
         $this->writeDocument($this->getEventDispatcherListenersDocument($eventDispatcher, $options));
     }
 
-    protected function describeCallable(mixed $callable, array $options = [])
+    protected function describeCallable(mixed $callable, array $options = []): void
     {
         $this->writeDocument($this->getCallableDocument($callable));
     }
 
-    protected function describeContainerParameter(mixed $parameter, array $options = [])
+    protected function describeContainerParameter(mixed $parameter, array $options = []): void
     {
         $this->writeDocument($this->getContainerParameterDocument($parameter, $options));
     }
 
-    protected function describeContainerEnvVars(array $envs, array $options = [])
+    protected function describeContainerEnvVars(array $envs, array $options = []): void
     {
         throw new LogicException('Using the XML format to debug environment variables is not supported.');
     }
@@ -136,7 +136,7 @@ protected function describeContainerDeprecations(ContainerBuilder $builder, arra
         $this->writeDocument($dom);
     }
 
-    private function writeDocument(\DOMDocument $dom)
+    private function writeDocument(\DOMDocument $dom): void
     {
         $dom->formatOutput = true;
         $this->write($dom->saveXML());
@@ -503,7 +503,7 @@ private function getEventDispatcherListenersDocument(EventDispatcherInterface $e
         return $dom;
     }
 
-    private function appendEventListenerDocument(EventDispatcherInterface $eventDispatcher, string $event, \DOMElement $element, array $eventListeners)
+    private function appendEventListenerDocument(EventDispatcherInterface $eventDispatcher, string $event, \DOMElement $element, array $eventListeners): void
     {
         foreach ($eventListeners as $listener) {
             $callableXML = $this->getCallableDocument($listener);
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 5e67e2bb6a612..af9f9190d1982 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -353,7 +353,7 @@ private function createFirewalls(array $config, ContainerBuilder $container)
         }
     }
 
-    private function createFirewall(ContainerBuilder $container, string $id, array $firewall, array &$authenticationProviders, array $providerIds, string $configId)
+    private function createFirewall(ContainerBuilder $container, string $id, array $firewall, array &$authenticationProviders, array $providerIds, string $configId): array
     {
         $config = $container->setDefinition($configId, new ChildDefinition('security.firewall.config'));
         $config->replaceArgument(0, $id);
@@ -599,7 +599,7 @@ private function createContextListener(ContainerBuilder $container, string $cont
         return $this->contextListeners[$contextKey] = $listenerId;
     }
 
-    private function createAuthenticationListeners(ContainerBuilder $container, string $id, array $firewall, array &$authenticationProviders, ?string $defaultProvider, array $providerIds, ?string $defaultEntryPoint, string $contextListenerId = null)
+    private function createAuthenticationListeners(ContainerBuilder $container, string $id, array $firewall, array &$authenticationProviders, ?string $defaultProvider, array $providerIds, ?string $defaultEntryPoint, string $contextListenerId = null): array
     {
         $listeners = [];
         $entryPoints = [];
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
index 2f35c3bea36a1..9d7ebfcfb91eb 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
@@ -68,7 +68,7 @@ public function getFunctions(): array
         ];
     }
 
-    public function dumpData(Environment $env, Data $data, int $maxDepth = 0)
+    public function dumpData(Environment $env, Data $data, int $maxDepth = 0): string
     {
         $this->dumper->setCharset($env->getCharset());
         $this->dumper->dump($data, null, [
@@ -82,7 +82,7 @@ public function dumpData(Environment $env, Data $data, int $maxDepth = 0)
         return str_replace("\n</pre", '</pre', rtrim($dump));
     }
 
-    public function dumpLog(Environment $env, string $message, Data $context = null)
+    public function dumpLog(Environment $env, string $message, Data $context = null): string
     {
         $message = twig_escape_filter($env, $message);
         $message = preg_replace('/&quot;(.*?)&quot;/', '&quot;<b>$1</b>&quot;', $message);
@@ -106,7 +106,7 @@ public function dumpLog(Environment $env, string $message, Data $context = null)
         return '<span class="dump-inline">'.strtr($message, $replacements).'</span>';
     }
 
-    public function getName()
+    public function getName(): string
     {
         return 'profiler';
     }
diff --git a/src/Symfony/Component/Asset/UrlPackage.php b/src/Symfony/Component/Asset/UrlPackage.php
index 575523db849e6..34c0e4ff909b9 100644
--- a/src/Symfony/Component/Asset/UrlPackage.php
+++ b/src/Symfony/Component/Asset/UrlPackage.php
@@ -110,7 +110,7 @@ protected function chooseBaseUrl(string $path): int
         return abs(crc32($path)) % \count($this->baseUrls);
     }
 
-    private function getSslUrls(array $urls)
+    private function getSslUrls(array $urls): array
     {
         $sslUrls = [];
         foreach ($urls as $url) {
diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
index 8aa7e46cb0b80..3a9d4f23db3cf 100644
--- a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
+++ b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
@@ -215,7 +215,7 @@ public function process(ContainerBuilder $container)
         }
     }
 
-    private function getNamespace(string $seed, string $id)
+    private function getNamespace(string $seed, string $id): string
     {
         return substr(str_replace('/', '-', base64_encode(hash('sha256', $id.$seed, true))), 0, 10);
     }
@@ -223,7 +223,7 @@ private function getNamespace(string $seed, string $id)
     /**
      * @internal
      */
-    public static function getServiceProvider(ContainerBuilder $container, string $name)
+    public static function getServiceProvider(ContainerBuilder $container, string $name): string
     {
         $container->resolveEnvPlaceholders($name, null, $usedEnvs);
 
diff --git a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
index 368307b382544..845b783821ea1 100644
--- a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
+++ b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
@@ -317,7 +317,7 @@ private function generateItems(iterable $items, array &$keys): \Generator
         }
     }
 
-    private function getId(mixed $key)
+    private function getId(mixed $key): string
     {
         if ($this->versioningIsEnabled && '' === $this->namespaceVersion) {
             $this->ids = [];
diff --git a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
index c70859a4efff3..2ee96e9b3702c 100644
--- a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
+++ b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
@@ -77,12 +77,15 @@ protected function doDelete(array $ids): bool
         return $ok;
     }
 
+    /**
+     * @return bool
+     */
     protected function doUnlink(string $file)
     {
         return @unlink($file);
     }
 
-    private function write(string $file, string $data, int $expiresAt = null)
+    private function write(string $file, string $data, int $expiresAt = null): bool
     {
         set_error_handler(__CLASS__.'::throwError');
         try {
@@ -110,7 +113,7 @@ private function write(string $file, string $data, int $expiresAt = null)
         }
     }
 
-    private function getFile(string $id, bool $mkdir = false, string $directory = null)
+    private function getFile(string $id, bool $mkdir = false, string $directory = null): string
     {
         // Use xxh128 to favor speed over security, which is not an issue here
         $hash = str_replace('/', '-', base64_encode(hash('xxh128', static::class.$id, true)));
diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
index 30034e55a58c9..3f06f0c38c23e 100644
--- a/src/Symfony/Component/Config/Loader/FileLoader.php
+++ b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -97,7 +97,7 @@ public function import(mixed $resource, string $type = null, bool $ignoreErrors
     /**
      * @internal
      */
-    protected function glob(string $pattern, bool $recursive, array|GlobResource &$resource = null, bool $ignoreErrors = false, bool $forExclusion = false, array $excluded = [])
+    protected function glob(string $pattern, bool $recursive, array|GlobResource &$resource = null, bool $ignoreErrors = false, bool $forExclusion = false, array $excluded = []): iterable
     {
         if (\strlen($pattern) === $i = strcspn($pattern, '*?{[')) {
             $prefix = $pattern;
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
index 893b3192e98e1..7d31794be3d39 100644
--- a/src/Symfony/Component/Console/Helper/Table.php
+++ b/src/Symfony/Component/Console/Helper/Table.php
@@ -727,7 +727,7 @@ private function fillNextRows(array $rows, int $line): array
     /**
      * fill cells for a row that contains colspan > 1.
      */
-    private function fillCells(iterable $row)
+    private function fillCells(iterable $row): iterable
     {
         $newRow = [];
 
diff --git a/src/Symfony/Component/CssSelector/Parser/Reader.php b/src/Symfony/Component/CssSelector/Parser/Reader.php
index c0b6923a4d1f8..7f6ae7a600a77 100644
--- a/src/Symfony/Component/CssSelector/Parser/Reader.php
+++ b/src/Symfony/Component/CssSelector/Parser/Reader.php
@@ -53,7 +53,10 @@ public function getSubstring(int $length, int $offset = 0): string
         return substr($this->source, $this->position + $offset, $length);
     }
 
-    public function getOffset(string $string)
+    /**
+     * @return int|false
+     */
+    public function getOffset(string $string): int|bool
     {
         $position = strpos($this->source, $string, $this->position);
 
@@ -71,12 +74,12 @@ public function findPattern(string $pattern): array|false
         return false;
     }
 
-    public function moveForward(int $length)
+    public function moveForward(int $length): void
     {
         $this->position += $length;
     }
 
-    public function moveToEnd()
+    public function moveToEnd(): void
     {
         $this->position = $this->length;
     }
diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
index 758048cb9444e..8472f0cc20377 100644
--- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
+++ b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
@@ -171,7 +171,7 @@ private function formatArgs(array $args): string
         return implode(', ', $result);
     }
 
-    private function formatArgsAsText(array $args)
+    private function formatArgsAsText(array $args): string
     {
         return strip_tags($this->formatArgs($args));
     }
@@ -273,7 +273,7 @@ private function fileExcerpt(string $file, int $line, int $srcContext = 3): stri
         return '';
     }
 
-    private function fixCodeMarkup(string $line)
+    private function fixCodeMarkup(string $line): string
     {
         // </span> ending tag from previous line
         $opening = strpos($line, '<span');
@@ -292,12 +292,12 @@ private function fixCodeMarkup(string $line)
         return trim($line);
     }
 
-    private function formatFileFromText(string $text)
+    private function formatFileFromText(string $text): string
     {
         return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', fn ($match) => 'in '.$this->formatFile($match[2], $match[3]), $text);
     }
 
-    private function formatLogMessage(string $message, array $context)
+    private function formatLogMessage(string $message, array $context): string
     {
         if ($context && str_contains($message, '{')) {
             $replacements = [];
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php
index e9849a448a624..981cae21c61f6 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php
@@ -20,12 +20,12 @@
  */
 class ArgumentsNode extends ArrayNode
 {
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $this->compileArguments($compiler, false);
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
 
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
index e1a3169b0030c..e75de1af2aa69 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
@@ -27,7 +27,7 @@ public function __construct()
         $this->index = -1;
     }
 
-    public function addElement(Node $value, Node $key = null)
+    public function addElement(Node $value, Node $key = null): void
     {
         $key ??= new ConstantNode(++$this->index);
 
@@ -37,14 +37,14 @@ public function addElement(Node $value, Node $key = null)
     /**
      * Compiles the node to PHP.
      */
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->raw('[');
         $this->compileArguments($compiler);
         $compiler->raw(']');
     }
 
-    public function evaluate(array $functions, array $values)
+    public function evaluate(array $functions, array $values): array
     {
         $result = [];
         foreach ($this->getKeyValuePairs() as $pair) {
@@ -54,7 +54,7 @@ public function evaluate(array $functions, array $values)
         return $result;
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         $value = [];
         foreach ($this->getKeyValuePairs() as $pair) {
@@ -84,7 +84,7 @@ public function toArray()
         return $array;
     }
 
-    protected function getKeyValuePairs()
+    protected function getKeyValuePairs(): array
     {
         $pairs = [];
         foreach (array_chunk($this->nodes, 2) as $pair) {
@@ -94,7 +94,7 @@ protected function getKeyValuePairs()
         return $pairs;
     }
 
-    protected function compileArguments(Compiler $compiler, bool $withKeys = true)
+    protected function compileArguments(Compiler $compiler, bool $withKeys = true): void
     {
         $first = true;
         foreach ($this->getKeyValuePairs() as $pair) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
index 0b31c66dede7c..48331167bd275 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
@@ -45,7 +45,7 @@ public function __construct(string $operator, Node $left, Node $right)
         );
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $operator = $this->attributes['operator'];
 
@@ -92,7 +92,7 @@ public function compile(Compiler $compiler)
         ;
     }
 
-    public function evaluate(array $functions, array $values)
+    public function evaluate(array $functions, array $values): mixed
     {
         $operator = $this->attributes['operator'];
         $left = $this->nodes['left']->evaluate($functions, $values);
@@ -171,7 +171,7 @@ public function evaluate(array $functions, array $values)
         }
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         return ['(', $this->nodes['left'], ' '.$this->attributes['operator'].' ', $this->nodes['right'], ')'];
     }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
index ba78a2848eeab..fec02abaaea47 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
@@ -27,7 +27,7 @@ public function __construct(Node $expr1, Node $expr2, Node $expr3)
         );
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler
             ->raw('((')
@@ -49,7 +49,7 @@ public function evaluate(array $functions, array $values)
         return $this->nodes['expr3']->evaluate($functions, $values);
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         return ['(', $this->nodes['expr1'], ' ? ', $this->nodes['expr2'], ' : ', $this->nodes['expr3'], ')'];
     }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
index 869e350dc9d4c..37beee86f8863 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
@@ -33,17 +33,17 @@ public function __construct(mixed $value, bool $isIdentifier = false, bool $isNu
         );
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->repr($this->attributes['value']);
     }
 
-    public function evaluate(array $functions, array $values)
+    public function evaluate(array $functions, array $values): mixed
     {
         return $this->attributes['value'];
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         $array = [];
         $value = $this->attributes['value'];
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
index e9b10c3295d75..421556776b3a4 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
@@ -24,6 +24,9 @@ class GetAttrNode extends Node
     public const METHOD_CALL = 2;
     public const ARRAY_CALL = 3;
 
+    /**
+     * @param self::* $type
+     */
     public function __construct(Node $node, Node $attribute, ArrayNode $arguments, int $type)
     {
         parent::__construct(
@@ -32,7 +35,7 @@ public function __construct(Node $node, Node $attribute, ArrayNode $arguments, i
         );
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $nullSafe = $this->nodes['attribute'] instanceof ConstantNode && $this->nodes['attribute']->isNullSafe;
         switch ($this->attributes['type']) {
@@ -65,7 +68,7 @@ public function compile(Compiler $compiler)
         }
     }
 
-    public function evaluate(array $functions, array $values)
+    public function evaluate(array $functions, array $values): mixed
     {
         switch ($this->attributes['type']) {
             case self::PROPERTY_CALL:
@@ -136,7 +139,7 @@ private function isShortCircuited(): bool
         return $this->attributes['is_short_circuited'] || ($this->nodes['node'] instanceof self && $this->nodes['node']->isShortCircuited());
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         switch ($this->attributes['type']) {
             case self::PROPERTY_CALL:
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
index e017e967a1d08..b9d0e1a11635f 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
@@ -28,17 +28,17 @@ public function __construct(string $name)
         );
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->raw('$'.$this->attributes['name']);
     }
 
-    public function evaluate(array $functions, array $values)
+    public function evaluate(array $functions, array $values): mixed
     {
         return $values[$this->attributes['name']];
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         return [$this->attributes['name']];
     }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php
index 3e59ef867611c..1cc5eb058e0cc 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php
@@ -25,7 +25,7 @@ public function __construct(Node $expr1, Node $expr2)
         parent::__construct(['expr1' => $expr1, 'expr2' => $expr2]);
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler
             ->raw('((')
@@ -36,7 +36,7 @@ public function compile(Compiler $compiler)
         ;
     }
 
-    public function evaluate(array $functions, array $values)
+    public function evaluate(array $functions, array $values): mixed
     {
         if ($this->nodes['expr1'] instanceof GetAttrNode) {
             $this->nodes['expr1']->attributes['is_null_coalesce'] = true;
@@ -45,7 +45,7 @@ public function evaluate(array $functions, array $values)
         return $this->nodes['expr1']->evaluate($functions, $values) ?? $this->nodes['expr2']->evaluate($functions, $values);
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         return ['(', $this->nodes['expr1'], ') ?? (', $this->nodes['expr2'], ')'];
     }
diff --git a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
index 43edf13d35b3b..782bad8870c1a 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
@@ -40,7 +40,7 @@ abstract class Descriptor implements DescriptorInterface
     protected $parents = [];
     protected $extensions = [];
 
-    public function describe(OutputInterface $output, ?object $object, array $options = [])
+    public function describe(OutputInterface $output, ?object $object, array $options = []): void
     {
         $this->output = $output instanceof OutputStyle ? $output : new SymfonyStyle(new ArrayInput([]), $output);
 
@@ -52,13 +52,13 @@ public function describe(OutputInterface $output, ?object $object, array $option
         };
     }
 
-    abstract protected function describeDefaults(array $options);
+    abstract protected function describeDefaults(array $options): void;
 
-    abstract protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedFormType, array $options = []);
+    abstract protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedFormType, array $options = []): void;
 
-    abstract protected function describeOption(OptionsResolver $optionsResolver, array $options);
+    abstract protected function describeOption(OptionsResolver $optionsResolver, array $options): void;
 
-    protected function collectOptions(ResolvedFormTypeInterface $type)
+    protected function collectOptions(ResolvedFormTypeInterface $type): void
     {
         $this->parents = [];
         $this->extensions = [];
@@ -96,7 +96,7 @@ protected function collectOptions(ResolvedFormTypeInterface $type)
         $this->extensions = array_keys($this->extensions);
     }
 
-
10000
    protected function getOptionDefinition(OptionsResolver $optionsResolver, string $option)
+    protected function getOptionDefinition(OptionsResolver $optionsResolver, string $option): array
     {
         $definition = [];
 
@@ -139,7 +139,7 @@ protected function getOptionDefinition(OptionsResolver $optionsResolver, string
         return $definition;
     }
 
-    protected function filterOptionsByDeprecated(ResolvedFormTypeInterface $type)
+    protected function filterOptionsByDeprecated(ResolvedFormTypeInterface $type): void
     {
         $deprecatedOptions = [];
         $resolver = $type->getOptionsResolver();
@@ -186,7 +186,7 @@ private function getParentOptionsResolver(ResolvedFormTypeInterface $type): Opti
         return $optionsResolver;
     }
 
-    private function collectTypeExtensionsOptions(ResolvedFormTypeInterface $type, OptionsResolver $optionsResolver)
+    private function collectTypeExtensionsOptions(ResolvedFormTypeInterface $type, OptionsResolver $optionsResolver): void
     {
         foreach ($type->getTypeExtensions() as $extension) {
             $inheritedOptions = $optionsResolver->getDefinedOptions();
diff --git a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
index 92d600389fe08..1f5c7bfa55fb3 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
@@ -21,7 +21,7 @@
  */
 class JsonDescriptor extends Descriptor
 {
-    protected function describeDefaults(array $options)
+    protected function describeDefaults(array $options): void
     {
         $data['builtin_form_types'] = $options['core_types'];
         $data['service_form_types'] = $options['service_types'];
@@ -33,7 +33,7 @@ protected function describeDefaults(array $options)
         $this->writeData($data, $options);
     }
 
-    protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedFormType, array $options = [])
+    protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedFormType, array $options = []): void
     {
         $this->collectOptions($resolvedFormType);
 
@@ -61,7 +61,7 @@ protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedF
         $this->writeData($data, $options);
     }
 
-    protected function describeOption(OptionsResolver $optionsResolver, array $options)
+    protected function describeOption(OptionsResolver $optionsResolver, array $options): void
     {
         $definition = $this->getOptionDefinition($optionsResolver, $options['option']);
 
@@ -93,14 +93,14 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio
         $this->writeData($data, $options);
     }
 
-    private function writeData(array $data, array $options)
+    private function writeData(array $data, array $options): void
     {
         $flags = $options['json_encoding'] ?? 0;
 
         $this->output->write(json_encode($data, $flags | \JSON_PRETTY_PRINT)."\n");
     }
 
-    private function sortOptions(array &$options)
+    private function sortOptions(array &$options): void
     {
         foreach ($options as &$opts) {
             $sorted = false;
diff --git a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
index 317287f174478..c4a2db27a0810 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
@@ -31,7 +31,7 @@ public function __construct(FileLinkFormatter $fileLinkFormatter = null)
         $this->fileLinkFormatter = $fileLinkFormatter;
     }
 
-    protected function describeDefaults(array $options)
+    protected function describeDefaults(array $options): void
     {
         if ($options['core_types']) {
             $this->output->section('Built-in form types (Symfony\Component\Form\Extension\Core\Type)');
@@ -59,7 +59,7 @@ protected function describeDefaults(array $options)
         }
     }
 
-    protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedFormType, array $options = [])
+    protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedFormType, array $options = []): void
     {
         $this->collectOptions($resolvedFormType);
 
@@ -99,7 +99,7 @@ protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedF
         }
     }
 
-    protected function describeOption(OptionsResolver $optionsResolver, array $options)
+    protected function describeOption(OptionsResolver $optionsResolver, array $options): void
     {
         $definition = $this->getOptionDefinition($optionsResolver, $options['option']);
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 051795b9571da..9694ed750a346 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -420,7 +420,7 @@ private function addSubForm(FormBuilderInterface $builder, string $name, ChoiceV
         $builder->add($name, $choiceType, $choiceOpts);
     }
 
-    private function createChoiceList(array $options)
+    private function createChoiceList(array $options): ChoiceListInterface
     {
         if (null !== $options['choice_loader']) {
             return $this->choiceListFactory->createListFromLoader(
@@ -440,7 +440,7 @@ private function createChoiceList(array $options)
         );
     }
 
-    private function createChoiceListView(ChoiceListInterface $choiceList, array $options)
+    private function createChoiceListView(ChoiceListInterface $choiceList, array $options): ChoiceListView
     {
         return $this->choiceListFactory->createView(
             $choiceList,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
index b18df900ff68e..b08a4dd834247 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -319,7 +319,7 @@ public function getBlockPrefix(): string
         return 'date';
     }
 
-    private function formatTimestamps(\IntlDateFormatter $formatter, string $regex, array $timestamps)
+    private function formatTimestamps(\IntlDateFormatter $formatter, string $regex, array $timestamps): array
     {
         $pattern = $formatter->getPattern();
         $timezone = $formatter->getTimeZoneId();
@@ -344,7 +344,7 @@ private function formatTimestamps(\IntlDateFormatter $formatter, string $regex,
         return $formattedTimestamps;
     }
 
-    private function listYears(array $years)
+    private function listYears(array $years): array
     {
         $result = [];
 
@@ -355,7 +355,7 @@ private function listYears(array $years)
         return $result;
     }
 
-    private function listMonths(array $months)
+    private function listMonths(array $months): array
     {
         $result = [];
 
@@ -366,7 +366,7 @@ private function listMonths(array $months)
         return $result;
     }
 
-    private function listDays(array $days)
+    private function listDays(array $days): array
     {
         $result = [];
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
index d1bad77505c69..16d212ef0f75c 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -124,7 +124,7 @@ public function getBlockPrefix(): string
         return 'file';
     }
 
-    private function getFileUploadError(int $errorCode)
+    private function getFileUploadError(int $errorCode): FileUploadError
     {
         $messageParameters = [];
 
@@ -191,7 +191,7 @@ private static function getMaxFilesize(): int|float
      *
      * This method should be kept in sync with Symfony\Component\Validator\Constraints\FileValidator::factorizeSizes().
      */
-    private function factorizeSizes(int $size, int|float $limit)
+    private function factorizeSizes(int $size, int|float $limit): array
     {
         $coef = self::MIB_BYTES;
         $coefFactor = self::KIB_BYTES;
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
index 6a02486b45301..7ea266cecd29e 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -227,7 +227,7 @@ private function getContainerCompilerLogs(string $compilerLogsFilepath = null):
         return $logs;
     }
 
-    private function sanitizeLogs(array $logs)
+    private function sanitizeLogs(array $logs): array
     {
         $sanitizedLogs = [];
         $silencedLogs = [];
diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
index 7f32f6b0ccd5b..fcb100859f64d 100644
--- a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
+++ b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
@@ -49,7 +49,10 @@ public function __construct(string|array $fileLinkFormat = null, RequestStack $r
         $this->urlFormat = $urlFormat;
     }
 
-    public function format(string $file, int $line)
+    /**
+     * @return string|false
+     */
+    public function format(string $file, int $line): string|bool
     {
         if ($fmt = $this->getFileLinkFormat()) {
             for ($i = 1; isset($fmt[$i]); ++$i) {
diff --git a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
index 2650aa05d9ab3..453954bebdc51 100644
--- a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
@@ -36,7 +36,7 @@ public function __construct(BundleCompilerInterface $compiler, string $dirName)
         $this->dirName = $dirName;
     }
 
-    public function generateData(GeneratorConfig $config)
+    public function generateData(GeneratorConfig $config): void
     {
         $filesystem = new Filesystem();
         $localeScanner = new LocaleScanner();
diff --git a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
index dbf045bd20e0e..d25e79949e763 100644
--- a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
@@ -53,13 +53,13 @@ protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
         return $scanner->scanLocales($sourceDir.'/curr');
     }
 
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir): void
     {
         $compiler->compile($sourceDir.'/curr', $tempDir);
         $compiler->compile($sourceDir.'/misc/currencyNumericCodes.txt', $tempDir);
     }
 
-    protected function preGenerate()
+    protected function preGenerate(): void
     {
         $this->currencyCodes = [];
     }
diff --git a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
index 363f173103c32..6189e00290311 100644
--- a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
@@ -103,13 +103,13 @@ protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
         return $scanner->scanLocales($sourceDir.'/lang');
     }
 
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir): void
     {
         $compiler->compile($sourceDir.'/lang', $tempDir);
         $compiler->compile($sourceDir.'/misc/metadata.txt', $tempDir);
     }
 
-    protected function preGenerate()
+    protected function preGenerate(): void
     {
         $this->languageCodes = [];
     }
diff --git a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
index 3b86994fb89a9..4f50ad7b8a5b7 100644
--- a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
@@ -67,7 +67,7 @@ class RegionDataGenerator extends AbstractDataGenerator
      */
     private array $regionCodes = [];
 
-    public static function isValidCountryCode(int|string|null $region)
+    public static function isValidCountryCode(int|string|null $region): bool
     {
         if (isset(self::DENYLIST[$region])) {
             return false;
@@ -86,13 +86,13 @@ protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
         return $scanner->scanLocales($sourceDir.'/region');
     }
 
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir): void
     {
         $compiler->compile($sourceDir.'/region', $tempDir);
         $compiler->compile($sourceDir.'/misc/metadata.txt', $tempDir);
     }
 
-    protected function preGenerate()
+    protected function preGenerate(): void
     {
         $this->regionCodes = [];
     }
diff --git a/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php
index 1f9f421ec397a..8d5bebe294fa1 100644
--- a/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php
@@ -40,12 +40,12 @@ protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
         return $scanner->scanLocales($sourceDir.'/lang');
     }
 
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir): void
     {
         $compiler->compile($sourceDir.'/lang', $tempDir);
     }
 
-    protected function preGenerate()
+    protected function preGenerate(): void
     {
         $this->scriptCodes = [];
     }
diff --git a/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php
index 698495efd7ca5..a0573e36f39c4 100644
--- a/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php
@@ -46,7 +46,7 @@ protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
         return $scanner->scanLocales($sourceDir.'/zone');
     }
 
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir): void
     {
         $filesystem = new Filesystem();
         $filesystem->mkdir($tempDir.'/region');
@@ -57,7 +57,7 @@ protected function compileTemporaryBundles(BundleCompilerInterface $compiler, st
         $compiler->compile($sourceDir.'/misc/windowsZones.txt', $tempDir);
     }
 
-    protected function preGenerate()
+    protected function preGenerate(): void
     {
         $this->zoneIds = [];
         $this->zoneToCountryMapping = [];
diff --git a/src/Symfony/Component/Intl/Data/Util/ArrayAccessibleResourceBundle.php b/src/Symfony/Component/Intl/Data/Util/ArrayAccessibleResourceBundle.php
index e8e3bf4ba2415..04110a46f1890 100644
--- a/src/Symfony/Component/Intl/Data/Util/ArrayAccessibleResourceBundle.php
+++ b/src/Symfony/Component/Intl/Data/Util/ArrayAccessibleResourceBundle.php
@@ -69,12 +69,12 @@ public function count(): int
         return $this->bundleImpl->count();
     }
 
-    public function getErrorCode()
+    public function getErrorCode(): int
     {
         return $this->bundleImpl->getErrorCode();
     }
 
-    public function getErrorMessage()
+    public function getErrorMessage(): string
     {
         return $this->bundleImpl->getErrorMessage();
     }
diff --git a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
index ff27ecbb0e460..a652cd55430bf 100644
--- a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
+++ b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
@@ -79,7 +79,7 @@ protected function getCasters(): array
         return $casters;
     }
 
-    private function collectMessage(string $busName, array $tracedMessage)
+    private function collectMessage(string $busName, array $tracedMessage): array
     {
         $message = $tracedMessage['message'];
 
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
index 7fcc2aae1837b..97f5ded24d6dc 100644
--- a/src/Symfony/Component/Mime/Email.php
+++ b/src/Symfony/Component/Mime/Email.php
@@ -527,7 +527,10 @@ private function setHeaderBody(string $type, string $name, $body): static
         return $this;
     }
 
-    private function addListAddressHeaderBody(string $name, array $addresses)
+    /**
+     * @return $this
+     */
+    private function addListAddressHeaderBody(string $name, array $addresses): static
     {
         if (!$header = $this->getHeaders()->get($name)) {
             return $this->setListAddressHeaderBody($name, $addresses);
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index 3c70be2a2a162..82f89006496aa 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -1567,7 +1567,7 @@ private function escapeArgument(?string $argument): string
         return '"'.str_replace(['"', '^', '%', '!', "\n"], ['""', '"^^"', '"^%"', '"^!"', '!LF!'], $argument).'"';
     }
 
-    private function replacePlaceholders(string $commandline, array $env)
+    private function replacePlaceholders(string $commandline, array $env): string
     {
         return preg_replace_callback('/"\$\{:([_a-zA-Z]++[_a-zA-Z0-9]*+)\}"/', function ($matches) use ($commandline, $env) {
             if (!isset($env[$matches[1]]) || false === $env[$matches[1]]) {
diff --git a/src/Symfony/Component/RateLimiter/Policy/Window.php b/src/Symfony/Component/RateLimiter/Policy/Window.php
index 485b913df5d9e..19f436ac1a16c 100644
--- a/src/Symfony/Component/RateLimiter/Policy/Window.php
+++ b/src/Symfony/Component/RateLimiter/Policy/Window.php
@@ -61,7 +61,7 @@ public function getHitCount(): int
         return $this->hitCount;
     }
 
-    public function getAvailableTokens(float $now)
+    public function getAvailableTokens(float $now): int
     {
         // if now is more than the window interval in the past, all tokens are available
         if (($now - $this->timer) > $this->intervalInSeconds) {
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php b/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php
index ab357bafd4b20..7c1668495623d 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php
@@ -61,7 +61,7 @@ public function getRoutes(): array
     /**
      * Adds a route to a group.
      */
-    public function addRoute(string $prefix, array|StaticPrefixCollection $route)
+    public function addRoute(string $prefix, array|StaticPrefixCollection $route): void
     {
         [$prefix, $staticPrefix] = $this->getCommonPrefix($prefix, $prefix);
 
@@ -196,7 +196,7 @@ private function getCommonPrefix(string $prefix, string $anotherPrefix): array
         return [substr($prefix, 0, $i), substr($prefix, 0, $staticLength ?? $i)];
     }
 
-    public static function handleError(int $type, string $msg)
+    public static function handleError(int $type, string $msg): bool
     {
         return str_contains($msg, 'Compilation failed: lookbehind assertion is not fixed length');
     }
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
index dc0554be902c1..900547e0acdf6 100644
--- a/src/Symfony/Component/Routing/Route.php
+++ b/src/Symfony/Component/Routing/Route.php
@@ -428,7 +428,7 @@ private function extractInlineDefaultsAndRequirements(string $pattern): string
         }, $pattern);
     }
 
-    private function sanitizeRequirement(string $key, string $regex)
+    private function sanitizeRequirement(string $key, string $regex): string
     {
         if ('' !== $regex) {
             if ('^' === $regex[0]) {
diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
index dcf25c7c84f18..b4ffa1dcd4e02 100644
--- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
+++ b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
@@ -54,6 +54,10 @@ public function __construct(array $users = [])
      */
     public function createUser(UserInterface $user)
     {
+        if (!$user instanceof InMemoryUser) {
+            trigger_deprecation('symfony/security-core', '6.3', 'Passing users that are not instance of "%s" to "%s" is deprecated, "%s" given.', InMemoryUser::class, __METHOD__, get_debug_type($user));
+        }
+
         $userIdentifier = strtolower($user->getUserIdentifier());
         if (isset($this->users[$userIdentifier])) {
             throw new \LogicException('Another user with the same username already exists.');
@@ -90,8 +94,10 @@ public function supportsClass(string $class): bool
      * Returns the user by given username.
      *
      * @throws UserNotFoundException if user whose given username does not exist
+     *
+     * @return InMemoryUser change return type on 7.0
      */
-    private function getUser(string $username)/* : InMemoryUser */
+    private function getUser(string $username): UserInterface
     {
         if (!isset($this->users[strtolower($username)])) {
             $ex = new UserNotFoundException(sprintf('Username "%s" does not exist.', $username));
diff --git a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
index bd655d9cd28ce..49c5f9a52096d 100644
--- a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
+++ b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
@@ -136,7 +136,7 @@ public function setTranslator(TranslatorInterface $translator)
         $this->translator = $translator;
     }
 
-    private function getCredentials(Request $request)
+    private function getCredentials(Request $request): array
     {
         $data = json_decode($request->getContent());
         if (!$data instanceof \stdClass) {
diff --git a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
index ccf3fde9490d8..32e38bab3d1cb 100644
--- a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
@@ -86,7 +86,7 @@ public function authenticate(RequestEvent $event)
         }
     }
 
-    private function createAccessDeniedException(Request $request, array $attributes)
+    private function createAccessDeniedException(Request $request, array $attributes): AccessDeniedException
     {
         $exception = new AccessDeniedException();
         $exception->setAttributes($attributes);
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php
index 5359408dd80b5..708d58e03d2d2 100644
--- a/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php
+++ b/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php
@@ -65,7 +65,7 @@ public function getTypeForMappedObject(object|string $object): ?string
         return $mapping->getMappedObjectType($object);
     }
 
-    private function resolveMappingForMappedObject(object|string $object)
+    private function resolveMappingForMappedObject(object|string $object): ?ClassDiscriminatorMapping
     {
         $reflectionClass = new \ReflectionClass($object);
         if ($parentClass = $reflectionClass->getParentClass()) {
diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
index 59a5c581299ea..cf195c0446127 100644
--- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php
+++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
@@ -161,7 +161,7 @@ private function display(SymfonyStyle $io, array $files)
         };
     }
 
-    private function displayTxt(SymfonyStyle $io, array $filesInfo, bool $errorAsGithubAnnotations = false)
+    private function displayTxt(SymfonyStyle $io, array $filesInfo, bool $errorAsGithubAnnotations = false): int
     {
         $countFiles = \count($filesInfo);
         $erroredFiles = 0;
@@ -209,7 +209,7 @@ private function displayJson(SymfonyStyle $io, array $filesInfo)
         return min($errors, 1);
     }
 
-    private function getFiles(string $fileOrDirectory)
+    private function getFiles(string $fileOrDirectory): iterable
     {
         if (is_file($fileOrDirectory)) {
             yield new \SplFileInfo($fileOrDirectory);
diff --git a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
index 064140a63e648..e7cf2c1537e7b 100644
--- a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
+++ b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
@@ -91,7 +91,7 @@ public function getName(): string
         return 'translation';
     }
 
-    private function sanitizeCollectedMessages(array $messages)
+    private function sanitizeCollectedMessages(array $messages): array
     {
         $result = [];
         foreach ($messages as $key => $message) {
@@ -116,7 +116,7 @@ private function sanitizeCollectedMessages(array $messages)
         return $result;
     }
 
-    private function computeCount(array $messages)
+    private function computeCount(array $messages): array
     {
         $count = [
             DataCollectorTranslator::MESSAGE_DEFINED => 0,
@@ -131,7 +131,7 @@ private function computeCount(array $messages)
         return $count;
     }
 
-    private function sanitizeString(string $string, int $length = 80)
+    private function sanitizeString(string $string, int $length = 80): string
     {
         $string = trim(preg_replace('/\s+/', ' ', $string));
 
diff --git a/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php b/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php
index 50ef82d03064b..72c1ec0890796 100644
--- a/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php
@@ -83,7 +83,7 @@ private function writePadding(string $data): ?string
         return $padding ? str_repeat("\xAA", 4 - $padding) : null;
     }
 
-    private function getPosition(string $data)
+    private function getPosition(string $data): float|int
     {
         return (\strlen($data) + 28) / 4;
     }
diff --git a/src/Symfony/Component/Translation/Dumper/PoFileDumper.php b/src/Symfony/Component/Translation/Dumper/PoFileDumper.php
index c026672d312b8..a2d0deb78153a 100644
--- a/src/Symfony/Component/Translation/Dumper/PoFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/PoFileDumper.php
@@ -65,7 +65,7 @@ public function formatCatalogue(MessageCatalogue $messages, string $domain, arra
         return $output;
     }
 
-    private function getStandardRules(string $id)
+    private function getStandardRules(string $id): array
     {
         // Partly copied from TranslatorTrait::trans.
         $parts = [];
diff --git a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
index 53847193050b0..22f0227b9d52f 100644
--- a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
@@ -54,7 +54,7 @@ protected function getExtension(): string
         return $this->extension;
     }
 
-    private function dumpXliff1(string $defaultLocale, MessageCatalogue $messages, ?string $domain, array $options = [])
+    private function dumpXliff1(string $defaultLocale, MessageCatalogue $messages, ?string $domain, array $options = []): string
     {
         $toolInfo = ['tool-id' => 'symfony', 'tool-name' => 'Symfony'];
         if (\array_key_exists('tool_info', $options)) {
@@ -137,7 +137,7 @@ private function dumpXliff1(string $defaultLocale, MessageCatalogue $messages, ?
         return $dom->saveXML();
     }
 
-    private function dumpXliff2(string $defaultLocale, MessageCatalogue $messages, ?string $domain)
+    private function dumpXliff2(string $defaultLocale, MessageCatalogue $messages, ?string $domain): string
     {
         $dom = new \DOMDocument('1.0', 'utf-8');
         $dom->formatOutput = true;
diff --git a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
index 329d619293bb6..b7cd38789e762 100644
--- a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
+++ b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
@@ -197,7 +197,7 @@ private function skipMethodArgument(\Iterator $tokenIterator)
      * Extracts the message from the iterator while the tokens
      * match allowed message tokens.
      */
-    private function getValue(\Iterator $tokenIterator)
+    private function getValue(\Iterator $tokenIterator): string
     {
         $message = '';
         $docToken = '';
diff --git a/src/Symfony/Component/Translation/Resources/bin/translation-status.php b/src/Symfony/Component/Translation/Resources/bin/translation-status.php
index 21ef604723a84..8064190d86e39 100644
--- a/src/Symfony/Component/Translation/Resources/bin/translation-status.php
+++ b/src/Symfony/Component/Translation/Resources/bin/translation-status.php
@@ -95,7 +95,7 @@
 
 exit($totalTranslationMismatches > 0 ? 1 : 0);
 
-function findTranslationFiles($originalFilePath, $localeToAnalyze)
+function findTranslationFiles($originalFilePath, $localeToAnalyze): array
 {
     $translations = [];
 
@@ -118,7 +118,7 @@ function findTranslationFiles($originalFilePath, $localeToAnalyze)
     return $translations;
 }
 
-function calculateTranslationStatus($originalFilePath, $translationFilePaths)
+function calculateTranslationStatus($originalFilePath, $translationFilePaths): array
 {
     $translationStatus = [];
     $allTranslationKeys = extractTranslationKeys($originalFilePath);
@@ -159,7 +159,7 @@ function extractLocaleFromFilePath($filePath)
     return $parts[count($parts) - 2];
 }
 
-function extractTranslationKeys($filePath)
+function extractTranslationKeys($filePath): array
 {
     $translationKeys = [];
     $contents = new \SimpleXMLElement(file_get_contents($filePath));
diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
index edac8395df87a..1b2457707fc4b 100644
--- a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
+++ b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
@@ -414,7 +414,7 @@ public function buildNextViolation(string $message): self
         return new self($this->context, $message, $this->constraint, $assertions);
     }
 
-    public function assertRaised()
+    public function assertRaised(): void
     {
         $expected = [];
         foreach ($this->assertions as $assertion) {
@@ -564,17 +564,17 @@ public function getViolations(): ConstraintViolationListInterface
         throw new \BadMethodCallException();
     }
 
-    public function doGetViolations()
+    public function doGetViolations(): ConstraintViolationListInterface
     {
         return $this->context->getViolations();
     }
 
-    public function expectNoValidate()
+    public function expectNoValidate(): void
     {
         $this->expectNoValidate = true;
     }
 
-    public function expectValidation(string $call, ?string $propertyPath, mixed $value, string|GroupSequence|array|null $group, callable $constraints, ConstraintViolationInterface $violation = null)
+    public function expectValidation(string $call, ?string $propertyPath, mixed $value, string|GroupSequence|array|null $group, callable $constraints, ConstraintViolationInterface $violation = null): void
     {
         if (null !== $propertyPath) {
             $this->expectedAtPath[$call] = $propertyPath;
diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
index 0cc7baabb6c51..91539daaada52 100644
--- a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
@@ -962,7 +962,7 @@ private function getSourceLink(string $file, int $line)
     }
 }
 
-function esc(string $str)
+function esc(string $str): string
 {
     return htmlspecialchars($str, \ENT_QUOTES, 'UTF-8');
 }
diff --git a/src/Symfony/Component/Workflow/Dumper/MermaidDumper.php b/src/Symfony/Component/Workflow/Dumper/MermaidDumper.php
index 27b8dd0f4ea09..20897f7c7feeb 100644
--- a/src/Symfony/Component/Workflow/Dumper/MermaidDumper.php
+++ b/src/Symfony/Component/Workflow/Dumper/MermaidDumper.php
@@ -186,7 +186,7 @@ private function styleNode(array $meta, string $nodeName, bool $hasMarking = fal
      * Replace double quotes with the mermaid escape syntax and
      * ensure all other characters are properly escaped.
      */
-    private function escape(string $label)
+    private function escape(string $label): string
     {
         $label = str_replace('"', '#quot;', $label);
 
@@ -207,12 +207,8 @@ private function validateTransitionType(string $transitionType): void
         }
     }
 
-    private function styleStatemachineTransition(
-        string $from,
-        string $to,
-        string $transitionLabel,
-        array $transitionMeta
-    ): array {
+    private function styleStatemachineTransition(string $from, string $to, string $transitionLabel, array $transitionMeta): array
+    {
         $transitionOutput = [sprintf('%s-->|%s|%s', $from, $this->escape($transitionLabel), $to)];
 
         $linkStyle = $this->styleLink($transitionMeta);
@@ -225,13 +221,8 @@ private function styleStatemachineTransition(
         return $transitionOutput;
     }
 
-    private function styleWorkflowTransition(
-        string $from,
-        string $to,
-        int $transitionId,
-        string $transitionLabel,
-        array $transitionMeta
-    ) {
+    private function styleWorkflowTransition(string $from, string $to, int $transitionId, string $transitionLabel, array $transitionMeta): array
+    {
         $transitionOutput = [];
 
         $transitionLabel = $this->escape($transitionLabel);
diff --git a/src/Symfony/Component/Yaml/Command/LintCommand.php b/src/Symfony/Component/Yaml/Command/LintCommand.php
index 70f68c51d7313..6962c51295f03 100644
--- a/src/Symfony/Component/Yaml/Command/LintCommand.php
+++ b/src/Symfony/Component/Yaml/Command/LintCommand.php
@@ -124,7 +124,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return $this->display($io, $filesInfo);
     }
 
-    private function validate(string $content, int $flags, string $file = null)
+    private function validate(string $content, int $flags, string $file = null): array
     {
         $prevErrorHandler = set_error_handler(function ($level, $message, $file, $line) use (&$prevErrorHandler) {
             if (\E_USER_DEPRECATED === $level) {

From 508ed8127e7952caac93fd8f56fd9291e1c51829 Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Sun, 12 Feb 2023 23:57:18 +0100
Subject: [PATCH 197/475] Add void return types

---
 .github/expected-missing-return-types.diff    | 10373 +++++++++++++++-
 .../Doctrine/ContainerAwareEventManager.php   |     4 +-
 .../DataCollector/DoctrineDataCollector.php   |     8 +
 .../DataFixtures/ContainerAwareLoader.php     |     3 +
 .../AbstractDoctrineExtension.php             |    12 +
 .../CompilerPass/DoctrineValidationPass.php   |     5 +-
 .../CompilerPass/RegisterMappingsPass.php     |     2 +
 .../CompilerPass/RegisterUidTypePass.php      |     2 +-
 .../Security/UserProvider/EntityFactory.php   |     6 +
 .../MergeDoctrineCollectionListener.php       |     3 +
 .../Doctrine/Form/Type/DoctrineType.php       |     9 +
 .../Bridge/Doctrine/Form/Type/EntityType.php  |     3 +
 .../Bridge/Doctrine/Logger/DbalLogger.php     |     2 +
 ...rineClearEntityManagerWorkerSubscriber.php |     8 +-
 .../DoctrinePingConnectionMiddleware.php      |     2 +-
 .../RememberMe/DoctrineTokenProvider.php      |     9 +
 .../Validator/DoctrineInitializer.php         |     3 +
 .../Monolog/Command/ServerLogCommand.php      |     5 +-
 .../Monolog/Formatter/ConsoleFormatter.php    |     2 +-
 .../Monolog/Handler/ChromePhpHandler.php      |     2 +-
 .../Handler/ElasticsearchLogstashHandler.php  |     4 +-
 .../Bridge/Monolog/Handler/FirePHPHandler.php |     2 +-
 .../Bridge/Monolog/Handler/MailerHandler.php  |     2 +
 src/Symfony/Bridge/Monolog/Logger.php         |     6 +
 .../Processor/ConsoleCommandProcessor.php     |     6 +
 .../Monolog/Processor/DebugProcessor.php      |     6 +
 .../Monolog/Processor/RouteProcessor.php      |     6 +-
 .../Bridge/Monolog/Processor/WebProcessor.php |     2 +-
 .../Bridge/PhpUnit/ClassExistsMock.php        |     7 +
 src/Symfony/Bridge/PhpUnit/ClockMock.php      |     6 +
 src/Symfony/Bridge/PhpUnit/DnsMock.php        |     5 +
 .../ExpectDeprecationTraitBeforeV8_4.php      |     4 +-
 .../Legacy/SymfonyTestsListenerTrait.php      |    21 +-
 src/Symfony/Bridge/Twig/AppVariable.php       |    12 +
 .../Bridge/Twig/Command/DebugCommand.php      |    11 +-
 .../Bridge/Twig/Command/LintCommand.php       |     3 +
 .../Twig/DataCollector/TwigDataCollector.php  |     6 +-
 .../TemplateAttributeListener.php             |     3 +
 .../Bridge/Twig/Form/TwigRendererEngine.php   |     2 +
 .../Bridge/Twig/Translation/TwigExtractor.php |     9 +
 .../Command/ServerDumpPlaceholderCommand.php  |     2 +-
 .../Bundle/DebugBundle/DebugBundle.php        |     9 +
 .../Compiler/DumpDataCollectorPass.php        |     3 +
 .../DependencyInjection/DebugExtension.php    |     3 +
 .../CacheWarmer/AnnotationsCacheWarmer.php    |     2 +-
 .../FrameworkBundle/Command/AboutCommand.php  |     2 +-
 .../Command/AssetsInstallCommand.php          |     4 +-
 .../Command/CacheClearCommand.php             |     4 +-
 .../Command/CachePoolClearCommand.php         |     2 +-
 .../Command/CachePoolDeleteCommand.php        |     2 +-
 .../Command/CachePoolListCommand.php          |     2 +-
 .../Command/CachePoolPruneCommand.php         |     2 +-
 .../Command/CacheWarmupCommand.php            |     2 +-
 .../Command/ConfigDebugCommand.php            |     2 +-
 .../Command/ConfigDumpReferenceCommand.php    |     2 +-
 .../Command/ContainerDebugCommand.php         |     4 +-
 .../Command/ContainerLintCommand.php          |     2 +-
 .../Command/DebugAutowiringCommand.php        |     2 +-
 .../Command/EventDispatcherDebugCommand.php   |     2 +-
 .../Command/RouterDebugCommand.php            |     2 +-
 .../Command/RouterMatchCommand.php            |     2 +-
 .../Command/SecretsDecryptToLocalCommand.php  |     2 +-
 .../SecretsEncryptFromLocalCommand.php        |     2 +-
 .../Command/SecretsGenerateKeysCommand.php    |     2 +-
 .../Command/SecretsListCommand.php            |     2 +-
 .../Command/SecretsRemoveCommand.php          |     2 +-
 .../Command/SecretsSetCommand.php             |     2 +-
 .../Command/TranslationDebugCommand.php       |     2 +-
 .../Command/TranslationUpdateCommand.php      |     2 +-
 .../Command/WorkflowDumpCommand.php           |     2 +-
 .../Command/XliffLintCommand.php              |     2 +-
 .../Command/YamlLintCommand.php               |     2 +-
 .../FrameworkBundle/Console/Application.php   |     8 +-
 .../AddAnnotationsCachedReaderPass.php        |     2 +-
 .../Compiler/AddDebugLogProcessorPass.php     |     6 +
 .../AddExpressionLanguageProvidersPass.php    |     3 +
 .../Compiler/AssetsContextPass.php            |     3 +
 .../ContainerBuilderDebugDumpPass.php         |     3 +
 .../Compiler/DataCollectorTranslatorPass.php  |     3 +
 .../Compiler/EnableLoggerDebugModePass.php    |     2 +-
 .../Compiler/LoggingTranslatorPass.php        |     3 +
 .../Compiler/ProfilerPass.php                 |     3 +
 ...oveUnusedSessionMarshallingHandlerPass.php |     3 +
 .../TestServiceContainerRealRefPass.php       |     3 +
 .../TestServiceContainerWeakRefPass.php       |     3 +
 .../Compiler/UnusedTagsPass.php               |     3 +
 .../Compiler/WorkflowGuardListenerPass.php    |     3 +
 .../DependencyInjection/Configuration.php     |    66 +-
 .../FrameworkExtension.php                    |    72 +-
 .../FrameworkBundle/FrameworkBundle.php       |     8 +-
 .../Bundle/FrameworkBundle/KernelBrowser.php  |     6 +
 .../AnnotatedRouteControllerLoader.php        |     2 +
 .../Bundle/FrameworkBundle/Routing/Router.php |     2 +-
 .../FrameworkBundle/Test/TestContainer.php    |     8 +-
 .../Compiler/ProfilerPassTest.php             |     6 +-
 .../Translation/Translator.php                |     9 +
 .../Command/DebugFirewallCommand.php          |     2 +-
 .../DataCollector/SecurityDataCollector.php   |     6 +-
 .../Debug/TraceableFirewallListener.php       |     2 +-
 .../AddExpressionLanguageProvidersPass.php    |     3 +
 .../Compiler/AddSecurityVotersPass.php        |     3 +
 .../AddSessionDomainConstraintPass.php        |     3 +
 .../Compiler/CleanRememberMeVerifierPass.php  |     3 +
 ...eFirewallsEventDispatcherTraceablePass.php |     3 +
 .../Compiler/RegisterCsrfFeaturesPass.php     |     6 +-
 .../Compiler/RegisterEntryPointPass.php       |     3 +
 ...gisterGlobalSecurityEventListenersPass.php |     2 +-
 .../Compiler/RegisterLdapLocatorPass.php      |     2 +-
 .../RegisterTokenUsageTrackingPass.php        |     2 +-
 .../DependencyInjection/MainConfiguration.php |    10 +-
 .../Security/Factory/AbstractFactory.php      |     3 +
 .../Factory/CustomAuthenticatorFactory.php    |     2 +-
 .../Security/Factory/FormLoginFactory.php     |     2 +-
 .../Security/Factory/FormLoginLdapFactory.php |     2 +-
 .../Security/Factory/HttpBasicFactory.php     |     2 +-
 .../Security/Factory/HttpBasicLdapFactory.php |     2 +-
 .../Security/Factory/JsonLoginLdapFactory.php |     2 +-
 .../Security/Factory/LoginLinkFactory.php     |     2 +-
 .../Factory/LoginThrottlingFactory.php        |     4 +-
 .../Security/Factory/RememberMeFactory.php    |     4 +-
 .../Security/Factory/RemoteUserFactory.php    |     2 +-
 .../Security/Factory/X509Factory.php          |     2 +-
 .../Security/UserProvider/InMemoryFactory.php |     6 +
 .../Security/UserProvider/LdapFactory.php     |     6 +
 .../EventListener/FirewallListener.php        |     6 +
 .../EventListener/VoteListener.php            |     5 +-
 .../Bundle/SecurityBundle/SecurityBundle.php  |     3 +
 .../Bundle/TwigBundle/Command/LintCommand.php |     2 +-
 .../Compiler/ExtensionPass.php                |     3 +
 .../Compiler/RuntimeLoaderPass.php            |     3 +
 .../Compiler/TwigEnvironmentPass.php          |     3 +
 .../Compiler/TwigLoaderPass.php               |     3 +
 .../DependencyInjection/Configuration.php     |    10 +-
 .../Configurator/EnvironmentConfigurator.php  |     3 +
 .../DependencyInjection/TwigExtension.php     |     3 +
 src/Symfony/Bundle/TwigBundle/TwigBundle.php  |     6 +
 .../Controller/ProfilerController.php         |     2 +-
 .../Csp/ContentSecurityPolicyHandler.php      |     6 +-
 .../WebProfilerExtension.php                  |     2 +
 .../EventListener/WebDebugToolbarListener.php |     4 +-
 .../WebProfilerBundle/WebProfilerBundle.php   |     3 +
 src/Symfony/Component/Asset/Packages.php      |     6 +
 .../Component/BrowserKit/AbstractBrowser.php  |    14 +
 .../Component/BrowserKit/CookieJar.php        |    13 +
 src/Symfony/Component/BrowserKit/History.php  |     4 +
 .../Cache/Adapter/AbstractAdapter.php         |     2 +-
 .../Component/Cache/Adapter/ArrayAdapter.php  |     3 +
 .../Component/Cache/Adapter/ChainAdapter.php  |     3 +
 .../Component/Cache/Adapter/PdoAdapter.php    |     2 +
 .../Cache/Adapter/PhpArrayAdapter.php         |     2 +-
 .../Cache/Adapter/TagAwareAdapter.php         |     3 +
 .../Cache/Adapter/TraceableAdapter.php        |     6 +
 src/Symfony/Component/Cache/CacheItem.php     |     2 +-
 .../DataCollector/CacheDataCollector.php      |     8 +-
 .../CacheCollectorPass.php                    |     5 +-
 .../CachePoolClearerPass.php                  |     3 +
 .../CachePoolPrunerPass.php                   |     3 +
 .../Cache/Traits/AbstractAdapterTrait.php     |     2 +-
 .../Component/Cache/Traits/ProxyTrait.php     |     2 +-
 .../Component/Cache/Traits/RedisTrait.php     |     2 +-
 .../Component/Config/Definition/ArrayNode.php |    23 +
 .../Component/Config/Definition/BaseNode.php  |    31 +-
 .../Config/Definition/BooleanNode.php         |     3 +
 .../Builder/ArrayNodeDefinition.php           |     7 +
 .../Config/Definition/Builder/TreeBuilder.php |     3 +
 .../Definition/Dumper/XmlReferenceDumper.php  |     7 +-
 .../Definition/Dumper/YamlReferenceDumper.php |    12 +-
 .../Component/Config/Definition/EnumNode.php  |     3 +
 .../InvalidConfigurationException.php         |     5 +
 .../Component/Config/Definition/FloatNode.php |     3 +
 .../Config/Definition/IntegerNode.php         |     3 +
 .../Config/Definition/PrototypedArrayNode.php |    10 +
 .../Config/Definition/ScalarNode.php          |     3 +
 .../Config/Definition/VariableNode.php        |    11 +
 .../Component/Config/Loader/Loader.php        |     3 +
 .../Config/Loader/LoaderResolver.php          |     3 +
 .../Resource/ClassExistenceResource.php       |     2 +-
 .../Config/Resource/ComposerResource.php      |     2 +-
 .../Resource/ReflectionClassResource.php      |     2 +-
 .../Config/ResourceCheckerConfigCache.php     |     4 +-
 src/Symfony/Component/Console/Application.php |    33 +-
 .../Component/Console/Command/Command.php     |    18 +-
 .../Console/Command/CompleteCommand.php       |     2 +-
 .../Console/Command/DumpCompletionCommand.php |     2 +-
 .../Component/Console/Command/HelpCommand.php |     6 +
 .../Component/Console/Command/ListCommand.php |     3 +
 .../AddConsoleCommandPass.php                 |     3 +
 .../Descriptor/ApplicationDescription.php     |     2 +-
 .../Console/Descriptor/Descriptor.php         |    12 +-
 .../Console/Descriptor/JsonDescriptor.php     |    12 +-
 .../Console/Descriptor/MarkdownDescriptor.php |    26 +-
 .../Console/Descriptor/TextDescriptor.php     |    12 +-
 .../Console/Descriptor/XmlDescriptor.php      |    14 +-
 .../Console/EventListener/ErrorListener.php   |     6 +
 .../Console/Formatter/OutputFormatter.php     |     6 +
 .../Formatter/OutputFormatterStyle.php        |    15 +
 .../Formatter/OutputFormatterStyleStack.php   |     4 +
 .../Console/Helper/DescriptorHelper.php       |     2 +
 .../Component/Console/Helper/Helper.php       |     3 +
 .../Component/Console/Helper/HelperSet.php    |     3 +
 .../Console/Helper/InputAwareHelper.php       |     3 +
 .../Component/Console/Helper/ProgressBar.php  |    24 +-
 .../Console/Helper/ProgressIndicator.php      |    14 +-
 .../Console/Helper/QuestionHelper.php         |     6 +
 .../Console/Helper/SymfonyQuestionHelper.php  |     6 +
 .../Component/Console/Input/ArgvInput.php     |    18 +-
 .../Component/Console/Input/ArrayInput.php    |     9 +-
 src/Symfony/Component/Console/Input/Input.php |    18 +
 .../Component/Console/Input/InputArgument.php |     2 +
 .../Console/Input/InputDefinition.php         |    14 +
 .../Component/Console/Input/InputOption.php   |     3 +
 .../Console/Output/BufferedOutput.php         |     3 +
 .../Console/Output/ConsoleOutput.php          |    12 +
 .../Console/Output/ConsoleSectionOutput.php   |     7 +
 .../Component/Console/Output/NullOutput.php   |    15 +
 .../Component/Console/Output/Output.php       |    15 +
 .../Component/Console/Output/StreamOutput.php |     3 +
 .../Console/Output/TrimmedBufferOutput.php    |     3 +
 .../Component/Console/Style/OutputStyle.php   |    18 +
 .../Component/Console/Style/SymfonyStyle.php  |    58 +
 src/Symfony/Component/Console/Terminal.php    |     4 +-
 .../Component/Console/Tester/TesterTrait.php  |     2 +-
 .../Console/Tests/Fixtures/BarBucCommand.php  |     2 +-
 .../Tests/Fixtures/BarHiddenCommand.php       |     2 +-
 .../Tests/Fixtures/DescriptorCommand1.php     |     2 +-
 .../Tests/Fixtures/DescriptorCommand2.php     |     2 +-
 .../Tests/Fixtures/DescriptorCommand3.php     |     2 +-
 .../Tests/Fixtures/DescriptorCommand4.php     |     2 +-
 .../Fixtures/DescriptorCommandMbString.php    |     2 +-
 .../Console/Tests/Fixtures/Foo1Command.php    |     2 +-
 .../Console/Tests/Fixtures/Foo2Command.php    |     2 +-
 .../Console/Tests/Fixtures/Foo3Command.php    |     2 +-
 .../Console/Tests/Fixtures/Foo4Command.php    |     2 +-
 .../Console/Tests/Fixtures/Foo6Command.php    |     2 +-
 .../Console/Tests/Fixtures/FooCommand.php     |     8 +-
 .../Tests/Fixtures/FooHiddenCommand.php       |     2 +-
 .../Tests/Fixtures/FooLock2Command.php        |     2 +-
 .../Console/Tests/Fixtures/FooLockCommand.php |     2 +-
 .../Console/Tests/Fixtures/FooOptCommand.php  |     4 +-
 .../Fixtures/FooSameCaseLowercaseCommand.php  |     2 +-
 .../Fixtures/FooSameCaseUppercaseCommand.php  |     2 +-
 .../Fixtures/FooSubnamespaced1Command.php     |     6 +-
 .../Fixtures/FooSubnamespaced2Command.php     |     6 +-
 .../Tests/Fixtures/FooWithoutAliasCommand.php |     2 +-
 .../Console/Tests/Fixtures/FoobarCommand.php  |     2 +-
 .../TestAmbiguousCommandRegistering.php       |     2 +-
 .../TestAmbiguousCommandRegistering2.php      |     2 +-
 .../Console/Tests/Fixtures/TestCommand.php    |     4 +-
 .../CssSelector/Parser/TokenStream.php        |     2 +-
 .../Argument/BoundArgument.php                |     2 +-
 .../Argument/IteratorArgument.php             |     3 +
 .../Argument/ServiceClosureArgument.php       |     3 +
 .../Argument/ServiceLocatorArgument.php       |     3 +
 .../Compiler/AbstractRecursivePass.php        |     6 +
 .../AliasDeprecatedPublicServicesPass.php     |     2 +-
 .../Compiler/AnalyzeServiceReferencesPass.php |     2 +
 .../Compiler/AutoAliasServicePass.php         |     3 +
 .../Compiler/AutowireAsDecoratorPass.php      |     4 +-
 .../Compiler/AutowirePass.php                 |     9 +-
 .../Compiler/CheckCircularReferencesPass.php  |     4 +-
 .../Compiler/CheckDefinitionValidityPass.php  |     2 +
 ...xceptionOnInvalidReferenceBehaviorPass.php |     5 +-
 .../DependencyInjection/Compiler/Compiler.php |     7 +
 .../Compiler/DecoratorServicePass.php         |     3 +
 .../Compiler/ExtensionCompilerPass.php        |     3 +
 .../Compiler/InlineServiceDefinitionsPass.php |     3 +
 .../MergeExtensionConfigurationPass.php       |     5 +-
 .../Compiler/PassConfig.php                   |    15 +
 .../RegisterAutoconfigureAttributesPass.php   |     4 +-
 .../Compiler/RegisterEnvVarProcessorsPass.php |     3 +
 .../Compiler/RegisterReverseContainerPass.php |     3 +
 .../RemoveAbstractDefinitionsPass.php         |     2 +
 .../Compiler/RemoveBuildParametersPass.php    |     3 +
 .../Compiler/RemovePrivateAliasesPass.php     |     2 +
 .../Compiler/RemoveUnusedDefinitionsPass.php  |     2 +
 .../ReplaceAliasByActualDefinitionPass.php    |     2 +
 .../Compiler/ResolveBindingsPass.php          |     3 +
 .../Compiler/ResolveClassPass.php             |     3 +
 .../Compiler/ResolveDecoratorStackPass.php    |     3 +
 .../Compiler/ResolveHotPathPass.php           |     3 +
 .../ResolveInstanceofConditionalsPass.php     |     3 +
 .../Compiler/ResolveInvalidReferencesPass.php |     2 +
 .../Compiler/ResolveNoPreloadPass.php         |     3 +
 .../ResolveParameterPlaceHoldersPass.php      |     2 +
 .../ResolveReferencesToAliasesPass.php        |     3 +
 .../Compiler/ServiceReferenceGraph.php        |     4 +-
 .../Compiler/ServiceReferenceGraphNode.php    |     8 +
 .../Compiler/ValidateEnvPlaceholdersPass.php  |     3 +
 .../DependencyInjection/Container.php         |    10 +
 .../ContainerAwareTrait.php                   |     3 +
 .../DependencyInjection/ContainerBuilder.php  |    37 +-
 .../DependencyInjection/Dumper/PhpDumper.php  |    10 +-
 .../DependencyInjection/Dumper/XmlDumper.php  |    14 +-
 .../Exception/ParameterNotFoundException.php  |     9 +
 .../Configurator/ContainerConfigurator.php    |     4 +-
 .../DependencyInjection/Loader/FileLoader.php |     7 +
 .../Loader/PhpFileLoader.php                  |     2 +-
 .../Loader/XmlFileLoader.php                  |    14 +-
 .../Loader/YamlFileLoader.php                 |    10 +-
 .../EnvPlaceholderParameterBag.php            |    10 +
 .../ParameterBag/ParameterBag.php             |    17 +
 .../ResolveInstanceofConditionalsPassTest.php |     2 +-
 src/Symfony/Component/DomCrawler/Crawler.php  |    23 +
 .../DomCrawler/Field/ChoiceFormField.php      |    12 +-
 .../DomCrawler/Field/FileFormField.php        |    10 +
 .../Component/DomCrawler/Field/FormField.php  |     2 +
 .../DomCrawler/Field/InputFormField.php       |     2 +
 .../DomCrawler/Field/TextareaFormField.php    |     2 +
 src/Symfony/Component/DomCrawler/Form.php     |    10 +-
 .../DomCrawler/FormFieldRegistry.php          |     6 +-
 src/Symfony/Component/DomCrawler/Image.php    |     3 +
 src/Symfony/Component/DomCrawler/Link.php     |     3 +
 .../Dotenv/Command/DotenvDumpCommand.php      |     2 +-
 src/Symfony/Component/Dotenv/Dotenv.php       |     4 +-
 .../ErrorHandler/DebugClassLoader.php         |     6 +-
 .../Debug/TraceableEventDispatcher.php        |    13 +
 .../RegisterListenersPass.php                 |     5 +-
 .../EventDispatcher/EventDispatcher.php       |    16 +-
 .../ExpressionLanguage/ExpressionLanguage.php |    11 +
 .../ExpressionLanguage/Node/FunctionNode.php  |     2 +-
 .../ExpressionLanguage/Node/Node.php          |     3 +
 .../ExpressionLanguage/Node/UnaryNode.php     |     2 +-
 .../Component/ExpressionLanguage/Parser.php   |     3 +
 .../ExpressionLanguage/TokenStream.php        |     4 +
 .../Component/Filesystem/Filesystem.php       |    28 +-
 src/Symfony/Component/Finder/Finder.php       |     2 +
 .../Component/Form/AbstractExtension.php      |     6 +-
 .../Component/Form/AbstractRendererEngine.php |     3 +
 src/Symfony/Component/Form/AbstractType.php   |    12 +
 .../Component/Form/AbstractTypeExtension.php  |    12 +
 .../Form/ChoiceList/ArrayChoiceList.php       |     2 +-
 .../Factory/CachingFactoryDecorator.php       |     3 +
 .../Factory/DefaultChoiceListFactory.php      |     6 +-
 .../Component/Form/Command/DebugCommand.php   |     3 +
 .../Form/DependencyInjection/FormPass.php     |     3 +
 .../Core/DataMapper/CheckboxListMapper.php    |     6 +
 .../Core/DataMapper/RadioListMapper.php       |     6 +
 .../EventListener/FixUrlProtocolListener.php  |     3 +
 .../EventListener/MergeCollectionListener.php |     3 +
 .../Core/EventListener/ResizeFormListener.php |     9 +
 .../TransformationFailureListener.php         |     3 +
 .../Core/EventListener/TrimListener.php       |     3 +
 .../Form/Extension/Core/Type/BaseType.php     |     9 +
 .../Form/Extension/Core/Type/BirthdayType.php |     3 +
 .../Form/Extension/Core/Type/ButtonType.php   |     3 +
 .../Form/Extension/Core/Type/CheckboxType.php |     9 +
 .../Extension/Core/Type/CollectionType.php    |    12 +
 .../Form/Extension/Core/Type/ColorType.php    |     6 +
 .../Form/Extension/Core/Type/CountryType.php  |     3 +
 .../Form/Extension/Core/Type/CurrencyType.php |     3 +
 .../Extension/Core/Type/DateIntervalType.php  |     9 +
 .../Form/Extension/Core/Type/DateTimeType.php |     9 +
 .../Form/Extension/Core/Type/EmailType.php    |     3 +
 .../Form/Extension/Core/Type/FormType.php     |    12 +
 .../Form/Extension/Core/Type/HiddenType.php   |     3 +
 .../Form/Extension/Core/Type/IntegerType.php  |     9 +
 .../Form/Extension/Core/Type/LanguageType.php |     3 +
 .../Form/Extension/Core/Type/LocaleType.php   |     3 +
 .../Form/Extension/Core/Type/MoneyType.php    |     9 +
 .../Form/Extension/Core/Type/NumberType.php   |     9 +
 .../Form/Extension/Core/Type/PasswordType.php |     6 +
 .../Form/Extension/Core/Type/PercentType.php  |     9 +
 .../Form/Extension/Core/Type/RadioType.php    |     3 +
 .../Form/Extension/Core/Type/RangeType.php    |     3 +
 .../Form/Extension/Core/Type/RepeatedType.php |     6 +
 .../Form/Extension/Core/Type/SearchType.php   |     3 +
 .../Form/Extension/Core/Type/SubmitType.php   |     6 +
 .../Form/Extension/Core/Type/TelType.php      |     3 +
 .../Form/Extension/Core/Type/TextType.php     |     6 +
 .../Form/Extension/Core/Type/TextareaType.php |     3 +
 .../Form/Extension/Core/Type/TimeType.php     |     9 +
 .../Form/Extension/Core/Type/TimezoneType.php |     6 +
 .../Type/TransformationFailureExtension.php   |     3 +
 .../Form/Extension/Core/Type/UlidType.php     |     6 +
 .../Form/Extension/Core/Type/UrlType.php      |     9 +
 .../Form/Extension/Core/Type/UuidType.php     |     6 +
 .../Form/Extension/Core/Type/WeekType.php     |     9 +
 .../EventListener/CsrfValidationListener.php  |     3 +
 .../Csrf/Type/FormTypeCsrfExtension.php       |     7 +
 .../EventListener/DataCollectorListener.php   |     4 +
 .../DataCollector/FormDataCollector.php       |    18 +-
 .../Proxy/ResolvedTypeDataCollectorProxy.php  |     9 +
 .../Type/DataCollectorTypeExtension.php       |     3 +
 .../Type/TextTypeHtmlSanitizerExtension.php   |     6 +
 .../HttpFoundationRequestHandler.php          |     3 +
 .../Type/FormTypeHttpFoundationExtension.php  |     3 +
 .../EventListener/PasswordHasherListener.php  |     6 +
 .../Type/FormTypePasswordHasherExtension.php  |     3 +
 .../PasswordTypePasswordHasherExtension.php   |     6 +
 .../Validator/Constraints/FormValidator.php   |     3 +
 .../EventListener/ValidationListener.php      |     3 +
 .../Validator/Type/BaseValidatorExtension.php |     3 +
 .../Type/FormTypeValidatorExtension.php       |     6 +
 .../Type/RepeatedTypeValidatorExtension.php   |     3 +
 .../Type/UploadValidatorExtension.php         |     3 +
 .../ViolationMapper/ViolationMapper.php       |     3 +
 .../ViolationMapper/ViolationPath.php         |     2 +-
 src/Symfony/Component/Form/FormBuilder.php    |     2 +-
 .../Component/Form/FormConfigBuilder.php      |     2 +-
 src/Symfony/Component/Form/FormError.php      |     2 +
 src/Symfony/Component/Form/FormEvent.php      |     2 +
 src/Symfony/Component/Form/FormRenderer.php   |     3 +
 src/Symfony/Component/Form/FormView.php       |     3 +
 .../Component/Form/NativeRequestHandler.php   |     2 +
 .../Component/Form/ResolvedFormType.php       |     9 +
 .../Component/HttpClient/AmpHttpClient.php    |     2 +-
 .../HttpClient/CachingHttpClient.php          |     3 +
 .../Component/HttpClient/CurlHttpClient.php   |     2 +-
 .../DataCollector/HttpClientDataCollector.php |     8 +-
 .../Component/HttpClient/DecoratorTrait.php   |     3 +
 .../DependencyInjection/HttpClientPass.php    |     2 +-
 .../Component/HttpClient/HttplugClient.php    |     2 +-
 .../Component/HttpClient/Internal/Canary.php  |     2 +-
 .../HttpClient/Internal/CurlClientState.php   |     2 +-
 .../HttpClient/Internal/NativeClientState.php |     2 +-
 .../Component/HttpClient/MockHttpClient.php   |     3 +
 .../Component/HttpClient/NativeHttpClient.php |     2 +-
 .../HttpClient/NoPrivateNetworkHttpClient.php |     2 +-
 .../Component/HttpClient/Psr18Client.php      |     2 +-
 .../Response/CommonResponseTrait.php          |     2 +-
 .../HttpClient/ScopingHttpClient.php          |     3 +
 .../HttpClient/TraceableHttpClient.php        |     2 +-
 .../HttpFoundation/BinaryFileResponse.php     |     2 +
 .../ExpressionRequestMatcher.php              |     3 +
 .../Component/HttpFoundation/FileBag.php      |     9 +
 .../Component/HttpFoundation/HeaderBag.php    |    12 +
 .../Component/HttpFoundation/InputBag.php     |     6 +-
 .../Component/HttpFoundation/ParameterBag.php |     9 +
 .../Component/HttpFoundation/Request.php      |    29 +-
 .../HttpFoundation/RequestMatcher.php         |    16 +
 .../Component/HttpFoundation/RequestStack.php |     2 +
 .../HttpFoundation/ResponseHeaderBag.php      |    16 +
 .../Session/Attribute/AttributeBag.php        |    12 +
 .../Session/Flash/AutoExpireFlashBag.php      |    15 +
 .../HttpFoundation/Session/Flash/FlashBag.php |    15 +
 .../HttpFoundation/Session/Session.php        |    21 +
 .../Storage/Handler/PdoSessionHandler.php     |     2 +
 .../Session/Storage/MetadataBag.php           |     7 +
 .../Storage/MockArraySessionStorage.php       |    24 +
 .../Storage/MockFileSessionStorage.php        |     3 +
 .../Session/Storage/NativeSessionStorage.php  |    24 +
 .../Storage/PhpBridgeSessionStorage.php       |     3 +
 .../Session/Storage/Proxy/AbstractProxy.php   |     4 +
 .../Component/HttpKernel/Bundle/Bundle.php    |    13 +-
 .../CacheClearer/ChainCacheClearer.php        |     2 +-
 .../CacheClearer/Psr6CacheClearer.php         |     3 +
 .../HttpKernel/CacheWarmer/CacheWarmer.php    |     3 +
 .../CacheWarmer/CacheWarmerAggregate.php      |     4 +-
 .../ContainerControllerResolver.php           |     2 +-
 .../DataCollector/AjaxDataCollector.php       |     4 +-
 .../DataCollector/ConfigDataCollector.php     |     8 +-
 .../DataCollector/DataCollector.php           |     4 +-
 .../DataCollector/DataCollectorInterface.php  |     2 +
 .../DataCollector/DumpDataCollector.php       |     8 +-
 .../DataCollector/EventDataCollector.php      |    12 +-
 .../DataCollector/ExceptionDataCollector.php  |     4 +-
 .../LateDataCollectorInterface.php            |     2 +
 .../DataCollector/LoggerDataCollector.php     |     6 +-
 .../DataCollector/MemoryDataCollector.php     |     8 +-
 .../DataCollector/RequestDataCollector.php    |    10 +-
 .../DataCollector/RouterDataCollector.php     |     7 +-
 .../DataCollector/TimeDataCollector.php       |     8 +-
 .../Debug/TraceableEventDispatcher.php        |     6 +
 .../AddAnnotatedClassesToCachePass.php        |     3 +
 .../ConfigurableExtension.php                 |     2 +-
 .../ControllerArgumentValueResolverPass.php   |     3 +
 .../DependencyInjection/Extension.php         |     2 +
 .../FragmentRendererPass.php                  |     3 +
 .../DependencyInjection/LoggerPass.php        |     3 +
 .../MergeExtensionConfigurationPass.php       |     3 +
 ...RegisterControllerArgumentLocatorsPass.php |     3 +
 .../RegisterLocaleAwareServicesPass.php       |     3 +
 ...oveEmptyControllerArgumentLocatorsPass.php |     3 +
 .../ResettableServicePass.php                 |     3 +
 .../DependencyInjection/ServicesResetter.php  |     2 +-
 .../Event/ControllerArgumentsEvent.php        |     2 +-
 .../HttpKernel/Event/RequestEvent.php         |     2 +
 .../EventListener/AbstractSessionListener.php |     4 +-
 .../AddRequestFormatsListener.php             |     2 +-
 .../EventListener/CacheAttributeListener.php  |     4 +
 .../EventListener/DebugHandlersListener.php   |     2 +-
 .../HttpKernel/EventListener/DumpListener.php |     3 +
 .../EventListener/ErrorListener.php           |     9 +
 .../EventListener/FragmentListener.php        |     4 +-
 .../EventListener/LocaleListener.php          |    10 +-
 .../EventListener/ProfilerListener.php        |     6 +-
 .../EventListener/ResponseListener.php        |     2 +-
 .../EventListener/RouterListener.php          |     8 +-
 .../StreamedResponseListener.php              |     2 +-
 .../EventListener/SurrogateListener.php       |     2 +-
 .../EventListener/ValidateRequestListener.php |     2 +-
 .../HttpKernel/Exception/HttpException.php    |     3 +
 .../HttpKernel/Fragment/FragmentHandler.php   |     2 +
 .../Fragment/RoutableFragmentRenderer.php     |     2 +
 .../HttpCache/AbstractSurrogate.php           |     5 +
 .../Component/HttpKernel/Htt
10000
pCache/Esi.php    |     3 +
 .../HttpKernel/HttpCache/HttpCache.php        |    14 +-
 .../HttpCache/ResponseCacheStrategy.php       |     8 +-
 .../Component/HttpKernel/HttpCache/Ssi.php    |     3 +
 .../Component/HttpKernel/HttpCache/Store.php  |     4 +
 .../Component/HttpKernel/HttpKernel.php       |     7 +-
 .../HttpKernel/HttpKernelBrowser.php          |     2 +
 src/Symfony/Component/HttpKernel/Kernel.php   |    24 +-
 .../Profiler/FileProfilerStorage.php          |     5 +-
 .../Component/HttpKernel/Profiler/Profile.php |    28 +
 .../HttpKernel/Profiler/Profiler.php          |    13 +
 .../DataCollector/CloneVarDataCollector.php   |    13 +
 .../Component/HttpKernel/Tests/KernelTest.php |     2 +-
 .../Data/Bundle/Compiler/GenrbCompiler.php    |     2 +-
 .../Data/Bundle/Reader/BundleEntryReader.php  |     2 +-
 .../Data/Bundle/Writer/JsonBundleWriter.php   |     2 +-
 .../Data/Bundle/Writer/PhpBundleWriter.php    |     2 +-
 .../Data/Bundle/Writer/TextBundleWriter.php   |    16 +-
 .../Intl/Data/Generator/GeneratorConfig.php   |     2 +-
 .../Data/Generator/LocaleDataGenerator.php    |     4 +-
 src/Symfony/Component/Intl/Locale.php         |     2 +-
 .../Component/Intl/Resources/bin/common.php   |     4 +-
 .../Component/Intl/Util/GitRepository.php     |     2 +-
 .../Component/Intl/Util/IntlTestHelper.php    |     8 +
 .../Ldap/Adapter/AbstractConnection.php       |     3 +
 .../Ldap/Adapter/ExtLdap/Connection.php       |    15 +-
 .../Ldap/Adapter/ExtLdap/EntryManager.php     |     3 +
 .../Component/Ldap/Adapter/ExtLdap/Query.php  |     2 +-
 src/Symfony/Component/Ldap/Entry.php          |     4 +
 src/Symfony/Component/Ldap/Ldap.php           |     2 +-
 .../Security/CheckLdapCredentialsListener.php |     3 +
 .../Component/Ldap/Security/LdapUser.php      |     4 +-
 src/Symfony/Component/Lock/Key.php            |     4 +-
 src/Symfony/Component/Lock/Lock.php           |     4 +-
 src/Symfony/Component/Lock/NoLock.php         |     4 +-
 .../Component/Lock/Store/CombinedStore.php    |    12 +
 .../Store/DoctrineDbalPostgreSqlStore.php     |    18 +
 .../Lock/Store/DoctrineDbalStore.php          |     9 +
 .../Lock/Store/ExpiringStoreTrait.php         |     2 +-
 .../Component/Lock/Store/FlockStore.php       |    20 +-
 .../Component/Lock/Store/InMemoryStore.php    |    12 +
 .../Component/Lock/Store/MemcachedStore.php   |     9 +
 .../Component/Lock/Store/MongoDbStore.php     |    11 +-
 src/Symfony/Component/Lock/Store/PdoStore.php |     9 +
 .../Component/Lock/Store/PostgreSqlStore.php  |    18 +
 .../Component/Lock/Store/RedisStore.php       |    12 +
 .../Component/Lock/Store/SemaphoreStore.php   |    14 +-
 .../Component/Lock/Store/ZookeeperStore.php   |    11 +-
 .../Mailer/Command/MailerTestCommand.php      |     2 +-
 .../DataCollector/MessageDataCollector.php    |     4 +-
 .../EventListener/MessageLoggerListener.php   |     3 +
 .../Mailer/Transport/AbstractTransport.php    |     2 +-
 .../Transport/Smtp/Stream/ProcessStream.php   |     2 +-
 .../Transport/AmazonSqsTransport.php          |     3 +
 .../Bridge/Amqp/Transport/Connection.php      |     8 +-
 .../Bridge/Doctrine/Transport/Connection.php  |     2 +-
 .../Transport/PostgreSqlConnection.php        |     4 +-
 .../Bridge/Redis/Transport/Connection.php     |     2 +-
 .../Command/AbstractFailedMessagesCommand.php |     4 +-
 .../Command/ConsumeMessagesCommand.php        |     3 +
 .../Messenger/Command/DebugCommand.php        |     3 +
 .../Command/FailedMessagesRetryCommand.php    |     6 +-
 .../Command/FailedMessagesShowCommand.php     |     6 +-
 .../Command/SetupTransportsCommand.php        |     3 +
 .../Messenger/Command/StatsCommand.php        |     3 +
 .../DataCollector/MessengerDataCollector.php  |     6 +-
 .../DependencyInjection/MessengerPass.php     |    11 +-
 .../Event/SendMessageToTransportsEvent.php    |     2 +-
 .../SendFailedMessageForRetryListener.php     |     3 +
 ...ailedMessageToFailureTransportListener.php |     3 +
 .../Component/Messenger/Tests/WorkerTest.php  |     2 +-
 .../Messenger/TraceableMessageBus.php         |     3 +
 .../Transport/InMemory/InMemoryTransport.php  |     3 +
 .../InMemory/InMemoryTransportFactory.php     |     3 +
 .../AddMimeTypeGuesserPass.php                |     3 +
 .../Component/Mime/Header/AbstractHeader.php  |     8 +
 .../Component/Mime/Header/DateHeader.php      |     4 +-
 src/Symfony/Component/Mime/Header/Headers.php |     2 +-
 .../Mime/Header/IdentificationHeader.php      |     6 +-
 .../Component/Mime/Header/MailboxHeader.php   |     4 +-
 .../Mime/Header/MailboxListHeader.php         |     8 +-
 .../Mime/Header/ParameterizedHeader.php       |     4 +-
 .../Component/Mime/Header/PathHeader.php      |     4 +-
 .../Mime/Header/UnstructuredHeader.php        |     4 +
 src/Symfony/Component/Mime/Message.php        |     3 +
 src/Symfony/Component/Mime/MimeTypes.php      |     4 +-
 src/Symfony/Component/Mime/RawMessage.php     |     2 +
 .../Notifier/Bridge/Mobyt/MobytOptions.php    |     2 +-
 .../NotificationDataCollector.php             |     4 +-
 .../NotificationLoggerListener.php            |     3 +
 .../SendFailedMessageToNotifierListener.php   |     3 +
 .../Command/UserPasswordHashCommand.php       |     2 +-
 .../Component/Process/ExecutableFinder.php    |     4 +
 src/Symfony/Component/Process/InputStream.php |     6 +
 src/Symfony/Component/Process/PhpProcess.php  |     3 +
 .../Component/Process/Pipes/AbstractPipes.php |     6 +-
 .../Process/Pipes/PipesInterface.php          |     2 +-
 .../Component/Process/Pipes/WindowsPipes.php  |     2 +-
 .../PropertyAccess/PropertyAccessor.php       |     9 +-
 .../PropertyAccess/PropertyPathBuilder.php    |    16 +-
 .../PropertyInfoConstructorPass.php           |     2 +-
 .../DependencyInjection/PropertyInfoPass.php  |     3 +
 .../RateLimiter/Policy/SlidingWindow.php      |     2 +-
 .../Component/Routing/Annotation/Route.php    |    30 +
 .../RoutingResolverPass.php                   |     3 +
 .../Routing/Generator/UrlGenerator.php        |     6 +
 .../Routing/Loader/AnnotationClassLoader.php  |     7 +
 .../Loader/Configurator/Traits/HostTrait.php  |     2 +-
 .../Configurator/Traits/PrefixTrait.php       |     2 +-
 .../Component/Routing/Loader/ObjectLoader.php |     2 +-
 .../Routing/Loader/XmlFileLoader.php          |     6 +
 .../Routing/Loader/YamlFileLoader.php         |     6 +
 .../Dumper/CompiledUrlMatcherDumper.php       |     3 +
 .../Routing/Matcher/TraceableUrlMatcher.php   |     5 +-
 .../Component/Routing/Matcher/UrlMatcher.php  |     6 +
 .../Component/Routing/RouteCollection.php     |    27 +
 src/Symfony/Component/Routing/Router.php      |    12 +
 .../RememberMe/InMemoryTokenProvider.php      |     9 +
 .../Authentication/Token/AbstractToken.php    |    12 +
 .../Core/Authentication/Token/NullToken.php   |     3 +
 .../Token/Storage/TokenStorage.php            |     6 +
 .../TraceableAccessDecisionManager.php        |     2 +-
 .../Core/Exception/AccessDeniedException.php  |     6 +
 .../Core/Exception/AccountStatusException.php |     3 +
 .../Exception/AuthenticationException.php     |     3 +
 ...ustomUserMessageAccountStatusException.php |     2 +
 ...stomUserMessageAuthenticationException.php |     2 +
 .../Security/Core/Role/RoleHierarchy.php      |     3 +
 .../Security/Core/User/InMemoryUser.php       |     2 +-
 .../Core/User/InMemoryUserChecker.php         |     6 +
 .../Constraints/UserPasswordValidator.php     |     3 +
 .../NativeSessionTokenStorage.php             |     8 +-
 .../Csrf/TokenStorage/SessionTokenStorage.php |     6 +
 .../Component/Security/Http/AccessMap.php     |     2 +
 .../DefaultAuthenticationFailureHandler.php   |     3 +
 .../DefaultAuthenticationSuccessHandler.php   |     3 +
 .../AccessTokenAuthenticator.php              |     3 +
 .../Security/Http/Event/LoginFailureEvent.php |     3 +
 .../Security/Http/Event/SwitchUserEvent.php   |     2 +-
 .../IsGrantedAttributeListener.php            |     3 +
 .../Component/Security/Http/Firewall.php      |     9 +
 .../Http/Firewall/ChannelListener.php         |     2 +-
 .../Http/Firewall/ContextListener.php         |     4 +-
 .../Http/Firewall/ExceptionListener.php       |    10 +-
 .../Security/Http/Firewall/LogoutListener.php |     2 +-
 .../Http/Firewall/SwitchUserListener.php      |     2 +-
 .../Component/Security/Http/FirewallMap.php   |     2 +
 .../Http/Logout/LogoutUrlGenerator.php        |     5 +
 .../RememberMe/AbstractRememberMeHandler.php  |     2 +
 .../Http/RememberMe/ResponseListener.php      |     2 +-
 .../Session/SessionAuthenticationStrategy.php |     3 +
 .../Security/Http/Util/TargetPathTrait.php    |     4 +-
 src/Symfony/Component/Semaphore/Key.php       |     2 +-
 src/Symfony/Component/Semaphore/Semaphore.php |     4 +-
 .../Component/Semaphore/Store/RedisStore.php  |     9 +
 .../Serializer/Debug/TraceableEncoder.php     |     2 +-
 .../Serializer/Debug/TraceableNormalizer.php  |     6 +-
 .../DependencyInjection/SerializerPass.php    |     3 +
 .../Serializer/Encoder/CsvEncoder.php         |     2 +-
 .../Serializer/Mapping/AttributeMetadata.php  |    15 +
 .../Serializer/Mapping/ClassMetadata.php      |     9 +
 .../Normalizer/DenormalizerAwareTrait.php     |     3 +
 .../Normalizer/GetSetMethodNormalizer.php     |     3 +
 .../Normalizer/MimeMessageNormalizer.php      |     2 +-
 .../Normalizer/NormalizerAwareTrait.php       |     3 +
 .../Normalizer/ObjectNormalizer.php           |     3 +
 .../Normalizer/PropertyNormalizer.php         |     3 +
 .../Serializer/SerializerAwareTrait.php       |     3 +
 src/Symfony/Component/Stopwatch/Stopwatch.php |     6 +
 .../Component/Stopwatch/StopwatchEvent.php    |     2 +
 .../Component/String/Slugger/AsciiSlugger.php |     3 +
 .../Component/Templating/DelegatingEngine.php |     6 +
 .../Component/Templating/Helper/Helper.php    |     2 +
 .../Templating/Helper/SlotsHelper.php         |     6 +
 .../Templating/Loader/ChainLoader.php         |     3 +
 .../Component/Templating/Loader/Loader.php    |     2 +
 .../Component/Templating/PhpEngine.php        |    18 +
 .../Translation/Catalogue/MergeOperation.php  |     3 +
 .../Translation/Catalogue/TargetOperation.php |     3 +
 .../Command/TranslationPullCommand.php        |     2 +-
 .../Command/TranslationPushCommand.php        |     2 +-
 .../Translation/Command/XliffLintCommand.php  |     3 +
 .../TranslationDataCollector.php              |     6 +-
 .../Translation/DataCollectorTranslator.php   |     5 +-
 .../TranslationDumperPass.php                 |     3 +
 .../TranslationExtractorPass.php              |     3 +
 .../DependencyInjection/TranslatorPass.php    |     3 +
 .../TranslatorPathsPass.php                   |     3 +
 .../Translation/Dumper/CsvFileDumper.php      |     2 +
 .../Translation/Dumper/FileDumper.php         |     5 +
 .../Translation/Extractor/ChainExtractor.php  |     8 +
 .../Translation/Loader/CsvFileLoader.php      |     2 +
 .../Translation/Loader/PoFileLoader.php       |     2 +-
 .../Translation/Loader/XliffFileLoader.php    |     6 +-
 .../Translation/LoggingTranslator.php         |     5 +-
 .../Translation/MessageCatalogue.php          |    34 +-
 .../Translation/Reader/TranslationReader.php  |     5 +
 .../Component/Translation/Translator.php      |    20 +
 .../Translation/Util/ArrayConverter.php       |     2 +-
 .../Translation/Writer/TranslationWriter.php  |     4 +
 .../Validator/Command/DebugCommand.php        |     3 +
 .../Component/Validator/Constraint.php        |     2 +
 .../Validator/ConstraintValidator.php         |     3 +
 .../Validator/ConstraintViolationList.php     |    12 +
 .../AbstractComparisonValidator.php           |     3 +
 .../Validator/Constraints/AllValidator.php    |     3 +
 .../Constraints/AtLeastOneOfValidator.php     |     3 +
 .../Validator/Constraints/BicValidator.php    |     3 +
 .../Validator/Constraints/BlankValidator.php  |     3 +
 .../Constraints/CallbackValidator.php         |     3 +
 .../Constraints/CardSchemeValidator.php       |     2 +
 .../Validator/Constraints/ChoiceValidator.php |     3 +
 .../Validator/Constraints/Collection.php      |     3 +
 .../Constraints/CollectionValidator.php       |     3 +
 .../Validator/Constraints/Composite.php       |     4 +
 .../Constraints/CompoundValidator.php         |     3 +
 .../Validator/Constraints/CountValidator.php  |     3 +
 .../Constraints/CountryValidator.php          |     3 +
 .../Constraints/CurrencyValidator.php         |     3 +
 .../Constraints/DateTimeValidator.php         |     3 +
 .../Validator/Constraints/DateValidator.php   |     3 +
 .../Validator/Constraints/EmailValidator.php  |     3 +
 .../Constraints/ExpressionValidator.php       |     3 +
 .../Component/Validator/Constraints/File.php  |     2 +-
 .../Validator/Constraints/FileValidator.php   |     3 +
 .../Constraints/HostnameValidator.php         |     3 +
 .../Validator/Constraints/IbanValidator.php   |     3 +
 .../Validator/Constraints/ImageValidator.php  |     3 +
 .../Validator/Constraints/IpValidator.php     |     3 +
 .../Constraints/IsFalseValidator.php          |     3 +
 .../Validator/Constraints/IsNullValidator.php |     3 +
 .../Validator/Constraints/IsTrueValidator.php |     3 +
 .../Validator/Constraints/IsbnValidator.php   |     3 +
 .../Validator/Constraints/IsinValidator.php   |     3 +
 .../Validator/Constraints/IssnValidator.php   |     3 +
 .../Validator/Constraints/JsonValidator.php   |     3 +
 .../Constraints/LanguageValidator.php         |     3 +
 .../Validator/Constraints/LengthValidator.php |     3 +
 .../Validator/Constraints/LocaleValidator.php |     3 +
 .../Validator/Constraints/LuhnValidator.php   |     3 +
 .../Constraints/NotBlankValidator.php         |     3 +
 .../NotCompromisedPasswordValidator.php       |     2 +
 .../Constraints/NotNullValidator.php          |     3 +
 .../Validator/Constraints/RangeValidator.php  |     3 +
 .../Validator/Constraints/RegexValidator.php  |     3 +
 .../Constraints/SequentiallyValidator.php     |     3 +
 .../Validator/Constraints/TimeValidator.php   |     3 +
 .../Constraints/TimezoneValidator.php         |     3 +
 .../Validator/Constraints/TypeValidator.php   |     3 +
 .../Validator/Constraints/UlidValidator.php   |     3 +
 .../Validator/Constraints/UniqueValidator.php |     3 +
 .../Validator/Constraints/UrlValidator.php    |     3 +
 .../Validator/Constraints/UuidValidator.php   |     7 +-
 .../Component/Validator/Constraints/Valid.php |     3 +
 .../Validator/Constraints/ValidValidator.php  |     3 +
 .../Validator/Context/ExecutionContext.php    |    14 +-
 .../DataCollector/ValidatorDataCollector.php  |     6 +-
 .../AddAutoMappingConfigurationPass.php       |     3 +
 .../AddConstraintValidatorsPass.php           |     3 +
 .../AddValidatorInitializersPass.php          |     3 +
 .../Validator/Mapping/ClassMetadata.php       |     8 +-
 .../Factory/LazyLoadingMetadataFactory.php    |     2 +-
 .../Mapping/Loader/AbstractLoader.php         |     2 +
 .../Mapping/Loader/PropertyInfoLoader.php     |     2 +-
 .../Mapping/Loader/XmlFileLoader.php          |     4 +-
 .../Mapping/Loader/YamlFileLoader.php         |     4 +-
 .../Validator/Mapping/MemberMetadata.php      |     2 +-
 .../RecursiveContextualValidator.php          |    12 +-
 .../Validator/TraceableValidator.php          |     3 +
 .../Violation/ConstraintViolationBuilder.php  |     2 +-
 .../VarDumper/Caster/RdKafkaCaster.php        |     6 +
 .../VarDumper/Caster/ReflectionCaster.php     |     6 +-
 .../VarDumper/Caster/ResourceCaster.php       |     2 +-
 .../VarDumper/Cloner/AbstractCloner.php       |     8 +
 .../Component/VarDumper/Cloner/Data.php       |     4 +-
 .../VarDumper/Command/ServerDumpCommand.php   |     2 +-
 .../VarDumper/Dumper/AbstractDumper.php       |     4 +
 .../Component/VarDumper/Dumper/CliDumper.php  |    30 +
 .../VarDumper/Dumper/ContextualizedDumper.php |     3 +
 .../VarDumper/Dumper/ServerDumper.php         |     3 +
 .../Component/VarDumper/Server/Connection.php |     9 +-
 .../EventListener/AddLinkHeaderListener.php   |     2 +-
 src/Symfony/Component/Workflow/Definition.php |     6 +-
 .../EventListener/AuditTrailListener.php      |     9 +
 .../EventListener/ExpressionLanguage.php      |     3 +
 .../Workflow/EventListener/GuardListener.php  |     5 +-
 src/Symfony/Component/Workflow/Marking.php    |     6 +
 .../MarkingStore/MethodMarkingStore.php       |     2 +-
 src/Symfony/Component/Workflow/Registry.php   |     3 +
 .../Validator/StateMachineValidator.php       |     3 +
 .../Workflow/Validator/WorkflowValidator.php  |     3 +
 .../Component/Yaml/Command/LintCommand.php    |     3 +
 .../Yaml/Exception/ParseException.php         |     8 +-
 src/Symfony/Component/Yaml/Inline.php         |     2 +-
 .../Contracts/Translation/TranslatorTrait.php |     3 +
 790 files changed, 13771 insertions(+), 897 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index ab6b6b4cf122f..b6acfc677e7ee 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -7,27 +7,495 @@ head=$(sed '/^diff /Q' .github/expected-missing-return-types.diff)
 git checkout composer.json src/
 
 diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
-index 96c346846c..57a229c4d4 100644
+index ada5fcbd49..51af652f08 100644
 --- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
 +++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
-@@ -111,5 +111,5 @@ class DoctrineDataCollector extends DataCollector
+@@ -51,5 +51,5 @@ class DoctrineDataCollector extends DataCollector
+      * @return void
+      */
+-    public function addLogger(string $name, DebugStack $logger)
++    public function addLogger(string $name, DebugStack $logger): void
+     {
+         $this->loggers[$name] = $logger;
+@@ -59,5 +59,5 @@ class DoctrineDataCollector extends DataCollector
+      * @return void
+      */
+-    public function collect(Request $request, Response $response, \Throwable $exception = null)
++    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+     {
+         $this->data = [
+@@ -90,5 +90,5 @@ class DoctrineDataCollector extends DataCollector
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->data = [];
+@@ -119,5 +119,5 @@ class DoctrineDataCollector extends DataCollector
       * @return int
       */
 -    public function getQueryCount()
 +    public function getQueryCount(): int
      {
          return array_sum(array_map('count', $this->data['queries']));
+diff --git a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
+index 4fa5057fe2..9e111adac5 100644
+--- a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
++++ b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
+@@ -36,5 +36,5 @@ class ContainerAwareLoader extends Loader
+      * @return void
+      */
+-    public function addFixture(FixtureInterface $fixture)
++    public function addFixture(FixtureInterface $fixture): void
+     {
+         if ($fixture instanceof ContainerAwareInterface) {
+diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+index 56b108942e..20761fcc26 100644
+--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
++++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+@@ -43,5 +43,5 @@ abstract class AbstractDoctrineExtension extends Extension
+      * @throws \InvalidArgumentException
+      */
+-    protected function loadMappingInformation(array $objectManager, ContainerBuilder $container)
++    protected function loadMappingInformation(array $objectManager, ContainerBuilder $container): void
+     {
+         if ($objectManager['auto_mapping']) {
+@@ -111,5 +111,5 @@ abstract class AbstractDoctrineExtension extends Extension
+      * @return void
+      */
+-    protected function setMappingDriverAlias(array $mappingConfig, string $mappingName)
++    protected function setMappingDriverAlias(array $mappingConfig, string $mappingName): void
+     {
+         if (isset($mappingConfig['alias'])) {
+@@ -127,5 +127,5 @@ abstract class AbstractDoctrineExtension extends Extension
+      * @throws \InvalidArgumentException
+      */
+-    protected function setMappingDriverConfig(array $mappingConfig, string $mappingName)
++    protected function setMappingDriverConfig(array $mappingConfig, string $mappingName): void
+     {
+         $mappingDirectory = $mappingConfig['dir'];
+@@ -182,5 +182,5 @@ abstract class AbstractDoctrineExtension extends Extension
+      * @return void
+      */
+-    protected function registerMappingDrivers(array $objectManager, ContainerBuilder $container)
++    protected function registerMappingDrivers(array $objectManager, ContainerBuilder $container): void
+     {
+         // configure metadata driver for each bundle based on the type of mapping files found
+@@ -240,5 +240,5 @@ abstract class AbstractDoctrineExtension extends Extension
+      * @throws \InvalidArgumentException
+      */
+-    protected function assertValidMappingConfiguration(array $mappingConfig, string $objectManagerName)
++    protected function assertValidMappingConfiguration(array $mappingConfig, string $objectManagerName): void
+     {
+         if (!$mappingConfig['type'] || !$mappingConfig['dir'] || !$mappingConfig['prefix']) {
+@@ -330,5 +330,5 @@ abstract class AbstractDoctrineExtension extends Extension
+      * @throws \InvalidArgumentException in case of unknown driver type
+      */
+-    protected function loadObjectManagerCacheDriver(array $objectManager, ContainerBuilder $container, string $cacheName)
++    protected function loadObjectManagerCacheDriver(array $objectManager, ContainerBuilder $container, string $cacheName): void
+     {
+         $this->loadCacheDriver($cacheName, $objectManager['name'], $objectManager[$cacheName.'_driver'], $container);
+diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
+index 83bfffaf27..acbd7e4bc7 100644
+--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
++++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
+@@ -32,5 +32,5 @@ class DoctrineValidationPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $this->updateValidatorMappingFiles($container, 'xml', 'xml');
+diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
+index 1a3f227c6d..daf6634922 100644
+--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
++++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
+@@ -134,5 +134,5 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$this->enabled($container)) {
 diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
-index e3dcea3398..c72d24cc9d 100644
+index 80ee258438..e2c51954d0 100644
 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
 +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
-@@ -47,5 +47,5 @@ class EntityFactory implements UserProviderFactoryInterface
+@@ -37,5 +37,5 @@ class EntityFactory implements UserProviderFactoryInterface
+      * @return void
+      */
+-    public function create(ContainerBuilder $container, string $id, array $config)
++    public function create(ContainerBuilder $container, string $id, array $config): void
+     {
+         $container
+@@ -50,5 +50,5 @@ class EntityFactory implements UserProviderFactoryInterface
       * @return string
       */
 -    public function getKey()
 +    public function getKey(): string
      {
          return $this->key;
+@@ -58,5 +58,5 @@ class EntityFactory implements UserProviderFactoryInterface
+      * @return void
+      */
+-    public function addConfiguration(NodeDefinition $node)
++    public function addConfiguration(NodeDefinition $node): void
+     {
+         $node
+diff --git a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
+index cff8b3b156..51e1f32e97 100644
+--- a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
++++ b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
+@@ -42,5 +42,5 @@ class MergeDoctrineCollectionListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onSubmit(FormEvent $event)
++    public function onSubmit(FormEvent $event): void
+     {
+         $collection = $event->getForm()->getData();
+diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+index d1d72ef75a..68a437e8d7 100644
+--- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
++++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+@@ -101,5 +101,5 @@ abstract class DoctrineType extends AbstractType implements ResetInterface
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         if ($options['multiple'] && interface_exists(Collection::class)) {
+@@ -114,5 +114,5 @@ abstract class DoctrineType extends AbstractType implements ResetInterface
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $choiceLoader = function (Options $options) {
+@@ -242,5 +242,5 @@ abstract class DoctrineType extends AbstractType implements ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->idReaders = [];
+diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
+index c096b558db..8d584900a9 100644
+--- a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
++++ b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
+@@ -25,5 +25,5 @@ class EntityType extends DoctrineType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         parent::configureOptions($resolver);
+diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
+index b2369e95d6..c33484608e 100644
+--- a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
++++ b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
+@@ -52,5 +52,5 @@ class DbalLogger implements SQLLogger
+      * @return void
+      */
+-    protected function log(string $message, array $params)
++    protected function log(string $message, array $params): void
+     {
+         $this->logger->debug($message, $params);
+diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php
+index 38618fc15e..eb599eb0b4 100644
+--- a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php
++++ b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php
+@@ -34,5 +34,5 @@ class DoctrineClearEntityManagerWorkerSubscriber implements EventSubscriberInter
+      * @return void
+      */
+-    public function onWorkerMessageHandled()
++    public function onWorkerMessageHandled(): void
+     {
+         $this->clearEntityManagers();
+@@ -42,5 +42,5 @@ class DoctrineClearEntityManagerWorkerSubscriber implements EventSubscriberInter
+      * @return void
+      */
+-    public function onWorkerMessageFailed()
++    public function onWorkerMessageFailed(): void
+     {
+         $this->clearEntityManagers();
+diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
+index 9d61be61bd..e89985de26 100644
+--- a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
++++ b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
+@@ -70,5 +70,5 @@ class DoctrineTokenProvider implements TokenProviderInterface, TokenVerifierInte
+      * @return void
+      */
+-    public function deleteTokenBySeries(string $series)
++    public function deleteTokenBySeries(string $series): void
+     {
+         $sql = 'DELETE FROM rememberme_token WHERE series=:series';
+@@ -85,5 +85,5 @@ class DoctrineTokenProvider implements TokenProviderInterface, TokenVerifierInte
+      * @return void
+      */
+-    public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTime $lastUsed)
++    public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTime $lastUsed): void
+     {
+         $sql = 'UPDATE rememberme_token SET value=:value, lastUsed=:lastUsed WHERE series=:series';
+@@ -111,5 +111,5 @@ class DoctrineTokenProvider implements TokenProviderInterface, TokenVerifierInte
+      * @return void
+      */
+-    public function createNewToken(PersistentTokenInterface $token)
++    public function createNewToken(PersistentTokenInterface $token): void
+     {
+         $sql = 'INSERT INTO rememberme_token (class, username, series, value, lastUsed) VALUES (:class, :username, :series, :value, :lastUsed)';
+diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php
+index bf8a5feb9f..e346c8b17c 100644
+--- a/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php
++++ b/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php
+@@ -32,5 +32,5 @@ class DoctrineInitializer implements ObjectInitializerInterface
+      * @return void
+      */
+-    public function initialize(object $object)
++    public function initialize(object $object): void
+     {
+         $this->registry->getManagerForClass($object::class)?->initializeObject($object);
+diff --git a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
+index 9975c46cba..c7bbad69b2 100644
+--- a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
++++ b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
+@@ -54,5 +54,5 @@ class ServerLogCommand extends Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+         if (!class_exists(ConsoleFormatter::class)) {
+diff --git a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
+index 7ee64c62f1..644f68790c 100644
+--- a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
++++ b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
+@@ -81,5 +81,5 @@ class MailerHandler extends AbstractProcessingHandler
+      * @return void
+      */
+-    protected function send(string $content, array $records)
++    protected function send(string $content, array $records): void
+     {
+         $this->mailer->send($this->buildMessage($content, $records));
+diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php
+index 367b3351ff..fb603e74ba 100644
+--- a/src/Symfony/Bridge/Monolog/Logger.php
++++ b/src/Symfony/Bridge/Monolog/Logger.php
+@@ -44,5 +44,5 @@ class Logger extends BaseLogger implements DebugLoggerInterface, ResetInterface
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         if ($logger = $this->getDebugLogger()) {
+@@ -63,5 +63,5 @@ class Logger extends BaseLogger implements DebugLoggerInterface, ResetInterface
+      * @return void
+      */
+-    public function removeDebugLogger()
++    public function removeDebugLogger(): void
+     {
+         foreach ($this->processors as $k => $processor) {
+diff --git a/src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php b/src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php
+index df2a718720..2ccab3649f 100644
+--- a/src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php
++++ b/src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php
+@@ -51,5 +51,5 @@ class ConsoleCommandProcessor implements EventSubscriberInterface, ResetInterfac
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         unset($this->commandData);
+@@ -59,5 +59,5 @@ class ConsoleCommandProcessor implements EventSubscriberInterface, ResetInterfac
+      * @return void
+      */
+-    public function addCommandData(ConsoleEvent $event)
++    public function addCommandData(ConsoleEvent $event): void
+     {
+         $this->commandData = [
+diff --git a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
+index 08427180f2..96e65ec833 100644
+--- a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
++++ b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
+@@ -94,5 +94,5 @@ class DebugProcessor implements DebugLoggerInterface, ResetInterface
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         $this->records = [];
+@@ -103,5 +103,5 @@ class DebugProcessor implements DebugLoggerInterface, ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->clear();
+diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php
+index 6ce2278c53..27b05b5815 100644
+--- a/src/Symfony/Bridge/Twig/AppVariable.php
++++ b/src/Symfony/Bridge/Twig/AppVariable.php
+@@ -34,5 +34,5 @@ class AppVariable
+      * @return void
+      */
+-    public function setTokenStorage(TokenStorageInterface $tokenStorage)
++    public function setTokenStorage(TokenStorageInterface $tokenStorage): void
+     {
+         $this->tokenStorage = $tokenStorage;
+@@ -42,5 +42,5 @@ class AppVariable
+      * @return void
+      */
+-    public function setRequestStack(RequestStack $requestStack)
++    public function setRequestStack(RequestStack $requestStack): void
+     {
+         $this->requestStack = $requestStack;
+@@ -50,5 +50,5 @@ class AppVariable
+      * @return void
+      */
+-    public function setEnvironment(string $environment)
++    public function setEnvironment(string $environment): void
+     {
+         $this->environment = $environment;
+@@ -58,5 +58,5 @@ class AppVariable
+      * @return void
+      */
+-    public function setDebug(bool $debug)
++    public function setDebug(bool $debug): void
+     {
+         $this->debug = $debug;
+diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
+index cec031127b..167f26d846 100644
+--- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php
++++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
+@@ -63,5 +63,5 @@ class DebugCommand extends Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+         $this
+diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
+index 05f6319b39..7f10935866 100644
+--- a/src/Symfony/Bridge/Twig/Command/LintCommand.php
++++ b/src/Symfony/Bridge/Twig/Command/LintCommand.php
+@@ -52,5 +52,5 @@ class LintCommand extends Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+         $this
+diff --git a/src/Symfony/Bridge/Twig/EventListener/TemplateAttributeListener.php b/src/Symfony/Bridge/Twig/EventListener/TemplateAttributeListener.php
+index ef0f9ba954..16240deb4a 100644
+--- a/src/Symfony/Bridge/Twig/EventListener/TemplateAttributeListener.php
++++ b/src/Symfony/Bridge/Twig/EventListener/TemplateAttributeListener.php
+@@ -32,5 +32,5 @@ class TemplateAttributeListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onKernelView(ViewEvent $event)
++    public function onKernelView(ViewEvent $event): void
+     {
+         $parameters = $event->getControllerResult();
+diff --git a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
+index fbe8e0b3e4..6e7fefc70d 100644
+--- a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
++++ b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
+@@ -136,5 +136,5 @@ class TwigRendererEngine extends AbstractRendererEngine
+      * @return void
+      */
+-    protected function loadResourcesFromTheme(string $cacheKey, mixed &$theme)
++    protected function loadResourcesFromTheme(string $cacheKey, mixed &$theme): void
+     {
+         if (!$theme instanceof Template) {
+diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
+index 2b44c5ef8d..05b4428490 100644
+--- a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
++++ b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
+@@ -49,5 +49,5 @@ class TwigExtractor extends AbstractFileExtractor implements ExtractorInterface
+      * @return void
+      */
+-    public function extract($resource, MessageCatalogue $catalogue)
++    public function extract($resource, MessageCatalogue $catalogue): void
+     {
+         foreach ($this->extractFiles($resource) as $file) {
+@@ -63,5 +63,5 @@ class TwigExtractor extends AbstractFileExtractor implements ExtractorInterface
+      * @return void
+      */
+-    public function setPrefix(string $prefix)
++    public function setPrefix(string $prefix): void
+     {
+         $this->prefix = $prefix;
+@@ -71,5 +71,5 @@ class TwigExtractor extends AbstractFileExtractor implements ExtractorInterface
+      * @return void
+      */
+-    protected function extractTemplate(string $template, MessageCatalogue $catalogue)
++    protected function extractTemplate(string $template, MessageCatalogue $catalogue): void
+     {
+         $visitor = $this->twig->getExtension(TranslationExtension::class)->getTranslationNodeVisitor();
+diff --git a/src/Symfony/Bundle/DebugBundle/DebugBundle.php b/src/Symfony/Bundle/DebugBundle/DebugBundle.php
+index a24321e229..1e9e893142 100644
+--- a/src/Symfony/Bundle/DebugBundle/DebugBundle.php
++++ b/src/Symfony/Bundle/DebugBundle/DebugBundle.php
+@@ -26,5 +26,5 @@ class DebugBundle extends Bundle
+      * @return void
+      */
+-    public function boot()
++    public function boot(): void
+     {
+         if ($this->container->getParameter('kernel.debug')) {
+@@ -51,5 +51,5 @@ class DebugBundle extends Bundle
+      * @return void
+      */
+-    public function build(ContainerBuilder $container)
++    public function build(ContainerBuilder $container): void
+     {
+         parent::build($container);
+@@ -61,5 +61,5 @@ class DebugBundle extends Bundle
+      * @return void
+      */
+-    public function registerCommands(Application $application)
++    public function registerCommands(Application $application): void
+     {
+         // noop
+diff --git a/src/Symfony/Bundle/DebugBundle/DependencyInjection/Compiler/DumpDataCollectorPass.php b/src/Symfony/Bundle/DebugBundle/DependencyInjection/Compiler/DumpDataCollectorPass.php
+index cecce87c4a..7c6d738481 100644
+--- a/src/Symfony/Bundle/DebugBundle/DependencyInjection/Compiler/DumpDataCollectorPass.php
++++ b/src/Symfony/Bundle/DebugBundle/DependencyInjection/Compiler/DumpDataCollectorPass.php
+@@ -26,5 +26,5 @@ class DumpDataCollectorPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('data_collector.dump')) {
+diff --git a/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php b/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
+index eadeafba55..4f1ca3bfef 100644
+--- a/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
++++ b/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
+@@ -33,5 +33,5 @@ class DebugExtension extends Extension
+      * @return void
+      */
+-    public function load(array $configs, ContainerBuilder $container)
++    public function load(array $configs, ContainerBuilder $container): void
+     {
+         $configuration = new Configuration();
+diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
+index cdbb90a3a9..b137a12012 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
+@@ -56,5 +56,5 @@ class Application extends BaseApplication
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         if ($this->kernel->getContainer()->has('services_resetter')) {
+@@ -144,5 +144,5 @@ class Application extends BaseApplication
+      * @return void
+      */
+-    protected function registerCommands()
++    protected function registerCommands(): void
+     {
+         if ($this->commandsRegistered) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php
 index ccb61b1286..700d0f22d4 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php
@@ -39,6 +507,217 @@ index ccb61b1286..700d0f22d4 100644
 +    public function guessRoute(Request $request, mixed $controller): string
      {
          if (\is_array($controller)) {
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
+index d0aca7a06b..aee4af1a43 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
+@@ -21,5 +21,5 @@ class AddDebugLogProcessorPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('profiler')) {
+@@ -41,5 +41,5 @@ class AddDebugLogProcessorPass implements CompilerPassInterface
+      * @return void
+      */
+-    public static function configureLogger(mixed $logger)
++    public static function configureLogger(mixed $logger): void
+     {
+         if (\is_object($logger) && method_exists($logger, 'removeDebugLogger') && \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
+index 5442b27734..9ed6cf284c 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
+@@ -26,5 +26,5 @@ class AddExpressionLanguageProvidersPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         // routing
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AssetsContextPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AssetsContextPass.php
+index e8c2ad3a0e..d8b3b64f5d 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AssetsContextPass.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AssetsContextPass.php
+@@ -22,5 +22,5 @@ class AssetsContextPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('assets.context')) {
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
+index af20aaa951..c2c0285d11 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
+@@ -29,5 +29,5 @@ class ContainerBuilderDebugDumpPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $cache = new ConfigCache($container->getParameter('debug.container.dump'), true);
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/DataCollectorTranslatorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/DataCollectorTranslatorPass.php
+index e66e98b451..7714d62f3e 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/DataCollectorTranslatorPass.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/DataCollectorTranslatorPass.php
+@@ -24,5 +24,5 @@ class DataCollectorTranslatorPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->has('translator')) {
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
+index b7cb920bf7..76b5dace0f 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
+@@ -26,5 +26,5 @@ class LoggingTranslatorPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasAlias('logger') || !$container->hasAlias('translator')) {
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php
+index c2d669fe1c..322f3eaeee 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php
+@@ -28,5 +28,5 @@ class ProfilerPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (false === $container->hasDefinition('profiler')) {
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RemoveUnusedSessionMarshallingHandlerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RemoveUnusedSessionMarshallingHandlerPass.php
+index fedc30d06e..bb934fe1f6 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RemoveUnusedSessionMarshallingHandlerPass.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RemoveUnusedSessionMarshallingHandlerPass.php
+@@ -23,5 +23,5 @@ class RemoveUnusedSessionMarshallingHandlerPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('session.marshalling_handler')) {
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
+index 09f272daa9..1fd0608bde 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
+@@ -25,5 +25,5 @@ class TestServiceContainerRealRefPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('test.private_services_locator')) {
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
+index 6e7669a710..27517d34ae 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
+@@ -25,5 +25,5 @@ class TestServiceContainerWeakRefPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('test.private_services_locator')) {
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+index 169a1c0a69..57f5d7bf3c 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+@@ -105,5 +105,5 @@ class UnusedTagsPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $tags = array_unique(array_merge($container->findTags(), self::KNOWN_TAGS));
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
+index bda9ca9515..c0d1f91339 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
+@@ -25,5 +25,5 @@ class WorkflowGuardListenerPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasParameter('workflow.has_guard_listeners')) {
+diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+index 7d1d6dd5a4..712e7f872f 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
++++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+@@ -270,5 +270,5 @@ class FrameworkExtension extends Extension
+      * @return void
+      */
+-    public function load(array $configs, ContainerBuilder $container)
++    public function load(array $configs, ContainerBuilder $container): void
+     {
+         $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
+@@ -2706,5 +2706,5 @@ class FrameworkExtension extends Extension
+      * @return void
+      */
+-    public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)
++    public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig): void
+     {
+         trigger_deprecation('symfony/framework-bundle', '6.2', 'The "%s()" method is deprecated.', __METHOD__);
+diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+index c5af22c913..667c3cfd8b 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
++++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+@@ -93,5 +93,5 @@ class FrameworkBundle extends Bundle
+      * @return void
+      */
+-    public function boot()
++    public function boot(): void
+     {
+         ErrorHandler::register(null, false)->throwAt($this->container->getParameter('debug.error_handler.throw_at'), true);
+@@ -109,5 +109,5 @@ class FrameworkBundle extends Bundle
+      * @return void
+      */
+-    public function build(ContainerBuilder $container)
++    public function build(ContainerBuilder $container): void
+     {
+         parent::build($container);
+diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
+index 1f484c1b84..67dba6fc40 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
++++ b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
+@@ -77,5 +77,5 @@ class KernelBrowser extends HttpKernelBrowser
+      * @return void
+      */
+-    public function enableProfiler()
++    public function enableProfiler(): void
+     {
+         if ($this->getContainer()->has('profiler')) {
+@@ -92,5 +92,5 @@ class KernelBrowser extends HttpKernelBrowser
+      * @return void
+      */
+-    public function disableReboot()
++    public function disableReboot(): void
+     {
+         $this->reboot = false;
+@@ -102,5 +102,5 @@ class KernelBrowser extends HttpKernelBrowser
+      * @return void
+      */
+-    public function enableReboot()
++    public function enableReboot(): void
+     {
+         $this->reboot = true;
+diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php
+index ec03f84979..498dc24d1c 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php
+@@ -28,5 +28,5 @@ class AnnotatedRouteControllerLoader extends AnnotationClassLoader
+      * @return void
+      */
+-    protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
++    protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void
+     {
+         if ('__invoke' === $method->getName()) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/Secrets/AbstractVault.php b/src/Symfony/Bundle/FrameworkBundle/Secrets/AbstractVault.php
 index b3eb0c6bc3..c47152f219 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/Secrets/AbstractVault.php
@@ -61,8 +740,77 @@ index bb5560a7b5..be86cbf98e 100644
 +    protected static function getContainer(): Container
      {
          if (!static::$booted) {
+diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php
+index cc55da770e..112dfbba06 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php
+@@ -40,5 +40,5 @@ class TestAppKernel extends Kernel
+     }
+ 
+-    protected function build(ContainerBuilder $container)
++    protected function build(ContainerBuilder $container): void
+     {
+     }
+diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
+index 678d573586..98ba21fd98 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
+@@ -37,5 +37,5 @@ class TestAppKernel extends Kernel
+     }
+ 
+-    protected function build(ContainerBuilder $container)
++    protected function build(ContainerBuilder $container): void
+     {
+         $container->register('logger', NullLogger::class);
+diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
+index 13c368fd58..bde1279ad1 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
+@@ -22,5 +22,5 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
+ class TestBundle extends Bundle
+ {
+-    public function build(ContainerBuilder $container)
++    public function build(ContainerBuilder $container): void
+     {
+         parent::build($container);
+diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
+index b182e902d7..399403155f 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
+@@ -79,5 +79,5 @@ class AppKernel extends Kernel implements ExtensionInterface, ConfigurationInter
+     }
+ 
+-    protected function build(ContainerBuilder $container)
++    protected function build(ContainerBuilder $container): void
+     {
+         $container->register('logger', NullLogger::class);
+diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
+index dac3b6394f..d319cb0824 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
+@@ -122,5 +122,5 @@ class Translator extends BaseTranslator implements WarmableInterface
+      * @return void
+      */
+-    public function addResource(string $format, mixed $resource, string $locale, string $domain = null)
++    public function addResource(string $format, mixed $resource, string $locale, string $domain = null): void
+     {
+         if ($this->resourceFiles) {
+@@ -133,5 +133,5 @@ class Translator extends BaseTranslator implements WarmableInterface
+      * @return void
+      */
+-    protected function initializeCatalogue(string $locale)
++    protected function initializeCatalogue(string $locale): void
+     {
+         $this->initialize();
+@@ -155,5 +155,5 @@ class Translator extends BaseTranslator implements WarmableInterface
+      * @return void
+      */
+-    protected function initialize()
++    protected function initialize(): void
+     {
+         if ($this->resourceFiles) {
 diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
-index 0e40e39851..0c3b145111 100644
+index bb5fe03096..e756cd7957 100644
 --- a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
 +++ b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
 @@ -32,5 +32,5 @@ final class TraceableFirewallListener extends FirewallListener
@@ -72,32 +820,105 @@ index 0e40e39851..0c3b145111 100644
 +    public function getWrappedListeners(): array
      {
          return $this->wrappedListeners;
+diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
+index 08d7fd9213..8bacecce11 100644
+--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
++++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
+@@ -26,5 +26,5 @@ class AddExpressionLanguageProvidersPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if ($container->has('security.expression_language')) {
+diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
+index ccf474087a..f9e4b0622f 100644
+--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
++++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
+@@ -33,5 +33,5 @@ class AddSecurityVotersPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('security.access.decision_manager')) {
+diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php
+index 9a7a94ca08..bc4baa0f65 100644
+--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php
++++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php
+@@ -25,5 +25,5 @@ class AddSessionDomainConstraintPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasParameter('session.storage.options') || !$container->has('security.http_utils')) {
+diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/CleanRememberMeVerifierPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/CleanRememberMeVerifierPass.php
+index 2041a36b38..d54311d5de 100644
+--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/CleanRememberMeVerifierPass.php
++++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/CleanRememberMeVerifierPass.php
+@@ -25,5 +25,5 @@ class CleanRememberMeVerifierPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('cache.system')) {
+diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePass.php
+index e7c77d1ec3..419e18f6f0 100644
+--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePass.php
++++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePass.php
+@@ -26,5 +26,5 @@ class MakeFirewallsEventDispatcherTraceablePass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->has('event_dispatcher') || !$container->hasParameter('security.firewalls')) {
+diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterEntryPointPass.php b/src/Symfony/Bundle/Secur
10000
ityBundle/DependencyInjection/Compiler/RegisterEntryPointPass.php
+index 3ca2a70acb..2ba4a41499 100644
+--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterEntryPointPass.php
++++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterEntryPointPass.php
+@@ -27,5 +27,5 @@ class RegisterEntryPointPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasParameter('security.firewalls')) {
 diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
-index fd2b18bb50..91f223d29b 100644
+index 24eb1377c5..6367585643 100644
 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
 +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
-@@ -76,5 +76,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
+@@ -56,5 +56,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
+      * @return void
+      */
+-    public function addConfiguration(NodeDefinition $node)
++    public function addConfiguration(NodeDefinition $node): void
+     {
+         $builder = $node->children();
+@@ -79,5 +79,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
       * @return string
       */
 -    protected function createAuthenticationSuccessHandler(ContainerBuilder $container, string $id, array $config)
 +    protected function createAuthenticationSuccessHandler(ContainerBuilder $container, string $id, array $config): string
      {
          $successHandlerId = $this->getSuccessHandlerId($id);
-@@ -98,5 +98,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
+@@ -101,5 +101,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
       * @return string
       */
 -    protected function createAuthenticationFailureHandler(ContainerBuilder $container, string $id, array $config)
 +    protected function createAuthenticationFailureHandler(ContainerBuilder $container, string $id, array $config): string
      {
          $id = $this->getFailureHandlerId($id);
-@@ -118,5 +118,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
+@@ -121,5 +121,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
       * @return string
       */
 -    protected function getSuccessHandlerId(string $id)
 +    protected function getSuccessHandlerId(string $id): string
      {
          return 'security.authentication.success_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());
-@@ -126,5 +126,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
+@@ -129,5 +129,5 @@ abstract class AbstractFactory implements AuthenticatorFactoryInterface
       * @return string
       */
 -    protected function getFailureHandlerId(string $id)
@@ -105,27 +926,73 @@ index fd2b18bb50..91f223d29b 100644
      {
          return 'security.authentication.failure_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());
 diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
-index 32208a6e3b..3a9064dadf 100644
+index 936f58a084..1a3c89381b 100644
 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
 +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
-@@ -41,5 +41,5 @@ class InMemoryFactory implements UserProviderFactoryInterface
+@@ -28,5 +28,5 @@ class InMemoryFactory implements UserProviderFactoryInterface
+      * @return void
+      */
+-    public function create(ContainerBuilder $container, string $id, array $config)
++    public function create(ContainerBuilder $container, string $id, array $config): void
+     {
+         $definition = $container->setDefinition($id, new ChildDefinition('security.user.provider.in_memory'));
+@@ -44,5 +44,5 @@ class InMemoryFactory implements UserProviderFactoryInterface
       * @return string
       */
 -    public function getKey()
 +    public function getKey(): string
      {
          return 'memory';
+@@ -52,5 +52,5 @@ class InMemoryFactory implements UserProviderFactoryInterface
+      * @return void
+      */
+-    public function addConfiguration(NodeDefinition $node)
++    public function addConfiguration(NodeDefinition $node): void
+     {
+         $node
 diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
-index d54ebf7738..f2a74ec902 100644
+index 2f4dca01d1..ca99ad286f 100644
 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
 +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
-@@ -44,5 +44,5 @@ class LdapFactory implements UserProviderFactoryInterface
+@@ -28,5 +28,5 @@ class LdapFactory implements UserProviderFactoryInterface
+      * @return void
+      */
+-    public function create(ContainerBuilder $container, string $id, array $config)
++    public function create(ContainerBuilder $container, string $id, array $config): void
+     {
+         $container
+@@ -47,5 +47,5 @@ class LdapFactory implements UserProviderFactoryInterface
       * @return string
       */
 -    public function getKey()
 +    public function getKey(): string
      {
          return 'ldap';
+@@ -55,5 +55,5 @@ class LdapFactory implements UserProviderFactoryInterface
+      * @return void
+      */
+-    public function addConfiguration(NodeDefinition $node)
++    public function addConfiguration(NodeDefinition $node): void
+     {
+         $node
+diff --git a/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php b/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php
+index 0c703f79cf..7d9e956580 100644
+--- a/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php
++++ b/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php
+@@ -40,5 +40,5 @@ class FirewallListener extends Firewall
+      * @return void
+      */
+-    public function configureLogoutUrlGenerator(RequestEvent $event)
++    public function configureLogoutUrlGenerator(RequestEvent $event): void
+     {
+         if (!$event->isMainRequest()) {
+@@ -54,5 +54,5 @@ class FirewallListener extends Firewall
+      * @return void
+      */
+-    public function onKernelFinishRequest(FinishRequestEvent $event)
++    public function onKernelFinishRequest(FinishRequestEvent $event): void
+     {
+         if ($event->isMainRequest()) {
 diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
 index 5077c6768d..bd741840f4 100644
 --- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
@@ -151,6 +1018,163 @@ index 5077c6768d..bd741840f4 100644
 +    public function getLogoutListener(): ?LogoutListener
      {
          return $this->logoutListener;
+diff --git a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
+index bf30dafbee..47fe692328 100644
+--- a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
++++ b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
+@@ -57,5 +57,5 @@ class SecurityBundle extends Bundle
+      * @return void
+      */
+-    public function build(ContainerBuilder $container)
++    public function build(ContainerBuilder $container): void
+     {
+         parent::build($container);
+diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php
+index 730974f17f..6d0f01391a 100644
+--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php
++++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php
+@@ -18,5 +18,5 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
+ class AuthenticatorBundle extends Bundle
+ {
+-    public function build(ContainerBuilder $container)
++    public function build(ContainerBuilder $container): void
+     {
+         parent::build($container);
+diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
+index 80adb49a88..6dd128c59e 100644
+--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
++++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
+@@ -40,5 +40,5 @@ class UserLoginType extends AbstractType
+     }
+ 
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder
+@@ -72,5 +72,5 @@ class UserLoginType extends AbstractType
+     }
+ 
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         /* Note: the form's csrf_token_id must correspond to that for the form login
+diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php
+index 62490a739b..76ac78c3c4 100644
+--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php
++++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php
+@@ -19,5 +19,5 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
+ class FormLoginBundle extends Bundle
+ {
+-    public function build(ContainerBuilder $container)
++    public function build(ContainerBuilder $container): void
+     {
+         parent::build($container);
+diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php
+index 8336dce245..8652dc73b4 100644
+--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php
++++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php
+@@ -19,5 +19,5 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
+ class TestBundle extends Bundle
+ {
+-    public function build(ContainerBuilder $container)
++    public function build(ContainerBuilder $container): void
+     {
+         $container->setParameter('container.build_hash', 'test_bundle');
+diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+index 5c3cff66fc..6c867b1e76 100644
+--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
++++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+@@ -29,5 +29,5 @@ class ExtensionPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!class_exists(Packages::class)) {
+diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
+index ecb99ce20e..212ebbc96f 100644
+--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
++++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
+@@ -25,5 +25,5 @@ class RuntimeLoaderPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('twig.runtime_loader')) {
+diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigEnvironmentPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigEnvironmentPass.php
+index 99b975edea..2c9e2d326d 100644
+--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigEnvironmentPass.php
++++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigEnvironmentPass.php
+@@ -28,5 +28,5 @@ class TwigEnvironmentPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (false === $container->hasDefinition('twig')) {
+diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
+index 1da7e86797..eb6df32373 100644
+--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
++++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
+@@ -27,5 +27,5 @@ class TwigLoaderPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (false === $container->hasDefinition('twig')) {
+diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php
+index b3eec9ff60..742be71a64 100644
+--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php
++++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php
+@@ -46,5 +46,5 @@ class EnvironmentConfigurator
+      * @return void
+      */
+-    public function configure(Environment $environment)
++    public function configure(Environment $environment): void
+     {
+         $environment->getExtension(CoreExtension::class)->setDateFormat($this->dateFormat, $this->intervalFormat);
+diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+index 101dbf699a..81f5a7fc4c 100644
+--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
++++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+@@ -39,5 +39,5 @@ class TwigExtension extends Extension
+      * @return void
+      */
+-    public function load(array $configs, ContainerBuilder $container)
++    public function load(array $configs, ContainerBuilder $container): void
+     {
+         $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+diff --git a/src/Symfony/Bundle/TwigBundle/TwigBundle.php b/src/Symfony/Bundle/TwigBundle/TwigBundle.php
+index 802cb536d1..d7e1017875 100644
+--- a/src/Symfony/Bundle/TwigBundle/TwigBundle.php
++++ b/src/Symfony/Bundle/TwigBundle/TwigBundle.php
+@@ -31,5 +31,5 @@ class TwigBundle extends Bundle
+      * @return void
+      */
+-    public function build(ContainerBuilder $container)
++    public function build(ContainerBuilder $container): void
+     {
+         parent::build($container);
+@@ -45,5 +45,5 @@ class TwigBundle extends Bundle
+      * @return void
+      */
+-    public function registerCommands(Application $application)
++    public function registerCommands(Application $application): void
+     {
+         // noop
+diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
+index 16e6db29ee..1420b29c99 100644
+--- a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
++++ b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
+@@ -41,5 +41,5 @@ class WebProfilerExtension extends Extension
+      * @return void
+      */
+-    public function load(array $configs, ContainerBuilder $container)
++    public function load(array $configs, ContainerBuilder $container): void
+     {
+         $configuration = $this->getConfiguration($configs, $container);
 diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
 index 3b379f59d4..7bf45f08c2 100644
 --- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
@@ -162,38 +1186,191 @@ index 3b379f59d4..7bf45f08c2 100644
 +    private function createDumpDataCollector(): MockObject&DumpDataCollector
      {
          $dumpDataCollector = $this->createMock(DumpDataCollector::class);
+diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php
+index d194b2fd83..78395c4b75 100644
+--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php
++++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php
+@@ -77,5 +77,5 @@ class WebProfilerBundleKernel extends Kernel
+     }
+ 
+-    protected function build(ContainerBuilder $container)
++    protected function build(ContainerBuilder $container): void
+     {
+         $container->register('data_collector.dump', DumpDataCollector::class);
+diff --git a/src/Symfony/Bundle/WebProfilerBundle/WebProfilerBundle.php b/src/Symfony/Bundle/WebProfilerBundle/WebProfilerBundle.php
+index 264b26c925..2dbc40c735 100644
+--- a/src/Symfony/Bundle/WebProfilerBundle/WebProfilerBundle.php
++++ b/src/Symfony/Bundle/WebProfilerBundle/WebProfilerBundle.php
+@@ -22,5 +22,5 @@ class WebProfilerBundle extends Bundle
+      * @return void
+      */
+-    public function boot()
++    public function boot(): void
+     {
+         if ('prod' === $this->container->getParameter('kernel.environment')) {
+diff --git a/src/Symfony/Component/Asset/Packages.php b/src/Symfony/Component/Asset/Packages.php
+index cffea43c49..0645fbd756 100644
+--- a/src/Symfony/Component/Asset/Packages.php
++++ b/src/Symfony/Component/Asset/Packages.php
+@@ -41,5 +41,5 @@ class Packages
+      * @return void
+      */
+-    public function setDefaultPackage(PackageInterface $defaultPackage)
++    public function setDefaultPackage(PackageInterface $defaultPackage): void
+     {
+         $this->defaultPackage = $defaultPackage;
+@@ -49,5 +49,5 @@ class Packages
+      * @return void
+      */
+-    public function addPackage(string $name, PackageInterface $package)
++    public function addPackage(string $name, PackageInterface $package): void
+     {
+         $this->packages[$name] = $package;
 diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
-index b27ca37529..5b80175850 100644
+index 71d165a5a0..a31098d7e0 100644
 --- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 +++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
-@@ -408,5 +408,5 @@ abstract class AbstractBrowser
+@@ -63,5 +63,5 @@ abstract class AbstractBrowser
+      * @return void
+      */
+-    public function followRedirects(bool $followRedirects = true)
++    public function followRedirects(bool $followRedirects = true): void
+     {
+         $this->followRedirects = $followRedirects;
+@@ -73,5 +73,5 @@ abstract class AbstractBrowser
+      * @return void
+      */
+-    public function followMetaRefresh(bool $followMetaRefresh = true)
++    public function followMetaRefresh(bool $followMetaRefresh = true): void
+     {
+         $this->followMetaRefresh = $followMetaRefresh;
+@@ -91,5 +91,5 @@ abstract class AbstractBrowser
+      * @return void
+      */
+-    public function setMaxRedirects(int $maxRedirects)
++    public function setMaxRedirects(int $maxRedirects): void
+     {
+         $this->maxRedirects = $maxRedirects < 0 ? -1 : $maxRedirects;
+@@ -112,5 +112,5 @@ abstract class AbstractBrowser
+      * @return void
+      */
+-    public function insulate(bool $insulated = true)
++    public function insulate(bool $insulated = true): void
+     {
+         if ($insulated && !class_exists(\Symfony\Component\Process\Process::class)) {
+@@ -126,5 +126,5 @@ abstract class AbstractBrowser
+      * @return void
+      */
+-    public function setServerParameters(array $server)
++    public function setServerParameters(array $server): void
+     {
+         $this->server = array_merge([
+@@ -138,5 +138,5 @@ abstract class AbstractBrowser
+      * @return void
+      */
+-    public function setServerParameter(string $key, string $value)
++    public function setServerParameter(string $key, string $value): void
+     {
+         $this->server[$key] = $value;
+@@ -420,5 +420,5 @@ abstract class AbstractBrowser
       * @throws \RuntimeException When processing returns exit code
       */
 -    protected function doRequestInProcess(object $request)
 +    protected function doRequestInProcess(object $request): object
      {
          $deprecationsFile = tempnam(sys_get_temp_dir(), 'deprec');
-@@ -441,5 +441,5 @@ abstract class AbstractBrowser
+@@ -453,5 +453,5 @@ abstract class AbstractBrowser
       * @return object
       */
 -    abstract protected function doRequest(object $request);
 +    abstract protected function doRequest(object $request): object;
  
      /**
-@@ -460,5 +460,5 @@ abstract class AbstractBrowser
+@@ -472,5 +472,5 @@ abstract class AbstractBrowser
       * @return object
       */
 -    protected function filterRequest(Request $request)
 +    protected function filterRequest(Request $request): object
      {
          return $request;
-@@ -470,5 +470,5 @@ abstract class AbstractBrowser
+@@ -482,5 +482,5 @@ abstract class AbstractBrowser
       * @return Response
       */
 -    protected function filterResponse(object $response)
 +    protected function filterResponse(object $response): Response
      {
          return $response;
+@@ -607,5 +607,5 @@ abstract class AbstractBrowser
+      * @return void
+      */
+-    public function restart()
++    public function restart(): void
+     {
+         $this->cookieJar->clear();
+diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php
+index 9753d305d9..081d621068 100644
+--- a/src/Symfony/Component/BrowserKit/CookieJar.php
++++ b/src/Symfony/Component/BrowserKit/CookieJar.php
+@@ -24,5 +24,5 @@ class CookieJar
+      * @return void
+      */
+-    public function set(Cookie $cookie)
++    public function set(Cookie $cookie): void
+     {
+         $this->cookieJar[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
+@@ -71,5 +71,5 @@ class CookieJar
+      * @return void
+      */
+-    public function expire(string $name, ?string $path = '/', string $domain = null)
++    public function expire(string $name, ?string $path = '/', string $domain = null): void
+     {
+         $path ??= '/';
+@@ -101,5 +101,5 @@ class CookieJar
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         $this->cookieJar = [];
+@@ -113,5 +113,5 @@ class CookieJar
+      * @return void
+      */
+-    public function updateFromSetCookie(array $setCookies, string $uri = null)
++    public function updateFromSetCookie(array $setCookies, string $uri = null): void
+     {
+         $cookies = [];
+@@ -141,5 +141,5 @@ class CookieJar
+      * @return void
+      */
+-    public function updateFromResponse(Response $response, string $uri = null)
++    public function updateFromResponse(Response $response, string $uri = null): void
+     {
+         $this->updateFromSetCookie($response->getHeader('Set-Cookie', false), $uri);
+@@ -215,5 +215,5 @@ class CookieJar
+      * @return void
+      */
+-    public function flushExpiredCookies()
++    public function flushExpiredCookies(): void
+     {
+         foreach ($this->cookieJar as $domain => $pathCookies) {
+diff --git a/src/Symfony/Component/BrowserKit/History.php b/src/Symfony/Component/BrowserKit/History.php
+index 01f5e80382..20c3349c14 100644
+--- a/src/Symfony/Component/BrowserKit/History.php
++++ b/src/Symfony/Component/BrowserKit/History.php
+@@ -27,5 +27,5 @@ class History
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         $this->stack = [];
+@@ -38,5 +38,5 @@ class History
+      * @return void
+      */
+-    public function add(Request $request)
++    public function add(Request $request): void
+     {
+         $this->stack = \array_slice($this->stack, 0, $this->position + 1);
 diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
 index 3dc93fd541..8a7df7a19b 100644
 --- a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
@@ -205,6 +1382,28 @@ index 3dc93fd541..8a7df7a19b 100644
 +    public static function isSupported(): bool
      {
          return \function_exists('apcu_fetch') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOL);
+diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
+index ca5bcaded8..90c2bf5080 100644
+--- a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
+@@ -264,5 +264,5 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->clear();
+diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
+index 07ef47f5eb..ea659c2fb4 100644
+--- a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
+@@ -284,5 +284,5 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         foreach ($this->adapters as $adapter) {
 diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
 index dc25a395a3..a56e1b74ce 100644
 --- a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
@@ -216,6 +1415,17 @@ index dc25a395a3..a56e1b74ce 100644
 +    public static function isSupported(): bool
      {
          return \extension_loaded('memcached') && version_compare(phpversion('memcached'), '3.1.6', '>=');
+diff --git a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
+index a4c629bb3d..280ca0f7c8 100644
+--- a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
+@@ -101,5 +101,5 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
+      * @return void
+      */
+-    public function createTable()
++    public function createTable(): void
+     {
+         // connect if we are not yet
 diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
 index d104530c0d..a1845d3ae9 100644
 --- a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
@@ -234,24 +1444,82 @@ index d104530c0d..a1845d3ae9 100644
 +    protected function doUnlink(string $file): bool
      {
          unset(self::$valuesCache[$file]);
+diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+index 7525632e91..cfe5cd863d 100644
+--- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+@@ -283,5 +283,5 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->commit();
 diff --git a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
-index 18f7ba0fb0..7f37cb6d9b 100644
+index 118b009099..ba388b3ad8 100644
 --- a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
 +++ b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
-@@ -215,5 +215,5 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
+@@ -196,5 +196,5 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         if ($this->pool instanceof ResetInterface) {
+@@ -218,5 +218,5 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
       * @return array
       */
 -    public function getCalls()
 +    public function getCalls(): array
      {
          return $this->calls;
-@@ -233,5 +233,5 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
+@@ -226,5 +226,5 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
+      * @return void
+      */
+-    public function clearCalls()
++    public function clearCalls(): void
+     {
+         $this->calls = [];
+@@ -239,5 +239,5 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
       * @return TraceableAdapterEvent
       */
 -    protected function start(string $name)
 +    protected function start(string $name): TraceableAdapterEvent
      {
          $this->calls[] = $event = new TraceableAdapterEvent();
+diff --git a/src/Symfony/Component/Cache/DependencyInjection/CacheCollectorPass.php b/src/Symfony/Component/Cache/DependencyInjection/CacheCollectorPass.php
+index b50ca12308..6c39f61e89 100644
+--- a/src/Symfony/Component/Cache/DependencyInjection/CacheCollectorPass.php
++++ b/src/Symfony/Component/Cache/DependencyInjection/CacheCollectorPass.php
+@@ -30,5 +30,5 @@ class CacheCollectorPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('data_collector.cache')) {
+diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolClearerPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolClearerPass.php
+index 6793bea94c..230575ef42 100644
+--- a/src/Symfony/Component/Cache/DependencyInjection/CachePoolClearerPass.php
++++ b/src/Symfony/Component/Cache/DependencyInjection/CachePoolClearerPass.php
+@@ -24,5 +24,5 @@ class CachePoolClearerPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $container->getParameterBag()->remove('cache.prefix.seed');
+diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPrunerPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPrunerPass.php
+index 00e912686b..58872ec2bc 100644
+--- a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPrunerPass.php
++++ b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPrunerPass.php
+@@ -27,5 +27,5 @@ class CachePoolPrunerPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('console.command.cache_pool_prune')) {
 diff --git a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
 index 2ee96e9b37..f49ed24f68 100644
 --- a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
@@ -263,6 +1531,204 @@ index 2ee96e9b37..f49ed24f68 100644
 +    protected function doUnlink(string $file): bool
      {
          return @unlink($file);
+diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
+index 0f0f18a915..d9b4460b66 100644
+--- a/src/Symfony/Component/Config/Definition/ArrayNode.php
++++ b/src/Symfony/Component/Config/Definition/ArrayNode.php
+@@ -36,5 +36,5 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    public function setNormalizeKeys(bool $normalizeKeys)
++    public function setNormalizeKeys(bool $normalizeKeys): void
+     {
+         $this->normalizeKeys = $normalizeKeys;
+@@ -84,5 +84,5 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    public function setXmlRemappings(array $remappings)
++    public function setXmlRemappings(array $remappings): void
+     {
+         $this->xmlRemappings = $remappings;
+@@ -105,5 +105,5 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    public function setAddIfNotSet(bool $boolean)
++    public function setAddIfNotSet(bool $boolean): void
+     {
+         $this->addIfNotSet = $boolean;
+@@ -115,5 +115,5 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    public function setAllowFalse(bool $allow)
++    public function setAllowFalse(bool $allow): void
+     {
+         $this->allowFalse = $allow;
+@@ -125,5 +125,5 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    public function setAllowNewKeys(bool $allow)
++    public function setAllowNewKeys(bool $allow): void
+     {
+         $this->allowNewKeys = $allow;
+@@ -135,5 +135,5 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    public function setPerformDeepMerging(bool $boolean)
++    public function setPerformDeepMerging(bool $boolean): void
+     {
+         $this->performDeepMerging = $boolean;
+@@ -148,5 +148,5 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    public function setIgnoreExtraKeys(bool $boolean, bool $remove = true)
++    public function setIgnoreExtraKeys(bool $boolean, bool $remove = true): void
+     {
+         $this->ignoreExtraKeys = $boolean;
+@@ -165,5 +165,5 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    public function setName(string $name)
++    public function setName(string $name): void
+     {
+         $this->name = $name;
+@@ -199,5 +199,5 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    public function addChild(NodeInterface $node)
++    public function addChild(NodeInterface $node): void
+     {
+         $name = $node->getName();
+@@ -262,5 +262,5 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    protected function validateType(mixed $value)
++    protected function validateType(mixed $value): void
+     {
+         if (!\is_array($value) && (!$this->allowFalse || false !== $value)) {
+diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
+index f2e32384a9..b42bc8d3c7 100644
+--- a/src/Symfony/Component/Config/Definition/BaseNode.php
++++ b/src/Symfony/Component/Config/Definition/BaseNode.php
+@@ -102,5 +102,5 @@ abstract class BaseNode implements NodeInterface
+      * @return void
+      */
+-    public function setAttribute(string $key, mixed $value)
++    public function setAttribute(string $key, mixed $value): void
+     {
+         $this->attributes[$key] = $value;
+@@ -125,5 +125,5 @@ abstract class BaseNode implements NodeInterface
+      * @return void
+      */
+-    public function setAttributes(array $attributes)
++    public function setAttributes(array $attributes): void
+     {
+         $this->attributes = $attributes;
+@@ -133,5 +133,5 @@ abstract class BaseNode implements NodeInterface
+      * @return void
+      */
+-    public function removeAttribute(string $key)
++    public function removeAttribute(string $key): void
+     {
+         unset($this->attributes[$key]);
+@@ -143,5 +143,5 @@ abstract class BaseNode implements NodeInterface
+      * @return void
+      */
+-    public function setInfo(string $info)
++    public function setInfo(string $info): void
+     {
+         $this->setAttribute('info', $info);
+@@ -161,5 +161,5 @@ abstract class BaseNode implements NodeInterface
+      * @return void
+      */
+-    public function setExample(string|array $example)
++    public function setExample(string|array $example): void
+     {
+         $this->setAttribute('example', $example);
+@@ -179,5 +179,5 @@ abstract class BaseNode implements NodeInterface
+      * @return void
+      */
+-    public function addEquivalentValue(mixed $originalValue, mixed $equivalentValue)
++    public function addEquivalentValue(mixed $originalValue, mixed $equivalentValue): void
+     {
+         $this->equivalentValues[] = [$originalValue, $equivalentValue];
+@@ -189,5 +189,5 @@ abstract class BaseNode implements NodeInterface
+      * @return void
+      */
+-    public function setRequired(bool $boolean)
++    public function setRequired(bool $boolean): void
+     {
+         $this->required = $boolean;
+@@ -206,5 +206,5 @@ abstract class BaseNode implements NodeInterface
+      * @return void
+      */
+-    public function setDeprecated(string $package, string $version, string $message = 'The child node "%node%" at path "%path%" is deprecated.')
++    public function setDeprecated(string $package, string $version, string $message = 'The child node "%node%" at path "%path%" is deprecated.'): void
+     {
+         $this->deprecation = [
+@@ -220,5 +220,5 @@ abstract class BaseNode implements NodeInterface
+      * @return void
+      */
+-    public function setAllowOverwrite(bool $allow)
++    public function setAllowOverwrite(bool $allow): void
+     {
+         $this->allowOverwrite = $allow;
+@@ -232,5 +232,5 @@ abstract class BaseNode implements NodeInterface
+      * @return void
+      */
+-    public function setNormalizationClosures(array $closures)
++    public function setNormalizationClosures(array $closures): void
+     {
+         $this->normalizationClosures = $closures;
+@@ -244,5 +244,5 @@ abstract class BaseNode implements NodeInterface
+      * @return void
+      */
+-    public function setNormalizedTypes(array $types)
++    public function setNormalizedTypes(array $types): void
+     {
+         $this->normalizedTypes = $types;
+@@ -266,5 +266,5 @@ abstract class BaseNode implements NodeInterface
+      * @return void
+      */
+-    public function setFinalValidationClosures(array $closures)
++    public function setFinalValidationClosures(array $closures): void
+     {
+         $this->finalValidationClosures = $closures;
+diff --git a/src/Symfony/Component/Config/Definition/BooleanNode.php b/src/Symfony/Component/Config/Definition/BooleanNode.php
+index 7ec903cd67..9a86de2559 100644
+--- a/src/Symfony/Component/Config/Definition/BooleanNode.php
++++ b/src/Symfony/Component/Config/Definition/BooleanNode.php
+@@ -24,5 +24,5 @@ class BooleanNode extends ScalarNode
+      * @return void
+      */
+-    protected function validateType(mixed $value)
++    protected function validateType(mixed $value): void
+     {
+         if (!\is_bool($value)) {
+diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
+index f24271b80f..ce219e95b9 100644
+--- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
++++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
+@@ -49,5 +49,5 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
+      * @return void
+      */
+-    public function setBuilder(NodeBuilder $builder)
++    public function setBuilder(NodeBuilder $builder): void
+     {
+         $this->nodeBuilder = $builder;
+@@ -430,5 +430,5 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
+      * @return void
+      */
+-    protected function validateConcreteNode(ArrayNode $node)
++    protected function validateConcreteNode(ArrayNode $node): void
+     {
+         $path = $node->getPath();
+@@ -462,5 +462,5 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
+      * @return void
+      */
+-    protected function validatePrototypeNode(PrototypedArrayNode $node)
++    protected function validatePrototypeNode(PrototypedArrayNode $node): void
+     {
+         $path = $node->getPath();
 diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
 index 7cda0bc7d8..b2311826f4 100644
 --- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
@@ -274,6 +1740,17 @@ index 7cda0bc7d8..b2311826f4 100644
 +    public function end(): NodeDefinition&ParentNodeDefinitionInterface
      {
          return $this->parent;
+diff --git a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php
+index 4f868f7031..190b720b61 100644
+--- a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php
++++ b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php
+@@ -55,5 +55,5 @@ class TreeBuilder implements NodeParentInterface
+      * @return void
+      */
+-    public function setPathSeparator(string $separator)
++    public function setPathSeparator(string $separator): void
+     {
+         // unset last built as changing path separator changes all nodes
 diff --git a/src/Symfony/Component/Config/Definition/ConfigurationInterface.php b/src/Symfony/Component/Config/Definition/ConfigurationInterface.php
 index 7b5d443fe6..d64ae0d024 100644
 --- a/src/Symfony/Component/Config/Definition/ConfigurationInterface.php
@@ -285,10 +1762,17 @@ index 7b5d443fe6..d64ae0d024 100644
 +    public function getConfigTreeBuilder(): TreeBuilder;
  }
 diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
-index 2f07f31d0a..17601dbec4 100644
+index 34f93ce07d..0e7f1317d3 100644
 --- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
 +++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
-@@ -40,5 +40,5 @@ class XmlReferenceDumper
+@@ -35,5 +35,5 @@ class XmlReferenceDumper
+      * @return string
+      */
+-    public function dump(ConfigurationInterface $configuration, string $namespace = null)
++    public function dump(ConfigurationInterface $configuration, string $namespace = null): string
+     {
+         return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree(), $namespace);
+@@ -43,5 +43,5 @@ class XmlReferenceDumper
       * @return string
       */
 -    public function dumpNode(NodeInterface $node, string $namespace = null)
@@ -296,10 +1780,24 @@ index 2f07f31d0a..17601dbec4 100644
      {
          $this->reference = '';
 diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
-index 4621e6b1dc..96316277b3 100644
+index 97a391adab..1a59318a40 100644
 --- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
 +++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
-@@ -65,5 +65,5 @@ class YamlReferenceDumper
+@@ -34,5 +34,5 @@ class YamlReferenceDumper
+      * @return string
+      */
+-    public function dump(ConfigurationInterface $configuration)
++    public function dump(ConfigurationInterface $configuration): string
+     {
+         return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree());
+@@ -42,5 +42,5 @@ class YamlReferenceDumper
+      * @return string
+      */
+-    public function dumpAtPath(ConfigurationInterface $configuration, string $path)
++    public function dumpAtPath(ConfigurationInterface $configuration, string $path): string
+     {
+         $rootNode = $node = $configuration->getConfigTreeBuilder()->buildTree();
+@@ -71,5 +71,5 @@ class YamlReferenceDumper
       * @return string
       */
 -    public function dumpNode(NodeInterface $node)
@@ -307,7 +1805,7 @@ index 4621e6b1dc..96316277b3 100644
      {
          $this->reference = '';
 diff --git a/src/Symfony/Component/Config/Definition/EnumNode.php b/src/Symfony/Component/Config/Definition/EnumNode.php
-index 683096949d..bce1cecc29 100644
+index 4edeae9040..d562308fa2 100644
 --- a/src/Symfony/Component/Config/Definition/EnumNode.php
 +++ b/src/Symfony/Component/Config/Definition/EnumNode.php
 @@ -50,5 +50,5 @@ class EnumNode extends ScalarNode
@@ -317,6 +1815,142 @@ index 683096949d..bce1cecc29 100644
 +    public function getValues(): array
      {
          return $this->values;
+@@ -72,5 +72,5 @@ class EnumNode extends ScalarNode
+      * @return void
+      */
+-    protected function validateType(mixed $value)
++    protected function validateType(mixed $value): void
+     {
+         if ($value instanceof \UnitEnum) {
+diff --git a/src/Symfony/Component/Config/Definition/Exception/InvalidConfigurationException.php b/src/Symfony/Component/Config/Definition/Exception/InvalidConfigurationException.php
+index 794447bf8d..42db1e5a40 100644
+--- a/src/Symfony/Component/Config/Definition/Exception/InvalidConfigurationException.php
++++ b/src/Symfony/Component/Config/Definition/Exception/InvalidConfigurationException.php
+@@ -26,5 +26,5 @@ class InvalidConfigurationException extends Exception
+      * @return void
+      */
+-    public function setPath(string $path)
++    public function setPath(string $path): void
+     {
+         $this->path = $path;
+@@ -41,5 +41,5 @@ class InvalidConfigurationException extends Exception
+      * @return void
+      */
+-    public function addHint(string $hint)
++    public function addHint(string $hint): void
+     {
+         if (!$this->containsHints) {
+diff --git a/src/Symfony/Component/Config/Definition/FloatNode.php b/src/Symfony/Component/Config/Definition/FloatNode.php
+index ce4193e09c..64344cadb6 100644
+--- a/src/Symfony/Component/Config/Definition/FloatNode.php
++++ b/src/Symfony/Component/Config/Definition/FloatNode.php
+@@ -24,5 +24,5 @@ class FloatNode extends NumericNode
+      * @return void
+      */
+-    protected function validateType(mixed $value)
++    protected function validateType(mixed $value): void
+     {
+         // Integers are also accepted, we just cast them
+diff --git a/src/Symfony/Component/Config/Definition/IntegerNode.php b/src/Symfony/Component/Config/Definition/IntegerNode.php
+index 4a3e3253ce..09957cd846 100644
+--- a/src/Symfony/Component/Config/Definition/IntegerNode.php
++++ b/src/Symfony/Component/Config/Definition/IntegerNode.php
+@@ -24,5 +24,5 @@ class IntegerNode extends NumericNode
+      * @return void
+      */
+-    protected function validateType(mixed $value)
++    protected function validateType(mixed $value): void
+     {
+         if (!\is_int($value)) {
+diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
+index 11910fb338..58489913ce 100644
+--- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
++++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
+@@ -41,5 +41,5 @@ class PrototypedArrayNode extends ArrayNode
+      * @return void
+      */
+-    public function setMinNumberOfElements(int $number)
++    public function setMinNumberOfElements(int $number): void
+     {
+         $this->minNumberOfElements = $number;
+@@ -72,5 +72,5 @@ class PrototypedArrayNode extends ArrayNode
+      * @return void
+      */
+-    public function setKeyAttribute(string $attribute, bool $remove = true)
++    public function setKeyAttribute(string $attribute, bool $remove = true): void
+     {
+         $this->keyAttribute = $attribute;
+@@ -91,5 +91,5 @@ class PrototypedArrayNode extends ArrayNode
+      * @return void
+      */
+-    public function setDefaultValue(array $value)
++    public function setDefaultValue(array $value): void
+     {
+         $this->defaultValue = $value;
+@@ -108,5 +108,5 @@ class PrototypedArrayNode extends ArrayNode
+      * @return void
+      */
+-    public function setAddChildrenIfNoneSet(int|string|array|null $children = ['defaults'])
++    public function setAddChildrenIfNoneSet(int|string|array|null $children = ['defaults']): void
+     {
+         if (null === $children) {
+@@ -141,5 +141,5 @@ class PrototypedArrayNode extends ArrayNode
+      * @return void
+      */
+-    public function setPrototype(PrototypeNodeInterface $node)
++    public function setPrototype(PrototypeNodeInterface $node): void
+     {
+         $this->prototype = $node;
+@@ -159,5 +159,5 @@ class PrototypedArrayNode extends ArrayNode
+      * @throws Exception
+      */
+-    public function addChild(NodeInterface $node)
++    public function addChild(NodeInterface $node): void
+     {
+         throw new Exception('A prototyped array node cannot have concrete children.');
+diff --git a/src/Symfony/Component/Config/Definition/ScalarNode.php b/src/Symfony/Component/Config/Definition/ScalarNode.php
+index e11fa1ee1c..ee27f874d0 100644
+--- a/src/Symfony/Component/Config/Definition/ScalarNode.php
++++ b/src/Symfony/Component/Config/Definition/ScalarNode.php
+@@ -31,5 +31,5 @@ class ScalarNode extends VariableNode
+      * @return void
+      */
+-    protected function validateType(mixed $value)
++    protected function validateType(mixed $value): void
+     {
+         if (!\is_scalar($value) && null !== $value) {
+diff --git a/src/Symfony/Component/Config/Definition/VariableNode.php b/src/Symfony/Component/Config/Definition/VariableNode.php
+index 6bdc65b4e7..c5a3fb4f6f 100644
+--- a/src/Symfony/Component/Config/Definition/VariableNode.php
++++ b/src/Symfony/Component/Config/Definition/VariableNode.php
+@@ -31,5 +31,5 @@ class VariableNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    public function setDefaultValue(mixed $value)
++    public function setDefaultValue(mixed $value): void
+     {
+         $this->defaultValueSet = true;
+@@ -56,5 +56,5 @@ class VariableNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    public function setAllowEmptyValue(bool $boolean)
++    public function setAllowEmptyValue(bool $boolean): void
+     {
+         $this->allowEmptyValue = $boolean;
+@@ -64,5 +64,5 @@ class VariableNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    public function setName(string $name)
++    public function setName(string $name): void
+     {
+         $this->name = $name;
+@@ -72,5 +72,5 @@ class VariableNode extends BaseNode implements PrototypeNodeInterface
+      * @return void
+      */
+-    protected function validateType(mixed $value)
++    protected function validateType(mixed $value): void
+     {
+     }
 diff --git a/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php b/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php
 index c5173ae580..1f5aa3616e 100644
 --- a/src/Symfony/Component/Config/Exception/FileLocatorFileNotFoundException.php
@@ -372,10 +2006,17 @@ index 3f06f0c38c..ce0fd1d76d 100644
      {
          if (\is_string($resource) && \strlen($resource) !== ($i = strcspn($resource, '*?{[')) && !str_contains($resource, "\n")) {
 diff --git a/src/Symfony/Component/Config/Loader/Loader.php b/src/Symfony/Component/Config/Loader/Loader.php
-index 2ab50b021b..b64e1e1055 100644
+index 36e85ad346..bb6d9ca2fe 100644
 --- a/src/Symfony/Component/Config/Loader/Loader.php
 +++ b/src/Symfony/Component/Config/Loader/Loader.php
-@@ -44,5 +44,5 @@ abstract class Loader implements LoaderInterface
+@@ -37,5 +37,5 @@ abstract class Loader implements LoaderInterface
+      * @return void
+      */
+-    public function setResolver(LoaderResolverInterface $resolver)
++    public function setResolver(LoaderResolverInterface $resolver): void
+     {
+         $this->resolver = $resolver;
+@@ -47,5 +47,5 @@ abstract class Loader implements LoaderInterface
       * @return mixed
       */
 -    public function import(mixed $resource, string $type = null)
@@ -407,6 +2048,28 @@ index b94a4378f5..db502e12a7 100644
 +    public function getResolver(): LoaderResolverInterface;
  
      /**
+diff --git a/src/Symfony/Component/Config/Loader/LoaderResolver.php b/src/Symfony/Component/Config/Loader/LoaderResolver.php
+index 670e320122..134e4069e7 100644
+--- a/src/Symfony/Component/Config/Loader/LoaderResolver.php
++++ b/src/Symfony/Component/Config/Loader/LoaderResolver.php
+@@ -51,5 +51,5 @@ class LoaderResolver implements LoaderResolverInterface
+      * @return void
+      */
+-    public function addLoader(LoaderInterface $loader)
++    public function addLoader(LoaderInterface $loader): void
+     {
+         $this->loaders[] = $loader;
+diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
+index d505af161c..9721864d8d 100644
+--- a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
++++ b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
+@@ -110,5 +110,5 @@ class ResourceCheckerConfigCache implements ConfigCacheInterface
+      * @return void
+      */
+-    public function write(string $content, array $metadata = null)
++    public function write(string $content, array $metadata = null): void
+     {
+         $mode = 0666;
 diff --git a/src/Symfony/Component/Config/ResourceCheckerInterface.php b/src/Symfony/Component/Config/ResourceCheckerInterface.php
 index 6b1c6c5fbe..bb80ed461e 100644
 --- a/src/Symfony/Component/Config/ResourceCheckerInterface.php
@@ -436,52 +2099,129 @@ index cc024da461..00b79e915f 100644
      {
          $errors = [];
 diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
-index 40c7035af4..9b7cad07b8 100644
+index 8e24667bc6..b48ab19e04 100644
 --- a/src/Symfony/Component/Console/Application.php
 +++ b/src/Symfony/Component/Console/Application.php
-@@ -215,5 +215,5 @@ class Application implements ResetInterface
+@@ -114,5 +114,5 @@ class Application implements ResetInterface
+      * @return void
+      */
+-    public function setCommandLoader(CommandLoaderInterface $commandLoader)
++    public function setCommandLoader(CommandLoaderInterface $commandLoader): void
+     {
+         $this->commandLoader = $commandLoader;
+@@ -131,5 +131,5 @@ class Application implements ResetInterface
+      * @return void
+      */
+-    public function setSignalsToDispatchEvent(int ...$signalsToDispatchEvent)
++    public function setSignalsToDispatchEvent(int ...$signalsToDispatchEvent): void
+     {
+         $this->signalsToDispatchEvent = $signalsToDispatchEvent;
+@@ -221,5 +221,5 @@ class Application implements ResetInterface
       * @return int 0 if everything went fine, or an error code
       */
 -    public function doRun(InputInterface $input, OutputInterface $output)
 +    public function doRun(InputInterface $input, OutputInterface $output): int
      {
          if (true === $input->hasParameterOption(['--version', '-V'], true)) {
-@@ -464,5 +464,5 @@ class Application implements ResetInterface
+@@ -327,5 +327,5 @@ class Application implements ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+     }
+@@ -334,5 +334,5 @@ class Application implements ResetInterface
+      * @return void
+      */
+-    public function setHelperSet(HelperSet $helperSet)
++    public function setHelperSet(HelperSet $helperSet): void
+     {
+         $this->helperSet = $helperSet;
+@@ -350,5 +350,5 @@ class Application implements ResetInterface
+      * @return void
+      */
+-    public function setDefinition(InputDefinition $definition)
++    public function setDefinition(InputDefinition $definition): void
+     {
+         $this->definition = $definition;
+@@ -423,5 +423,5 @@ class Application implements ResetInterface
+      * @return void
+      */
+-    public function setCatchExceptions(bool $boolean)
++    public function setCatchExceptions(bool $boolean): void
+     {
+         $this->catchExceptions = $boolean;
+@@ -441,5 +441,5 @@ class Application implements ResetInterface
+      * @return void
+      */
+-    public function setAutoExit(bool $boolean)
++    public function setAutoExit(bool $boolean): void
+     {
+         $this->autoExit = $boolean;
+@@ -459,5 +459,5 @@ class Application implements ResetInterface
+      * @return void
+      */
+-    public function setName(string $name)
++    public function setName(string $name): void
+     {
+         $this->name = $name;
+@@ -477,5 +477,5 @@ class Application implements ResetInterface
+      * @return void
+      */
+-    public function setVersion(string $version)
++    public function setVersion(string $version): void
+     {
+         $this->version = $version;
+@@ -487,5 +487,5 @@ class Application implements ResetInterface
       * @return string
       */
 -    public function getLongVersion()
 +    public function getLongVersion(): string
      {
          if ('UNKNOWN' !== $this->getName()) {
-@@ -507,5 +507,5 @@ class Application implements ResetInterface
+@@ -517,5 +517,5 @@ class Application implements ResetInterface
+      * @return void
+      */
+-    public function addCommands(array $commands)
++    public function addCommands(array $commands): void
+     {
+         foreach ($commands as $command) {
+@@ -532,5 +532,5 @@ class Application implements ResetInterface
       * @return Command|null
       */
 -    public function add(Command $command)
 +    public function add(Command $command): ?Command
      {
          $this->init();
-@@ -544,5 +544,5 @@ class Application implements ResetInterface
+@@ -569,5 +569,5 @@ class Application implements ResetInterface
       * @throws CommandNotFoundException When given command name does not exist
       */
 -    public function get(string $name)
 +    public function get(string $name): Command
      {
          $this->init();
-@@ -651,5 +651,5 @@ class Application implements ResetInterface
+@@ -676,5 +676,5 @@ class Application implements ResetInterface
       * @throws CommandNotFoundException When command name is incorrect or ambiguous
       */
 -    public function find(string $name)
 +    public function find(string $name): Command
      {
          $this->init();
-@@ -759,5 +759,5 @@ class Application implements ResetInterface
+@@ -784,5 +784,5 @@ class Application implements ResetInterface
       * @return Command[]
       */
 -    public function all(string $namespace = null)
 +    public function all(string $namespace = null): array
      {
          $this->init();
-@@ -966,5 +966,5 @@ class Application implements ResetInterface
+@@ -928,5 +928,5 @@ class Application implements ResetInterface
+      * @return void
+      */
+-    protected function configureIO(InputInterface $input, OutputInterface $output)
++    protected function configureIO(InputInterface $input, OutputInterface $output): void
+     {
+         if (true === $input->hasParameterOption(['--ansi'], true)) {
+@@ -993,5 +993,5 @@ class Application implements ResetInterface
       * @return int 0 if everything went fine, or an error code
       */
 -    protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)
@@ -489,41 +2229,212 @@ index 40c7035af4..9b7cad07b8 100644
      {
          foreach ($command->getHelperSet() as $helper) {
 diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
-index 1e3c1a5a2b..923ab29a4d 100644
+index 704b112d1a..b296bffcbd 100644
 --- a/src/Symfony/Component/Console/Command/Command.php
 +++ b/src/Symfony/Component/Console/Command/Command.php
-@@ -192,5 +192,5 @@ class Command
+@@ -145,5 +145,5 @@ class Command
+      * @return void
+      */
+-    public function ignoreValidationErrors()
++    public function ignoreValidationErrors(): void
+     {
+         $this->ignoreValidationErrors = true;
+@@ -153,5 +153,5 @@ class Command
+      * @return void
+      */
+-    public function setApplication(Application $application = null)
++    public function setApplication(Application $application = null): void
+     {
+         if (1 > \func_num_args()) {
+@@ -171,5 +171,5 @@ class Command
+      * @return void
+      */
+-    public function setHelperSet(HelperSet $helperSet)
++    public function setHelperSet(HelperSet $helperSet): void
+     {
+         $this->helperSet = $helperSet;
+@@ -200,5 +200,5 @@ class Command
       * @return bool
       */
 -    public function isEnabled()
 +    public function isEnabled(): bool
      {
          return true;
-@@ -218,5 +218,5 @@ class Command
+@@ -210,5 +210,5 @@ class Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+     }
+@@ -228,5 +228,5 @@ class Command
       * @see setCode()
       */
 -    protected function execute(InputInterface $input, OutputInterface $output)
 +    protected function execute(InputInterface $input, OutputInterface $output): int
      {
          throw new LogicException('You must override the execute() method in the concrete command class.');
-@@ -687,5 +687,5 @@ class Command
+@@ -242,5 +242,5 @@ class Command
+      * @return void
+      */
+-    protected function interact(InputInterface $input, OutputInterface $output)
++    protected function interact(InputInterface $input, OutputInterface $output): void
+     {
+     }
+@@ -258,5 +258,5 @@ class Command
+      * @return void
+      */
+-    protected function initialize(InputInterface $input, OutputInterface $output)
++    protected function initialize(InputInterface $input, OutputInterface $output): void
+     {
+     }
+@@ -701,5 +701,5 @@ class Command
       * @throws InvalidArgumentException if the helper is not defined
       */
 -    public function getHelper(string $name): mixed
 +    public function getHelper(string $name): HelperInterface
      {
          if (null === $this->helperSet) {
+diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
+index e6447b0506..be85331bc3 100644
+--- a/src/Symfony/Component/Console/Command/HelpCommand.php
++++ b/src/Symfony/Component/Console/Command/HelpCommand.php
+@@ -31,5 +31,5 @@ class HelpCommand extends Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+         $this->ignoreValidationErrors();
+@@ -61,5 +61,5 @@ EOF
+      * @return void
+      */
+-    public function setCommand(Command $command)
++    public function setCommand(Command $command): void
+     {
+         $this->command = $command;
+diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
+index 5850c3d7b8..e2371f88fd 100644
+--- a/src/Symfony/Component/Console/Command/ListCommand.php
++++ b/src/Symfony/Component/Console/Command/ListCommand.php
+@@ -29,5 +29,5 @@ class ListCommand extends Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+         $this
+diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
+index 27705ddb63..1b25473f75 100644
+--- a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
++++ b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
+@@ -33,5 +33,5 @@ class AddConsoleCommandPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $commandServices = $container->findTaggedServiceIds('console.command', true);
+diff --git a/src/Symfony/Component/Console/EventListener/ErrorListener.php b/src/Symfony/Component/Console/EventListener/ErrorListener.php
+index 9925a5f746..e72fb5fc89 100644
+--- a/src/Symfony/Component/Console/EventListener/ErrorListener.php
++++ b/src/Symfony/Com
10000
ponent/Console/EventListener/ErrorListener.php
+@@ -35,5 +35,5 @@ class ErrorListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onConsoleError(ConsoleErrorEvent $event)
++    public function onConsoleError(ConsoleErrorEvent $event): void
+     {
+         if (null === $this->logger) {
+@@ -55,5 +55,5 @@ class ErrorListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onConsoleTerminate(ConsoleTerminateEvent $event)
++    public function onConsoleTerminate(ConsoleTerminateEvent $event): void
+     {
+         if (null === $this->logger) {
 diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
-index 38e75c3178..e5db4d626e 100644
+index 88519f725d..8d728257fe 100644
 --- a/src/Symfony/Component/Console/Formatter/OutputFormatter.php
 +++ b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
-@@ -116,5 +116,5 @@ class OutputFormatter implements WrappableOutputFormatterInterface
+@@ -85,5 +85,5 @@ class OutputFormatter implements WrappableOutputFormatterInterface
+      * @return void
+      */
+-    public function setDecorated(bool $decorated)
++    public function setDecorated(bool $decorated): void
+     {
+         $this->decorated = $decorated;
+@@ -98,5 +98,5 @@ class OutputFormatter implements WrappableOutputFormatterInterface
+      * @return void
+      */
+-    public function setStyle(string $name, OutputFormatterStyleInterface $style)
++    public function setStyle(string $name, OutputFormatterStyleInterface $style): void
+     {
+         $this->styles[strtolower($name)] = $style;
+@@ -122,5 +122,5 @@ class OutputFormatter implements WrappableOutputFormatterInterface
      }
  
 -    public function formatAndWrap(?string $message, int $width)
 +    public function formatAndWrap(?string $message, int $width): string
      {
          if (null === $message) {
+diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
+index 9f1601d16d..68bfe5e98b 100644
+--- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
++++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
+@@ -42,5 +42,5 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
+      * @return void
+      */
+-    public function setForeground(string $color = null)
++    public function setForeground(string $color = null): void
+     {
+         if (1 > \func_num_args()) {
+@@ -53,5 +53,5 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
+      * @return void
+      */
+-    public function setBackground(string $color = null)
++    public function setBackground(string $color = null): void
+     {
+         if (1 > \func_num_args()) {
+@@ -69,5 +69,5 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
+      * @return void
+      */
+-    public function setOption(string $option)
++    public function setOption(string $option): void
+     {
+         $this->options[] = $option;
+@@ -78,5 +78,5 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
+      * @return void
+      */
+-    public function unsetOption(string $option)
++    public function unsetOption(string $option): void
+     {
+         $pos = array_search($option, $this->options);
+@@ -91,5 +91,5 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
+      * @return void
+      */
+-    public function setOptions(array $options)
++    public function setOptions(array $options): void
+     {
+         $this->color = new Color($this->foreground, $this->background, $this->options = $options);
+diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
+index f98c2eff7c..5d9c2c246f 100644
+--- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
++++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
+@@ -38,5 +38,5 @@ class OutputFormatterStyleStack implements ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->styles = [];
+@@ -48,5 +48,5 @@ class OutputFormatterStyleStack implements ResetInterface
+      * @return void
+      */
+-    public function push(OutputFormatterStyleInterface $style)
++    public function push(OutputFormatterStyleInterface $style): void
+     {
+         $this->styles[] = $style;
 diff --git a/src/Symfony/Component/Console/Formatter/WrappableOutputFormatterInterface.php b/src/Symfony/Component/Console/Formatter/WrappableOutputFormatterInterface.php
 index 746cd27e79..52c61429cf 100644
 --- a/src/Symfony/Component/Console/Formatter/WrappableOutputFormatterInterface.php
@@ -534,18 +2445,36 @@ index 746cd27e79..52c61429cf 100644
 -    public function formatAndWrap(?string $message, int $width);
 +    public function formatAndWrap(?string $message, int $width): string;
  }
+diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+index a860c30860..4d17315e52 100644
+--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
++++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+@@ -55,5 +55,5 @@ class DescriptorHelper extends Helper
+      * @return void
+      */
+-    public function describe(OutputInterface $output, ?object $object, array $options = [])
++    public function describe(OutputInterface $output, ?object $object, array $options = []): void
+     {
+         $options = array_merge([
 diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
-index 8e56f2b571..8a629f7565 100644
+index 51fd11b260..3acfc88c9a 100644
 --- a/src/Symfony/Component/Console/Helper/Helper.php
 +++ b/src/Symfony/Component/Console/Helper/Helper.php
-@@ -121,5 +121,5 @@ abstract class Helper implements HelperInterface
+@@ -27,5 +27,5 @@ abstract class Helper implements HelperInterface
+      * @return void
+      */
+-    public function setHelperSet(HelperSet $helperSet = null)
++    public function setHelperSet(HelperSet $helperSet = null): void
+     {
+         if (1 > \func_num_args()) {
+@@ -124,5 +124,5 @@ abstract class Helper implements HelperInterface
       * @return string
       */
 -    public static function formatMemory(int $memory)
 +    public static function formatMemory(int $memory): string
      {
          if ($memory >= 1024 * 1024 * 1024) {
-@@ -141,5 +141,5 @@ abstract class Helper implements HelperInterface
+@@ -144,5 +144,5 @@ abstract class Helper implements HelperInterface
       * @return string
       */
 -    public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string)
@@ -562,6 +2491,110 @@ index 2762cdf05c..737334268a 100644
 -    public function getName();
 +    public function getName(): string;
  }
+diff --git a/src/Symfony/Component/Console/Helper/HelperSet.php b/src/Symfony/Component/Console/Helper/HelperSet.php
+index dc5d499caa..e19192da81 100644
+--- a/src/Symfony/Component/Console/Helper/HelperSet.php
++++ b/src/Symfony/Component/Console/Helper/HelperSet.php
+@@ -39,5 +39,5 @@ class HelperSet implements \IteratorAggregate
+      * @return void
+      */
+-    public function set(HelperInterface $helper, string $alias = null)
++    public function set(HelperInterface $helper, string $alias = null): void
+     {
+         $this->helpers[$helper->getName()] = $helper;
+diff --git a/src/Symfony/Component/Console/Helper/InputAwareHelper.php b/src/Symfony/Component/Console/Helper/InputAwareHelper.php
+index 6f8225973c..5f3640c346 100644
+--- a/src/Symfony/Component/Console/Helper/InputAwareHelper.php
++++ b/src/Symfony/Component/Console/Helper/InputAwareHelper.php
+@@ -27,5 +27,5 @@ abstract class InputAwareHelper extends Helper implements InputAwareInterface
+      * @return void
+      */
+-    public function setInput(InputInterface $input)
++    public function setInput(InputInterface $input): void
+     {
+         $this->input = $input;
+diff --git a/src/Symfony/Component/Console/Helper/ProgressIndicator.php b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
+index c7e9fc1734..276115118f 100644
+--- a/src/Symfony/Component/Console/Helper/ProgressIndicator.php
++++ b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
+@@ -74,5 +74,5 @@ class ProgressIndicator
+      * @return void
+      */
+-    public function setMessage(?string $message)
++    public function setMessage(?string $message): void
+     {
+         $this->message = $message;
+@@ -86,5 +86,5 @@ class ProgressIndicator
+      * @return void
+      */
+-    public function start(string $message)
++    public function start(string $message): void
+     {
+         if ($this->started) {
+@@ -106,5 +106,5 @@ class ProgressIndicator
+      * @return void
+      */
+-    public function advance()
++    public function advance(): void
+     {
+         if (!$this->started) {
+@@ -135,5 +135,5 @@ class ProgressIndicator
+      * @return void
+      */
+-    public function finish(string $message)
++    public function finish(string $message): void
+     {
+         if (!$this->started) {
+@@ -162,5 +162,5 @@ class ProgressIndicator
+      * @return void
+      */
+-    public static function setPlaceholderFormatterDefinition(string $name, callable $callable)
++    public static function setPlaceholderFormatterDefinition(string $name, callable $callable): void
+     {
+         self::$formatters ??= self::initPlaceholderFormatters();
+diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
+index c595ca1968..4222beac6b 100644
+--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
++++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
+@@ -93,5 +93,5 @@ class QuestionHelper extends Helper
+      * @return void
+      */
+-    public static function disableStty()
++    public static function disableStty(): void
+     {
+         self::$stty = false;
+@@ -183,5 +183,5 @@ class QuestionHelper extends Helper
+      * @return void
+      */
+-    protected function writePrompt(OutputInterface $output, Question $question)
++    protected function writePrompt(OutputInterface $output, Question $question): void
+     {
+         $message = $question->getQuestion();
+@@ -221,5 +221,5 @@ class QuestionHelper extends Helper
+      * @return void
+      */
+-    protected function writeError(OutputInterface $output, \Exception $error)
++    protected function writeError(OutputInterface $output, \Exception $error): void
+     {
+         if (null !== $this->getHelperSet() && $this->getHelperSet()->has('formatter')) {
+diff --git a/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php b/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
+index 8ebc84376b..4af2691707 100644
+--- a/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
++++ b/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
+@@ -29,5 +29,5 @@ class SymfonyQuestionHelper extends QuestionHelper
+      * @return void
+      */
+-    protected function writePrompt(OutputInterface $output, Question $question)
++    protected function writePrompt(OutputInterface $output, Question $question): void
+     {
+         $text = OutputFormatter::escapeTrailingBackslash($question->getQuestion());
+@@ -87,5 +87,5 @@ class SymfonyQuestionHelper extends QuestionHelper
+      * @return void
+      */
+-    protected function writeError(OutputInterface $output, \Exception $error)
++    protected function writeError(OutputInterface $output, \Exception $error): void
+     {
+         if ($output instanceof SymfonyStyle) {
 diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
 index 7d31794be3..1c311aded2 100644
 --- a/src/Symfony/Component/Console/Helper/Table.php
@@ -573,6 +2606,145 @@ index 7d31794be3..1c311aded2 100644
 +    public function setRows(array $rows): static
      {
          $this->rows = [];
+diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
+index 59f9217ec5..77b402b7d7 100644
+--- a/src/Symfony/Component/Console/Input/ArgvInput.php
++++ b/src/Symfony/Component/Console/Input/ArgvInput.php
+@@ -59,5 +59,5 @@ class ArgvInput extends Input
+      * @return void
+      */
+-    protected function setTokens(array $tokens)
++    protected function setTokens(array $tokens): void
+     {
+         $this->tokens = $tokens;
+@@ -67,5 +67,5 @@ class ArgvInput extends Input
+      * @return void
+      */
+-    protected function parse()
++    protected function parse(): void
+     {
+         $parseOptions = true;
+diff --git a/src/Symfony/Component/Console/Input/ArrayInput.php b/src/Symfony/Component/Console/Input/ArrayInput.php
+index 355de61dd6..c6b82a2886 100644
+--- a/src/Symfony/Component/Console/Input/ArrayInput.php
++++ b/src/Symfony/Component/Console/Input/ArrayInput.php
+@@ -117,5 +117,5 @@ class ArrayInput extends Input
+      * @return void
+      */
+-    protected function parse()
++    protected function parse(): void
+     {
+         foreach ($this->parameters as $key => $value) {
+diff --git a/src/Symfony/Component/Console/Input/Input.php b/src/Symfony/Component/Console/Input/Input.php
+index 22ede15e11..d8e5f58b74 100644
+--- a/src/Symfony/Component/Console/Input/Input.php
++++ b/src/Symfony/Component/Console/Input/Input.php
+@@ -47,5 +47,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
+      * @return void
+      */
+-    public function bind(InputDefinition $definition)
++    public function bind(InputDefinition $definition): void
+     {
+         $this->arguments = [];
+@@ -64,5 +64,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
+      * @return void
+      */
+-    public function validate()
++    public function validate(): void
+     {
+         $definition = $this->definition;
+@@ -84,5 +84,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
+      * @return void
+      */
+-    public function setInteractive(bool $interactive)
++    public function setInteractive(bool $interactive): void
+     {
+         $this->interactive = $interactive;
+@@ -106,5 +106,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
+      * @return void
+      */
+-    public function setArgument(string $name, mixed $value)
++    public function setArgument(string $name, mixed $value): void
+     {
+         if (!$this->definition->hasArgument($name)) {
+@@ -145,5 +145,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
+      * @return void
+      */
+-    public function setOption(string $name, mixed $value)
++    public function setOption(string $name, mixed $value): void
+     {
+         if ($this->definition->hasNegation($name)) {
+@@ -174,5 +174,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
+      * @return void
+      */
+-    public function setStream($stream)
++    public function setStream($stream): void
+     {
+         $this->stream = $stream;
+diff --git a/src/Symfony/Component/Console/Input/InputArgument.php b/src/Symfony/Component/Console/Input/InputArgument.php
+index ff8e9276fd..0be143da1b 100644
+--- a/src/Symfony/Component/Console/Input/InputArgument.php
++++ b/src/Symfony/Component/Console/Input/InputArgument.php
+@@ -96,5 +96,5 @@ class InputArgument
+      * @return void
+      */
+-    public function setDefault(string|bool|int|float|array $default = null)
++    public function setDefault(string|bool|int|float|array $default = null): void
+     {
+         if (1 > \func_num_args()) {
+diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
+index 0ee85b4990..0de1fc4193 100644
+--- a/src/Symfony/Component/Console/Input/InputDefinition.php
++++ b/src/Symfony/Component/Console/Input/InputDefinition.php
+@@ -50,5 +50,5 @@ class InputDefinition
+      * @return void
+      */
+-    public function setDefinition(array $definition)
++    public function setDefinition(array $definition): void
+     {
+         $arguments = [];
+@@ -73,5 +73,5 @@ class InputDefinition
+      * @return void
+      */
+-    public function setArguments(array $arguments = [])
++    public function setArguments(array $arguments = []): void
+     {
+         $this->arguments = [];
+@@ -89,5 +89,5 @@ class InputDefinition
+      * @return void
+      */
+-    public function addArguments(?array $arguments = [])
++    public function addArguments(?array $arguments = []): void
+     {
+         if (null !== $arguments) {
+@@ -103,5 +103,5 @@ class InputDefinition
+      * @return void
+      */
+-    public function addArgument(InputArgument $argument)
++    public function addArgument(InputArgument $argument): void
+     {
+         if (isset($this->arguments[$argument->getName()])) {
+@@ -202,5 +202,5 @@ class InputDefinition
+      * @return void
+      */
+-    public function setOptions(array $options = [])
++    public function setOptions(array $options = []): void
+     {
+         $this->options = [];
+@@ -217,5 +217,5 @@ class InputDefinition
+      * @return void
+      */
+-    public function addOptions(array $options = [])
++    public function addOptions(array $options = []): void
+     {
+         foreach ($options as $option) {
+@@ -229,5 +229,5 @@ class InputDefinition
+      * @return void
+      */
+-    public function addOption(InputOption $option)
++    public function addOption(InputOption $option): void
+     {
+         if (isset($this->options[$option->getName()]) && !$option->equals($this->options[$option->getName()])) {
 diff --git a/src/Symfony/Component/Console/Input/InputInterface.php b/src/Symfony/Component/Console/Input/InputInterface.php
 index 3af991a76f..742e2508f3 100644
 --- a/src/Symfony/Component/Console/Input/InputInterface.php
@@ -598,28 +2770,400 @@ index 3af991a76f..742e2508f3 100644
 +    public function getOption(string $name): mixed;
  
      /**
-diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
-index e1f981bc1e..f701cb549d 100644
---- a/src/Symfony/Component/Console/Question/Question.php
-+++ b/src/Symfony/Component/Console/Question/Question.php
-@@ -269,5 +269,5 @@ class Question
-      * @return bool
+diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php
+index 231e6cc616..9ba217a593 100644
+--- a/src/Symfony/Component/Console/Input/InputOption.php
++++ b/src/Symfony/Component/Console/Input/InputOption.php
+@@ -182,5 +182,5 @@ class InputOption
+      * @return void
+      */
+-    public function setDefault(string|bool|int|float|array $default = null)
++    public function setDefault(string|bool|int|float|array $default = null): void
+     {
+         if (1 > \func_num_args()) {
+diff --git a/src/Symfony/Component/Console/Output/BufferedOutput.php b/src/Symfony/Component/Console/Output/BufferedOutput.php
+index ef5099bfd6..8fb59d794d 100644
+--- a/src/Symfony/Component/Console/Output/BufferedOutput.php
++++ b/src/Symfony/Component/Console/Output/BufferedOutput.php
+@@ -33,5 +33,5 @@ class BufferedOutput extends Output
+      * @return void
+      */
+-    protected function doWrite(string $message, bool $newline)
++    protected function doWrite(string $message, bool $newline): void
+     {
+         $this->buffer .= $message;
+diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php
+index c1eb7cd14b..c7fc040bb4 100644
+--- a/src/Symfony/Component/Console/Output/ConsoleOutput.php
++++ b/src/Symfony/Component/Console/Output/ConsoleOutput.php
+@@ -68,5 +68,5 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
+      * @return void
+      */
+-    public function setDecorated(bool $decorated)
++    public function setDecorated(bool $decorated): void
+     {
+         parent::setDecorated($decorated);
+@@ -77,5 +77,5 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
+      * @return void
+      */
+-    public function setFormatter(OutputFormatterInterface $formatter)
++    public function setFormatter(OutputFormatterInterface $formatter): void
+     {
+         parent::setFormatter($formatter);
+@@ -86,5 +86,5 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
+      * @return void
+      */
+-    public function setVerbosity(int $level)
++    public function setVerbosity(int $level): void
+     {
+         parent::setVerbosity($level);
+@@ -100,5 +100,5 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
+      * @return void
+      */
+-    public function setErrorOutput(OutputInterface $error)
++    public function setErrorOutput(OutputInterface $error): void
+     {
+         $this->stderr = $error;
+diff --git a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
+index 689f39d2f0..d04287e801 100644
+--- a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
++++ b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
+@@ -64,5 +64,5 @@ class ConsoleSectionOutput extends StreamOutput
+      * @return void
+      */
+-    public function clear(int $lines = null)
++    public function clear(int $lines = null): void
+     {
+         if (empty($this->content) || !$this->isDecorated()) {
+@@ -87,5 +87,5 @@ class ConsoleSectionOutput extends StreamOutput
+      * @return void
+      */
+-    public function overwrite(string|iterable $message)
++    public function overwrite(string|iterable $message): void
+     {
+         $this->clear();
+@@ -157,5 +157,5 @@ class ConsoleSectionOutput extends StreamOutput
+      * @return void
+      */
+-    protected function doWrite(string $message, bool $newline)
++    protected function doWrite(string $message, bool $newline): void
+     {
+         if (!$this->isDecorated()) {
+diff --git a/src/Symfony/Component/Console/Output/NullOutput.php b/src/Symfony/Component/Console/Output/NullOutput.php
+index f3aa15b1d4..206df78910 100644
+--- a/src/Symfony/Component/Console/Output/NullOutput.php
++++ b/src/Symfony/Component/Console/Output/NullOutput.php
+@@ -30,5 +30,5 @@ class NullOutput implements OutputInterface
+      * @return void
+      */
+-    public function setFormatter(OutputFormatterInterface $formatter)
++    public function setFormatter(OutputFormatterInterface $formatter): void
+     {
+         // do nothing
+@@ -44,5 +44,5 @@ class NullOutput implements OutputInterface
+      * @return void
+      */
+-    public function setDecorated(bool $decorated)
++    public function setDecorated(bool $decorated): void
+     {
+         // do nothing
+@@ -57,5 +57,5 @@ class NullOutput implements OutputInterface
+      * @return void
+      */
+-    public function setVerbosity(int $level)
++    public function setVerbosity(int $level): void
+     {
+         // do nothing
+@@ -90,5 +90,5 @@ class NullOutput implements OutputInterface
+      * @return void
+      */
+-    public function writeln(string|iterable $messages, int $options = self::OUTPUT_NORMAL)
++    public function writeln(string|iterable $messages, int $options = self::OUTPUT_NORMAL): void
+     {
+         // do nothing
+@@ -98,5 +98,5 @@ class NullOutput implements OutputInterface
+      * @return void
+      */
+-    public function write(string|iterable $messages, bool $newline = false, int $options = self::OUTPUT_NORMAL)
++    public function write(string|iterable $messages, bool $newline = false, int $options = self::OUTPUT_NORMAL): void
+     {
+         // do nothing
+diff --git a/src/Symfony/Component/Console/Output/Output.php b/src/Symfony/Component/Console/Output/Output.php
+index 29761351f9..0a599c6042 100644
+--- a/src/Symfony/Component/Console/Output/Output.php
++++ b/src/Symfony/Component/Console/Output/Output.php
+@@ -48,5 +48,5 @@ abstract class Output implements OutputInterface
+      * @return void
       */
--    protected function isAssoc(array $array)
-+    protected function isAssoc(array $array): bool
+-    public function setFormatter(OutputFormatterInterface $formatter)
++    public function setFormatter(OutputFormatterInterface $formatter): void
      {
-         return (bool) \count(array_filter(array_keys($array), 'is_string'));
-diff --git a/src/Symfony/Component/Console/Style/OutputStyle.php b/src/Symfony/Component/Console/Style/OutputStyle.php
-index 74d885d131..3de806a60e 100644
---- a/src/Symfony/Component/Console/Style/OutputStyle.php
-+++ b/src/Symfony/Component/Console/Style/OutputStyle.php
-@@ -104,5 +104,5 @@ abstract class OutputStyle implements OutputInterface, StyleInterface
+         $this->formatter = $formatter;
+@@ -61,5 +61,5 @@ abstract class Output implements OutputInterface
+      * @return void
+      */
+-    public function setDecorated(bool $decorated)
++    public function setDecorated(bool $decorated): void
+     {
+         $this->formatter->setDecorated($decorated);
+@@ -74,5 +74,5 @@ abstract class Output implements OutputInterface
+      * @return void
+      */
+-    public function setVerbosity(int $level)
++    public function setVerbosity(int $level): void
+     {
+         $this->verbosity = $level;
+@@ -107,5 +107,5 @@ abstract class Output implements OutputInterface
+      * @return void
+      */
+-    public function writeln(string|iterable $messages, int $options = self::OUTPUT_NORMAL)
++    public function writeln(string|iterable $messages, int $options = self::OUTPUT_NORMAL): void
+     {
+         $this->write($messages, true, $options);
+@@ -115,5 +115,5 @@ abstract class Output implements OutputInterface
+      * @return void
+      */
+-    public function write(string|iterable $messages, bool $newline = false, int $options = self::OUTPUT_NORMAL)
++    public function write(string|iterable $messages, bool $newline = false, int $options = self::OUTPUT_NORMAL): void
+     {
+         if (!is_iterable($messages)) {
+diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
+index 155066ea0e..85e07025bc 100644
+--- a/src/Symfony/Component/Console/Output/StreamOutput.php
++++ b/src/Symfony/Component/Console/Output/StreamOutput.php
+@@ -66,5 +66,5 @@ class StreamOutput extends Output
+      * @return void
+      */
+-    protected function doWrite(string $message, bool $newline)
++    protected function doWrite(string $message, bool $newline): void
+     {
+         if ($newline) {
+diff --git a/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php b/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php
+index b00445ece8..5e9b1086b0 100644
+--- a/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php
++++ b/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php
+@@ -49,5 +49,5 @@ class TrimmedBufferOutput extends Output
+      * @return void
+      */
+-    protected function doWrite(string $message, bool $newline)
++    protected function doWrite(string $message, bool $newline): void
+     {
+         $this->buffer .= $message;
+diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
+index e1f981bc1e..f701cb549d 100644
+--- a/src/Symfony/Component/Console/Question/Question.php
++++ b/src/Symfony/Component/Console/Question/Question.php
+@@ -269,5 +269,5 @@ class Question
+      * @return bool
+      */
+-    protected function isAssoc(array $array)
++    protected function isAssoc(array $array): bool
+     {
+         return (bool) \count(array_filter(array_keys($array), 'is_string'));
+diff --git a/src/Symfony/Component/Console/Style/OutputStyle.php b/src/Symfony/Component/Console/Style/OutputStyle.php
+index ddfa8decc2..e67453d9fe 100644
+--- a/src/Symfony/Component/Console/Style/OutputStyle.php
++++ b/src/Symfony/Component/Console/Style/OutputStyle.php
+@@ -34,5 +34,5 @@ abstract class OutputStyle implements OutputInterface, StyleInterface
+      * @return void
+      */
+-    public function newLine(int $count = 1)
++    public function newLine(int $count = 1): void
+     {
+         $this->output->write(str_repeat(\PHP_EOL, $count));
+@@ -47,5 +47,5 @@ abstract class OutputStyle implements OutputInterface, StyleInterface
+      * @return void
+      */
+-    public function write(string|iterable $messages, bool $newline = false, int $type = self::OUTPUT_NORMAL)
++    public function write(string|iterable $messages, bool $newline = false, int $type = self::OUTPUT_NORMAL): void
+     {
+         $this->output->write($messages, $newline, $type);
+@@ -55,5 +55,5 @@ abstract class OutputStyle implements OutputInterface, StyleInterface
+      * @return void
+      */
+-    public function writeln(string|iterable $messages, int $type = self::OUTPUT_NORMAL)
++    public function writeln(string|iterable $messages, int $type = self::OUTPUT_NORMAL): void
+     {
+         $this->output->writeln($messages, $type);
+@@ -63,5 +63,5 @@ abstract class OutputStyle implements OutputInterface, StyleInterface
+      * @return void
+      */
+-    public function setVerbosity(int $level)
++    public function setVerbosity(int $level): void
+     {
+         $this->output->setVerbosity($level);
+@@ -76,5 +76,5 @@ abstract class OutputStyle implements OutputInterface, StyleInterface
+      * @return void
+      */
+-    public function setDecorated(bool $decorated)
++    public function setDecorated(bool $decorated): void
+     {
+         $this->output->setDecorated($decorated);
+@@ -89,5 +89,5 @@ abstract class OutputStyle implements OutputInterface, StyleInterface
+      * @return void
+      */
+-    public function setFormatter(OutputFormatterInterface $formatter)
++    public function setFormatter(OutputFormatterInterface $formatter): void
+     {
+         $this->output->setFormatter($formatter);
+@@ -122,5 +122,5 @@ abstract class OutputStyle implements OutputInterface, StyleInterface
       * @return OutputInterface
       */
 -    protected function getErrorOutput()
 +    protected function getErrorOutput(): OutputInterface
      {
          if (!$this->output instanceof ConsoleOutputInterface) {
+diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
+index 52d9b5edc9..3026cfccf4 100644
+--- a/src/Symfony/Component/Console/Style/SymfonyStyle.php
++++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php
+@@ -63,5 +63,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function block(string|array $messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = true)
++    public function block(string|array $messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = true): void
+     {
+         $messages = \is_array($messages) ? array_values($messages) : [$messages];
+@@ -75,5 +75,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function title(string $message)
++    public function title(string $message): void
+     {
+         $this->autoPrependBlock();
+@@ -88,5 +88,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function section(string $message)
++    public function section(string $message): void
+     {
+         $this->autoPrependBlock();
+@@ -101,5 +101,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function listing(array $elements)
++    public function listing(array $elements): void
+     {
+         $this->autoPrependText();
+@@ -113,5 +113,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function text(string|array $message)
++    public function text(string|array $message): void
+     {
+         $this->autoPrependText();
+@@ -128,5 +128,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function comment(string|array $message)
++    public function comment(string|array $message): void
+     {
+         $this->block($message, null, null, '<fg=default;bg=default> // </>', false, false);
+@@ -136,5 +136,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function success(string|array $message)
++    public function success(string|array $message): void
+     {
+         $this->block($message, 'OK', 'fg=black;bg=green', ' ', true);
+@@ -144,5 +144,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function error(string|array $message)
++    public function error(string|array $message): void
+     {
+         $this->block($message, 'ERROR', 'fg=white;bg=red', ' ', true);
+@@ -152,5 +152,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function warning(string|array $message)
++    public function warning(string|array $message): void
+     {
+         $this->block($message, 'WARNING', 'fg=black;bg=yellow', ' ', true);
+@@ -160,5 +160,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function note(string|array $message)
++    public function note(string|array $message): void
+     {
+         $this->block($message, 'NOTE', 'fg=yellow', ' ! ');
+@@ -170,5 +170,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function info(string|array $message)
++    public function info(string|array $message): void
+     {
+         $this->block($message, 'INFO', 'fg=green', ' ', true);
+@@ -178,5 +178,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function caution(string|array $message)
++    public function caution(string|array $message): void
+     {
+         $this->block($message, 'CAUTION', 'fg=white;bg=red', ' ! ', true);
+@@ -186,5 +186,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function table(array $headers, array $rows)
++    public function table(array $headers, array $rows): void
+     {
+         $this->createTable()
+@@ -202,5 +202,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function horizontalTable(array $headers, array $rows)
++    public function horizontalTable(array $headers, array $rows): void
+     {
+         $this->createTable()
+@@ -224,5 +224,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function definitionList(string|array|TableSeparator ...$list)
++    public function definitionList(string|array|TableSeparator ...$list): void
+     {
+         $headers = [];
+@@ -288,5 +288,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function progressStart(int $max = 0)
++    public function progressStart(int $max = 0): void
+     {
+         $this->progressBar = $this->createProgressBar($max);
+@@ -297,5 +297,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function progressAdvance(int $step = 1)
++    public function progressAdvance(int $step = 1): void
+     {
+         $this->getProgressBar()->advance($step);
+@@ -305,5 +305,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function progressFinish()
++    public function progressFinish(): void
+     {
+         $this->getProgressBar()->finish();
+@@ -356,5 +356,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function writeln(string|iterable $messages, int $type = self::OUTPUT_NORMAL)
++    public function writeln(string|iterable $messages, int $type = self::OUTPUT_NORMAL): void
+     {
+         if (!is_iterable($messages)) {
+@@ -371,5 +371,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function write(string|iterable $messages, bool $newline = false, int $type = self::OUTPUT_NORMAL)
++    public function write(string|iterable $messages, bool $newline = false, int $type = self::OUTPUT_NORMAL): void
+     {
+         if (!is_iterable($messages)) {
+@@ -386,5 +386,5 @@ class SymfonyStyle extends OutputStyle
+      * @return void
+      */
+-    public function newLine(int $count = 1)
++    public function newLine(int $count = 1): void
+     {
+         parent::newLine($count);
 diff --git a/src/Symfony/Component/CssSelector/Parser/Reader.php b/src/Symfony/Component/CssSelector/Parser/Reader.php
 index 7f6ae7a600..d79db02567 100644
 --- a/src/Symfony/Component/CssSelector/Parser/Reader.php
@@ -631,6 +3175,39 @@ index 7f6ae7a600..d79db02567 100644
 +    public function getOffset(string $string): int|false
      {
          $position = strpos($this->source, $string, $this->position);
+diff --git a/src/Symfony/Component/DependencyInjection/Argument/IteratorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/IteratorArgument.php
+index aedd1e659e..92aff35b84 100644
+--- a/src/Symfony/Component/DependencyInjection/Argument/IteratorArgument.php
++++ b/src/Symfony/Component/DependencyInjection/Argument/IteratorArgument.php
+@@ -34,5 +34,5 @@ class IteratorArgument implements ArgumentInterface
+      * @return void
+      */
+-    public function setValues(array $values)
++    public function setValues(array $values): void
+     {
+         $this->values = $values;
+diff --git a/src/Symfony/Component/DependencyInjection/Argument/ServiceClosureArgument.php b/src/Symfony/Component/DependencyInjection/Argument/ServiceClosureArgument.php
+index be86412bcb..28f53536bc 100644
+--- a/src/Symfony/Component/DependencyInjection/Argument/ServiceClosureArgument.php
++++ b/src/Symfony/Component/DependencyInjection/Argument/ServiceClosureArgument.php
+@@ -36,5 +36,5 @@ class ServiceClosureArgument implements ArgumentInterface
+      * @return void
+      */
+-    public function setValues(array $values)
++    public function setValues(array $values): void
+     {
+         if ([0] !== array_keys($values)) {
+diff --git a/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php
+index de533fcca6..ed25852022 100644
+--- a/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php
++++ b/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php
+@@ -45,5 +45,5 @@ class ServiceLocatorArgument implements ArgumentInterface
+      * @return void
+      */
+-    public function setValues(array $values)
++    public function setValues(array $values): void
+     {
+         $this->values = $values;
 diff --git a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
 index b4e982c457..521a9531f8 100644
 --- a/src/Symfony/Component/DependencyInjection/Argument/TaggedIteratorArgument.php
@@ -643,27 +3220,595 @@ index b4e982c457..521a9531f8 100644
      {
          return $this->tag;
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
-index 08bab02ee4..1181f0795e 100644
+index 95251dec82..74c2b38eb8 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
 +++ b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
-@@ -68,5 +68,5 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
+@@ -40,5 +40,5 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $this->container = $container;
+@@ -54,5 +54,5 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
+      * @return void
+      */
+-    protected function enableExpressionProcessing()
++    protected function enableExpressionProcessing(): void
+     {
+         $this->processExpressions = true;
+@@ -74,5 +74,5 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
       * @return mixed
       */
 -    protected function processValue(mixed $value, bool $isRoot = false)
 +    protected function processValue(mixed $value, bool $isRoot = false): mixed
      {
          if (\is_array($value)) {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
+index de033d9847..e515b6344c 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
+@@ -58,5 +58,5 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $this->container = $container;
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php
+index 3f070dcc0c..aa0e5186bf 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php
+@@ -24,5 +24,5 @@ class AutoAliasServicePass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         foreach ($container->findTaggedServiceIds('auto_alias') as $serviceId => $tags) {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+index 4d419a273b..dfbe815bde 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+@@ -64,5 +64,5 @@ class AutowirePass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         try {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
+index 1fb8935c3e..1cfccaa671 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
+@@ -35,5 +35,5 @@ class CheckCircularReferencesPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $graph = $container->getCompiler()->getServiceReferenceGraph();
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
+index b7ee4b6973..f28a2b992d 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
+@@ -38,5 +38,5 @@ class CheckDefinitionValidityPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         foreach ($container->getDefinitions() as $id => $definition) {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
+index 6e86da0d57..a835cb345b 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
+@@ -29,5 +29,5 @@ class CheckExceptionOnInvalidReferenceBehaviorPass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $this->serviceLocatorContextIds = [];
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
+index c8cbccb4b9..0446970598 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
+@@ -45,5 +45,5 @@ class Compiler
+      * @return void
+      */
+-    public function addPass(CompilerPassInterface $pass, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
++    public function addPass(CompilerPassInterface $pass, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0): void
+     {
+         $this->passConfig->addPass($pass, $type, $priority);
+@@ -55,5 +55,5 @@ class Compiler
+      * @return void
+      */
+-    public function log(CompilerPassInterface $pass, string $message)
++    public function log(CompilerPassInterface $pass, string $message): void
+     {
+         if (str_contains($message, "\n")) {
+@@ -74,5 +74,5 @@ class Compiler
+      * @return void
+      */
+-    public function compile(ContainerBuilder $container)
++    public function compile(ContainerBuilder $container): void
+     {
+         try {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
+index 9c1d7e218e..61415b6ade 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
+@@ -31,5 +31,5 @@ class DecoratorServicePass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $definitions = new \SplPriorityQueue();
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php
+index 953b7f942e..96912701e5 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php
+@@ -25,5 +25,5 @@ class ExtensionCompilerPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         foreach ($container->getExtensions() as $extension) {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
+index f4eb931412..0e5448aa91 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
+@@ -41,5 +41,5 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $this->container = $container;
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
+index cd8ebfe0f7..36cd2b93a4 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
+@@ -33,5 +33,5 @@ class MergeExtensionConfigurationPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $parameters = $container->getParameterBag()->all();
+@@ -169,10 +169,10 @@ class MergeExtensionConfigurationContainerBuilder extends ContainerBuilder
+     }
+ 
+-    public function registerExtension(ExtensionInterface $extension)
++    public function registerExtension(ExtensionInterface $extension): void
+     {
+         throw new LogicException(sprintf('You cannot register extension "%s" from "%s". Extensions must be registered before the container is compiled.', get_debug_type($extension), $this->extensionClass));
+     }
+ 
+-    public function compile(bool $resolveEnvPlaceholders = false)
++    public function compile(bool $resolveEnvPlaceholders = false): void
+     {
+         throw new LogicException(sprintf('Cannot compile the container in extension "%s".', $this->extensionClass));
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+index 7575318524..5602e8556f 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+@@ -126,5 +126,5 @@ class PassConfig
+      * @return void
+      */
+-    public function addPass(CompilerPassInterface $pass, string $type = self::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
++    public function addPass(CompilerPassInterface $pass, string $type = self::TYPE_BEFORE_OPTIMIZATION, int $priority = 0): void
+     {
+         $property = $type.'Passes';
+@@ -202,5 +202,5 @@ class PassConfig
+      * @return void
+      */
+-    public function setMergePass(CompilerPassInterface $pass)
++    public function setMergePass(CompilerPassInterface $pass): void
+     {
+         $this->mergePass = $pass;
+@@ -214,5 +214,5 @@ class PassConfig
+      * @return void
+      */
+-    public function setAfterRemovingPasses(array $passes)
++    public function setAfterRemovingPasses(array $passes): void
+     {
+         $this->afterRemovingPasses = [$passes];
+@@ -226,5 +226,5 @@ class PassConfig
+      * @return void
+      */
+-    public function setBeforeOptimizationPasses(array $passes)
++    public function setBeforeOptimizationPasses(array $passes): void
+     {
+         $this->beforeOptimizationPasses = [$passes];
+@@ -238,5 +238,5 @@ class PassConfig
+      * @return void
+      */
+-    public function setBeforeRemovingPasses(array $passes)
++    public function setBeforeRemovingPasses(array $passes): void
+     {
+         $this->beforeRemovingPasses = [$passes];
+@@ -250,5 +250,5 @@ class PassConfig
+      * @return void
+      */
+-    public function setOptimizationPasses(array $passes)
++    public function setOptimizationPasses(array $passes): void
+     {
+         $this->optimizationPasses = [$passes];
+@@ -262,5 +262,5 @@ class PassConfig
+      * @return void
+      */
+-    public function setRemovingPasses(array $passes)
++    public function setRemovingPasses(array $passes): void
+     {
+         $this->removingPasses = [$passes];
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
+index 2a706bfe5e..68f25a4ff8 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
+@@ -31,5 +31,5 @@ class RegisterEnvVarProcessorsPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $bag = $container->getParameterBag();
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterReverseContainerPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterReverseContainerPass.php
+index aa4cca3571..4365ecffde 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/RegisterReverseContainerPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/RegisterReverseContainerPass.php
+@@ -33,5 +33,5 @@ class RegisterReverseContainerPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('reverse_container')) {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php
+index d0ebfcc509..9b50d622aa 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php
+@@ -24,5 +24,5 @@ class RemoveAbstractDefinitionsPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         foreach ($container->getDefinitions() as $id => $definition) {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveBuildParametersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveBuildParametersPass.php
+index 75e714475c..e5bb34a465 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/RemoveBuildParametersPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveBuildParametersPass.php
+@@ -24,5 +24,5 @@ class RemoveBuildParametersPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $parameterBag = $container->getParameterBag();
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php
+index 93c3fd2672..250a640d63 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php
+@@ -28,5 +28,5 @@ class RemovePrivateAliasesPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         foreach ($container->getAliases() as $id => $alias) {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
+index df97a62f7e..60126d8d06 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
+@@ -30,5 +30,5 @@ class RemoveUnusedDefinitionsPass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         try {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+index 22278bc607..22c6fa918d 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+@@ -34,5 +34,5 @@ class ReplaceAliasByActualDefinitionPass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         // First collect all alias targets that need to be replaced
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
+index 55a358efdf..be943ae655 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
+@@ -36,5 +36,5 @@ class ResolveBindingsPass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $this->usedBindings = $container->getRemovedBindingIds();
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php
+index 468837672e..bdfa98bfa6 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php
+@@ -24,5 +24,5 @@ class ResolveClassPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         foreach ($container->getDefinitions() as $id => $definition) {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDecoratorStackPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDecoratorStackPass.php
+index da02622b21..395c5a1de6 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDecoratorStackPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDecoratorStackPass.php
+@@ -28,5 +28,5 @@ class ResolveDecoratorStackPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $stacks = [];
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php
+index bffb9dab85..40e484f5a5 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php
+@@ -29,5 +29,5 @@ class ResolveHotPathPass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         try {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
+index 88d6fa01fd..d057c13802 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
+@@ -28,5 +28,5 @@ class ResolveInstanceofConditionalsPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         foreach ($container->getAutoconfiguredInstanceof() as $interface => $definition) {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php
+index 7a2a69aa6a..7a265cc8aa 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php
+@@ -39,5 +39,5 @@ class ResolveInvalidReferencesPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $this->container = $container;
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php
+index 3302dd2cd2..459c22434b 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php
+@@ -30,5 +30,5 @@ class ResolveNoPreloadPass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $this->container = $container;
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
+index 2c0e330abb..b6c472cb8e 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
+@@ -37,5 +37,5 @@ class ResolveParameterPlaceHoldersPass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $this->bag = $container->getParameterBag();
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+index 3176d405f8..0bbc25ba9e 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+@@ -26,5 +26,5 @@ class ResolveReferencesToAliasesPass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         parent::process($container);
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
+index e7f42f87db..8c995103ad 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
+@@ -38,5 +38,5 @@ class ServiceReferenceGraphNode
+      * @return void
+      */
+-    public function addInEdge(ServiceReferenceGraphEdge $edge)
++    public function addInEdge(ServiceReferenceGraphEdge $edge): void
+     {
+         $this->inEdges[] = $edge;
+@@ -46,5 +46,5 @@ class ServiceReferenceGraphNode
+      * @return void
+      */
+-    public function addOutEdge(ServiceReferenceGraphEdge $edge)
++    public function addOutEdge(ServiceReferenceGraphEdge $edge): void
+     {
+         $this->outEdges[] = $edge;
+@@ -108,5 +108,5 @@ class ServiceReferenceGraphNode
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         $this->inEdges = $this->outEdges = [];
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
+index 2d6542660b..20287f9286 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
+@@ -34,5 +34,5 @@ class ValidateEnvPlaceholdersPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $this->extensionConfig = [];
 diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
-index ff10702229..d98f26f82b 100644
+index 05df65cfe8..fe27ddf30b 100644
 --- a/src/Symfony/Component/DependencyInjection/Container.php
 +++ b/src/Symfony/Component/DependencyInjection/Container.php
-@@ -115,5 +115,5 @@ class Container implements ContainerInterface, ResetInterface
+@@ -82,5 +82,5 @@ class Container implement
10000
s ContainerInterface, ResetInterface
+      * @return void
+      */
+-    public function compile()
++    public function compile(): void
+     {
+         $this->parameterBag->resolve();
+@@ -117,5 +117,5 @@ class Container implements ContainerInterface, ResetInterface
       * @throws ParameterNotFoundException if the parameter is not defined
       */
 -    public function getParameter(string $name)
 +    public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
      {
          return $this->parameterBag->get($name);
+@@ -130,5 +130,5 @@ class Container implements ContainerInterface, ResetInterface
+      * @return void
+      */
+-    public function setParameter(string $name, array|bool|string|int|float|\UnitEnum|null $value)
++    public function setParameter(string $name, array|bool|string|int|float|\UnitEnum|null $value): void
+     {
+         $this->parameterBag->set($name, $value);
+@@ -143,5 +143,5 @@ class Container implements ContainerInterface, ResetInterface
+      * @return void
+      */
+-    public function set(string $id, ?object $service)
++    public function set(string $id, ?object $service): void
+     {
+         // Runs the internal initializer; used by the dumped container to include always-needed files
+@@ -286,5 +286,5 @@ class Container implements ContainerInterface, ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $services = $this->services + $this->privates;
+diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
+index ac67b468c5..bc1e395810 100644
+--- a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
++++ b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
+@@ -27,5 +27,5 @@ trait ContainerAwareTrait
+      * @return void
+      */
+-    public function setContainer(ContainerInterface $container = null)
++    public function setContainer(ContainerInterface $container = null): void
+     {
+         if (1 > \func_num_args()) {
+diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+index 2329ad570b..dddad4f5b8 100644
+--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
++++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+@@ -176,5 +176,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function setResourceTracking(bool $track)
++    public function setResourceTracking(bool $track): void
+     {
+         $this->trackResources = $track;
+@@ -194,5 +194,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function setProxyInstantiator(InstantiatorInterface $proxyInstantiator)
++    public function setProxyInstantiator(InstantiatorInterface $proxyInstantiator): void
+     {
+         $this->proxyInstantiator = $proxyInstantiator;
+@@ -202,5 +202,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function registerExtension(ExtensionInterface $extension)
++    public function registerExtension(ExtensionInterface $extension): void
+     {
+         $this->extensions[$extension->getAlias()] = $extension;
+@@ -484,5 +484,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function set(string $id, ?object $service)
++    public function set(string $id, ?object $service): void
+     {
+         if ($this->isCompiled() && (isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())) {
+@@ -501,5 +501,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function removeDefinition(string $id)
++    public function removeDefinition(string $id): void
+     {
+         if (isset($this->definitions[$id])) {
+@@ -613,5 +613,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function merge(self $container)
++    public function merge(self $container): void
+     {
+         if ($this->isCompiled()) {
+@@ -705,5 +705,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function prependExtensionConfig(string $name, array $config)
++    public function prependExtensionConfig(string $name, array $config): void
+     {
+         if (!isset($this->extensionConfigs[$name])) {
+@@ -749,5 +749,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function compile(bool $resolveEnvPlaceholders = false)
++    public function compile(bool $resolveEnvPlaceholders = false): void
+     {
+         $compiler = $this->getCompiler();
+@@ -813,5 +813,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function addAliases(array $aliases)
++    public function addAliases(array $aliases): void
+     {
+         foreach ($aliases as $alias => $id) {
+@@ -827,5 +827,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function setAliases(array $aliases)
++    public function setAliases(array $aliases): void
+     {
+         $this->aliasDefinitions = [];
+@@ -861,5 +861,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function removeAlias(string $alias)
++    public function removeAlias(string $alias): void
+     {
+         if (isset($this->aliasDefinitions[$alias])) {
+@@ -923,5 +923,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function addDefinitions(array $definitions)
++    public function addDefinitions(array $definitions): void
+     {
+         foreach ($definitions as $id => $definition) {
+@@ -937,5 +937,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function setDefinitions(array $definitions)
++    public function setDefinitions(array $definitions): void
+     {
+         $this->definitions = [];
+@@ -1304,5 +1304,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+      * @return void
+      */
+-    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
++    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider): void
+     {
+         $this->expressionLanguageProviders[] = $provider;
 diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
 index 9e97fb71fc..1cda97c611 100644
 --- a/src/Symfony/Component/DependencyInjection/ContainerInterface.php
@@ -698,30 +3843,51 @@ index 9fc3b50b62..a6c1469c2d 100644
      {
          return $this->parameters;
 diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
-index 89966648f7..fa80eb75ee 100644
+index 69f7b3a50c..654537df61 100644
 --- a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
 +++ b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
-@@ -75,5 +75,5 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
+@@ -51,5 +51,5 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
+      * @return void
+      */
+-    public function updateRepr()
++    public function updateRepr(): void
+     {
+         if (null !== $this->sourceId) {
+@@ -78,5 +78,5 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
       * @return string
       */
 -    public function getKey()
 +    public function getKey(): string
      {
          return $this->key;
-@@ -83,5 +83,5 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
+@@ -86,5 +86,5 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
       * @return string|null
       */
 -    public function getSourceId()
 +    public function getSourceId(): ?string
      {
          return $this->sourceId;
-@@ -91,5 +91,5 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
+@@ -94,5 +94,5 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
       * @return string|null
       */
 -    public function getSourceKey()
 +    public function getSourceKey(): ?string
      {
          return $this->sourceKey;
+@@ -102,5 +102,5 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
+      * @return void
+      */
+-    public function setSourceId(?string $sourceId)
++    public function setSourceId(?string $sourceId): void
+     {
+         $this->sourceId = $sourceId;
+@@ -112,5 +112,5 @@ class ParameterNotFoundException extends InvalidArgumentException implements Not
+      * @return void
+      */
+-    public function setSourceKey(?string $sourceKey)
++    public function setSourceKey(?string $sourceKey): void
+     {
+         $this->sourceKey = $sourceKey;
 diff --git a/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php b/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php
 index d62c22567b..085d5fa167 100644
 --- a/src/Symfony/Component/DependencyInjection/Exception/ServiceCircularReferenceException.php
@@ -833,6 +3999,144 @@ index f4c6b29258..1402331f9e 100644
 -    public function instantiateProxy(ContainerInterface $container, Definition $definition, string $id, callable $realInstantiator);
 +    public function instantiateProxy(ContainerInterface $container, Definition $definition, string $id, callable $realInstantiator): object;
  }
+diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
+index d6b046c9f6..7a4eaa5abc 100644
+--- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
++++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
+@@ -93,5 +93,5 @@ abstract class FileLoader extends BaseFileLoader
+      * @return void
+      */
+-    public function registerClasses(Definition $prototype, string $namespace, string $resource, string|array $exclude = null/* , string $source = null */)
++    public function registerClasses(Definition $prototype, string $namespace, string $resource, string|array $exclude = null/* , string $source = null */): void
+     {
+         if (!str_ends_with($namespace, '\\')) {
+@@ -155,5 +155,5 @@ abstract class FileLoader extends BaseFileLoader
+      * @return void
+      */
+-    public function registerAliasesForSinglyImplementedInterfaces()
++    public function registerAliasesForSinglyImplementedInterfaces(): void
+     {
+         foreach ($this->interfaces as $interface) {
+@@ -171,5 +171,5 @@ abstract class FileLoader extends BaseFileLoader
+      * @return void
+      */
+-    protected function setDefinition(string $id, Definition $definition)
++    protected function setDefinition(string $id, Definition $definition): void
+     {
+         $this->container->removeBindings($id);
+diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
+index 9c66e1f944..619e44fc73 100644
+--- a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
++++ b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
+@@ -91,5 +91,5 @@ class EnvPlaceholderParameterBag extends ParameterBag
+      * @return void
+      */
+-    public function clearUnusedEnvPlaceholders()
++    public function clearUnusedEnvPlaceholders(): void
+     {
+         $this->unusedEnvPlaceholders = [];
+@@ -101,5 +101,5 @@ class EnvPlaceholderParameterBag extends ParameterBag
+      * @return void
+      */
+-    public function mergeEnvPlaceholders(self $bag)
++    public function mergeEnvPlaceholders(self $bag): void
+     {
+         if ($newPlaceholders = $bag->getEnvPlaceholders()) {
+@@ -125,5 +125,5 @@ class EnvPlaceholderParameterBag extends ParameterBag
+      * @return void
+      */
+-    public function setProvidedTypes(array $providedTypes)
++    public function setProvidedTypes(array $providedTypes): void
+     {
+         $this->providedTypes = $providedTypes;
+@@ -143,5 +143,5 @@ class EnvPlaceholderParameterBag extends ParameterBag
+      * @return void
+      */
+-    public function resolve()
++    public function resolve(): void
+     {
+         if ($this->resolved) {
+diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
+index d4933af33e..47b4778c26 100644
+--- a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
++++ b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
+@@ -35,25 +35,25 @@ class FrozenParameterBag extends ParameterBag
+     }
+ 
+-    public function clear()
++    public function clear(): void
+     {
+         throw new LogicException('Impossible to call clear() on a frozen ParameterBag.');
+     }
+ 
+-    public function add(array $parameters)
++    public function add(array $parameters): void
+     {
+         throw new LogicException('Impossible to call add() on a frozen ParameterBag.');
+     }
+ 
+-    public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value)
++    public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value): void
+     {
+         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+     }
+ 
+-    public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.')
++    public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.'): void
+     {
+         throw new LogicException('Impossible to call deprecate() on a frozen ParameterBag.');
+     }
+ 
+-    public function remove(string $name)
++    public function remove(string $name): void
+     {
+         throw new LogicException('Impossible to call remove() on a frozen ParameterBag.');
+diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
+index 0ad11194dd..7ef6b2e7ab 100644
+--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
++++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
+@@ -35,5 +35,5 @@ class ParameterBag implements ParameterBagInterface
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         $this->parameters = [];
+@@ -43,5 +43,5 @@ class ParameterBag implements ParameterBagInterface
+      * @return void
+      */
+-    public function add(array $parameters)
++    public function add(array $parameters): void
+     {
+         foreach ($parameters as $key => $value) {
+@@ -104,5 +104,5 @@ class ParameterBag implements ParameterBagInterface
+      * @return void
+      */
+-    public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value)
++    public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value): void
+     {
+         if (is_numeric($name)) {
+@@ -122,5 +122,5 @@ class ParameterBag implements ParameterBagInterface
+      * @return void
+      */
+-    public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.')
++    public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.'): void
+     {
+         if (!\array_key_exists($name, $this->parameters)) {
+@@ -139,5 +139,5 @@ class ParameterBag implements ParameterBagInterface
+      * @return void
+      */
+-    public function remove(string $name)
++    public function remove(string $name): void
+     {
+         unset($this->parameters[$name], $this->deprecatedParameters[$name]);
+@@ -147,5 +147,5 @@ class ParameterBag implements ParameterBagInterface
+      * @return void
+      */
+-    public function resolve()
++    public function resolve(): void
+     {
+         if ($this->resolved) {
 diff --git a/src/Symfony/Component/DependencyInjection/TypedReference.php b/src/Symfony/Component/DependencyInjection/TypedReference.php
 index 9b431cd65b..5fdb0643cd 100644
 --- a/src/Symfony/Component/DependencyInjection/TypedReference.php
@@ -844,6 +4148,334 @@ index 9b431cd65b..5fdb0643cd 100644
 +    public function getType(): string
      {
          return $this->type;
+diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
+index 02e3915d2e..936ae278c8 100644
+--- a/src/Symfony/Component/DomCrawler/Crawler.php
++++ b/src/Symfony/Component/DomCrawler/Crawler.php
+@@ -95,5 +95,5 @@ class Crawler implements \Countable, \IteratorAggregate
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         $this->nodes = [];
+@@ -114,5 +114,5 @@ class Crawler implements \Countable, \IteratorAggregate
+      * @return void
+      */
+-    public function add(\DOMNodeList|\DOMNode|array|string|null $node)
++    public function add(\DOMNodeList|\DOMNode|array|string|null $node): void
+     {
+         if ($node instanceof \DOMNodeList) {
+@@ -138,5 +138,5 @@ class Crawler implements \Countable, \IteratorAggregate
+      * @return void
+      */
+-    public function addContent(string $content, string $type = null)
++    public function addContent(string $content, string $type = null): void
+     {
+         if (empty($type)) {
+@@ -180,5 +180,5 @@ class Crawler implements \Countable, \IteratorAggregate
+      * @return void
+      */
+-    public function addHtmlContent(string $content, string $charset = 'UTF-8')
++    public function addHtmlContent(string $content, string $charset = 'UTF-8'): void
+     {
+         $dom = $this->parseHtmlString($content, $charset);
+@@ -216,5 +216,5 @@ class Crawler implements \Countable, \IteratorAggregate
+      * @return void
+      */
+-    public function addXmlContent(string $content, string $charset = 'UTF-8', int $options = \LIBXML_NONET)
++    public function addXmlContent(string $content, string $charset = 'UTF-8', int $options = \LIBXML_NONET): void
+     {
+         // remove the default namespace if it's the only namespace to make XPath expressions simpler
+@@ -246,5 +246,5 @@ class Crawler implements \Countable, \IteratorAggregate
+      * @return void
+      */
+-    public function addDocument(\DOMDocument $dom)
++    public function addDocument(\DOMDocument $dom): void
+     {
+         if ($dom->documentElement) {
+@@ -260,5 +260,5 @@ class Crawler implements \Countable, \IteratorAggregate
+      * @return void
+      */
+-    public function addNodeList(\DOMNodeList $nodes)
++    public function addNodeList(\DOMNodeList $nodes): void
+     {
+         foreach ($nodes as $node) {
+@@ -276,5 +276,5 @@ class Crawler implements \Countable, \IteratorAggregate
+      * @return void
+      */
+-    public function addNodes(array $nodes)
++    public function addNodes(array $nodes): void
+     {
+         foreach ($nodes as $node) {
+@@ -290,5 +290,5 @@ class Crawler implements \Countable, \IteratorAggregate
+      * @return void
+      */
+-    public function addNode(\DOMNode $node)
++    public function addNode(\DOMNode $node): void
+     {
+         if ($node instanceof \DOMDocument) {
+@@ -884,5 +884,5 @@ class Crawler implements \Countable, \IteratorAggregate
+      * @return void
+      */
+-    public function setDefaultNamespacePrefix(string $prefix)
++    public function setDefaultNamespacePrefix(string $prefix): void
+     {
+         $this->defaultNamespacePrefix = $prefix;
+@@ -892,5 +892,5 @@ class Crawler implements \Countable, \IteratorAggregate
+      * @return void
+      */
+-    public function registerNamespace(string $prefix, string $namespace)
++    public function registerNamespace(string $prefix, string $namespace): void
+     {
+         $this->namespaces[$prefix] = $namespace;
+diff --git a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
+index 58aff3613e..ec15ede591 100644
+--- a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
++++ b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
+@@ -64,5 +64,5 @@ class ChoiceFormField extends FormField
+      * @return void
+      */
+-    public function select(string|array|bool $value)
++    public function select(string|array|bool $value): void
+     {
+         $this->setValue($value);
+@@ -76,5 +76,5 @@ class ChoiceFormField extends FormField
+      * @return void
+      */
+-    public function tick()
++    public function tick(): void
+     {
+         if ('checkbox' !== $this->type) {
+@@ -92,5 +92,5 @@ class ChoiceFormField extends FormField
+      * @return void
+      */
+-    public function untick()
++    public function untick(): void
+     {
+         if ('checkbox' !== $this->type) {
+@@ -108,5 +108,5 @@ class ChoiceFormField extends FormField
+      * @return void
+      */
+-    public function setValue(string|array|bool|null $value)
++    public function setValue(string|array|bool|null $value): void
+     {
+         if ('checkbox' === $this->type && false === $value) {
+@@ -187,5 +187,5 @@ class ChoiceFormField extends FormField
+      * @return void
+      */
+-    protected function initialize()
++    protected function initialize(): void
+     {
+         if ('input' !== $this->node->nodeName && 'select' !== $this->node->nodeName) {
+diff --git a/src/Symfony/Component/DomCrawler/Field/FileFormField.php b/src/Symfony/Component/DomCrawler/Field/FileFormField.php
+index 4238e5a73c..ce38830f9f 100644
+--- a/src/Symfony/Component/DomCrawler/Field/FileFormField.php
++++ b/src/Symfony/Component/DomCrawler/Field/FileFormField.php
+@@ -28,5 +28,5 @@ class FileFormField extends FormField
+      * @return void
+      */
+-    public function setErrorCode(int $error)
++    public function setErrorCode(int $error): void
+     {
+         $codes = [\UPLOAD_ERR_INI_SIZE, \UPLOAD_ERR_FORM_SIZE, \UPLOAD_ERR_PARTIAL, \UPLOAD_ERR_NO_FILE, \UPLOAD_ERR_NO_TMP_DIR, \UPLOAD_ERR_CANT_WRITE, \UPLOAD_ERR_EXTENSION];
+@@ -43,5 +43,5 @@ class FileFormField extends FormField
+      * @return void
+      */
+-    public function upload(?string $value)
++    public function upload(?string $value): void
+     {
+         $this->setValue($value);
+@@ -53,5 +53,5 @@ class FileFormField extends FormField
+      * @return void
+      */
+-    public function setValue(?string $value)
++    public function setValue(?string $value): void
+     {
+         if (null !== $value && is_readable($value)) {
+@@ -86,5 +86,5 @@ class FileFormField extends FormField
+      * @return void
+      */
+-    public function setFilePath(string $path)
++    public function setFilePath(string $path): void
+     {
+         parent::setValue($path);
+@@ -98,5 +98,5 @@ class FileFormField extends FormField
+      * @return void
+      */
+-    protected function initialize()
++    protected function initialize(): void
+     {
+         if ('input' !== $this->node->nodeName) {
+diff --git a/src/Symfony/Component/DomCrawler/Field/FormField.php b/src/Symfony/Component/DomCrawler/Field/FormField.php
+index 483b08f089..f0f7d96f67 100644
+--- a/src/Symfony/Component/DomCrawler/Field/FormField.php
++++ b/src/Symfony/Component/DomCrawler/Field/FormField.php
+@@ -96,5 +96,5 @@ abstract class FormField
+      * @return void
+      */
+-    public function setValue(?string $value)
++    public function setValue(?string $value): void
+     {
+         $this->value = $value ?? '';
+diff --git a/src/Symfony/Component/DomCrawler/Field/InputFormField.php b/src/Symfony/Component/DomCrawler/Field/InputFormField.php
+index a7542a7f80..af2d70a962 100644
+--- a/src/Symfony/Component/DomCrawler/Field/InputFormField.php
++++ b/src/Symfony/Component/DomCrawler/Field/InputFormField.php
+@@ -29,5 +29,5 @@ class InputFormField extends FormField
+      * @return void
+      */
+-    protected function initialize()
++    protected function initialize(): void
+     {
+         if ('input' !== $this->node->nodeName && 'button' !== $this->node->nodeName) {
+diff --git a/src/Symfony/Component/DomCrawler/Field/TextareaFormField.php b/src/Symfony/Component/DomCrawler/Field/TextareaFormField.php
+index 1bf85600ac..9233fac5d0 100644
+--- a/src/Symfony/Component/DomCrawler/Field/TextareaFormField.php
++++ b/src/Symfony/Component/DomCrawler/Field/TextareaFormField.php
+@@ -26,5 +26,5 @@ class TextareaFormField extends FormField
+      * @return void
+      */
+-    protected function initialize()
++    protected function initialize(): void
+     {
+         if ('textarea' !== $this->node->nodeName) {
+diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
+index ab644ffa12..80ad0799da 100644
+--- a/src/Symfony/Component/DomCrawler/Form.php
++++ b/src/Symfony/Component/DomCrawler/Form.php
+@@ -249,5 +249,5 @@ class Form extends Link implements \ArrayAccess
+      * @return void
+      */
+-    public function remove(string $name)
++    public function remove(string $name): void
+     {
+         $this->fields->remove($name);
+@@ -271,5 +271,5 @@ class Form extends Link implements \ArrayAccess
+      * @return void
+      */
+-    public function set(FormField $field)
++    public function set(FormField $field): void
+     {
+         $this->fields->add($field);
+@@ -358,5 +358,5 @@ class Form extends Link implements \ArrayAccess
+      * @return void
+      */
+-    protected function setNode(\DOMElement $node)
++    protected function setNode(\DOMElement $node): void
+     {
+         $this->button = $node;
+diff --git a/src/Symfony/Component/DomCrawler/Image.php b/src/Symfony/Component/DomCrawler/Image.php
+index 725e3aea38..9ada91a4be 100644
+--- a/src/Symfony/Component/DomCrawler/Image.php
++++ b/src/Symfony/Component/DomCrawler/Image.php
+@@ -30,5 +30,5 @@ class Image extends AbstractUriElement
+      * @return void
+      */
+-    protected function setNode(\DOMElement $node)
++    protected function setNode(\DOMElement $node): void
+     {
+         if ('img' !== $node->nodeName) {
+diff --git a/src/Symfony/Component/DomCrawler/Link.php b/src/Symfony/Component/DomCrawler/Link.php
+index 681a2f7a23..07ca3531a1 100644
+--- a/src/Symfony/Component/DomCrawler/Link.php
++++ b/src/Symfony/Component/DomCrawler/Link.php
+@@ -27,5 +27,5 @@ class Link extends AbstractUriElement
+      * @return void
+      */
+-    protected function setNode(\DOMElement $node)
++    protected function setNode(\DOMElement $node): void
+     {
+         if ('a' !== $node->nodeName && 'area' !== $node->nodeName && 'link' !== $node->nodeName) {
+diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+index 54e024628f..29c9198dab 100644
+--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
++++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+@@ -55,5 +55,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
+      * @return void
+      */
+-    public function addListener(string $eventName, callable|array $listener, int $priority = 0)
++    public function addListener(string $eventName, callable|array $listener, int $priority = 0): void
+     {
+         $this->dispatcher->addListener($eventName, $listener, $priority);
+@@ -63,5 +63,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
+      * @return void
+      */
+-    public function addSubscriber(EventSubscriberInterface $subscriber)
++    public function addSubscriber(EventSubscriberInterface $subscriber): void
+     {
+         $this->dispatcher->addSubscriber($subscriber);
+@@ -224,5 +224,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->callStack = null;
+@@ -247,5 +247,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
+      * @return void
+      */
+-    protected function beforeDispatch(string $eventName, object $event)
++    protected function beforeDispatch(string $eventName, object $event): void
+     {
+     }
+@@ -256,5 +256,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
+      * @return void
+      */
+-    protected function afterDispatch(string $eventName, object $event)
++    protected function afterDispatch(string $eventName, object $event): void
+     {
+     }
+diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
+index cbfe7e416d..bf72a91ce8 100644
+--- a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
++++ b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
+@@ -52,5 +52,5 @@ class RegisterListenersPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('event_dispatcher') && !$container->hasAlias('event_dispatcher')) {
+diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
+index 327803af67..2466d748ec 100644
+--- a/src/Symfony/Component/EventDispatcher/EventDispatcher.php
++++ b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
+@@ -127,5 +127,5 @@ class EventDispatcher implements EventDispatcherInterface
+      * @return void
+      */
+-    public function addListener(string $eventName, callable|array $listener, int $priority = 0)
++    public function addListener(string $eventName, callable|array $listener, int $priority = 0): void
+     {
+         $this->listeners[$eventName][$priority][] = $listener;
+@@ -136,5 +136,5 @@ class EventDispatcher implements EventDispatcherInterface
+      * @return void
+      */
+-    public function removeListener(string $eventName, callable|array $listener)
++    public function removeListener(string $eventName, callable|array $listener): void
+     {
+         if (empty($this->listeners[$eventName])) {
+@@ -167,5 +167,5 @@ class EventDispatcher implements EventDispatcherInterface
+      * @return void
+      */
+-    public function addSubscriber(EventSubscriberInterface $subscriber)
++    public function addSubscriber(EventSubscriberInterface $subscriber): void
+     {
+         foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
+@@ -185,5 +185,5 @@ class EventDispatcher implements EventDispatcherInterface
+      * @return void
+      */
+-    public function removeSubscriber(EventSubscriberInterface $subscriber)
++    public function removeSubscriber(EventSubscriberInterface $subscriber): void
+     {
+         foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
+@@ -210,5 +210,5 @@ class EventDispatcher implements EventDispatcherInterface
+      * @return void
+      */
+-    protected function callListeners(iterable $listeners, string $eventName, object $event)
++    protected function callListeners(iterable $listeners, string $eventName, object $event): void
+     {
+         $stoppable = $event instanceof StoppableEventInterface;
 diff --git a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php b/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
 index 2085e428e9..ca0d6964e5 100644
 --- a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
@@ -875,6 +4507,38 @@ index 479aeef880..272954c082 100644
 -    public function getFunctions();
 +    public function getFunctions(): array;
  }
+diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
+index c6cc4047e4..936ff228fa 100644
+--- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
++++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
+@@ -117,5 +117,5 @@ class ExpressionLanguage
+      * @return void
+      */
+-    public function register(string $name, callable $compiler, callable $evaluator)
++    public function register(string $name, callable $compiler, callable $evaluator): void
+     {
+         if (isset($this->parser)) {
+@@ -129,5 +129,5 @@ class ExpressionLanguage
+      * @return void
+      */
+-    public function addFunction(ExpressionFunction $function)
++    public function addFunction(ExpressionFunction $function): void
+     {
+         $this->register($function->getName(), $function->getCompiler(), $function->getEvaluator());
+@@ -137,5 +137,5 @@ class ExpressionLanguage
+      * @return void
+      */
+-    public function registerProvider(ExpressionFunctionProviderInterface $provider)
++    public function registerProvider(ExpressionFunctionProviderInterface $provider): void
+     {
+         foreach ($provider->getFunctions() as $function) {
+@@ -147,5 +147,5 @@ class ExpressionLanguage
+      * @return void
+      */
+-    protected function registerFunctions()
++    protected function registerFunctions(): void
+     {
+         $this->addFunction(ExpressionFunction::fromPhp('constant'));
 diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
 index fec02abaae..7d02544275 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
@@ -887,7 +4551,7 @@ index fec02abaae..7d02544275 100644
      {
          if ($this->nodes['expr1']->evaluate($functions, $values)) {
 diff --git a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
-index 06078da305..cc11697293 100644
+index d4ab3e0922..811fec7e2e 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
 +++ b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
 @@ -41,5 +41,5 @@ class FunctionNode extends Node
@@ -905,31 +4569,38 @@ index 06078da305..cc11697293 100644
      {
          $array = [];
 diff --git a/src/Symfony/Component/ExpressionLanguage/Node/Node.php b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
-index eb5046c9bf..ef142d3787 100644
+index f6fff09b1e..4661f7d165 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Node/Node.php
 +++ b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
-@@ -68,5 +68,5 @@ class Node
+@@ -61,5 +61,5 @@ class Node
+      * @return void
+      */
+-    public function compile(Compiler $compiler)
++    public function compile(Compiler $compiler): void
+     {
+         foreach ($this->nodes as $node) {
+@@ -71,5 +71,5 @@ class Node
       * @return mixed
       */
 -    public function evaluate(array $functions, array $values)
 +    public function evaluate(array $functions, array $values): mixed
      {
          $results = [];
-@@ -86,5 +86,5 @@ class Node
+@@ -89,5 +89,5 @@ class Node
       * @return string
       */
 -    public function dump()
 +    public function dump(): string
      {
          $dump = '';
-@@ -100,5 +100,5 @@ class Node
+@@ -103,5 +103,5 @@ class Node
       * @return string
       */
 -    protected function dumpString(string $value)
 +    protected function dumpString(string $value): string
      {
          return sprintf('"%s"', addcslashes($value, "\0\t\"\\"));
-@@ -108,5 +108,5 @@ class Node
+@@ -111,5 +111,5 @@ class Node
       * @return bool
       */
 -    protected function isHash(array $value)
@@ -937,7 +4608,7 @@ index eb5046c9bf..ef142d3787 100644
      {
          $expectedKey = 0;
 diff --git a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
-index 9e30d848eb..ee82938d8a 100644
+index 580ee13095..55e2121fcf 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
 +++ b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
 @@ -46,5 +46,5 @@ class UnaryNode extends Node
@@ -959,7 +4630,7 @@ index 239624ec2c..3b497d5ccf 100644
      {
          return $this->nodes;
 diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
-index 92585a574c..96c62f8521 100644
+index a2911686f0..8f19254f51 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Parser.php
 +++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
 @@ -178,5 +178,5 @@ class Parser
@@ -969,28 +4640,35 @@ index 92585a574c..96c62f8521 100644
 +    protected function parseConditionalExpression(Node\Node $expr): Node\Node
      {
          while ($this->stream->current->test(Token::PUNCTUATION_TYPE, '??')) {
-@@ -277,5 +277,5 @@ class Parser
+@@ -212,5 +212,5 @@ class Parser
+      * @return Node\Node
+      */
+-    public function parsePrimaryExpression()
++    public function parsePrimaryExpression(): Node\Node
+     {
+         $token = $this->stream->current;
+@@ -280,5 +280,5 @@ class Parser
       * @return Node\ArrayNode
       */
 -    public function parseArrayExpression()
 +    public function parseArrayExpression(): Node\ArrayNode
      {
          $this->stream->expect(Token::PUNCTUATION_TYPE, '[', 'An array element was expected');
-@@ -304,5 +304,5 @@ class Parser
+@@ -307,5 +307,5 @@ class Parser
       * @return Node\ArrayNode
       */
 -    public function parseHashExpression()
 +    public function parseHashExpression(): Node\ArrayNode
      {
          $this->stream->expect(Token::PUNCTUATION_TYPE, '{', 'A hash element was expected');
-@@ -351,5 +351,5 @@ class Parser
+@@ -354,5 +354,5 @@ class Parser
       * @return Node\GetAttrNode|Node\Node
       */
 -    public function parsePostfixExpression(Node\Node $node)
 +    public function parsePostfixExpression(Node\Node $node): Node\GetAttrNode|Node\Node
      {
          $token = $this->stream->current;
-@@ -414,5 +414,5 @@ class Parser
+@@ -417,5 +417,5 @@ class Parser
       * @return Node\Node
       */
 -    public function parseArguments()
@@ -1014,42 +4692,199 @@ index 56207b0985..133a3a1061 100644
 +    public function getNodes(): Node
      {
          return unserialize($this->nodes);
-diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php
-index 5d3c1a8480..7eb6bba474 100644
---- a/src/Symfony/Component/Form/AbstractExtension.php
-+++ b/src/Symfony/Component/Form/AbstractExtension.php
-@@ -99,5 +99,5 @@ abstract class AbstractExtension implements FormExtensionInterface
-      * @return FormTypeInterface[]
+diff --git a/src/Symfony/Component/ExpressionLanguage/TokenStream.php b/src/Symfony/Component/ExpressionLanguage/TokenStream.php
+index 241725b9c5..420932897f 100644
+--- a/src/Symfony/Component/ExpressionLanguage/TokenStream.php
++++ b/src/Symfony/Component/ExpressionLanguage/TokenStream.php
+@@ -45,5 +45,5 @@ class TokenStream
+      * @return void
       */
--    protected function loadTypes()
-+    protected function loadTypes(): array
+-    public function next()
++    public function next(): void
      {
-         return [];
-@@ -119,5 +119,5 @@ abstract class AbstractExtension implements FormExtensionInterface
-      * @return FormTypeGuesserInterface|null
+         ++$this->position;
+@@ -61,5 +61,5 @@ class TokenStream
+      * @return void
       */
--    protected function loadTypeGuesser()
-+    protected function loadTypeGuesser(): ?FormTypeGuesserInterface
+-    public function expect(string $type, string $value = null, string $message = null)
++    public function expect(string $type, string $value = null, string $message = null): void
      {
-         return null;
-diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php
-index f79f1c1338..c74c4bf2f1 100644
---- a/src/Symfony/Component/Form/AbstractRendererEngine.php
-+++ b/src/Symfony/Component/Form/AbstractRendererEngine.php
-@@ -125,5 +125,5 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface, Re
-      * @return bool
+         $token = $this->current;
+diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
+index 2263d58fe7..8a1b84d368 100644
+--- a/src/Symfony/Component/Filesystem/Filesystem.php
++++ b/src/Symfony/Component/Filesystem/Filesystem.php
+@@ -37,5 +37,5 @@ class Filesystem
+      * @return void
       */
--    abstract protected function loadResourceForBlockName(string $cacheKey, FormView $view, string $blockName);
-+    abstract protected function loadResourceForBlockName(string $cacheKey, FormView $view, string $blockName): bool;
- 
-     /**
-diff --git a/src/Symfony/Component/Form/AbstractType.php b/src/Symfony/Component/Form/AbstractType.php
-index da401930d7..15d6219259 100644
---- a/src/Symfony/Component/Form/AbstractType.php
-+++ b/src/Symfony/Component/Form/AbstractType.php
-@@ -37,10 +37,10 @@ abstract class AbstractType implements FormTypeInterface
-     }
- 
+-    public function copy(string $originFile, string $targetFile, bool $overwriteNewerFiles = false)
++    public function copy(string $originFile, string $targetFile, bool $overwriteNewerFiles = false): void
+     {
+         $originIsLocal = stream_is_local($originFile) || 0 === stripos($originFile, 'file://');
+@@ -89,5 +89,5 @@ class Filesystem
+      * @return void
+      */
+-    public function mkdir(string|iterable $dirs, int $mode = 0777)
++    public function mkdir(string|iterable $dirs, int $mode = 0777): void
+     {
+         foreach ($this->toIterable($dirs) as $dir) {
+@@ -132,5 +132,5 @@ class Filesystem
+      * @return void
+      */
+-    public function touch(string|iterable $files, int $time = null, int $atime = null)
++    public function touch(string|iterable $files, int $time = null, int $atime = null): void
+     {
+         foreach ($this->toIterable($files) as $file) {
+@@ -148,5 +148,5 @@ class Filesystem
+      * @return void
+      */
+-    public function remove(string|iterable $files)
++    public function remove(string|iterable $files): void
+     {
+         if ($files instanceof \Traversable) {
+@@ -216,5 +216,5 @@ class Filesystem
+      * @return void
+      */
+-    public function chmod(string|iterable $files, int $mode, int $umask = 0000, bool $recursive = false)
++    public function chmod(string|iterable $files, int $mode, int $umask = 0000, bool $recursive = false): void
+     {
+         foreach ($this->toIterable($files) as $file) {
+@@ -238,5 +238,5 @@ class Filesystem
+      * @return void
+      */
+-    public function chown(string|iterable $files, string|int $user, bool $recursive = false)
++    public function chown(string|iterable $files, string|int $user, bool $recursive = false): void
+     {
+         foreach ($this->toIterable($files) as $file) {
+@@ -266,5 +266,5 @@ class Filesystem
+      * @return void
+      */
+-    public function chgrp(string|iterable $files, string|int $group, bool $recursive = false)
++    public function chgrp(string|iterable $files, string|int $group, bool $recursive = false): void
+     {
+         foreach ($this->toIterable($files) as $file) {
+@@ -292,5 +292,5 @@ class Filesystem
+      * @return void
+      */
+-    public function rename(string $origin, string $target, bool $overwrite = false)
++    public function rename(string $origin, string $target, bool $overwrite = false): void
+     {
+         // we check that target does not exist
+@@ -334,5 +334,5 @@ class Filesystem
+      * @return void
+      */
+-    public function symlink(string $originDir, string $targetDir, bool $copyOnWindows = false)
++    public function symlink(string $originDir, string $targetDir, bool $copyOnWindows = false): void
+     {
+         self::assertFunctionExists('symlink');
+@@ -373,5 +373,5 @@ class Filesystem
+      * @return void
+      */
+-    public function hardlink(string $originFile, string|iterable $targetFiles)
++    public function hardlink(string $originFile, string|iterable $targetFiles): void
+     {
+         self::assertFunctionExists('link');
+@@ -531,5 +531,5 @@ class Filesystem
+      * @return void
+      */
+-    public function mirror(string $originDir, string $targetDir, \Traversable $iterator = null, array $options = [])
++    public function mirror(string $originDir, string $targetDir, \Traversable $iterator = null, array $options = []): void
+     {
+         $targetDir = rtrim($targetDir, '/\\');
+@@ -657,5 +657,5 @@ class Filesystem
+      * @return void
+      */
+-    public function dumpFile(string $filename, $content)
++    public function dumpFile(string $filename, $content): void
+     {
+         if (\is_array($content)) {
+@@ -698,5 +698,5 @@ class Filesystem
+      * @return void
+      */
+-    public function appendToFile(string $filename, $content/* , bool $lock = false */)
++    public function appendToFile(string $filename, $content/* , bool $lock = false */): void
+     {
+         if (\is_array($content)) {
+diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
+index 62c3f9e24f..f5055abd0c 100644
+--- a/src/Symfony/Component/Finder/Finder.php
++++ b/src/Symfony/Component/Finder/Finder.php
+@@ -400,5 +400,5 @@ class Finder implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public static function addVCSPattern(string|array $pattern)
++    public static function addVCSPattern(string|array $pattern): void
+     {
+         foreach ((array) $pattern as $p) {
+diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php
+index cffca7d398..f528c135a2 100644
+--- a/src/Symfony/Component/Form/AbstractExtension.php
++++ b/src/Symfony/Component/Form/AbstractExtension.php
+@@ -99,5 +99,5 @@ abstract class AbstractExtension implements FormExtensionInterface
+      * @return FormTypeInterface[]
+      */
+-    protected function loadTypes()
++    protected function loadTypes(): array
+     {
+         return [];
+@@ -119,5 +119,5 @@ abstract class AbstractExtension implements FormExtensionInterface
+      * @return FormTypeGuesserInterface|null
+      */
+-    protected function loadTypeGuesser()
++    protected function loadTypeGuesser(): ?FormTypeGuesserInterface
+     {
+         return null;
+diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php
+index 3f1ab79c26..bddb459b86 100644
+--- a/src/Symfony/Component/Form/AbstractRendererEngine.php
++++ b/src/Symfony/Component/Form/AbstractRendererEngine.php
+@@ -65,5 +65,5 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface, Re
+      * @return void
+      */
+-    public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true)
++    public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true): void
+     {
+         $cacheKey = $view->vars[self::CACHE_KEY_VAR];
+@@ -128,5 +128,5 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface, Re
+      * @return bool
+      */
+-    abstract protected function loadResourceForBlockName(string $cacheKey, FormView $view, string $blockName);
++    abstract protected function loadResourceForBlockName(string $cacheKey, FormView $view, string $blockName): bool;
+ 
+     /**
+diff --git a/src/Symfony/Component/Form/AbstractType.php b/src/Symfony/Component/Form/AbstractType.php
+index b163506132..d8f2cc5d49 100644
+--- a/src/Symfony/Component/Form/AbstractType.php
++++ b/src/Symfony/Component/Form/AbstractType.php
+@@ -24,5 +24,5 @@ abstract class AbstractType implements FormTypeInterface
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+     }
+@@ -31,5 +31,5 @@ abstract class AbstractType implements FormTypeInterface
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+     }
+@@ -38,5 +38,5 @@ abstract class AbstractType implements FormTypeInterface
+      * @return void
+      */
+-    public function finishView(FormView $view, FormInterface $form, array $options)
++    public function finishView(FormView $view, FormInterface $form, array $options): void
+     {
+     }
+@@ -45,14 +45,14 @@ abstract class AbstractType implements FormTypeInterface
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+     }
+ 
 -    public function getBlockPrefix()
 +    public function getBlockPrefix(): string
      {
@@ -1060,6 +4895,38 @@ index da401930d7..15d6219259 100644
 +    public function getParent(): ?string
      {
          return FormType::class;
+diff --git a/src/Symfony/Component/Form/AbstractTypeExtension.php b/src/Symfony/Component/Form/AbstractTypeExtension.php
+index 422f28bf33..b1d608fd4d 100644
+--- a/src/Symfony/Component/Form/AbstractTypeExtension.php
++++ b/src/Symfony/Component/Form/AbstractTypeExtension.php
+@@ -22,5 +22,5 @@ abstract class AbstractTypeExtension implements FormTypeExtensionInterface
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+     }
+@@ -29,5 +29,5 @@ abstract class AbstractTypeExtension implements FormTypeExtensionInterface
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+     }
+@@ -36,5 +36,5 @@ abstract class AbstractTypeExtension implements FormTypeExtensionInterface
+      * @return void
+      */
+-    public function finishView(FormView $view, FormInterface $form, array $options)
++    public function finishView(FormView $view, FormInterface $form, array $options): void
+     {
+     }
+@@ -43,5 +43,5 @@ abstract class AbstractTypeExtension implements FormTypeExtensionInterface
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+     }
 diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
 index 9cc32888e1..0fa604ceec 100644
 --- a/src/Symfony/Component/Form/ButtonBuilder.php
@@ -1071,6 +4938,28 @@ index 9cc32888e1..0fa604ceec 100644
 +    public function setFormFactory(FormFactoryInterface $formFactory): static
      {
          throw new BadMethodCallException('Buttons do not support form factories.');
+diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
+index 304105cbc2..8268ca39fe 100644
+--- a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
++++ b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
+@@ -218,5 +218,5 @@ class CachingFactoryDecorator implements ChoiceListFactoryInterface, ResetInterf
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->lists = [];
+diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
+index 9b6b830341..9c656316e4 100644
+--- a/src/Symfony/Component/Form/Command/DebugCommand.php
++++ b/src/Symfony/Component/Form/Command/DebugCommand.php
+@@ -58,5 +58,5 @@ class DebugCommand extends Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+         $this
 diff --git a/src/Symfony/Component/Form/DataTransformerInterface.php b/src/Symfony/Component/Form/DataTransformerInterface.php
 index 85fb99d218..6cc654f681 100644
 --- a/src/Symfony/Component/Form/DataTransformerInterface.php
@@ -1088,8 +4977,1110 @@ index 85fb99d218..6cc654f681 100644
 -    public function reverseTransform(mixed $value);
 +    public function reverseTransform(mixed $value): mixed;
  }
+diff --git a/src/Symfony/Component/Form/DependencyInjection/FormPass.php b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
+index efb6d5c8bb..ab3befa3f0 100644
+--- a/src/Symfony/Component/Form/DependencyInjection/FormPass.php
++++ b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
+@@ -34,5 +34,5 @@ class FormPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('form.extension')) {
+diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php
+index 119c81107d..cf9f6f16af 100644
+--- a/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php
++++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php
+@@ -29,5 +29,5 @@ class CheckboxListMapper implements DataMapperInterface
+      * @return void
+      */
+-    public function mapDataToForms(mixed $choices, \Traversable $checkboxes)
++    public function mapDataToForms(mixed $choices, \Traversable $checkboxes): void
+     {
+         if (!\is_array($choices ??= [])) {
+@@ -44,5 +44,5 @@ class CheckboxListMapper implements DataMapperInterface
+      * @return void
+      */
+-    public function mapFormsToData(\Traversable $checkboxes, mixed &$choices)
++    public function mapFormsToData(\Traversable $checkboxes, mixed &$choices): void
+     {
+         if (!\is_array($choices)) {
+diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
+index 37fdba0c35..ed6557a3d8 100644
+--- a/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
++++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
+@@ -29,5 +29,5 @@ class RadioListMapper implements DataMapperInterface
+      * @return void
+      */
+-    public function mapDataToForms(mixed $choice, \Traversable $radios)
++    public function mapDataToForms(mixed $choice, \Traversable $radios): void
+     {
+         if (!\is_string($choice)) {
+@@ -44,5 +44,5 @@ class RadioListMapper implements DataMapperInterface
+      * @return void
+      */
+-    public function mapFormsToData(\Traversable $radios, mixed &$choice)
++    public function mapFormsToData(\Traversable $radios, mixed &$choice): void
+     {
+         if (null !== $choice && !\is_string($choice)) {
+diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
+index 7189977549..29ec9e3efc 100644
+--- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
++++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
+@@ -36,5 +36,5 @@ class FixUrlProtocolListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onSubmit(FormEvent $event)
++    public function onSubmit(FormEvent $event): void
+     {
+         $data = $event->getData();
+diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
+index 62cd0a42a7..55ab20aabc 100644
+--- a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
++++ b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
+@@ -45,5 +45,5 @@ class MergeCollectionListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onSubmit(FormEvent $event)
++    public function onSubmit(FormEvent $event): void
+     {
+         $dataToMergeInto = $event->getForm()->getNormData();
+diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+index 4c06342e54..ccb381629d 100644
+--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
++++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+@@ -54,5 +54,5 @@ class ResizeFormListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function preSetData(FormEvent $event)
++    public function preSetData(FormEvent $event): void
+     {
+         $form = $event->getForm();
+@@ -79,5 +79,5 @@ class ResizeFormListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function preSubmit(FormEvent $event)
++    public function preSubmit(FormEvent $event): void
+     {
+         $form = $event->getForm();
+@@ -112,5 +112,5 @@ class ResizeFormListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onSubmit(FormEvent $event)
++    public function onSubmit(FormEvent $event): void
+     {
+         $form = $event->getForm();
+diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php
+index c9c216b59f..82b8cfb33b 100644
+--- a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php
++++ b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php
+@@ -40,5 +40,5 @@ class TransformationFailureListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function convertTransformationFailureToFormError(FormEvent $event)
++    public function convertTransformationFailureToFormError(FormEvent $event): void
+     {
+         $form = $event->getForm();
+diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
+index 81a55f3cb0..ea669fb590 100644
+--- a/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
++++ b/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
+@@ -27,5 +27,5 @@ class TrimListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function preSubmit(FormEvent $event)
++    public function preSubmit(FormEvent $event): void
+     {
+         $data = $event->getData();
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php b/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
+index 5e2ae22481..760cb1a132 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
+@@ -33,5 +33,5 @@ abstract class BaseType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder->setDisabled($options['disabled']);
+@@ -42,5 +42,5 @@ abstract class BaseType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $name = $form->getName();
+@@ -129,5 +129,5 @@ abstract class BaseType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php b/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php
+index fa60d016eb..fdb786cc61 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php
+@@ -20,5 +20,5 @@ class BirthdayType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php b/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php
+index d710546407..5ff4dc9989 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php
+@@ -35,5 +35,5 @@ class ButtonType extends BaseType implements ButtonTypeInterface
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         parent::configureOptions($resolver);
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
+index b261f926bb..52634b0db7 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
+@@ -24,5 +24,5 @@ class CheckboxType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         // Unlike in other types, where the data is NULL by default, it
+@@ -39,5 +39,5 @@ class CheckboxType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $view->vars = array_replace($view->vars, [
+@@ -50,5 +50,5 @@ class CheckboxType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $emptyData = fn (FormInterface $form, $viewData) => $viewData;
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+index 9694ed750a..0a4187c162 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+@@ -63,5 +63,5 @@ class ChoiceType extends AbstractType
+     }
+ 
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $unknownValues = [];
+@@ -215,5 +215,5 @@ class ChoiceType extends AbstractType
+     }
+ 
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $choiceTranslationDomain = $options['choice_translation_domain'];
+@@ -267,5 +267,5 @@ class ChoiceType extends AbstractType
+     }
+ 
+-    public function finishView(FormView $view, FormInterface $form, array $options)
++    public function finishView(FormView $view, FormInterface $form, array $options): void
+     {
+         if ($options['expanded']) {
+@@ -284,5 +284,5 @@ class ChoiceType extends AbstractType
+     }
+ 
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $emptyData = function (Options $options) {
+diff --git a/src/Symfony/Component/Form/Extensi
10000
on/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
+index 1654d379a8..66ea974d31 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
+@@ -25,5 +25,5 @@ class CollectionType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         if ($options['allow_add'] && $options['prototype']) {
+@@ -55,5 +55,5 @@ class CollectionType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $view->vars = array_replace($view->vars, [
+@@ -71,5 +71,5 @@ class CollectionType extends AbstractType
+      * @return void
+      */
+-    public function finishView(FormView $view, FormInterface $form, array $options)
++    public function finishView(FormView $view, FormInterface $form, array $options): void
+     {
+         $prefixOffset = -2;
+@@ -105,5 +105,5 @@ class CollectionType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $entryOptionsNormalizer = function (Options $options, $value) {
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
+index 6e205fcbc9..f99464a9e7 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
+@@ -37,5 +37,5 @@ class ColorType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         if (!$options['html5']) {
+@@ -66,5 +66,5 @@ class ColorType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
+index b647284904..64566e5b64 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
+@@ -26,5 +26,5 @@ class CountryType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
+index 1c0ac471b8..64e6dea662 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
+@@ -26,5 +26,5 @@ class CurrencyType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
+index 0e4a7555a0..9f0cc46353 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
+@@ -47,5 +47,5 @@ class DateIntervalType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         if (!$options['with_years'] && !$options['with_months'] && !$options['with_weeks'] && !$options['with_days'] && !$options['with_hours'] && !$options['with_minutes'] && !$options['with_seconds']) {
+@@ -152,5 +152,5 @@ class DateIntervalType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $vars = [
+@@ -167,5 +167,5 @@ class DateIntervalType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
+index ae47519c53..18a007ba32 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
+@@ -51,5 +51,5 @@ class DateTimeType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $parts = ['year', 'month', 'day', 'hour'];
+@@ -204,5 +204,5 @@ class DateTimeType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $view->vars['widget'] = $options['widget'];
+@@ -228,5 +228,5 @@ class DateTimeType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+index b08a4dd834..e889f1de28 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+@@ -44,5 +44,5 @@ class DateType extends AbstractType
+     ];
+ 
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $dateFormat = \is_int($options['format']) ? $options['format'] : self::DEFAULT_FORMAT;
+@@ -178,5 +178,5 @@ class DateType extends AbstractType
+     }
+ 
+-    public function finishView(FormView $view, FormInterface $form, array $options)
++    public function finishView(FormView $view, FormInterface $form, array $options): void
+     {
+         $view->vars['widget'] = $options['widget'];
+@@ -215,5 +215,5 @@ class DateType extends AbstractType
+     }
+ 
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php b/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
+index 64d01ee67a..0cd6cd3b79 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
+@@ -20,5 +20,5 @@ class EmailType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+index 16d212ef0f..55960608f8 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+@@ -42,5 +42,5 @@ class FileType extends AbstractType
+     }
+ 
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         // Ensure that submitted data is always an uploaded file or an array of some
+@@ -83,5 +83,5 @@ class FileType extends AbstractType
+     }
+ 
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         if ($options['multiple']) {
+@@ -96,10 +96,10 @@ class FileType extends AbstractType
+     }
+ 
+-    public function finishView(FormView $view, FormInterface $form, array $options)
++    public function finishView(FormView $view, FormInterface $form, array $options): void
+     {
+         $view->vars['multipart'] = true;
+     }
+ 
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $dataClass = null;
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
+index 560d1e2cb3..b683c2ef8d 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
+@@ -42,5 +42,5 @@ class FormType extends BaseType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         parent::buildForm($builder, $options);
+@@ -73,5 +73,5 @@ class FormType extends BaseType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         parent::buildView($view, $form, $options);
+@@ -115,5 +115,5 @@ class FormType extends BaseType
+      * @return void
+      */
+-    public function finishView(FormView $view, FormInterface $form, array $options)
++    public function finishView(FormView $view, FormInterface $form, array $options): void
+     {
+         $multipart = false;
+@@ -132,5 +132,5 @@ class FormType extends BaseType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         parent::configureOptions($resolver);
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php b/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php
+index c4e5eb2ccf..495525f889 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php
+@@ -20,5 +20,5 @@ class HiddenType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
+index a287b66b7c..12dc4a1f71 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
+@@ -24,5 +24,5 @@ class IntegerType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder->addViewTransformer(new IntegerToLocalizedStringTransformer($options['grouping'], $options['rounding_mode'], !$options['grouping'] ? 'en' : null));
+@@ -32,5 +32,5 @@ class IntegerType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         if ($options['grouping']) {
+@@ -42,5 +42,5 @@ class IntegerType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
+index 0c6faafec6..8fac78ae1a 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
+@@ -27,5 +27,5 @@ class LanguageType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
+index 5086b0b0e6..662244cf46 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
+@@ -26,5 +26,5 @@ class LocaleType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
+index aea35410c1..03a13b5a52 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
+@@ -28,5 +28,5 @@ class MoneyType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         // Values used in HTML5 number inputs should be formatted as in "1234.5", ie. 'en' format without grouping,
+@@ -46,5 +46,5 @@ class MoneyType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $view->vars['money_pattern'] = self::getPattern($options['currency']);
+@@ -58,5 +58,5 @@ class MoneyType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
+index c1b5f3e627..c393619784 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
+@@ -27,5 +27,5 @@ class NumberType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder->addViewTransformer(new NumberToLocalizedStringTransformer(
+@@ -44,5 +44,5 @@ class NumberType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         if ($options['html5']) {
+@@ -56,5 +56,5 @@ class NumberType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php b/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
+index 0c247f0f30..08d7cefb9a 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
+@@ -22,5 +22,5 @@ class PasswordType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         if ($options['always_empty'] || !$form->isSubmitted()) {
+@@ -32,5 +32,5 @@ class PasswordType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php b/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
+index f71e288b3e..30fad82d81 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
+@@ -24,5 +24,5 @@ class PercentType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder->addViewTransformer(new PercentToLocalizedStringTransformer(
+@@ -37,5 +37,5 @@ class PercentType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $view->vars['symbol'] = $options['symbol'];
+@@ -49,5 +49,5 @@ class PercentType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php b/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php
+index 4b97b0ae21..1889bb0e1e 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php
+@@ -20,5 +20,5 @@ class RadioType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php b/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php
+index 2e33a977d9..ed7e88b5af 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php
+@@ -20,5 +20,5 @@ class RangeType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php b/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
+index 4176f93e52..8f133ee41d 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
+@@ -22,5 +22,5 @@ class RepeatedType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         // Overwrite required option for child fields
+@@ -48,5 +48,5 @@ class RepeatedType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php b/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php
+index 0dca6e42a8..aa51e40efa 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php
+@@ -20,5 +20,5 @@ class SearchType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/SubmitType.php b/src/Symfony/Component/Form/Extension/Core/Type/SubmitType.php
+index 3f1b5f95c9..d586bb1463 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/SubmitType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/SubmitType.php
+@@ -28,5 +28,5 @@ class SubmitType extends AbstractType implements SubmitButtonTypeInterface
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $view->vars['clicked'] = $form->isClicked();
+@@ -40,5 +40,5 @@ class SubmitType extends AbstractType implements SubmitButtonTypeInterface
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefault('validate', true);
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TelType.php b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php
+index 05fdd41626..b6565675ee 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/TelType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php
+@@ -20,5 +20,5 @@ class TelType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TextType.php b/src/Symfony/Component/Form/Extension/Core/Type/TextType.php
+index 479ce054d8..e909f2fa3b 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/TextType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/TextType.php
+@@ -22,5 +22,5 @@ class TextType extends AbstractType implements DataTransformerInterface
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         // When empty_data is explicitly set to an empty string,
+@@ -37,5 +37,5 @@ class TextType extends AbstractType implements DataTransformerInterface
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php b/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php
+index 40e7580d80..18c58e30c0 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php
+@@ -21,5 +21,5 @@ class TextareaType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $view->vars['pattern'] = null;
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+index a22f2122cd..7d5ff334a3 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+@@ -38,5 +38,5 @@ class TimeType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $parts = ['hour'];
+@@ -214,5 +214,5 @@ class TimeType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $view->vars = array_replace($view->vars, [
+@@ -241,5 +241,5 @@ class TimeType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
+index 0827fcfc5a..b3b56c1ce2 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
+@@ -29,5 +29,5 @@ class TimezoneType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         if ('datetimezone' === $options['input']) {
+@@ -41,5 +41,5 @@ class TimezoneType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php
+index 029ad4d439..3814f6ada0 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php
+@@ -32,5 +32,5 @@ class TransformationFailureExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         if (!isset($options['constraints'])) {
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UlidType.php b/src/Symfony/Component/Form/Extension/Core/Type/UlidType.php
+index ea3da07c02..78b57ad153 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/UlidType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/UlidType.php
+@@ -25,5 +25,5 @@ class UlidType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder
+@@ -35,5 +35,5 @@ class UlidType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
+index 385c7a25fa..4a8fcc71f2 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
+@@ -24,5 +24,5 @@ class UrlType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         if (null !== $options['default_protocol']) {
+@@ -34,5 +34,5 @@ class UrlType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         if ($options['default_protocol']) {
+@@ -45,5 +45,5 @@ class UrlType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UuidType.php b/src/Symfony/Component/Form/Extension/Core/Type/UuidType.php
+index 7c0f65b9a0..d79b4d30e6 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/UuidType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/UuidType.php
+@@ -25,5 +25,5 @@ class UuidType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder
+@@ -35,5 +35,5 @@ class UuidType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
+index f0d8f96467..3fa585b583 100644
+--- a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
++++ b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
+@@ -32,5 +32,5 @@ class WeekType extends AbstractType
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         if ('string' === $options['input']) {
+@@ -87,5 +87,5 @@ class WeekType extends AbstractType
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $view->vars['widget'] = $options['widget'];
+@@ -99,5 +99,5 @@ class WeekType extends AbstractType
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+diff --git a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
+index eca450a165..72330772b9 100644
+--- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
++++ b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
+@@ -55,5 +55,5 @@ class CsrfValidationListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function preSubmit(FormEvent $event)
++    public function preSubmit(FormEvent $event): void
+     {
+         $form = $event->getForm();
+diff --git a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
+index 8c3d45dec0..ff7934deed 100644
+--- a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
++++ b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
+@@ -51,5 +51,5 @@ class FormTypeCsrfExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         if (!$options['csrf_protection']) {
+@@ -75,5 +75,5 @@ class FormTypeCsrfExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function finishView(FormView $view, FormInterface $form, array $options)
++    public function finishView(FormView $view, FormInterface $form, array $options): void
+     {
+         if ($options['csrf_protection'] && !$view->parent && $options['compound']) {
+@@ -94,5 +94,5 @@ class FormTypeCsrfExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php
+index 41a52e091e..fce936b740 100644
+--- a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php
++++ b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php
+@@ -47,5 +47,5 @@ class DataCollectorListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function postSetData(FormEvent $event)
++    public function postSetData(FormEvent $event): void
+     {
+         if ($event->getForm()->isRoot()) {
+@@ -63,5 +63,5 @@ class DataCollectorListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function postSubmit(FormEvent $event)
++    public function postSubmit(FormEvent $event): void
+     {
+         if ($event->getForm()->isRoot()) {
+diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
+index 6c8cf3ee24..0d8fba357e 100644
+--- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
++++ b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
+@@ -75,5 +75,5 @@ class ResolvedTypeDataCollectorProxy implements ResolvedFormTypeInterface
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $this->proxiedType->buildForm($builder, $options);
+@@ -83,5 +83,5 @@ class ResolvedTypeDataCollectorProxy implements ResolvedFormTypeInterface
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $this->proxiedType->buildView($view, $form, $options);
+@@ -91,5 +91,5 @@ class ResolvedTypeDataCollectorProxy implements ResolvedFormTypeInterface
+      * @return void
+      */
+-    public function finishView(FormView $view, FormInterface $form, array $options)
++    public function finishView(FormView $view, FormInterface $form, array $options): void
+     {
+         $this->proxiedType->finishView($view, $form, $options);
+diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php b/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php
+index f1e3c903ec..20721f3040 100644
+--- a/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php
++++ b/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php
+@@ -36,5 +36,5 @@ class DataCollectorTypeExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder->addEventSubscriber($this->listener);
+diff --git a/src/Symfony/Component/Form/Extension/HtmlSanitizer/Type/TextTypeHtmlSanitizerExtension.php b/src/Symfony/Component/Form/Extension/HtmlSanitizer/Type/TextTypeHtmlSanitizerExtension.php
+index 8e92ea74a5..633d1985db 100644
+--- a/src/Symfony/Component/Form/Extension/HtmlSanitizer/Type/TextTypeHtmlSanitizerExtension.php
++++ b/src/Symfony/Component/Form/Extension/HtmlSanitizer/Type/TextTypeHtmlSanitizerExtension.php
+@@ -39,5 +39,5 @@ class TextTypeHtmlSanitizerExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver
+@@ -51,5 +51,5 @@ class TextTypeHtmlSanitizerExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         if (!$options['sanitize_html']) {
+diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
+index b4e835c95a..9cbcc28e31 100644
+--- a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
++++ b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
+@@ -39,5 +39,5 @@ class HttpFoundationRequestHandler implements RequestHandlerInterface
+      * @return void
+      */
+-    public function handleRequest(FormInterface $form, mixed $request = null)
++    public function handleRequest(FormInterface $form, mixed $request = null): void
+     {
+         if (!$request instanceof Request) {
+diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php b/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php
+index cc3e5e1207..f9c85b9a0a 100644
+--- a/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php
++++ b/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php
+@@ -33,5 +33,5 @@ class FormTypeHttpFoundationExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder->setRequestHandler($this->requestHandler);
+diff --git a/src/Symfony/Component/Form/Extension/PasswordHasher/EventListener/PasswordHasherListener.php b/src/Symfony/Component/Form/Extension/PasswordHasher/EventListener/PasswordHasherListener.php
+index f905a7e034..16245f0b6e 100644
+--- a/src/Symfony/Component/Form/Extension/PasswordHasher/EventListener/PasswordHasherListener.php
++++ b/src/Symfony/Component/Form/Extension/PasswordHasher/EventListener/PasswordHasherListener.php
+@@ -39,5 +39,5 @@ class PasswordHasherListener
+      * @return void
+      */
+-    public function registerPassword(FormEvent $event)
++    public function registerPassword(FormEvent $event): void
+     {
+         $this->assertNotMapped($event->getForm());
+@@ -53,5 +53,5 @@ class PasswordHasherListener
+      * @return void
+      */
+-    public function hashPasswords(FormEvent $event)
++    public function hashPasswords(FormEvent $event): void
+     {
+         $form = $event->getForm();
+diff --git a/src/Symfony/Component/Form/Extension/PasswordHasher/Type/FormTypePasswordHasherExtension.php b/src/Symfony/Component/Form/Extension/PasswordHasher/Type/FormTypePasswordHasherExtension.php
+index 5308992863..e799b6ba31 100644
+--- a/src/Symfony/Component/Form/Extension/PasswordHasher/Type/FormTypePasswordHasherExtension.php
++++ b/src/Symfony/Component/Form/Extension/PasswordHasher/Type/FormTypePasswordHasherExtension.php
+@@ -31,5 +31,5 @@ class FormTypePasswordHasherExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder->addEventListener(FormEvents::POST_SUBMIT, [$this->passwordHasherListener, 'hashPasswords']);
+diff --git a/src/Symfony/Component/Form/Extension/PasswordHasher/Type/PasswordTypePasswordHasherExtension.php b/src/Symfony/Component/Form/Extension/PasswordHasher/Type/PasswordTypePasswordHasherExtension.php
+index 6f022fb1bf..aede2bbb52 100644
+--- a/src/Symfony/Component/Form/Extension/PasswordHasher/Type/PasswordTypePasswordHasherExtension.php
++++ b/src/Symfony/Component/Form/Extension/PasswordHasher/Type/PasswordTypePasswordHasherExtension.php
+@@ -33,5 +33,5 @@ class PasswordTypePasswordHasherExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         if ($options['hash_property_path']) {
+@@ -43,5 +43,5 @@ class PasswordTypePasswordHasherExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
+index d664e9b500..fbff1c16bf 100644
+--- a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
++++ b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
+@@ -33,5 +33,5 @@ class FormValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $form, Constraint $formConstraint)
++    public function validate(mixed $form, Constraint $formConstraint): void
+     {
+         if (!$formConstraint instanceof Form) {
+diff --git a/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php b/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
+index e2d4357622..ed84c8b4cf 100644
+--- a/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
++++ b/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
+@@ -41,5 +41,5 @@ class ValidationListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function validateForm(FormEvent $event)
++    public function validateForm(FormEvent $event): void
+     {
+         $form = $event->getForm();
+diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
+index 2abc466fe3..3534aa7744 100644
+--- a/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
++++ b/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
+@@ -28,5 +28,5 @@ abstract class BaseValidatorExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         // Make sure that validation groups end up as null, closure or array
+diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
+index 4602918c3a..5edcb58ec6 100644
+--- a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
++++ b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
+@@ -41,5 +41,5 @@ class FormTypeValidatorExtension extends BaseValidatorExtension
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder->addEventSubscriber(new ValidationListener($this->validator, $this->violationMapper));
+@@ -49,5 +49,5 @@ class FormTypeValidatorExtension extends BaseValidatorExtension
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         parent::configureOptions($resolver);
+diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
+index 2e2c21426a..b11c6159ad 100644
+--- a/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
++++ b/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
+@@ -25,5 +25,5 @@ class RepeatedTypeValidatorExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         // Map errors to the first field
+diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
+index 70034135bf..246957f8f7 100644
+--- a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
++++ b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
+@@ -36,5 +36,5 @@ class UploadValidatorExtension extends AbstractTypeExtension
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $translator = $this->translator;
+diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
+index 2f2ccefd30..689a6d5cab 100644
+--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
++++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
+@@ -42,5 +42,5 @@ class ViolationMapper implements ViolationMapperInterface
+      * @return void
+      */
+-    public function mapViolation(ConstraintViolation $violation, FormInterface $form, bool $allowNonSynchronized = false)
++    public function mapViolation(ConstraintViolation $violation, FormInterface $form, bool $allowNonSynchronized = false): void
+     {
+         $this->allowNonSynchronized = $allowNonSynchronized;
 diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
-index 0220399758..0839a42daf 100644
+index 9fed3d1a0a..5cd4eb5f16 100644
 --- a/src/Symfony/Component/Form/FormConfigBuilder.php
 +++ b/src/Symfony/Component/Form/FormConfigBuilder.php
 @@ -537,5 +537,5 @@ class FormConfigBuilder implements FormConfigBuilderInterface
@@ -1110,6 +6101,39 @@ index 09b9149801..6b22b9f9e8 100644
 +    public function setFormFactory(FormFactoryInterface $formFactory): static;
  
      /**
+diff --git a/src/Symfony/Component/Form/FormError.php b/src/Symfony/Component/Form/FormError.php
+index 5b19d6ea5b..2455a91076 100644
+--- a/src/Symfony/Component/Form/FormError.php
++++ b/src/Symfony/Component/Form/FormError.php
+@@ -104,5 +104,5 @@ class FormError
+      * @return void
+      */
+-    public function setOrigin(FormInterface $origin)
++    public function setOrigin(FormInterface $origin): void
+     {
+         if (null !== $this->origin) {
+diff --git a/src/Symfony/Component/Form/FormEvent.php b/src/Symfony/Component/Form/FormEvent.php
+index 1e6aa34d63..3f05ff971a 100644
+--- a/src/Symfony/Component/Form/FormEvent.php
++++ b/src/Symfony/Component/Form/FormEvent.php
+@@ -49,5 +49,5 @@ class FormEvent extends Event
+      * @return void
+      */
+-    public function setData(mixed $data)
++    public function setData(mixed $data): void
+     {
+         $this->data = $data;
+diff --git a/src/Symfony/Component/Form/FormRenderer.php b/src/Symfony/Component/Form/FormRenderer.php
+index 18dec4946b..9272277b5c 100644
+--- a/src/Symfony/Component/Form/FormRenderer.php
++++ b/src/Symfony/Component/Form/FormRenderer.php
+@@ -46,5 +46,5 @@ class FormRenderer implements FormRendererInterface
+      * @return void
+      */
+-    public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true)
++    public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true): void
+     {
+         $this->engine->setTheme($view, $themes, $useDefaultThemes);
 diff --git a/src/Symfony/Component/Form/FormRendererEngineInterface.php b/src/Symfony/Component/Form/FormRendererEngineInterface.php
 index aa249270a0..3c9d04ff9a 100644
 --- a/src/Symfony/Component/Form/FormRendererEngineInterface.php
@@ -1168,6 +6192,260 @@ index 2b9066a511..1c9e9f5a26 100644
 -    public function getParent();
 +    public function getParent(): ?string;
  }
+diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php
+index e04fa13b09..231b75810e 100644
+--- a/src/Symfony/Component/Form/FormView.php
++++ b/src/Symfony/Component/Form/FormView.php
+@@ -96,5 +96,5 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function setMethodRendered()
++    public function setMethodRendered(): void
+     {
+         $this->methodRendered = true;
+diff --git a/src/Symfony/Component/Form/NativeRequestHandler.php b/src/Symfony/Component/Form/NativeRequestHandler.php
+index bf240de37e..677c92bc1b 100644
+--- a/src/Symfony/Component/Form/NativeRequestHandler.php
++++ b/src/Symfony/Component/Form/NativeRequestHandler.php
+@@ -45,5 +45,5 @@ class NativeRequestHandler implements RequestHandlerInterface
+      * @return void
+      */
+-    public function handleRequest(FormInterface $form, mixed $request = null)
++    public function handleRequest(FormInterface $form, mixed $request = null): void
+     {
+         if (null !== $request) {
+diff --git a/src/Symfony/Component/Form/ResolvedFormType.php b/src/Symfony/Component/Form/ResolvedFormType.php
+index f05db1533b..0e67c63c66 100644
+--- a/src/Symfony/Component/Form/ResolvedFormType.php
++++ b/src/Symfony/Component/Form/ResolvedFormType.php
+@@ -96,5 +96,5 @@ class ResolvedFormType implements ResolvedFormTypeInterface
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $this->parent?->buildForm($builder, $options);
+@@ -110,5 +110,5 @@ class ResolvedFormType implements ResolvedFormTypeInterface
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options)
++    public function buildView(FormView $view, FormInterface $form, array $options): void
+     {
+         $this->parent?->buildView($view, $form, $options);
+@@ -124,5 +124,5 @@ class ResolvedFormType implements ResolvedFormTypeInterface
+      * @return void
+      */
+-    public function finishView(FormView $view, FormInterface $form, array $options)
++    public function finishView(FormView $view, FormInterface $form, array $options): void
+     {
+         $this->parent?->finishView($view, $form, $options);
+diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
+index 31ab27884b..2f4d043122 100644
+--- a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
++++ b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
+@@ -285,5 +285,5 @@ TXT
+ class FooType extends AbstractType
+ {
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setRequired('foo');
+diff --git a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
+index 3fea781b6c..d5fb003766 100644
+--- a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
++++ b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
+@@ -160,5 +160,5 @@ abstract class AbstractDescriptorTestCase extends TestCase
+ class FooType extends AbstractType
+ {
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setRequired('foo');
+diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
+index b8e2cf7bca..f20e51c340 100644
+--- a/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
++++ b/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
+@@ -24,5 +24,5 @@ use Symfony\Component\Translation\IdentityTranslator;
+ class FormTypeCsrfExtensionTest_ChildType extends AbstractType
+ {
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         // The form needs a child in order to trigger CSRF protection by
+diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
+index f712805e00..f002fec9ed 100644
+--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
++++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
+@@ -495,5 +495,5 @@ class Foo
+ class FooType extends AbstractType
+ {
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder
+@@ -505,5 +505,5 @@ class FooType extends AbstractType
+     }
+ 
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefault('data_class', Foo::class);
+@@ -526,5 +526,5 @@ class Review
+ class ReviewType extends AbstractType
+ {
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder
+@@ -539,5 +539,5 @@ class ReviewType extends AbstractType
+     }
+ 
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefault('data_class', Review::class);
+@@ -557,5 +557,5 @@ class Customer
+ class CustomerType extends AbstractType
+ {
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder
+@@ -564,5 +564,5 @@ class CustomerType extends AbstractType
+     }
+ 
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefault('data_class', Customer::class);
+diff --git a/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php b/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php
+index 556166f554..3e0bb40c2b 100644
+--- a/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php
++++ b/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php
+@@ -10,5 +10,5 @@ use Symfony\Component\Form\FormEvents;
+ class AlternatingRowType extends AbstractType
+ {
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+diff --git a/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php b/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php
+index 84c988984f..a55dbfeacc 100644
+--- a/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php
++++ b/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php
+@@ -9,5 +9,5 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
+ class AuthorType extends AbstractType
+ {
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder
+@@ -17,5 +17,5 @@ class AuthorType extends AbstractType
+     }
+ 
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Form/Tests/Fixtures/BlockPrefixedFooTextType.php b/src/Symfony/Component/Form/Tests/Fixtures/BlockPrefixedFooTextType.php
+index 3fda7a55dd..fa145a49c2 100644
+--- a/src/Symfony/Component/Form/Tests/Fixtures/BlockPrefixedFooTextType.php
++++ b/src/Symfony/Component/Form/Tests/Fixtures/BlockPrefixedFooTextType.php
+@@ -17,5 +17,5 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
+ class BlockPrefixedFooTextType extends AbstractType
+ {
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefault('block_prefix', 'foo');
+diff --git a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
+index 7399dfe36b..38b22b87e5 100644
+--- a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
++++ b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
+@@ -21,5 +21,5 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
+ class ChoiceSubType extends AbstractType
+ {
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults(['expanded' => true]);
+diff --git a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php
+index 1751531d19..3549763f16 100644
+--- a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php
++++ b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php
+@@ -19,5 +19,5 @@ class ChoiceTypeExtension extends AbstractTypeExtension
+     public static $extendedType;
+ 
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefault('choices', [
+diff --git a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php
+index 70c710e922..abd8edd6b8 100644
+--- a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php
++++ b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php
+@@ -17,5 +17,5 @@ use Symfony\Component\Form\FormBuilderInterface;
+ class FooTypeBarExtension extends AbstractTypeExtension
+ {
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder->setAttribute('bar', 'x');
+diff --git a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBazExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBazExtension.php
+index a11f158844..9720439eb1 100644
+--- a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBazExtension.php
++++ b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBazExtension.php
+@@ -17,5 +17,5 @@ use Symfony\Component\Form\FormBuilderInterface;
+ class FooTypeBazExtension extends AbstractTypeExtension
+ {
+-    public function buildForm(FormBuilderInterface $builder, array $options)
++    public function buildForm(FormBuilderInterface $builder, array $options): void
+     {
+         $builder->setAttribute('baz', 'x');
+diff --git a/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
+index ccd5b3f489..0c7e294144 100644
+--- a/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
++++ b/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
+@@ -20,5 +20,5 @@ class LazyChoiceTypeExtension extends AbstractTypeExtension
+     public static $extendedType;
+ 
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefault('choice_loader', ChoiceList::lazy($this, fn () => [
+diff --git a/src/Symfony/Component/Form/Tests/Fixtures/NotMappedType.php b/src/Symfony/Component/Form/Tests/Fixtures/NotMappedType.php
+index 14c340b891..3d55122e79 100644
+--- a/src/Symfony/Component/Form/Tests/Fixtures/NotMappedType.php
++++ b/src/Symfony/Component/Form/Tests/Fixtures/NotMappedType.php
+@@ -17,5 +17,5 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
+ class NotMappedType extends AbstractType
+ {
+-    public function configureOptions(OptionsResolver $resolver)
++    public function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefault('mapped', false);
+diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php
+index 05a8e6b4c6..232bed6fac 100644
+--- a/src/Symfony/Component/HttpClient/CachingHttpClient.php
++++ b/src/Symfony/Component/HttpClient/CachingHttpClient.php
+@@ -139,5 +139,5 @@ class CachingHttpClient implements HttpClientInterface, ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         if ($this->client instanceof ResetInterface) {
+diff --git a/src/Symfony/Component/HttpClient/DecoratorTrait.php b/src/Symfony/Component/HttpClient/DecoratorTrait.php
+index 472437e465..1dfe39146b 100644
+--- a/src/Symfony/Component/HttpClient/DecoratorTrait.php
++++ b/src/Symfony/Component/HttpClient/DecoratorTrait.php
+@@ -52,5 +52,5 @@ trait DecoratorTrait
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         if ($this->client instanceof ResetInterface) {
 diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
 index 38c544b4b1..9945f480d2 100644
 --- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -1179,19 +6457,328 @@ index 38c544b4b1..9945f480d2 100644
 +    private static function removeDotSegments(string $path): string
      {
          $result = '';
+diff --git a/src/Symfony/Component/HttpClient/MockHttpClient.php b/src/Symfony/Component/HttpClient/MockHttpClient.php
+index 9b8305e418..9ab577f6e8 100644
+--- a/src/Symfony/Component/HttpClient/MockHttpClient.php
++++ b/src/Symfony/Component/HttpClient/MockHttpClient.php
+@@ -110,5 +110,5 @@ class MockHttpClient implements HttpClientInterface, ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->requestsCount = 0;
+diff --git a/src/Symfony/Component/HttpClient/ScopingHttpClient.php b/src/Symfony/Component/HttpClient/ScopingHttpClient.php
+index a87171d2ca..cec8a6f027 100644
+--- a/src/Symfony/Component/HttpClient/ScopingHttpClient.php
++++ b/src/Symfony/Component/HttpClient/ScopingHttpClient.php
+@@ -97,5 +97,5 @@ class ScopingHttpClient implements HttpClientInterface, ResetInterface, LoggerAw
+      * @return v
10000
oid
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         if ($this->client instanceof ResetInterface) {
+diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+index 78958f1ae0..a9fe288e4b 100644
+--- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
++++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+@@ -355,5 +355,5 @@ class BinaryFileResponse extends Response
+      * @return void
+      */
+-    public static function trustXSendfileTypeHeader()
++    public static function trustXSendfileTypeHeader(): void
+     {
+         self::$trustXSendfileTypeHeader = true;
+diff --git a/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php b/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
+index b09c167cff..93d1a8cac5 100644
+--- a/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
++++ b/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
+@@ -33,5 +33,5 @@ class ExpressionRequestMatcher extends RequestMatcher
+      * @return void
+      */
+-    public function setExpression(ExpressionLanguage $language, Expression|string $expression)
++    public function setExpression(ExpressionLanguage $language, Expression|string $expression): void
+     {
+         $this->language = $language;
+diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php
+index b74a02e2e1..51b4f7f1c3 100644
+--- a/src/Symfony/Component/HttpFoundation/FileBag.php
++++ b/src/Symfony/Component/HttpFoundation/FileBag.php
+@@ -35,5 +35,5 @@ class FileBag extends ParameterBag
+      * @return void
+      */
+-    public function replace(array $files = [])
++    public function replace(array $files = []): void
+     {
+         $this->parameters = [];
+@@ -44,5 +44,5 @@ class FileBag extends ParameterBag
+      * @return void
+      */
+-    public function set(string $key, mixed $value)
++    public function set(string $key, mixed $value): void
+     {
+         if (!\is_array($value) && !$value instanceof UploadedFile) {
+@@ -56,5 +56,5 @@ class FileBag extends ParameterBag
+      * @return void
+      */
+-    public function add(array $files = [])
++    public function add(array $files = []): void
+     {
+         foreach ($files as $key => $file) {
 diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
-index b7be1b3827..c5f6098eea 100644
+index 081f26a2d0..7ed43e2c07 100644
 --- a/src/Symfony/Component/HttpFoundation/HeaderBag.php
 +++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php
-@@ -258,5 +258,5 @@ class HeaderBag implements \IteratorAggregate, \Countable
+@@ -90,5 +90,5 @@ class HeaderBag implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function replace(array $headers = [])
++    public function replace(array $headers = []): void
+     {
+         $this->headers = [];
+@@ -101,5 +101,5 @@ class HeaderBag implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function add(array $headers)
++    public function add(array $headers): void
+     {
+         foreach ($headers as $key => $values) {
+@@ -134,5 +134,5 @@ class HeaderBag implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function set(string $key, string|array|null $values, bool $replace = true)
++    public function set(string $key, string|array|null $values, bool $replace = true): void
+     {
+         $key = strtr($key, self::UPPER, self::LOWER);
+@@ -180,5 +180,5 @@ class HeaderBag implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function remove(string $key)
++    public function remove(string $key): void
+     {
+         $key = strtr($key, self::UPPER, self::LOWER);
+@@ -214,5 +214,5 @@ class HeaderBag implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function addCacheControlDirective(string $key, bool|string $value = true)
++    public function addCacheControlDirective(string $key, bool|string $value = true): void
+     {
+         $this->cacheControl[$key] = $value;
+@@ -242,5 +242,5 @@ class HeaderBag implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function removeCacheControlDirective(string $key)
++    public function removeCacheControlDirective(string $key): void
+     {
+         unset($this->cacheControl[$key]);
+@@ -270,5 +270,5 @@ class HeaderBag implements \IteratorAggregate, \Countable
       * @return string
       */
 -    protected function getCacheControlHeader()
 +    protected function getCacheControlHeader(): string
      {
          ksort($this->cacheControl);
+diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
+index 44d8d96d28..43124c0ea0 100644
+--- a/src/Symfony/Component/HttpFoundation/ParameterBag.php
++++ b/src/Symfony/Component/HttpFoundation/ParameterBag.php
+@@ -64,5 +64,5 @@ class ParameterBag implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function replace(array $parameters = [])
++    public function replace(array $parameters = []): void
+     {
+         $this->parameters = $parameters;
+@@ -74,5 +74,5 @@ class ParameterBag implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function add(array $parameters = [])
++    public function add(array $parameters = []): void
+     {
+         $this->parameters = array_replace($this->parameters, $parameters);
+@@ -87,5 +87,5 @@ class ParameterBag implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function set(string $key, mixed $value)
++    public function set(string $key, mixed $value): void
+     {
+         $this->parameters[$key] = $value;
+@@ -105,5 +105,5 @@ class ParameterBag implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function remove(string $key)
++    public function remove(string $key): void
+     {
+         unset($this->parameters[$key]);
+diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
+index fdb701d00b..60b3b60b81 100644
+--- a/src/Symfony/Component/HttpFoundation/Request.php
++++ b/src/Symfony/Component/HttpFoundation/Request.php
+@@ -267,5 +267,5 @@ class Request
+      * @return void
+      */
+-    public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null)
++    public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null): void
+     {
+         $this->request = new InputBag($request);
+@@ -423,5 +423,5 @@ class Request
+      * @return void
+      */
+-    public static function setFactory(?callable $callable)
++    public static function setFactory(?callable $callable): void
+     {
+         self::$requestFactory = $callable;
+@@ -529,5 +529,5 @@ class Request
+      * @return void
+      */
+-    public function overrideGlobals()
++    public function overrideGlobals(): void
+     {
+         $this->server->set('QUERY_STRING', static::normalizeQueryString(http_build_query($this->query->all(), '', '&')));
+@@ -571,5 +571,5 @@ class Request
+      * @return void
+      */
+-    public static function setTrustedProxies(array $proxies, int $trustedHeaderSet)
++    public static function setTrustedProxies(array $proxies, int $trustedHeaderSet): void
+     {
+         self::$trustedProxies = array_reduce($proxies, function ($proxies, $proxy) {
+@@ -614,5 +614,5 @@ class Request
+      * @return void
+      */
+-    public static function setTrustedHosts(array $hostPatterns)
++    public static function setTrustedHosts(array $hostPatterns): void
+     {
+         self::$trustedHostPatterns = array_map(fn ($hostPattern) => sprintf('{%s}i', $hostPattern), $hostPatterns);
+@@ -662,5 +662,5 @@ class Request
+      * @return void
+      */
+-    public static function enableHttpMethodParameterOverride()
++    public static function enableHttpMethodParameterOverride(): void
+     {
+         self::$httpMethodParameterOverride = true;
+@@ -749,5 +749,5 @@ class Request
+      * @return void
+      */
+-    public function setSession(SessionInterface $session)
++    public function setSession(SessionInterface $session): void
+     {
+         $this->session = $session;
+@@ -1172,5 +1172,5 @@ class Request
+      * @return void
+      */
+-    public function setMethod(string $method)
++    public function setMethod(string $method): void
+     {
+         $this->method = null;
+@@ -1295,5 +1295,5 @@ class Request
+      * @return void
+      */
+-    public function setFormat(?string $format, string|array $mimeTypes)
++    public function setFormat(?string $format, string|array $mimeTypes): void
+     {
+         if (null === static::$formats) {
+@@ -1327,5 +1327,5 @@ class Request
+      * @return void
+      */
+-    public function setRequestFormat(?string $format)
++    public function setRequestFormat(?string $format): void
+     {
+         $this->format = $format;
+@@ -1359,5 +1359,5 @@ class Request
+      * @return void
+      */
+-    public function setDefaultLocale(string $locale)
++    public function setDefaultLocale(string $locale): void
+     {
+         $this->defaultLocale = $locale;
+@@ -1381,5 +1381,5 @@ class Request
+      * @return void
+      */
+-    public function setLocale(string $locale)
++    public function setLocale(string $locale): void
+     {
+         $this->setPhpDefaultLocale($this->locale = $locale);
+@@ -1887,5 +1887,5 @@ class Request
+      * @return void
+      */
+-    protected static function initializeFormats()
++    protected static function initializeFormats(): void
+     {
+         static::$formats = [
+diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
+index 8c5f1d8134..fdd3a666e9 100644
+--- a/src/Symfony/Component/HttpFoundation/RequestMatcher.php
++++ b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
+@@ -73,5 +73,5 @@ class RequestMatcher implements RequestMatcherInterface
+      * @return void
+      */
+-    public function matchScheme(string|array|null $scheme)
++    public function matchScheme(string|array|null $scheme): void
+     {
+         $this->schemes = null !== $scheme ? array_map('strtolower', (array) $scheme) : [];
+@@ -83,5 +83,5 @@ class RequestMatcher implements RequestMatcherInterface
+      * @return void
+      */
+-    public function matchHost(?string $regexp)
++    public function matchHost(?string $regexp): void
+     {
+         $this->host = $regexp;
+@@ -95,5 +95,5 @@ class RequestMatcher implements RequestMatcherInterface
+      * @return void
+      */
+-    public function matchPort(?int $port)
++    public function matchPort(?int $port): void
+     {
+         $this->port = $port;
+@@ -105,5 +105,5 @@ class RequestMatcher implements RequestMatcherInterface
+      * @return void
+      */
+-    public function matchPath(?string $regexp)
++    public function matchPath(?string $regexp): void
+     {
+         $this->path = $regexp;
+@@ -117,5 +117,5 @@ class RequestMatcher implements RequestMatcherInterface
+      * @return void
+      */
+-    public function matchIp(string $ip)
++    public function matchIp(string $ip): void
+     {
+         $this->matchIps($ip);
+@@ -129,5 +129,5 @@ class RequestMatcher implements RequestMatcherInterface
+      * @return void
+      */
+-    public function matchIps(string|array|null $ips)
++    public function matchIps(string|array|null $ips): void
+     {
+         $ips = null !== $ips ? (array) $ips : [];
+@@ -143,5 +143,5 @@ class RequestMatcher implements RequestMatcherInterface
+      * @return void
+      */
+-    public function matchMethod(string|array|null $method)
++    public function matchMethod(string|array|null $method): void
+     {
+         $this->methods = null !== $method ? array_map('strtoupper', (array) $method) : [];
+@@ -153,5 +153,5 @@ class RequestMatcher implements RequestMatcherInterface
+      * @return void
+      */
+-    public function matchAttribute(string $key, string $regexp)
++    public function matchAttribute(string $key, string $regexp): void
+     {
+         $this->attributes[$key] = $regexp;
+diff --git a/src/Symfony/Component/HttpFoundation/RequestStack.php b/src/Symfony/Component/HttpFoundation/RequestStack.php
+index 5aa8ba7934..80742b0764 100644
+--- a/src/Symfony/Component/HttpFoundation/RequestStack.php
++++ b/src/Symfony/Component/HttpFoundation/RequestStack.php
+@@ -35,5 +35,5 @@ class RequestStack
+      * @return void
+      */
+-    public function push(Request $request)
++    public function push(Request $request): void
+     {
+         $this->requests[] = $request;
 diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
-index 203a8b278d..e26bb42b22 100644
+index 10450ca5e2..3e034007fb 100644
 --- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
 +++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
 @@ -59,5 +59,5 @@ class ResponseHeaderBag extends HeaderBag
@@ -1200,14 +6787,476 @@ index 203a8b278d..e26bb42b22 100644
 -    public function allPreserveCaseWithoutCookies()
 +    public function allPreserveCaseWithoutCookies(): array
      {
-         $headers = $this->allPreserveCase();
-@@ -231,5 +231,5 @@ class ResponseHeaderBag extends HeaderBag
-      * @return string
+         $headers = $this->allPreserveCase();
+@@ -72,5 +72,5 @@ class ResponseHeaderBag extends HeaderBag
+      * @return void
+      */
+-    public function replace(array $headers = [])
++    public function replace(array $headers = []): void
+     {
+         $this->headerNames = [];
+@@ -107,5 +107,5 @@ class ResponseHeaderBag extends HeaderBag
+      * @return void
+      */
+-    public function set(string $key, string|array|null $values, bool $replace = true)
++    public function set(string $key, string|array|null $values, bool $replace = true): void
+     {
+         $uniqueKey = strtr($key, self::UPPER, self::LOWER);
+@@ -138,5 +138,5 @@ class ResponseHeaderBag extends HeaderBag
+      * @return void
+      */
+-    public function remove(string $key)
++    public function remove(string $key): void
+     {
+         $uniqueKey = strtr($key, self::UPPER, self::LOWER);
+@@ -173,5 +173,5 @@ class ResponseHeaderBag extends HeaderBag
+      * @return void
+      */
+-    public function setCookie(Cookie $cookie)
++    public function setCookie(Cookie $cookie): void
+     {
+         $this->cookies[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
+@@ -184,5 +184,5 @@ class ResponseHeaderBag extends HeaderBag
+      * @return void
+      */
+-    public function removeCookie(string $name, ?string $path = '/', string $domain = null)
++    public function removeCookie(string $name, ?string $path = '/', string $domain = null): void
+     {
+         $path ??= '/';
+@@ -237,5 +237,5 @@ class ResponseHeaderBag extends HeaderBag
+      * @return void
+      */
+-    public function clearCookie(string $name, ?string $path = '/', string $domain = null, bool $secure = false, bool $httpOnly = true, string $sameSite = null)
++    public function clearCookie(string $name, ?string $path = '/', string $domain = null, bool $secure = false, bool $httpOnly = true, string $sameSite = null): void
+     {
+         $this->setCookie(new Cookie($name, null, 1, $path, $domain, $secure, $httpOnly, false, $sameSite));
+@@ -247,5 +247,5 @@ class ResponseHeaderBag extends HeaderBag
+      * @return string
+      */
+-    public function makeDisposition(string $disposition, string $filename, string $filenameFallback = '')
++    public function makeDisposition(string $disposition, string $filename, string $filenameFallback = ''): string
+     {
+         return HeaderUtils::makeDisposition($disposition, $filename, $filenameFallback);
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
+index ad5a6590a5..cf296c1d6d 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
+@@ -40,5 +40,5 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
+      * @return void
+      */
+-    public function setName(string $name)
++    public function setName(string $name): void
+     {
+         $this->name = $name;
+@@ -48,5 +48,5 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
+      * @return void
+      */
+-    public function initialize(array &$attributes)
++    public function initialize(array &$attributes): void
+     {
+         $this->attributes = &$attributes;
+@@ -71,5 +71,5 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
+      * @return void
+      */
+-    public function set(string $name, mixed $value)
++    public function set(string $name, mixed $value): void
+     {
+         $this->attributes[$name] = $value;
+@@ -84,5 +84,5 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
+      * @return void
+      */
+-    public function replace(array $attributes)
++    public function replace(array $attributes): void
+     {
+         $this->attributes = [];
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
+index 80bbeda0f8..c4d461cd3a 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
+@@ -39,5 +39,5 @@ class AutoExpireFlashBag implements FlashBagInterface
+      * @return void
+      */
+-    public function setName(string $name)
++    public function setName(string $name): void
+     {
+         $this->name = $name;
+@@ -47,5 +47,5 @@ class AutoExpireFlashBag implements FlashBagInterface
+      * @return void
+      */
+-    public function initialize(array &$flashes)
++    public function initialize(array &$flashes): void
+     {
+         $this->flashes = &$flashes;
+@@ -61,5 +61,5 @@ class AutoExpireFlashBag implements FlashBagInterface
+      * @return void
+      */
+-    public function add(string $type, mixed $message)
++    public function add(string $type, mixed $message): void
+     {
+         $this->flashes['new'][$type][] = $message;
+@@ -103,5 +103,5 @@ class AutoExpireFlashBag implements FlashBagInterface
+      * @return void
+      */
+-    public function setAll(array $messages)
++    public function setAll(array $messages): void
+     {
+         $this->flashes['new'] = $messages;
+@@ -111,5 +111,5 @@ class AutoExpireFlashBag implements FlashBagInterface
+      * @return void
+      */
+-    public function set(string $type, string|array $messages)
++    public function set(string $type, string|array $messages): void
+     {
+         $this->flashes['new'][$type] = (array) $messages;
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
+index 659d59d186..3da6888cec 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
+@@ -39,5 +39,5 @@ class FlashBag implements FlashBagInterface
+      * @return void
+      */
+-    public function setName(string $name)
++    public function setName(string $name): void
+     {
+         $this->name = $name;
+@@ -47,5 +47,5 @@ class FlashBag implements FlashBagInterface
+      * @return void
+      */
+-    public function initialize(array &$flashes)
++    public function initialize(array &$flashes): void
+     {
+         $this->flashes = &$flashes;
+@@ -55,5 +55,5 @@ class FlashBag implements FlashBagInterface
+      * @return void
+      */
+-    public function add(string $type, mixed $message)
++    public function add(string $type, mixed $message): void
+     {
+         $this->flashes[$type][] = $message;
+@@ -94,5 +94,5 @@ class FlashBag implements FlashBagInterface
+      * @return void
+      */
+-    public function set(string $type, string|array $messages)
++    public function set(string $type, string|array $messages): void
+     {
+         $this->flashes[$type] = (array) $messages;
+@@ -102,5 +102,5 @@ class FlashBag implements FlashBagInterface
+      * @return void
+      */
+-    public function setAll(array $messages)
++    public function setAll(array $messages): void
+     {
+         $this->flashes = $messages;
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
+index b45be2f8c3..ce73fdb85f 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Session.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Session.php
+@@ -73,5 +73,5 @@ class Session implements FlashBagAwareSessionInterface, \IteratorAggregate, \Cou
+      * @return void
+      */
+-    public function set(string $name, mixed $value)
++    public function set(string $name, mixed $value): void
+     {
+         $this->getAttributeBag()->set($name, $value);
+@@ -86,5 +86,5 @@ class Session implements FlashBagAwareSessionInterface, \IteratorAggregate, \Cou
+      * @return void
+      */
+-    public function replace(array $attributes)
++    public function replace(array $attributes): void
+     {
+         $this->getAttributeBag()->replace($attributes);
+@@ -99,5 +99,5 @@ class Session implements FlashBagAwareSessionInterface, \IteratorAggregate, \Cou
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         $this->getAttributeBag()->clear();
+@@ -167,5 +167,5 @@ class Session implements FlashBagAwareSessionInterface, \IteratorAggregate, \Cou
+      * @return void
+      */
+-    public function save()
++    public function save(): void
+     {
+         $this->storage->save();
+@@ -180,5 +180,5 @@ class Session implements FlashBagAwareSessionInterface, \IteratorAggregate, \Cou
+      * @return void
+      */
+-    public function setId(string $id)
++    public function setId(string $id): void
+     {
+         if ($this->storage->getId() !== $id) {
+@@ -195,5 +195,5 @@ class Session implements FlashBagAwareSessionInterface, \IteratorAggregate, \Cou
+      * @return void
+      */
+-    public function setName(string $name)
++    public function setName(string $name): void
+     {
+         $this->storage->setName($name);
+@@ -213,5 +213,5 @@ class Session implements FlashBagAwareSessionInterface, \IteratorAggregate, \Cou
+      * @return void
+      */
+-    public function registerBag(SessionBagInterface $bag)
++    public function registerBag(SessionBagInterface $bag): void
+     {
+         $this->storage->registerBag(new SessionBagProxy($bag, $this->data, $this->usageIndex, $this->usageReporter));
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+index 7d7d49ddb4..88ea67f3ac 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+@@ -242,5 +242,5 @@ class PdoSessionHandler extends AbstractSessionHandler
+      * @return void
+      */
+-    public function createTable()
++    public function createTable(): void
+     {
+         // connect if we are not yet
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
+index 79c03a8e09..69214b00d1 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
+@@ -55,5 +55,5 @@ class MetadataBag implements SessionBagInterface
+      * @return void
+      */
+-    public function initialize(array &$array)
++    public function initialize(array &$array): void
+     {
+         $this->meta = &$array;
+@@ -89,5 +89,5 @@ class MetadataBag implements SessionBagInterface
+      * @return void
+      */
+-    public function stampNew(int $lifetime = null)
++    public function stampNew(int $lifetime = null): void
+     {
+         $this->stampCreated($lifetime);
+@@ -135,5 +135,5 @@ class MetadataBag implements SessionBagInterface
+      * @return void
+      */
+-    public function setName(string $name)
++    public function setName(string $name): void
+     {
+         $this->name = $name;
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
+index d30b56d691..0f002902bd 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
+@@ -72,5 +72,5 @@ class MockArraySessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function setSessionData(array $array)
++    public function setSessionData(array $array): void
+     {
+         $this->data = $array;
+@@ -112,5 +112,5 @@ class MockArraySessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function setId(string $id)
++    public function setId(string $id): void
+     {
+         if ($this->started) {
+@@ -129,5 +129,5 @@ class MockArraySessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function setName(string $name)
++    public function setName(string $name): void
+     {
+         $this->name = $name;
+@@ -137,5 +137,5 @@ class MockArraySessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function save()
++    public function save(): void
+     {
+         if (!$this->started || $this->closed) {
+@@ -150,5 +150,5 @@ class MockArraySessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         // clear out the bags
+@@ -167,5 +167,5 @@ class MockArraySessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function registerBag(SessionBagInterface $bag)
++    public function registerBag(SessionBagInterface $bag): void
+     {
+         $this->bags[$bag->getName()] = $bag;
+@@ -193,5 +193,5 @@ class MockArraySessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function setMetadataBag(MetadataBag $bag = null)
++    public function setMetadataBag(MetadataBag $bag = null): void
+     {
+         if (1 > \func_num_args()) {
+@@ -223,5 +223,5 @@ class MockArraySessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    protected function loadSession()
++    protected function loadSession(): void
+     {
+         $bags = array_merge($this->bags, [$this->metadataBag]);
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
+index 95f69f2e13..971b890f0f 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
+@@ -77,5 +77,5 @@ class MockFileSessionStorage extends MockArraySessionStorage
+      * @return void
+      */
+-    public function save()
++    public function save(): void
+     {
+         if (!$this->started) {
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+index 2bf5e8dc19..9d79f8c488 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+@@ -187,5 +187,5 @@ class NativeSessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function setId(string $id)
++    public function setId(string $id): void
+     {
+         $this->saveHandler->setId($id);
+@@ -200,5 +200,5 @@ class NativeSessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function setName(string $name)
++    public function setName(string $name): void
+     {
+         $this->saveHandler->setName($name);
+@@ -232,5 +232,5 @@ class NativeSessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function save()
++    public function save(): void
+     {
+         // Store a copy so we can restore the bags in case the session was not left empty
+@@ -274,5 +274,5 @@ class NativeSessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         // clear out the bags
+@@ -291,5 +291,5 @@ class NativeSessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function registerBag(SessionBagInterface $bag)
++    public function registerBag(SessionBagInterface $bag): void
+     {
+         if ($this->started) {
+@@ -318,5 +318,5 @@ class NativeSessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function setMetadataBag(MetadataBag $metaBag = null)
++    public function setMetadataBag(MetadataBag $metaBag = null): void
+     {
+         if (1 > \func_num_args()) {
+@@ -352,5 +352,5 @@ class NativeSessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function setOptions(array $options)
++    public function setOptions(array $options): void
+     {
+         if (headers_sent() || \PHP_SESSION_ACTIVE === session_status()) {
+@@ -398,5 +398,5 @@ class NativeSessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    public function setSaveHandler(AbstractProxy|\SessionHandlerInterface $saveHandler = null)
++    public function setSaveHandler(AbstractProxy|\SessionHandlerInterface $saveHandler = null): void
+     {
+         if (1 > \func_num_args()) {
+@@ -431,5 +431,5 @@ class NativeSessionStorage implements SessionStorageInterface
+      * @return void
+      */
+-    protected function loadSession(array &$session = null)
++    protected function loadSession(array &$session = null): void
+     {
+         if (null === $session) {
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
+index 28cb3c3d05..fc5452c5b0 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
+@@ -45,5 +45,5 @@ class PhpBridgeSessionStorage extends NativeSessionStorage
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         // clear out the bags and nothing else that may be set
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
+index de4fca5fba..688ab56a32 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
+@@ -76,5 +76,5 @@ abstract class AbstractProxy
+      * @return void
+      */
+-    public function setId(string $id)
++    public function setId(string $id): void
+     {
+         if ($this->isActive()) {
+@@ -100,5 +100,5 @@ abstract class AbstractProxy
+      * @return void
+      */
+-    public function setName(string $name)
++    public function setName(string $name): void
+     {
+         if ($this->isActive()) {
+diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
+index 2ddf55f2cb..52049a92b4 100644
+--- a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
++++ b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
+@@ -35,5 +35,5 @@ abstract class Bundle implements BundleInterface
+      * @return void
+      */
+-    public function boot()
++    public function boot(): void
+     {
+     }
+@@ -42,5 +42,5 @@ abstract class Bundle implements BundleInterface
+      * @return void
+      */
+-    public function shutdown()
++    public function shutdown(): void
+     {
+     }
+@@ -52,5 +52,5 @@ abstract class Bundle implements BundleInterface
+      * @return void
+      */
+-    public function build(ContainerBuilder $container)
++    public function build(ContainerBuilder $container): void
+     {
+     }
+@@ -122,5 +122,5 @@ abstract class Bundle implements BundleInterface
+      * @return void
       */
--    public function makeDisposition(string $disposition, string $filename, string $filenameFallback = '')
-+    public function makeDisposition(string $disposition, string $filename, string $filenameFallback = ''): string
+-    public function registerCommands(Application $application)
++    public function registerCommands(Application $application): void
      {
-         return HeaderUtils::makeDisposition($disposition, $filename, $filenameFallback);
+     }
+diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
+index 3c99b74af3..fdb68feb2c 100644
+--- a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
++++ b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
+@@ -61,5 +61,5 @@ class Psr6CacheClearer implements CacheClearerInterface
+      * @return void
+      */
+-    public function clear(string $cacheDir)
++    public function clear(string $cacheDir): void
+     {
+         foreach ($this->pools as $pool) {
+diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmer.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmer.php
+index f940ba4a72..5178dc96bb 100644
+--- a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmer.php
++++ b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmer.php
+@@ -22,5 +22,5 @@ abstract class CacheWarmer implements CacheWarmerInterface
+      * @return void
+      */
+-    protected function writeCacheFile(string $file, $content)
++    protected function writeCacheFile(string $file, $content): void
+     {
+         $tmpFile = @tempnam(\dirname($file), basename($file));
 diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php
 index 1f1740b7e2..22dc8ea26a 100644
 --- a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php
@@ -1229,7 +7278,7 @@ index 2f442cb536..d98909cfae 100644
 +    public function warmUp(string $cacheDir): array;
  }
 diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
-index 3a3be3af49..971560c07b 100644
+index 698ed31397..c5a3eea409 100644
 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
 +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
 @@ -59,5 +59,5 @@ abstract class DataCollector implements DataCollectorInterface
@@ -1240,17 +7289,34 @@ index 3a3be3af49..971560c07b 100644
      {
          $casters = [
 diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
-index 1cb865fd66..f6f4efe7a7 100644
+index 8df94ccb8f..42288d8a02 100644
 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
 +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
-@@ -33,4 +33,4 @@ interface DataCollectorInterface extends ResetInterface
+@@ -28,5 +28,5 @@ interface DataCollectorInterface extends ResetInterface
+      * @return void
+      */
+-    public function collect(Request $request, Response $response, \Throwable $exception = null);
++    public function collect(Request $request, Response $response, \Throwable $exception = null): void;
+ 
+     /**
+@@ -35,4 +35,4 @@ interface DataCollectorInterface extends ResetInterface
       * @return string
       */
 -    public function getName();
 +    public function getName(): string;
  }
+diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LateDataCollectorInterface.php b/src/Symfony/Component/HttpKernel/DataCollector/LateDataCollectorInterface.php
+index efa1a4f737..752eb19faf 100644
+--- a/src/Symfony/Component/HttpKernel/DataCollector/LateDataCollectorInterface.php
++++ b/src/Symfony/Component/HttpKernel/DataCollector/LateDataCollectorInterface.php
+@@ -24,4 +24,4 @@ interface LateDataCollectorInterface
+      * @return void
+      */
+-    public function lateCollect();
++    public function lateCollect(): void;
+ }
 diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
-index fa62bc7de4..ca8f57ac2f 100644
+index 094683ccce..5582af522e 100644
 --- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
 +++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
 @@ -199,5 +199,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
@@ -1338,16 +7404,30 @@ index fa62bc7de4..ca8f57ac2f 100644
      {
          return new ParameterBag($this->data['dotenv_vars']->getValue());
 diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
-index d894b7e74c..f0d6d32f0a 100644
+index 444138da70..42a3c28b5f 100644
 --- a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
 +++ b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
-@@ -63,5 +63,5 @@ class RouterDataCollector extends DataCollector
+@@ -52,5 +52,5 @@ class RouterDataCollector extends DataCollector
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->controllers = new \SplObjectStorage();
+@@ -66,5 +66,5 @@ class RouterDataCollector extends DataCollector
       * @return string
       */
 -    protected function guessRoute(Request $request, string|object|array $controller)
 +    protected function guessRoute(Request $request, string|object|array $controller): string
      {
          return 'n/a';
+@@ -76,5 +76,5 @@ class RouterDataCollector extends DataCollector
+      * @return void
+      */
+-    public function onKernelController(ControllerEvent $event)
++    public function onKernelController(ControllerEvent $event): void
+     {
+         $this->controllers[$event->getRequest()] = $event->getController();
 diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
 index fcb100859f..8bf3ef09d5 100644
 --- a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
@@ -1359,6 +7439,221 @@ index fcb100859f..8bf3ef09d5 100644
 +    public function format(string $file, int $line): string|false
      {
          if ($fmt = $this->getFileLinkFormat()) {
+diff --git a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
+index 4f6c34bc74..c84198c912 100644
+--- a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
++++ b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
+@@ -27,5 +27,5 @@ class TraceableEventDispatcher extends BaseTraceableEventDispatcher
+      * @return void
+      */
+-    protected function beforeDispatch(string $eventName, object $event)
++    protected function beforeDispatch(string $eventName, object $event): void
+     {
+         switch ($eventName) {
+@@ -62,5 +62,5 @@ class TraceableEventDispatcher extends BaseTraceableEventDispatcher
+      * @return void
+      */
+-    protected function afterDispatch(string $eventName, object $event)
++    protected function afterDispatch(string $eventName, object $event): void
+     {
+         switch ($eventName) {
+diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
+index 1924b1ddb0..62c58c8e8b 100644
+--- a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
++++ b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
+@@ -35,5 +35,5 @@ class AddAnnotatedClassesToCachePass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $annotatedClasses = [];
+diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
+index 5bb801c8cd..7426ca9430 100644
+--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
++++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
+@@ -32,5 +32,5 @@ class ControllerArgumentValueResolverPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('argument_resolver')) {
+diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php b/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php
+index d72efa1724..ea38e4d301 100644
+--- a/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php
++++ b/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php
+@@ -38,5 +38,5 @@ abstract class Extension extends BaseExtension
+      * @return void
+      */
+-    public function addAnnotatedClassesToCompile(array $annotatedClasses)
++    public function addAnnotatedClassesToCompile(array $annotatedClasses): void
+     {
+         $this->annotatedClasses = array_merge($this->annotatedClasses, $annotatedClasses);
+diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
+index f41d58b81b..cb2b5c484c 100644
+--- a/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
++++ b/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
+@@ -29,5 +29,5 @@ class FragmentRendererPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('fragment.handler')) {
+diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php
+index 2b6cb00793..6bf9e49796 100644
+--- a/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php
++++ b/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php
+@@ -29,5 +29,5 @@ class LoggerPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $container->setAlias(LoggerInterface::class, 'logger')
+diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php
+index cec23e1970..946d9f6802 100644
+--- a/src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php
++++ b/src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php
+@@ -35,5 +35,5 @@ class MergeExtensionConfigurationPass extends BaseMergeExtensionConfigurationPas
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         foreach ($this->extensions as $extension) {
+diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
+index b294036d4e..517e958f6b 100644
+--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
++++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
+@@ -37,5 +37,5 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('argument_resolver.service') && !$container->hasDefinition('argument_resolver.not_tagged_controller')) {
+diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterLocaleAwareServicesPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterLocaleAwareServicesPass.php
+index 2a01365bd3..d321073903 100644
+--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterLocaleAwareServicesPass.php
++++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterLocaleAwareServicesPass.php
+@@ -27,5 +27,5 @@ class RegisterLocaleAwareServicesPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('locale_aware_listener')) {
+diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
+index 7a21fe0e59..1a87f4f7e5 100644
+--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
++++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
+@@ -25,5 +25,5 @@ class RemoveEmptyControllerArgumentLocatorsPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $controllerLocator = $container->findDefinition('argument_resolver.controller_locator');
+diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
+index da9f8d6320..cfef739f87 100644
+--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
++++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
+@@ -27,5 +27,5 @@ class ResettableServicePass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->has('services_resetter')) {
+diff --git a/src/Symfony/Component/HttpKernel/Event/RequestEvent.php b/src/Symfony/Component/HttpKernel/Event/RequestEvent.php
+index b81a79b780..e05ed715e2 100644
+--- a/src/Symfony/Component/HttpKernel/Event/RequestEvent.php
++++ b/src/Symfony/Component/HttpKernel/Event/RequestEvent.php
+@@ -40,5 +40,5 @@ class RequestEvent extends KernelEvent
+      * @return void
+      */
+-    public function setResponse(Response $response)
++    public function setResponse(Response $response): void
+     {
+         $this->response = $response;
+diff --git a/src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php b/src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php
+index 723e758cd0..f3a5618e3d 100644
+--- a/src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php
++++ b/src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php
+@@ -50,5 +50,5 @@ class CacheAttributeListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onKernelControllerArguments(ControllerArgumentsEvent $event)
++    public function onKernelControllerArguments(ControllerArgumentsEvent $event): void
+     {
+         $request = $event->getRequest();
+@@ -96,5 +96,5 @@ class CacheAttributeListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onKernelResponse(ResponseEvent $event)
++    public function onKernelResponse(ResponseEvent $event): void
+     {
+         $request = $event->getRequest();
+diff --git a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php
+index 4a40909157..61edeb266c 100644
+--- a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php
++++ b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php
+@@ -40,5 +40,5 @@ class DumpListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function configure()
++    public function configure(): void
+     {
+         $cloner = $this->cloner;
+diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
+index cc6936cfda..c4a74bdd93 100644
+--- a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
++++ b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
+@@ -55,5 +55,5 @@ class ErrorListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function logKernelException(ExceptionEvent $event)
++    public function logKernelException(ExceptionEvent $event): void
+     {
+         $throwable = $event->getThrowable();
+@@ -96,5 +96,5 @@ class ErrorListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onKernelException(ExceptionEvent $event)
++    public function onKernelException(ExceptionEvent $event): void
+     {
+         if (null === $this->controller) {
+@@ -142,5 +142,5 @@ class ErrorListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onControllerArguments(ControllerArgumentsEvent $event)
++    public function onControllerArguments(ControllerArgumentsEvent $event): void
+     {
+         $e = $event->getRequest()->attributes->get('exception');
+diff --git a/src/Symfony/Component/HttpKernel/Exception/HttpException.php b/src/Symfony/Component/HttpKernel/Exception/HttpException.php
+index e12abce004..3354a5aebf 100644
+--- a/src/Symfony/Component/HttpKernel/Exception/HttpException.php
++++ b/src/Symfony/Component/HttpKernel/Exception/HttpException.php
+@@ -43,5 +43,5 @@ class HttpException extends \RuntimeException implements HttpExceptionInterface
+      * @return void
+      */
+-    public function setHeaders(array $headers)
++    public function setHeaders(array $headers): void
+     {
+         $this->headers = $headers;
+diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
+index 62b21e6d4e..67984f7e75 100644
+--- a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
++++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
+@@ -52,5 +52,5 @@ class FragmentHandler
+      * @return void
+      */
+-    public function addRenderer(FragmentRendererInterface $renderer)
++    public function addRenderer(FragmentRendererInterface $renderer): void
+     {
+         $this->renderers[$renderer->getName()] = $renderer;
 diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
 index 3650d1700d..055b57fc77 100644
 --- a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
@@ -1370,53 +7665,242 @@ index 3650d1700d..055b57fc77 100644
 +    protected function createSubRequest(string $uri, Request $request): Request
      {
          $cookies = $request->cookies->all();
+diff --git a/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
+index 47027233a7..2be5cfc7de 100644
+--- a/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
++++ b/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
+@@ -35,5 +35,5 @@ abstract class RoutableFragmentRenderer implements FragmentRendererInterface
+      * @return void
+      */
+-    public function setFragmentPath(string $path)
++    public function setFragmentPath(string $path): void
+     {
+         $this->fragmentPath = $path;
+diff --git a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
+index f158cca3f9..bf5533dce7 100644
+--- a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
++++ b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
+@@ -59,5 +59,5 @@ abstract class AbstractSurrogate implements SurrogateInterface
+      * @return void
+      */
+-    public function addSurrogateCapability(Request $request)
++    public function addSurrogateCapability(Request $request): void
+     {
+         $current = $request->headers->get('Surrogate-Capability');
+@@ -108,5 +108,5 @@ abstract class AbstractSurrogate implements SurrogateInterface
+      * @return void
+      */
+-    protected function removeFromControl(Response $response)
++    protected function removeFromControl(Response $response): void
+     {
+         if (!$response->headers->has('Surrogate-Control')) {
+diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
+index 4730b33c13..da8fdccfaa 100644
+--- a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
++++ b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
+@@ -36,5 +36,5 @@ class Esi extends AbstractSurrogate
+      * @return void
+      */
+-    public function addSurrogateControl(Response $response)
++    public function addSurrogateControl(Response $response): void
+     {
+         if (str_contains($response->getContent(), 'surrogate?->addSurrogateCapability($request);
+@@ -594,5 +594,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
+      * @return void
+      */
+-    protected function store(Request $request, Response $response)
++    protected function store(Request $request, Response $response): void
+     {
+         try {
+@@ -649,5 +649,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
+      * @return void
+      */
+-    protected function processResponseBody(Request $request, Response $response)
++    protected function processResponseBody(Request $request, Response $response): void
+     {
+         if ($this->surrogate?->needsParsing($response)) {
+diff --git a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
+index 1bdaab148a..7976d00605 100644
+--- a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
++++ b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
+@@ -58,5 +58,5 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface
+      * @return void
+      */
+-    public function add(Response $response)
++    public function add(Response $response): void
+     {
+         ++$this->embeddedResponses;
+@@ -102,5 +102,5 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface
+      * @return void
+      */
+-    public function update(Response $response)
++    public function update(Response $response): void
+     {
+         // if we have no embedded Response, do nothing
+diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
+index bde72914a7..c1656f2ac0 100644
+--- a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
++++ b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
+@@ -30,5 +30,5 @@ class Ssi extends AbstractSurrogate
+      * @return void
+      */
+-    public function addSurrogateControl(Response $response)
++    public function addSurrogateControl(Response $response): void
+     {
+         if (str_contains($response->getContent(), '<!--#include')) {
 diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
-index facd20b942..c7a3fefc59 100644
+index e7ea54ae15..616a3deff6 100644
 --- a/src/Symfony/Component/HttpKernel/HttpCache/Store.php
 +++ b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
-@@ -417,5 +417,5 @@ class Store implements StoreInterface
+@@ -59,5 +59,5 @@ class Store implements StoreInterface
+      * @return void
+      */
+-    public function cleanup()
++    public function cleanup(): void
+     {
+         // unlock everything
+@@ -254,5 +254,5 @@ class Store implements StoreInterface
+      * @return void
+      */
+-    public function invalidate(Request $request)
++    public function invalidate(Request $request): void
+     {
+         $modified = false;
+@@ -421,5 +421,5 @@ class Store implements StoreInterface
       * @return string
       */
 -    public function getPath(string $key)
 +    public function getPath(string $key): string
      {
          return $this->root.\DIRECTORY_SEPARATOR.substr($key, 0, 2).\DIRECTORY_SEPARATOR.substr($key, 2, 2).\DIRECTORY_SEPARATOR.substr($key, 4, 2).\DIRECTORY_SEPARATOR.substr($key, 6);
+diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
+index 794a55dc18..1fb8cbaa5d 100644
+--- a/src/Symfony/Component/HttpKernel/HttpKernel.php
++++ b/src/Symfony/Component/HttpKernel/HttpKernel.php
+@@ -96,5 +96,5 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
+      * @return void
+      */
+-    public function terminate(Request $request, Response $response)
++    public function terminate(Request $request, Response $response): void
+     {
+         $this->dispatcher->dispatch(new TerminateEvent($this, $request, $response), KernelEvents::TERMINATE);
 diff --git a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
-index 3077ed0398..8b971d9196 100644
+index 0f3630e7fe..ddf77b8a19 100644
 --- a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
 +++ b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
-@@ -59,5 +59,5 @@ class HttpKernelBrowser extends AbstractBrowser
+@@ -51,5 +51,5 @@ class HttpKernelBrowser extends AbstractBrowser
+      * @return void
+      */
+-    public function catchExceptions(bool $catchExceptions)
++    public function catchExceptions(bool $catchExceptions): void
+     {
+         $this->catchExceptions = $catchExceptions;
+@@ -61,5 +61,5 @@ class HttpKernelBrowser extends AbstractBrowser
       * @return Response
       */
 -    protected function doRequest(object $request)
 +    protected function doRequest(object $request): Response
      {
          $response = $this->kernel->handle($request, HttpKernelInterface::MAIN_REQUEST, $this->catchExceptions);
-@@ -75,5 +75,5 @@ class HttpKernelBrowser extends AbstractBrowser
+@@ -77,5 +77,5 @@ class HttpKernelBrowser extends AbstractBrowser
       * @return string
       */
 -    protected function getScript(object $request)
 +    protected function getScript(object $request): string
      {
          $kernel = var_export(serialize($this->kernel), true);
-@@ -114,5 +114,5 @@ EOF;
+@@ -116,5 +116,5 @@ EOF;
       * @return string
       */
 -    protected function getHandleScript()
 +    protected function getHandleScript(): string
      {
          return <<<'EOF'
+diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
+index 8157d0a2ad..6f2e1a42f0 100644
+--- a/src/Symfony/Component/HttpKernel/Kernel.php
++++ b/src/Symfony/Component/HttpKernel/Kernel.php
+@@ -107,5 +107,5 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
+      * @return void
+      */
+-    public function boot()
++    public function boot(): void
+     {
+         if (true === $this->booted) {
+@@ -138,5 +138,5 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
+      * @return void
+      */
+-    public function reboot(?string $warmupDir)
++    public function reboot(?string $warmupDir): void
+     {
+         $this->shutdown();
+@@ -148,5 +148,5 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
+      * @return void
+      */
+-    public function terminate(Request $request, Response $response)
++    public function terminate(Request $request, Response $response): void
+     {
+         if (false === $this->booted) {
+@@ -162,5 +162,5 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
+      * @return void
+      */
+-    public function shutdown()
++    public function shutdown(): void
+     {
+         if (false === $this->booted) {
+@@ -340,5 +340,5 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
+      * @return void
+      */
+-    protected function initializeBundles()
++    protected function initializeBundles(): void
+     {
+         // init bundles
+@@ -360,5 +360,5 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
+      * @return void
+      */
+-    protected function build(ContainerBuilder $container)
++    protected function build(ContainerBuilder $container): void
+     {
+     }
+@@ -400,5 +400,5 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
+      * @return void
+      */
+-    protected function initializeContainer()
++    protected function initializeContainer(): void
+     {
+         $class = $this->getContainerClass();
+@@ -614,5 +614,5 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
+      * @return void
+      */
+-    protected function prepareContainer(ContainerBuilder $container)
++    protected function prepareContainer(ContainerBuilder $container): void
+     {
+         $extensions = [];
+@@ -667,5 +667,5 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
+      * @return void
+      */
+-    protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container, string $class, string $baseClass)
++    protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container, string $class, string $baseClass): void
+     {
+         // cache the container
 diff --git a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
 index 84452ae71f..f70165d25f 100644
 --- a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
@@ -1436,16 +7920,251 @@ index 84452ae71f..f70165d25f 100644
  
      /**
 diff --git a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
-index 3add13d5e9..12880be7b0 100644
+index 0fdbfc44ba..67ad8c64c1 100644
 --- a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
 +++ b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
-@@ -246,5 +246,5 @@ class FileProfilerStorage implements ProfilerStorageInterface
+@@ -91,5 +91,5 @@ class FileProfilerStorage implements ProfilerStorageInterface
+      * @return void
+      */
+-    public function purge()
++    public function purge(): void
+     {
+         $flags = \FilesystemIterator::SKIP_DOTS;
+@@ -249,5 +249,5 @@ class FileProfilerStorage implements ProfilerStorageInterface
       * @return Profile
       */
 -    protected function createProfileFromData(string $token, array $data, Profile $parent = null)
 +    protected function createProfileFromData(string $token, array $data, Profile $parent = null): Profile
      {
          $profile = new Profile($token);
+diff --git a/src/Symfony/Component/HttpKernel/
10000
Profiler/Profile.php b/src/Symfony/Component/HttpKernel/Profiler/Profile.php
+index 8de1468ac6..858ef75b57 100644
+--- a/src/Symfony/Component/HttpKernel/Profiler/Profile.php
++++ b/src/Symfony/Component/HttpKernel/Profiler/Profile.php
+@@ -48,5 +48,5 @@ class Profile
+      * @return void
+      */
+-    public function setToken(string $token)
++    public function setToken(string $token): void
+     {
+         $this->token = $token;
+@@ -66,5 +66,5 @@ class Profile
+      * @return void
+      */
+-    public function setParent(self $parent)
++    public function setParent(self $parent): void
+     {
+         $this->parent = $parent;
+@@ -98,5 +98,5 @@ class Profile
+      * @return void
+      */
+-    public function setIp(?string $ip)
++    public function setIp(?string $ip): void
+     {
+         $this->ip = $ip;
+@@ -114,5 +114,5 @@ class Profile
+      * @return void
+      */
+-    public function setMethod(string $method)
++    public function setMethod(string $method): void
+     {
+         $this->method = $method;
+@@ -130,5 +130,5 @@ class Profile
+      * @return void
+      */
+-    public function setUrl(?string $url)
++    public function setUrl(?string $url): void
+     {
+         $this->url = $url;
+@@ -143,5 +143,5 @@ class Profile
+      * @return void
+      */
+-    public function setTime(int $time)
++    public function setTime(int $time): void
+     {
+         $this->time = $time;
+@@ -151,5 +151,5 @@ class Profile
+      * @return void
+      */
+-    public function setStatusCode(int $statusCode)
++    public function setStatusCode(int $statusCode): void
+     {
+         $this->statusCode = $statusCode;
+@@ -178,5 +178,5 @@ class Profile
+      * @return void
+      */
+-    public function setChildren(array $children)
++    public function setChildren(array $children): void
+     {
+         $this->children = [];
+@@ -191,5 +191,5 @@ class Profile
+      * @return void
+      */
+-    public function addChild(self $child)
++    public function addChild(self $child): void
+     {
+         $this->children[] = $child;
+@@ -239,5 +239,5 @@ class Profile
+      * @return void
+      */
+-    public function setCollectors(array $collectors)
++    public function setCollectors(array $collectors): void
+     {
+         $this->collectors = [];
+@@ -252,5 +252,5 @@ class Profile
+      * @return void
+      */
+-    public function addCollector(DataCollectorInterface $collector)
++    public function addCollector(DataCollectorInterface $collector): void
+     {
+         $this->collectors[$collector->getName()] = $collector;
+diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
+index 5d6fad8fe3..e723e1e445 100644
+--- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
++++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
+@@ -50,5 +50,5 @@ class Profiler implements ResetInterface
+      * @return void
+      */
+-    public function disable()
++    public function disable(): void
+     {
+         $this->enabled = false;
+@@ -60,5 +60,5 @@ class Profiler implements ResetInterface
+      * @return void
+      */
+-    public function enable()
++    public function enable(): void
+     {
+         $this->enabled = true;
+@@ -114,5 +114,5 @@ class Profiler implements ResetInterface
+      * @return void
+      */
+-    public function purge()
++    public function purge(): void
+     {
+         $this->storage->purge();
+@@ -172,5 +172,5 @@ class Profiler implements ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         foreach ($this->collectors as $collector) {
+@@ -195,5 +195,5 @@ class Profiler implements ResetInterface
+      * @return void
+      */
+-    public function set(array $collectors = [])
++    public function set(array $collectors = []): void
+     {
+         $this->collectors = [];
+@@ -208,5 +208,5 @@ class Profiler implements ResetInterface
+      * @return void
+      */
+-    public function add(DataCollectorInterface $collector)
++    public function add(DataCollectorInterface $collector): void
+     {
+         $this->collectors[$collector->getName()] = $collector;
+diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
+index bac4be1e7c..b51ac22632 100644
+--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
++++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
+@@ -32,5 +32,5 @@ class CloneVarDataCollector extends DataCollector
+      * @return void
+      */
+-    public function collect(Request $request, Response $response, \Throwable $exception = null)
++    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+     {
+         $this->data = $this->cloneVar($this->varToClone);
+@@ -40,5 +40,5 @@ class CloneVarDataCollector extends DataCollector
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->data = [];
+@@ -48,5 +48,5 @@ class CloneVarDataCollector extends DataCollector
+      * @return Data
+      */
+-    public function getData()
++    public function getData(): Data
+     {
+         return $this->data;
+diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
+index dd05d5bf6b..019add95c5 100644
+--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
++++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
+@@ -50,5 +50,5 @@ class KernelForTest extends Kernel
+     }
+ 
+-    protected function initializeContainer()
++    protected function initializeContainer(): void
+     {
+         if ($this->fakeContainer) {
+diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php
+index 0a6470e6e6..e9a417b98d 100644
+--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php
++++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php
+@@ -32,5 +32,5 @@ class KernelWithoutBundles extends Kernel
+     }
+ 
+-    protected function build(ContainerBuilder $container)
++    protected function build(ContainerBuilder $container): void
+     {
+         $container->setParameter('test_executed', true);
+diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+index 73800bab38..03f12833c7 100644
+--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
++++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+@@ -778,5 +778,5 @@ class CustomProjectDirKernel extends Kernel implements WarmableInterface
+     }
+ 
+-    protected function build(ContainerBuilder $container)
++    protected function build(ContainerBuilder $container): void
+     {
+         if ($build = $this->buildContainer) {
+diff --git a/src/Symfony/Component/Intl/Util/IntlTestHelper.php b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
+index d22f2e6953..1dcdcdf4ea 100644
+--- a/src/Symfony/Component/Intl/Util/IntlTestHelper.php
++++ b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
+@@ -33,5 +33,5 @@ class IntlTestHelper
+      * @return void
+      */
+-    public static function requireIntl(TestCase $testCase, string $minimumIcuVersion = null)
++    public static function requireIntl(TestCase $testCase, string $minimumIcuVersion = null): void
+     {
+         $minimumIcuVersion ??= Intl::getIcuStubVersion();
+@@ -67,5 +67,5 @@ class IntlTestHelper
+      * @return void
+      */
+-    public static function requireFullIntl(TestCase $testCase, string $minimumIcuVersion = null)
++    public static function requireFullIntl(TestCase $testCase, string $minimumIcuVersion = null): void
+     {
+         // We only run tests if the intl extension is loaded...
+@@ -89,5 +89,5 @@ class IntlTestHelper
+      * @return void
+      */
+-    public static function require32Bit(TestCase $testCase)
++    public static function require32Bit(TestCase $testCase): void
+     {
+         if (4 !== \PHP_INT_SIZE) {
+@@ -101,5 +101,5 @@ class IntlTestHelper
+      * @return void
+      */
+-    public static function require64Bit(TestCase $testCase)
++    public static function require64Bit(TestCase $testCase): void
+     {
+         if (8 !== \PHP_INT_SIZE) {
+diff --git a/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php b/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php
+index 7c85f09258..369b3fb239 100644
+--- a/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php
++++ b/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php
+@@ -34,5 +34,5 @@ abstract class AbstractConnection implements ConnectionInterface
+      * @return void
+      */
+-    protected function configureOptions(OptionsResolver $resolver)
++    protected function configureOptions(OptionsResolver $resolver): void
+     {
+         $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php b/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
 index 9b356b10b2..68942b21dc 100644
 --- a/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
@@ -1484,8 +8203,40 @@ index 9b356b10b2..68942b21dc 100644
 -    public function remove(Entry $entry);
 +    public function remove(Entry $entry): static;
  }
+diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
+index 2daa651b7a..95b9e73916 100644
+--- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
++++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
+@@ -67,5 +67,5 @@ class Connection extends AbstractConnection
+      * @return void
+      */
+-    public function bind(string $dn = null, #[\SensitiveParameter] string $password = null)
++    public function bind(string $dn = null, #[\SensitiveParameter] string $password = null): void
+     {
+         if (!$this->connection) {
+@@ -102,5 +102,5 @@ class Connection extends AbstractConnection
+      * @return void
+      */
+-    public function setOption(string $name, array|string|int|bool $value)
++    public function setOption(string $name, array|string|int|bool $value): void
+     {
+         if (!@ldap_set_option($this->connection, ConnectionOptions::getOption($name), $value)) {
+@@ -112,5 +112,5 @@ class Connection extends AbstractConnection
+      * @return array|string|int|null
+      */
+-    public function getOption(string $name)
++    public function getOption(string $name): array|string|int|null
+     {
+         if (!@ldap_get_option($this->connection, ConnectionOptions::getOption($name), $ret)) {
+@@ -124,5 +124,5 @@ class Connection extends AbstractConnection
+      * @return void
+      */
+-    protected function configureOptions(OptionsResolver $resolver)
++    protected function configureOptions(OptionsResolver $resolver): void
+     {
+         parent::configureOptions($resolver);
 diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
-index e919a1152a..7fa97f3be1 100644
+index 20f0922384..4eea54731e 100644
 --- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
 +++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
 @@ -35,5 +35,5 @@ class EntryManager implements EntryManagerInterface
@@ -1523,27 +8274,56 @@ index e919a1152a..7fa97f3be1 100644
 +    public function removeAttributeValues(Entry $entry, string $attribute, array $values): static
      {
          $con = $this->getConnectionResource();
-@@ -112,5 +112,5 @@ class EntryManager implements EntryManagerInterface
-     }
- 
+@@ -115,5 +115,5 @@ class EntryManager implements EntryManagerInterface
+      * @return $this
+      */
 -    public function rename(Entry $entry, string $newRdn, bool $removeOldRdn = true)
 +    public function rename(Entry $entry, string $newRdn, bool $removeOldRdn = true): static
      {
          $con = $this->getConnectionResource();
-@@ -131,5 +131,5 @@ class EntryManager implements EntryManagerInterface
+@@ -134,5 +134,5 @@ class EntryManager implements EntryManagerInterface
       * @throws LdapException     if an error is thrown during the rename operation
       */
 -    public function move(Entry $entry, string $newParent)
 +    public function move(Entry $entry, string $newParent): static
      {
          $con = $this->getConnectionResource();
-@@ -165,5 +165,5 @@ class EntryManager implements EntryManagerInterface
+@@ -168,5 +168,5 @@ class EntryManager implements EntryManagerInterface
       * @throws UpdateOperationException in case of an error
       */
 -    public function applyOperations(string $dn, iterable $operations)
 +    public function applyOperations(string $dn, iterable $operations): static
      {
          $operationsMapped = [];
+diff --git a/src/Symfony/Component/Ldap/Entry.php b/src/Symfony/Component/Ldap/Entry.php
+index 0d008d8ecd..96b07b4845 100644
+--- a/src/Symfony/Component/Ldap/Entry.php
++++ b/src/Symfony/Component/Ldap/Entry.php
+@@ -100,5 +100,5 @@ class Entry
+      * @return void
+      */
+-    public function setAttribute(string $name, array $value)
++    public function setAttribute(string $name, array $value): void
+     {
+         $this->attributes[$name] = $value;
+@@ -111,5 +111,5 @@ class Entry
+      * @return void
+      */
+-    public function removeAttribute(string $name)
++    public function removeAttribute(string $name): void
+     {
+         unset($this->attributes[$name]);
+diff --git a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php b/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php
+index 7e535ebde1..ebb3df9b2b 100644
+--- a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php
++++ b/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php
+@@ -40,5 +40,5 @@ class CheckLdapCredentialsListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onCheckPassport(CheckPassportEvent $event)
++    public function onCheckPassport(CheckPassportEvent $event): void
+     {
+         $passport = $event->getPassport();
 diff --git a/src/Symfony/Component/Lock/LockFactory.php b/src/Symfony/Component/Lock/LockFactory.php
 index 125b6eae50..ac327e8981 100644
 --- a/src/Symfony/Component/Lock/LockFactory.php
@@ -1562,8 +8342,189 @@ index 125b6eae50..ac327e8981 100644
 +    public function createLockFromKey(Key $key, ?float $ttl = 300.0, bool $autoRelease = true): SharedLockInterface
      {
          $lock = new Lock($key, $this->store, $ttl, $autoRelease);
+diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php
+index 9087874c29..5cfd87c4ad 100644
+--- a/src/Symfony/Component/Lock/Store/CombinedStore.php
++++ b/src/Symfony/Component/Lock/Store/CombinedStore.php
+@@ -57,5 +57,5 @@ class CombinedStore implements SharedLockStoreInterface, LoggerAwareInterface
+      * @return void
+      */
+-    public function save(Key $key)
++    public function save(Key $key): void
+     {
+         $successCount = 0;
+@@ -94,5 +94,5 @@ class CombinedStore implements SharedLockStoreInterface, LoggerAwareInterface
+      * @return void
+      */
+-    public function saveRead(Key $key)
++    public function saveRead(Key $key): void
+     {
+         $successCount = 0;
+@@ -135,5 +135,5 @@ class CombinedStore implements SharedLockStoreInterface, LoggerAwareInterface
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, float $ttl)
++    public function putOffExpiration(Key $key, float $ttl): void
+     {
+         $successCount = 0;
+@@ -179,5 +179,5 @@ class CombinedStore implements SharedLockStoreInterface, LoggerAwareInterface
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         foreach ($this->stores as $store) {
+diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
+index 4344a6f41f..c3ee27f8a5 100644
+--- a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
++++ b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
+@@ -57,5 +57,5 @@ class DoctrineDbalPostgreSqlStore implements BlockingSharedLockStoreInterface, B
+      * @return void
+      */
+-    public function save(Key $key)
++    public function save(Key $key): void
+     {
+         // prevent concurrency within the same connection
+@@ -92,5 +92,5 @@ class DoctrineDbalPostgreSqlStore implements BlockingSharedLockStoreInterface, B
+      * @return void
+      */
+-    public function saveRead(Key $key)
++    public function saveRead(Key $key): void
+     {
+         // prevent concurrency within the same connection
+@@ -127,5 +127,5 @@ class DoctrineDbalPostgreSqlStore implements BlockingSharedLockStoreInterface, B
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, float $ttl)
++    public function putOffExpiration(Key $key, float $ttl): void
+     {
+         // postgresql locks forever.
+@@ -139,5 +139,5 @@ class DoctrineDbalPostgreSqlStore implements BlockingSharedLockStoreInterface, B
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         // Prevent deleting locks own by an other key in the same connection
+@@ -179,5 +179,5 @@ class DoctrineDbalPostgreSqlStore implements BlockingSharedLockStoreInterface, B
+      * @return void
+      */
+-    public function waitAndSave(Key $key)
++    public function waitAndSave(Key $key): void
+     {
+         // prevent concurrency within the same connection
+@@ -205,5 +205,5 @@ class DoctrineDbalPostgreSqlStore implements BlockingSharedLockStoreInterface, B
+      * @return void
+      */
+-    public function waitAndSaveRead(Key $key)
++    public function waitAndSaveRead(Key $key): void
+     {
+         // prevent concurrency within the same connection
+diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
+index 7e573b3692..cfb2e038d5 100644
+--- a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
++++ b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
+@@ -76,5 +76,5 @@ class DoctrineDbalStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function save(Key $key)
++    public function save(Key $key): void
+     {
+         $key->reduceLifetime($this->initialTtl);
+@@ -118,5 +118,5 @@ class DoctrineDbalStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, $ttl)
++    public function putOffExpiration(Key $key, $ttl): void
+     {
+         if ($ttl < 1) {
+@@ -152,5 +152,5 @@ class DoctrineDbalStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         $this->conn->delete($this->table, [
+diff --git a/src/Symfony/Component/Lock/Store/FlockStore.php b/src/Symfony/Component/Lock/Store/FlockStore.php
+index edabbb946c..247e012718 100644
+--- a/src/Symfony/Component/Lock/Store/FlockStore.php
++++ b/src/Symfony/Component/Lock/Store/FlockStore.php
+@@ -54,5 +54,5 @@ class FlockStore implements BlockingStoreInterface, SharedLockStoreInterface
+      * @return void
+      */
+-    public function save(Key $key)
++    public function save(Key $key): void
+     {
+         $this->lock($key, false, false);
+@@ -62,5 +62,5 @@ class FlockStore implements BlockingStoreInterface, SharedLockStoreInterface
+      * @return void
+      */
+-    public function saveRead(Key $key)
++    public function saveRead(Key $key): void
+     {
+         $this->lock($key, true, false);
+@@ -70,5 +70,5 @@ class FlockStore implements BlockingStoreInterface, SharedLockStoreInterface
+      * @return void
+      */
+-    public function waitAndSave(Key $key)
++    public function waitAndSave(Key $key): void
+     {
+         $this->lock($key, false, true);
+@@ -78,5 +78,5 @@ class FlockStore implements BlockingStoreInterface, SharedLockStoreInterface
+      * @return void
+      */
+-    public function waitAndSaveRead(Key $key)
++    public function waitAndSaveRead(Key $key): void
+     {
+         $this->lock($key, true, true);
+@@ -136,5 +136,5 @@ class FlockStore implements BlockingStoreInterface, SharedLockStoreInterface
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, float $ttl)
++    public function putOffExpiration(Key $key, float $ttl): void
+     {
+         // do nothing, the flock locks forever.
+@@ -144,5 +144,5 @@ class FlockStore implements BlockingStoreInterface, SharedLockStoreInterface
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         // The lock is maybe not acquired.
+diff --git a/src/Symfony/Component/Lock/Store/InMemoryStore.php b/src/Symfony/Component/Lock/Store/InMemoryStore.php
+index 34d3ede5c1..29963f2d14 100644
+--- a/src/Symfony/Component/Lock/Store/InMemoryStore.php
++++ b/src/Symfony/Component/Lock/Store/InMemoryStore.php
+@@ -30,5 +30,5 @@ class InMemoryStore implements SharedLockStoreInterface
+      * @return void
+      */
+-    public function save(Key $key)
++    public function save(Key $key): void
+     {
+         $hashKey = (string) $key;
+@@ -61,5 +61,5 @@ class InMemoryStore implements SharedLockStoreInterface
+      * @return void
+      */
+-    public function saveRead(Key $key)
++    public function saveRead(Key $key): void
+     {
+         $hashKey = (string) $key;
+@@ -88,5 +88,5 @@ class InMemoryStore implements SharedLockStoreInterface
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, float $ttl)
++    public function putOffExpiration(Key $key, float $ttl): void
+     {
+         // do nothing, memory locks forever.
+@@ -96,5 +96,5 @@ class InMemoryStore implements SharedLockStoreInterface
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         $hashKey = (string) $key;
 diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php
-index c9b0fbde05..f9b08d008b 100644
+index 88233655f9..abfb1fe7a6 100644
 --- a/src/Symfony/Component/Lock/Store/MemcachedStore.php
 +++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php
 @@ -34,5 +34,5 @@ class MemcachedStore implements PersistingStoreInterface
@@ -1573,17 +8534,325 @@ index c9b0fbde05..f9b08d008b 100644
 +    public static function isSupported(): bool
      {
          return \extension_loaded('memcached');
+@@ -59,5 +59,5 @@ class MemcachedStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function save(Key $key)
++    public function save(Key $key): void
+     {
+         $token = $this->getUniqueToken($key);
+@@ -74,5 +74,5 @@ class MemcachedStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, float $ttl)
++    public function putOffExpiration(Key $key, float $ttl): void
+     {
+         if ($ttl < 1) {
+@@ -113,5 +113,5 @@ class MemcachedStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         $token = $this->getUniqueToken($key);
+diff --git a/src/Symfony/Component/Lock/Store/MongoDbStore.php b/src/Symfony/Component/Lock/Store/MongoDbStore.php
+index 717df9b4e7..893043bcd2 100644
+--- a/src/Symfony/Component/Lock/Store/MongoDbStore.php
++++ b/src/Symfony/Component/Lock/Store/MongoDbStore.php
+@@ -194,5 +194,5 @@ class MongoDbStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function createTtlIndex(int $expireAfterSeconds = 0)
++    public function createTtlIndex(int $expireAfterSeconds = 0): void
+     {
+         $this->getCollection()->createIndex(
+@@ -211,5 +211,5 @@ class MongoDbStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function save(Key $key)
++    public function save(Key $key): void
+     {
+         $key->reduceLifetime($this->initialTtl);
+@@ -237,5 +237,5 @@ class MongoDbStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, float $ttl)
++    public function putOffExpiration(Key $key, float $ttl): void
+     {
+         $key->reduceLifetime($ttl);
+@@ -256,5 +256,5 @@ class MongoDbStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         $this->getCollection()->deleteOne([ // filter
+diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php
+index 85d0de78ea..7a0cca622e 100644
+--- a/src/Symfony/Component/Lock/Store/PdoStore.php
++++ b/src/Symfony/Component/Lock/Store/PdoStore.php
+@@ -87,5 +87,5 @@ class PdoStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function save(Key $key)
++    public function save(Key $key): void
+     {
+         $key->reduceLifetime($this->initialTtl);
+@@ -119,5 +119,5 @@ class PdoStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, float $ttl)
++    public function putOffExpiration(Key $key, float $ttl): void
+     {
+         if ($ttl < 1) {
+@@ -147,5 +147,5 @@ class PdoStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         $sql = "DELETE FROM $this->table WHERE $this->idCol = :id AND $this->tokenCol = :token";
+diff --git a/src/Symfony/Component/Lock/Store/PostgreSqlStore.php b/src/Symfony/Component/Lock/Store/PostgreSqlStore.php
+index 87a57ea064..0c89396d79 100644
+--- a/src/Symfony/Component/Lock/Store/PostgreSqlStore.php
++++ b/src/Symfony/Component/Lock/Store/PostgreSqlStore.php
+@@ -71,5 +71,5 @@ class PostgreSqlStore implements BlockingSharedLockStoreInterface, BlockingStore
+      * @return void
+      */
+-    public function save(Key $key)
++    public function save(Key $key): void
+     {
+         // prevent concurrency within the same connection
+@@ -106,5 +106,5 @@ class PostgreSqlStore implements BlockingSharedLockStoreInterface, BlockingStore
+      * @return void
+      */
+-    public function saveRead(Key $key)
++    public function saveRead(Key $key): void
+     {
+         // prevent concurrency within the same connection
+@@ -142,5 +142,5 @@ class PostgreSqlStore implements BlockingSharedLockStoreInterface, BlockingStore
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, float $ttl)
++    public function putOffExpiration(Key $key, float $ttl): void
+     {
+         // postgresql locks forever.
+@@ -154,5 +154,5 @@ class PostgreSqlStore implements BlockingSharedLockStoreInterface, BlockingStore
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         // Prevent deleting locks own by an other key in the same connection
+@@ -195,5 +195,5 @@ class PostgreSqlStore implements BlockingSharedLockStoreInterface, BlockingStore
+      * @return void
+      */
+-    public function waitAndSave(Key $key)
++    public function waitAndSave(Key $key): void
+     {
+         // prevent concurrency within the same connection
+@@ -221,5 +221,5 @@ class PostgreSqlStore implements BlockingSharedLockStoreInterface, BlockingStore
+      * @return void
+      */
+-    public function waitAndSaveRead(Key $key)
++    public function waitAndSaveRead(Key $key): void
+     {
+         // prevent concurrency within the same connection
+diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php
+index 51d3f72a9f..963c80efda 100644
+--- a/src/Symfony/Component/Lock/Store/RedisStore.php
++++ b/src/Symfony/Component/Lock/Store/RedisStore.php
+@@ -48,5 +48,5 @@ class RedisStore implements SharedLockStoreInterface
+      * @return void
+      */
+-    public function save(Key $key)
++    public function save(Key $key): void
+     {
+         $script = '
+@@ -96,5 +96,5 @@ class RedisStore implements SharedLockStoreInterface
+      * @return void
+      */
+-    public function saveRead(Key $key)
++    public function saveRead(Key $key): void
+     {
+         $script = '
+@@ -139,5 +139,5 @@ class RedisStore implements SharedLockStoreInterface
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, float $ttl)
++    public function putOffExpiration(Key $key, float $ttl): void
+     {
+         $script = '
+@@ -182,5 +182,5 @@ class RedisStore implements SharedLockStoreInterface
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         $script = '
+diff --git a/src/Symfony/Component/Lock/Store/SemaphoreStore.php b/src/Symfony/Component/Lock/Store/SemaphoreStore.php
+index 7af6681a46..628e54ab30 100644
+--- a/src/Symfony/Component/Lock/Store/SemaphoreStore.php
++++ b/src/Symfony/Component/Lock/Store/SemaphoreStore.php
+@@ -44,5 +44,5 @@ class SemaphoreStore implements BlockingStoreInterface
+      * @return void
+      */
+-    public function save(Key $key)
++    public function save(Key $key): void
+     {
+         $this->lock($key, false);
+@@ -52,5 +52,5 @@ class SemaphoreStore implements BlockingStoreInterface
+      * @return void
+      */
+-    public function waitAndSave(Key $key)
++    public function waitAndSave(Key $key): void
+     {
+         $this->lock($key, true);
+@@ -83,5 +83,5 @@ class SemaphoreStore implements BlockingStoreInterface
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         // The lock is maybe not acquired.
+@@ -100,5 +100,5 @@ class SemaphoreStore implements BlockingStoreInterface
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, float $ttl)
++    public function putOffExpiration(Key $key, float $ttl): void
+     {
+         // do nothing, the semaphore locks forever.
+diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
+index 3d22eeb786..4b5a912202 100644
+--- a/src/Symfony/Component/Lock/Store/ZookeeperStore.php
++++ b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
+@@ -60,5 +60,5 @@ class ZookeeperStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function save(Key $key)
++    public function save(Key $key): void
+     {
+         if ($this->exists($key)) {
+@@ -78,5 +78,5 @@ class ZookeeperStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         if (!$this->exists($key)) {
+@@ -106,5 +106,5 @@ class ZookeeperStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, float $ttl)
++    public function putOffExpiration(Key $key, float $ttl): void
+     {
+         // do nothing, zookeeper locks forever.
+diff --git a/src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php b/src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php
+index 6c5605fa8e..56914f2e64 100644
+--- a/src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php
++++ b/src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php
+@@ -34,5 +34,5 @@ class MessageLoggerListener implements EventSubscriberInterface, ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->events = new MessageEvents();
 diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php
-index c8ba7f9c73..f36408603d 100644
+index 1a1305f5d8..95fb4347c3 100644
 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php
 +++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php
-@@ -91,5 +91,5 @@ class AmazonSqsTransport implements TransportInterface, SetupableTransportInterf
+@@ -82,5 +82,5 @@ class AmazonSqsTransport implements TransportInterface, SetupableTransportInterf
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         try {
+@@ -94,5 +94,5 @@ class AmazonSqsTransport implements TransportInterface, SetupableTransportInterf
       * @return MessageCountAwareInterface&ReceiverInterface
       */
 -    private function getReceiver(): ReceiverInterface
 +    private function getReceiver(): MessageCountAwareInterface&ReceiverInterface
      {
          return $this->receiver ??= new AmazonSqsReceiver($this->connection, $this->serializer);
+diff --git a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
+index a6b0d881df..6391a76313 100644
+--- a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
++++ b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
+@@ -128,5 +128,5 @@ EOF
+      * @return void
+      */
+-    protected function interact(InputInterface $input, OutputInterface $output)
++    protected function interact(InputInterface $input, OutputInterface $output): void
+     {
+         $io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
+diff --git a/src/Symfony/Component/Messenger/Command/DebugCommand.php b/src/Symfony/Component/Messenger/Command/DebugCommand.php
+index 5767f06a02..0902128db3 100644
+--- a/src/Symfony/Component/Messenger/Command/DebugCommand.php
++++ b/src/Symfony/Component/Messenger/Command/DebugCommand.php
+@@ -42,5 +42,5 @@ class DebugCommand extends Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+         $this
+diff --git a/src/Symfony/Component/Messenger/Command/SetupTransportsCommand.php b/src/Symfony/Component/Messenger/Command/SetupTransportsCommand.php
+index e506e49487..b7bbbb82a5 100644
+--- a/src/Symfony/Component/Messenger/Command/SetupTransportsCommand.php
++++ b/src/Symfony/Component/Messenger/Command/SetupTransportsCommand.php
+@@ -43,5 +43,5 @@ class SetupTransportsCommand extends Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+         $this
+diff --git a/src/Symfony/Component/Messenger/Command/StatsCommand.php b/src/Symfony/Component/Messenger/Command/StatsCommand.php
+index 3b6d6b8a39..98bc75ecd7 100644
+--- a/src/Symfony/Component/Messenger/Command/StatsCommand.php
++++ b/src/Symfony/Component/Messenger/Command/StatsCommand.php
+@@ -42,5 +42,5 @@ class StatsCommand extends Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+         $this
+diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
+index ac2b97fc3d..d896347a12 100644
+--- a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
++++ b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
+@@ -37,5 +37,5 @@ class MessengerPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         $busIds = [];
+diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
+index ba775b0c17..1e1c50b517 100644
+--- a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
++++ b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
+@@ -52,5 +52,5 @@ class SendFailedMessageForRetryListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onMessageFailed(WorkerMessageFailedEvent $event)
++    public function onMessageFailed(WorkerMessageFailedEvent $event): void
+     {
+         $retryStrategy = $this->getRetryStrategyForTransport($event->getReceiverName());
+diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
+index f6cd8aab00..1fd9f9f41e 100644
+--- a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
++++ b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
+@@ -39,5 +39,5 @@ class SendFailedMessageToFailureTransportListener implements EventSubscriberInte
+      * @return void
+      */
+-    public function onMessageFailed(WorkerMessageFailedEvent $event)
++    public function onMessageFailed(WorkerMessageFailedEvent $event): void
+     {
+         if ($event->willRetry()) {
 diff --git a/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php b/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
 index 0e91372f62..20a62a7e74 100644
 --- a/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
@@ -1606,6 +8875,148 @@ index 3dcdacf88f..f12f6c9437 100644
 +    public function getAdditionalArguments(): array
      {
          return $this->additionalArguments;
+diff --git a/src/Symfony/Component/Messenger/TraceableMessageBus.php b/src/Symfony/Component/Messenger/TraceableMessageBus.php
+index d8e6dd4ad9..f96aae262e 100644
+--- a/src/Symfony/Component/Messenger/TraceableMessageBus.php
++++ b/src/Symfony/Component/Messenger/TraceableMessageBus.php
+@@ -54,5 +54,5 @@ class TraceableMessageBus implements MessageBusInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->dispatchedMessages = [];
+diff --git a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
+index 13a97667b5..b37e71c7b9 100644
+--- a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
++++ b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
+@@ -95,5 +95,5 @@ class InMemoryTransport implements TransportInterface, ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->sent = $this->queue = $this->rejected = $this->acknowledged = [];
+diff --git a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransportFactory.php b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransportFactory.php
+index 774957c3cc..148d85ba1d 100644
+--- a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransportFactory.php
++++ b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransportFactory.php
+@@ -42,5 +42,5 @@ class InMemoryTransportFactory implements TransportFactoryInterface, ResetInterf
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         foreach ($this->createdTransports as $transport) {
+diff --git a/src/Symfony/Component/Mime/DependencyInjection/AddMimeTypeGuesserPass.php b/src/Symfony/Component/Mime/DependencyInjection/AddMimeTypeGuesserPass.php
+index 70fa786331..f27afd0f01 100644
+--- a/src/Symfony/Component/Mime/DependencyInjection/AddMimeTypeGuesserPass.php
++++ b/src/Symfony/Component/Mime/DependencyInjection/AddMimeTypeGuesserPass.php
+@@ -26,5 +26,5 @@ class AddMimeTypeGuesserPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if ($container->has('mime_types')) {
+diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
+index 97f5ded24d..05e3ed5202 100644
+--- a/src/Symfony/Component/Mime/Email.php
++++ b/src/Symfony/Component/Mime/Email.php
+@@ -397,5 +397,5 @@ class Email extends Message
+     }
+ 
+-    public function ensureValidity()
++    public function ensureValidity(): void
+     {
+         $this->ensureBodyValid();
+diff --git a/src/Symfony/Component/Mime/Header/AbstractHeader.php b/src/Symfony/Component/Mime/Header/AbstractHeader.php
+index faa5fd8b6f..16b7833b7d 100644
+--- a/src/Symfony/Component/Mime/Header/AbstractHeader.php
++++ b/src/Symfony/Component/Mime/Header/AbstractHeader.php
+@@ -38,5 +38,5 @@ abstract class AbstractHeader implements HeaderInterface
+      * @return void
+      */
+-    public function setCharset(string $charset)
++    public function setCharset(string $charset): void
+     {
+         $this->charset = $charset;
+@@ -55,5 +55,5 @@ abstract class AbstractHeader implements HeaderInterface
+      * @return void
+      */
+-    public function setLanguage(string $lang)
++    public function setLanguage(string $lang): void
+     {
+         $this->lang = $lang;
+@@ -73,5 +73,5 @@ abstract class AbstractHeader implements HeaderInterface
+      * @return void
+      */
+-    public function setMaxLineLength(int $lineLength)
++    public function setMaxLineLength(int $lineLength): void
+     {
+         $this->lineLength = $lineLength;
+diff --git a/src/Symfony/Component/Mime/Header/UnstructuredHeader.php b/src/Symfony/Component/Mime/Header/UnstructuredHeader.php
+index 61c06d8f50..883293f6e0 100644
+--- a/src/Symfony/Component/Mime/Header/UnstructuredHeader.php
++++ b/src/Symfony/Component/Mime/Header/UnstructuredHeader.php
+@@ -33,5 +33,5 @@ class UnstructuredHeader extends AbstractHeader
+      * @return void
+      */
+-    public function setBody(mixed $body)
++    public function setBody(mixed $body): void
+     {
+         $this->setValue($body);
+@@ -56,5 +56,5 @@ class UnstructuredHeader extends AbstractHeader
+      * @return void
+      */
+-    public function setValue(string $value)
++    public function setValue(string $value): void
+     {
+         $this->value = $value;
+diff --git a/src/Symfony/Component/Mime/Message.php b/src/Symfony/Component/Mime/Message.php
+index e636c2e8e5..4c0597d16f 100644
+--- a/src/Symfony/Component/Mime/Message.php
++++ b/src/Symfony/Component/Mime/Message.php
+@@ -129,5 +129,5 @@ class Message extends RawMessage
+      * @return void
+      */
+-    public function ensureValidity()
++    public function ensureValidity(): void
+     {
+         if (!$this->headers->has('To') && !$this->headers->has('Cc') && !$this->headers->has('Bcc')) {
+diff --git a/src/Symfony/Component/Mime/RawMessage.php b/src/Symfony/Component/Mime/RawMessage.php
+index 90e7caee9e..421331ac5c 100644
+--- a/src/Symfony/Component/Mime/RawMessage.php
++++ b/src/Symfony/Component/Mime/RawMessage.php
+@@ -59,5 +59,5 @@ class RawMessage
+      * @return void
+      */
+-    public function ensureValidity()
++    public function ensureValidity(): void
+     {
+     }
+diff --git a/src/Symfony/Component/Notifier/EventListener/NotificationLoggerListener.php b/src/Symfony/Component/Notifier/EventListener/NotificationLoggerListener.php
+index 70ca6aed9c..b9b5a3262f 100644
+--- a/src/Symfony/Component/Notifier/EventListener/NotificationLoggerListener.php
++++ b/src/Symfony/Component/Notifier/EventListener/NotificationLoggerListener.php
+@@ -32,5 +32,5 @@ class NotificationLoggerListener implements EventSubscriberInterface, ResetInter
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->events = new NotificationEvents();
+diff --git a/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php b/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php
+index 355c136195..ecd14480ad 100644
+--- a/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php
++++ b/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php
+@@ -35,5 +35,5 @@ class SendFailedMessageToNotifierListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onMessageFailed(WorkerMessageFailedEvent $event)
++    public function onMessageFailed(WorkerMessageFailedEvent $event): void
+     {
+         if ($event->willRetry()) {
 diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
 index b429812176..21aec2b9e8 100644
 --- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -1663,17 +9074,131 @@ index 27ce7fd430..708e611502 100644
 +    public function isIdleTimeout(): bool
      {
          return self::TYPE_IDLE === $this->timeoutType;
+diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
+index e3387dfe15..b88d942f05 100644
+--- a/src/Symfony/Component/Process/ExecutableFinder.php
++++ b/src/Symfony/Component/Process/ExecutableFinder.php
+@@ -27,5 +27,5 @@ class ExecutableFinder
+      * @return void
+      */
+-    public function setSuffixes(array $suffixes)
++    public function setSuffixes(array $suffixes): void
+     {
+         $this->suffixes = $suffixes;
+@@ -37,5 +37,5 @@ class ExecutableFinder
+      * @return void
+      */
+-    public function addSuffix(string $suffix)
++    public function addSuffix(string $suffix): void
+     {
+         $this->suffixes[] = $suffix;
 diff --git a/src/Symfony/Component/Process/InputStream.php b/src/Symfony/Component/Process/InputStream.php
-index d703660868..c3e41ca00c 100644
+index 25f574f703..c6042b4826 100644
 --- a/src/Symfony/Component/Process/InputStream.php
 +++ b/src/Symfony/Component/Process/InputStream.php
-@@ -66,5 +66,5 @@ class InputStream implements \IteratorAggregate
+@@ -33,5 +33,5 @@ class InputStream implements \IteratorAggregate
+      * @return void
+      */
+-    public function onEmpty(callable $onEmpty = null)
++    public function onEmpty(callable $onEmpty = null): void
+     {
+         $this->onEmpty = $onEmpty;
+@@ -46,5 +46,5 @@ class InputStream implements \IteratorAggregate
+      * @return void
+      */
+-    public function write(mixed $input)
++    public function write(mixed $input): void
+     {
+         if (null === $input) {
+@@ -62,5 +62,5 @@ class InputStream implements \IteratorAggregate
+      * @return void
+      */
+-    public function close()
++    public function close(): void
+     {
+         $this->open = false;
+@@ -72,5 +72,5 @@ class InputStream implements \IteratorAggregate
       * @return bool
       */
 -    public function isClosed()
 +    public function isClosed(): bool
      {
-         return !$this->open;
+         return !$this->open;
+diff --git a/src/Symfony/Component/Process/PhpProcess.php b/src/Symfony/Component/Process/PhpProcess.php
+index ef54a3d2b0..d084e5ba24 100644
+--- a/src/Symfony/Component/Process/PhpProcess.php
++++ b/src/Symfony/Component/Process/PhpProcess.php
+@@ -59,5 +59,5 @@ class PhpProcess extends Process
+      * @return void
+      */
+-    public function start(callable $callback = null, array $env = [])
++    public function start(callable $callback = null, array $env = []): void
+     {
+         if (null === $this->getCommandLine()) {
+diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+index 843031f01e..cec83a3c5a 100644
+--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
++++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+@@ -123,5 +123,5 @@ class PropertyAccessor implements PropertyAccessorInterface
+      * @return void
+      */
+-    public function setValue(object|array &$objectOrArray, string|PropertyPathInterface $propertyPath, mixed $value)
++    public function setValue(object|array &$objectOrArray, string|PropertyPathInterface $propertyPath, mixed $value): void
+     {
+         if (\is_object($objectOrArray) && false === strpbrk((string) $propertyPath, '.[')) {
+diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
+index a3c79e667b..4a7ebb8832 100644
+--- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
++++ b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
+@@ -37,5 +37,5 @@ class PropertyPathBuilder
+      * @return void
+      */
+-    public function append(PropertyPathInterface|string $path, int $offset = 0, int $length = 0)
++    public function append(PropertyPathInterface|string $path, int $offset = 0, int $length = 0): void
+     {
+         if (\is_string($path)) {
+@@ -60,5 +60,5 @@ class PropertyPathBuilder
+      * @return void
+      */
+-    public function appendIndex(string $name)
++    public function appendIndex(string $name): void
+     {
+         $this->elements[] = $name;
+@@ -71,5 +71,5 @@ class PropertyPathBuilder
+      * @return void
+      */
+-    public function appendProperty(string $name)
++    public function appendProperty(string $name): void
+     {
+         $this->elements[] = $name;
+@@ -84,5 +84,5 @@ class PropertyPathBuilder
+      * @return void
+      */
+-    public function remove(int $offset, int $length = 1)
++    public function remove(int $offset, int $length = 1): void
+     {
+         if (!isset($this->elements[$offset])) {
+@@ -103,5 +103,5 @@ class PropertyPathBuilder
+      * @return void
+      */
+-    public function replace(int $offset, int $length, PropertyPathInterface|string $path, int $pathOffset = 0, int $pathLength = 0)
++    public function replace(int $offset, int $length, PropertyPathInterface|string $path, int $pathOffset = 0, int $pathLength = 0): void
+     {
+         if (\is_string($path)) {
+@@ -135,5 +135,5 @@ class PropertyPathBuilder
+      * @return void
+      */
+-    public function replaceByIndex(int $offset, string $name = null)
++    public function replaceByIndex(int $offset, string $name = null): void
+     {
+         if (!isset($this->elements[$offset])) {
+@@ -155,5 +155,5 @@ class PropertyPathBuilder
+      * @return void
+      */
+-    public function replaceByProperty(int $offset, string $name = null)
++    public function replaceByProperty(int $offset, string $name = null): void
+     {
+         if (!isset($this->elements[$offset])) {
 diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php b/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php
 index 11f6ed405b..53e7b33451 100644
 --- a/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php
@@ -1719,6 +9244,17 @@ index 11f6ed405b..53e7b33451 100644
 -    public function isIndex(int $index);
 +    public function isIndex(int $index): bool;
  }
+diff --git a/src/Symfony/Component/PropertyInfo/DependencyInjection/PropertyInfoPass.php b/src/Symfony/Component/PropertyInfo/DependencyInjection/PropertyInfoPass.php
+index 1c240b43da..a96fbefdb9 100644
+--- a/src/Symfony/Component/PropertyInfo/DependencyInjection/PropertyInfoPass.php
++++ b/src/Symfony/Component/PropertyInfo/DependencyInjection/PropertyInfoPass.php
+@@ -29,5 +29,5 @@ class PropertyInfoPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('property_info')) {
 diff --git a/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php b/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php
 index f9ee787130..61f8b6d5be 100644
 --- a/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php
@@ -1757,99 +9293,280 @@ index 6da0bcb4c8..16e9765b1d 100644
 +    public function getTypes(string $class, string $property, array $context = []): ?array;
  }
 diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
-index 974215a097..1516d9df79 100644
+index bb8423101d..bffe81146e 100644
 --- a/src/Symfony/Component/Routing/Annotation/Route.php
 +++ b/src/Symfony/Component/Routing/Annotation/Route.php
-@@ -85,5 +85,5 @@ class Route
+@@ -80,5 +80,5 @@ class Route
+      * @return void
+      */
+-    public function setPath(string $path)
++    public function setPath(string $path): void
+     {
+         $this->path = $path;
+@@ -88,5 +88,5 @@ class Route
       * @return string|null
       */
 -    public function getPath()
 +    public function getPath(): ?string
      {
          return $this->path;
-@@ -108,5 +108,5 @@ class Route
+@@ -96,5 +96,5 @@ class Route
+      * @return void
+      */
+-    public function setLocalizedPaths(array $localizedPaths)
++    public function setLocalizedPaths(array $localizedPaths): void
+     {
+         $this->localizedPaths = $localizedPaths;
+@@ -109,5 +109,5 @@ class Route
+      * @return void
+      */
+-    public function setHost(string $pattern)
++    public function setHost(string $pattern): void
+     {
+         $this->host = $pattern;
+@@ -117,5 +117,5 @@ class Route
       * @return string|null
       */
 -    public function getHost()
 +    public function getHost(): ?string
      {
          return $this->host;
-@@ -121,5 +121,5 @@ class Route
+@@ -125,5 +125,5 @@ class Route
+      * @return void
+      */
+-    public function setName(string $name)
++    public function setName(string $name): void
+     {
+         $this->name = $name;
+@@ -133,5 +133,5 @@ class Route
       * @return string|null
       */
 -    public function getName()
 +    public function getName(): ?string
      {
          return $this->name;
-@@ -134,5 +134,5 @@ class Route
+@@ -141,5 +141,5 @@ class Route
+      * @return void
+      */
+-    public function setRequirements(array $requirements)
++    public function setRequirements(array $requirements): void
+     {
+         $this->requirements = $requirements;
+@@ -149,5 +149,5 @@ class Route
       * @return array
       */
 -    public function getRequirements()
 +    public function getRequirements(): array
      {
          return $this->requirements;
-@@ -147,5 +147,5 @@ class Route
+@@ -157,5 +157,5 @@ class Route
+      * @return void
+      */
+-    public function setOptions(array $options)
++    public function setOptions(array $options): void
+     {
+         $this->options = $options;
+@@ -165,5 +165,5 @@ class Route
       * @return array
       */
 -    public function getOptions()
 +    public function getOptions(): array
      {
          return $this->options;
-@@ -160,5 +160,5 @@ class Route
+@@ -173,5 +173,5 @@ class Route
+      * @return void
+      */
+-    public function setDefaults(array $defaults)
++    public function setDefaults(array $defaults): void
+     {
+         $this->defaults = $defaults;
+@@ -181,5 +181,5 @@ class Route
       * @return array
       */
 -    public function getDefaults()
 +    public function getDefaults(): array
      {
          return $this->defaults;
-@@ -173,5 +173,5 @@ class Route
+@@ -189,5 +189,5 @@ class Route
+      * @return void
+      */
+-    public function setSchemes(array|string $schemes)
++    public function setSchemes(array|string $schemes): void
+     {
+         $this->schemes = (array) $schemes;
+@@ -197,5 +197,5 @@ class Route
       * @return array
       */
 -    public function getSchemes()
 +    public function getSchemes(): array
      {
          return $this->schemes;
-@@ -186,5 +186,5 @@ class Route
+@@ -205,5 +205,5 @@ class Route
+      * @return void
+      */
+-    public function setMethods(array|string $methods)
++    public function setMethods(array|string $methods): void
+     {
+         $this->methods = (array) $methods;
+@@ -213,5 +213,5 @@ class Route
       * @return array
       */
 -    public function getMethods()
 +    public function getMethods(): array
      {
          return $this->methods;
-@@ -199,5 +199,5 @@ class Route
+@@ -221,5 +221,5 @@ class Route
+      * @return void
+      */
+-    public function setCondition(?string $condition)
++    public function setCondition(?string $condition): void
+     {
+         $this->condition = $condition;
+@@ -229,5 +229,5 @@ class Route
       * @return string|null
       */
 -    public function getCondition()
 +    public function getCondition(): ?string
      {
          return $this->condition;
+diff --git a/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php b/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php
+index edbecc1f0e..6f07800fad 100644
+--- a/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php
++++ b/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php
+@@ -29,5 +29,5 @@ class RoutingResolverPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (false === $container->hasDefinition('routing.resolver')) {
+diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
+index e3fb17e81c..cd27f3e387 100644
+--- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php
++++ b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
+@@ -95,5 +95,5 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
+      * @return void
+      */
+-    public function setContext(RequestContext $context)
++    public function setContext(RequestContext $context): void
+     {
+         $this->context = $context;
+@@ -108,5 +108,5 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
+      * @return void
+      */
+-    public function setStrictRequirements(?bool $enabled)
++    public function setStrictRequirements(?bool $enabled): void
+     {
+         $this->strictRequirements = $enabled;
 diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
-index f390b2066c..6808e48778 100644
+index 03d54d5909..f0219187b2 100644
 --- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
 +++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
-@@ -244,5 +244,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -97,5 +97,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+      * @return void
+      */
+-    public function setRouteAnnotationClass(string $class)
++    public function setRouteAnnotationClass(string $class): void
+     {
+         $this->routeAnnotationClass = $class;
+@@ -149,5 +149,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+      * @return void
+      */
+-    protected function addRoute(RouteCollection $collection, object $annot, array $globals, \ReflectionClass $class, \ReflectionMethod $method)
++    protected function addRoute(RouteCollection $collection, object $annot, array $globals, \ReflectionClass $class, \ReflectionMethod $method): void
+     {
+         if ($annot->getEnv() && $annot->getEnv() !== $this->env) {
+@@ -238,5 +238,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+      * @return void
+      */
+-    public function setResolver(LoaderResolverInterface $resolver)
++    public function setResolver(LoaderResolverInterface $resolver): void
+     {
+     }
+@@ -251,5 +251,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return string
       */
 -    protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method)
 +    protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method): string
      {
          $name = str_replace('\\', '_', $class->name).'_'.$method->name;
-@@ -259,5 +259,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -266,5 +266,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return array
       */
 -    protected function getGlobals(\ReflectionClass $class)
 +    protected function getGlobals(\ReflectionClass $class): array
      {
          $globals = $this->resetGlobals();
-@@ -344,5 +344,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -351,5 +351,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return Route
       */
 -    protected function createRoute(string $path, array $defaults, array $requirements, array $options, ?string $host, array $schemes, array $methods, ?string $condition)
 +    protected function createRoute(string $path, array $defaults, array $requirements, array $options, ?string $host, array $schemes, array $methods, ?string $condition): Route
      {
          return new Route($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
+diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
+index 942cc2214f..5f56c63a21 100644
+--- a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
++++ b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
+@@ -67,5 +67,5 @@ class XmlFileLoader extends FileLoader
+      * @return void
+      */
+-    protected function parseNode(RouteCollection $collection, \DOMElement $node, string $path, string $file)
++    protected function parseNode(RouteCollection $collection, \DOMElement $node, string $path, string $file): void
+     {
+         if (self::NAMESPACE_URI !== $node->namespaceURI) {
+@@ -107,5 +107,5 @@ class XmlFileLoader extends FileLoader
+      * @return void
+      */
+-    protected function parseRoute(RouteCollection $collection, \DOMElement $node, string $path)
++    protected function parseRoute(RouteCollection $collection, \DOMElement $node, string $path): void
+     {
+         if ('' === $id = $node->getAttribute('id')) {
+@@ -156,5 +156,5 @@ class XmlFileLoader extends FileLoader
+      * @return void
+      */
+-    protected function parseImport(RouteCollection $collection, \DOMElement $node, string $path, string $file)
++    protected function parseImport(RouteCollection $collection, \DOMElement $node, string $path, string $file): void
+     {
+         /** @var \DOMElement $resourceElement */
+diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
+index 8bae74b4de..911f1b1b8f 100644
+--- a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
++++ b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
+@@ -116,5 +116,5 @@ class YamlFileLoader extends FileLoader
+      * @return void
+      */
+-    protected function parseRoute(RouteCollection $collection, string $name, array $config, string $path)
++    protected function parseRoute(RouteCollection $collection, string $name, array $config, string $path): void
+     {
+         if (isset($config['alias'])) {
+@@ -176,5 +176,5 @@ class YamlFileLoader extends FileLoader
+      * @return void
+      */
+-    protected function parseImport(RouteCollection $collection, array $config, string $path, string $file)
++    protected function parseImport(RouteCollection $collection, array $config, string $path, string $file): void
+     {
+         $type = $config['type'] ?? null;
+@@ -248,5 +248,5 @@ class YamlFileLoader extends FileLoader
+      * @return void
+      */
+-    protected function validate(mixed $config, string $name, string $path)
++    protected function validate(mixed $config, string $name, string $path): void
+     {
+         if (!\is_array($config)) {
+diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
+index af5969f771..3f737c0104 100644
+--- a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
++++ b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
+@@ -54,5 +54,5 @@ EOF;
+      * @return void
+      */
+-    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
++    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider): void
+     {
+         $this->expressionLanguageProviders[] = $provider;
 diff --git a/src/Symfony/Comp
10000
onent/Routing/Matcher/TraceableUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
-index b682040b5a..b054cb2daf 100644
+index 417f156415..75d770d852 100644
 --- a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
 +++ b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
 @@ -33,5 +33,5 @@ class TraceableUrlMatcher extends UrlMatcher
@@ -1859,17 +9576,172 @@ index b682040b5a..b054cb2daf 100644
 +    public function getTraces(string $pathinfo): array
      {
          $this->traces = [];
+@@ -48,5 +48,5 @@ class TraceableUrlMatcher extends UrlMatcher
+      * @return array
+      */
+-    public function getTracesForRequest(Request $request)
++    public function getTracesForRequest(Request $request): array
+     {
+         $this->request = $request;
+diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
+index a0b439a1f4..ecf1c21e44 100644
+--- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
++++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
+@@ -66,5 +66,5 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
+      * @return void
+      */
+-    public function setContext(RequestContext $context)
++    public function setContext(RequestContext $context): void
+     {
+         $this->context = $context;
+@@ -105,5 +105,5 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
+      * @return void
+      */
+-    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
++    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider): void
+     {
+         $this->expressionLanguageProviders[] = $provider;
+diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
+index f244e62bed..a5e918317c 100644
+--- a/src/Symfony/Component/Routing/RouteCollection.php
++++ b/src/Symfony/Component/Routing/RouteCollection.php
+@@ -86,5 +86,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function add(string $name, Route $route, int $priority = 0)
++    public function add(string $name, Route $route, int $priority = 0): void
+     {
+         unset($this->routes[$name], $this->priorities[$name], $this->aliases[$name]);
+@@ -146,5 +146,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function remove(string|array $name)
++    public function remove(string|array $name): void
+     {
+         foreach ((array) $name as $n) {
+@@ -159,5 +159,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function addCollection(self $collection)
++    public function addCollection(self $collection): void
+     {
+         // we need to remove all routes with the same names first because just replacing them
+@@ -188,5 +188,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function addPrefix(string $prefix, array $defaults = [], array $requirements = [])
++    public function addPrefix(string $prefix, array $defaults = [], array $requirements = []): void
+     {
+         $prefix = trim(trim($prefix), '/');
+@@ -208,5 +208,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function addNamePrefix(string $prefix)
++    public function addNamePrefix(string $prefix): void
+     {
+         $prefixedRoutes = [];
+@@ -238,5 +238,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function setHost(?string $pattern, array $defaults = [], array $requirements = [])
++    public function setHost(?string $pattern, array $defaults = [], array $requirements = []): void
+     {
+         foreach ($this->routes as $route) {
+@@ -254,5 +254,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function setCondition(?string $condition)
++    public function setCondition(?string $condition): void
+     {
+         foreach ($this->routes as $route) {
+@@ -268,5 +268,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function addDefaults(array $defaults)
++    public function addDefaults(array $defaults): void
+     {
+         if ($defaults) {
+@@ -284,5 +284,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function addRequirements(array $requirements)
++    public function addRequirements(array $requirements): void
+     {
+         if ($requirements) {
+@@ -300,5 +300,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function addOptions(array $options)
++    public function addOptions(array $options): void
+     {
+         if ($options) {
+@@ -316,5 +316,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function setSchemes(string|array $schemes)
++    public function setSchemes(string|array $schemes): void
+     {
+         foreach ($this->routes as $route) {
+@@ -330,5 +330,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function setMethods(string|array $methods)
++    public function setMethods(string|array $methods): void
+     {
+         foreach ($this->routes as $route) {
+@@ -353,5 +353,5 @@ class RouteCollection implements \IteratorAggregate, \Countable
+      * @return void
+      */
+-    public function addResource(ResourceInterface $resource)
++    public function addResource(ResourceInterface $resource): void
+     {
+         $key = (string) $resource;
 diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
-index f7f2454062..73fbc8eb54 100644
+index 058613072e..d921721850 100644
 --- a/src/Symfony/Component/Routing/Router.php
 +++ b/src/Symfony/Component/Routing/Router.php
-@@ -175,5 +175,5 @@ class Router implements RouterInterface, RequestMatcherInterface
+@@ -121,5 +121,5 @@ class Router implements RouterInterface, RequestMatcherInterface
+      * @return void
+      */
+-    public function setOptions(array $options)
++    public function setOptions(array $options): void
+     {
+         $this->options = [
+@@ -156,5 +156,5 @@ class Router implements RouterInterface, RequestMatcherInterface
+      * @return void
+      */
+-    public function setOption(string $key, mixed $value)
++    public function setOption(string $key, mixed $value): void
+     {
+         if (!\array_key_exists($key, $this->options)) {
+@@ -179,5 +179,5 @@ class Router implements RouterInterface, RequestMatcherInterface
      }
  
 -    public function getRouteCollection()
 +    public function getRouteCollection(): RouteCollection
      {
          return $this->collection ??= $this->loader->load($this->resource, $this->options['resource_type']);
+@@ -187,5 +187,5 @@ class Router implements RouterInterface, RequestMatcherInterface
+      * @return void
+      */
+-    public function setContext(RequestContext $context)
++    public function setContext(RequestContext $context): void
+     {
+         $this->context = $context;
+@@ -209,5 +209,5 @@ class Router implements RouterInterface, RequestMatcherInterface
+      * @return void
+      */
+-    public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory)
++    public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory): void
+     {
+         $this->configCacheFactory = $configCacheFactory;
+@@ -315,5 +315,5 @@ class Router implements RouterInterface, RequestMatcherInterface
+      * @return void
+      */
+-    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
++    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider): void
+     {
+         $this->expressionLanguageProviders[] = $provider;
 diff --git a/src/Symfony/Component/Routing/RouterInterface.php b/src/Symfony/Component/Routing/RouterInterface.php
 index 6912f8a15b..caf18c886a 100644
 --- a/src/Symfony/Component/Routing/RouterInterface.php
@@ -1880,6 +9752,31 @@ index 6912f8a15b..caf18c886a 100644
 -    public function getRouteCollection();
 +    public function getRouteCollection(): RouteCollection;
  }
+diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php
+index 341883f3c5..d508e0ce1e 100644
+--- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php
++++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php
+@@ -35,5 +35,5 @@ class InMemoryTokenProvider implements TokenProviderInterface
+      * @return void
+      */
+-    public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTime $lastUsed)
++    public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTime $lastUsed): void
+     {
+         if (!isset($this->tokens[$series])) {
+@@ -54,5 +54,5 @@ class InMemoryTokenProvider implements TokenProviderInterface
+      * @return void
+      */
+-    public function deleteTokenBySeries(string $series)
++    public function deleteTokenBySeries(string $series): void
+     {
+         unset($this->tokens[$series]);
+@@ -62,5 +62,5 @@ class InMemoryTokenProvider implements TokenProviderInterface
+      * @return void
+      */
+-    public function createNewToken(PersistentTokenInterface $token)
++    public function createNewToken(PersistentTokenInterface $token): void
+     {
+         $this->tokens[$token->getSeries()] = $token;
 diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
 index 9b32fdce31..fbbd65d8b7 100644
 --- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
@@ -1891,6 +9788,67 @@ index 9b32fdce31..fbbd65d8b7 100644
 +    public function loadTokenBySeries(string $series): PersistentTokenInterface;
  
      /**
+diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
+index 4416cda616..0fcf4303e0 100644
+--- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
++++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
+@@ -57,5 +57,5 @@ abstract class AbstractToken implements TokenInterface, \Serializable
+      * @return void
+      */
+-    public function setUser(UserInterface $user)
++    public function setUser(UserInterface $user): void
+     {
+         $this->user = $user;
+@@ -65,5 +65,5 @@ abstract class AbstractToken implements TokenInterface, \Serializable
+      * @return void
+      */
+-    public function eraseCredentials()
++    public function eraseCredentials(): void
+     {
+         if ($this->getUser() instanceof UserInterface) {
+@@ -122,5 +122,5 @@ abstract class AbstractToken implements TokenInterface, \Serializable
+      * @return void
+      */
+-    public function setAttributes(array $attributes)
++    public function setAttributes(array $attributes): void
+     {
+         $this->attributes = $attributes;
+@@ -144,5 +144,5 @@ abstract class AbstractToken implements TokenInterface, \Serializable
+      * @return void
+      */
+-    public function setAttribute(string $name, mixed $value)
++    public function setAttribute(string $name, mixed $value): void
+     {
+         $this->attributes[$name] = $value;
+diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
+index 3df95e527d..ec72b91986 100644
+--- a/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
++++ b/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
+@@ -47,5 +47,5 @@ class NullToken implements TokenInterface
+      * @return void
+      */
+-    public function eraseCredentials()
++    public function eraseCredentials(): void
+     {
+     }
+diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php
+index 0ec6b1cfb9..2e235a6069 100644
+--- a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php
++++ b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php
+@@ -41,5 +41,5 @@ class TokenStorage implements TokenStorageInterface, ResetInterface
+      * @return void
+      */
+-    public function setToken(TokenInterface $token = null)
++    public function setToken(TokenInterface $token = null): void
+     {
+         if (1 > \func_num_args()) {
+@@ -64,5 +64,5 @@ class TokenStorage implements TokenStorageInterface, ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->setToken(null);
 diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php
 index c8db1485e0..34bf5a5763 100644
 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php
@@ -1934,17 +9892,104 @@ index 054dd95728..e6704119b2 100644
 +    public function getAuthenticationToken(): TokenInterface
      {
          return $this->authenticationToken;
+diff --git a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
+index 88804d6591..a991d35f46 100644
+--- a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
++++ b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
+@@ -38,5 +38,5 @@ class AccessDeniedException extends RuntimeException
+      * @return void
+      */
+-    public function setAttributes(array|string $attributes)
++    public function setAttributes(array|string $attributes): void
+     {
+         $this->attributes = (array) $attributes;
+@@ -51,5 +51,5 @@ class AccessDeniedException extends RuntimeException
+      * @return void
+      */
+-    public function setSubject(mixed $subject)
++    public function setSubject(mixed $subject): void
+     {
+         $this->subject = $subject;
+diff --git a/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php b/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php
+index 5b064929ed..c37e9140a6 100644
+--- a/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php
++++ b/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php
+@@ -36,5 +36,5 @@ abstract class AccountStatusException extends AuthenticationException
+      * @return void
+      */
+-    public function setUser(UserInterface $user)
++    public function setUser(UserInterface $user): void
+     {
+         $this->user = $user;
 diff --git a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
-index 69ac3d6ec4..d96c7d038d 100644
+index adec6f8758..1349f0af1e 100644
 --- a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
 +++ b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
-@@ -91,5 +91,5 @@ class AuthenticationException extends RuntimeException
+@@ -43,5 +43,5 @@ class AuthenticationException extends RuntimeException
+      * @return void
+      */
+-    public function setToken(TokenInterface $token)
++    public function setToken(TokenInterface $token): void
+     {
+         $this->token = $token;
+@@ -94,5 +94,5 @@ class AuthenticationException extends RuntimeException
       * @return string
       */
 -    public function getMessageKey()
 +    public function getMessageKey(): string
      {
          return 'An authentication exception occurred.';
+diff --git a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAccountStatusException.php b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAccountStatusException.php
+index 829a22cd1b..2c72c15a41 100644
+--- a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAccountStatusException.php
++++ b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAccountStatusException.php
+@@ -42,5 +42,5 @@ class CustomUserMessageAccountStatusException extends AccountStatusException
+      * @return void
+      */
+-    public function setSafeMessage(string $messageKey, array $messageData = [])
++    public function setSafeMessage(string $messageKey, array $messageData = []): void
+     {
+         $this->messageKey = $messageKey;
+diff --git a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php
+index 40de92d29f..2e310539a6 100644
+--- a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php
++++ b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php
+@@ -41,5 +41,5 @@ class CustomUserMessageAuthenticationException extends AuthenticationException
+      * @return void
+      */
+-    public function setSafeMessage(string $messageKey, array $messageData = [])
++    public function setSafeMessage(string $messageKey, array $messageData = []): void
+     {
+         $this->messageKey = $messageKey;
+diff --git a/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php b/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
+index da094d2bbf..f9b6e30c47 100644
+--- a/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
++++ b/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
+@@ -53,5 +53,5 @@ class RoleHierarchy implements RoleHierarchyInterface
+      * @return void
+      */
+-    protected function buildRoleMap()
++    protected function buildRoleMap(): void
+     {
+         $this->map = [];
+diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserChecker.php b/src/Symfony/Component/Security/Core/User/InMemoryUserChecker.php
+index a493b00e79..377dcacc09 100644
+--- a/src/Symfony/Component/Security/Core/User/InMemoryUserChecker.php
++++ b/src/Symfony/Component/Security/Core/User/InMemoryUserChecker.php
+@@ -24,5 +24,5 @@ class InMemoryUserChecker implements UserCheckerInterface
+      * @return void
+      */
+-    public function checkPreAuth(UserInterface $user)
++    public function checkPreAuth(UserInterface $user): void
+     {
+         if (!$user instanceof InMemoryUser) {
+@@ -40,5 +40,5 @@ class InMemoryUserChecker implements UserCheckerInterface
+      * @return void
+      */
+-    public function checkPostAuth(UserInterface $user)
++    public function checkPostAuth(UserInterface $user): void
+     {
+     }
 diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
 index b4ffa1dcd4..dd3c58a6d0 100644
 --- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
@@ -1974,6 +10019,97 @@ index ec90d413fa..9f1401aa91 100644
 +    public function supportsClass(string $class): bool;
  
      /**
+diff --git a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
+index 8fd2205a9d..5d5a72ac41 100644
+--- a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
++++ b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
+@@ -35,5 +35,5 @@ class UserPasswordValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $password, Constraint $constraint)
++    public function validate(mixed $password, Constraint $constraint): void
+     {
+         if (!$constraint instanceof UserPassword) {
+diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php b/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php
+index 7de8b52969..97e61d84da 100644
+--- a/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php
++++ b/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php
+@@ -55,5 +55,5 @@ class NativeSessionTokenStorage implements ClearableTokenStorageInterface
+      * @return void
+      */
+-    public function setToken(string $tokenId, #[\SensitiveParameter] string $token)
++    public function setToken(string $tokenId, #[\SensitiveParameter] string $token): void
+     {
+         if (!$this->sessionStarted) {
+@@ -97,5 +97,5 @@ class NativeSessionTokenStorage implements ClearableTokenStorageInterface
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         unset($_SESSION[$this->namespace]);
+diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php b/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php
+index 4b3c3e56a5..7937512868 100644
+--- a/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php
++++ b/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php
+@@ -60,5 +60,5 @@ class SessionTokenStorage implements ClearableTokenStorageInterface
+      * @return void
+      */
+-    public function setToken(string $tokenId, #[\SensitiveParameter] string $token)
++    public function setToken(string $tokenId, #[\SensitiveParameter] string $token): void
+     {
+         $session = $this->getSession();
+@@ -93,5 +93,5 @@ class SessionTokenStorage implements ClearableTokenStorageInterface
+      * @return void
+      */
+-    public function clear()
++    public function clear(): void
+     {
+         $session = $this->getSession();
+diff --git a/src/Symfony/Component/Security/Http/AccessMap.php b/src/Symfony/Component/Security/Http/AccessMap.php
+index 6c05dffa21..4b60abcb25 100644
+--- a/src/Symfony/Component/Security/Http/AccessMap.php
++++ b/src/Symfony/Component/Security/Http/AccessMap.php
+@@ -31,5 +31,5 @@ class AccessMap implements AccessMapInterface
+      * @return void
+      */
+-    public function add(RequestMatcherInterface $requestMatcher, array $attributes = [], string $channel = null)
++    public function add(RequestMatcherInterface $requestMatcher, array $attributes = [], string $channel = null): void
+     {
+         $this->map[] = [$requestMatcher, $attributes, $channel];
+diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
+index c6ffa45279..734e29fdf5 100644
+--- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
++++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
+@@ -63,5 +63,5 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle
+      * @return void
+      */
+-    public function setOptions(array $options)
++    public function setOptions(array $options): void
+     {
+         $this->options = array_merge($this->defaultOptions, $options);
+diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
+index bd9d98c65b..b12f3bbf51 100644
+--- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
++++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
+@@ -69,5 +69,5 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
+      * @return void
+      */
+-    public function setOptions(array $options)
++    public function setOptions(array $options): void
+     {
+         $this->options = array_merge($this->defaultOptions, $options);
+diff --git a/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php
+index e88a04056e..07493c5f20 100644
+--- a/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php
++++ b/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php
+@@ -99,5 +99,5 @@ class AccessTokenAuthenticator implements AuthenticatorInterface
+      * @return void
+      */
+-    public function setTranslator(?TranslatorInterface $translator)
++    public function setTranslator(?TranslatorInterface $translator): void
+     {
+         $this->translator = $translator;
 diff --git a/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php b/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php
 index 91271d14a3..100c2fb549 100644
 --- a/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php
@@ -1984,17 +10120,82 @@ index 91271d14a3..100c2fb549 100644
 -    public function start(Request $request, AuthenticationException $authException = null);
 +    public function start(Request $request, AuthenticationException $authException = null): Response;
  }
+diff --git a/src/Symfony/Component/Security/Http/Event/LazyResponseEvent.php b/src/Symfony/Component/Security/Http/Event/LazyResponseEvent.php
+index 46a25eed07..b3e25f1af3 100644
+--- a/src/Symfony/Component/Security/Http/Event/LazyResponseEvent.php
++++ b/src/Symfony/Component/Security/Http/Event/LazyResponseEvent.php
+@@ -32,5 +32,5 @@ final class LazyResponseEvent extends RequestEvent
+     }
+ 
+-    public function setResponse(Response $response)
++    public function setResponse(Response $response): void
+     {
+         $this->stopPropagation();
+diff --git a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
+index 1d2a4b2be1..ecc6b58a8f 100644
+--- a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
++++ b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
+@@ -69,5 +69,5 @@ class LoginFailureEvent extends Event
+      * @return void
+      */
+-    public function setResponse(?Response $response)
++    public function setResponse(?Response $response): void
+     {
+         $this->response = $response;
+diff --git a/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php b/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
+index 7ee9f41fcd..d7c5312900 100644
+--- a/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
++++ b/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
+@@ -40,5 +40,5 @@ class IsGrantedAttributeListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onKernelControllerArguments(ControllerArgumentsEvent $event)
++    public function onKernelControllerArguments(ControllerArgumentsEvent $event): void
+     {
+         /** @var IsGranted[] $attributes */
 diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php
-index 69be986785..a32d9871d9 100644
+index fc56733efa..8538f5f821 100644
 --- a/src/Symfony/Component/Security/Http/Firewall.php
 +++ b/src/Symfony/Component/Security/Http/Firewall.php
-@@ -103,5 +103,5 @@ class Firewall implements EventSubscriberInterface
+@@ -51,5 +51,5 @@ class Firewall implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onKernelRequest(RequestEvent $event)
++    public function onKernelRequest(RequestEvent $event): void
+     {
+         if (!$event->isMainRequest()) {
+@@ -99,5 +99,5 @@ class Firewall implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onKernelFinishRequest(FinishRequestEvent $event)
++    public function onKernelFinishRequest(FinishRequestEvent $event): void
+     {
+         $request = $event->getRequest();
+@@ -109,5 +109,5 @@ class Firewall implements EventSubscriberInterface
      }
  
 -    public static function getSubscribedEvents()
 +    public static function getSubscribedEvents(): array
      {
          return [
+@@ -120,5 +120,5 @@ class Firewall implements EventSubscriberInterface
+      * @return void
+      */
+-    protected function callListeners(RequestEvent $event, iterable $listeners)
++    protected function callListeners(RequestEvent $event, iterable $listeners): void
+     {
+         foreach ($listeners as $listener) {
+diff --git a/src/Symfony/Component/Security/Http/FirewallMap.php b/src/Symfony/Component/Security/Http/FirewallMap.php
+index 36c8c67e38..32a83871e5 100644
+--- a/src/Symfony/Component/Security/Http/FirewallMap.php
++++ b/src/Symfony/Component/Security/Http/FirewallMap.php
+@@ -35,5 +35,5 @@ class FirewallMap implements FirewallMapInterface
+      * @return void
+      */
+-    public function add(RequestMatcherInterface $requestMatcher = null, array $listeners = [], ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null)
++    public function add(RequestMatcherInterface $requestMatcher = null, array $listeners = [], ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null): void
+     {
+         $this->map[] = [$requestMatcher, $listeners, $exceptionListener, $logoutListener];
 diff --git a/src/Symfony/Component/Security/Http/FirewallMapInterface.php b/src/Symfony/Component/Security/Http/FirewallMapInterface.php
 index 480ea8ad6b..fa43d6a6e9 100644
 --- a/src/Symfony/Component/Security/Http/FirewallMapInterface.php
@@ -2005,6 +10206,71 @@ index 480ea8ad6b..fa43d6a6e9 100644
 -    public function getListeners(Request $request);
 +    public function getListeners(Request $request): array;
  }
+diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
+index 54f52194c7..72537120f9 100644
+--- a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
++++ b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
+@@ -50,5 +50,5 @@ class LogoutUrlGenerator
+      * @return void
+      */
+-    public function registerListener(string $key, string $logoutPath, ?string $csrfTokenId, ?string $csrfParameter, CsrfTokenManagerInterface $csrfTokenManager = null, string $context = null)
++    public function registerListener(string $key, string $logoutPath, ?string $csrfTokenId, ?string $csrfParameter, CsrfTokenManagerInterface $csrfTokenManager = null, string $context = null): void
+     {
+         $this->listeners[$key] = [$logoutPath, $csrfTokenId, $csrfParameter, $csrfTokenManager, $context];
+@@ -74,5 +74,5 @@ class LogoutUrlGenerator
+      * @return void
+      */
+-    public function setCurrentFirewall(?string $key, string $context = null)
++    public function setCurrentFirewall(?string $key, string $context = null): void
+     {
+         $this->currentFirewallName = $key;
+diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php
+index 6c75833c39..5282b7c158 100644
+--- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php
++++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php
+@@ -91,5 +91,5 @@ abstract class AbstractRememberMeHandler implements RememberMeHandlerInterface
+      * @return void
+      */
+-    protected function createCookie(?RememberMeDetails $rememberMeDetails)
++    protected function createCookie(?RememberMeDetails $rememberMeDetails): void
+     {
+         $request = $this->requestStack->getMainRequest();
+diff --git a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php
+index 63ede6193a..a26912201b 100644
+--- a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php
++++ b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php
+@@ -47,5 +47,5 @@ class SessionAuthenticationStrategy implements SessionAuthenticationStrategyInte
+      * @return void
+      */
+-    public function onAuthentication(Request $request, TokenInterface $token)
++    public function onAuthentication(Request $request, TokenInterface $token): void
+     {
+         switch ($this->strategy) {
+diff --git a/src/Symfony/Component/Semaphore/Store/RedisStore.php b/src/Symfony/Component/Semaphore/Store/RedisStore.php
+index 0e0f551876..1ab8bc9577 100644
+--- a/src/Symfony/Component/Semaphore/Store/RedisStore.php
++++ b/src/Symfony/Component/Semaphore/Store/RedisStore.php
+@@ -35,5 +35,5 @@ class RedisStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function save(Key $key, float $ttlInSecond)
++    public function save(Key $key, float $ttlInSecond): void
+     {
+         if (0 > $ttlInSecond) {
+@@ -101,5 +101,5 @@ class RedisStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function putOffExpiration(Key $key, float $ttlInSecond)
++    public function putOffExpiration(Key $key, float $ttlInSecond): void
+     {
+         if (0 > $ttlInSecond) {
+@@ -146,5 +146,5 @@ class RedisStore implements PersistingStoreInterface
+      * @return void
+      */
+-    public function delete(Key $key)
++    public function delete(Key $key): void
+     {
+         $script = '
 diff --git a/src/Symfony/Component/Serializer/Annotation/MaxDepth.php b/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
 index 43785b292a..df3453cedb 100644
 --- a/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
@@ -2016,6 +10282,17 @@ index 43785b292a..df3453cedb 100644
 +    public function getMaxDepth(): int
      {
          return $this->maxDepth;
+diff --git a/src/Symfony/Component/Serializer/DependencyInjection/SerializerPass.php b/src/Symfony/Component/Serializer/DependencyInjection/SerializerPass.php
+index 71376d4965..79a77b114e 100644
+--- a/src/Symfony/Component/Serializer/DependencyInjection/SerializerPass.php
++++ b/src/Symfony/Component/Serializer/DependencyInjection/SerializerPass.php
+@@ -35,5 +35,5 @@ class SerializerPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('serializer')) {
 diff --git a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php
 index 84a84ad1f3..6f66b6d32a 100644
 --- a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php
@@ -2033,6 +10310,70 @@ index 84a84ad1f3..6f66b6d32a 100644
 -    public function supportsDecoding(string $format);
 +    public function supportsDecoding(string $format): bool;
  }
+diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
+index aeee5ac680..4ac78f5458 100644
+--- a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
++++ b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
+@@ -98,5 +98,5 @@ class AttributeMetadata implements AttributeMetadataInterface
+      * @return void
+      */
+-    public function addGroup(string $group)
++    public function addGroup(string $group): void
+     {
+         if (!\in_array($group, $this->groups)) {
+@@ -113,5 +113,5 @@ class AttributeMetadata implements AttributeMetadataInterface
+      * @return void
+      */
+-    public function setMaxDepth(?int $maxDepth)
++    public function setMaxDepth(?int $maxDepth): void
+     {
+         $this->maxDepth = $maxDepth;
+@@ -126,5 +126,5 @@ class AttributeMetadata implements AttributeMetadataInterface
+      * @return void
+      */
+-    public function setSerializedName(string $serializedName = null)
++    public function setSerializedName(string $serializedName = null): void
+     {
+         if (1 > \func_num_args()) {
+@@ -153,5 +153,5 @@ class AttributeMetadata implements AttributeMetadataInterface
+      * @return void
+      */
+-    public function setIgnore(bool $ignore)
++    public function setIgnore(bool $ignore): void
+     {
+         $this->ignore = $ignore;
+@@ -218,5 +218,5 @@ class AttributeMetadata implements AttributeMetadataInterface
+      * @return void
+      */
+-    public function merge(AttributeMetadataInterface $attributeMetadata)
++    public function merge(AttributeMetadataInterface $attributeMetadata): void
+     {
+         foreach ($attributeMetadata->getGroups() as $group) {
+diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
+index fc6336ebdb..e13a834930 100644
+--- a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
++++ b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
+@@ -64,5 +64,5 @@ class ClassMetadata implements ClassMetadataInterface
+      * @return void
+      */
+-    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata)
++    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata): void
+     {
+         $this->attributesMetadata[$attributeMetadata->getName()] = $attributeMetadata;
+@@ -77,5 +77,5 @@ class ClassMetadata implements ClassMetadataInterface
+      * @return void
+      */
+-    public function merge(ClassMetadataInterface $classMetadata)
++    public function merge(ClassMetadataInterface $classMetadata): void
+     {
+         foreach ($classMetadata->getAttributesMetadata() as $attributeMetadata) {
+@@ -105,5 +105,5 @@ class ClassMetadata implements ClassMetadataInterface
+      * @return void
+      */
+-    public function setClassDiscriminatorMapping(ClassDiscriminatorMapping $mapping = null)
++    public function setClassDiscriminatorMapping(ClassDiscriminatorMapping $mapping = null): void
+     {
+         if (1 > \func_num_args()) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 index 829e178407..1ac8101771 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -2108,6 +10449,17 @@ index e64cfc8802..112b74b07a 100644
 +    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
      {
          if (!isset($context['cache_key'])) {
+diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareTrait.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareTrait.php
+index c5cc86ecf6..c65534fafb 100644
+--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareTrait.php
++++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareTrait.php
+@@ -25,5 +25,5 @@ trait DenormalizerAwareTrait
+      * @return void
+      */
+-    public function setDenormalizer(DenormalizerInterface $denormalizer)
++    public function setDenormalizer(DenormalizerInterface $denormalizer): void
+     {
+         $this->denormalizer = $denormalizer;
 diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
 index ae3adbfe33..3a38429cf1 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
@@ -2125,6 +10477,28 @@ index ae3adbfe33..3a38429cf1 100644
 -    public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */);
 +    public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */): bool;
  }
+diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
+index e08dd5d9ec..cc282ae4bb 100644
+--- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
++++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
+@@ -138,5 +138,5 @@ class GetSetMethodNormalizer extends AbstractObjectNormalizer
+      * @return void
+      */
+-    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
++    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = []): void
+     {
+         $setter = 'set'.ucfirst($attribute);
+diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareTrait.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareTrait.php
+index 40a4fa0e8c..a1e2749aae 100644
+--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareTrait.php
++++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareTrait.php
+@@ -25,5 +25,5 @@ trait NormalizerAwareTrait
+      * @return void
+      */
+-    public function setNormalizer(NormalizerInterface $normalizer)
++    public function setNormalizer(NormalizerInterface $normalizer): void
+     {
+         $this->normalizer = $normalizer;
 diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
 index 691e9c70f0..fc87f672e1 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
@@ -2142,6 +10516,115 @@ index 691e9c70f0..fc87f672e1 100644
 -    public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */);
 +    public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */): bool;
  }
+diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+index 8018cb7a49..aa06b9c50b 100644
+--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
++++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+@@ -133,5 +133,5 @@ class ObjectNormalizer extends AbstractObjectNormalizer
+      * @return void
+      */
+-    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
++    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = []): void
+     {
+         try {
+diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
+index 3dd734055d..cbc0e86d27 100644
+--- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
++++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
+@@ -175,5 +175,5 @@ class PropertyNormalizer extends AbstractObjectNormalizer
+      * @return void
+      */
+-    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
++    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = []): void
+     {
+         try {
+diff --git a/src/Symfony/Component/Serializer/SerializerAwareTrait.php b/src/Symfony/Component/Serializer/SerializerAwareTrait.php
+index 1835568745..2b98fc11d6 100644
+--- a/src/Symfony/Component/Serializer/SerializerAwareTrait.php
++++ b/src/Symfony/Component/Serializer/SerializerAwareTrait.php
+@@ -25,5 +25,5 @@ trait SerializerAwareTrait
+      * @return void
+      */
+-    public function setSerializer(SerializerInterface $serializer)
++    public function setSerializer(SerializerInterface $serializer): void
+     {
+         $this->serializer = $serializer;
+diff --git a/src/Symfony/Component/Stopwatch/Stopwatch.php b/src/Symfony/Component/Stopwatch/Stopwatch.php
+index 33976a0e87..27f8dbfdc4 100644
+--- a/src/Symfony/Component/Stopwatch/Stopwatch.php
++++ b/src/Symfony/Component/Stopwatch/Stopwatch.php
+@@ -62,5 +62,5 @@ class Stopwatch implements ResetInterface
+      * @return void
+      */
+-    public function openSection(string $id = null)
++    public function openSection(string $id = null): void
+     {
+         $current = end($this->activeSections);
+@@ -86,5 +86,5 @@ class Stopwatch implements ResetInterface
+      * @return void
+      */
+-    public function stopSection(string $id)
++    public function stopSection(string $id): void
+     {
+         $this->stop('__section__');
+@@ -153,5 +153,5 @@ class Stopwatch implements ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->sections = $this->activeSections = ['__root__' => new Section(null, $this->morePrecision)];
+diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
+index 3bca2fd610..ff014a33b2 100644
+--- a/src/Symfony/Component/Stopwatch/StopwatchEvent.php
++++ b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
+@@ -120,5 +120,5 @@ class StopwatchEvent
+      * @return void
+      */
+-    public function ensureStopped()
++    public function ensureStopped(): void
+     {
+         while (\count($this->started)) {
+diff --git a/src/Symfony/Component/String/Slugger/AsciiSlugger.php b/src/Symfony/Component/String/Slugger/AsciiSlugger.php
+index 6e550c61cf..5cb704fae0 100644
+--- a/src/Symfony/Component/String/Slugger/AsciiSlugger.php
++++ b/src/Symfony/Component/String/Slugger/AsciiSlugger.php
+@@ -78,5 +78,5 @@ class AsciiSlugger implements SluggerInterface, LocaleAwareInterface
+      * @return void
+      */
+-    public function setLocale(string $locale)
++    public function setLocale(string $locale): void
+     {
+         $this->defaultLocale = $locale;
+diff --git a/src/Symfony/Component/Templating/DelegatingEngine.php b/src/Symfony/Component/Templating/DelegatingEngine.php
+index bbe500549a..a1cce0e692 100644
+--- a/src/Symfony/Component/Templating/DelegatingEngine.php
++++ b/src/Symfony/Component/Templating/DelegatingEngine.php
+@@ -42,5 +42,5 @@ class DelegatingEngine implements EngineInterface, StreamingEngineInterface
+      * @return void
+      */
+-    public function stream(string|TemplateReferenceInterface $name, array $parameters = [])
++    public function stream(string|TemplateReferenceInterface $name, array $parameters = []): void
+     {
+         $engine = $this->getEngine($name);
+@@ -60,5 +60,5 @@ class DelegatingEngine implements EngineInterface, StreamingEngineInterface
+      * @return void
+      */
+-    public function addEngine(EngineInterface $engine)
++    public function addEngine(EngineInterface $engine): void
+     {
+         $this->engines[] = $engine;
+diff --git a/src/Symfony/Component/Templating/Helper/Helper.php b/src/Symfony/Component/Templating/Helper/Helper.php
+index 537e8e584c..bf5c5aea70 100644
+--- a/src/Symfony/Component/Templating/Helper/Helper.php
++++ b/src/Symfony/Component/Templating/Helper/Helper.php
+@@ -29,5 +29,5 @@ abstract class Helper implements HelperInterface
+      * @return void
+      */
+-    public function setCharset(string $charset)
++    public function setCharset(string $charset): void
+     {
+         $this->charset = $charset;
 diff --git a/src/Symfony/Component/Templating/Helper/HelperInterface.php b/src/Symfony/Component/Templating/Helper/HelperInterface.php
 index 5dade65db5..db0d0a00ea 100644
 --- a/src/Symfony/Component/Templating/Helper/HelperInterface.php
@@ -2153,6 +10636,230 @@ index 5dade65db5..db0d0a00ea 100644
 +    public function getName(): string;
  
      /**
+diff --git a/src/Symfony/Component/Templating/Helper/SlotsHelper.php b/src/Symfony/Component/Templating/Helper/SlotsHelper.php
+index 7d5e7e008b..abbbff101c 100644
+--- a/src/Symfony/Component/Templating/Helper/SlotsHelper.php
++++ b/src/Symfony/Component/Templating/Helper/SlotsHelper.php
+@@ -32,5 +32,5 @@ class SlotsHelper extends Helper
+      * @return void
+      */
+-    public function start(string $name)
++    public function start(string $name): void
+     {
+         if (\in_array($name, $this->openSlots)) {
+@@ -52,5 +52,5 @@ class SlotsHelper extends Helper
+      * @return void
+      */
+-    public function stop()
++    public function stop(): void
+     {
+         if (!$this->openSlots) {
+@@ -84,5 +84,5 @@ class SlotsHelper extends Helper
+      * @return void
+      */
+-    public function set(string $name, string $content)
++    public function set(string $name, string $content): void
+     {
+         $this->slots[$name] = $content;
+diff --git a/src/Symfony/Component/Templating/Loader/ChainLoader.php b/src/Symfony/Component/Templating/Loader/ChainLoader.php
+index 936a75630b..784f3aa1c8 100644
+--- a/src/Symfony/Component/Templating/Loader/ChainLoader.php
++++ b/src/Symfony/Component/Templating/Loader/ChainLoader.php
+@@ -37,5 +37,5 @@ class ChainLoader extends Loader
+      * @return void
+      */
+-    public function addLoader(LoaderInterface $loader)
++    public function addLoader(LoaderInterface $loader): void
+     {
+         $this->loaders[] = $loader;
+diff --git a/src/Symfony/Component/Templating/Loader/Loader.php b/src/Symfony/Component/Templating/Loader/Loader.php
+index 6df5cf2124..0adb2c9d44 100644
+--- a/src/Symfony/Component/Templating/Loader/Loader.php
++++ b/src/Symfony/Component/Templating/Loader/Loader.php
+@@ -31,5 +31,5 @@ abstract class Loader implements LoaderInterface
+      * @return void
+      */
+-    public function setLogger(LoggerInterface $logger)
++    public function setLogger(LoggerInterface $logger): void
+     {
+         $this->logger = $logger;
+diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php
+index 0b158be9f2..cc3209cc9e 100644
+--- a/src/Symfony/Component/Templating/PhpEngine.php
++++ b/src/Symfony/Component/Templating/PhpEngine.php
+@@ -198,5 +198,5 @@ class PhpEngine implements EngineInterface, \ArrayAccess
+      * @return void
+      */
+-    public function addHelpers(array $helpers)
++    public function addHelpers(array $helpers): void
+     {
+         foreach ($helpers as $alias => $helper) {
+@@ -212,5 +212,5 @@ class PhpEngine implements EngineInterface, \ArrayAccess
+      * @return void
+      */
+-    public function setHelpers(array $helpers)
++    public function setHelpers(array $helpers): void
+     {
+         $this->helpers = [];
+@@ -221,5 +221,5 @@ class PhpEngine implements EngineInterface, \ArrayAccess
+      * @return void
+      */
+-    public function set(HelperInterface $helper, string $alias = null)
++    public function set(HelperInterface $helper, string $alias = null): void
+     {
+         $this->helpers[$helper->getName()] = $helper;
+@@ -258,5 +258,5 @@ class PhpEngine implements EngineInterface, \ArrayAccess
+      * @return void
+      */
+-    public function extend(string $template)
++    public function extend(string $template): void
+     {
+         $this->parents[$this->current] = $template;
+@@ -290,5 +290,5 @@ class PhpEngine implements EngineInterface, \ArrayAccess
+      * @return void
+      */
+-    public function setCharset(string $charset)
++    public function setCharset(string $charset): void
+     {
+         if ('UTF8' === $charset = strtoupper($charset)) {
+@@ -315,5 +315,5 @@ class PhpEngine implements EngineInterface, \ArrayAccess
+      * @return void
+      */
+-    public function setEscaper(string $context, callable $escaper)
++    public function setEscaper(string $context, callable $escaper): void
+     {
+         $this->escapers[$context] = $escaper;
+@@ -338,5 +338,5 @@ class PhpEngine implements EngineInterface, \ArrayAccess
+      * @return void
+      */
+-    public function addGlobal(string $name, mixed $value)
++    public function addGlobal(string $name, mixed $value): void
+     {
+         $this->globals[$name] = $value;
+@@ -370,5 +370,5 @@ class PhpEngine implements EngineInterface, \ArrayAccess
+      * @return void
+      */
+-    protected function initializeEscapers()
++    protected function initializeEscapers(): void
+     {
+         $flags = \ENT_QUOTES | \ENT_SUBSTITUTE;
+diff --git a/src/Symfony/Component/Translation/Catalogue/MergeOperation.php b/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
+index 1b777a8435..804cc138fc 100644
+--- a/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
++++ b/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
+@@ -28,5 +28,5 @@ class MergeOperation extends AbstractOperation
+      * @return void
+      */
+-    protected function processDomain(string $domain)
++    protected function processDomain(string $domain): void
+     {
+         $this->messages[$domain] = [
+diff --git a/src/Symfony/Component/Translation/Catalogue/TargetOperation.php b/src/Symfony/Component/Translation/Catalogue/TargetOperation.php
+index 2c0ec722ee..ff3a7c7c85 100644
+--- a/src/Symfony/Component/Translation/Catalogue/TargetOperation.php
++++ b/src/Symfony/Component/Translation/Catalogue/TargetOperation.php
+@@ -29,5 +29,5 @@ class TargetOperation extends AbstractOperation
+      * @return void
+      */
+-    protected function processDomain(string $domain)
++    protected function processDomain(string $domain): void
+     {
+         $this->messages[$domain] = [
+diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
+index 73ddae5dcc..f327362d39 100644
+--- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php
++++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
+@@ -54,5 +54,5 @@ class XliffLintCommand extends Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+         $this
+diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php
+index 0e584daad1..b7bb0c070d 100644
+--- a/src/Symfony/Component/Translation/DataCollectorTranslator.php
++++ b/src/Symfony/Component/Translation/DataCollectorTranslator.php
+@@ -52,5 +52,5 @@ class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInter
+      * @return void
+      */
+-    public function setLocale(string $locale)
++    public function setLocale(string $locale): void
+     {
+         $this->translator->setLocale($locale);
+diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php
+index 2ece6ac7b3..1bac9cfb3e 100644
+--- a/src/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php
++++ b/src/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php
+@@ -24,5 +24,5 @@ class TranslationDumperPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('translation.writer')) {
+diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php
+index 1baf9341e4..2e6d94b696 100644
+--- a/src/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php
++++ b/src/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php
+@@ -25,5 +25,5 @@ class TranslationExtractorPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('translation.extractor')) {
+diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
+index 9d4418d639..d1959f433d 100644
+--- a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
++++ b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
+@@ -22,5 +22,5 @@ class TranslatorPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('translator.default')) {
+diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php
+index ac83f0e26d..654d076323 100644
+--- a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php
++++ b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php
+@@ -43,5 +43,5 @@ class TranslatorPathsPass extends AbstractRecursivePass
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('translator')) {
+diff --git a/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php b/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php
+index 8f54752590..cefb1e1b80 100644
+--- a/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php
++++ b/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php
+@@ -44,5 +44,5 @@ class CsvFileDumper extends FileDumper
+      * @return void
+      */
+-    public function setCsvControl(string $delimiter = ';', string $enclosure = '"')
++    public function setCsvControl(string $delimiter = ';', string $enclosure = '"'): void
+     {
+         $this->delimiter = $delimiter;
+diff --git a/src/Symfony/Component/Translation/Dumper/FileDumper.php b/src/Symfony/Component/Translation/Dumper/FileDumper.php
+index ed2c278aaf..0722e1c160 100644
+--- a/src/Symfony/Component/Translation/Dumper/FileDumper.php
++++ b/src/Symfony/Component/Translation/Dumper/FileDumper.php
+@@ -40,5 +40,5 @@ abstract class FileDumper implements DumperInterface
+      * @return void
+      */
+-    public function setRelativePathTemplate(string $relativePathTemplate)
++    public function setRelativePathTemplate(string $relativePathTemplate): void
+     {
+         $this->relativePathTemplate = $relativePathTemplate;
+@@ -48,5 +48,5 @@ abstract class FileDumper implements DumperInterface
+      * @return void
+      */
+-    public function dump(MessageCatalogue $messages, array $options = [])
++    public function dump(MessageCatalogue $messages, array $options = []): void
+     {
+         if (!\array_key_exists('path', $options)) {
 diff --git a/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php b/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php
 index 4c088b94f9..86107a636d 100644
 --- a/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php
@@ -2169,67 +10876,927 @@ index 4c088b94f9..86107a636d 100644
 -    abstract protected function extractFromDirectory(string|array $resource);
 +    abstract protected function extractFromDirectory(string|array $resource): iterable;
  }
+diff --git a/src/Symfony/Component/Translation/Extractor/ChainExtractor.php b/src/Symfony/Component/Translation/Extractor/ChainExtractor.php
+index d36f7f385a..dbaeceee09 100644
+--- a/src/Symfony/Component/Translation/Extractor/ChainExtractor.php
++++ b/src/Symfony/Component/Translation/Extractor/ChainExtractor.php
+@@ -33,5 +33,5 @@ class ChainExtractor implements ExtractorInterface
+      * @return void
+      */
+-    public function addExtractor(string $format, ExtractorInterface $extractor)
++    public function addExtractor(string $format, ExtractorInterface $extractor): void
+     {
+         $this->extractors[$format] = $extractor;
+@@ -41,5 +41,5 @@ class ChainExtractor implements ExtractorInterface
+      * @return void
+      */
+-    public function setPrefix(string $prefix)
++    public function setPrefix(string $prefix): void
+     {
+         foreach ($this->extractors as $extractor) {
+@@ -51,5 +51,5 @@ class ChainExtractor implements ExtractorInterface
+      * @return void
+      */
+-    public function extract(string|iterable $directory, MessageCatalogue $catalogue)
++    public function extract(string|iterable $directory, MessageCatalogue $catalogue): void
+     {
+         foreach ($this->extractors as $extractor) {
+diff --git a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
+index 7f2f96be64..266c7f48c9 100644
+--- a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
++++ b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
+@@ -56,5 +56,5 @@ class CsvFileLoader extends FileLoader
+      * @return void
+      */
+-    public function setCsvControl(string $delimiter = ';', string $enclosure = '"', string $escape = '\\')
++    public function setCsvControl(string $delimiter = ';', string $enclosure = '"', string $escape = '\\'): void
+     {
+         $this->delimiter = $delimiter;
+diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php
+index e107bf223c..817940a626 100644
+--- a/src/Symfony/Component/Translation/LoggingTranslator.php
++++ b/src/Symfony/Component/Translation/LoggingTranslator.php
+@@ -49,5 +49,5 @@ class LoggingTranslator implements TranslatorInterface, TranslatorBagInterface,
+      * @return void
+      */
+-    public function setLocale(string $locale)
++    public function setLocale(string $locale): void
+     {
+         $prev = $this->translator->getLocale();
+diff --git a/src/Symfony/Component/Translation/MessageCatalogue.php b/src/Symfony/Component/Translation/MessageCatalogue.php
+index 379d947ce7..effc8dab3d 100644
+--- a/src/Symfony/Component/Translation/MessageCatalogue.php
++++ b/src/Symfony/Component/Translation/MessageCatalogue.php
+@@ -84,5 +84,5 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
+      * @return void
+      */
+-    public function set(string $id, string $translation, string $domain = 'messages')
++    public function set(string $id, string $translation, string $domain = 'messages'): void
+     {
+         $this->add([$id => $translation], $domain);
+@@ -127,5 +127,5 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
+      * @return void
+      */
+-    public function replace(array $messages, string $domain = 'messages')
++    public function replace(array $messages, string $domain = 'messages'): void
+     {
+         unset($this->messages[$domain], $this->messages[$domain.self::INTL_DOMAIN_SUFFIX]);
+@@ -137,5 +137,5 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
+      * @return void
+      */
+-    public function add(array $messages, string $domain = 'messages')
++    public function add(array $messages, string $domain = 'messages'): void
+     {
+         $altDomain = str_ends_with($domain, self::INTL_DOMAIN_SUFFIX) ? substr($domain, 0, -\strlen(self::INTL_DOMAIN_SUFFIX)) : $domain.self::INTL_DOMAIN_SUFFIX;
+@@ -153,5 +153,5 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
+      * @return void
+      */
+-    public function addCatalogue(MessageCatalogueInterface $catalogue)
++    public function addCatalogue(MessageCatalogueInterface $catalogue): void
+     {
+         if ($catalogue->getLocale() !== $this->locale) {
+@@ -185,5 +185,5 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
+      * @return void
+      */
+-    public function addFallbackCatalogue(MessageCatalogueInterface $catalogue)
++    public function addFallbackCatalogue(MessageCatalogueInterface $catalogue): void
+     {
+         // detect circular references
+@@ -227,5 +227,5 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
+      * @return void
+      */
+-    public function addResource(ResourceInterface $resource)
++    public function addResource(ResourceInterface $resource): void
+     {
+         $this->resources[$resource->__toString()] = $resource;
+@@ -254,5 +254,5 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
+      * @return void
+      */
+-    public function setMetadata(string $key, mixed $value, string $domain = 'messages')
++    public function setMetadata(string $key, m
10000
ixed $value, string $domain = 'messages'): void
+     {
+         $this->metadata[$domain][$key] = $value;
+@@ -262,5 +262,5 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
+      * @return void
+      */
+-    public function deleteMetadata(string $key = '', string $domain = 'messages')
++    public function deleteMetadata(string $key = '', string $domain = 'messages'): void
+     {
+         if ('' == $domain) {
+@@ -295,5 +295,5 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
+      * @return void
+      */
+-    public function setCatalogueMetadata(string $key, mixed $value, string $domain = 'messages')
++    public function setCatalogueMetadata(string $key, mixed $value, string $domain = 'messages'): void
+     {
+         $this->catalogueMetadata[$domain][$key] = $value;
+@@ -303,5 +303,5 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
+      * @return void
+      */
+-    public function deleteCatalogueMetadata(string $key = '', string $domain = 'messages')
++    public function deleteCatalogueMetadata(string $key = '', string $domain = 'messages'): void
+     {
+         if (!$domain) {
+diff --git a/src/Symfony/Component/Translation/Reader/TranslationReader.php b/src/Symfony/Component/Translation/Reader/TranslationReader.php
+index 01408d4dcd..cd49c7a920 100644
+--- a/src/Symfony/Component/Translation/Reader/TranslationReader.php
++++ b/src/Symfony/Component/Translation/Reader/TranslationReader.php
+@@ -37,5 +37,5 @@ class TranslationReader implements TranslationReaderInterface
+      * @return void
+      */
+-    public function addLoader(string $format, LoaderInterface $loader)
++    public function addLoader(string $format, LoaderInterface $loader): void
+     {
+         $this->loaders[$format] = $loader;
+@@ -45,5 +45,5 @@ class TranslationReader implements TranslationReaderInterface
+      * @return void
+      */
+-    public function read(string $directory, MessageCatalogue $catalogue)
++    public function read(string $directory, MessageCatalogue $catalogue): void
+     {
+         if (!is_dir($directory)) {
 diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
-index 54977283cc..ddcf594055 100644
+index f87218997e..34cca41175 100644
 --- a/src/Symfony/Component/Translation/Translator.php
 +++ b/src/Symfony/Component/Translation/Translator.php
-@@ -370,5 +370,5 @@ EOF
+@@ -84,5 +84,5 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA
+      * @return void
+      */
+-    public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory)
++    public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory): void
+     {
+         $this->configCacheFactory = $configCacheFactory;
+@@ -96,5 +96,5 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA
+      * @return void
+      */
+-    public function addLoader(string $format, LoaderInterface $loader)
++    public function addLoader(string $format, LoaderInterface $loader): void
+     {
+         $this->loaders[$format] = $loader;
+@@ -111,5 +111,5 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA
+      * @return void
+      */
+-    public function addResource(string $format, mixed $resource, string $locale, string $domain = null)
++    public function addResource(string $format, mixed $resource, string $locale, string $domain = null): void
+     {
+         $domain ??= 'messages';
+@@ -130,5 +130,5 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA
+      * @return void
+      */
+-    public function setLocale(string $locale)
++    public function setLocale(string $locale): void
+     {
+         $this->assertValidLocale($locale);
+@@ -150,5 +150,5 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA
+      * @return void
+      */
+-    public function setFallbackLocales(array $locales)
++    public function setFallbackLocales(array $locales): void
+     {
+         // needed as the fallback locales are linked to the already loaded catalogues
+@@ -237,5 +237,5 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA
+      * @return void
+      */
+-    protected function loadCatalogue(string $locale)
++    protected function loadCatalogue(string $locale): void
+     {
+         if (null === $this->cacheDir) {
+@@ -249,5 +249,5 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA
+      * @return void
+      */
+-    protected function initializeCatalogue(string $locale)
++    protected function initializeCatalogue(string $locale): void
+     {
+         $this->assertValidLocale($locale);
+@@ -388,5 +388,5 @@ EOF
       * @return array
       */
 -    protected function computeFallbackLocales(string $locale)
 +    protected function computeFallbackLocales(string $locale): array
      {
          $this->parentLocales ??= json_decode(file_get_contents(__DIR__.'/Resources/data/parents.json'), true);
+@@ -436,5 +436,5 @@ EOF
+      * @return void
+      */
+-    protected function assertValidLocale(string $locale)
++    protected function assertValidLocale(string $locale): void
+     {
+         if (!preg_match('/^[a-z0-9@_\\.\\-]*$/i', $locale)) {
+diff --git a/src/Symfony/Component/Translation/Writer/TranslationWriter.php b/src/Symfony/Component/Translation/Writer/TranslationWriter.php
+index 00d40192cd..6c25c7e716 100644
+--- a/src/Symfony/Component/Translation/Writer/TranslationWriter.php
++++ b/src/Symfony/Component/Translation/Writer/TranslationWriter.php
+@@ -34,5 +34,5 @@ class TranslationWriter implements TranslationWriterInterface
+      * @return void
+      */
+-    public function addDumper(string $format, DumperInterface $dumper)
++    public function addDumper(string $format, DumperInterface $dumper): void
+     {
+         $this->dumpers[$format] = $dumper;
+@@ -57,5 +57,5 @@ class TranslationWriter implements TranslationWriterInterface
+      * @return void
+      */
+-    public function write(MessageCatalogue $catalogue, string $format, array $options = [])
++    public function write(MessageCatalogue $catalogue, string $format, array $options = []): void
+     {
+         if (!isset($this->dumpers[$format])) {
+diff --git a/src/Symfony/Component/Validator/Command/DebugCommand.php b/src/Symfony/Component/Validator/Command/DebugCommand.php
+index acb00d7242..37cc40a06f 100644
+--- a/src/Symfony/Component/Validator/Command/DebugCommand.php
++++ b/src/Symfony/Component/Validator/Command/DebugCommand.php
+@@ -47,5 +47,5 @@ class DebugCommand extends Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+         $this
 diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php
-index ee1d68c78f..9baaabb04c 100644
+index d53bbb196f..4eecf85f8e 100644
 --- a/src/Symfony/Component/Validator/Constraint.php
 +++ b/src/Symfony/Component/Validator/Constraint.php
-@@ -254,5 +254,5 @@ abstract class Constraint
+@@ -236,5 +236,5 @@ abstract class Constraint
+      * @return void
+      */
+-    public function addImplicitGroupName(string $group)
++    public function addImplicitGroupName(string $group): void
+     {
+         if (null === $this->groups && \array_key_exists('groups', (array) $this)) {
+@@ -256,5 +256,5 @@ abstract class Constraint
       * @see __construct()
       */
 -    public function getDefaultOption()
 +    public function getDefaultOption(): ?string
      {
          return null;
-@@ -268,5 +268,5 @@ abstract class Constraint
+@@ -270,5 +270,5 @@ abstract class Constraint
       * @see __construct()
       */
 -    public function getRequiredOptions()
 +    public function getRequiredOptions(): array
      {
          return [];
-@@ -282,5 +282,5 @@ abstract class Constraint
+@@ -284,5 +284,5 @@ abstract class Constraint
       * @return string
       */
 -    public function validatedBy()
 +    public function validatedBy(): string
      {
          return static::class.'Validator';
-@@ -296,5 +296,5 @@ abstract class Constraint
+@@ -298,5 +298,5 @@ abstract class Constraint
       * @return string|string[] One or more constant values
       */
 -    public function getTargets()
 +    public function getTargets(): string|array
      {
          return self::PROPERTY_CONSTRAINT;
+diff --git a/src/Symfony/Component/Validator/ConstraintValidator.php b/src/Symfony/Component/Validator/ConstraintValidator.php
+index 3a3da8da82..db923387a5 100644
+--- a/src/Symfony/Component/Validator/ConstraintValidator.php
++++ b/src/Symfony/Component/Validator/ConstraintValidator.php
+@@ -40,5 +40,5 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface
+      * @return void
+      */
+-    public function initialize(ExecutionContextInterface $context)
++    public function initialize(ExecutionContextInterface $context): void
+     {
+         $this->context = $context;
+diff --git a/src/Symfony/Component/Validator/ConstraintViolationList.php b/src/Symfony/Component/Validator/ConstraintViolationList.php
+index 0b98624509..4367f247fc 100644
+--- a/src/Symfony/Component/Validator/ConstraintViolationList.php
++++ b/src/Symfony/Component/Validator/ConstraintViolationList.php
+@@ -60,5 +60,5 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
+      * @return void
+      */
+-    public function add(ConstraintViolationInterface $violation)
++    public function add(ConstraintViolationInterface $violation): void
+     {
+         $this->violations[] = $violation;
+@@ -68,5 +68,5 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
+      * @return void
+      */
+-    public function addAll(ConstraintViolationListInterface $otherList)
++    public function addAll(ConstraintViolationListInterface $otherList): void
+     {
+         foreach ($otherList as $violation) {
+@@ -92,5 +92,5 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
+      * @return void
+      */
+-    public function set(int $offset, ConstraintViolationInterface $violation)
++    public function set(int $offset, ConstraintViolationInterface $violation): void
+     {
+         $this->violations[$offset] = $violation;
+@@ -100,5 +100,5 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
+      * @return void
+      */
+-    public function remove(int $offset)
++    public function remove(int $offset): void
+     {
+         unset($this->violations[$offset]);
+diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
+index 29fd4daa8a..c358e6cc6f 100644
+--- a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
+@@ -38,5 +38,5 @@ abstract class AbstractComparisonValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof AbstractComparison) {
+diff --git a/src/Symfony/Component/Validator/Constraints/AllValidator.php b/src/Symfony/Component/Validator/Constraints/AllValidator.php
+index 15896f29da..22e24e34f9 100644
+--- a/src/Symfony/Component/Validator/Constraints/AllValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/AllValidator.php
+@@ -25,5 +25,5 @@ class AllValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof All) {
+diff --git a/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php b/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php
+index 5ce9e545ec..465ff8b13f 100644
+--- a/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php
+@@ -24,5 +24,5 @@ class AtLeastOneOfValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof AtLeastOneOf) {
+diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php
+index 3368a26c51..855dae6e01 100644
+--- a/src/Symfony/Component/Validator/Constraints/BicValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/BicValidator.php
+@@ -59,5 +59,5 @@ class BicValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Bic) {
+diff --git a/src/Symfony/Component/Validator/Constraints/BlankValidator.php b/src/Symfony/Component/Validator/Constraints/BlankValidator.php
+index 2551d5e244..0e5ae317e6 100644
+--- a/src/Symfony/Component/Validator/Constraints/BlankValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/BlankValidator.php
+@@ -24,5 +24,5 @@ class BlankValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Blank) {
+diff --git a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php
+index ea62a5c821..bbcdd4c7f6 100644
+--- a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php
+@@ -27,5 +27,5 @@ class CallbackValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $object, Constraint $constraint)
++    public function validate(mixed $object, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Callback) {
+diff --git a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
+index 3e51050158..16946072e8 100644
+--- a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
+@@ -97,5 +97,5 @@ class CardSchemeValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof CardScheme) {
+diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
+index 5528252c52..de7c2c1257 100644
+--- a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
+@@ -31,5 +31,5 @@ class ChoiceValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Choice) {
+diff --git a/src/Symfony/Component/Validator/Constraints/Collection.php b/src/Symfony/Component/Validator/Constraints/Collection.php
+index ee50fca169..62effcb311 100644
+--- a/src/Symfony/Component/Validator/Constraints/Collection.php
++++ b/src/Symfony/Component/Validator/Constraints/Collection.php
+@@ -61,5 +61,5 @@ class Collection extends Composite
+      * @return void
+      */
+-    protected function initializeNestedConstraints()
++    protected function initializeNestedConstraints(): void
+     {
+         parent::initializeNestedConstraints();
+diff --git a/src/Symfony/Component/Validator/Constraints/CollectionValidator.php b/src/Symfony/Component/Validator/Constraints/CollectionValidator.php
+index 7bb63e7ded..7ed823e822 100644
+--- a/src/Symfony/Component/Validator/Constraints/CollectionValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/CollectionValidator.php
+@@ -25,5 +25,5 @@ class CollectionValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Collection) {
+diff --git a/src/Symfony/Component/Validator/Constraints/Composite.php b/src/Symfony/Component/Validator/Constraints/Composite.php
+index df13315380..bcb59060f2 100644
+--- a/src/Symfony/Component/Validator/Constraints/Composite.php
++++ b/src/Symfony/Component/Validator/Constraints/Composite.php
+@@ -114,5 +114,5 @@ abstract class Composite extends Constraint
+      * @return void
+      */
+-    public function addImplicitGroupName(string $group)
++    public function addImplicitGroupName(string $group): void
+     {
+         parent::addImplicitGroupName($group);
+@@ -152,5 +152,5 @@ abstract class Composite extends Constraint
+      * @return void
+      */
+-    protected function initializeNestedConstraints()
++    protected function initializeNestedConstraints(): void
+     {
+     }
+diff --git a/src/Symfony/Component/Validator/Constraints/CompoundValidator.php b/src/Symfony/Component/Validator/Constraints/CompoundValidator.php
+index 8f9c713c79..12ebf9b5c9 100644
+--- a/src/Symfony/Component/Validator/Constraints/CompoundValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/CompoundValidator.php
+@@ -24,5 +24,5 @@ class CompoundValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Compound) {
+diff --git a/src/Symfony/Component/Validator/Constraints/CountValidator.php b/src/Symfony/Component/Validator/Constraints/CountValidator.php
+index 3c56023538..597e2b568c 100644
+--- a/src/Symfony/Component/Validator/Constraints/CountValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/CountValidator.php
+@@ -25,5 +25,5 @@ class CountValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Count) {
+diff --git a/src/Symfony/Component/Validator/Constraints/CountryValidator.php b/src/Symfony/Component/Validator/Constraints/CountryValidator.php
+index 54c8da0f9e..97061c3936 100644
+--- a/src/Symfony/Component/Validator/Constraints/CountryValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/CountryValidator.php
+@@ -28,5 +28,5 @@ class CountryValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Country) {
+diff --git a/src/Symfony/Component/Validator/Constraints/CurrencyValidator.php b/src/Symfony/Component/Validator/Constraints/CurrencyValidator.php
+index a50ea62ab6..5f5b5b4e5a 100644
+--- a/src/Symfony/Component/Validator/Constraints/CurrencyValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/CurrencyValidator.php
+@@ -29,5 +29,5 @@ class CurrencyValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Currency) {
+diff --git a/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php b/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
+index f02ba54daf..e89c616ec8 100644
+--- a/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
+@@ -25,5 +25,5 @@ class DateTimeValidator extends DateValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof DateTime) {
+diff --git a/src/Symfony/Component/Validator/Constraints/DateValidator.php b/src/Symfony/Component/Validator/Constraints/DateValidator.php
+index 0e3d848430..b4a6755388 100644
+--- a/src/Symfony/Component/Validator/Constraints/DateValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/DateValidator.php
+@@ -37,5 +37,5 @@ class DateValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Date) {
+diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
+index 43279c08be..291237f4f9 100644
+--- a/src/Symfony/Component/Validator/Constraints/EmailValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
+@@ -55,5 +55,5 @@ class EmailValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Email) {
+diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
+index d1fe60a791..3d602f5e7b 100644
+--- a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
+@@ -33,5 +33,5 @@ class ExpressionValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Expression) {
+diff --git a/src/Symfony/Component/Validator/Constraints/FileValidator.php b/src/Symfony/Component/Validator/Constraints/FileValidator.php
+index a632a54f48..9090968e1d 100644
+--- a/src/Symfony/Component/Validator/Constraints/FileValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/FileValidator.php
+@@ -42,5 +42,5 @@ class FileValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof File) {
+diff --git a/src/Symfony/Component/Validator/Constraints/HostnameValidator.php b/src/Symfony/Component/Validator/Constraints/HostnameValidator.php
+index 8b0fa60e20..25e2837f5c 100644
+--- a/src/Symfony/Component/Validator/Constraints/HostnameValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/HostnameValidator.php
+@@ -35,5 +35,5 @@ class HostnameValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Hostname) {
+diff --git a/src/Symfony/Component/Validator/Constraints/IbanValidator.php b/src/Symfony/Component/Validator/Constraints/IbanValidator.php
+index b1b17aac35..7537c0f15e 100644
+--- a/src/Symfony/Component/Validator/Constraints/IbanValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/IbanValidator.php
+@@ -141,5 +141,5 @@ class IbanValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Iban) {
+diff --git a/src/Symfony/Component/Validator/Constraints/ImageValidator.php b/src/Symfony/Component/Validator/Constraints/ImageValidator.php
+index 93386e6f88..bc6b9e6501 100644
+--- a/src/Symfony/Component/Validator/Constraints/ImageValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/ImageValidator.php
+@@ -29,5 +29,5 @@ class ImageValidator extends FileValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Image) {
+diff --git a/src/Symfony/Component/Validator/Constraints/IpValidator.php b/src/Symfony/Component/Validator/Constraints/IpValidator.php
+index 2f71a88045..3bc469e392 100644
+--- a/src/Symfony/Component/Validator/Constraints/IpValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/IpValidator.php
+@@ -28,5 +28,5 @@ class IpValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Ip) {
+diff --git a/src/Symfony/Component/Validator/Constraints/IsFalseValidator.php b/src/Symfony/Component/Validator/Constraints/IsFalseValidator.php
+index 76a24ad789..7e161c265c 100644
+--- a/src/Symfony/Component/Validator/Constraints/IsFalseValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/IsFalseValidator.php
+@@ -24,5 +24,5 @@ class IsFalseValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof IsFalse) {
+diff --git a/src/Symfony/Component/Validator/Constraints/IsNullValidator.php b/src/Symfony/Component/Validator/Constraints/IsNullValidator.php
+index 628aacf267..d45d075094 100644
+--- a/src/Symfony/Component/Validator/Constraints/IsNullValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/IsNullValidator.php
+@@ -24,5 +24,5 @@ class IsNullValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof IsNull) {
+diff --git a/src/Symfony/Component/Validator/Constraints/IsTrueValidator.php b/src/Symfony/Component/Validator/Constraints/IsTrueValidator.php
+index 644bbf70cb..4a1336e78b 100644
+--- a/src/Symfony/Component/Validator/Constraints/IsTrueValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/IsTrueValidator.php
+@@ -24,5 +24,5 @@ class IsTrueValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof IsTrue) {
 diff --git a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
-index da14aed66b..38a010dfcd 100644
+index c6445b16a5..50d738bdc9 100644
 --- a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
 +++ b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
-@@ -96,5 +96,5 @@ class IsbnValidator extends ConstraintValidator
+@@ -31,5 +31,5 @@ class IsbnValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Isbn) {
+@@ -99,5 +99,5 @@ class IsbnValidator extends ConstraintValidator
       * @return string|bool
       */
 -    protected function validateIsbn10(string $isbn)
 +    protected function validateIsbn10(string $isbn): string|bool
      {
          // Choose an algorithm so that ERROR_INVALID_CHARACTERS is preferred
-@@ -139,5 +139,5 @@ class IsbnValidator extends ConstraintValidator
+@@ -142,5 +142,5 @@ class IsbnValidator extends ConstraintValidator
       * @return string|bool
       */
 -    protected function validateIsbn13(string $isbn)
 +    protected function validateIsbn13(string $isbn): string|bool
      {
          // Error priority:
+diff --git a/src/Symfony/Component/Validator/Constraints/IsinValidator.php b/src/Symfony/Component/Validator/Constraints/IsinValidator.php
+index 21539cbcb7..86d85efe95 100644
+--- a/src/Symfony/Component/Validator/Constraints/IsinValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/IsinValidator.php
+@@ -27,5 +27,5 @@ class IsinValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Isin) {
+diff --git a/src/Symfony/Component/Validator/Constraints/IssnValidator.php b/src/Symfony/Component/Validator/Constraints/IssnValidator.php
+index 1962322b49..d934922b00 100644
+--- a/src/Symfony/Component/Validator/Constraints/IssnValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/IssnValidator.php
+@@ -30,5 +30,5 @@ class IssnValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Issn) {
+diff --git a/src/Symfony/Component/Validator/Constraints/JsonValidator.php b/src/Symfony/Component/Validator/Constraints/JsonValidator.php
+index f12424ae8b..bbec56c3bd 100644
+--- a/src/Symfony/Component/Validator/Constraints/JsonValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/JsonValidator.php
+@@ -24,5 +24,5 @@ class JsonValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Json) {
+diff --git a/src/Symfony/Component/Validator/Constraints/LanguageValidator.php b/src/Symfony/Component/Validator/Constraints/LanguageValidator.php
+index 4706c33569..909308a8b8 100644
+--- a/src/Symfony/Component/Validator/Constraints/LanguageValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/LanguageValidator.php
+@@ -28,5 +28,5 @@ class LanguageValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Language) {
+diff --git a/src/Symfony/Component/Validator/Constraints/LengthValidator.php b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
+index 98044c7c53..8c06e0ee64 100644
+--- a/src/Symfony/Component/Validator/Constraints/LengthValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
+@@ -25,5 +25,5 @@ class LengthValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Length) {
+diff --git a/src/Symfony/Component/Validator/Constraints/LocaleValidator.php b/src/Symfony/Component/Validator/Constraints/LocaleValidator.php
+index 4cd0b120b4..e918b84513 100644
+--- a/src/Symfony/Component/Validator/Constraints/LocaleValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/LocaleValidator.php
+@@ -28,5 +28,5 @@ class LocaleValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Locale) {
+diff --git a/src/Symfony/Component/Validator/Constraints/LuhnValidator.php b/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
+index a3f871e339..c6064e8b30 100644
+--- a/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
+@@ -34,5 +34,5 @@ class LuhnValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Luhn) {
+diff --git a/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php b/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
+index fa6c794c02..f46f38845e 100644
+--- a/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
+@@ -25,5 +25,5 @@ class NotBlankValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof NotBlank) {
+diff --git a/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php b/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php
+index 3894551807..e51ce88a88 100644
+--- a/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php
+@@ -55,5 +55,5 @@ class NotCompromisedPasswordValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof NotCompromisedPassword) {
+diff --git a/src/Symfony/Component/Validator/Constraints/NotNullValidator.php b/src/Symfony/Component/Validator/Constraints/NotNullValidator.php
+index 3f8f951280..503e779244 100644
+--- a/src/Symfony/Component/Validator/Constraints/NotNullValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/NotNullValidator.php
+@@ -24,5 +24,5 @@ class NotNullValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof NotNull) {
+diff --git a/src/Symfony/Component/Validator/Constraints/RangeValidator.php b/src/Symfony/Component/Validator/Constraints/RangeValidator.php
+index 18c399cd08..c98312a9aa 100644
+--- a/src/Symfony/Component/Validator/Constraints/RangeValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/RangeValidator.php
+@@ -35,5 +35,5 @@ class RangeValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Range) {
+diff --git a/src/Symfony/Component/Validator/Constraints/RegexValidator.php b/src/Symfony/Component/Validator/Constraints/RegexValidator.php
+index 4e9ae9039f..29e48a452d 100644
+--- a/src/Symfony/Component/Validator/Constraints/RegexValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/RegexValidator.php
+@@ -28,5 +28,5 @@ class RegexValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Regex) {
+diff --git a/src/Symfony/Component/Validator/Constraints/SequentiallyValidator.php b/src/Symfony/Component/Validator/Constraints/SequentiallyValidator.php
+index d076f3cfdd..cc54421652 100644
+--- a/src/Symfony/Component/Validator/Constraints/SequentiallyValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/SequentiallyValidator.php
+@@ -24,5 +24,5 @@ class SequentiallyValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Sequentially) {
+diff --git a/src/Symfony/Component/Validator/Constraints/TimeValidator.php b/src/Symfony/Component/Validator/Constraints/TimeValidator.php
+index c6d111cfe3..fed053db79 100644
+--- a/src/Symfony/Component/Validator/Constraints/TimeValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/TimeValidator.php
+@@ -37,5 +37,5 @@ class TimeValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Time) {
+diff --git a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
+index 20d81e8809..0d18cad247 100644
+--- a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
+@@ -30,5 +30,5 @@ class TimezoneValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Timezone) {
+diff --git a/src/Symfony/Component/Validator/Constraints/TypeValidator.php b/src/Symfony/Component/Validator/Constraints/TypeValidator.php
+index ad9e314572..f172b41a47 100644
+--- a/src/Symfony/Component/Validator/Constraints/TypeValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/TypeValidator.php
+@@ -56,5 +56,5 @@ class TypeValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Type) {
+diff --git a/src/Symfony/Component/Validator/Constraints/UlidValidator.php b/src/Symfony/Component/Validator/Constraints/UlidValidator.php
+index ad47f66d4f..f382dea0db 100644
+--- a/src/Symfony/Component/Validator/Constraints/UlidValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/UlidValidator.php
+@@ -28,5 +28,5 @@ class UlidValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Ulid) {
+diff --git a/src/Symfony/Component/Validator/Constraints/UniqueValidator.php b/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
+index 1e692fe682..ae1c23fd44 100644
+--- a/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
+@@ -25,5 +25,5 @@ class UniqueValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Unique) {
+diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
+index 4a73040a24..e29da3bf1d 100644
+--- a/src/Symfony/Component/Validator/Constraints/UrlValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
+@@ -49,5 +49,5 @@ class UrlValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Url) {
+diff --git a/src/Symfony/Component/Validator/Constraints/UuidValidator.php b/src/Symfony/Component/Validator/Constraints/UuidValidator.php
+index 1fc8791237..85f253c99c 100644
+--- a/src/Symfony/Component/Validator/Constraints/UuidValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/UuidValidator.php
+@@ -63,5 +63,5 @@ class UuidValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Uuid) {
+diff --git a/src/Symfony/Component/Validator/Constraints/Valid.php b/src/Symfony/Component/Validator/Constraints/Valid.php
+index 46c5ee355b..e68e2cfa26 100644
+--- a/src/Symfony/Component/Validator/Constraints/Valid.php
++++ b/src/Symfony/Component/Validator/Constraints/Valid.php
+@@ -45,5 +45,5 @@ class Valid extends Constraint
+      * @return void
+      */
+-    public function addImplicitGroupName(string $group)
++    public function addImplicitGroupName(string $group): void
+     {
+         if (null !== $this->groups) {
+diff --git a/src/Symfony/Component/Validator/Constraints/ValidValidator.php b/src/Symfony/Component/Validator/Constraints/ValidValidator.php
+index 7c960ffee1..3952a146b0 100644
+--- a/src/Symfony/Component/Validator/Constraints/ValidValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/ValidValidator.php
+@@ -24,5 +24,5 @@ class ValidValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof Valid) {
+diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php
+index b1680b7cd4..805d093001 100644
+--- a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php
++++ b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php
+@@ -26,5 +26,5 @@ class AddAutoMappingConfigurationPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasParameter('validator.auto_mapping') || !$container->hasDefinition('validator.builder')) {
+diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php
+index 4bcae00efa..1c6c15c42e 100644
+--- a/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php
++++ b/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php
+@@ -26,5 +26,5 @@ class AddConstraintValidatorsPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('validator.validator_factory')) {
+diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php
+index d53e3c85e7..5fe192215e 100644
+--- a/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php
++++ b/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php
+@@ -25,5 +25,5 @@ class AddValidatorInitializersPass implements CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasDefinition('validator.builder')) {
 diff --git a/src/Symfony/Component/Validator/Exception/InvalidOptionsException.php b/src/Symfony/Component/Validator/Exception/InvalidOptionsException.php
 index 8a4fba25d0..6165250ee3 100644
 --- a/src/Symfony/Component/Validator/Exception/InvalidOptionsException.php
@@ -2252,8 +11819,37 @@ index a7eda1457d..28630f205f 100644
 +    public function getOptions(): array
      {
          return $this->options;
+diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
+index 33c0bc45f0..2b20fbc574 100644
+--- a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
++++ b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
+@@ -321,5 +321,5 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
+      * @return void
+      */
+-    public function mergeConstraints(self $source)
++    public function mergeConstraints(self $source): void
+     {
+         if ($source->isGroupSequenceProvider()) {
+@@ -430,5 +430,5 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
+      * @return void
+      */
+-    public function setGroupSequenceProvider(bool $active)
++    public function setGroupSequenceProvider(bool $active): void
+     {
+         if ($this->hasGroupSequence()) {
+diff --git a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
+index 3f0c0aa46f..3cdd05ac09 100644
+--- a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
++++ b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
+@@ -53,5 +53,5 @@ abstract class AbstractLoader implements LoaderInterface
+      * @return void
+      */
+-    protected function addNamespaceAlias(string $alias, string $namespace)
++    protected function addNamespaceAlias(string $alias, string $namespace): void
+     {
+         $this->namespaces[$alias] = $namespace;
 diff --git a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
-index 1749dd78d2..250b46bdd3 100644
+index e7389f7b8e..3c07cdc9f7 100644
 --- a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
 +++ b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
 @@ -97,5 +97,5 @@ abstract class MemberMetadata extends GenericMetadata implements PropertyMetadat
@@ -2274,6 +11870,17 @@ index 1b2457707f..5811aa8106 100644
 +    abstract protected function createValidator(): ConstraintValidatorInterface;
  }
  
+diff --git a/src/Symfony/Component/Validator/Validator/TraceableValidator.php b/src/Symfony/Component/Validator/Validator/TraceableValidator.php
+index 241ce901b5..bde6394ec3 100644
+--- a/src/Symfony/Component/Validator/Validator/TraceableValidator.php
++++ b/src/Symfony/Component/Validator/Validator/TraceableValidator.php
+@@ -42,5 +42,5 @@ class TraceableValidator implements ValidatorInterface, ResetInterface
+      * @return void
+      */
+-    public function reset()
++    public function reset(): void
+     {
+         $this->collectedData = [];
 diff --git a/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php b/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
 index 22026f46a7..52b1ef696b 100644
 --- a/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
@@ -2648,73 +12255,87 @@ index eb6c88db6a..df608c2714 100644
      {
          if ($parent = get_parent_class($c)) {
 diff --git a/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php b/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php
-index 9e91592bd2..94cda7358f 100644
+index fcaa1b768a..53d991103c 100644
 --- a/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php
 +++ b/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php
-@@ -55,5 +55,5 @@ class RdKafkaCaster
+@@ -35,5 +35,5 @@ class RdKafkaCaster
+      * @return array
+      */
+-    public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub, bool $isNested)
++    public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -58,5 +58,5 @@ class RdKafkaCaster
       * @return array
       */
 -    public static function castTopic(Topic $c, array $a, Stub $stub, bool $isNested)
 +    public static function castTopic(Topic $c, array $a, Stub $stub, bool $isNested): array
      {
          $prefix = Caster::PREFIX_VIRTUAL;
-@@ -69,5 +69,5 @@ class RdKafkaCaster
+@@ -72,5 +72,5 @@ class RdKafkaCaster
       * @return array
       */
 -    public static function castTopicPartition(TopicPartition $c, array $a)
 +    public static function castTopicPartition(TopicPartition $c, array $a): array
      {
          $prefix = Caster::PREFIX_VIRTUAL;
-@@ -85,5 +85,5 @@ class RdKafkaCaster
+@@ -88,5 +88,5 @@ class RdKafkaCaster
       * @return array
       */
 -    public static function castMessage(Message $c, array $a, Stub $stub, bool $isNested)
 +    public static function castMessage(Message $c, array $a, Stub $stub, bool $isNested): array
      {
          $prefix = Caster::PREFIX_VIRTUAL;
-@@ -99,5 +99,5 @@ class RdKafkaCaster
+@@ -102,5 +102,5 @@ class RdKafkaCaster
       * @return array
       */
 -    public static function castConf(Conf $c, array $a, Stub $stub, bool $isNested)
 +    public static function castConf(Conf $c, array $a, Stub $stub, bool $isNested): array
      {
          $prefix = Caster::PREFIX_VIRTUAL;
-@@ -113,5 +113,5 @@ class RdKafkaCaster
+@@ -116,5 +116,5 @@ class RdKafkaCaster
       * @return array
       */
 -    public static function castTopicConf(TopicConf $c, array $a, Stub $stub, bool $isNested)
 +    public static function castTopicConf(TopicConf $c, array $a, Stub $stub, bool $isNested): array
      {
          $prefix = Caster::PREFIX_VIRTUAL;
-@@ -140,5 +140,5 @@ class RdKafkaCaster
+@@ -130,5 +130,5 @@ class RdKafkaCaster
+      * @return array
+      */
+-    public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, bool $isNested)
++    public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, bool $isNested): array
+     {
+         $prefix = Caster::PREFIX_VIRTUAL;
+@@ -146,5 +146,5 @@ class RdKafkaCaster
       * @return array
       */
 -    public static function castCollectionMetadata(CollectionMetadata $c, array $a, Stub $stub, bool $isNested)
 +    public static function castCollectionMetadata(CollectionMetadata $c, array $a, Stub $stub, bool $isNested): array
      {
          $a += iterator_to_array($c);
-@@ -150,5 +150,5 @@ class RdKafkaCaster
+@@ -156,5 +156,5 @@ class RdKafkaCaster
       * @return array
       */
 -    public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub, bool $isNested)
 +    public static function castTopicMetadata(TopicMetadata $c, array $a, Stub $stub, bool $isNested): array
      {
          $prefix = Caster::PREFIX_VIRTUAL;
-@@ -165,5 +165,5 @@ class RdKafkaCaster
+@@ -171,5 +171,5 @@ class RdKafkaCaster
       * @return array
       */
 -    public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stub $stub, bool $isNested)
 +    public static function castPartitionMetadata(PartitionMetadata $c, array $a, Stub $stub, bool $isNested): array
      {
          $prefix = Caster::PREFIX_VIRTUAL;
-@@ -181,5 +181,5 @@ class RdKafkaCaster
+@@ -187,5 +187,5 @@ class RdKafkaCaster
       * @return array
       */
 -    public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stub, bool $isNested)
 +    public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stub, bool $isNested): array
      {
          $prefix = Caster::PREFIX_VIRTUAL;
-@@ -197,5 +197,5 @@ class RdKafkaCaster
+@@ -203,5 +203,5 @@ class RdKafkaCaster
       * @return array
       */
 -    private static function extractMetadata(KafkaConsumer|\RdKafka $c)
@@ -2747,7 +12368,7 @@ index 6ff046754d..2b9382f1a7 100644
      {
          $prefix = Caster::PREFIX_VIRTUAL;
 diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
-index 0569278cff..7314dc2825 100644
+index 591751fce2..a2dfb9ae7f 100644
 --- a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
 +++ b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
 @@ -39,5 +39,5 @@ class ReflectionCaster
@@ -2856,7 +12477,7 @@ index 0569278cff..7314dc2825 100644
      {
          $prefix = Caster::PREFIX_VIRTUAL;
 diff --git a/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php b/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
-index f8c5344617..adf3cf07c2 100644
+index f3bbf3be4f..4941d9cd41 100644
 --- a/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
 +++ b/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
 @@ -31,5 +31,5 @@ class ResourceCaster
@@ -3068,6 +12689,223 @@ index 0cf42584a0..e2807c7001 100644
 +    public static function castXml($h, array $a, Stub $stub, bool $isNested): array
      {
          $a['current_byte_index'] = xml_get_current_byte_index($h);
+diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+index 9df2b79f0a..fd9ed90066 100644
+--- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
++++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+@@ -236,5 +236,5 @@ abstract class AbstractCloner implements ClonerInterface
+      * @return void
+      */
+-    public function addCasters(array $casters)
++    public function addCasters(array $casters): void
+     {
+         foreach ($casters as $type => $callback) {
+@@ -248,5 +248,5 @@ abstract class AbstractCloner implements ClonerInterface
+      * @return void
+      */
+-    public function setMaxItems(int $maxItems)
++    public function setMaxItems(int $maxItems): void
+     {
+         $this->maxItems = $maxItems;
+@@ -258,5 +258,5 @@ abstract class AbstractCloner implements ClonerInterface
+      * @return void
+      */
+-    public function setMaxString(int $maxString)
++    public function setMaxString(int $maxString): void
+     {
+         $this->maxString = $maxString;
+@@ -269,5 +269,5 @@ abstract class AbstractCloner implements ClonerInterface
+      * @return void
+      */
+-    public function setMinDepth(int $minDepth)
++    public function setMinDepth(int $minDepth): void
+     {
+         $this->minDepth = $minDepth;
+diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
+index 056b3dfb6a..fea14d593b 100644
+--- a/src/Symfony/Component/VarDumper/Cloner/Data.php
++++ b/src/Symfony/Component/VarDumper/Cloner/Data.php
+@@ -266,5 +266,5 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
+      * @return void
+      */
+-    public function dump(DumperInterface $dumper)
++    public function dump(DumperInterface $dumper): void
+     {
+         $refs = [0];
+diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
+index 053a90972b..5876b02373 100644
+--- a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
++++ b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
+@@ -159,5 +159,5 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
+      * @return void
+      */
+-    protected function dumpLine(int $depth)
++    protected function dumpLine(int $depth): void
+     {
+         ($this->lineDumper)($this->line, $depth, $this->indentPad);
+@@ -170,5 +170,5 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
+      * @return void
+      */
+-    protected function echoLine(string $line, int $depth, string $indentPad)
++    protected function echoLine(string $line, int $depth, string $indentPad): void
+     {
+         if (-1 !== $depth) {
+diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
+index f5780a87ed..285e5e5377 100644
+--- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
++++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
+@@ -90,5 +90,5 @@ class CliDumper extends AbstractDumper
+      * @return void
+      */
+-    public function setColors(bool $colors)
++    public function setColors(bool $colors): void
+     {
+         $this->colors = $colors;
+@@ -100,5 +100,5 @@ class CliDumper extends AbstractDumper
+      * @return void
+      */
+-    public function setMaxStringWidth(int $maxStringWidth)
++    public function setMaxStringWidth(int $maxStringWidth): void
+     {
+         $this->maxStringWidth = $maxStringWidth;
+@@ -112,5 +112,5 @@ class CliDumper extends AbstractDumper
+      * @return void
+      */
+-    public function setStyles(array $styles)
++    public function setStyles(array $styles): void
+     {
+         $this->styles = $styles + $this->styles;
+@@ -124,5 +124,5 @@ class CliDumper extends AbstractDumper
+      * @return void
+      */
+-    public function setDisplayOptions(array $displayOptions)
++    public function setDisplayOptions(array $displayOptions): void
+     {
+         $this->displayOptions = $displayOptions + $this->displayOptions;
+@@ -132,5 +132,5 @@ class CliDumper extends AbstractDumper
+      * @return void
+      */
+-    public function dumpScalar(Cursor $cursor, string $type, string|int|float|bool|null $value)
++    public function dumpScalar(Cursor $cursor, string $type, string|int|float|bool|null $value): void
+     {
+         $this->dumpKey($cursor);
+@@ -190,5 +190,5 @@ class CliDumper extends AbstractDumper
+      * @return void
+      */
+-    public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut)
++    public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut): void
+     {
+         $this->dumpKey($cursor);
+@@ -278,5 +278,5 @@ class CliDumper extends AbstractDumper
+      * @return void
+      */
+-    public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild)
++    public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild): void
+     {
+         $this->colors ??= $this->supportsColors();
+@@ -317,5 +317,5 @@ class CliDumper extends AbstractDumper
+      * @return void
+      */
+-    public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut)
++    public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut): void
+     {
+         if (empty($cursor->attr['cut_hash'])) {
+@@ -335,5 +335,5 @@ class CliDumper extends AbstractDumper
+      * @return void
+      */
+-    protected function dumpEllipsis(Cursor $cursor, bool $hasChild, int $cut)
++    protected function dumpEllipsis(Cursor $cursor, bool $hasChild, int $cut): void
+     {
+         if ($cut) {
+@@ -353,5 +353,5 @@ class CliDumper extends AbstractDumper
+      * @return void
+      */
+-    protected function dumpKey(Cursor $cursor)
++    protected function dumpKey(Cursor $cursor): void
+     {
+         if (null !== $key = $cursor->hashKey) {
+@@ -558,5 +558,5 @@ class CliDumper extends AbstractDumper
+      * @return void
+      */
+-    protected function dumpLine(int $depth, bool $endOfValue = false)
++    protected function dumpLine(int $depth, bool $endOfValue = false): void
+     {
+         if ($this->colors) {
+@@ -569,5 +569,5 @@ class CliDumper extends AbstractDumper
+      * @return void
+      */
+-    protected function endValue(Cursor $cursor)
++    protected function endValue(Cursor $cursor): void
+     {
+         if (-1 === $cursor->hashType) {
+diff --git a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
+index a2e8f8c7b2..5561bc167f 100644
+--- a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
++++ b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
+@@ -35,5 +35,5 @@ class ContextualizedDumper implements DataDumperInterface
+      * @return void
+      */
+-    public function dump(Data $data)
++    public function dump(Data $data): void
+     {
+         $context = $data->getContext();
+diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
+index 91539daaad..be8c4b5550 100644
+--- a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
++++ b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
+@@ -83,5 +83,5 @@ class HtmlDumper extends CliDumper
+     }
+ 
+-    public function setStyles(array $styles)
++    public function setStyles(array $styles): void
+     {
+         $this->headerIsDumped = false;
+@@ -103,5 +103,5 @@ class HtmlDumper extends CliDumper
+      * @param array $displayOptions A map of display options to customize the behavior
+      */
+-    public function setDisplayOptions(array $displayOptions)
++    public function setDisplayOptions(array $displayOptions): void
+     {
+         $this->headerIsDumped = false;
+@@ -774,5 +774,5 @@ EOHTML
+     }
+ 
+-    public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut)
++    public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut): void
+     {
+         if ('' === $str && isset($cursor->attr['img-data'], $cursor->attr['content-type'])) {
+@@ -789,5 +789,5 @@ EOHTML
+     }
+ 
+-    public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild)
++    public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild): void
+     {
+         if (Cursor::HASH_OBJECT === $type) {
+@@ -817,5 +817,5 @@ EOHTML
+     }
+ 
+-    public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut)
++    public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut): void
+     {
+         $this->dumpEllipsis($cursor, $hasChild, $cut);
+@@ -924,5 +924,5 @@ EOHTML
+     }
+ 
+-    protected function dumpLine(int $depth, bool $endOfValue = false)
++    protected function dumpLine(int $depth, bool $endOfValue = false): void
+     {
+         if (-1 === $this->lastDepth) {
+diff --git a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
+index 546490d9ae..f7fed41e4d 100644
+--- a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
++++ b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
+@@ -45,5 +45,5 @@ class ServerDumper implements DataDumperInterface
+      * @return void
+      */
+-    public function dump(Data $data)
++    public function dump(Data $data): void
+     {
+         if (!$this->connection->write($data) && $this->wrappedDumper) {
 diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
 index ae12ec414a..971280f868 100644
 --- a/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -3122,6 +12960,42 @@ index cd7fab7896..b340eba38e 100644
 +    public function getWorkflowName(): string
      {
          return $this->workflow->getName();
+diff --git a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php b/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
+index 8d82824eb0..fab7b30160 100644
+--- a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
++++ b/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
+@@ -31,5 +31,5 @@ class AuditTrailListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onLeave(Event $event)
++    public function onLeave(Event $event): void
+     {
+         foreach ($event->getTransition()->getFroms() as $place) {
+@@ -41,5 +41,5 @@ class AuditTrailListener implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onTransition(Event $event)
++    public function onTransition(Event $event): void
+     {
+         $this->logger->info(sprintf('Transition "%s" for subject of class "%s" in workflow "%s".', $event->getTransition()->getName(), $event->getSubject()::class, $event->getWorkflowName()));
+@@ -49,5 +49,5 @@ class AuditTrailListe
10000
ner implements EventSubscriberInterface
+      * @return void
+      */
+-    public function onEnter(Event $event)
++    public function onEnter(Event $event): void
+     {
+         foreach ($event->getTransition()->getTos() as $place) {
+diff --git a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
+index ab5ea51110..8831d93588 100644
+--- a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
++++ b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
+@@ -26,5 +26,5 @@ class ExpressionLanguage extends BaseExpressionLanguage
+      * @return void
+      */
+-    protected function registerFunctions()
++    protected function registerFunctions(): void
+     {
+         parent::registerFunctions();
 diff --git a/src/Symfony/Component/Workflow/EventListener/GuardExpression.php b/src/Symfony/Component/Workflow/EventListener/GuardExpression.php
 index 23e830cac4..2b119f2db8 100644
 --- a/src/Symfony/Component/Workflow/EventListener/GuardExpression.php
@@ -3140,6 +13014,17 @@ index 23e830cac4..2b119f2db8 100644
 +    public function getExpression(): string
      {
          return $this->expression;
+diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
+index c207b1a655..5285d3417f 100644
+--- a/src/Symfony/Component/Workflow/EventListener/GuardListener.php
++++ b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
+@@ -47,5 +47,5 @@ class GuardListener
+      * @return void
+      */
+-    public function onTransition(GuardEvent $event, string $eventName)
++    public function onTransition(GuardEvent $event, string $eventName): void
+     {
+         if (!isset($this->configuration[$eventName])) {
 diff --git a/src/Symfony/Component/Workflow/Exception/TransitionException.php b/src/Symfony/Component/Workflow/Exception/TransitionException.php
 index 890d8e244b..d074936253 100644
 --- a/src/Symfony/Component/Workflow/Exception/TransitionException.php
@@ -3152,23 +13037,106 @@ index 890d8e244b..d074936253 100644
      {
          return $this->subject;
 diff --git a/src/Symfony/Component/Workflow/Marking.php b/src/Symfony/Component/Workflow/Marking.php
-index dba7c3dcfb..dce66ea6b9 100644
+index 95a83f0cfd..84e568b939 100644
 --- a/src/Symfony/Component/Workflow/Marking.php
 +++ b/src/Symfony/Component/Workflow/Marking.php
-@@ -45,5 +45,5 @@ class Marking
+@@ -35,5 +35,5 @@ class Marking
+      * @return void
+      */
+-    public function mark(string $place)
++    public function mark(string $place): void
+     {
+         $this->places[$place] = 1;
+@@ -43,5 +43,5 @@ class Marking
+      * @return void
+      */
+-    public function unmark(string $place)
++    public function unmark(string $place): void
+     {
+         unset($this->places[$place]);
+@@ -51,5 +51,5 @@ class Marking
       * @return bool
       */
 -    public function has(string $place)
 +    public function has(string $place): bool
      {
          return isset($this->places[$place]);
-@@ -53,5 +53,5 @@ class Marking
+@@ -59,5 +59,5 @@ class Marking
       * @return array
       */
 -    public function getPlaces()
 +    public function getPlaces(): array
      {
          return $this->places;
+diff --git a/src/Symfony/Component/Workflow/Registry.php b/src/Symfony/Component/Workflow/Registry.php
+index 287d8b750f..9462747d84 100644
+--- a/src/Symfony/Component/Workflow/Registry.php
++++ b/src/Symfony/Component/Workflow/Registry.php
+@@ -28,5 +28,5 @@ class Registry
+      * @return void
+      */
+-    public function addWorkflow(WorkflowInterface $workflow, WorkflowSupportStrategyInterface $supportStrategy)
++    public function addWorkflow(WorkflowInterface $workflow, WorkflowSupportStrategyInterface $supportStrategy): void
+     {
+         $this->workflows[] = [$workflow, $supportStrategy];
+diff --git a/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php b/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php
+index 20afc8d937..ef56c02882 100644
+--- a/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php
++++ b/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php
+@@ -23,5 +23,5 @@ class StateMachineValidator implements DefinitionValidatorInterface
+      * @return void
+      */
+-    public function validate(Definition $definition, string $name)
++    public function validate(Definition $definition, string $name): void
+     {
+         $transitionFromNames = [];
+diff --git a/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php b/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php
+index c13c2814c3..782521afe1 100644
+--- a/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php
++++ b/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php
+@@ -31,5 +31,5 @@ class WorkflowValidator implements DefinitionValidatorInterface
+      * @return void
+      */
+-    public function validate(Definition $definition, string $name)
++    public function validate(Definition $definition, string $name): void
+     {
+         // Make sure all transitions for one place has unique name.
+diff --git a/src/Symfony/Component/Yaml/Command/LintCommand.php b/src/Symfony/Component/Yaml/Command/LintCommand.php
+index de11d48d0f..0d5590965f 100644
+--- a/src/Symfony/Component/Yaml/Command/LintCommand.php
++++ b/src/Symfony/Component/Yaml/Command/LintCommand.php
+@@ -54,5 +54,5 @@ class LintCommand extends Command
+      * @return void
+      */
+-    protected function configure()
++    protected function configure(): void
+     {
+         $this
+diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php
+index c1a77ad157..1e926dc83a 100644
+--- a/src/Symfony/Component/Yaml/Exception/ParseException.php
++++ b/src/Symfony/Component/Yaml/Exception/ParseException.php
+@@ -55,5 +55,5 @@ class ParseException extends RuntimeException
+      * @return void
+      */
+-    public function setSnippet(string $snippet)
++    public function setSnippet(string $snippet): void
+     {
+         $this->snippet = $snippet;
+@@ -77,5 +77,5 @@ class ParseException extends RuntimeException
+      * @return void
+      */
+-    public function setParsedFile(string $parsedFile)
++    public function setParsedFile(string $parsedFile): void
+     {
+         $this->parsedFile = $parsedFile;
+@@ -97,5 +97,5 @@ class ParseException extends RuntimeException
+      * @return void
+      */
+-    public function setParsedLine(int $parsedLine)
++    public function setParsedLine(int $parsedLine): void
+     {
+         $this->parsedLine = $parsedLine;
 diff --git a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
 index 06340a61bb..2654d15b9a 100644
 --- a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
@@ -3180,3 +13148,14 @@ index 06340a61bb..2654d15b9a 100644
 +    public function setContainer(ContainerInterface $container): ?ContainerInterface
      {
          return $container;
+diff --git a/src/Symfony/Contracts/Translation/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php
+index e3b0adff05..19d90162ab 100644
+--- a/src/Symfony/Contracts/Translation/TranslatorTrait.php
++++ b/src/Symfony/Contracts/Translation/TranslatorTrait.php
+@@ -26,5 +26,5 @@ trait TranslatorTrait
+      * @return void
+      */
+-    public function setLocale(string $locale)
++    public function setLocale(string $locale): void
+     {
+         $this->locale = $locale;
diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
index bf337bf751635..566504e84912c 100644
--- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
+++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
@@ -167,7 +167,7 @@ public function removeEventSubscriber(EventSubscriber $subscriber): void
         parent::removeEventSubscriber($subscriber);
     }
 
-    private function initializeListeners(string $eventName)
+    private function initializeListeners(string $eventName): void
     {
         $this->initialized[$eventName] = true;
         foreach ($this->listeners[$eventName] as $hash => $listener) {
@@ -179,7 +179,7 @@ private function initializeListeners(string $eventName)
         }
     }
 
-    private function initializeSubscribers()
+    private function initializeSubscribers(): void
     {
         $this->initializedSubscribers = true;
         foreach ($this->subscribers as $subscriber) {
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
index 96c346846cd40..ada5fcbd49804 100644
--- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -47,12 +47,17 @@ public function __construct(
 
     /**
      * Adds the stack logger for a connection.
+     *
+     * @return void
      */
     public function addLogger(string $name, DebugStack $logger)
     {
         $this->loggers[$name] = $logger;
     }
 
+    /**
+     * @return void
+     */
     public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         $this->data = [
@@ -81,6 +86,9 @@ private function collectQueries(): array
         return $queries;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->data = [];
diff --git a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
index 95dc8825ed213..4fa5057fe29fe 100644
--- a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
+++ b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
@@ -32,6 +32,9 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
+    /**
+     * @return void
+     */
     public function addFixture(FixtureInterface $fixture)
     {
         if ($fixture instanceof ContainerAwareInterface) {
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
index cd5fc91cb32b7..56b108942e627 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -38,6 +38,8 @@ abstract class AbstractDoctrineExtension extends Extension
     /**
      * @param array $objectManager A configured object manager
      *
+     * @return void
+     *
      * @throws \InvalidArgumentException
      */
     protected function loadMappingInformation(array $objectManager, ContainerBuilder $container)
@@ -105,6 +107,8 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
      * Register the alias for this mapping driver.
      *
      * Aliases can be used in the Query languages of all the Doctrine object managers to simplify writing tasks.
+     *
+     * @return void
      */
     protected function setMappingDriverAlias(array $mappingConfig, string $mappingName)
     {
@@ -118,6 +122,8 @@ protected function setMappingDriverAlias(array $mappingConfig, string $mappingNa
     /**
      * Register the mapping driver configuration for later use with the object managers metadata driver chain.
      *
+     * @return void
+     *
      * @throws \InvalidArgumentException
      */
     protected function setMappingDriverConfig(array $mappingConfig, string $mappingName)
@@ -172,6 +178,8 @@ protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \Re
 
     /**
      * Register all the collected mapping information with the object manager by registering the appropriate mapping drivers.
+     *
+     * @return void
      */
     protected function registerMappingDrivers(array $objectManager, ContainerBuilder $container)
     {
@@ -227,6 +235,8 @@ protected function registerMappingDrivers(array $objectManager, ContainerBuilder
     /**
      * Assertion if the specified mapping information is valid.
      *
+     * @return void
+     *
      * @throws \InvalidArgumentException
      */
     protected function assertValidMappingConfiguration(array $mappingConfig, string $objectManagerName)
@@ -315,6 +325,8 @@ private function detectMappingType(string $directory, ContainerBuilder $containe
     /**
      * Loads a configured object manager metadata, query or result cache driver.
      *
+     * @return void
+     *
      * @throws \InvalidArgumentException in case of unknown driver type
      */
     protected function loadObjectManagerCacheDriver(array $objectManager, ContainerBuilder $container, string $cacheName)
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
index aa76d7d2da8e5..83bfffaf2724e 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
@@ -28,6 +28,9 @@ public function __construct(string $managerType)
         $this->managerType = $managerType;
     }
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $this->updateValidatorMappingFiles($container, 'xml', 'xml');
@@ -38,7 +41,7 @@ public function process(ContainerBuilder $container)
      * Gets the validation mapping files for the format and extends them with
      * files matching a doctrine search pattern (Resources/config/validation.orm.xml).
      */
-    private function updateValidatorMappingFiles(ContainerBuilder $container, string $mapping, string $extension)
+    private function updateValidatorMappingFiles(ContainerBuilder $container, string $mapping, string $extension): void
     {
         if (!$container->hasParameter('validator.mapping.loader.'.$mapping.'_files_loader.mapping_files')) {
             return;
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
index 0aeb25d287488..1a3f227c6d100 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
@@ -130,6 +130,8 @@ public function __construct(Definition|Reference $driver, array $namespaces, arr
 
     /**
      * Register mappings and alias with the metadata drivers.
+     *
+     * @return void
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterUidTypePass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterUidTypePass.php
index 1ea0470bf8d0b..fd27f60ceb4f5 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterUidTypePass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterUidTypePass.php
@@ -19,7 +19,7 @@
 
 final class RegisterUidTypePass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!class_exists(AbstractUid::class)) {
             return;
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
index e3dcea33989ad..80ee258438d24 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
@@ -33,6 +33,9 @@ public function __construct(string $key, string $providerId)
         $this->providerId = $providerId;
     }
 
+    /**
+     * @return void
+     */
     public function create(ContainerBuilder $container, string $id, array $config)
     {
         $container
@@ -51,6 +54,9 @@ public function getKey()
         return $this->key;
     }
 
+    /**
+     * @return void
+     */
     public function addConfiguration(NodeDefinition $node)
     {
         $node
diff --git a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
index f16fc64fd3ff4..cff8b3b156154 100644
--- a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
+++ b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
@@ -38,6 +38,9 @@ public static function getSubscribedEvents(): array
         ];
     }
 
+    /**
+     * @return void
+     */
     public function onSubmit(FormEvent $event)
     {
         $collection = $event->getForm()->getData();
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
index 68c91d157f7f0..d1d72ef75a922 100644
--- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -97,6 +97,9 @@ public function __construct(ManagerRegistry $registry)
         $this->registry = $registry;
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if ($options['multiple'] && interface_exists(Collection::class)) {
@@ -107,6 +110,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $choiceLoader = function (Options $options) {
@@ -232,6 +238,9 @@ public function getParent(): string
         return ChoiceType::class;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->idReaders = [];
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
index fb45f99ac2657..c096b558db891 100644
--- a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
+++ b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
@@ -21,6 +21,9 @@
 
 class EntityType extends DoctrineType
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
index f715e782e3af7..b2369e95d601a 100644
--- a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
+++ b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
@@ -48,6 +48,8 @@ public function stopQuery(): void
 
     /**
      * Logs a message.
+     *
+     * @return void
      */
     protected function log(string $message, array $params)
     {
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php
index 9b464351fa09d..38618fc15e5ba 100644
--- a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php
+++ b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php
@@ -30,11 +30,17 @@ public function __construct(ManagerRegistry $managerRegistry)
         $this->managerRegistry = $managerRegistry;
     }
 
+    /**
+     * @return void
+     */
     public function onWorkerMessageHandled()
     {
         $this->clearEntityManagers();
     }
 
+    /**
+     * @return void
+     */
     public function onWorkerMessageFailed()
     {
         $this->clearEntityManagers();
@@ -48,7 +54,7 @@ public static function getSubscribedEvents(): array
         ];
     }
 
-    private function clearEntityManagers()
+    private function clearEntityManagers(): void
     {
         foreach ($this->managerRegistry->getManagers() as $manager) {
             $manager->clear();
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrinePingConnectionMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrinePingConnectionMiddleware.php
index 105a1c6ffe76e..1831715039d2e 100644
--- a/src/Symfony/Bridge/Doctrine/Messenger/DoctrinePingConnectionMiddleware.php
+++ b/src/Symfony/Bridge/Doctrine/Messenger/DoctrinePingConnectionMiddleware.php
@@ -33,7 +33,7 @@ protected function handleForManager(EntityManagerInterface $entityManager, Envel
         return $stack->next()->handle($envelope, $stack);
     }
 
-    private function pingConnection(EntityManagerInterface $entityManager)
+    private function pingConnection(EntityManagerInterface $entityManager): void
     {
         $connection = $entityManager->getConnection();
 
diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
index bc2e7d915a7aa..9d61be61bd3a7 100644
--- a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
+++ b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
@@ -66,6 +66,9 @@ public function loadTokenBySeries(string $series): PersistentTokenInterface
         throw new TokenNotFoundException('No token found.');
     }
 
+    /**
+     * @return void
+     */
     public function deleteTokenBySeries(string $series)
     {
         $sql = 'DELETE FROM rememberme_token WHERE series=:series';
@@ -78,6 +81,9 @@ public function deleteTokenBySeries(string $series)
         }
     }
 
+    /**
+     * @return void
+     */
     public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTime $lastUsed)
     {
         $sql = 'UPDATE rememberme_token SET value=:value, lastUsed=:lastUsed WHERE series=:series';
@@ -101,6 +107,9 @@ public function updateToken(string $series, #[\SensitiveParameter] string $token
         }
     }
 
+    /**
+     * @return void
+     */
     public function createNewToken(PersistentTokenInterface $token)
     {
         $sql = 'INSERT INTO rememberme_token (class, username, series, value, lastUsed) VALUES (:class, :username, :series, :value, :lastUsed)';
diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php
index c50c6e98120ab..bf8a5feb9f9e3 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php
@@ -28,6 +28,9 @@ public function __construct(ManagerRegistry $registry)
         $this->registry = $registry;
     }
 
+    /**
+     * @return void
+     */
     public function initialize(object $object)
     {
         $this->registry->getManagerForClass($object::class)?->initializeObject($object);
diff --git a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
index 3168e2598b5dc..9975c46cba9f0 100644
--- a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
+++ b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
@@ -50,6 +50,9 @@ public function isEnabled(): bool
         return parent::isEnabled();
     }
 
+    /**
+     * @return void
+     */
     protected function configure()
     {
         if (!class_exists(ConsoleFormatter::class)) {
@@ -145,7 +148,7 @@ private function getLogs($socket): iterable
         }
     }
 
-    private function displayLog(OutputInterface $output, int $clientId, array $record)
+    private function displayLog(OutputInterface $output, int $clientId, array $record): void
     {
         if (isset($record['log_id'])) {
             $clientId = unpack('H*', $record['log_id'])[1];
diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
index 31f2197b75afb..36de344954c1c 100644
--- a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
+++ b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
@@ -138,7 +138,7 @@ private function doFormat(array|LogRecord $record): mixed
     /**
      * @internal
      */
-    public function echoLine(string $line, int $depth, string $indentPad)
+    public function echoLine(string $line, int $depth, string $indentPad): void
     {
         if (-1 !== $depth) {
             fwrite($this->outputBuffer, $line);
diff --git a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
index c84db4d897df8..9088ddfe3309a 100644
--- a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
@@ -30,7 +30,7 @@ class ChromePhpHandler extends BaseChromePhpHandler
     /**
      * Adds the headers to the response once it's created.
      */
-    public function onKernelResponse(ResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event): void
     {
         if (!$event->isMainRequest()) {
             return;
diff --git a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php
index 064a0fca43a21..e387c869608e9 100644
--- a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php
@@ -106,7 +106,7 @@ protected function getDefaultFormatter(): FormatterInterface
         return new LogstashFormatter('application');
     }
 
-    private function sendToElasticsearch(array $records)
+    private function sendToElasticsearch(array $records): void
     {
         $formatter = $this->getFormatter();
 
@@ -164,7 +164,7 @@ public function __destruct()
         $this->wait(true);
     }
 
-    private function wait(bool $blocking)
+    private function wait(bool $blocking): void
     {
         foreach ($this->client->stream($this->responses, $blocking ? null : 0.0) as $response => $chunk) {
             try {
diff --git a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
index 3627f50551493..91d68afe3d95a 100644
--- a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
@@ -30,7 +30,7 @@ class FirePHPHandler extends BaseFirePHPHandler
     /**
      * Adds the headers to the response once it's created.
      */
-    public function onKernelResponse(ResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event): void
     {
         if (!$event->isMainRequest()) {
             return;
diff --git a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
index e0862f8f45df3..7ee64c62f1558 100644
--- a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
@@ -77,6 +77,8 @@ private function doWrite(array|LogRecord $record): void
      *
      * @param string $content formatted email body to be sent
      * @param array  $records the array of log records that formed this content
+     *
+     * @return void
      */
     protected function send(string $content, array $records)
     {
diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php
index 4e2168a114866..367b3351ff102 100644
--- a/src/Symfony/Bridge/Monolog/Logger.php
+++ b/src/Symfony/Bridge/Monolog/Logger.php
@@ -40,6 +40,9 @@ public function countErrors(Request $request = null): int
         return 0;
     }
 
+    /**
+     * @return void
+     */
     public function clear()
     {
         if ($logger = $this->getDebugLogger()) {
@@ -56,6 +59,9 @@ public function reset(): void
         }
     }
 
+    /**
+     * @return void
+     */
     public function removeDebugLogger()
     {
         foreach ($this->processors as $k => $processor) {
diff --git a/src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php b/src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php
index a5b26eacbae83..df2a7187201b4 100644
--- a/src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php
+++ b/src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php
@@ -47,11 +47,17 @@ private function doInvoke(array|LogRecord $record): array|LogRecord
         return $record;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         unset($this->commandData);
     }
 
+    /**
+     * @return void
+     */
     public function addCommandData(ConsoleEvent $event)
     {
         $this->commandData = [
diff --git a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
index 5c135d10065b0..08427180f2715 100644
--- a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
+++ b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
@@ -90,12 +90,18 @@ public function countErrors(Request $request = null): int
         return array_sum($this->errorCount);
     }
 
+    /**
+     * @return void
+     */
     public function clear()
     {
         $this->records = [];
         $this->errorCount = [];
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->clear();
diff --git a/src/Symfony/Bridge/Monolog/Processor/RouteProcessor.php b/src/Symfony/Bridge/Monolog/Processor/RouteProcessor.php
index c9f28af084068..bec88e3ed0e14 100644
--- a/src/Symfony/Bridge/Monolog/Processor/RouteProcessor.php
+++ b/src/Symfony/Bridge/Monolog/Processor/RouteProcessor.php
@@ -45,12 +45,12 @@ public function __invoke(array|LogRecord $record): array|LogRecord
         return $record;
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->routeData = [];
     }
 
-    public function addRouteData(RequestEvent $event)
+    public function addRouteData(RequestEvent $event): void
     {
         if ($event->isMainRequest()) {
             $this->reset();
@@ -73,7 +73,7 @@ public function addRouteData(RequestEvent $event)
         $this->routeData[spl_object_id($request)] = $currentRequestData;
     }
 
-    public function removeRouteData(FinishRequestEvent $event)
+    public function removeRouteData(FinishRequestEvent $event): void
     {
         $requestId = spl_object_id($event->getRequest());
         unset($this->routeData[$requestId]);
diff --git a/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php b/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php
index f72023cdfdac4..e34219b97cc4c 100644
--- a/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php
+++ b/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php
@@ -31,7 +31,7 @@ public function __construct(array $extraFields = null)
         parent::__construct([], $extraFields);
     }
 
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event): void
     {
         if ($event->isMainRequest()) {
             $this->serverData = $event->getRequest()->server->all();
diff --git a/src/Symfony/Bridge/PhpUnit/ClassExistsMock.php b/src/Symfony/Bridge/PhpUnit/ClassExistsMock.php
index fd8c90b4afd91..bbf9b76a0c3f3 100644
--- a/src/Symfony/Bridge/PhpUnit/ClassExistsMock.php
+++ b/src/Symfony/Bridge/PhpUnit/ClassExistsMock.php
@@ -24,6 +24,8 @@ class ClassExistsMock
      * Configures the classes to be checked upon existence.
      *
      * @param array $classes Mocked class names as keys (case-sensitive, without leading root namespace slash) and booleans as values
+     *
+     * @return void
      */
     public static function withMockedClasses(array $classes)
     {
@@ -34,6 +36,8 @@ public static function withMockedClasses(array $classes)
      * Configures the enums to be checked upon existence.
      *
      * @param array $enums Mocked enums names as keys (case-sensitive, without leading root namespace slash) and booleans as values
+     *
+     * @return void
      */
     public static function withMockedEnums(array $enums)
     {
@@ -81,6 +85,9 @@ public static function enum_exists($name, $autoload = true)
         return isset(self::$enums[$name]) ? (bool) self::$enums[$name] : \enum_exists($name, $autoload);
     }
 
+    /**
+     * @return void
+     */
     public static function register($class)
     {
         $self = static::class;
diff --git a/src/Symfony/Bridge/PhpUnit/ClockMock.php b/src/Symfony/Bridge/PhpUnit/ClockMock.php
index 3c1a722c06026..64a7ac8fa14d7 100644
--- a/src/Symfony/Bridge/PhpUnit/ClockMock.php
+++ b/src/Symfony/Bridge/PhpUnit/ClockMock.php
@@ -59,6 +59,9 @@ public static function sleep($s)
         return 0;
     }
 
+    /**
+     * @return void
+     */
     public static function usleep($us)
     {
         if (null === self::$now) {
@@ -121,6 +124,9 @@ public static function hrtime($asNumber = false)
         return [(int) self::$now, (int) $ns];
     }
 
+    /**
+     * @return void
+     */
     public static function register($class)
     {
         $self = static::class;
diff --git a/src/Symfony/Bridge/PhpUnit/DnsMock.php b/src/Symfony/Bridge/PhpUnit/DnsMock.php
index 080f5a73b4976..f0145e7d8a7f6 100644
--- a/src/Symfony/Bridge/PhpUnit/DnsMock.php
+++ b/src/Symfony/Bridge/PhpUnit/DnsMock.php
@@ -36,6 +36,8 @@ class DnsMock
      * Configures the mock values for DNS queries.
      *
      * @param array $hosts Mocked hosts as keys, arrays of DNS records as returned by dns_get_record() as values
+     *
+     * @return void
      */
     public static function withMockedHosts(array $hosts)
     {
@@ -167,6 +169,9 @@ public static function dns_get_record($hostname, $type = \DNS_ANY, &$authns = nu
         return $records;
     }
 
+    /**
+     * @return void
+     */
     public static function register($class)
     {
         $self = static::class;
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/ExpectDeprecationTraitBeforeV8_4.php b/src/Symfony/Bridge/PhpUnit/Legacy/ExpectDeprecationTraitBeforeV8_4.php
index 03368b5597fbe..d60587eca9b03 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/ExpectDeprecationTraitBeforeV8_4.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/ExpectDeprecationTraitBeforeV8_4.php
@@ -18,10 +18,8 @@ trait ExpectDeprecationTraitBeforeV8_4
 {
     /**
      * @param string $message
-     *
-     * @return void
      */
-    protected function expectDeprecation($message)
+    protected function expectDeprecation($message): void
     {
         // Expected deprecations set by isolated tests need to be written to a file
         // so that the test running process can take account of them.
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
index 015bc881ae573..3652c3bb388c4 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -107,13 +107,13 @@ public function __destruct()
         }
     }
 
-    public function globalListenerDisabled()
+    public function globalListenerDisabled(): void
     {
         self::$globallyEnabled = false;
         $this->state = -1;
     }
 
-    public function startTestSuite($suite)
+    public function startTestSuite($suite): void
     {
         $suiteName = $suite->getName();
 
@@ -188,14 +188,14 @@ public function startTestSuite($suite)
         }
     }
 
-    public function addSkippedTest($test, \Exception $e, $time)
+    public function addSkippedTest($test, \Exception $e, $time): void
     {
         if (0 < $this->state) {
             $this->isSkipped[\get_class($test)][$test->getName()] = 1;
         }
     }
 
-    public function startTest($test)
+    public function startTest($test): void
     {
         if (-2 < $this->state && $test instanceof TestCase) {
             // This event is triggered before the test is re-run in isolation
@@ -242,7 +242,7 @@ public function startTest($test)
         }
     }
 
-    public function endTest($test, $time)
+    public function endTest($test, $time): void
     {
         if ($file = getenv('SYMFONY_EXPECTED_DEPRECATIONS_SERIALIZE')) {
             putenv('SYMFONY_EXPECTED_DEPRECATIONS_SERIALIZE');
@@ -338,15 +338,10 @@ public static function handleError($type, $msg, $file, $line, $context = [])
         }
         self::$gatheredDeprecations[] = $msg;
 
-        return null;
+        return true;
     }
 
-    /**
-     * @param TestCase $test
-     *
-     * @return bool
-     */
-    private function willBeIsolated($test)
+    private function willBeIsolated(TestCase $test): bool
     {
         if ($test->isInIsolation()) {
             return false;
@@ -355,6 +350,6 @@ private function willBeIsolated($test)
         $r = new \ReflectionProperty($test, 'runTestInSeparateProcess');
         $r->setAccessible(true);
 
-        return $r->getValue($test);
+        return $r->getValue($test) ?? false;
     }
 }
diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php
index 6cdbaa8370811..6ce2278c53adb 100644
--- a/src/Symfony/Bridge/Twig/AppVariable.php
+++ b/src/Symfony/Bridge/Twig/AppVariable.php
@@ -30,21 +30,33 @@ class AppVariable
     private string $environment;
     private bool $debug;
 
+    /**
+     * @return void
+     */
     public function setTokenStorage(TokenStorageInterface $tokenStorage)
     {
         $this->tokenStorage = $tokenStorage;
     }
 
+    /**
+     * @return void
+     */
     public function setRequestStack(RequestStack $requestStack)
     {
         $this->requestStack = $requestStack;
     }
 
+    /**
+     * @return void
+     */
     public function setEnvironment(string $environment)
     {
         $this->environment = $environment;
     }
 
+    /**
+     * @return void
+     */
     public function setDebug(bool $debug)
     {
         $this->debug = $debug;
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
index d4e8528ed536c..cec031127ba85 100644
--- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -59,6 +59,9 @@ public function __construct(Environment $twig, string $projectDir = null, array
         $this->fileLinkFormatter = $fileLinkFormatter;
     }
 
+    /**
+     * @return void
+     */
     protected function configure()
     {
         $this
@@ -121,7 +124,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
         }
     }
 
-    private function displayPathsText(SymfonyStyle $io, string $name)
+    private function displayPathsText(SymfonyStyle $io, string $name): void
     {
         $file = new \ArrayIterator($this->findTemplateFiles($name));
         $paths = $this->getLoaderPaths($name);
@@ -196,7 +199,7 @@ private function displayPathsText(SymfonyStyle $io, string $name)
         }
     }
 
-    private function displayPathsJson(SymfonyStyle $io, string $name)
+    private function displayPathsJson(SymfonyStyle $io, string $name): void
     {
         $files = $this->findTemplateFiles($name);
         $paths = $this->getLoaderPaths($name);
@@ -214,7 +217,7 @@ private function displayPathsJson(SymfonyStyle $io, string $name)
         $io->writeln(json_encode($data));
     }
 
-    private function displayGeneralText(SymfonyStyle $io, string $filter = null)
+    private function displayGeneralText(SymfonyStyle $io, string $filter = null): void
     {
         $decorated = $io->isDecorated();
         $types = ['functions', 'filters', 'tests', 'globals'];
@@ -248,7 +251,7 @@ private function displayGeneralText(SymfonyStyle $io, string $filter = null)
         }
     }
 
-    private function displayGeneralJson(SymfonyStyle $io, ?string $filter)
+    private function displayGeneralJson(SymfonyStyle $io, ?string $filter): void
     {
         $decorated = $io->isDecorated();
         $types = ['functions', 'filters', 'tests', 'globals'];
diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
index 1429f4ffcd9e4..05f6319b39e6c 100644
--- a/src/Symfony/Bridge/Twig/Command/LintCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/LintCommand.php
@@ -48,6 +48,9 @@ public function __construct(
         parent::__construct();
     }
 
+    /**
+     * @return void
+     */
     protected function configure()
     {
         $this
diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
index 2366433f4eebd..cfdba17b4576e 100644
--- a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
+++ b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
@@ -38,18 +38,18 @@ public function __construct(Profile $profile, Environment $twig = null)
         $this->twig = $twig;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->profile->reset();
         unset($this->computed);
         $this->data = [];
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         $this->data['profile'] = serialize($this->profile);
         $this->data['template_paths'] = [];
diff --git a/src/Symfony/Bridge/Twig/EventListener/TemplateAttributeListener.php b/src/Symfony/Bridge/Twig/EventListener/TemplateAttributeListener.php
index 96924442d1e48..ef0f9ba9544e0 100644
--- a/src/Symfony/Bridge/Twig/EventListener/TemplateAttributeListener.php
+++ b/src/Symfony/Bridge/Twig/EventListener/TemplateAttributeListener.php
@@ -28,6 +28,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @return void
+     */
     public function onKernelView(ViewEvent $event)
     {
         $parameters = $event->getControllerResult();
diff --git a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
index 7f733455e824a..fbe8e0b3e43dc 100644
--- a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
+++ b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
@@ -132,6 +132,8 @@ protected function loadResourceForBlockName(string $cacheKey, FormView $view, st
      *                     to initialize the theme first. Any changes made to
      *                     this variable will be kept and be available upon
      *                     further calls to this method using the same theme.
+     *
+     * @return void
      */
     protected function loadResourcesFromTheme(string $cacheKey, mixed &$theme)
     {
diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
index 0707359dd16cf..2b44c5ef8d90a 100644
--- a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
+++ b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
@@ -45,6 +45,9 @@ public function __construct(Environment $twig)
         $this->twig = $twig;
     }
 
+    /**
+     * @return void
+     */
     public function extract($resource, MessageCatalogue $catalogue)
     {
         foreach ($this->extractFiles($resource) as $file) {
@@ -56,11 +59,17 @@ public function extract($resource, MessageCatalogue $catalogue)
         }
     }
 
+    /**
+     * @return void
+     */
     public function setPrefix(string $prefix)
     {
         $this->prefix = $prefix;
     }
 
+    /**
+     * @return void
+     */
     protected function extractTemplate(string $template, MessageCatalogue $catalogue)
     {
         $visitor = $this->twig->getExtension(TranslationExtension::class)->getTranslationNodeVisitor();
diff --git a/src/Symfony/Bundle/DebugBundle/Command/ServerDumpPlaceholderCommand.php b/src/Symfony/Bundle/DebugBundle/Command/ServerDumpPlaceholderCommand.php
index cc8588f1ceb6c..f0cffcd238ece 100644
--- a/src/Symfony/Bundle/DebugBundle/Command/ServerDumpPlaceholderCommand.php
+++ b/src/Symfony/Bundle/DebugBundle/Command/ServerDumpPlaceholderCommand.php
@@ -38,7 +38,7 @@ public function __construct(DumpServer $server = null, array $descriptors = [])
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->setDefinition($this->replacedCommand->getDefinition());
         $this->setHelp($this->replacedCommand->getHelp());
diff --git a/src/Symfony/Bundle/DebugBundle/DebugBundle.php b/src/Symfony/Bundle/DebugBundle/DebugBundle.php
index 045ea5f8dbd65..a24321e22910d 100644
--- a/src/Symfony/Bundle/DebugBundle/DebugBundle.php
+++ b/src/Symfony/Bundle/DebugBundle/DebugBundle.php
@@ -22,6 +22,9 @@
  */
 class DebugBundle extends Bundle
 {
+    /**
+     * @return void
+     */
     public function boot()
     {
         if ($this->container->getParameter('kernel.debug')) {
@@ -44,6 +47,9 @@ public function boot()
         }
     }
 
+    /**
+     * @return void
+     */
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
@@ -51,6 +57,9 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new DumpDataCollectorPass());
     }
 
+    /**
+     * @return void
+     */
     public function registerCommands(Application $application)
     {
         // noop
diff --git a/src/Symfony/Bundle/DebugBundle/DependencyInjection/Compiler/DumpDataCollectorPass.php b/src/Symfony/Bundle/DebugBundle/DependencyInjection/Compiler/DumpDataCollectorPass.php
index 5c531cc91dbcd..cecce87c4a4e7 100644
--- a/src/Symfony/Bundle/DebugBundle/DependencyInjection/Compiler/DumpDataCollectorPass.php
+++ b/src/Symfony/Bundle/DebugBundle/DependencyInjection/Compiler/DumpDataCollectorPass.php
@@ -22,6 +22,9 @@
  */
 class DumpDataCollectorPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('data_collector.dump')) {
diff --git a/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php b/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
index 2d077ba681f5e..eadeafba55832 100644
--- a/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
+++ b/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
@@ -29,6 +29,9 @@
  */
 class DebugExtension extends Extension
 {
+    /**
+     * @return void
+     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
index 1d94fc973b6e1..e489a0bbbec2b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
@@ -76,7 +76,7 @@ protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array
         return parent::warmUpPhpArrayAdapter($phpArrayAdapter, $values);
     }
 
-    private function readAllComponents(Reader $reader, string $class)
+    private function readAllComponents(Reader $reader, string $class): void
     {
         $reflectionClass = new \ReflectionClass($class);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
index f39950587c3e8..4f68228ee5200 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
@@ -31,7 +31,7 @@
 #[AsCommand(name: 'about', description: 'Display information about the current project')]
 class AboutCommand extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setHelp(<<<'EOT'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
index 2ee2d93988864..264955d7951eb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -52,7 +52,7 @@ public function __construct(Filesystem $filesystem, string $projectDir)
         $this->projectDir = $projectDir;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
@@ -226,7 +226,7 @@ private function absoluteSymlinkWithFallback(string $originDir, string $targetDi
      *
      * @throws IOException if link cannot be created
      */
-    private function symlink(string $originDir, string $targetDir, bool $relative = false)
+    private function symlink(string $originDir, string $targetDir, bool $relative = false): void
     {
         if ($relative) {
             $this->filesystem->mkdir(\dirname($targetDir));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
index ca46a577154a3..aa8c47f57166f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -48,7 +48,7 @@ public function __construct(CacheClearerInterface $cacheClearer, Filesystem $fil
         $this->filesystem = $filesystem ?? new Filesystem();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
@@ -219,7 +219,7 @@ private function isNfs(string $dir): bool
         return false;
     }
 
-    private function warmup(string $warmupDir, string $realBuildDir, bool $enableOptionalWarmers = true)
+    private function warmup(string $warmupDir, string $realBuildDir, bool $enableOptionalWarmers = true): void
     {
         // create a temporary kernel
         $kernel = $this->getApplication()->getKernel();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
index 99ebf9a979595..152e6cfcaeecd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
@@ -45,7 +45,7 @@ public function __construct(Psr6CacheClearer $poolClearer, array $poolNames = nu
         $this->poolNames = $poolNames;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolDeleteCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolDeleteCommand.php
index 2c0dddd0fd9f9..7b53ceb8ba94d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolDeleteCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolDeleteCommand.php
@@ -43,7 +43,7 @@ public function __construct(Psr6CacheClearer $poolClearer, array $poolNames = nu
         $this->poolNames = $poolNames;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolListCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolListCommand.php
index 0894d3fa719e5..2659ad8fe05c2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolListCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolListCommand.php
@@ -37,7 +37,7 @@ public function __construct(array $poolNames)
         $this->poolNames = $poolNames;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setHelp(<<<'EOF'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolPruneCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolPruneCommand.php
index 53f2b01dff994..fc0dc6d795e0d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolPruneCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolPruneCommand.php
@@ -38,7 +38,7 @@ public function __construct(iterable $pools)
         $this->pools = $pools;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setHelp(<<<'EOF'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php
index 48f7aa391bae4..d094902c36c55 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php
@@ -39,7 +39,7 @@ public function __construct(CacheWarmerAggregate $cacheWarmer)
         $this->cacheWarmer = $cacheWarmer;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
index b80bf4d0b0319..c8d4b2ca6e86a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -39,7 +39,7 @@
 #[AsCommand(name: 'debug:config', description: 'Dump the current configuration for an extension')]
 class ConfigDebugCommand extends AbstractConfigCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         $commentedHelpFormats = array_map(static fn (string $format): string => sprintf('<comment>%s</comment>', $format), $this->getAvailableFormatOptions());
         $helpFormats = implode('", "', $commentedHelpFormats);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
index c28c5a3d0de7a..0d0a4837212bf 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
@@ -39,7 +39,7 @@
 #[AsCommand(name: 'config:dump-reference', description: 'Dump the default configuration for an extension')]
 class ConfigDumpReferenceCommand extends AbstractConfigCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
index 293fccc20b18b..f57b5a5ae89cd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -38,7 +38,7 @@ class ContainerDebugCommand extends Command
 {
     use BuildDebugContainerTrait;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
@@ -243,7 +243,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
      *
      * @throws \InvalidArgumentException
      */
-    protected function validateInput(InputInterface $input)
+    protected function validateInput(InputInterface $input): void
     {
         $options = ['tags', 'tag', 'parameters', 'parameter'];
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php
index 8100793faf3dc..5bbaf40ea0271 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php
@@ -33,7 +33,7 @@ final class ContainerLintCommand extends Command
 {
     private ContainerBuilder $containerBuilder;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setHelp('This command parses service definitions and ensures that injected values match the type declarations of each services\' class.')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
index bb39b00288a99..92b02c9b14ed9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
@@ -43,7 +43,7 @@ public function __construct(string $name = null, FileLinkFormatter $fileLinkForm
         parent::__construct($name);
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php
index 41edb7505ab5c..a6a51ec97ca68 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php
@@ -46,7 +46,7 @@ public function __construct(ContainerInterface $dispatchers)
         $this->dispatchers = $dispatchers;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
index d2d1971b6ef45..b88130d7a6a23 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -50,7 +50,7 @@ public function __construct(RouterInterface $router, FileLinkFormatter $fileLink
         $this->fileLinkFormatter = $fileLinkFormatter;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
index a654522d806f2..7efd1f3ed3708 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
@@ -47,7 +47,7 @@ public function __construct(RouterInterface $router, iterable $expressionLanguag
         $this->expressionLanguageProviders = $expressionLanguageProviders;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php
index 823c0f10d8d1a..22be8950244de 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php
@@ -39,7 +39,7 @@ public function __construct(AbstractVault $vault, AbstractVault $localVault = nu
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->addOption('force', 'f', InputOption::VALUE_NONE, 'Force overriding of secrets that already exist in the local vault')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsEncryptFromLocalCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsEncryptFromLocalCommand.php
index aa5d25fc8dc2d..4c613ef7b27b6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsEncryptFromLocalCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsEncryptFromLocalCommand.php
@@ -38,7 +38,7 @@ public function __construct(AbstractVault $vault, AbstractVault $localVault = nu
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setHelp(<<<'EOF'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsGenerateKeysCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsGenerateKeysCommand.php
index 40816665781bf..761f6c260cd7b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsGenerateKeysCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsGenerateKeysCommand.php
@@ -41,7 +41,7 @@ public function __construct(AbstractVault $vault, AbstractVault $localVault = nu
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->addOption('local', 'l', InputOption::VALUE_NONE, 'Update the local vault.')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php
index 16a6f115992dc..8422d2c91a023 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php
@@ -42,7 +42,7 @@ public function __construct(AbstractVault $vault, AbstractVault $localVault = nu
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->addOption('reveal', 'r', InputOption::VALUE_NONE, 'Display decrypted values alongside names')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php
index dfbfcf2267469..e03afcd0cf902 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php
@@ -43,7 +43,7 @@ public function __construct(AbstractVault $vault, AbstractVault $localVault = nu
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->addArgument('name', InputArgument::REQUIRED, 'The name of the secret')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsSetCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsSetCommand.php
index 1a0a500d89872..0e831a343d2f7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsSetCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsSetCommand.php
@@ -44,7 +44,7 @@ public function __construct(AbstractVault $vault, AbstractVault $localVault = nu
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->addArgument('name', InputArgument::REQUIRED, 'The name of the secret')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
index f255053db3d5b..70d3a13e1db84 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
@@ -73,7 +73,7 @@ public function __construct(TranslatorInterface $translator, TranslationReaderIn
         $this->enabledLocales = $enabledLocales;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
index bf2d6347daa38..3005a5b286849 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -75,7 +75,7 @@ public function __construct(TranslationWriterInterface $writer, TranslationReade
         $this->enabledLocales = $enabledLocales;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
index 3daa2b9ddb71a..9a7ea28f35cf9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
@@ -66,7 +66,7 @@ public function __construct($workflows)
         }
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/XliffLintCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/XliffLintCommand.php
index c6c66da4fb3ac..73d55e7506fd4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/XliffLintCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/
10000
Command/XliffLintCommand.php
@@ -41,7 +41,7 @@ public function __construct()
         parent::__construct(null, $directoryIteratorProvider, $isReadableProvider);
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php
index d29b9e523c478..14139081264fc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php
@@ -40,7 +40,7 @@ public function __construct()
         parent::__construct(null, $directoryIteratorProvider, $isReadableProvider);
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
index d73f323af7bbc..cdbb90a3a967a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -52,6 +52,9 @@ public function getKernel(): KernelInterface
         return $this->kernel;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         if ($this->kernel->getContainer()->has('services_resetter')) {
@@ -137,6 +140,9 @@ public function add(Command $command): ?Command
         return parent::add($command);
     }
 
+    /**
+     * @return void
+     */
     protected function registerCommands()
     {
         if ($this->commandsRegistered) {
@@ -177,7 +183,7 @@ protected function registerCommands()
         }
     }
 
-    private function renderRegistrationErrors(InputInterface $input, OutputInterface $output)
+    private function renderRegistrationErrors(InputInterface $input, OutputInterface $output): void
     {
         if ($output instanceof ConsoleOutputInterface) {
             $output = $output->getErrorOutput();
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php
index fbbf53d3431f2..2105a54df9f36 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php
@@ -20,7 +20,7 @@
  */
 class AddAnnotationsCachedReaderPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         // "annotations.cached_reader" is wired late so that any passes using
         // "annotation_reader" at build time don't get any cache
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
index a1bf0a80eadb0..d0aca7a06bf06 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
@@ -17,6 +17,9 @@
 
 class AddDebugLogProcessorPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('profiler')) {
@@ -34,6 +37,9 @@ public function process(ContainerBuilder $container)
         $definition->addMethodCall('pushProcessor', [new Reference('debug.log_processor')]);
     }
 
+    /**
+     * @return void
+     */
     public static function configureLogger(mixed $logger)
     {
         if (\is_object($logger) && method_exists($logger, 'removeDebugLogger') && \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
index f7a6bcdbd710a..5442b277348e3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
@@ -22,6 +22,9 @@
  */
 class AddExpressionLanguageProvidersPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         // routing
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AssetsContextPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AssetsContextPass.php
index 3fc79f0ee0d64..e8c2ad3a0e031 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AssetsContextPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AssetsContextPass.php
@@ -18,6 +18,9 @@
 
 class AssetsContextPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('assets.context')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
index 0df5420c769ee..af20aaa9519c5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
@@ -25,6 +25,9 @@
  */
 class ContainerBuilderDebugDumpPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $cache = new ConfigCache($container->getParameter('debug.container.dump'), true);
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/DataCollectorTranslatorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/DataCollectorTranslatorPass.php
index 898f961d0a1f3..e66e98b451d6c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/DataCollectorTranslatorPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/DataCollectorTranslatorPass.php
@@ -20,6 +20,9 @@
  */
 class DataCollectorTranslatorPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->has('translator')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/EnableLoggerDebugModePass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/EnableLoggerDebugModePass.php
index 3dad9d6b24031..ef303a1406da9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/EnableLoggerDebugModePass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/EnableLoggerDebugModePass.php
@@ -17,7 +17,7 @@
 
 final class EnableLoggerDebugModePass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('profiler') || !$container->hasDefinition('logger')) {
             return;
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
index 80cbe52e6c4f4..b7cb920bf7434 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/LoggingTranslatorPass.php
@@ -22,6 +22,9 @@
  */
 class LoggingTranslatorPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasAlias('logger') || !$container->hasAlias('translator')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php
index 7200b12b9ba87..c2d669fe1cf3a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php
@@ -24,6 +24,9 @@
  */
 class ProfilerPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (false === $container->hasDefinition('profiler')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RemoveUnusedSessionMarshallingHandlerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RemoveUnusedSessionMarshallingHandlerPass.php
index 8b6479c4f2edd..fedc30d06eec4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RemoveUnusedSessionMarshallingHandlerPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RemoveUnusedSessionMarshallingHandlerPass.php
@@ -19,6 +19,9 @@
  */
 class RemoveUnusedSessionMarshallingHandlerPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('session.marshalling_handler')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
index 8d54563c2c7d0..09f272daa940e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
@@ -21,6 +21,9 @@
  */
 class TestServiceContainerRealRefPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('test.private_services_locator')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
index 45166842b5e0d..6e7669a710eb2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
@@ -21,6 +21,9 @@
  */
 class TestServiceContainerWeakRefPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('test.private_services_locator')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
index f127f32b49952..169a1c0a6909a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -101,6 +101,9 @@ class UnusedTagsPass implements CompilerPassInterface
         'workflow',
     ];
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $tags = array_unique(array_merge($container->findTags(), self::KNOWN_TAGS));
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
index d74fa11b2ae6b..bda9ca9515258 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
@@ -21,6 +21,9 @@
  */
 class WorkflowGuardListenerPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasParameter('workflow.has_guard_listeners')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 772c8fe1ffeb7..53c1526866923 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -183,7 +183,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         return $treeBuilder;
     }
 
-    private function addSecretsSection(ArrayNodeDefinition $rootNode)
+    private function addSecretsSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -199,7 +199,7 @@ private function addSecretsSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addCsrfSection(ArrayNodeDefinition $rootNode)
+    private function addCsrfSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -217,7 +217,7 @@ private function addCsrfSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addFormSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addFormSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -244,7 +244,7 @@ private function addFormSection(ArrayNodeDefinition $rootNode, callable $enableI
         ;
     }
 
-    private function addHttpCacheSection(ArrayNodeDefinition $rootNode)
+    private function addHttpCacheSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -274,7 +274,7 @@ private function addHttpCacheSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addEsiSection(ArrayNodeDefinition $rootNode)
+    private function addEsiSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -286,7 +286,7 @@ private function addEsiSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addSsiSection(ArrayNodeDefinition $rootNode)
+    private function addSsiSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -297,7 +297,7 @@ private function addSsiSection(ArrayNodeDefinition $rootNode)
             ->end();
     }
 
-    private function addFragmentsSection(ArrayNodeDefinition $rootNode)
+    private function addFragmentsSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -313,7 +313,7 @@ private function addFragmentsSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addProfilerSection(ArrayNodeDefinition $rootNode)
+    private function addProfilerSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -333,7 +333,7 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addWorkflowSection(ArrayNodeDefinition $rootNode)
+    private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->fixXmlConfig('workflow')
@@ -596,7 +596,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addRouterSection(ArrayNodeDefinition $rootNode)
+    private function addRouterSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -629,7 +629,7 @@ private function addRouterSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addSessionSection(ArrayNodeDefinition $rootNode)
+    private function addSessionSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -678,7 +678,7 @@ private function addSessionSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addRequestSection(ArrayNodeDefinition $rootNode)
+    private function addRequestSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -704,7 +704,7 @@ private function addRequestSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addAssetsSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addAssetsSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -800,7 +800,7 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode, callable $enabl
         ;
     }
 
-    private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -870,7 +870,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
         ;
     }
 
-    private function addValidationSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addValidationSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -960,7 +960,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
         ;
     }
 
-    private function addAnnotationsSection(ArrayNodeDefinition $rootNode, callable $willBeAvailable)
+    private function addAnnotationsSection(ArrayNodeDefinition $rootNode, callable $willBeAvailable): void
     {
         $rootNode
             ->children()
@@ -980,7 +980,7 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode, callable $
         ;
     }
 
-    private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -1013,7 +1013,7 @@ private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $e
         ;
     }
 
-    private function addPropertyAccessSection(ArrayNodeDefinition $rootNode, callable $willBeAvailable)
+    private function addPropertyAccessSection(ArrayNodeDefinition $rootNode, callable $willBeAvailable): void
     {
         $rootNode
             ->children()
@@ -1033,7 +1033,7 @@ private function addPropertyAccessSection(ArrayNodeDefinition $rootNode, callabl
         ;
     }
 
-    private function addPropertyInfoSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addPropertyInfoSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -1045,7 +1045,7 @@ private function addPropertyInfoSection(ArrayNodeDefinition $rootNode, callable
         ;
     }
 
-    private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBeAvailable)
+    private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBeAvailable): void
     {
         $rootNode
             ->children()
@@ -1136,7 +1136,7 @@ private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBe
         ;
     }
 
-    private function addPhpErrorsSection(ArrayNodeDefinition $rootNode)
+    private function addPhpErrorsSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -1182,7 +1182,7 @@ private function addPhpErrorsSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addExceptionsSection(ArrayNodeDefinition $rootNode)
+    private function addExceptionsSection(ArrayNodeDefinition $rootNode): void
     {
         $logLevels = (new \ReflectionClass(LogLevel::class))->getConstants();
 
@@ -1242,7 +1242,7 @@ private function addExceptionsSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addLockSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addLockSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -1305,7 +1305,7 @@ private function addLockSection(ArrayNodeDefinition $rootNode, callable $enableI
         ;
     }
 
-    private function addSemaphoreSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addSemaphoreSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -1360,7 +1360,7 @@ private function addSemaphoreSection(ArrayNodeDefinition $rootNode, callable $en
         ;
     }
 
-    private function addWebLinkSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addWebLinkSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -1372,7 +1372,7 @@ private function addWebLinkSection(ArrayNodeDefinition $rootNode, callable $enab
         ;
     }
 
-    private function addMessengerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addMessengerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -1598,7 +1598,7 @@ function ($a) {
         ;
     }
 
-    private function addRobotsIndexSection(ArrayNodeDefinition $rootNode)
+    private function addRobotsIndexSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -1611,7 +1611,7 @@ private function addRobotsIndexSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -1955,7 +1955,7 @@ private function addHttpClientRetrySection()
         ;
     }
 
-    private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -2009,7 +2009,7 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl
         ;
     }
 
-    private function addNotifierSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addNotifierSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -2061,7 +2061,7 @@ private function addNotifierSection(ArrayNodeDefinition $rootNode, callable $ena
         ;
     }
 
-    private function addRateLimiterSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addRateLimiterSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -2132,7 +2132,7 @@ private function addRateLimiterSection(ArrayNodeDefinition $rootNode, callable $
         ;
     }
 
-    private function addUidSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addUidSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
@@ -2165,7 +2165,7 @@ private function addUidSection(ArrayNodeDefinition $rootNode, callable $enableIf
         ;
     }
 
-    private function addHtmlSanitizerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    private function addHtmlSanitizerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
             ->children()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 47f311fe97bd2..7d1d6dd5a407e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -266,6 +266,8 @@ class FrameworkExtension extends Extension
      * Responds to the app.config configuration parameter.
      *
      * @throws LogicException
+     *
+     * @return void
      */
     public function load(array $configs, ContainerBuilder $container)
     {
@@ -720,7 +722,7 @@ protected function hasConsole(): bool
         return class_exists(Application::class);
     }
 
-    private function registerFormConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerFormConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('form.php');
 
@@ -751,7 +753,7 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
         }
     }
 
-    private function registerHttpCacheConfiguration(array $config, ContainerBuilder $container, bool $httpMethodOverride)
+    private function registerHttpCacheConfiguration(array $config, ContainerBuilder $container, bool $httpMethodOverride): void
     {
         $options = $config;
         unset($options['enabled']);
@@ -772,7 +774,7 @@ private function registerHttpCacheConfiguration(array $config, ContainerBuilder
         }
     }
 
-    private function registerEsiConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerEsiConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!$this->readConfigEnabled('esi', $container, $config)) {
             $container->removeDefinition('fragment.renderer.esi');
@@ -783,7 +785,7 @@ private function registerEsiConfiguration(array $config, ContainerBuilder $conta
         $loader->load('esi.php');
     }
 
-    private function registerSsiConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerSsiConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!$this->readConfigEnabled('ssi', $container, $config)) {
             $container->removeDefinition('fragment.renderer.ssi');
@@ -794,7 +796,7 @@ private function registerSsiConfiguration(array $config, ContainerBuilder $conta
         $loader->load('ssi.php');
     }
 
-    private function registerFragmentsConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerFragmentsConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!$this->readConfigEnabled('fragments', $container, $config)) {
             $container->removeDefinition('fragment.renderer.hinclude');
@@ -808,7 +810,7 @@ private function registerFragmentsConfiguration(array $config, ContainerBuilder
         $container->setParameter('fragment.path', $config['path']);
     }
 
-    private function registerProfilerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerProfilerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!$this->readConfigEnabled('profiler', $container, $config)) {
             // this is needed for the WebProfiler to work even if the profiler is disabled
@@ -874,7 +876,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
             ->addArgument($config['collect_parameter']);
     }
 
-    private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!$config['enabled']) {
             $container->removeDefinition('console.command.workflow_dump');
@@ -1072,7 +1074,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
         }
     }
 
-    private function registerDebugConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerDebugConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('debug_prod.php');
 
@@ -1113,7 +1115,7 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
         }
     }
 
-    private function registerRouterConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, array $enabledLocales = [])
+    private function registerRouterConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, array $enabledLocales = []): void
     {
         if (!$this->readConfigEnabled('router', $container, $config)) {
             $container->removeDefinition('console.command.router_debug');
@@ -1164,7 +1166,7 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
         }
     }
 
-    private function registerSessionConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerSessionConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('session.php');
 
@@ -1212,7 +1214,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
         $container->setParameter('session.metadata.update_threshold', $config['metadata_update_threshold']);
     }
 
-    private function registerRequestConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerRequestConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if ($config['formats']) {
             $loader->load('request.php');
@@ -1222,7 +1224,7 @@ private function registerRequestConfiguration(array $config, ContainerBuilder $c
         }
     }
 
-    private function registerAssetsConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerAssetsConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('assets.php');
 
@@ -1300,7 +1302,7 @@ private function createVersion(ContainerBuilder $container, ?string $version, ?s
         return new Reference('assets.empty_version_strategy');
     }
 
-    private function registerTranslatorConfiguration(array $config, ContainerBuilder $container, LoaderInterface $loader, string $defaultLocale, array $enabledLocales)
+    private function registerTranslatorConfiguration(array $config, ContainerBuilder $container, LoaderInterface $loader, string $defaultLocale, array $enabledLocales): void
     {
         if (!$this->readConfigEnabled('translator', $container, $config)) {
             $container->removeDefinition('console.command.translation_debug');
@@ -1491,7 +1493,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         $container->getDefinition('translation.provider_collection')->setArgument(0, $config['providers']);
     }
 
-    private function registerValidationConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $propertyInfoEnabled)
+    private function registerValidationConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $propertyInfoEnabled): void
     {
         if (!$this->readConfigEnabled('validation', $container, $config)) {
             $container->removeDefinition('console.command.validator_debug');
@@ -1564,7 +1566,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
         }
     }
 
-    private function registerValidatorMapping(ContainerBuilder $container, array $config, array &$files)
+    private function registerValidatorMapping(ContainerBuilder $container, array $config, array &$files): void
     {
         $fileRecorder = function ($extension, $path) use (&$files) {
             $files['yaml' === $extension ? 'yml' : $extension][] = $path;
@@ -1602,14 +1604,14 @@ private function registerValidatorMapping(ContainerBuilder $container, array $co
         $this->registerMappingFilesFromConfig($container, $config, $fileRecorder);
     }
 
-    private function registerMappingFilesFromDir(string $dir, callable $fileRecorder)
+    private function registerMappingFilesFromDir(string $dir, callable $fileRecorder): void
     {
         foreach (Finder::create()->followLinks()->files()->in($dir)->name('/\.(xml|ya?ml)$/')->sortByName() as $file) {
             $fileRecorder($file->getExtension(), $file->getRealPath());
         }
     }
 
-    private function registerMappingFilesFromConfig(ContainerBuilder $container, array $config, callable $fileRecorder)
+    private function registerMappingFilesFromConfig(ContainerBuilder $container, array $config, callable $fileRecorder): void
     {
         foreach ($config['mapping']['paths'] as $path) {
             if (is_dir($path)) {
@@ -1626,7 +1628,7 @@ private function registerMappingFilesFromConfig(ContainerBuilder $container, arr
         }
     }
 
-    private function registerAnnotationsConfiguration(array $config, ContainerBuilder $container, LoaderInterface $loader)
+    private function registerAnnotationsConfiguration(array $config, ContainerBuilder $container, LoaderInterface $loader): void
     {
         if (!$this->isInitializedConfigEnabled('annotations')) {
             return;
@@ -1676,7 +1678,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
         $container->removeDefinition('annotations.psr_cached_reader');
     }
 
-    private function registerPropertyAccessConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerPropertyAccessConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!$this->readConfigEnabled('property_access', $container, $config)) {
             return;
@@ -1702,7 +1704,7 @@ private function registerPropertyAccessConfiguration(array $config, ContainerBui
         ;
     }
 
-    private function registerSecretsConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerSecretsConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!$this->readConfigEnabled('secrets', $container, $config)) {
             $container->removeDefinition('console.command.secrets_set');
@@ -1742,7 +1744,7 @@ private function registerSecretsConfiguration(array $config, ContainerBuilder $c
         }
     }
 
-    private function registerSecurityCsrfConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerSecurityCsrfConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!$this->readConfigEnabled('csrf_protection', $container, $config)) {
             return;
@@ -1764,7 +1766,7 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild
         }
     }
 
-    private function registerSerializerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerSerializerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('serializer.php');
         if ($container->getParameter('kernel.debug')) {
@@ -1858,7 +1860,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         }
     }
 
-    private function registerPropertyInfoConfiguration(ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerPropertyInfoConfiguration(ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!interface_exists(PropertyInfoExtractorInterface::class)) {
             throw new LogicException('PropertyInfo support cannot be enabled as the PropertyInfo component is not installed. Try running "composer require symfony/property-info".');
@@ -1885,7 +1887,7 @@ private function registerPropertyInfoConfiguration(ContainerBuilder $container,
         }
     }
 
-    private function registerLockConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerLockConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('lock.php');
 
@@ -1933,7 +1935,7 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
         }
     }
 
-    private function registerSemaphoreConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerSemaphoreConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('semaphore.php');
 
@@ -1966,7 +1968,7 @@ private function registerSemaphoreConfiguration(array $config, ContainerBuilder
         }
     }
 
-    private function registerMessengerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, array $validationConfig)
+    private function registerMessengerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, array $validationConfig): void
     {
         if (!interface_exists(MessageBusInterface::class)) {
             throw new LogicException('Messenger support cannot be enabled as the Messenger component is not installed. Try running "composer require symfony/messenger".');
@@ -2207,7 +2209,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
         }
     }
 
-    private function registerCacheConfiguration(array $config, ContainerBuilder $container)
+    private function registerCacheConfiguration(array $config, ContainerBuilder $container): void
     {
         if (!class_exists(DefaultMarshaller::class)) {
             $container->removeDefinition('cache.default_marshaller');
@@ -2324,7 +2326,7 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
         }
     }
 
-    private function registerHttpClientConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerHttpClientConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('http_client.php');
 
@@ -2394,7 +2396,7 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
         }
     }
 
-    private function registerRetryableHttpClient(array $options, string $name, ContainerBuilder $container)
+    private function registerRetryableHttpClient(array $options, string $name, ContainerBuilder $container): void
     {
         if (null !== $options['retry_strategy']) {
             $retryStrategy = new Reference($options['retry_strategy']);
@@ -2427,7 +2429,7 @@ private function registerRetryableHttpClient(array $options, string $name, Conta
             ->addTag('monolog.logger', ['channel' => 'http_client']);
     }
 
-    private function registerMailerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerMailerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!class_exists(Mailer::class)) {
             throw new LogicException('Mailer support cannot be enabled as the component is not installed. Try running "composer require symfony/mailer".');
@@ -2495,7 +2497,7 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
         }
     }
 
-    private function registerNotifierConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerNotifierConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!class_exists(Notifier::class)) {
             throw new LogicException('Notifier support cannot be enabled as the component is not installed. Try running "composer require symfony/notifier".');
@@ -2661,7 +2663,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
         }
     }
 
-    private function registerRateLimiterConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerRateLimiterConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('rate_limiter.php');
 
@@ -2700,6 +2702,8 @@ private function registerRateLimiterConfiguration(array $config, ContainerBuilde
 
     /**
      * @deprecated since Symfony 6.2
+     *
+     * @return void
      */
     public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)
     {
@@ -2735,7 +2739,7 @@ public static function registerRateLimiter(ContainerBuilder $container, string $
         $container->registerAliasForArgument($limiterId, RateLimiterFactory::class, $name.'.limiter');
     }
 
-    private function registerUidConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerUidConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('uid.php');
 
@@ -2760,7 +2764,7 @@ private function registerUidConfiguration(array $config, ContainerBuilder $conta
         }
     }
 
-    private function registerHtmlSanitizerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    private function registerHtmlSanitizerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('html_sanitizer.php');
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index b51e19a5a2341..c5af22c91316f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -89,6 +89,9 @@ class_exists(Registry::class);
  */
 class FrameworkBundle extends Bundle
 {
+    /**
+     * @return void
+     */
     public function boot()
     {
         ErrorHandler::register(null, false)->throwAt($this->container->getParameter('debug.error_handler.throw_at'), true);
@@ -102,6 +105,9 @@ public function boot()
         }
     }
 
+    /**
+     * @return void
+     */
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
@@ -174,7 +180,7 @@ public function build(ContainerBuilder $container)
         }
     }
 
-    private function addCompilerPassIfExists(ContainerBuilder $container, string $class, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
+    private function addCompilerPassIfExists(ContainerBuilder $container, string $class, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0): void
     {
         $container->addResource(new ClassExistenceResource($class));
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
index b75b422ce7e5e..1f484c1b84515 100644
--- a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
@@ -73,6 +73,8 @@ public function getProfile(): HttpProfile|false|null
      * Enables the profiler for the very next request.
      *
      * If the profiler is not enabled, the call to this method does nothing.
+     *
+     * @return void
      */
     public function enableProfiler()
     {
@@ -86,6 +88,8 @@ public function enableProfiler()
      *
      * By default, the Client reboots the Kernel for each request. This method
      * allows to keep the same kernel across requests.
+     *
+     * @return void
      */
     public function disableReboot()
     {
@@ -94,6 +98,8 @@ public function disableReboot()
 
     /**
      * Enables kernel reboot between requests.
+     *
+     * @return void
      */
     public function enableReboot()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php
index 7e6fa732090eb..ec03f849793df 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Routing/AnnotatedRouteControllerLoader.php
@@ -24,6 +24,8 @@ class AnnotatedRouteControllerLoader extends AnnotationClassLoader
 {
     /**
      * Configures the _controller default parameter of a given Route instance.
+     *
+     * @return void
      */
     protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
index ac5db387de808..f9747a3c489a8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
@@ -109,7 +109,7 @@ public function warmUp(string $cacheDir): array
      * - the route schemes,
      * - the route methods.
      */
-    private function resolveParameters(RouteCollection $collection)
+    private function resolveParameters(RouteCollection $collection): void
     {
         foreach ($collection as $route) {
             foreach ($route->getDefaults() as $name => $value) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php b/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php
index 933fb6de47a83..e1e7a85926068 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php
@@ -36,7 +36,7 @@ public function __construct(
     ) {
     }
 
-    public function compile()
+    public function compile(): void
     {
         $this->getPublicContainer()->compile();
     }
@@ -61,12 +61,12 @@ public function hasParameter(string $name): bool
         return $this->getPublicContainer()->hasParameter($name);
     }
 
-    public function setParameter(string $name, mixed $value)
+    public function setParameter(string $name, mixed $value): void
     {
         $this->getPublicContainer()->setParameter($name, $value);
     }
 
-    public function set(string $id, mixed $service)
+    public function set(string $id, mixed $service): void
     {
         $container = $this->getPublicContainer();
         $renamedId = $this->renamedIds[$id] ?? $id;
@@ -99,7 +99,7 @@ public function initialized(string $id): bool
         return $this->getPublicContainer()->initialized($id);
     }
 
-    public function reset()
+    public function reset(): void
     {
         // ignore the call
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
index bb7d4f1f4ae4d..87f781f475b31 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
@@ -65,7 +65,7 @@ public function testValidCollector()
     public function provideValidCollectorWithTemplateUsingAutoconfigure(): \Generator
     {
         yield [new class() implements TemplateAwareDataCollectorInterface {
-            public function collect(Request $request, Response $response, \Throwable $exception = null)
+            public function collect(Request $request, Response $response, \Throwable $exception = null): void
             {
             }
 
@@ -74,7 +74,7 @@ public function getName(): string
                 return static::class;
             }
 
-            public function reset()
+            public function reset(): void
             {
             }
 
@@ -85,7 +85,7 @@ public static function getTemplate(): string
         }];
 
         yield [new class() extends AbstractDataCollector {
-            public function collect(Request $request, Response $response, \Throwable $exception = null)
+            public function collect(Request $request, Response $response, \Throwable $exception = null): void
             {
             }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
index 3116080f042c0..dac3b6394fce8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -118,6 +118,9 @@ public function warmUp(string $cacheDir): array
         return [];
     }
 
+    /**
+     * @return void
+     */
     public function addResource(string $format, mixed $resource, string $locale, string $domain = null)
     {
         if ($this->resourceFiles) {
@@ -126,6 +129,9 @@ public function addResource(string $format, mixed $resource, string $locale, str
         $this->resources[] = [$format, $resource, $locale, $domain];
     }
 
+    /**
+     * @return void
+     */
     protected function initializeCatalogue(string $locale)
     {
         $this->initialize();
@@ -145,6 +151,9 @@ protected function doLoadCatalogue(string $locale): void
         }
     }
 
+    /**
+     * @return void
+     */
     protected function initialize()
     {
         if ($this->resourceFiles) {
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php
index 0f105efd5ea1b..846d82dec0710 100644
--- a/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php
+++ b/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php
@@ -152,7 +152,7 @@ protected function displayFirewallSummary(string $name, FirewallContext $context
         );
     }
 
-    private function displaySwitchUser(FirewallContext $context, SymfonyStyle $io)
+    private function displaySwitchUser(FirewallContext $context, SymfonyStyle $io): void
     {
         if ((null === $config = $context->getConfig()) || (null === $switchUser = $config->getSwitchUser())) {
             return;
diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
index 6f0e496477702..14b95bff007b1 100644
--- a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
+++ b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
@@ -55,7 +55,7 @@ public function __construct(TokenStorageInterface $tokenStorage = null, RoleHier
         $this->hasVarDumper = class_exists(ClassStub::class);
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         if (null === $this->tokenStorage) {
             $this->data = [
@@ -202,12 +202,12 @@ public function collect(Request $request, Response $response, \Throwable $except
         $this->data['authenticators'] = $this->firewall ? $this->firewall->getAuthenticatorsInfo() : [];
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         $this->data = $this->cloneVar($this->data);
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
index 0e40e398510a2..bb5fe03096466 100644
--- a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
+++ b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableFirewallListener.php
@@ -41,7 +41,7 @@ public function getAuthenticatorsInfo(): array
         return $this->authenticatorsInfo;
     }
 
-    protected function callListeners(RequestEvent $event, iterable $listeners)
+    protected function callListeners(RequestEvent $event, iterable $listeners): void
     {
         $wrappedListeners = [];
         $wrappedLazyListeners = [];
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
index 607d1f06c927d..08d7fd9213df8 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
@@ -22,6 +22,9 @@
  */
 class AddExpressionLanguageProvidersPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if ($container->has('security.expression_language')) {
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
index 273a0db67fddf..ccf474087af5d 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSecurityVotersPass.php
@@ -29,6 +29,9 @@ class AddSecurityVotersPass implements CompilerPassInterface
 {
     use PriorityTaggedServiceTrait;
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('security.access.decision_manager')) {
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php
index 5b107b5ef0dfc..9a7a94ca08786 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php
@@ -21,6 +21,9 @@
  */
 class AddSessionDomainConstraintPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasParameter('session.storage.options') || !$container->has('security.http_utils')) {
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/CleanRememberMeVerifierPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/CleanRememberMeVerifierPass.php
index fb4b6f83dc3b8..2041a36b3806d 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/CleanRememberMeVerifierPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/CleanRememberMeVerifierPass.php
@@ -21,6 +21,9 @@
  */
 class CleanRememberMeVerifierPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('cache.system')) {
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePass.php
index ee231a9398839..e7c77d1ec31d8 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/MakeFirewallsEventDispatcherTraceablePass.php
@@ -22,6 +22,9 @@
  */
 class MakeFirewallsEventDispatcherTraceablePass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->has('event_dispatcher') || !$container->hasParameter('security.firewalls')) {
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfFeaturesPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfFeaturesPass.php
index a0d6206134031..3564f7c1fd38a 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfFeaturesPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterCsrfFeaturesPass.php
@@ -26,13 +26,13 @@
  */
 class RegisterCsrfFeaturesPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $this->registerCsrfProtectionListener($container);
         $this->registerLogoutHandler($container);
     }
 
-    private function registerCsrfProtectionListener(ContainerBuilder $container)
+    private function registerCsrfProtectionListener(ContainerBuilder $container): void
     {
         if (!$container->has('security.authenticator.manager') || !$container->has('security.csrf.token_manager')) {
             return;
@@ -44,7 +44,7 @@ private function registerCsrfProtectionListener(ContainerBuilder $container)
             ->setPublic(false);
     }
 
-    protected function registerLogoutHandler(ContainerBuilder $container)
+    protected function registerLogoutHandler(ContainerBuilder $container): void
     {
         if (!$container->has('security.logout_listener') || !$container->has('security.csrf.token_storage')) {
             return;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterEntryPointPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterEntryPointPass.php
index 6de49517f3405..3ca2a70acb934 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterEntryPointPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterEntryPointPass.php
@@ -23,6 +23,9 @@
  */
 class RegisterEntryPointPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasParameter('security.firewalls')) {
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPass.php
index 8eac2cf83a8c0..5d581aac7ccd8 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterGlobalSecurityEventListenersPass.php
@@ -52,7 +52,7 @@ class RegisterGlobalSecurityEventListenersPass implements CompilerPassInterface
         SecurityEvents::INTERACTIVE_LOGIN,
     ];
 
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->has('event_dispatcher') || !$container->hasParameter('security.firewalls')) {
             return;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterLdapLocatorPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterLdapLocatorPass.php
index 295f363292245..8221aa53aa783 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterLdapLocatorPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterLdapLocatorPass.php
@@ -25,7 +25,7 @@
  */
 class RegisterLdapLocatorPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $definition = $container->setDefinition('security.ldap_locator', new Definition(ServiceLocator::class));
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterTokenUsageTrackingPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterTokenUsageTrackingPass.php
index fdffab1bbf395..1d1e47cfe15ec 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterTokenUsageTrackingPass.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterTokenUsageTrackingPass.php
@@ -27,7 +27,7 @@
  */
 class RegisterTokenUsageTrackingPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->has('security.untracked_token_storage')) {
             return;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index b748c363a9952..bdb56a9f26bbf 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -102,7 +102,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         return $tb;
     }
 
-    private function addRoleHierarchySection(ArrayNodeDefinition $rootNode)
+    private function addRoleHierarchySection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->fixXmlConfig('role', 'role_hierarchy')
@@ -123,7 +123,7 @@ private function addRoleHierarchySection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addAccessControlSection(ArrayNodeDefinition $rootNode)
+    private function addAccessControlSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->fixXmlConfig('rule', 'access_control')
@@ -175,7 +175,7 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)
     /**
      * @param array<array-key, AuthenticatorFactoryInterface> $factories
      */
-    private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $factories)
+    private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $factories): void
     {
         $firewallNodeBuilder = $rootNode
             ->fixXmlConfig('firewall')
@@ -342,7 +342,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
         ;
     }
 
-    private function addProvidersSection(ArrayNodeDefinition $rootNode)
+    private function addProvidersSection(ArrayNodeDefinition $rootNode): void
     {
         $providerNodeBuilder = $rootNode
             ->fixXmlConfig('provider')
@@ -401,7 +401,7 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addPasswordHashersSection(ArrayNodeDefinition $rootNode)
+    private function addPasswordHashersSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->fixXmlConfig('password_hasher')
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
index fd2b18bb50f08..24eb1377c51c2 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -52,6 +52,9 @@ final public function addOption(string $name, mixed $default = null): void
         $this->options[$name] = $default;
     }
 
+    /**
+     * @return void
+     */
     public function addConfiguration(NodeDefinition $node)
     {
         $builder = $node->children();
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/CustomAuthenticatorFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/CustomAuthenticatorFactory.php
index b36745c672d5c..e443122e6cf10 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/CustomAuthenticatorFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/CustomAuthenticatorFactory.php
@@ -35,7 +35,7 @@ public function getKey(): string
     /**
      * @param ArrayNodeDefinition $builder
      */
-    public function addConfiguration(NodeDefinition $builder)
+    public function addConfiguration(NodeDefinition $builder): void
     {
         $builder
             ->info('An array of service ids for all of your "authenticators"')
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginFactory.ph
10000
p b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginFactory.php
index bc5ce52376c0f..177fda4feb5a4 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginFactory.php
@@ -50,7 +50,7 @@ public function getKey(): string
         return 'form-login';
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         parent::addConfiguration($node);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php
index a439ca0adf316..705d079c5d73e 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php
@@ -25,7 +25,7 @@ class FormLoginLdapFactory extends FormLoginFactory
 {
     use LdapFactoryTrait;
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         parent::addConfiguration($node);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
index 02f2009ac1eca..45d78508de6bc 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
@@ -48,7 +48,7 @@ public function getKey(): string
         return 'http-basic';
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         $node
             ->children()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php
index 0c63b21c63aaa..3d7946115c433 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php
@@ -70,7 +70,7 @@ public function create(ContainerBuilder $container, string $id, array $config, s
         return [$provider, $listenerId, $entryPointId];
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         parent::addConfiguration($node);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php
index 3b4ff7a048df2..61266854c8f5e 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php
@@ -22,7 +22,7 @@ class JsonLoginLdapFactory extends JsonLoginFactory
 {
     use LdapFactoryTrait;
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         parent::addConfiguration($node);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginLinkFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginLinkFactory.php
index 29b588631bc0a..9a03a0f066744 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginLinkFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginLinkFactory.php
@@ -28,7 +28,7 @@ class LoginLinkFactory extends AbstractFactory
 {
     public const PRIORITY = -20;
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         /** @var NodeBuilder $builder */
         $builder = $node->fixXmlConfig('signature_property', 'signature_properties')->children();
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginThrottlingFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginThrottlingFactory.php
index 6356702cc5d0b..4092f3e837f4c 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginThrottlingFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginThrottlingFactory.php
@@ -44,7 +44,7 @@ public function getKey(): string
     /**
      * @param ArrayNodeDefinition $builder
      */
-    public function addConfiguration(NodeDefinition $builder)
+    public function addConfiguration(NodeDefinition $builder): void
     {
         $builder
             ->children()
@@ -87,7 +87,7 @@ public function createAuthenticator(ContainerBuilder $container, string $firewal
         return [];
     }
 
-    private function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)
+    private function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig): void
     {
         // default configuration (when used by other DI extensions)
         $limiterConfig += ['lock_factory' => 'lock.factory', 'cache_pool' => 'cache.rate_limiter'];
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
index 8d5827232bd04..a9a679ffc3d51 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
@@ -133,7 +133,7 @@ public function getKey(): string
         return 'remember-me';
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         $builder = $node
             ->fixXmlConfig('user_provider')
@@ -235,7 +235,7 @@ private function createTokenVerifier(ContainerBuilder $container, string $firewa
         return new Reference($tokenVerifierId, ContainerInterface::NULL_ON_INVALID_REFERENCE);
     }
 
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         $rememberMeSecureDefault = false;
         $rememberMeSameSiteDefault = null;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RemoteUserFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RemoteUserFactory.php
index de79af1494f42..97d50008b5baf 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RemoteUserFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RemoteUserFactory.php
@@ -51,7 +51,7 @@ public function getKey(): string
         return 'remote-user';
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         $node
             ->children()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php
index 77840005c5fc9..2d28e2b684b74 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php
@@ -52,7 +52,7 @@ public function getKey(): string
         return 'x509';
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         $node
             ->children()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
index 32208a6e3b359..936f58a084222 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
@@ -24,6 +24,9 @@
  */
 class InMemoryFactory implements UserProviderFactoryInterface
 {
+    /**
+     * @return void
+     */
     public function create(ContainerBuilder $container, string $id, array $config)
     {
         $definition = $container->setDefinition($id, new ChildDefinition('security.user.provider.in_memory'));
@@ -45,6 +48,9 @@ public function getKey()
         return 'memory';
     }
 
+    /**
+     * @return void
+     */
     public function addConfiguration(NodeDefinition $node)
     {
         $node
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
index d54ebf7738167..2f4dca01d1598 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
@@ -24,6 +24,9 @@
  */
 class LdapFactory implements UserProviderFactoryInterface
 {
+    /**
+     * @return void
+     */
     public function create(ContainerBuilder $container, string $id, array $config)
     {
         $container
@@ -48,6 +51,9 @@ public function getKey()
         return 'ldap';
     }
 
+    /**
+     * @return void
+     */
     public function addConfiguration(NodeDefinition $node)
     {
         $node
diff --git a/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php b/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php
index 9e91f3930ab08..0c703f79cfb43 100644
--- a/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php
+++ b/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php
@@ -36,6 +36,9 @@ public function __construct(FirewallMapInterface $map, EventDispatcherInterface
         parent::__construct($map, $dispatcher);
     }
 
+    /**
+     * @return void
+     */
     public function configureLogoutUrlGenerator(RequestEvent $event)
     {
         if (!$event->isMainRequest()) {
@@ -47,6 +50,9 @@ public function configureLogoutUrlGenerator(RequestEvent $event)
         }
     }
 
+    /**
+     * @return void
+     */
     public function onKernelFinishRequest(FinishRequestEvent $event)
     {
         if ($event->isMainRequest()) {
diff --git a/src/Symfony/Bundle/SecurityBundle/EventListener/VoteListener.php b/src/Symfony/Bundle/SecurityBundle/EventListener/VoteListener.php
index ef715f5271a34..34ca91c3a7735 100644
--- a/src/Symfony/Bundle/SecurityBundle/EventListener/VoteListener.php
+++ b/src/Symfony/Bundle/SecurityBundle/EventListener/VoteListener.php
@@ -31,10 +31,7 @@ public function __construct(TraceableAccessDecisionManager $traceableAccessDecis
         $this->traceableAccessDecisionManager = $traceableAccessDecisionManager;
     }
 
-    /**
-     * Event dispatched by a voter during access manager decision.
-     */
-    public function onVoterVote(VoteEvent $event)
+    public function onVoterVote(VoteEvent $event): void
     {
         $this->traceableAccessDecisionManager->addVoterVote($event->getVoter(), $event->getAttributes(), $event->getVote());
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
index 317a6e11d1211..bf30dafbee612 100644
--- a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
+++ b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
@@ -53,6 +53,9 @@
  */
 class SecurityBundle extends Bundle
 {
+    /**
+     * @return void
+     */
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
diff --git a/src/Symfony/Bundle/TwigBundle/Command/LintCommand.php b/src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
index f85dd13aa2f3a..10aa983e0ea46 100644
--- a/src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
+++ b/src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
@@ -23,7 +23,7 @@
 #[AsCommand(name: 'lint:twig', description: 'Lint a Twig template and outputs encountered errors')]
 final class LintCommand extends BaseLintCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
index 6654fe08e11a9..5c3cff66fc411 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -25,6 +25,9 @@
  */
 class ExtensionPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!class_exists(Packages::class)) {
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
index 82cf1c145a312..ecb99ce20ea08 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
@@ -21,6 +21,9 @@
  */
 class RuntimeLoaderPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('twig.runtime_loader')) {
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigEnvironmentPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigEnvironmentPass.php
index 3a90bce15ffaa..99b975edea3a0 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigEnvironmentPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigEnvironmentPass.php
@@ -24,6 +24,9 @@ class TwigEnvironmentPass implements CompilerPassInterface
 {
     use PriorityTaggedServiceTrait;
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (false === $container->hasDefinition('twig')) {
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
index a422f668257ad..1da7e8679724f 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
@@ -23,6 +23,9 @@
  */
 class TwigLoaderPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (false === $container->hasDefinition('twig')) {
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
index 20b7427bedb9d..4712b18a6ac1b 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -54,7 +54,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         return $treeBuilder;
     }
 
-    private function addFormThemesSection(ArrayNodeDefinition $rootNode)
+    private function addFormThemesSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->fixXmlConfig('form_theme')
@@ -72,7 +72,7 @@ private function addFormThemesSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addGlobalsSection(ArrayNodeDefinition $rootNode)
+    private function addGlobalsSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->fixXmlConfig('global')
@@ -122,7 +122,7 @@ private function addGlobalsSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addTwigOptions(ArrayNodeDefinition $rootNode)
+    private function addTwigOptions(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->fixXmlConfig('path')
@@ -185,7 +185,7 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addTwigFormatOptions(ArrayNodeDefinition $rootNode)
+    private function addTwigFormatOptions(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
@@ -214,7 +214,7 @@ private function addTwigFormatOptions(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addMailerSection(ArrayNodeDefinition $rootNode)
+    private function addMailerSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php
index 09da820bbb84d..b3eec9ff60e34 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configurator/EnvironmentConfigurator.php
@@ -42,6 +42,9 @@ public function __construct(string $dateFormat, string $intervalFormat, ?string
         $this->thousandsSeparator = $thousandsSeparator;
     }
 
+    /**
+     * @return void
+     */
     public function configure(Environment $environment)
     {
         $environment->getExtension(CoreExtension::class)->setDateFormat($this->dateFormat, $this->intervalFormat);
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
index b323bf808946e..101dbf699a5a4 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -35,6 +35,9 @@
  */
 class TwigExtension extends Extension
 {
+    /**
+     * @return void
+     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
diff --git a/src/Symfony/Bundle/TwigBundle/TwigBundle.php b/src/Symfony/Bundle/TwigBundle/TwigBundle.php
index 3910dd5e2e389..802cb536d123f 100644
--- a/src/Symfony/Bundle/TwigBundle/TwigBundle.php
+++ b/src/Symfony/Bundle/TwigBundle/TwigBundle.php
@@ -27,6 +27,9 @@
  */
 class TwigBundle extends Bundle
 {
+    /**
+     * @return void
+     */
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
@@ -38,6 +41,9 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new RuntimeLoaderPass(), PassConfig::TYPE_BEFORE_REMOVING);
     }
 
+    /**
+     * @return void
+     */
     public function registerCommands(Application $application)
     {
         // noop
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
index be5b7883285ec..b9a861df38dd2 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -352,7 +352,7 @@ protected function getTemplateManager(): TemplateManager
         return $this->templateManager ??= new TemplateManager($this->profiler, $this->twig, $this->templates);
     }
 
-    private function denyAccessIfProfilerDisabled()
+    private function denyAccessIfProfilerDisabled(): void
     {
         if (null === $this->profiler) {
             throw new NotFoundHttpException('The profiler must be enabled.');
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
index 7b0b1373b7eb8..7fe5018317081 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
@@ -71,7 +71,7 @@ public function getNonces(Request $request, Response $response): array
      *
      * All related headers will be removed.
      */
-    public function disableCsp()
+    public function disableCsp(): void
     {
         $this->cspDisabled = true;
     }
@@ -96,13 +96,13 @@ public function updateResponseHeaders(Request $request, Response $response): arr
         return $nonces;
     }
 
-    private function cleanHeaders(Response $response)
+    private function cleanHeaders(Response $response): void
     {
         $response->headers->remove('X-SymfonyProfiler-Script-Nonce');
         $response->headers->remove('X-SymfonyProfiler-Style-Nonce');
     }
 
-    private function removeCspHeaders(Response $response)
+    private function removeCspHeaders(Response $response): void
     {
         $response->headers->remove('X-Content-Security-Policy');
         $response->headers->remove('Content-Security-Policy');
diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
index 23a69bc76490c..16e6db29eeaff 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
@@ -37,6 +37,8 @@ class WebProfilerExtension extends Extension
      * Loads the web profiler configuration.
      *
      * @param array $configs An array of configuration settings
+     *
+     * @return void
      */
     public function load(array $configs, ContainerBuilder $container)
     {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
index efaa98e0ca50f..c29a389902113 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
@@ -73,7 +73,7 @@ public function setMode(int $mode): void
         $this->mode = $mode;
     }
 
-    public function onKernelResponse(ResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event): void
     {
         $response = $event->getResponse();
         $request = $event->getRequest();
@@ -134,7 +134,7 @@ public function onKernelResponse(ResponseEvent $event)
     /**
      * Injects the web debug toolbar into the given Response.
      */
-    protected function injectToolbar(Response $response, Request $request, array $nonces)
+    protected function injectToolbar(Response $response, Request $request, array $nonces): void
     {
         $content = $response->getContent();
         $pos = strripos($content, '</body>');
diff --git a/src/Symfony/Bundle/WebProfilerBundle/WebProfilerBundle.php b/src/Symfony/Bundle/WebProfilerBundle/WebProfilerBundle.php
index 7fcc4ec47f780..264b26c92562d 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/WebProfilerBundle.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/WebProfilerBundle.php
@@ -18,6 +18,9 @@
  */
 class WebProfilerBundle extends Bundle
 {
+    /**
+     * @return void
+     */
     public function boot()
     {
         if ('prod' === $this->container->getParameter('kernel.environment')) {
diff --git a/src/Symfony/Component/Asset/Packages.php b/src/Symfony/Component/Asset/Packages.php
index 6ca4850490812..cffea43c49905 100644
--- a/src/Symfony/Component/Asset/Packages.php
+++ b/src/Symfony/Component/Asset/Packages.php
@@ -37,11 +37,17 @@ public function __construct(PackageInterface $defaultPackage = null, iterable $p
         }
     }
 
+    /**
+     * @return void
+     */
     public function setDefaultPackage(PackageInterface $defaultPackage)
     {
         $this->defaultPackage = $defaultPackage;
     }
 
+    /**
+     * @return void
+     */
     public function addPackage(string $name, PackageInterface $package)
     {
         $this->packages[$name] = $package;
diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
index b27ca375291bf..71d165a5a00b3 100644
--- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
+++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
@@ -59,6 +59,8 @@ public function __construct(array $server = [], History $history = null, CookieJ
 
     /**
      * Sets whether to automatically follow redirects or not.
+     *
+     * @return void
      */
     public function followRedirects(bool $followRedirects = true)
     {
@@ -67,6 +69,8 @@ public function followRedirects(bool $followRedirects = true)
 
     /**
      * Sets whether to automatically follow meta refresh redirects or not.
+     *
+     * @return void
      */
     public function followMetaRefresh(bool $followMetaRefresh = true)
     {
@@ -83,6 +87,8 @@ public function isFollowingRedirects(): bool
 
     /**
      * Sets the maximum number of redirects that crawler can follow.
+     *
+     * @return void
      */
     public function setMaxRedirects(int $maxRedirects)
     {
@@ -102,6 +108,8 @@ public function getMaxRedirects(): int
      * Sets the insulated flag.
      *
      * @throws \RuntimeException When Symfony Process Component is not installed
+     *
+     * @return void
      */
     public function insulate(bool $insulated = true)
     {
@@ -114,6 +122,8 @@ public function insulate(bool $insulated = true)
 
     /**
      * Sets server parameters.
+     *
+     * @return void
      */
     public function setServerParameters(array $server)
     {
@@ -124,6 +134,8 @@ public function setServerParameters(array $server)
 
     /**
      * Sets single server parameter.
+     *
+     * @return void
      */
     public function setServerParameter(string $key, string $value)
     {
@@ -591,6 +603,8 @@ private function getMetaRefreshUrl(): ?string
      * Restarts the client.
      *
      * It flushes history and all cookies.
+     *
+     * @return void
      */
     public function restart()
     {
diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php
index cb7da1420037d..9753d305d93ea 100644
--- a/src/Symfony/Component/BrowserKit/CookieJar.php
+++ b/src/Symfony/Component/BrowserKit/CookieJar.php
@@ -20,6 +20,9 @@ class CookieJar
 {
     protected $cookieJar = [];
 
+    /**
+     * @return void
+     */
     public function set(Cookie $cookie)
     {
         $this->cookieJar[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
@@ -64,6 +67,8 @@ public function get(string $name, string $path = '/', string $domain = null): ?C
      * You should never use an empty domain, but if you do so,
      * all cookies for the given name/path expire (this behavior
      * ensures a BC behavior with previous versions of Symfony).
+     *
+     * @return void
      */
     public function expire(string $name, ?string $path = '/', string $domain = null)
     {
@@ -92,6 +97,8 @@ public function expire(string $name, ?string $path = '/', string $domain = null)
 
     /**
      * Removes all the cookies from the jar.
+     *
+     * @return void
      */
     public function clear()
     {
@@ -102,6 +109,8 @@ public function clear()
      * Updates the cookie jar from a response Set-Cookie headers.
      *
      * @param string[] $setCookies Set-Cookie headers from an HTTP response
+     *
+     * @return void
      */
     public function updateFromSetCookie(array $setCookies, string $uri = null)
     {
@@ -128,6 +137,8 @@ public function updateFromSetCookie(array $setCookies, string $uri = null)
 
     /**
      * Updates the cookie jar from a Response object.
+     *
+     * @return void
      */
     public function updateFromResponse(Response $response, string $uri = null)
     {
@@ -200,6 +211,8 @@ public function allRawValues(string $uri): array
 
     /**
      * Removes all expired cookies.
+     *
+     * @return void
      */
     public function flushExpiredCookies()
     {
diff --git a/src/Symfony/Component/BrowserKit/History.php b/src/Symfony/Component/BrowserKit/History.php
index dc18665a40d48..01f5e80382774 100644
--- a/src/Symfony/Component/BrowserKit/History.php
+++ b/src/Symfony/Component/BrowserKit/History.php
@@ -23,6 +23,8 @@ class History
 
     /**
      * Clears the history.
+     *
+     * @return void
      */
     public function clear()
     {
@@ -32,6 +34,8 @@ public function clear()
 
     /**
      * Adds a Request to the history.
+     *
+     * @return void
      */
     public function add(Request $request)
     {
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
index a4fa30c14af12..3b742a6bfaf54 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -110,7 +110,7 @@ public static function createSystemCache(string $namespace, int $defaultLifetime
         return new ChainAdapter([$apcu, $opcache]);
     }
 
-    public static function createConnection(#[\SensitiveParameter] string $dsn, array $options = [])
+    public static function createConnection(#[\SensitiveParameter] string $dsn, array $options = []): mixed
     {
         if (str_starts_with($dsn, 'redis:') || str_starts_with($dsn, 'rediss:')) {
             return RedisAdapter::createConnection($dsn, $options);
diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
index 642fe0e0d2b55..ca5bcaded81ea 100644
--- a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
@@ -260,6 +260,9 @@ public function getValues(): array
         return $values;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->clear();
diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
index 041e1b21f08da..07ef47f5eb947 100644
--- a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
@@ -280,6 +280,9 @@ public function prune(): bool
         return $pruned;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         foreach ($this->adapters as $adapter) {
diff --git a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
index 6851727cd20e1..a4c629bb3d0f5 100644
--- a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
@@ -97,6 +97,8 @@ public function __construct(#[\SensitiveParameter] \PDO|string $connOrDsn, strin
      *
      * @throws \PDOException    When the table already exists
      * @throws \DomainException When an unsupported PDO driver is used
+     *
+     * @return void
      */
     public function createTable()
     {
diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
index dd90a0dac877f..f6decd8481ab9 100644
--- a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -338,7 +338,7 @@ public function warmUp(array $values): array
     /**
      * Load the cache file.
      */
-    private function initialize()
+    private function initialize(): void
     {
         if (isset(self::$valuesCache[$this->file])) {
             $values = self::$valuesCache[$this->file];
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
index 7521d7c32d4ab..7525632e91a13 100644
--- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -279,6 +279,9 @@ public function prune(): bool
         return $this->pool instanceof PruneableInterface && $this->pool->prune();
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->commit();
diff --git a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
index 18f7ba0fb0a05..118b009099d35 100644
--- a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
@@ -192,6 +192,9 @@ public function prune(): bool
         }
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         if ($this->pool instanceof ResetInterface) {
@@ -219,6 +222,9 @@ public function getCalls()
         return $this->calls;
     }
 
+    /**
+     * @return void
+     */
     public function clearCalls()
     {
         $this->calls = [];
diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php
index 715c0c16c9089..1a81706da9c07 100644
--- a/src/Symfony/Component/Cache/CacheItem.php
+++ b/src/Symfony/Component/Cache/CacheItem.php
@@ -147,7 +147,7 @@ public static function validateKey($key): string
      *
      * @internal
      */
-    public static function log(?LoggerInterface $logger, string $message, array $context = [])
+    public static function log(?LoggerInterface $logger, string $message, array $context = []): void
     {
         if ($logger) {
             $logger->warning($message, $context);
diff --git a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
index 1571e39c4e328..08ab8816c1687 100644
--- a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
+++ b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
@@ -31,12 +31,12 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
      */
     private array $instances = [];
 
-    public function addInstance(string $name, TraceableAdapter $instance)
+    public function addInstance(string $name, TraceableAdapter $instance): void
     {
         $this->instances[$name] = $instance;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         $empty = ['calls' => [], 'adapters' => [], 'config' => [], 'options' => [], 'statistics' => []];
         $this->data = ['instances' => $empty, 'total' => $empty];
@@ -49,7 +49,7 @@ public function collect(Request $request, Response $response, \Throwable $except
         $this->data['total']['statistics'] = $this->calculateTotalStatistics();
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
         foreach ($this->instances as $instance) {
@@ -57,7 +57,7 @@ public function reset()
         }
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         $this->data['instances']['calls'] = $this->cloneVar($this->data['instances']['calls']);
     }
diff --git a/src/Symfony/Component/Cache/DependencyInjection/CacheCollectorPass.php b/src/Symfony/Component/Cache/DependencyInjection/CacheCollectorPass.php
index 888e6a05ad871..b50ca123081e9 100644
--- a/src/Symfony/Component/Cache/DependencyInjection/CacheCollectorPass.php
+++ b/src/Symfony/Component/Cache/DependencyInjection/CacheCollectorPass.php
@@ -26,6 +26,9 @@
  */
 class CacheCollectorPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('data_collector.cache')) {
@@ -39,7 +42,7 @@ public function process(ContainerBuilder $container)
         }
     }
 
-    private function addToCollector(string $id, string $name, ContainerBuilder $container)
+    private function addToCollector(string $id, string $name, ContainerBuilder $container): void
     {
         $definition = $container->getDefinition($id);
         if ($definition->isAbstract()) {
diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolClearerPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolClearerPass.php
index 8f77c1a6c7cc9..6793bea94c2e8 100644
--- a/src/Symfony/Component/Cache/DependencyInjection/CachePoolClearerPass.php
+++ b/src/Symfony/Component/Cache/DependencyInjection/CachePoolClearerPass.php
@@ -20,6 +20,9 @@
  */
 class CachePoolClearerPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $container->getParameterBag()->remove('cache.prefix.seed');
diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPrunerPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPrunerPass.php
index a8d072db5c9da..00e912686b7a0 100644
--- a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPrunerPass.php
+++ b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPrunerPass.php
@@ -23,6 +23,9 @@
  */
 class CachePoolPrunerPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('console.command.cache_pool_prune')) {
diff --git a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
index 845b783821ea1..83eb42d0f3361 100644
--- a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
+++ b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
@@ -269,7 +269,7 @@ public function enableVersioning(bool $enable = true): bool
         return $wasEnabled;
     }
 
-    public function reset()
+    public function reset(): void
     {
         if ($this->deferred) {
             $this->commit();
diff --git a/src/Symfony/Component/Cache/Traits/ProxyTrait.php b/src/Symfony/Component/Cache/Traits/ProxyTrait.php
index 45aa4aea2afe8..ba7c11fbe173c 100644
--- a/src/Symfony/Component/Cache/Traits/ProxyTrait.php
+++ b/src/Symfony/Component/Cache/Traits/ProxyTrait.php
@@ -28,7 +28,7 @@ public function prune(): bool
         return $this->pool instanceof PruneableInterface && $this->pool->prune();
     }
 
-    public function reset()
+    public function reset(): void
     {
         if ($this->pool instanceof ResetInterface) {
             $this->pool->reset();
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index a226fad13bf7c..57641bcd4275c 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -50,7 +50,7 @@ trait RedisTrait
     private \Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis;
     private MarshallerInterface $marshaller;
 
-    private function init(\Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis, string $namespace, int $defaultLifetime, ?MarshallerInterface $marshaller)
+    private function init(\Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis, string $namespace, int $defaultLifetime, ?MarshallerInterface $marshaller): void
     {
         parent::__construct($namespace, $defaultLifetime);
 
diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
index 97500c90a75d3..0f0f18a9154bd 100644
--- a/src/Symfony/Component/Config/Definition/ArrayNode.php
+++ b/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -32,6 +32,9 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
     protected $removeExtraKeys = true;
     protected $normalizeKeys = true;
 
+    /**
+     * @return void
+     */
     public function setNormalizeKeys(bool $normalizeKeys)
     {
         $this->normalizeKeys = $normalizeKeys;
@@ -77,6 +80,8 @@ public function getChildren(): array
      * Sets the xml remappings that should be performed.
      *
      * @param array $remappings An array of the form [[string, string]]
+     *
+     * @return void
      */
     public function setXmlRemappings(array $remappings)
     {
@@ -96,6 +101,8 @@ public function getXmlRemappings(): array
     /**
      * Sets whether to add default values for this array if it has not been
      * defined in any of the configuration files.
+     *
+     * @return void
      */
     public function setAddIfNotSet(bool $boolean)
     {
@@ -104,6 +111,8 @@ public function setAddIfNotSet(bool $boolean)
 
     /**
      * Sets whether false is allowed as value indicating that the array should be unset.
+     *
+     * @return void
      */
     public function setAllowFalse(bool $allow)
     {
@@ -112,6 +121,8 @@ public function setAllowFalse(bool $allow)
 
     /**
      * Sets whether new keys can be defined in subsequent configurations.
+     *
+     * @return void
      */
     public function setAllowNewKeys(bool $allow)
     {
@@ -120,6 +131,8 @@ public function setAllowNewKeys(bool $allow)
 
     /**
      * Sets if deep merging should occur.
+     *
+     * @return void
      */
     public function setPerformDeepMerging(bool $boolean)
     {
@@ -131,6 +144,8 @@ public function setPerformDeepMerging(bool $boolean)
      *
      * @param bool $boolean To allow extra keys
      * @param bool $remove  To remove extra keys
+     *
+     * @return void
      */
     public function setIgnoreExtraKeys(bool $boolean, bool $remove = true)
     {
@@ -146,6 +161,9 @@ public function shouldIgnoreExtraKeys(): bool
         return $this->ignoreExtraKeys;
     }
 
+    /**
+     * @return void
+     */
     public function setName(string $name)
     {
         $this->name = $name;
@@ -177,6 +195,8 @@ public function getDefaultValue(): mixed
      *
      * @throws \InvalidArgumentException when the child node has no name
      * @throws \InvalidArgumentException when the child node's name is not unique
+     *
+     * @return void
      */
     public function addChild(NodeInterface $node)
     {
@@ -238,6 +258,9 @@ protected function finalizeValue(mixed $value): mixed
         return $value;
     }
 
+    /**
+     * @return void
+     */
     protected function validateType(mixed $value)
     {
         if (!\is_array($value) && (!$this->allowFalse || false !== $value)) {
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
index 814376091f9c7..f2e32384a9e23 100644
--- a/src/Symfony/Component/Config/Definition/BaseNode.php
+++ b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -98,6 +98,9 @@ public static function resetPlaceholders(): void
         self::$placeholders = [];
     }
 
+    /**
+     * @return void
+     */
     public function setAttribute(string $key, mixed $value)
     {
         $this->attributes[$key] = $value;
@@ -118,11 +121,17 @@ public function getAttributes(): array
         return $this->attributes;
     }
 
+    /**
+     * @return void
+     */
     public function setAttributes(array $attributes)
     {
         $this->attributes = $attributes;
     }
 
+    /**
+     * @return void
+     */
     public function removeAttribute(string $key)
     {
         unset($this->attributes[$key]);
@@ -130,6 +139,8 @@ public function removeAttribute(string $key)
 
     /**
      * Sets an info message.
+     *
+     * @return void
      */
     public function setInfo(string $info)
     {
@@ -146,6 +157,8 @@ public function getInfo(): ?string
 
     /**
      * Sets the example configuration for this node.
+     *
+     * @return void
      */
     public function setExample(string|array $example)
     {
@@ -162,6 +175,8 @@ public function getExample(): string|array|null
 
     /**
      * Adds an equivalent value.
+     *
+     * @return void
      */
     public function addEquivalentValue(mixed $originalValue, mixed $equivalentValue)
     {
@@ -170,6 +185,8 @@ public function addEquivalentValue(mixed $originalValue, mixed $equivalentValue)
 
     /**
      * Set this node as required.
+     *
+     * @return void
      */
     public function setRequired(bool $boolean)
     {
@@ -179,12 +196,14 @@ public function setRequired(bool $boolean)
     /**
      * Sets this node as deprecated.
      *
+     * You can use %node% and %path% placeholders in your message to display,
+     * respectively, the node name and its complete path.
+     *
      * @param string $package The name of the composer package that is triggering the deprecation
      * @param string $version The version of the package that introduced the deprecation
      * @param string $message the deprecation message to use
      *
-     * You can use %node% and %path% placeholders in your message to display,
-     * respectively, the node name and its complete path
+     * @return void
      */
     public function setDeprecated(string $package, string $version, string $message = 'The child node "%node%" at path "%path%" is deprecated.')
     {
@@ -197,6 +216,8 @@ public function setDeprecated(string $package, string $version, string $message
 
     /**
      * Sets if this node can be overridden.
+     *
+     * @return void
      */
     public function setAllowOverwrite(bool $allow)
     {
@@ -207,6 +228,8 @@ public function setAllowOverwrite(bool $allow)
      * Sets the closures used for normalization.
      *
      * @param \Closure[] $closures An array of Closures used for normalization
+     *
+     * @return void
      */
     public function setNormalizationClosures(array $closures)
     {
@@ -217,6 +240,8 @@ public function setNormalizationClosures(array $closures)
      * Sets the list of types supported by normalization.
      *
      * see ExprBuilder::TYPE_* constants.
+     *
+     * @return void
      */
     public function setNormalizedTypes(array $types)
     {
@@ -237,6 +262,8 @@ public function getNormalizedTypes(): array
      * Sets the closures used for final validation.
      *
      * @param \Closure[] $closures An array of Closures used for final validation
+     *
+     * @return void
      */
     public function setFinalValidationClosures(array $closures)
     {
diff --git a/src/Symfony/Component/Config/Definition/BooleanNode.php b/src/Symfony/Component/Config/Definition/BooleanNode.php
index 812881d6dd035..7ec903cd67198 100644
--- a/src/Symfony/Component/Config/Definition/BooleanNode.php
+++ b/src/Symfony/Component/Config/Definition/BooleanNode.php
@@ -20,6 +20,9 @@
  */
 class BooleanNode extends ScalarNode
 {
+    /**
+     * @return void
+     */
     protected function validateType(mixed $value)
     {
         if (!\is_bool($value)) {
diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
index 34f00085cbf76..f24271b80f4af 100644
--- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
+++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
@@ -45,6 +45,9 @@ public function __construct(?string $name, NodeParentInterface $parent = null)
         $this->trueEquivalent = [];
     }
 
+    /**
+     * @return void
+     */
     public function setBuilder(NodeBuilder $builder)
     {
         $this->nodeBuilder = $builder;
@@ -423,6 +426,8 @@ protected function createNode(): NodeInterface
      * Validate the configuration of a concrete node.
      *
      * @throws InvalidDefinitionException
+     *
+     * @return void
      */
     protected function validateConcreteNode(ArrayNode $node)
     {
@@ -453,6 +458,8 @@ protected function validateConcreteNode(ArrayNode $node)
      * Validate the configuration of a prototype node.
      *
      * @throws InvalidDefinitionException
+     *
+     * @return void
      */
     protected function validatePrototypeNode(PrototypedArrayNode $node)
     {
diff --git a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php
index e469e69044c3f..4f868f70319ab 100644
--- a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php
@@ -51,6 +51,9 @@ public function buildTree(): NodeInterface
         return $this->tree = $this->root->getNode(true);
     }
 
+    /**
+     * @return void
+     */
     public function setPathSeparator(string $separator)
     {
         // unset last built as changing path separator changes all nodes
diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
index 2f07f31d0a2af..34f93ce07d2e3 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
@@ -31,6 +31,9 @@ class XmlReferenceDumper
 {
     private ?string $reference = null;
 
+    /**
+     * @return string
+     */
     public function dump(ConfigurationInterface $configuration, string $namespace = null)
     {
         return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree(), $namespace);
@@ -49,7 +52,7 @@ public function dumpNode(NodeInterface $node, string $namespace = null)
         return $ref;
     }
 
-    private function writeNode(NodeInterface $node, int $depth = 0, bool $root = false, string $namespace = null)
+    private function writeNode(NodeInterface $node, int $depth = 0, bool $root = false, string $namespace = null): void
     {
         $rootName = ($root ? 'config' : $node->getName());
         $rootNamespace = ($namespace ?: ($root ? 'http://example.org/schema/dic/'.$node->getName() : null));
@@ -250,7 +253,7 @@ private function writeNode(NodeInterface $node, int $depth = 0, bool $root = fal
     /**
      * Outputs a single config reference line.
      */
-    private function writeLine(string $text, int $indent = 0)
+    private function writeLine(string $text, int $indent = 0): void
     {
         $indent = \strlen($text) + $indent;
         $format = '%'.$indent.'s';
diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
index 4621e6b1dc683..97a391adabf7e 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -30,11 +30,17 @@ class YamlReferenceDumper
 {
     private ?string $reference = null;
 
+    /**
+     * @return string
+     */
     public function dump(ConfigurationInterface $configuration)
     {
         return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree());
     }
 
+    /**
+     * @return string
+     */
     public function dumpAtPath(ConfigurationInterface $configuration, string $path)
     {
         $rootNode = $node = $configuration->getConfigTreeBuilder()->buildTree();
@@ -74,7 +80,7 @@ public function dumpNode(NodeInterface $node)
         return $ref;
     }
 
-    private function writeNode(NodeInterface $node, NodeInterface $parentNode = null, int $depth = 0, bool $prototypedArray = false)
+    private function writeNode(NodeInterface $node, NodeInterface $parentNode = null, int $depth = 0, bool $prototypedArray = false): void
     {
         $comments = [];
         $default = '';
@@ -186,7 +192,7 @@ private function writeNode(NodeInterface $node, NodeInterface $parentNode = null
     /**
      * Outputs a single config reference line.
      */
-    private function writeLine(string $text, int $indent = 0)
+    private function writeLine(string $text, int $indent = 0): void
     {
         $indent = \strlen($text) + $indent;
         $format = '%'.$indent.'s';
@@ -194,7 +200,7 @@ private function writeLine(string $text, int $indent = 0)
         $this->reference .= sprintf($format, $text)."\n";
     }
 
-    private function writeArray(array $array, int $depth)
+    private function writeArray(array $array, int $depth): void
     {
         $isIndexed = array_is_list($array);
 
diff --git a/src/Symfony/Component/Config/Definition/EnumNode.php b/src/Symfony/Component/Config/Definition/EnumNode.php
index 683096949df64..4edeae9040471 100644
--- a/src/Symfony/Component/Config/Definition/EnumNode.php
+++ b/src/Symfony/Component/Config/Definition/EnumNode.php
@@ -68,6 +68,9 @@ public function getPermissibleValues(string $separator): string
         }, $this->values)));
     }
 
+    /**
+     * @return void
+     */
     protected function validateType(mixed $value)
     {
         if ($value instanceof \UnitEnum) {
diff --git a/src/Symfony/Component/Config/Definition/Exception/InvalidConfigurationException.php b/src/Symfony/Component/Config/Definition/Exception/InvalidConfigurationException.php
index 4ecf351570f2a..794447bf8da3a 100644
--- a/src/Symfony/Component/Config/Definition/Exception/InvalidConfigurationException.php
+++ b/src/Symfony/Component/Config/Definition/Exception/InvalidConfigurationException.php
@@ -22,6 +22,9 @@ class InvalidConfigurationException extends Exception
     private ?string $path = null;
     private bool $containsHints = false;
 
+    /**
+     * @return void
+     */
     public function setPath(string $path)
     {
         $this->path = $path;
@@ -34,6 +37,8 @@ public function getPath(): ?string
 
     /**
      * Adds extra information that is suffixed to the original exception message.
+     *
+     * @return void
      */
     public function addHint(string $hint)
     {
diff --git a/src/Symfony/Component/Config/Definition/FloatNode.php b/src/Symfony/Component/Config/Definition/FloatNode.php
index e9123e8b0d363..ce4193e09cbe2 100644
--- a/src/Symfony/Component/Config/Definition/FloatNode.php
+++ b/src/Symfony/Component/Config/Definition/FloatNode.php
@@ -20,6 +20,9 @@
  */
 class FloatNode extends NumericNode
 {
+    /**
+     * @return void
+     */
     protected function validateType(mixed $value)
     {
         // Integers are also accepted, we just cast them
diff --git a/src/Symfony/Component/Config/Definition/IntegerNode.php b/src/Symfony/Component/Config/Definition/IntegerNode.php
index cc9132c749245..4a3e3253ceb92 100644
--- a/src/Symfony/Component/Config/Definition/IntegerNode.php
+++ b/src/Symfony/Component/Config/Definition/IntegerNode.php
@@ -20,6 +20,9 @@
  */
 class IntegerNode extends NumericNode
 {
+    /**
+     * @return void
+     */
     protected function validateType(mixed $value)
     {
         if (!\is_int($value)) {
diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
index d3ca83bdb0c79..11910fb33846a 100644
--- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
+++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
@@ -37,6 +37,8 @@ class PrototypedArrayNode extends ArrayNode
     /**
      * Sets the minimum number of elements that a prototype based node must
      * contain. By default this is zero, meaning no elements.
+     *
+     * @return void
      */
     public function setMinNumberOfElements(int $number)
     {
@@ -66,6 +68,8 @@ public function setMinNumberOfElements(int $number)
      *
      * @param string $attribute The name of the attribute which value is to be used as a key
      * @param bool   $remove    Whether or not to remove the key
+     *
+     * @return void
      */
     public function setKeyAttribute(string $attribute, bool $remove = true)
     {
@@ -83,6 +87,8 @@ public function getKeyAttribute(): ?string
 
     /**
      * Sets the default value of this node.
+     *
+     * @return void
      */
     public function setDefaultValue(array $value)
     {
@@ -98,6 +104,8 @@ public function hasDefaultValue(): bool
      * Adds default children when none are set.
      *
      * @param int|string|array|null $children The number of children|The child name|The children names to be added
+     *
+     * @return void
      */
     public function setAddChildrenIfNoneSet(int|string|array|null $children = ['defaults'])
     {
@@ -129,6 +137,8 @@ public function getDefaultValue(): mixed
 
     /**
      * Sets the node prototype.
+     *
+     * @return void
      */
     public function setPrototype(PrototypeNodeInterface $node)
     {
diff --git a/src/Symfony/Component/Config/Definition/ScalarNode.php b/src/Symfony/Component/Config/Definition/ScalarNode.php
index 766436dd23514..e11fa1ee1c279 100644
--- a/src/Symfony/Component/Config/Definition/ScalarNode.php
+++ b/src/Symfony/Component/Config/Definition/ScalarNode.php
@@ -27,6 +27,9 @@
  */
 class ScalarNode extends VariableNode
 {
+    /**
+     * @return void
+     */
     protected function validateType(mixed $value)
     {
         if (!\is_scalar($value) && null !== $value) {
diff --git a/src/Symfony/Component/Config/Definition/VariableNode.php b/src/Symfony/Component/Config/Definition/VariableNode.php
index c636f12c4e632..6bdc65b4e770d 100644
--- a/src/Symfony/Component/Config/Definition/VariableNode.php
+++ b/src/Symfony/Component/Config/Definition/VariableNode.php
@@ -27,6 +27,9 @@ class VariableNode extends BaseNode implements PrototypeNodeInterface
     protected $defaultValue;
     protected $allowEmptyValue = true;
 
+    /**
+     * @return void
+     */
     public function setDefaultValue(mixed $value)
     {
         $this->defaultValueSet = true;
@@ -49,17 +52,25 @@ public function getDefaultValue(): mixed
      * Sets if this node is allowed to have an empty value.
      *
      * @param bool $boolean True if this entity will accept empty values
+     *
+     * @return void
      */
     public function setAllowEmptyValue(bool $boolean)
     {
         $this->allowEmptyValue = $boolean;
     }
 
+    /**
+     * @return void
+     */
     public function setName(string $name)
     {
         $this->name = $name;
     }
 
+    /**
+     * @return void
+     */
     protected function validateType(mixed $value)
     {
     }
diff --git a/src/Symfony/Component/Config/Loader/Loader.php b/src/Symfony/Component/Config/Loader/Loader.php
index 2ab50b021b2b8..36e85ad346524 100644
--- a/src/Symfony/Component/Config/Loader/Loader.php
+++ b/src/Symfony/Component/Config/Loader/Loader.php
@@ -33,6 +33,9 @@ public function getResolver(): LoaderResolverInterface
         return $this->resolver;
     }
 
+    /**
+     * @return void
+     */
     public function setResolver(LoaderResolverInterface $resolver)
     {
         $this->resolver = $resolver;
diff --git a/src/Symfony/Component/Config/Loader/LoaderResolver.php b/src/Symfony/Component/Config/Loader/LoaderResolver.php
index fa00730dc4905..670e320122712 100644
--- a/src/Symfony/Component/Config/Loader/LoaderResolver.php
+++ b/src/Symfony/Component/Config/Loader/LoaderResolver.php
@@ -47,6 +47,9 @@ public function resolve(mixed $resource, string $type = null): LoaderInterface|f
         return false;
     }
 
+    /**
+     * @return void
+     */
     public function addLoader(LoaderInterface $loader)
     {
         $this->loaders[] = $loader;
diff --git a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
index ad0ebc5ebd9ba..f6423746a6cac 100644
--- a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
+++ b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
@@ -139,7 +139,7 @@ public function __wakeup()
      *
      * @internal
      */
-    public static function throwOnRequiredClass(string $class, \Exception $previous = null)
+    public static function throwOnRequiredClass(string $class, \Exception $previous = null): void
     {
         // If the passed class is the resource being checked, we shouldn't throw.
         if (null === $previous && self::$autoloadedClass === $class) {
diff --git a/src/Symfony/Component/Config/Resource/ComposerResource.php b/src/Symfony/Component/Config/Resource/ComposerResource.php
index e9b78b4fdcfde..834812253caab 100644
--- a/src/Symfony/Component/Config/Resource/ComposerResource.php
+++ b/src/Symfony/Component/Config/Resource/ComposerResource.php
@@ -47,7 +47,7 @@ public function isFresh(int $timestamp): bool
         return array_values(self::$runtimeVendors) === array_values($this->vendors);
     }
 
-    private static function refresh()
+    private static function refresh(): void
     {
         self::$runtimeVendors = [];
 
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
index 0180b687237cd..8498f94e40143 100644
--- a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
+++ b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -73,7 +73,7 @@ public function __sleep(): array
         return ['files', 'className', 'hash'];
     }
 
-    private function loadFiles(\ReflectionClass $class)
+    private function loadFiles(\ReflectionClass $class): void
     {
         foreach ($class->getInterfaces() as $v) {
             $this->loadFiles($v);
diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
index 3a3e6c52bb861..d505af161cbb9 100644
--- a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
+++ b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
@@ -106,6 +106,8 @@ public function isFresh(): bool
      * @param ResourceInterface[] $metadata An array of metadata
      *
      * @throws \RuntimeException When cache file can't be written
+     *
+     * @return void
      */
     public function write(string $content, array $metadata = null)
     {
@@ -172,7 +174,7 @@ private function safelyUnserialize(string $file)
     /**
      * @internal
      */
-    public static function handleUnserializeCallback(string $class)
+    public static function handleUnserializeCallback(string $class): void
     {
         trigger_error('Class not found: '.$class);
     }
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 40c7035af4875..8e24667bc6d7f 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -105,11 +105,14 @@ public function __construct(string $name = 'UNKNOWN', string $version = 'UNKNOWN
     /**
      * @final
      */
-    public function setDispatcher(EventDispatcherInterface $dispatcher)
+    public function setDispatcher(EventDispatcherInterface $dispatcher): void
     {
         $this->dispatcher = $dispatcher;
     }
 
+    /**
+     * @return void
+     */
     public function setCommandLoader(CommandLoaderInterface $commandLoader)
     {
         $this->commandLoader = $commandLoader;
@@ -124,6 +127,9 @@ public function getSignalRegistry(): SignalRegistry
         return $this->signalRegistry;
     }
 
+    /**
+     * @return void
+     */
     public function setSignalsToDispatchEvent(int ...$signalsToDispatchEvent)
     {
         $this->signalsToDispatchEvent = $signalsToDispatchEvent;
@@ -317,10 +323,16 @@ public function doRun(InputInterface $input, OutputInterface $output)
         return $exitCode;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
     }
 
+    /**
+     * @return void
+     */
     public function setHelperSet(HelperSet $helperSet)
     {
         $this->helperSet = $helperSet;
@@ -334,6 +346,9 @@ public function getHelperSet(): HelperSet
         return $this->helperSet ??= $this->getDefaultHelperSet();
     }
 
+    /**
+     * @return void
+     */
     public function setDefinition(InputDefinition $definition)
     {
         $this->definition = $definition;
@@ -404,6 +419,8 @@ public function areExceptionsCaught(): bool
 
     /**
      * Sets whether to catch exceptions or not during commands execution.
+     *
+     * @return void
      */
     public function setCatchExceptions(bool $boolean)
     {
@@ -420,6 +437,8 @@ public function isAutoExitEnabled(): bool
 
     /**
      * Sets whether to automatically exit after a command execution or not.
+     *
+     * @return void
      */
     public function setAutoExit(bool $boolean)
     {
@@ -436,7 +455,9 @@ public function getName(): string
 
     /**
      * Sets the application name.
-     **/
+     *
+     * @return void
+     */
     public function setName(string $name)
     {
         $this->name = $name;
@@ -452,6 +473,8 @@ public function getVersion(): string
 
     /**
      * Sets the application version.
+     *
+     * @return void
      */
     public function setVersion(string $version)
     {
@@ -490,6 +513,8 @@ public function register(string $name): Command
  
10000
    * If a Command is not enabled it will not be added.
      *
      * @param Command[] $commands An array of commands
+     *
+     * @return void
      */
     public function addCommands(array $commands)
     {
@@ -899,6 +924,8 @@ protected function doRenderThrowable(\Throwable $e, OutputInterface $output): vo
 
     /**
      * Configures the input and output instances based on the user arguments and options.
+     *
+     * @return void
      */
     protected function configureIO(InputInterface $input, OutputInterface $output)
     {
@@ -1250,7 +1277,7 @@ private function extractAllNamespaces(string $name): array
         return $namespaces;
     }
 
-    private function init()
+    private function init(): void
     {
         if ($this->initialized) {
             return;
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 1e3c1a5a2be68..704b112d1aed6 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -141,12 +141,17 @@ public function __construct(string $name = null)
      * Ignores validation errors.
      *
      * This is mainly useful for the help command.
+     *
+     * @return void
      */
     public function ignoreValidationErrors()
     {
         $this->ignoreValidationErrors = true;
     }
 
+    /**
+     * @return void
+     */
     public function setApplication(Application $application = null)
     {
         if (1 > \func_num_args()) {
@@ -162,6 +167,9 @@ public function setApplication(Application $application = null)
         $this->fullDefinition = null;
     }
 
+    /**
+     * @return void
+     */
     public function setHelperSet(HelperSet $helperSet)
     {
         $this->helperSet = $helperSet;
@@ -198,6 +206,8 @@ public function isEnabled()
 
     /**
      * Configures the current command.
+     *
+     * @return void
      */
     protected function configure()
     {
@@ -228,6 +238,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * This method is executed before the InputDefinition is validated.
      * This means that this is the only place where the command can
      * interactively ask for values of missing required arguments.
+     *
+     * @return void
      */
     protected function interact(InputInterface $input, OutputInterface $output)
     {
@@ -242,6 +254,8 @@ protected function interact(InputInterface $input, OutputInterface $output)
      *
      * @see InputInterface::bind()
      * @see InputInterface::validate()
+     *
+     * @return void
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {
@@ -378,7 +392,7 @@ public function setCode(callable $code): static
      *
      * @internal
      */
-    public function mergeApplicationDefinition(bool $mergeArgs = true)
+    public function mergeApplicationDefinition(bool $mergeArgs = true): void
     {
         if (null === $this->application) {
             return;
@@ -702,7 +716,7 @@ public function getHelper(string $name): mixed
      *
      * @throws InvalidArgumentException When the name is invalid
      */
-    private function validateName(string $name)
+    private function validateName(string $name): void
     {
         if (!preg_match('/^[^\:]++(\:[^\:]++)*$/', $name)) {
             throw new InvalidArgumentException(sprintf('Command name "%s" is invalid.', $name));
diff --git a/src/Symfony/Component/Console/Command/CompleteCommand.php b/src/Symfony/Component/Console/Command/CompleteCommand.php
index b251f88716b14..2a22eef73f1bc 100644
--- a/src/Symfony/Component/Console/Command/CompleteCommand.php
+++ b/src/Symfony/Component/Console/Command/CompleteCommand.php
@@ -74,7 +74,7 @@ protected function configure(): void
         ;
     }
 
-    protected function initialize(InputInterface $input, OutputInterface $output)
+    protected function initialize(InputInterface $input, OutputInterface $output): void
     {
         $this->isDebug = filter_var(getenv('SYMFONY_COMPLETION_DEBUG'), \FILTER_VALIDATE_BOOL);
     }
diff --git a/src/Symfony/Component/Console/Command/DumpCompletionCommand.php b/src/Symfony/Component/Console/Command/DumpCompletionCommand.php
index 54146d2305257..5892345fd8937 100644
--- a/src/Symfony/Component/Console/Command/DumpCompletionCommand.php
+++ b/src/Symfony/Component/Console/Command/DumpCompletionCommand.php
@@ -39,7 +39,7 @@ final class DumpCompletionCommand extends Command
 
     private array $supportedShells;
 
-    protected function configure()
+    protected function configure(): void
     {
         $fullCommand = $_SERVER['PHP_SELF'];
         $commandName = basename($fullCommand);
diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index 29c7e61c13355..e6447b0506b8f 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -27,6 +27,9 @@ class HelpCommand extends Command
 {
     private Command $command;
 
+    /**
+     * @return void
+     */
     protected function configure()
     {
         $this->ignoreValidationErrors();
@@ -54,6 +57,9 @@ protected function configure()
         ;
     }
 
+    /**
+     * @return void
+     */
     public function setCommand(Command $command)
     {
         $this->command = $command;
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index 91edfe695d2b6..5850c3d7b8140 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -25,6 +25,9 @@
  */
 class ListCommand extends Command
 {
+    /**
+     * @return void
+     */
     protected function configure()
     {
         $this
diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
index 62c80c3b06859..27705ddb63f7e 100644
--- a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
+++ b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -29,6 +29,9 @@
  */
 class AddConsoleCommandPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $commandServices = $container->findTaggedServiceIds('console.command', true);
diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
index 2158339ec4181..f8ed180451bcb 100644
--- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
+++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
@@ -79,7 +79,7 @@ public function getCommand(string $name): Command
         return $this->commands[$name] ?? $this->aliases[$name];
     }
 
-    private function inspectApplication()
+    private function inspectApplication(): void
     {
         $this->commands = [];
         $this->namespaces = [];
diff --git a/src/Symfony/Component/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Console/Descriptor/Descriptor.php
index 1476f57557ece..43a397d37a90a 100644
--- a/src/Symfony/Component/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Descriptor.php
@@ -26,12 +26,9 @@
  */
 abstract class Descriptor implements DescriptorInterface
 {
-    /**
-     * @var OutputInterface
-     */
-    protected $output;
+    protected OutputInterface $output;
 
-    public function describe(OutputInterface $output, object $object, array $options = [])
+    public function describe(OutputInterface $output, object $object, array $options = []): void
     {
         $this->output = $output;
 
@@ -45,10 +42,7 @@ public function describe(OutputInterface $output, object $object, array $options
         };
     }
 
-    /**
-     * Writes content to output.
-     */
-    protected function write(string $content, bool $decorated = false)
+    protected function write(string $content, bool $decorated = false): void
     {
         $this->output->write($content, false, $decorated ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW);
     }
diff --git a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
index 6f79a17a9d08c..956303709645f 100644
--- a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
@@ -26,12 +26,12 @@
  */
 class JsonDescriptor extends Descriptor
 {
-    protected function describeInputArgument(InputArgument $argument, array $options = [])
+    protected function describeInputArgument(InputArgument $argument, array $options = []): void
     {
         $this->writeData($this->getInputArgumentData($argument), $options);
     }
 
-    protected function describeInputOption(InputOption $option, array $options = [])
+    protected function describeInputOption(InputOption $option, array $options = []): void
     {
         $this->writeData($this->getInputOptionData($option), $options);
         if ($option->isNegatable()) {
@@ -39,17 +39,17 @@ protected function describeInputOption(InputOption $option, array $options = [])
         }
     }
 
-    protected function describeInputDefinition(InputDefinition $definition, array $options = [])
+    protected function describeInputDefinition(InputDefinition $definition, array $options = []): void
     {
         $this->writeData($this->getInputDefinitionData($definition), $options);
     }
 
-    protected function describeCommand(Command $command, array $options = [])
+    protected function describeCommand(Command $command, array $options = []): void
     {
         $this->writeData($this->getCommandData($command, $options['short'] ?? false), $options);
     }
 
-    protected function describeApplication(Application $application, array $options = [])
+    protected function describeApplication(Application $application, array $options = []): void
     {
         $describedNamespace = $options['namespace'] ?? null;
         $description = new ApplicationDescription($application, $describedNamespace, true);
@@ -81,7 +81,7 @@ protected function describeApplication(Application $application, array $options
     /**
      * Writes data as json.
      */
-    private function writeData(array $data, array $options)
+    private function writeData(array $data, array $options): void
     {
         $flags = $options['json_encoding'] ?? 0;
 
diff --git a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
index 16f78de1333a9..b3f16ee904834 100644
--- a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
@@ -28,7 +28,7 @@
  */
 class MarkdownDescriptor extends Descriptor
 {
-    public function describe(OutputInterface $output, object $object, array $options = [])
+    public function describe(OutputInterface $output, object $object, array $options = []): void
     {
         $decorated = $output->isDecorated();
         $output->setDecorated(false);
@@ -38,12 +38,12 @@ public function describe(OutputInterface $output, object $object, array $options
         $output->setDecorated($decorated);
     }
 
-    protected function write(string $content, bool $decorated = true)
+    protected function write(string $content, bool $decorated = true): void
     {
         parent::write($content, $decorated);
     }
 
-    protected function describeInputArgument(InputArgument $argument, array $options = [])
+    protected function describeInputArgument(InputArgument $argument, array $options = []): void
     {
         $this->write(
             '#### `'.($argument->getName() ?: '<none>')."`\n\n"
@@ -54,7 +54,7 @@ protected function describeInputArgument(InputArgument $argument, array $options
         );
     }
 
-    protected function describeInputOption(InputOption $option, array $options = [])
+    protected function describeInputOption(InputOption $option, array $options = []): void
     {
         $name = '--'.$option->getName();
         if ($option->isNegatable()) {
@@ -75,15 +75,13 @@ protected function describeInputOption(InputOption $option, array $options = [])
         );
     }
 
-    protected function describeInputDefinition(InputDefinition $definition, array $options = [])
+    protected function describeInputDefinition(InputDefinition $definition, array $options = []): void
     {
         if ($showArguments = \count($definition->getArguments()) > 0) {
             $this->write('### Arguments');
             foreach ($definition->getArguments() as $argument) {
                 $this->write("\n\n");
-                if (null !== $describeInputArgument = $this->describeInputArgument($argument)) {
-                    $this->write($describeInputArgument);
-                }
+                $this->describeInputArgument($argument);
             }
         }
 
@@ -95,14 +93,12 @@ protected function describeInputDefinition(InputDefinition $definition, array $o
             $this->write('### Options');
             foreach ($definition->getOptions() as $option) {
                 $this->write("\n\n");
-                if (null !== $describeInputOption = $this->describeInputOption($option)) {
-                    $this->write($describeInputOption);
-                }
+                $this->describeInputOption($option);
             }
         }
     }
 
-    protected function describeCommand(Command $command, array $options = [])
+    protected function describeCommand(Command $command, array $options = []): void
     {
         if ($options['short'] ?? false) {
             $this->write(
@@ -138,7 +134,7 @@ protected function describeCommand(Command $command, array $options = [])
         }
     }
 
-    protected function describeApplication(Application $application, array $options = [])
+    protected function describeApplication(Application $application, array $options = []): void
     {
         $describedNamespace = $options['namespace'] ?? null;
         $description = new ApplicationDescription($application, $describedNamespace);
@@ -158,9 +154,7 @@ protected function describeApplication(Application $application, array $options
 
         foreach ($description->getCommands() as $command) {
             $this->write("\n\n");
-            if (null !== $describeCommand = $this->describeCommand($command, $options)) {
-                $this->write($describeCommand);
-            }
+            $this->describeCommand($command, $options);
         }
     }
 
diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
index 31f5b4063bd89..d04d10238b8b0 100644
--- a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -28,7 +28,7 @@
  */
 class TextDescriptor extends Descriptor
 {
-    protected function describeInputArgument(InputArgument $argument, array $options = [])
+    protected function describeInputArgument(InputArgument $argument, array $options = []): void
     {
         if (null !== $argument->getDefault() && (!\is_array($argument->getDefault()) || \count($argument->getDefault()))) {
             $default = sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($argument->getDefault()));
@@ -48,7 +48,7 @@ protected function describeInputArgument(InputArgument $argument, array $options
         ), $options);
     }
 
-    protected function describeInputOption(InputOption $option, array $options = [])
+    protected function describeInputOption(InputOption $option, array $options = []): void
     {
         if ($option->acceptValue() && null !== $option->getDefault() && (!\is_array($option->getDefault()) || \count($option->getDefault()))) {
             $default = sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($option->getDefault()));
@@ -83,7 +83,7 @@ protected function describeInputOption(InputOption $option, array $options = [])
         ), $options);
     }
 
-    protected function describeInputDefinition(InputDefinition $definition, array $options = [])
+    protected function describeInputDefinition(InputDefinition $definition, array $options = []): void
     {
         $totalWidth = $this->calculateTotalWidthForOptions($definition->getOptions());
         foreach ($definition->getArguments() as $argument) {
@@ -122,7 +122,7 @@ protected function describeInputDefinition(InputDefinition $definition, array $o
         }
     }
 
-    protected function describeCommand(Command $command, array $options = [])
+    protected function describeCommand(Command $command, array $options = []): void
     {
         $command->mergeApplicationDefinition(false);
 
@@ -157,7 +157,7 @@ protected function describeCommand(Command $command, array $options = [])
         }
     }
 
-    protected function describeApplication(Application $application, array $options = [])
+    protected function describeApplication(Application $application, array $options = []): void
     {
         $describedNamespace = $options['namespace'] ?? null;
         $description = new ApplicationDescription($application, $describedNamespace);
@@ -226,7 +226,7 @@ protected function describeApplication(Application $application, array $options
         }
     }
 
-    private function writeText(string $content, array $options = [])
+    private function writeText(string $content, array $options = []): void
     {
         $this->write(
             isset($options['raw_text']) && $options['raw_text'] ? strip_tags($content) : $content,
diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
index f4643a9ac77be..72580fd9852b4 100644
--- a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -120,27 +120,27 @@ public function getApplicationDocument(Application $application, string $namespa
         return $dom;
     }
 
-    protected function describeInputArgument(InputArgument $argument, array $options = [])
+    protected function describeInputArgument(InputArgument $argument, array $options = []): void
     {
         $this->writeDocument($this->getInputArgumentDocument($argument));
     }
 
-    protected function describeInputOption(InputOption $option, array $options = [])
+    protected function describeInputOption(InputOption $option, array $options = []): void
     {
         $this->writeDocument($this->getInputOptionDocument($option));
     }
 
-    protected function describeInputDefinition(InputDefinition $definition, array $options = [])
+    protected function describeInputDefinition(InputDefinition $definition, array $options = []): void
     {
         $this->writeDocument($this->getInputDefinitionDocument($definition));
     }
 
-    protected function describeCommand(Command $command, array $options = [])
+    protected function describeCommand(Command $command, array $options = []): void
     {
         $this->writeDocument($this->getCommandDocument($command, $options['short'] ?? false));
     }
 
-    protected function describeApplication(Application $application, array $options = [])
+    protected function describeApplication(Application $application, array $options = []): void
     {
         $this->writeDocument($this->getApplicationDocument($application, $options['namespace'] ?? null, $options['short'] ?? false));
     }
@@ -148,7 +148,7 @@ protected function describeApplication(Application $application, array $options
     /**
      * Appends document children to parent node.
      */
-    private function appendDocument(\DOMNode $parentNode, \DOMNode $importedParent)
+    private function appendDocument(\DOMNode $parentNode, \DOMNode $importedParent): void
     {
         foreach ($importedParent->childNodes as $childNode) {
             $parentNode->appendChild($parentNode->ownerDocument->importNode($childNode, true));
@@ -158,7 +158,7 @@ private function appendDocument(\DOMNode $parentNode, \DOMNode $importedParent)
     /**
      * Writes DOM document.
      */
-    private function writeDocument(\DOMDocument $dom)
+    private function writeDocument(\DOMDocument $dom): void
     {
         $dom->formatOutput = true;
         $this->write($dom->saveXML());
diff --git a/src/Symfony/Component/Console/EventListener/ErrorListener.php b/src/Symfony/Component/Console/EventListener/ErrorListener.php
index 773a13a1c0df2..9925a5f7460e5 100644
--- a/src/Symfony/Component/Console/EventListener/ErrorListener.php
+++ b/src/Symfony/Component/Console/EventListener/ErrorListener.php
@@ -31,6 +31,9 @@ public function __construct(LoggerInterface $logger = null)
         $this->logger = $logger;
     }
 
+    /**
+     * @return void
+     */
     public function onConsoleError(ConsoleErrorEvent $event)
     {
         if (null === $this->logger) {
@@ -48,6 +51,9 @@ public function onConsoleError(ConsoleErrorEvent $event)
         $this->logger->critical('Error thrown while running command "{command}". Message: "{message}"', ['exception' => $error, 'command' => $inputString, 'message' => $error->getMessage()]);
     }
 
+    /**
+     * @return void
+     */
     public function onConsoleTerminate(ConsoleTerminateEvent $event)
     {
         if (null === $this->logger) {
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
index 38e75c3178855..88519f725d3c7 100644
--- a/src/Symfony/Component/Console/Formatter/OutputFormatter.php
+++ b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
@@ -81,6 +81,9 @@ public function __construct(bool $decorated = false, array $styles = [])
         $this->styleStack = new OutputFormatterStyleStack();
     }
 
+    /**
+     * @return void
+     */
     public function setDecorated(bool $decorated)
     {
         $this->decorated = $decorated;
@@ -91,6 +94,9 @@ public function isDecorated(): bool
         return $this->decorated;
     }
 
+    /**
+     * @return void
+     */
     public function setStyle(string $name, OutputFormatterStyleInterface $style)
     {
         $this->styles[strtolower($name)] = $style;
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
index 1659986ef7bda..9f1601d16dfd5 100644
--- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
+++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
@@ -38,6 +38,9 @@ public function __construct(string $foreground = null, string $background = null
         $this->color = new Color($this->foreground = $foreground ?: '', $this->background = $background ?: '', $this->options = $options);
     }
 
+    /**
+     * @return void
+     */
     public function setForeground(string $color = null)
     {
         if (1 > \func_num_args()) {
@@ -46,6 +49,9 @@ public function setForeground(string $color = null)
         $this->color = new Color($this->foreground = $color ?: '', $this->background, $this->options);
     }
 
+    /**
+     * @return void
+     */
     public function setBackground(string $color = null)
     {
         if (1 > \func_num_args()) {
@@ -59,12 +65,18 @@ public function setHref(string $url): void
         $this->href = $url;
     }
 
+    /**
+     * @return void
+     */
     public function setOption(string $option)
     {
         $this->options[] = $option;
         $this->color = new Color($this->foreground, $this->background, $this->options);
     }
 
+    /**
+     * @return void
+     */
     public function unsetOption(string $option)
     {
         $pos = array_search($option, $this->options);
@@ -75,6 +87,9 @@ public function unsetOption(string $option)
         $this->color = new Color($this->foreground, $this->background, $this->options);
     }
 
+    /**
+     * @return void
+     */
     public function setOptions(array $options)
     {
         $this->color = new Color($this->foreground, $this->background, $this->options = $options);
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
index 2c5cdf9b80a59..f98c2eff7c6f8 100644
--- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
+++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
@@ -34,6 +34,8 @@ public function __construct(OutputFormatterStyleInterface $emptyStyle = null)
 
     /**
      * Resets stack (ie. empty internal arrays).
+     *
+     * @return void
      */
     public function reset()
     {
@@ -42,6 +44,8 @@ public function reset()
 
     /**
      * Pushes a style in the stack.
+     *
+     * @return void
      */
     public function push(OutputFormatterStyleInterface $style)
     {
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index 7189ff446e5d7..a860c30860955 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -51,6 +51,8 @@ public function __construct()
      * * raw_text: boolean, sets output type as raw
      *
      * @throws InvalidArgumentException when the given format is not supported
+     *
+     * @return void
      */
     public function describe(OutputInterface $output, ?object $object, array $options = [])
     {
diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
index 8e56f2b57191f..51fd11b260f71 100644
--- a/src/Symfony/Component/Console/Helper/Helper.php
+++ b/src/Symfony/Component/Console/Helper/Helper.php
@@ -23,6 +23,9 @@ abstract class Helper implements HelperInterface
 {
     protected $helperSet = null;
 
+    /**
+     * @return void
+     */
     public function setHelperSet(HelperSet $helperSet = null)
     {
         if (1 > \func_num_args()) {
diff --git a/src/Symfony/Component/Console/Helper/HelperSet.php b/src/Symfony/Component/Console/Helper/HelperSet.php
index cefe62be3c551..dc5d499caa18a 100644
--- a/src/Symfony/Component/Console/Helper/HelperSet.php
+++ b/src/Symfony/Component/Console/Helper/HelperSet.php
@@ -35,6 +35,9 @@ public function __construct(array $helpers = [])
         }
     }
 
+    /**
+     * @return void
+     */
     public function set(HelperInterface $helper, string $alias = null)
     {
         $this->helpers[$helper->getName()] = $helper;
diff --git a/src/Symfony/Component/Console/Helper/InputAwareHelper.php b/src/Symfony/Component/Console/Helper/InputAwareHelper.php
index ba81e37713be1..6f8225973c50a 100644
--- a/src/Symfony/Component/Console/Helper/InputAwareHelper.php
+++ b/src/Symfony/Component/Console/Helper/InputAwareHelper.php
@@ -23,6 +23,9 @@ abstract class InputAwareHelper extends Helper implements InputAwareInterface
 {
     protected $input;
 
+    /**
+     * @return void
+     */
     public function setInput(InputInterface $input)
     {
         $this->input = $input;
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
index 3973b3d060b3e..a8d9f1683ecd5 100644
--- a/src/Symfony/Component/Console/Helper/ProgressBar.php
+++ b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -178,7 +178,7 @@ public static function getFormatDefinition(string $name): ?string
      * @param string $message The text to associate with the placeholder
      * @param string $name    The name of the placeholder
      */
-    public function setMessage(string $message, string $name = 'message')
+    public function setMessage(string $message, string $name = 'message'): void
     {
         $this->messages[$name] = $message;
     }
@@ -236,7 +236,7 @@ public function getRemaining(): float
         return round((time() - $this->startTime) / ($this->step - $this->startingStep) * ($this->max - $this->step));
     }
 
-    public function setBarWidth(int $size)
+    public function setBarWidth(int $size): void
     {
         $this->barWidth = max(1, $size);
     }
@@ -246,7 +246,7 @@ public function getBarWidth(): int
         return $this->barWidth;
     }
 
-    public function setBarCharacter(string $char)
+    public function setBarCharacter(string $char): void
     {
         $this->barChar = $char;
     }
@@ -256,7 +256,7 @@ public function getBarCharacter(): string
         return $this->barChar ?? ($this->max ? '=' : $this->emptyBarChar);
     }
 
-    public function setEmptyBarCharacter(string $char)
+    public function setEmptyBarCharacter(string $char): void
     {
         $this->emptyBarChar = $char;
     }
@@ -266,7 +266,7 @@ public function getEmptyBarCharacter(): string
         return $this->emptyBarChar;
     }
 
-    public function setProgressCharacter(string $char)
+    public function setProgressCharacter(string $char): void
     {
         $this->progressChar = $char;
     }
@@ -276,7 +276,7 @@ public function getProgressCharacter(): string
         return $this->progressChar;
     }
 
-    public function setFormat(string $format)
+    public function setFormat(string $format): void
     {
         $this->format = null;
         $this->internalFormat = $format;
@@ -287,7 +287,7 @@ public function setFormat(string $format)
      *
      * @param int|null $freq The frequency in steps
      */
-    public function setRedrawFrequency(?int $freq)
+    public function setRedrawFrequency(?int $freq): void
     {
         $this->redrawFreq = null !== $freq ? max(1, $freq) : null;
     }
@@ -346,7 +346,7 @@ public function start(int $max = null, int $startAt = 0): void
      *
      * @param int $step Number of steps to advance
      */
-    public function advance(int $step = 1)
+    public function advance(int $step = 1): void
     {
         $this->setProgress($this->step + $step);
     }
@@ -354,12 +354,12 @@ public function advance(int $step = 1)
     /**
      * Sets whether to overwrite the progressbar, false for new line.
      */
-    public function setOverwrite(bool $overwrite)
+    public function setOverwrite(bool $overwrite): void
     {
         $this->overwrite = $overwrite;
     }
 
-    public function setProgress(int $step)
+    public function setProgress(int $step): void
     {
         if ($this->max && $step > $this->max) {
             $this->max = $step;
@@ -392,7 +392,7 @@ public function setProgress(int $step)
         }
     }
 
-    public function setMaxSteps(int $max)
+    public function setMaxSteps(int $max): void
     {
         $this->format = null;
         $this->max = max(0, $max);
@@ -452,7 +452,7 @@ public function clear(): void
         $this->overwrite('');
     }
 
-    private function setRealFormat(string $format)
+    private function setRealFormat(string $format): void
     {
         // try to use the _nomax variant if available
         if (!$this->max && null !== self::getFormatDefinition($format.'_nomax')) {
diff --git a/src/Symfony/Component/Console/Helper/ProgressIndicator.php b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
index 5ca6309f8ff36..c7e9fc17345eb 100644
--- a/src/Symfony/Component/Console/Helper/ProgressIndicator.php
+++ b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
@@ -70,6 +70,8 @@ public function __construct(OutputInterface $output, string $format = null, int
 
     /**
      * Sets the current indicator message.
+     *
+     * @return void
      */
     public function setMessage(?string $message)
     {
@@ -80,6 +82,8 @@ public function setMessage(?string $message)
 
     /**
      * Starts the indicator output.
+     *
+     * @return void
      */
     public function start(string $message)
     {
@@ -98,6 +102,8 @@ public function start(string $message)
 
     /**
      * Advances the indicator.
+     *
+     * @return void
      */
     public function advance()
     {
@@ -125,6 +131,8 @@ public function advance()
      * Finish the indicator with message.
      *
      * @param $message
+     *
+     * @return void
      */
     public function finish(string $message)
     {
@@ -150,6 +158,8 @@ public static function getFormatDefinition(string $name): ?string
      * Sets a placeholder formatter for a given name.
      *
      * This method also allow you to override an existing placeholder.
+     *
+     * @return void
      */
     public static function setPlaceholderFormatterDefinition(string $name, callable $callable)
     {
@@ -168,7 +178,7 @@ public static function getPlaceholderFormatterDefinition(string $name): ?callabl
         return self::$formatters[$name] ?? null;
     }
 
-    private function display()
+    private function display(): void
     {
         if (OutputInterface::VERBOSITY_QUIET === $this->output->getVerbosity()) {
             return;
@@ -197,7 +207,7 @@ private function determineBestFormat(): string
     /**
      * Overwrites a previous message to the output.
      */
-    private function overwrite(string $message)
+    private function overwrite(string $message): void
     {
         if ($this->output->isDecorated()) {
             $this->output->write("\x0D\x1B[2K");
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index 7297a236422eb..c595ca1968b36 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -89,6 +89,8 @@ public function getName(): string
 
     /**
      * Prevents usage of stty.
+     *
+     * @return void
      */
     public static function disableStty()
     {
@@ -177,6 +179,8 @@ private function getDefaultAnswer(Question $question): mixed
 
     /**
      * Outputs the question prompt.
+     *
+     * @return void
      */
     protected function writePrompt(OutputInterface $output, Question $question)
     {
@@ -213,6 +217,8 @@ protected function formatChoiceQuestionChoices(ChoiceQuestion $question, string
 
     /**
      * Outputs an error message.
+     *
+     * @return void
      */
     protected function writeError(OutputInterface $output, \Exception $error)
     {
diff --git a/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php b/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
index 109045d043839..8ebc84376b08d 100644
--- a/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
@@ -25,6 +25,9 @@
  */
 class SymfonyQuestionHelper extends QuestionHelper
 {
+    /**
+     * @return void
+     */
     protected function writePrompt(OutputInterface $output, Question $question)
     {
         $text = OutputFormatter::escapeTrailingBackslash($question->getQuestion());
@@ -80,6 +83,9 @@ protected function writePrompt(OutputInterface $output, Question $question)
         $output->write($prompt);
     }
 
+    /**
+     * @return void
+     */
     protected function writeError(OutputInterface $output, \Exception $error)
     {
         if ($output instanceof SymfonyStyle) {
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
index c0c28bb5812ac..59f9217ec59ca 100644
--- a/src/Symfony/Component/Console/Input/ArgvInput.php
+++ b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -55,11 +55,17 @@ public function __construct(array $argv = null, InputDefinition $definition = nu
         parent::__construct($definition);
     }
 
+    /**
+     * @return void
+     */
     protected function setTokens(array $tokens)
     {
         $this->tokens = $tokens;
     }
 
+    /**
+     * @return void
+     */
     protected function parse()
     {
         $parseOptions = true;
@@ -89,7 +95,7 @@ protected function parseToken(string $token, bool $parseOptions): bool
     /**
      * Parses a short option.
      */
-    private function parseShortOption(string $token)
+    private function parseShortOption(string $token): void
     {
         $name = substr($token, 1);
 
@@ -110,7 +116,7 @@ private function parseShortOption(string $token)
      *
      * @throws RuntimeException When option given doesn't exist
      */
-    private function parseShortOptionSet(string $name)
+    private function parseShortOptionSet(string $name): void
     {
         $len = \strlen($name);
         for ($i = 0; $i < $len; ++$i) {
@@ -133,7 +139,7 @@ private function parseShortOptionSet(string $name)
     /**
      * Parses a long option.
      */
-    private function parseLongOption(string $token)
+    private function parseLongOption(string $token): void
     {
         $name = substr($token, 2);
 
@@ -152,7 +158,7 @@ private function parseLongOption(string $token)
      *
      * @throws RuntimeException When too many arguments are given
      */
-    private function parseArgument(string $token)
+    private function parseArgument(string $token): void
     {
         $c = \count($this->arguments);
 
@@ -196,7 +202,7 @@ private function parseArgument(string $token)
      *
      * @throws RuntimeException When option given doesn't exist
      */
-    private function addShortOption(string $shortcut, mixed $value)
+    private function addShortOption(string $shortcut, mixed $value): void
     {
         if (!$this->definition->hasShortcut($shortcut)) {
             throw new RuntimeException(sprintf('The "-%s" option does not exist.', $shortcut));
@@ -210,7 +216,7 @@ private function addShortOption(string $shortcut, mixed $value)
      *
      * @throws RuntimeException When option given doesn't exist
      */
-    private function addLongOption(string $name, mixed $value)
+    private function addLongOption(string $name, mixed $value): void
     {
         if (!$this->definition->hasOption($name)) {
             if (!$this->definition->hasNegation($name)) {
diff --git a/src/Symfony/Component/Console/Input/ArrayInput.php b/src/Symfony/Component/Console/Input/ArrayInput.php
index 02fb4e8eefdd5..355de61dd6aaa 100644
--- a/src/Symfony/Component/Console/Input/ArrayInput.php
+++ b/src/Symfony/Component/Console/Input/ArrayInput.php
@@ -113,6 +113,9 @@ public function __toString(): string
         return implode(' ', $params);
     }
 
+    /**
+     * @return void
+     */
     protected function parse()
     {
         foreach ($this->parameters as $key => $value) {
@@ -134,7 +137,7 @@ protected function parse()
      *
      * @throws InvalidOptionException When option given doesn't exist
      */
-    private function addShortOption(string $shortcut, mixed $value)
+    private function addShortOption(string $shortcut, mixed $value): void
     {
         if (!$this->definition->hasShortcut($shortcut)) {
             throw new InvalidOptionException(sprintf('The "-%s" option does not exist.', $shortcut));
@@ -149,7 +152,7 @@ private function addShortOption(string $shortcut, mixed $value)
      * @throws InvalidOptionException When option given doesn't exist
      * @throws InvalidOptionException When a required value is missing
      */
-    private function addLongOption(string $name, mixed $value)
+    private function addLongOption(string $name, mixed $value): void
     {
         if (!$this->definition->hasOption($name)) {
             if (!$this->definition->hasNegation($name)) {
@@ -182,7 +185,7 @@ private function addLongOption(string $name, mixed $value)
      *
      * @throws InvalidArgumentException When argument given doesn't exist
      */
-    private function addArgument(string|int $name, mixed $value)
+    private function addArgument(string|int $name, mixed $value): void
     {
         if (!$this->definition->hasArgument($name)) {
             throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
diff --git a/src/Symfony/Component/Console/Input/Input.php b/src/Symfony/Component/Console/Input/Input.php
index 4cfb0bb8d0d83..22ede15e11b07 100644
--- a/src/Symfony/Component/Console/Input/Input.php
+++ b/src/Symfony/Component/Console/Input/Input.php
@@ -43,6 +43,9 @@ public function __construct(InputDefinition $definition = null)
         }
     }
 
+    /**
+     * @return void
+     */
     public function bind(InputDefinition $definition)
     {
         $this->arguments = [];
@@ -57,6 +60,9 @@ public function bind(InputDefinition $definition)
      */
     abstract protected function parse();
 
+    /**
+     * @return void
+     */
     public function validate()
     {
         $definition = $this->definition;
@@ -74,6 +80,9 @@ public function isInteractive(): bool
         return $this->interactive;
     }
 
+    /**
+     * @return void
+     */
     public function setInteractive(bool $interactive)
     {
         $this->interactive = $interactive;
@@ -93,6 +102,9 @@ public function getArgument(string $name): mixed
         return $this->arguments[$name] ?? $this->definition->getArgument($name)->getDefault();
     }
 
+    /**
+     * @return void
+     */
     public function setArgument(string $name, mixed $value)
     {
         if (!$this->definition->hasArgument($name)) {
@@ -129,6 +141,9 @@ public function getOption(string $name): mixed
         return \array_key_exists($name, $this->options) ? $this->options[$name] : $this->definition->getOption($name)->getDefault();
     }
 
+    /**
+     * @return void
+     */
     public function setOption(string $name, mixed $value)
     {
         if ($this->definition->hasNegation($name)) {
@@ -155,6 +170,9 @@ public function escapeToken(string $token): string
         return preg_match('{^[\w-]+$}', $token) ? $token : escapeshellarg($token);
     }
 
+    /**
+     * @return void
+     */
     public function setStream($stream)
     {
         $this->stream = $stream;
diff --git a/src/Symfony/Component/Console/Input/InputArgument.php b/src/Symfony/Component/Console/Input/InputArgument.php
index f0867193e58bd..ff8e9276fd8d4 100644
--- a/src/Symfony/Component/Console/Input/InputArgument.php
+++ b/src/Symfony/Component/Console/Input/InputArgument.php
@@ -92,6 +92,8 @@ public function isArray(): bool
      * Sets the default value.
      *
      * @throws LogicException When incorrect default value is given
+     *
+     * @return void
      */
     public function setDefault(string|bool|int|float|array $default = null)
     {
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
index f4b14a1c89fb1..0ee85b4990543 100644
--- a/src/Symfony/Component/Console/Input/InputDefinition.php
+++ b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -46,6 +46,8 @@ public function __construct(array $definition = [])
 
     /**
      * Sets the definition of the input.
+     *
+     * @return void
      */
     public function setDefinition(array $definition)
     {
@@ -67,6 +69,8 @@ public function setDefinition(array $definition)
      * Sets the InputArgument objects.
      *
      * @param InputArgument[] $arguments An array of InputArgument objects
+     *
+     * @return void
      */
     public function setArguments(array $arguments = [])
     {
@@ -81,6 +85,8 @@ public function setArguments(array $arguments = [])
      * Adds an array of InputArgument objects.
      *
      * @param InputArgument[] $arguments An array of InputArgument objects
+     *
+     * @return void
      */
     public function addArguments(?array $arguments = [])
     {
@@ -93,6 +99,8 @@ public function addArguments(?array $arguments = [])
 
     /**
      * @throws LogicException When incorrect argument is given
+     *
+     * @return void
      */
     public function addArgument(InputArgument $argument)
     {
@@ -190,6 +198,8 @@ public function getArgumentDefaults(): array
      * Sets the InputOption objects.
      *
      * @param InputOption[] $options An array of InputOption objects
+     *
+     * @return void
      */
     public function setOptions(array $options = [])
     {
@@ -203,6 +213,8 @@ public function setOptions(array $options = [])
      * Adds an array of InputOption objects.
      *
      * @param InputOption[] $options An array of InputOption objects
+     *
+     * @return void
      */
     public function addOptions(array $options = [])
     {
@@ -213,6 +225,8 @@ public function addOptions(array $options = [])
 
     /**
      * @throws LogicException When option given already exist
+     *
+     * @return void
      */
     public function addOption(InputOption $option)
     {
diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php
index 452c9f7fdec3b..231e6cc616d97 100644
--- a/src/Symfony/Component/Console/Input/InputOption.php
+++ b/src/Symfony/Component/Console/Input/InputOption.php
@@ -178,6 +178,9 @@ public function isNegatable(): bool
         return self::VALUE_NEGATABLE === (self::VALUE_NEGATABLE & $this->mode);
     }
 
+    /**
+     * @return void
+     */
     public function setDefault(string|bool|int|float|array $default = null)
     {
         if (1 > \func_num_args()) {
diff --git a/src/Symfony/Component/Console/Output/BufferedOutput.php b/src/Symfony/Component/Console/Output/BufferedOutput.php
index 94d4e414a0a1b..ef5099bfd6a07 100644
--- a/src/Symfony/Component/Console/Output/BufferedOutput.php
+++ b/src/Symfony/Component/Console/Output/BufferedOutput.php
@@ -29,6 +29,9 @@ public function fetch(): string
         return $content;
     }
 
+    /**
+     * @return void
+     */
     protected function doWrite(string $message, bool $newline)
     {
         $this->buffer .= $message;
diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php
index e3aa92c7fcf87..c1eb7cd14b681 100644
--- a/src/Symfony/Component/Console/Output/ConsoleOutput.php
+++ b/src/Symfony/Component/Console/Output/ConsoleOutput.php
@@ -64,18 +64,27 @@ public function section(): ConsoleSectionOutput
         return new ConsoleSectionOutput($this->getStream(), $this->consoleSectionOutputs, $this->getVerbosity(), $this->isDecorated(), $this->getFormatter());
     }
 
+    /**
+     * @return void
+     */
     public function setDecorated(bool $decorated)
     {
         parent::setDecorated($decorated);
         $this->stderr->setDecorated($decorated);
     }
 
+    /**
+     * @return void
+     */
     public function setFormatter(OutputFormatterInterface $formatter)
     {
         parent::setFormatter($formatter);
         $this->stderr->setFormatter($formatter);
     }
 
+    /**
+     * @return void
+     */
     public function setVerbosity(int $level)
     {
         parent::setVerbosity($level);
@@ -87,6 +96,9 @@ public function getErrorOutput(): OutputInterface
         return $this->stderr;
     }
 
+    /**
+     * @return void
+     */
     public function setErrorOutput(OutputInterface $error)
     {
         $this->stderr = $error;
diff --git a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
index 7978a922ce3e4..689f39d2f0e0a 100644
--- a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
+++ b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
@@ -60,6 +60,8 @@ public function setMaxHeight(int $maxHeight): void
      * Clears previous output for this section.
      *
      * @param int $lines Number of lines to clear. If null, then the entire output of this section is cleared
+     *
+     * @return void
      */
     public function clear(int $lines = null)
     {
@@ -81,6 +83,8 @@ public function clear(int $lines = null)
 
     /**
      * Overwrites the previous output with a new message.
+     *
+     * @return void
      */
     public function overwrite(string|iterable $message)
     {
@@ -149,6 +153,9 @@ public function addContent(string $input, bool $newline = true): int
         return $linesAdded;
     }
 
+    /**
+     * @return void
+     */
     protected function doWrite(string $message, bool $newline)
     {
         if (!$this->isDecorated()) {
diff --git a/src/Symfony/Component/Console/Output/NullOutput.php b/src/Symfony/Component/Console/Output/NullOutput.php
index 4884cbad90599..f3aa15b1d4e01 100644
--- a/src/Symfony/Component/Console/Output/NullOutput.php
+++ b/src/Symfony/Component/Console/Output/NullOutput.php
@@ -26,6 +26,9 @@ class NullOutput implements OutputInterface
 {
     private NullOutputFormatter $formatter;
 
+    /**
+     * @return void
+     */
     public function setFormatter(OutputFormatterInterface $formatter)
     {
         // do nothing
@@ -37,6 +40,9 @@ public function getFormatter(): OutputFormatterInterface
         return $this->formatter ??= new NullOutputFormatter();
     }
 
+    /**
+     * @return void
+     */
     public function setDecorated(bool $decorated)
     {
         // do nothing
@@ -47,6 +53,9 @@ public function isDecorated(): bool
         return false;
     }
 
+    /**
+     * @return void
+     */
     public function setVerbosity(int $level)
     {
         // do nothing
@@ -77,11 +86,17 @@ public function isDebug(): bool
         return false;
     }
 
+    /**
+     * @return void
+     */
     public function writeln(string|iterable $messages, int $options = self::OUTPUT_NORMAL)
     {
         // do nothing
     }
 
+    /**
+     * @return void
+     */
     public function write(string|iterable $messages, bool $newline = false, int $options = self::OUTPUT_NORMAL)
     {
         // do nothing
diff --git a/src/Symfony/Component/Console/Output/Output.php b/src/Symfony/Component/Console/Output/Output.php
index 4cb71acbad7a0..29761351f9029 100644
--- a/src/Symfony/Component/Console/Output/Output.php
+++ b/src/Symfony/Component/Console/Output/Output.php
@@ -44,6 +44,9 @@ public function __construct(?int $verbosity = self::VERBOSITY_NORMAL, bool $deco
         $this->formatter->setDecorated($decorated);
     }
 
+    /**
+     * @return void
+     */
     public function setFormatter(OutputFormatterInterface $formatter)
     {
         $this->formatter = $formatter;
@@ -54,6 +57,9 @@ public function getFormatter(): OutputFormatterInterface
         return $this->formatter;
     }
 
+    /**
+     * @return void
+     */
     public function setDecorated(bool $decorated)
     {
         $this->formatter->setDecorated($decorated);
@@ -64,6 +70,9 @@ public function isDecorated(): bool
         return $this->formatter->isDecorated();
     }
 
+    /**
+     * @return void
+     */
     public function setVerbosity(int $level)
     {
         $this->verbosity = $level;
@@ -94,11 +103,17 @@ public function isDebug(): bool
         return self::VERBOSITY_DEBUG <= $this->verbosity;
     }
 
+    /**
+     * @return void
+     */
     public function writeln(string|iterable $messages, int $options = self::OUTPUT_NORMAL)
     {
         $this->write($messages, true, $options);
     }
 
+    /**
+     * @return void
+     */
     public function write(string|iterable $messages, bool $newline = false, int $options = self::OUTPUT_NORMAL)
     {
         if (!is_iterable($messages)) {
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
index 9ec524e4d2f7d..155066ea0e1e0 100644
--- a/src/Symfony/Component/Console/Output/StreamOutput.php
+++ b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -62,6 +62,9 @@ public function getStream()
         return $this->stream;
     }
 
+    /**
+     * @return void
+     */
     protected function doWrite(string $message, bool $newline)
     {
         if ($newline) {
diff --git a/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php b/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php
index 1ca5a13e822e2..b00445ece8c18 100644
--- a/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php
+++ b/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php
@@ -45,6 +45,9 @@ public function fetch(): string
         return $content;
     }
 
+    /**
+     * @return void
+     */
     protected function doWrite(string $message, bool $newline)
     {
         $this->buffer .= $message;
diff --git a/src/Symfony/Component/Console/Style/OutputStyle.php b/src/Symfony/Component/Console/Style/OutputStyle.php
index 74d885d131d6c..ddfa8decc23c9 100644
--- a/src/Symfony/Component/Console/Style/OutputStyle.php
+++ b/src/Symfony/Component/Console/Style/OutputStyle.php
@@ -30,6 +30,9 @@ public function __construct(OutputInterface $output)
         $this->output = $output;
     }
 
+    /**
+     * @return void
+     */
     public function newLine(int $count = 1)
     {
         $this->output->write(str_repeat(\PHP_EOL, $count));
@@ -40,16 +43,25 @@ public function createProgressBar(int $max = 0): ProgressBar
         return new ProgressBar($this->output, $max);
     }
 
+    /**
+     * @return void
+     */
     public function write(string|iterable $messages, bool $newline = false, int $type = self::OUTPUT_NORMAL)
     {
         $this->output->write($messages, $newline, $type);
     }
 
+    /**
+     * @return void
+     */
     public function writeln(string|iterable $messages, int $type = self::OUTPUT_NORMAL)
     {
         $this->output->writeln($messages, $type);
     }
 
+    /**
+     * @return void
+     */
     public function setVerbosity(int $level)
     {
         $this->output->setVerbosity($level);
@@ -60,6 +72,9 @@ public function getVerbosity(): int
         return $this->output->getVerbosity();
     }
 
+    /**
+     * @return void
+     */
     public function setDecorated(bool $decorated)
     {
         $this->output->setDecorated($decorated);
@@ -70,6 +85,9 @@ public function isDecorated(): bool
         return $this->output->isDecorated();
     }
 
+    /**
+     * @return void
+     */
     public function setFormatter(OutputFormatterInterface $formatter)
     {
         $this->output->setFormatter($formatter);
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
index 4225823b8d27a..52d9b5edc9b55 100644
--- a/src/Symfony/Component/Console/Style/SymfonyStyle.php
+++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -59,6 +59,8 @@ public function __construct(InputInterface $input, OutputInterface $output)
 
     /**
      * Formats a message as a block of text.
+     *
+     * @return void
      */
     public function block(string|array $messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = true)
     {
@@ -69,6 +71,9 @@ public function block(string|array $messages, string $type = null, string $style
         $this->newLine();
     }
 
+    /**
+     * @return void
+     */
     public function title(string $message)
     {
         $this->autoPrependBlock();
@@ -79,6 +84,9 @@ public function title(string $message)
         $this->newLine();
     }
 
+    /**
+     * @return void
+     */
     public function section(string $message)
     {
         $this->autoPrependBlock();
@@ -89,6 +97,9 @@ public function section(string $message)
         $this->newLine();
     }
 
+    /**
+     * @return void
+     */
     public function listing(array $elements)
     {
         $this->autoPrependText();
@@ -98,6 +109,9 @@ public function listing(array $elements)
         $this->newLine();
     }
 
+    /**
+     * @return void
+     */
     public function text(string|array $message)
     {
         $this->autoPrependText();
@@ -110,27 +124,41 @@ public function text(string|array $message)
 
     /**
      * Formats a command comment.
+     *
+     * @return void
      */
     public function comment(string|array $message)
     {
         $this->block($message, null, null, '<fg=default;bg=default> // </>', false, false);
     }
 
+    /**
+     * @return void
+     */
     public function success(string|array $message)
     {
         $this->block($message, 'OK', 'fg=black;bg=green', ' ', true);
     }
 
+    /**
+     * @return void
+     */
     public function error(string|array $message)
     {
         $this->block($message, 'ERROR', 'fg=white;bg=red', ' ', true);
     }
 
+    /**
+     * @return void
+     */
     public function warning(string|array $message)
     {
         $this->block($message, 'WARNING', 'fg=black;bg=yellow', ' ', true);
     }
 
+    /**
+     * @return void
+     */
     public function note(string|array $message)
     {
         $this->block($message, 'NOTE', 'fg=yellow', ' ! ');
@@ -138,17 +166,25 @@ public function note(string|array $message)
 
     /**
      * Formats an info message.
+     *
+     * @return void
      */
     public function info(string|array $message)
     {
         $this->block($message, 'INFO', 'fg=green', ' ', true);
     }
 
+    /**
+     * @return void
+     */
     public function caution(string|array $message)
     {
         $this->block($message, 'CAUTION', 'fg=white;bg=red', ' ! ', true);
     }
 
+    /**
+     * @return void
+     */
     public function table(array $headers, array $rows)
     {
         $this->createTable()
@@ -162,6 +198,8 @@ public function table(array $headers, array $rows)
 
     /**
      * Formats a horizontal table.
+     *
+     * @return void
      */
     public function horizontalTable(array $headers, array $rows)
     {
@@ -182,6 +220,8 @@ public function horizontalTable(array $headers, array $rows)
      * * 'A title'
      * * ['key' => 'value']
      * * new TableSeparator()
+     *
+     * @return void
      */
     public function definitionList(string|array|TableSeparator ...$list)
     {
@@ -244,17 +284,26 @@ public function choice(string $question, array $choices, mixed $default = null,
         return $this->askQuestion($questionChoice);
     }
 
+    /**
+     * @return void
+     */
     public function progressStart(int $max = 0)
     {
         $this->progressBar = $this->createProgressBar($max);
         $this->progressBar->start();
     }
 
+    /**
+     * @return void
+     */
     public function progressAdvance(int $step = 1)
     {
         $this->getProgressBar()->advance($step);
     }
 
+    /**
+     * @return void
+     */
     public function progressFinish()
     {
         $this->getProgressBar()->finish();
@@ -303,6 +352,9 @@ public function askQuestion(Question $question): mixed
         return $answer;
     }
 
+    /**
+     * @return void
+     */
     public function writeln(string|iterable $messages, int $type = self::OUTPUT_NORMAL)
     {
         if (!is_iterable($messages)) {
@@ -315,6 +367,9 @@ public function writeln(string|iterable $messages, int $type = self::OUTPUT_NORM
         }
     }
 
+    /**
+     * @return void
+     */
     public function write(string|iterable $messages, bool $newline = false, int $type = self::OUTPUT_NORMAL)
     {
         if (!is_iterable($messages)) {
@@ -327,6 +382,9 @@ public function write(string|iterable $messages, bool $newline = false, int $typ
         }
     }
 
+    /**
+     * @return void
+     */
     public function newLine(int $count = 1)
     {
         parent::newLine($count);
diff --git a/src/Symfony/Component/Console/Terminal.php b/src/Symfony/Component/Console/Terminal.php
index 216c609faf504..7c73f139f31ab 100644
--- a/src/Symfony/Component/Console/Terminal.php
+++ b/src/Symfony/Component/Console/Terminal.php
@@ -133,7 +133,7 @@ public static function hasSttyAvailable(): bool
         return self::$stty = 0 === $exitcode;
     }
 
-    private static function initDimensions()
+    private static function initDimensions(): void
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {
             if (preg_match('/^(\d+)x(\d+)(?: \((\d+)x(\d+)\))?$/', trim(getenv('ANSICON')), $matches)) {
@@ -166,7 +166,7 @@ private static function hasVt100Support(): bool
     /**
      * Initializes dimensions using the output of an stty columns line.
      */
-    private static function initDimensionsUsingStty()
+    private static function initDimensionsUsingStty(): void
     {
         if ($sttyString = self::getSttyColumns()) {
             if (preg_match('/rows.(\d+);.columns.(\d+);/is', $sttyString, $matches)) {
diff --git a/src/Symfony/Component/Console/Tester/TesterTrait.php b/src/Symfony/Component/Console/Tester/TesterTrait.php
index 9670a49686e26..497b8c8c77a8a 100644
--- a/src/Symfony/Component/Console/Tester/TesterTrait.php
+++ b/src/Symfony/Component/Console/Tester/TesterTrait.php
@@ -128,7 +128,7 @@ public function setInputs(array $inputs): static
      *  * verbosity:                 Sets the output verbosity flag
      *  * capture_stderr_separately: Make output of stdOut and stdErr separately available
      */
-    private function initOutput(array $options)
+    private function initOutput(array $options): void
     {
         $this->captureStreamsIndependently = \array_key_exists('capture_stderr_separately', $options) && $options['capture_stderr_separately'];
         if (!$this->captureStreamsIndependently) {
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/BarBucCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/BarBucCommand.php
index 52b619e821ed0..f2a7855070333 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/BarBucCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/BarBucCommand.php
@@ -4,7 +4,7 @@
 
 class BarBucCommand extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('bar:buc');
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/BarHiddenCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/BarHiddenCommand.php
index 87add7f8e0c20..2d42de46e33ab 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/BarHiddenCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/BarHiddenCommand.php
@@ -6,7 +6,7 @@
 
 class BarHiddenCommand extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('bar:hidden')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php
index 14bb20486e8d5..32d91af905566 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php
@@ -15,7 +15,7 @@
 
 class DescriptorCommand1 extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('descriptor:command1')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php
index 51106b96116a6..b9e8cb6d3e96a 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php
@@ -17,7 +17,7 @@
 
 class DescriptorCommand2 extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('descriptor:command2')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand3.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand3.php
index 5dbb4eb5d3100..14fa7aee8c14c 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand3.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand3.php
@@ -15,7 +15,7 @@
 
 class DescriptorCommand3 extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('descriptor:command3')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand4.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand4.php
index 22dcae0e3c10e..4e677feeb8864 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand4.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand4.php
@@ -15,7 +15,7 @@
 
 class DescriptorCommand4 extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('descriptor:command4')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommandMbString.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommandMbString.php
index 66de917e29f58..ba6be60e27581 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommandMbString.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommandMbString.php
@@ -17,7 +17,7 @@
 
 class DescriptorCommandMbString extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('descriptor:åèä')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Foo1Command.php b/src/Symfony/Component/Console/Tests/Fixtures/Foo1Command.php
index c4fc0e811227d..f8a80c54a6858 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Foo1Command.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/
97AE
Foo1Command.php
@@ -9,7 +9,7 @@ class Foo1Command extends Command
     public $input;
     public $output;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('foo:bar1')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Foo2Command.php b/src/Symfony/Component/Console/Tests/Fixtures/Foo2Command.php
index b3b6e6c06c934..39df932b9595d 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Foo2Command.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Foo2Command.php
@@ -6,7 +6,7 @@
 
 class Foo2Command extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('foo1:bar')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Foo3Command.php b/src/Symfony/Component/Console/Tests/Fixtures/Foo3Command.php
index d6ca5cd15c59b..505b2d58e25df 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Foo3Command.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Foo3Command.php
@@ -6,7 +6,7 @@
 
 class Foo3Command extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('foo3:bar')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Foo4Command.php b/src/Symfony/Component/Console/Tests/Fixtures/Foo4Command.php
index 1c5463995f92c..3f826a83ac158 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Foo4Command.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Foo4Command.php
@@ -4,7 +4,7 @@
 
 class Foo4Command extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('foo3:bar:toh');
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Foo6Command.php b/src/Symfony/Component/Console/Tests/Fixtures/Foo6Command.php
index ef5bd7702631b..b71022ae525a8 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/Foo6Command.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/Foo6Command.php
@@ -4,7 +4,7 @@
 
 class Foo6Command extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('0foo:bar')->setDescription('0foo:bar command');
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/FooCommand.php
index fac25f21ec317..d8c39ae496ca0 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooCommand.php
@@ -6,10 +6,10 @@
 
 class FooCommand extends Command
 {
-    public $input;
-    public $output;
+    public InputInterface $input;
+    public OutputInterface $output;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('foo:bar')
@@ -18,7 +18,7 @@ protected function configure()
         ;
     }
 
-    protected function interact(InputInterface $input, OutputInterface $output)
+    protected function interact(InputInterface $input, OutputInterface $output): void
     {
         $output->writeln('interact called');
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooHiddenCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/FooHiddenCommand.php
index 94c7d74ad8286..b9ef2576b8242 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooHiddenCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooHiddenCommand.php
@@ -6,7 +6,7 @@
 
 class FooHiddenCommand extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('foo:hidden')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooLock2Command.php b/src/Symfony/Component/Console/Tests/Fixtures/FooLock2Command.php
index dcf78bee7432c..d7521c4eeb5e3 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooLock2Command.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooLock2Command.php
@@ -9,7 +9,7 @@ class FooLock2Command extends Command
 {
     use LockableTrait;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('foo:lock2');
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooLockCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/FooLockCommand.php
index 103954f4fb7e7..df33c171cf819 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooLockCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooLockCommand.php
@@ -9,7 +9,7 @@ class FooLockCommand extends Command
 {
     use LockableTrait;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('foo:lock');
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooOptCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/FooOptCommand.php
index dea6d4d162fbf..e9147352cb662 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooOptCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooOptCommand.php
@@ -10,7 +10,7 @@ class FooOptCommand extends Command
     public $input;
     public $output;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('foo:bar')
@@ -20,7 +20,7 @@ protected function configure()
         ;
     }
 
-    protected function interact(InputInterface $input, OutputInterface $output)
+    protected function interact(InputInterface $input, OutputInterface $output): void
     {
         $output->writeln('interact called');
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooSameCaseLowercaseCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/FooSameCaseLowercaseCommand.php
index c875be0cd7546..7f0e2c2e6671c 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooSameCaseLowercaseCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooSameCaseLowercaseCommand.php
@@ -4,7 +4,7 @@
 
 class FooSameCaseLowercaseCommand extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('foo:bar')->setDescription('foo:bar command');
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooSameCaseUppercaseCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/FooSameCaseUppercaseCommand.php
index 75c8d0024e28c..570726897dd06 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooSameCaseUppercaseCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooSameCaseUppercaseCommand.php
@@ -4,7 +4,7 @@
 
 class FooSameCaseUppercaseCommand extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('foo:BAR')->setDescription('foo:BAR command');
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced1Command.php b/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced1Command.php
index c9fad78e152f8..72b389a674560 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced1Command.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced1Command.php
@@ -6,10 +6,10 @@
 
 class FooSubnamespaced1Command extends Command
 {
-    public $input;
-    public $output;
+    public InputInterface $input;
+    public OutputInterface $output;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('foo:bar:baz')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced2Command.php b/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced2Command.php
index dea20a49c508d..9867a07a59fb7 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced2Command.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooSubnamespaced2Command.php
@@ -6,10 +6,10 @@
 
 class FooSubnamespaced2Command extends Command
 {
-    public $input;
-    public $output;
+    public InputInterface $input;
+    public OutputInterface $output;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('foo:go:bret')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FooWithoutAliasCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/FooWithoutAliasCommand.php
index 3d125500c4ed5..268d0b3906da6 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FooWithoutAliasCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FooWithoutAliasCommand.php
@@ -6,7 +6,7 @@
 
 class FooWithoutAliasCommand extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('foo')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/FoobarCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/FoobarCommand.php
index ab3c9ff0c9db6..9405b091707a6 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/FoobarCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/FoobarCommand.php
@@ -9,7 +9,7 @@ class FoobarCommand extends Command
     public $input;
     public $output;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('foobar:foo')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering.php b/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering.php
index 71badf3428140..cc3967c064820 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering.php
@@ -6,7 +6,7 @@
 
 class TestAmbiguousCommandRegistering extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('test-ambiguous')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php b/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php
index 127ea56a95f49..3b8dcb2d2eac3 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/TestAmbiguousCommandRegistering2.php
@@ -6,7 +6,7 @@
 
 class TestAmbiguousCommandRegistering2 extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('test-ambiguous2')
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/TestCommand.php b/src/Symfony/Component/Console/Tests/Fixtures/TestCommand.php
index 7de01cebe92d4..1d2b45af10a96 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/TestCommand.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/TestCommand.php
@@ -6,7 +6,7 @@
 
 class TestCommand extends Command
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('namespace:name')
@@ -23,7 +23,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    protected function interact(InputInterface $input, OutputInterface $output)
+    protected function interact(InputInterface $input, OutputInterface $output): void
     {
         $output->writeln('interact called');
     }
diff --git a/src/Symfony/Component/CssSelector/Parser/TokenStream.php b/src/Symfony/Component/CssSelector/Parser/TokenStream.php
index 69f777807db4e..8b72d5dbc981f 100644
--- a/src/Symfony/Component/CssSelector/Parser/TokenStream.php
+++ b/src/Symfony/Component/CssSelector/Parser/TokenStream.php
@@ -145,7 +145,7 @@ public function getNextIdentifierOrStar(): ?string
     /**
      * Skips next whitespace if any.
      */
-    public function skipWhitespace()
+    public function skipWhitespace(): void
     {
         $peek = $this->getPeek();
 
diff --git a/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php b/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php
index 448f684255646..be24e20af8345 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php
@@ -45,7 +45,7 @@ public function getValues(): array
         return [$this->value, $this->identifier, $this->used, $this->type, $this->file];
     }
 
-    public function setValues(array $values)
+    public function setValues(array $values): void
     {
         if (5 === \count($values)) {
             [$this->value, $this->identifier, $this->used, $this->type, $this->file] = $values;
diff --git a/src/Symfony/Component/DependencyInjection/Argument/IteratorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/IteratorArgument.php
index 1c3965515f01c..aedd1e659ea70 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/IteratorArgument.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/IteratorArgument.php
@@ -30,6 +30,9 @@ public function getValues(): array
         return $this->values;
     }
 
+    /**
+     * @return void
+     */
     public function setValues(array $values)
     {
         $this->values = $values;
diff --git a/src/Symfony/Component/DependencyInjection/Argument/ServiceClosureArgument.php b/src/Symfony/Component/DependencyInjection/Argument/ServiceClosureArgument.php
index 064ff0b242c28..be86412bcb079 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/ServiceClosureArgument.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/ServiceClosureArgument.php
@@ -32,6 +32,9 @@ public function getValues(): array
         return $this->values;
     }
 
+    /**
+     * @return void
+     */
     public function setValues(array $values)
     {
         if ([0] !== array_keys($values)) {
diff --git a/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php
index 29aa0b01d00c6..de533fcca6c10 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php
@@ -41,6 +41,9 @@ public function getValues(): array
         return $this->values;
     }
 
+    /**
+     * @return void
+     */
     public function setValues(array $values)
     {
         $this->values = $values;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
index 08bab02ee468a..95251dec824bd 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
@@ -36,6 +36,9 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
     private ExpressionLanguage $expressionLanguage;
     private bool $inExpression = false;
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $this->container = $container;
@@ -47,6 +50,9 @@ public function process(ContainerBuilder $container)
         }
     }
 
+    /**
+     * @return void
+     */
     protected function enableExpressionProcessing()
     {
         $this->processExpressions = true;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AliasDeprecatedPublicServicesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AliasDeprecatedPublicServicesPass.php
index 96b1253161ca4..0658139d9a7ab 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AliasDeprecatedPublicServicesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AliasDeprecatedPublicServicesPass.php
@@ -28,7 +28,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
         return parent::processValue($value, $isRoot);
     }
 
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         foreach ($container->findTaggedServiceIds('container.private') as $id => $tags) {
             if (null === $package = $tags[0]['package'] ?? null) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
index 0d355f1c852e5..de033d984719d 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
@@ -54,6 +54,8 @@ public function __construct(bool $onlyConstructorArguments = false, bool $hasPro
 
     /**
      * Processes a ContainerBuilder object to populate the service reference graph.
+     *
+     * @return void
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php
index aadae28d4ccfb..3f070dcc0cbef 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php
@@ -20,6 +20,9 @@
  */
 class AutoAliasServicePass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         foreach ($container->findTaggedServiceIds('auto_alias') as $serviceId => $tags) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireAsDecoratorPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireAsDecoratorPass.php
index ef11e343ec2a3..1e812c7002bdf 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowireAsDecoratorPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowireAsDecoratorPass.php
@@ -21,7 +21,7 @@
  */
 final class AutowireAsDecoratorPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         foreach ($container->getDefinitions() as $definition) {
             if ($this->accept($definition) && $reflectionClass = $container->getReflectionClass($definition->getClass(), false)) {
@@ -35,7 +35,7 @@ private function accept(Definition $definition): bool
         return !$definition->hasTag('container.ignore_attributes') && $definition->isAutowired();
     }
 
-    private function processClass(Definition $definition, \ReflectionClass $reflectionClass)
+    private function processClass(Definition $definition, \ReflectionClass $reflectionClass): void
     {
         foreach ($reflectionClass->getAttributes(AsDecorator::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
             $attribute = $attribute->newInstance();
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 8bed2db42da5e..4d419a273b50f 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -60,6 +60,9 @@ public function __construct(bool $throwOnAutowireException = true)
         };
     }
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         try {
@@ -441,7 +444,7 @@ private function getAutowiredReference(TypedReference $reference, bool $filterTy
     /**
      * Populates the list of available types.
      */
-    private function populateAvailableTypes(ContainerBuilder $container)
+    private function populateAvailableTypes(ContainerBuilder $container): void
     {
         $this->types = [];
         $this->ambiguousServiceTypes = [];
@@ -459,7 +462,7 @@ private function populateAvailableTypes(ContainerBuilder $container)
     /**
      * Populates the list of available types for a given definition.
      */
-    private function populateAvailableType(ContainerBuilder $container, string $id, Definition $definition)
+    private function populateAvailableType(ContainerBuilder $container, string $id, Definition $definition): void
     {
         // Never use abstract services
         if ($definition->isAbstract()) {
@@ -484,7 +487,7 @@ private function populateAvailableType(ContainerBuilder $container, string $id,
     /**
      * Associates a type and a service id if applicable.
      */
-    private function set(string $type, string $id)
+    private function set(string $type, string $id): void
     {
         // is this already a type/class that is known to match multiple services?
         if (isset($this->ambiguousServiceTypes[$type])) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
index 6173688ca0dd7..1fb8935c3e102 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
@@ -31,6 +31,8 @@ class CheckCircularReferencesPass implements CompilerPassInterface
 
     /**
      * Checks the ContainerBuilder object for circular references.
+     *
+     * @return void
      */
     public function process(ContainerBuilder $container)
     {
@@ -51,7 +53,7 @@ public function process(ContainerBuilder $container)
      *
      * @throws ServiceCircularReferenceException when a circular reference is found
      */
-    private function checkOutEdges(array $edges)
+    private function checkOutEdges(array $edges): void
     {
         foreach ($edges as $edge) {
             $node = $edge->getDestNode();
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
index 47b6c1518fbba..b7ee4b6973ddb 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
@@ -34,6 +34,8 @@ class CheckDefinitionValidityPass implements CompilerPassInterface
      * Processes the ContainerBuilder to validate the Definition.
      *
      * @throws RuntimeException When the Definition is invalid
+     *
+     * @return void
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
index 622f58a92ddfa..6e86da0d576d0 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
@@ -25,6 +25,9 @@ class CheckExceptionOnInvalidReferenceBehaviorPass extends AbstractRecursivePass
 {
     private array $serviceLocatorContextIds = [];
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $this->serviceLocatorContextIds = [];
@@ -34,7 +37,7 @@ public function process(ContainerBuilder $container)
         }
 
         try {
-            return parent::process($container);
+            parent::process($container);
         } finally {
             $this->serviceLocatorContextIds = [];
         }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
index 43f6348c32e13..c8cbccb4b9cdf 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
@@ -41,6 +41,9 @@ public function getServiceReferenceGraph(): ServiceReferenceGraph
         return $this->serviceReferenceGraph;
     }
 
+    /**
+     * @return void
+     */
     public function addPass(CompilerPassInterface $pass, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
     {
         $this->passConfig->addPass($pass, $type, $priority);
@@ -48,6 +51,8 @@ public function addPass(CompilerPassInterface $pass, string $type = PassConfig::
 
     /**
      * @final
+     *
+     * @return void
      */
     public function log(CompilerPassInterface $pass, string $message)
     {
@@ -65,6 +70,8 @@ public function getLog(): array
 
     /**
      * Run the Compiler and process all Passes.
+     *
+     * @return void
      */
     public function compile(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
index 58b5e05b4040f..9c1d7e218e2fc 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -27,6 +27,9 @@
  */
 class DecoratorServicePass extends AbstractRecursivePass
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $definitions = new \SplPriorityQueue();
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php
index 7a6283841a78f..953b7f942e8b3 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php
@@ -21,6 +21,9 @@
  */
 class ExtensionCompilerPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         foreach ($container->getExtensions() as $extension) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
index 951f2542304b2..f4eb931412a1f 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -37,6 +37,9 @@ public function __construct(AnalyzeServiceReferencesPass $analyzingPass = null)
         $this->analyzingPass = $analyzingPass;
     }
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $this->container = $container;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
index 3391f15616787..cd8ebfe0f72e0 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
@@ -29,6 +29,9 @@
  */
 class MergeExtensionConfigurationPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $parameters = $container->getParameterBag()->all();
@@ -106,7 +109,7 @@ public function __construct(parent $parameterBag)
         $this->mergeEnvPlaceholders($parameterBag);
     }
 
-    public function freezeAfterProcessing(Extension $extension, ContainerBuilder $container)
+    public function freezeAfterProcessing(Extension $extension, ContainerBuilder $container): void
     {
         if (!$config = $extension->getProcessedConfigs()) {
             // Extension::processConfiguration() wasn't called, we cannot know how configs were merged
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 624a97db8ae0a..75753185247c5 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -122,6 +122,8 @@ public function getPasses(): array
      * Adds a pass.
      *
      * @throws InvalidArgumentException when a pass type doesn't exist
+     *
+     * @return void
      */
     public function addPass(CompilerPassInterface $pass, string $type = self::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
     {
@@ -196,6 +198,9 @@ public function getMergePass(): CompilerPassInterface
         return $this->mergePass;
     }
 
+    /**
+     * @return void
+     */
     public function setMergePass(CompilerPassInterface $pass)
     {
         $this->mergePass = $pass;
@@ -205,6 +210,8 @@ public function setMergePass(CompilerPassInterface $pass)
      * Sets the AfterRemoving passes.
      *
      * @param CompilerPassInterface[] $passes
+     *
+     * @return void
      */
     public function setAfterRemovingPasses(array $passes)
     {
@@ -215,6 +222,8 @@ public function setAfterRemovingPasses(array $passes)
      * Sets the BeforeOptimization passes.
      *
      * @param CompilerPassInterface[] $passes
+     *
+     * @return void
      */
     public function setBeforeOptimizationPasses(array $passes)
     {
@@ -225,6 +234,8 @@ public function setBeforeOptimizationPasses(array $passes)
      * Sets the BeforeRemoving passes.
      *
      * @param CompilerPassInterface[] $passes
+     *
+     * @return void
      */
     public function setBeforeRemovingPasses(array $passes)
     {
@@ -235,6 +246,8 @@ public function setBeforeRemovingPasses(array $passes)
      * Sets the Optimization passes.
      *
      * @param CompilerPassInterface[] $passes
+     *
+     * @return void
      */
     public function setOptimizationPasses(array $passes)
     {
@@ -245,6 +258,8 @@ public function setOptimizationPasses(array $passes)
      * Sets the Removing passes.
      *
      * @param CompilerPassInterface[] $passes
+     *
+     * @return void
      */
     public function setRemovingPasses(array $passes)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterAutoconfigureAttributesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterAutoconfigureAttributesPass.php
index ab9227e8ad5bf..576bb9376e6c6 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RegisterAutoconfigureAttributesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RegisterAutoconfigureAttributesPass.php
@@ -26,7 +26,7 @@ final class RegisterAutoconfigureAttributesPass implements CompilerPassInterface
 {
     private static $registerForAutoconfiguration;
 
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         foreach ($container->getDefinitions() as $id => $definition) {
             if ($this->accept($definition) && $class = $container->getReflectionClass($definition->getClass(), false)) {
@@ -40,7 +40,7 @@ public function accept(Definition $definition): bool
         return $definition->isAutoconfigured() && !$definition->hasTag('container.ignore_attributes');
     }
 
-    public function processClass(ContainerBuilder $container, \ReflectionClass $class)
+    public function processClass(ContainerBuilder $container, \ReflectionClass $class): void
     {
         foreach ($class->getAttributes(Autoconfigure::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
             self::registerForAutoconfiguration($container, $class, $attribute);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
index 0973164dbb2cf..2a706bfe5ef7f 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RegisterEnvVarProcessorsPass.php
@@ -27,6 +27,9 @@ class RegisterEnvVarProcessorsPass implements CompilerPassInterface
 {
     private const ALLOWED_TYPES = ['array', 'bool', 'float', 'int', 'string', \BackedEnum::class];
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $bag = $container->getParameterBag();
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterReverseContainerPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterReverseContainerPass.php
index 8f07c4b53d513..aa4cca3571754 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RegisterReverseContainerPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RegisterReverseContainerPass.php
@@ -29,6 +29,9 @@ public function __construct(bool $beforeRemoving)
         $this->beforeRemoving = $beforeRemoving;
     }
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('reverse_container')) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php
index 04b6852fab345..d0ebfcc509128 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php
@@ -20,6 +20,8 @@ class RemoveAbstractDefinitionsPass implements CompilerPassInterface
 {
     /**
      * Removes abstract definitions from the ContainerBuilder.
+     *
+     * @return void
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveBuildParametersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveBuildParametersPass.php
index 44d9fa8c64225..75e714475cbcc 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RemoveBuildParametersPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveBuildParametersPass.php
@@ -20,6 +20,9 @@ class RemoveBuildParametersPass implements CompilerPassInterface
      */
     private array $removedParameters = [];
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $parameterBag = $container->getParameterBag();
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php
index 75b36d227eab3..93c3fd267225d 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RemovePrivateAliasesPass.php
@@ -24,6 +24,8 @@ class RemovePrivateAliasesPass implements CompilerPassInterface
 {
     /**
      * Removes private aliases from the ContainerBuilder.
+     *
+     * @return void
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
index 41acfb276e20a..df97a62f7e0ab 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
@@ -26,6 +26,8 @@ class RemoveUnusedDefinitionsPass extends AbstractRecursivePass
 
     /**
      * Processes the ContainerBuilder to remove unused definitions.
+     *
+     * @return void
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
index ce4c2d321e836..22278bc607159 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -30,6 +30,8 @@ class ReplaceAliasByActualDefinitionPass extends AbstractRecursivePass
      * Process the Container to replace aliases with service definitions.
      *
      * @throws InvalidArgumentException if the service definition does not exist
+     *
+     * @return void
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
index 6f9ea2efd603d..55a358efdf8bc 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
@@ -32,6 +32,9 @@ class ResolveBindingsPass extends AbstractRecursivePass
     private array $unusedBindings = [];
     private array $errorMessages = [];
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $this->usedBindings = $container->getRemovedBindingIds();
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php
index a679e3ab9b663..468837672e15b 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveClassPass.php
@@ -20,6 +20,9 @@
  */
 class ResolveClassPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         foreach ($container->getDefinitions() as $id => $definition) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDecoratorStackPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDecoratorStackPass.php
index 48def28009d16..da02622b217db 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDecoratorStackPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDecoratorStackPass.php
@@ -24,6 +24,9 @@
  */
 class ResolveDecoratorStackPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $stacks = [];
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php
index 6b1a27e5a7cb6..b
741A
ffb9dab85c65 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php
@@ -25,6 +25,9 @@ class ResolveHotPathPass extends AbstractRecursivePass
 {
     private array $resolvedIds = [];
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         try {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
index 2e404244ffa71..88d6fa01fd3d1 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -24,6 +24,9 @@
  */
 class ResolveInstanceofConditionalsPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         foreach ($container->getAutoconfiguredInstanceof() as $interface => $definition) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php
index 87b72662b64fc..7a2a69aa6acc2 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php
@@ -35,6 +35,8 @@ class ResolveInvalidReferencesPass implements CompilerPassInterface
 
     /**
      * Process the ContainerBuilder to resolve invalid references.
+     *
+     * @return void
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php
index c105721cddb54..3302dd2cd21c6 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php
@@ -26,6 +26,9 @@ class ResolveNoPreloadPass extends AbstractRecursivePass
 
     private array $resolvedIds = [];
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $this->container = $container;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
index 6bca33da6d0ad..2c0e330abb798 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
@@ -33,6 +33,8 @@ public function __construct(
 
     /**
      * @throws ParameterNotFoundException
+     *
+     * @return void
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
index a9eca5bba37e9..3176d405f8eff 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
@@ -22,6 +22,9 @@
  */
 class ResolveReferencesToAliasesPass extends AbstractRecursivePass
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         parent::process($container);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
index 28931f0b3e102..c90fc7ac5618d 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
@@ -63,7 +63,7 @@ public function getNodes(): array
     /**
      * Clears all nodes.
      */
-    public function clear()
+    public function clear(): void
     {
         foreach ($this->nodes as $node) {
             $node->clear();
@@ -74,7 +74,7 @@ public function clear()
     /**
      * Connects 2 nodes together in the Graph.
      */
-    public function connect(?string $sourceId, mixed $sourceValue, ?string $destId, mixed $destValue = null, Reference $reference = null, bool $lazy = false, bool $weak = false, bool $byConstructor = false)
+    public function connect(?string $sourceId, mixed $sourceValue, ?string $destId, mixed $destValue = null, Reference $reference = null, bool $lazy = false, bool $weak = false, bool $byConstructor = false): void
     {
         if (null === $sourceId || null === $destId) {
             return;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
index 1562e19666d8f..e7f42f87dbe2a 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
@@ -34,11 +34,17 @@ public function __construct(string $id, mixed $value)
         $this->value = $value;
     }
 
+    /**
+     * @return void
+     */
     public function addInEdge(ServiceReferenceGraphEdge $edge)
     {
         $this->inEdges[] = $edge;
     }
 
+    /**
+     * @return void
+     */
     public function addOutEdge(ServiceReferenceGraphEdge $edge)
     {
         $this->outEdges[] = $edge;
@@ -98,6 +104,8 @@ public function getValue(): mixed
 
     /**
      * Clears all edges.
+     *
+     * @return void
      */
     public function clear()
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
index 0aa1a4acaae01..2d6542660b39c 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
@@ -30,6 +30,9 @@ class ValidateEnvPlaceholdersPass implements CompilerPassInterface
 
     private array $extensionConfig = [];
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $this->extensionConfig = [];
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index ff10702229dc6..05df65cfe8e04 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -78,6 +78,8 @@ public function __construct(ParameterBagInterface $parameterBag = null)
      *
      *  * Parameter values are resolved;
      *  * The parameter bag is frozen.
+     *
+     * @return void
      */
     public function compile()
     {
@@ -124,6 +126,9 @@ public function hasParameter(string $name): bool
         return $this->parameterBag->has($name);
     }
 
+    /**
+     * @return void
+     */
     public function setParameter(string $name, array|bool|string|int|float|\UnitEnum|null $value)
     {
         $this->parameterBag->set($name, $value);
@@ -134,6 +139,8 @@ public function setParameter(string $name, array|bool|string|int|float|\UnitEnum
      *
      * Setting a synthetic service to null resets it: has() returns false and get()
      * behaves in the same way as if the service was never created.
+     *
+     * @return void
      */
     public function set(string $id, ?object $service)
     {
@@ -275,6 +282,9 @@ public function initialized(string $id): bool
         return isset($this->services[$id]);
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $services = $this->services + $this->privates;
diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
index 122fa07d10281..ac67b468c55a9 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
@@ -23,6 +23,9 @@ trait ContainerAwareTrait
      */
     protected $container;
 
+    /**
+     * @return void
+     */
     public function setContainer(ContainerInterface $container = null)
     {
         if (1 > \func_num_args()) {
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 9b4a7c0fd007d..2329ad570bd4f 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -172,6 +172,8 @@ public function __construct(ParameterBagInterface $parameterBag = null)
      *
      * If you are not using the loaders and therefore don't want
      * to depend on the Config component, set this flag to false.
+     *
+     * @return void
      */
     public function setResourceTracking(bool $track)
     {
@@ -188,12 +190,17 @@ public function isTrackingResources(): bool
 
     /**
      * Sets the instantiator to be used when fetching proxies.
+     *
+     * @return void
      */
     public function setProxyInstantiator(InstantiatorInterface $proxyInstantiator)
     {
         $this->proxyInstantiator = $proxyInstantiator;
     }
 
+    /**
+     * @return void
+     */
     public function registerExtension(ExtensionInterface $extension)
     {
         $this->extensions[$extension->getAlias()] = $extension;
@@ -473,6 +480,8 @@ public function getCompiler(): Compiler
      * Sets a service.
      *
      * @throws BadMethodCallException When this ContainerBuilder is compiled
+     *
+     * @return void
      */
     public function set(string $id, ?object $service)
     {
@@ -488,6 +497,8 @@ public function set(string $id, ?object $service)
 
     /**
      * Removes a service definition.
+     *
+     * @return void
      */
     public function removeDefinition(string $id)
     {
@@ -598,6 +609,8 @@ private function doGet(string $id, int $invalidBehavior = ContainerInterface::EX
      * constructor.
      *
      * @throws BadMethodCallException When this ContainerBuilder is compiled
+     *
+     * @return void
      */
     public function merge(self $container)
     {
@@ -688,6 +701,8 @@ public function getExtensionConfig(string $name): array
      * Prepends a config array to the configs of the given extension.
      *
      * @param array<string, mixed> $config
+     *
+     * @return void
      */
     public function prependExtensionConfig(string $name, array $config)
     {
@@ -730,6 +745,8 @@ public function deprecateParameter(string $name, string $package, string $versio
      *                                     env vars or be replaced by uniquely identifiable placeholders.
      *                                     Set to "true" when you want to use the current ContainerBuilder
      *                                     directly, keep to "false" when the container is dumped instead.
+     *
+     * @return void
      */
     public function compile(bool $resolveEnvPlaceholders = false)
     {
@@ -792,6 +809,8 @@ public function getRemovedIds(): array
      * Adds the service aliases.
      *
      * @param array<string, string|Alias> $aliases
+     *
+     * @return void
      */
     public function addAliases(array $aliases)
     {
@@ -804,6 +823,8 @@ public function addAliases(array $aliases)
      * Sets the service aliases.
      *
      * @param array<string, string|Alias> $aliases
+     *
+     * @return void
      */
     public function setAliases(array $aliases)
     {
@@ -836,6 +857,9 @@ public function setAlias(string $alias, string|Alias $id): Alias
         return $this->aliasDefinitions[$alias] = $id;
     }
 
+    /**
+     * @return void
+     */
     public function removeAlias(string $alias)
     {
         if (isset($this->aliasDefinitions[$alias])) {
@@ -895,6 +919,8 @@ public function autowire(string $id, string $class = null): Definition
      * Adds the service definitions.
      *
      * @param array<string, Definition> $definitions
+     *
+     * @return void
      */
     public function addDefinitions(array $definitions)
     {
@@ -907,6 +933,8 @@ public function addDefinitions(array $definitions)
      * Sets the service definitions.
      *
      * @param array<string, Definition> $definitions
+     *
+     * @return void
      */
     public function setDefinitions(array $definitions)
     {
@@ -1272,6 +1300,9 @@ public function findUnusedTags(): array
         return array_values(array_diff($this->findTags(), $this->usedTags));
     }
 
+    /**
+     * @return void
+     */
     public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
     {
         $this->expressionLanguageProviders[] = $provider;
@@ -1442,7 +1473,7 @@ public function getEnvCounters(): array
     /**
      * @final
      */
-    public function log(CompilerPassInterface $pass, string $message)
+    public function log(CompilerPassInterface $pass, string $message): void
     {
         $this->getCompiler()->log($pass, $this->resolveEnvPlaceholders($message));
     }
@@ -1503,7 +1534,7 @@ public function getRemovedBindingIds(): array
      *
      * @internal
      */
-    public function removeBindings(string $id)
+    public function removeBindings(string $id): void
     {
         if ($this->hasDefinition($id)) {
             foreach ($this->getDefinition($id)->getBindings() as $key => $binding) {
@@ -1610,7 +1641,7 @@ private function callMethod(object $service, array $call, array &$inlineServices
         return empty($call[2]) ? $service : $result;
     }
 
-    private function shareService(Definition $definition, mixed $service, ?string $id, array &$inlineServices)
+    private function shareService(Definition $definition, mixed $service, ?string $id, array &$inlineServices): void
     {
         $inlineServices[$id ?? spl_object_hash($definition)] = $service;
 
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 1782d622c2f2f..667c23c4dc600 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -106,6 +106,8 @@ public function __construct(ContainerBuilder $container)
 
     /**
      * Sets the dumper to be used when dumping proxies in the generated container.
+     *
+     * @return void
      */
     public function setProxyDumper(DumperInterface $proxyDumper)
     {
@@ -421,7 +423,7 @@ private function getProxyDumper(): DumperInterface
         return $this->proxyDumper ??= new LazyServiceDumper($this->class);
     }
 
-    private function analyzeReferences()
+    private function analyzeReferences(): void
     {
         (new AnalyzeServiceReferencesPass(false, $this->hasProxyDumper))->process($this->container);
         $checkedNodes = [];
@@ -508,7 +510,7 @@ private function collectCircularReferences(string $sourceId, array $edges, array
         unset($path[$sourceId]);
     }
 
-    private function addCircularReferences(string $sourceId, array $currentPath, bool $byConstructor)
+    private function addCircularReferences(string $sourceId, array $currentPath, bool $byConstructor): void
     {
         $currentId = $sourceId;
         $currentPath = array_reverse($currentPath);
@@ -522,7 +524,7 @@ private function addCircularReferences(string $sourceId, array $currentPath, boo
         }
     }
 
-    private function collectLineage(string $class, array &$lineage)
+    private function collectLineage(string $class, array &$lineage): void
     {
         if (isset($lineage[$class])) {
             return;
@@ -2048,7 +2050,7 @@ private function getServiceCall(string $id, Reference $reference = null): string
     /**
      * Initializes the method names map to avoid conflicts with the Container methods.
      */
-    private function initializeMethodNamesMap(string $class)
+    private function initializeMethodNamesMap(string $class): void
     {
         $this->serviceIdToMethodNameMap = [];
         $this->usedMethodNames = [];
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
index 28ba4e647ba84..9ceeee09e5c0d 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -56,7 +56,7 @@ public function dump(array $options = []): string
         return $this->container->resolveEnvPlaceholders($xml);
     }
 
-    private function addParameters(\DOMElement $parent)
+    private function addParameters(\DOMElement $parent): void
     {
         $data = $this->container->getParameterBag()->all();
         if (!$data) {
@@ -72,7 +72,7 @@ private function addParameters(\DOMElement $parent)
         $this->convertParameters($data, 'parameter', $parameters);
     }
 
-    private function addMethodCalls(array $methodcalls, \DOMElement $parent)
+    private function addMethodCalls(array $methodcalls, \DOMElement $parent): void
     {
         foreach ($methodcalls as $methodcall) {
             $call = $this->document->createElement('call');
@@ -87,7 +87,7 @@ private function addMethodCalls(array $methodcalls, \DOMElement $parent)
         }
     }
 
-    private function addService(Definition $definition, ?string $id, \DOMElement $parent)
+    private function addService(Definition $definition, ?string $id, \DOMElement $parent): void
     {
         $service = $this->document->createElement('service');
         if (null !== $id) {
@@ -223,7 +223,7 @@ private function addService(Definition $definition, ?string $id, \DOMElement $pa
         $parent->appendChild($service);
     }
 
-    private function addServiceAlias(string $alias, Alias $id, \DOMElement $parent)
+    private function addServiceAlias(string $alias, Alias $id, \DOMElement $parent): void
     {
         $service = $this->document->createElement('service');
         $service->setAttribute('id', $alias);
@@ -245,7 +245,7 @@ private function addServiceAlias(string $alias, Alias $id, \DOMElement $parent)
         $parent->appendChild($service);
     }
 
-    private function addServices(\DOMElement $parent)
+    private function addServices(\DOMElement $parent): void
     {
         $definitions = $this->container->getDefinitions();
         if (!$definitions) {
@@ -267,7 +267,7 @@ private function addServices(\DOMElement $parent)
         $parent->appendChild($services);
     }
 
-    private function addTagRecursiveAttributes(\DOMElement $parent, array $attributes)
+    private function addTagRecursiveAttributes(\DOMElement $parent, array $attributes): void
     {
         foreach ($attributes as $name => $value) {
             $attribute = $this->document->createElement('attribute');
@@ -283,7 +283,7 @@ private function addTagRecursiveAttributes(\DOMElement $parent, array $attribute
         }
     }
 
-    private function convertParameters(array $parameters, string $type, \DOMElement $parent, string $keyAttribute = 'key')
+    private function convertParameters(array $parameters, string $type, \DOMElement $parent, string $keyAttribute = 'key'): void
     {
         $withKeys = !array_is_list($parameters);
         foreach ($parameters as $key => $value) {
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
index 89966648f7247..69f7b3a50cdd9 100644
--- a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
+++ b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
@@ -47,6 +47,9 @@ public function __construct(string $key, string $sourceId = null, string $source
         $this->updateRepr();
     }
 
+    /**
+     * @return void
+     */
     public function updateRepr()
     {
         if (null !== $this->sourceId) {
@@ -95,6 +98,9 @@ public function getSourceKey()
         return $this->sourceKey;
     }
 
+    /**
+     * @return void
+     */
     public function setSourceId(?string $sourceId)
     {
         $this->sourceId = $sourceId;
@@ -102,6 +108,9 @@ public function setSourceId(?string $sourceId)
         $this->updateRepr();
     }
 
+    /**
+     * @return void
+     */
     public function setSourceKey(?string $sourceKey)
     {
         $this->sourceKey = $sourceKey;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
index f98ee506d0032..a2d3558d4439c 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
@@ -48,7 +48,7 @@ public function __construct(ContainerBuilder $container, PhpFileLoader $loader,
         $this->env = $env;
     }
 
-    final public function extension(string $namespace, array $config)
+    final public function extension(string $namespace, array $config): void
     {
         if (!$this->container->hasExtension($namespace)) {
             $extensions = array_filter(array_map(fn (ExtensionInterface $ext) => $ext->getAlias(), $this->container->getExtensions()));
@@ -58,7 +58,7 @@ final public function extension(string $namespace, array $config)
         $this->container->loadFromExtension($namespace, static::processValue($config));
     }
 
-    final public function import(string $resource, string $type = null, bool|string $ignoreErrors = false)
+    final public function import(string $resource, string $type = null, bool|string $ignoreErrors = false): void
     {
         $this->loader->setCurrentDir(\dirname($this->path));
         $this->loader->import($resource, $type, $ignoreErrors, $this->file);
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
index 6cb1e6ffdb4e1..d6b046c9f6982 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -89,6 +89,8 @@ public function import(mixed $resource, string $type = null, bool|string $ignore
      * @param string               $resource  The directory to look for classes, glob-patterns allowed
      * @param string|string[]|null $exclude   A globbed path of files to exclude or an array of globbed paths of files to exclude
      * @param string|null          $source    The path to the file that defines the auto-discovery rule
+     *
+     * @return void
      */
     public function registerClasses(Definition $prototype, string $namespace, string $resource, string|array $exclude = null/* , string $source = null */)
     {
@@ -149,6 +151,9 @@ public function registerClasses(Definition $prototype, string $namespace, string
         }
     }
 
+    /**
+     * @return void
+     */
     public function registerAliasesForSinglyImplementedInterfaces()
     {
         foreach ($this->interfaces as $interface) {
@@ -162,6 +167,8 @@ public function registerAliasesForSinglyImplementedInterfaces()
 
     /**
      * Registers a definition in the container with its instanceof-conditionals.
+     *
+     * @return void
      */
     protected function setDefinition(string $id, Definition $definition)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
index 65b1c2d0651e5..e56fb51560932 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -87,7 +87,7 @@ public function supports(mixed $resource, string $type = null): bool
     /**
      * Resolve the parameters to the $callback and execute it.
      */
-    private function executeCallback(callable $callback, ContainerConfigurator $containerConfigurator, string $path)
+    private function executeCallback(callable $callback, ContainerConfigurator $containerConfigurator, string $path): void
     {
         $callback = $callback(...);
         $arguments = [];
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 9bf4955d15ece..7dc85a69a1a0c 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -105,14 +105,14 @@ public function supports(mixed $resource, string $type = null): bool
         return 'xml' === $type;
     }
 
-    private function parseParameters(\DOMDocument $xml, string $file, \DOMNode $root = null)
+    private function parseParameters(\DOMDocument $xml, string $file, \DOMNode $root = null): void
     {
         if ($parameters = $this->getChildren($root ?? $xml->documentElement, 'parameters')) {
             $this->container->getParameterBag()->add($this->getArgumentsAsPhp($parameters[0], 'parameter', $file));
         }
     }
 
-    private function parseImports(\DOMDocument $xml, string $file, \DOMNode $root = null)
+    private function parseImports(\DOMDocument $xml, string $file, \DOMNode $root = null): void
     {
         $xpath = new \DOMXPath($xml);
         $xpath->registerNamespace('container', self::NS);
@@ -128,7 +128,7 @@ private function parseImports(\DOMDocument $xml, string $file, \DOMNode $root =
         }
     }
 
-    private function parseDefinitions(\DOMDocument $xml, string $file, Definition $defaults, \DOMNode $root = null)
+    private function parseDefinitions(\DOMDocument $xml, string $file, Definition $defaults, \DOMNode $root = null): void
     {
         $xpath = new \DOMXPath($xml);
         $xpath->registerNamespace('container', self::NS);
@@ -413,7 +413,7 @@ private function parseFileToDOM(string $file): \DOMDocument
     /**
      * Processes anonymous services.
      */
-    private function processAnonymousServices(\DOMDocument $xml, string $file, \DOMNode $root = null)
+    private function processAnonymousServices(\DOMDocument $xml, string $file, \DOMNode $root = null): void
     {
         $definitions = [];
         $count = 0;
@@ -725,7 +725,7 @@ private function shouldEnableEntityLoader(): bool
         return !@$dom->schemaValidateSource($schema);
     }
 
-    private function validateAlias(\DOMElement $alias, string $file)
+    private function validateAlias(\DOMElement $alias, string $file): void
     {
         foreach ($alias->attributes as $name => $node) {
             if (!\in_array($name, ['alias', 'id', 'public'])) {
@@ -748,7 +748,7 @@ private function validateAlias(\DOMElement $alias, string $file)
      *
      * @throws InvalidArgumentException When no extension is found corresponding to a tag
      */
-    private function validateExtensions(\DOMDocument $dom, string $file)
+    private function validateExtensions(\DOMDocument $dom, string $file): void
     {
         foreach ($dom->documentElement->childNodes as $node) {
             if (!$node instanceof \DOMElement || 'http://symfony.com/schema/dic/services' === $node->namespaceURI) {
@@ -766,7 +766,7 @@ private function validateExtensions(\DOMDocument $dom, string $file)
     /**
      * Loads from an extension.
      */
-    private function loadFromExtensions(\DOMDocument $xml)
+    private function loadFromExtensions(\DOMDocument $xml): void
     {
         foreach ($xml->documentElement->childNodes as $node) {
             if (!$node instanceof \DOMElement || self::NS === $node->namespaceURI) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 3819793475079..650bbe3556239 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -146,7 +146,7 @@ public function load(mixed $resource, string $type = null): mixed
         return null;
     }
 
-    private function loadContent(array $content, string $path)
+    private function loadContent(array $content, string $path): void
     {
         // imports
         $this->parseImports($content, $path);
@@ -190,7 +190,7 @@ public function supports(mixed $resource, string $type = null): bool
         return \in_array($type, ['yaml', 'yml'], true);
     }
 
-    private function parseImports(array $content, string $file)
+    private function parseImports(array $content, string $file): void
     {
         if (!isset($content['imports'])) {
             return;
@@ -214,7 +214,7 @@ private function parseImports(array $content, string $file)
         }
     }
 
-    private function parseDefinitions(array $content, string $file, bool $trackBindings = true)
+    private function parseDefinitions(array $content, string $file, bool $trackBindings = true): void
     {
         if (!isset($content['services'])) {
             return;
@@ -909,7 +909,7 @@ private function resolveServices(mixed $value, string $file, bool $isParameter =
         return $value;
     }
 
-    private function loadFromExtensions(array $c
F438
ontent)
+    private function loadFromExtensions(array $content): void
     {
         foreach ($content as $namespace => $values) {
             if (\in_array($namespace, ['imports', 'parameters', 'services']) || str_starts_with($namespace, 'when@')) {
@@ -924,7 +924,7 @@ private function loadFromExtensions(array $content)
         }
     }
 
-    private function checkDefinition(string $id, array $definition, string $file)
+    private function checkDefinition(string $id, array $definition, string $file): void
     {
         if ($this->isLoadingInstanceof) {
             $keywords = self::INSTANCEOF_KEYWORDS;
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
index be6f481dd4420..9c66e1f944166 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -87,6 +87,9 @@ public function getUnusedEnvPlaceholders(): array
         return $this->unusedEnvPlaceholders;
     }
 
+    /**
+     * @return void
+     */
     public function clearUnusedEnvPlaceholders()
     {
         $this->unusedEnvPlaceholders = [];
@@ -94,6 +97,8 @@ public function clearUnusedEnvPlaceholders()
 
     /**
      * Merges the env placeholders of another EnvPlaceholderParameterBag.
+     *
+     * @return void
      */
     public function mergeEnvPlaceholders(self $bag)
     {
@@ -116,6 +121,8 @@ public function mergeEnvPlaceholders(self $bag)
 
     /**
      * Maps env prefixes to their corresponding PHP types.
+     *
+     * @return void
      */
     public function setProvidedTypes(array $providedTypes)
     {
@@ -132,6 +139,9 @@ public function getProvidedTypes(): array
         return $this->providedTypes;
     }
 
+    /**
+     * @return void
+     */
     public function resolve()
     {
         if ($this->resolved) {
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
index 97656011d3fbd..0ad11194dd544 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
@@ -31,11 +31,17 @@ public function __construct(array $parameters = [])
         $this->add($parameters);
     }
 
+    /**
+     * @return void
+     */
     public function clear()
     {
         $this->parameters = [];
     }
 
+    /**
+     * @return void
+     */
     public function add(array $parameters)
     {
         foreach ($parameters as $key => $value) {
@@ -94,6 +100,9 @@ public function get(string $name): array|bool|string|int|float|\UnitEnum|null
         return $this->parameters[$name];
     }
 
+    /**
+     * @return void
+     */
     public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value)
     {
         if (is_numeric($name)) {
@@ -109,6 +118,8 @@ public function set(string $name, array|bool|string|int|float|\UnitEnum|null $va
      * Deprecates a service container parameter.
      *
      * @throws ParameterNotFoundException if the parameter is not defined
+     *
+     * @return void
      */
     public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.')
     {
@@ -124,11 +135,17 @@ public function has(string $name): bool
         return \array_key_exists($name, $this->parameters);
     }
 
+    /**
+     * @return void
+     */
     public function remove(string $name)
     {
         unset($this->parameters[$name], $this->deprecatedParameters[$name]);
     }
 
+    /**
+     * @return void
+     */
     public function resolve()
     {
         if ($this->resolved) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
index b7ea0f4ac84bb..bfe002a514e35 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
@@ -372,7 +372,7 @@ public function testDecoratorsKeepBehaviorDescribingTags()
 
 class DecoratorWithBehavior implements ResetInterface, ResourceCheckerInterface, ServiceSubscriberInterface
 {
-    public function reset()
+    public function reset(): void
     {
     }
 
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index 2cce1e9b988a3..02e3915d2eb20 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -91,6 +91,8 @@ public function getBaseHref(): ?string
 
     /**
      * Removes all the nodes.
+     *
+     * @return void
      */
     public function clear()
     {
@@ -108,6 +110,8 @@ public function clear()
      * @param \DOMNodeList|\DOMNode|\DOMNode[]|string|null $node A node
      *
      * @throws \InvalidArgumentException when node is not the expected type
+     *
+     * @return void
      */
     public function add(\DOMNodeList|\DOMNode|array|string|null $node)
     {
@@ -130,6 +134,8 @@ public function add(\DOMNodeList|\DOMNode|array|string|null $node)
      * If the charset is not set via the content type, it is assumed to be UTF-8,
      * or ISO-8859-1 as a fallback, which is the default charset defined by the
      * HTTP 1.1 specification.
+     *
+     * @return void
      */
     public function addContent(string $content, string $type = null)
     {
@@ -170,6 +176,8 @@ public function addContent(string $content, string $type = null)
      * internal errors via libxml_use_internal_errors(true)
      * and then, get the errors via libxml_get_errors(). Be
      * sure to clear errors with libxml_clear_errors() afterward.
+     *
+     * @return void
      */
     public function addHtmlContent(string $content, string $charset = 'UTF-8')
     {
@@ -204,6 +212,8 @@ public function addHtmlContent(string $content, string $charset = 'UTF-8')
      * @param int $options Bitwise OR of the libxml option constants
      *                     LIBXML_PARSEHUGE is dangerous, see
      *                     http://symfony.com/blog/security-release-symfony-2-0-17-released
+     *
+     * @return void
      */
     public function addXmlContent(string $content, string $charset = 'UTF-8', int $options = \LIBXML_NONET)
     {
@@ -232,6 +242,8 @@ public function addXmlContent(string $content, string $charset = 'UTF-8', int $o
      * Adds a \DOMDocument to the list of nodes.
      *
      * @param \DOMDocument $dom A \DOMDocument instance
+     *
+     * @return void
      */
     public function addDocument(\DOMDocument $dom)
     {
@@ -244,6 +256,8 @@ public function addDocument(\DOMDocument $dom)
      * Adds a \DOMNodeList to the list of nodes.
      *
      * @param \DOMNodeList $nodes A \DOMNodeList instance
+     *
+     * @return void
      */
     public function addNodeList(\DOMNodeList $nodes)
     {
@@ -258,6 +272,8 @@ public function addNodeList(\DOMNodeList $nodes)
      * Adds an array of \DOMNode instances to the list of nodes.
      *
      * @param \DOMNode[] $nodes An array of \DOMNode instances
+     *
+     * @return void
      */
     public function addNodes(array $nodes)
     {
@@ -270,6 +286,8 @@ public function addNodes(array $nodes)
      * Adds a \DOMNode instance to the list of nodes.
      *
      * @param \DOMNode $node A \DOMNode instance
+     *
+     * @return void
      */
     public function addNode(\DOMNode $node)
     {
@@ -862,12 +880,17 @@ public function form(array $values = null, string $method = null): Form
 
     /**
      * Overloads a default namespace prefix to be used with XPath and CSS expressions.
+     *
+     * @return void
      */
     public function setDefaultNamespacePrefix(string $prefix)
     {
         $this->defaultNamespacePrefix = $prefix;
     }
 
+    /**
+     * @return void
+     */
     public function registerNamespace(string $prefix, string $namespace)
     {
         $this->namespaces[$prefix] = $namespace;
diff --git a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
index e16e81bb516af..58aff3613e826 100644
--- a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
@@ -60,6 +60,8 @@ public function isDisabled(): bool
 
     /**
      * Sets the value of the field.
+     *
+     * @return void
      */
     public function select(string|array|bool $value)
     {
@@ -70,6 +72,8 @@ public function select(string|array|bool $value)
      * Ticks a checkbox.
      *
      * @throws \LogicException When the type provided is not correct
+     *
+     * @return void
      */
     public function tick()
     {
@@ -84,6 +88,8 @@ public function tick()
      * Unticks a checkbox.
      *
      * @throws \LogicException When the type provided is not correct
+     *
+     * @return void
      */
     public function untick()
     {
@@ -98,6 +104,8 @@ public function untick()
      * Sets the value of the field.
      *
      * @throws \InvalidArgumentException When value type provided is not correct
+     *
+     * @return void
      */
     public function setValue(string|array|bool|null $value)
     {
@@ -141,7 +149,7 @@ public function setValue(string|array|bool|null $value)
      *
      * @internal
      */
-    public function addChoice(\DOMElement $node)
+    public function addChoice(\DOMElement $node): void
     {
         if (!$this->multiple && 'radio' !== $this->type) {
             throw new \LogicException(sprintf('Unable to add a choice for "%s" as it is not multiple or is not a radio button.', $this->name));
@@ -175,6 +183,8 @@ public function isMultiple(): bool
      * Initializes the form field.
      *
      * @throws \LogicException When node type is incorrect
+     *
+     * @return void
      */
     protected function initialize()
     {
diff --git a/src/Symfony/Component/DomCrawler/Field/FileFormField.php b/src/Symfony/Component/DomCrawler/Field/FileFormField.php
index bd97e7688ea13..4238e5a73cd66 100644
--- a/src/Symfony/Component/DomCrawler/Field/FileFormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/FileFormField.php
@@ -24,6 +24,8 @@ class FileFormField extends FormField
      * @param int $error The error code (one of UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, or UPLOAD_ERR_EXTENSION)
      *
      * @throws \InvalidArgumentException When error code doesn't exist
+     *
+     * @return void
      */
     public function setErrorCode(int $error)
     {
@@ -37,6 +39,8 @@ public function setErrorCode(int $error)
 
     /**
      * Sets the value of the field.
+     *
+     * @return void
      */
     public function upload(?string $value)
     {
@@ -45,6 +49,8 @@ public function upload(?string $value)
 
     /**
      * Sets the value of the field.
+     *
+     * @return void
      */
     public function setValue(?string $value)
     {
@@ -76,6 +82,8 @@ public function setValue(?string $value)
 
     /**
      * Sets path to the file as string for simulating HTTP request.
+     *
+     * @return void
      */
     public function setFilePath(string $path)
     {
@@ -86,6 +94,8 @@ public function setFilePath(string $path)
      * Initializes the form field.
      *
      * @throws \LogicException When node type is incorrect
+     *
+     * @return void
      */
     protected function initialize()
     {
diff --git a/src/Symfony/Component/DomCrawler/Field/FormField.php b/src/Symfony/Component/DomCrawler/Field/FormField.php
index 2edb1090f68d7..483b08f089379 100644
--- a/src/Symfony/Component/DomCrawler/Field/FormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/FormField.php
@@ -92,6 +92,8 @@ public function getValue(): string|array|null
 
     /**
      * Sets the value of the field.
+     *
+     * @return void
      */
     public function setValue(?string $value)
     {
diff --git a/src/Symfony/Component/DomCrawler/Field/InputFormField.php b/src/Symfony/Component/DomCrawler/Field/InputFormField.php
index 1c3c84d7217be..a7542a7f80152 100644
--- a/src/Symfony/Component/DomCrawler/Field/InputFormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/InputFormField.php
@@ -25,6 +25,8 @@ class InputFormField extends FormField
      * Initializes the form field.
      *
      * @throws \LogicException When node type is incorrect
+     *
+     * @return void
      */
     protected function initialize()
     {
diff --git a/src/Symfony/Component/DomCrawler/Field/TextareaFormField.php b/src/Symfony/Component/DomCrawler/Field/TextareaFormField.php
index 15526e1c259c6..1bf85600ac945 100644
--- a/src/Symfony/Component/DomCrawler/Field/TextareaFormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/TextareaFormField.php
@@ -22,6 +22,8 @@ class TextareaFormField extends FormField
      * Initializes the form field.
      *
      * @throws \LogicException When node type is incorrect
+     *
+     * @return void
      */
     protected function initialize()
     {
diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
index 050bec619bebc..ab644ffa12abf 100644
--- a/src/Symfony/Component/DomCrawler/Form.php
+++ b/src/Symfony/Component/DomCrawler/Form.php
@@ -245,6 +245,8 @@ public function has(string $name): bool
 
     /**
      * Removes a field from the form.
+     *
+     * @return void
      */
     public function remove(string $name)
     {
@@ -265,6 +267,8 @@ public function get(string $name): FormField|array
 
     /**
      * Sets a named field.
+     *
+     * @return void
      */
     public function set(FormField $field)
     {
@@ -350,6 +354,8 @@ public function disableValidation(): static
      * Expects a 'submit' button \DOMElement and finds the corresponding form element, or the form element itself.
      *
      * @throws \LogicException If given node is not a button or input or does not have a form ancestor
+     *
+     * @return void
      */
     protected function setNode(\DOMElement $node)
     {
@@ -386,7 +392,7 @@ protected function setNode(\DOMElement $node)
      * the form node or the entire document depending on whether we need
      * to find non-descendant elements through HTML5 'form' attribute.
      */
-    private function initialize()
+    private function initialize(): void
     {
         $this->fields = new FormFieldRegistry();
 
@@ -436,7 +442,7 @@ private function initialize()
         }
     }
 
-    private function addField(\DOMElement $node)
+    private function addField(\DOMElement $node): void
     {
         if (!$node->hasAttribute('name') || !$node->getAttribute('name')) {
             return;
diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
index 23be0ff61541b..9e15716567243 100644
--- a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
+++ b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
@@ -26,7 +26,7 @@ class FormFieldRegistry
     /**
      * Adds a field to the registry.
      */
-    public function add(FormField $field)
+    public function add(FormField $field): void
     {
         $segments = $this->getSegments($field->getName());
 
@@ -48,7 +48,7 @@ public function add(FormField $field)
     /**
      * Removes a field based on the fully qualified name and its children from the registry.
      */
-    public function remove(string $name)
+    public function remove(string $name): void
     {
         $segments = $this->getSegments($name);
         $target = &$this->fields;
@@ -103,7 +103,7 @@ public function has(string $name): bool
      *
      * @throws \InvalidArgumentException if the field does not exist
      */
-    public function set(string $name, mixed $value)
+    public function set(string $name, mixed $value): void
     {
         $target = &$this->get($name);
         if ((!\is_array($value) && $target instanceof Field\FormField) || $target instanceof Field\ChoiceFormField) {
diff --git a/src/Symfony/Component/DomCrawler/Image.php b/src/Symfony/Component/DomCrawler/Image.php
index e57364151626e..725e3aea38d16 100644
--- a/src/Symfony/Component/DomCrawler/Image.php
+++ b/src/Symfony/Component/DomCrawler/Image.php
@@ -26,6 +26,9 @@ protected function getRawUri(): string
         return $this->node->getAttribute('src');
     }
 
+    /**
+     * @return void
+     */
     protected function setNode(\DOMElement $node)
     {
         if ('img' !== $node->nodeName) {
diff --git a/src/Symfony/Component/DomCrawler/Link.php b/src/Symfony/Component/DomCrawler/Link.php
index 658b4fd8ae779..681a2f7a2362b 100644
--- a/src/Symfony/Component/DomCrawler/Link.php
+++ b/src/Symfony/Component/DomCrawler/Link.php
@@ -23,6 +23,9 @@ protected function getRawUri(): string
         return $this->node->getAttribute('href');
     }
 
+    /**
+     * @return void
+     */
     protected function setNode(\DOMElement $node)
     {
         if ('a' !== $node->nodeName && 'area' !== $node->nodeName && 'link' !== $node->nodeName) {
diff --git a/src/Symfony/Component/Dotenv/Command/DotenvDumpCommand.php b/src/Symfony/Component/Dotenv/Command/DotenvDumpCommand.php
index 0102175a72bef..13d0a51f458b6 100644
--- a/src/Symfony/Component/Dotenv/Command/DotenvDumpCommand.php
+++ b/src/Symfony/Component/Dotenv/Command/DotenvDumpCommand.php
@@ -40,7 +40,7 @@ public function __construct(string $projectDir, string $defaultEnv = null)
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
index b48d1001f7c30..27fd8da339e52 100644
--- a/src/Symfony/Component/Dotenv/Dotenv.php
+++ b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -410,7 +410,7 @@ private function lexNestedExpression(): string
         return $value;
     }
 
-    private function skipEmptyLines()
+    private function skipEmptyLines(): void
     {
         if (preg_match('/(?:\s*+(?:#[^\n]*+)?+)++/A', $this->data, $match, 0, $this->cursor)) {
             $this->moveCursor($match[0]);
@@ -534,7 +534,7 @@ private function resolveVariables(string $value, array $loadedVars): string
         return $value;
     }
 
-    private function moveCursor(string $text)
+    private function moveCursor(string $text): void
     {
         $this->cursor += \strlen($text);
         $this->lineno += substr_count($text, "\n");
diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
index 3439a36264fa3..7aac2332e2b31 100644
--- a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
+++ b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -930,7 +930,7 @@ private function normalizeType(string $type, string $class, ?string $parent, ?\R
     /**
      * Utility method to add #[ReturnTypeWillChange] where php triggers deprecations.
      */
-    private function patchReturnTypeWillChange(\ReflectionMethod $method)
+    private function patchReturnTypeWillChange(\ReflectionMethod $method): void
     {
         if (\count($method->getAttributes(\ReturnTypeWillChange::class))) {
             return;
@@ -958,7 +958,7 @@ private function patchReturnTypeWillChange(\ReflectionMethod $method)
     /**
      * Utility method to add @return annotations to the Symfony code-base where it triggers self-deprecations.
      */
-    private function patchMethod(\ReflectionMethod $method, string $returnType, string $declaringFile, string $normalizedType)
+    private function patchMethod(\ReflectionMethod $method, string $returnType, string $declaringFile, string $normalizedType): void
     {
         static $patchedMethods = [];
         static $useStatements = [];
@@ -1097,7 +1097,7 @@ private static function getUseStatements(string $file): array
         return [$namespace, $useOffset, $useMap];
     }
 
-    private function fixReturnStatements(\ReflectionMethod $method, string $returnType)
+    private function fixReturnStatements(\ReflectionMethod $method, string $returnType): void
     {
         if ('docblock' !== $this->patchTypes['force']) {
             if ('7.1' === $this->patchTypes['php'] && 'object' === ltrim($returnType, '?')) {
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
index d821378114cc2..54e024628fb1c 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -51,11 +51,17 @@ public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $sto
         $this->requestStack = $requestStack;
     }
 
+    /**
+     * @return void
+     */
     public function addListener(string $eventName, callable|array $listener, int $priority = 0)
     {
         $this->dispatcher->addListener($eventName, $listener, $priority);
     }
 
+    /**
+     * @return void
+     */
     public function addSubscriber(EventSubscriberInterface $subscriber)
     {
         $this->dispatcher->addSubscriber($subscriber);
@@ -214,6 +220,9 @@ public function getOrphanedEvents(Request $request = null): array
         return array_merge(...array_values($this->orphanedEvents));
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->callStack = null;
@@ -234,6 +243,8 @@ public function __call(string $method, array $arguments): mixed
 
     /**
      * Called before dispatching the event.
+     *
+     * @return void
      */
     protected function beforeDispatch(string $eventName, object $event)
     {
@@ -241,6 +252,8 @@ protected function beforeDispatch(string $eventName, object $event)
 
     /**
      * Called after dispatching the event.
+     *
+     * @return void
      */
     protected function afterDispatch(string $eventName, object $event)
     {
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
index 6b7e074652e19..cbfe7e416dcc1 100644
--- a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
+++ b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -48,6 +48,9 @@ public function setNoPreloadEvents(array $noPreloadEvents): static
         return $this;
     }
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('event_dispatcher') && !$container->hasAlias('event_dispatcher')) {
@@ -191,7 +194,7 @@ class ExtractingEventDispatcher extends EventDispatcher implements EventSubscrib
     public static array $aliases = [];
     public static string $subscriber;
 
-    public function addListener(string $eventName, callable|array $listener, int $priority = 0)
+    public function addListener(string $eventName, callable|array $listener, int $priority = 0): void
     {
         $this->listeners[] = [$eventName, $listener[1], $priority];
     }
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
index 41f3f7ae7c848..327803af671c7 100644
--- a/src/Symfony/Component/EventDispatcher/EventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
@@ -123,12 +123,18 @@ public function hasListeners(string $eventName = null): bool
         return false;
     }
 
+    /**
+     * @return void
+     */
     public function addListener(string $eventName, callable|array $listener, int $priority = 0)
     {
         $this->listeners[$eventName][$priority][] = $listener;
         unset($this->sorted[$eventName], $this->optimized[$eventName]);
     }
 
+    /**
+     * @return void
+     */
     public function removeListener(string $eventName, callable|array $listener)
     {
         if (empty($this->listeners[$eventName])) {
@@ -157,6 +163,9 @@ public function removeListener(string $eventName, callable|array $listener)
         }
     }
 
+    /**
+     * @return void
+     */
     public function addSubscriber(EventSubscriberInterface $subscriber)
     {
         foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
@@ -172,6 +181,9 @@ public function addSubscriber(EventSubscriberInterface $subscriber)
         }
     }
 
+    /**
+     * @return void
+     */
     public function removeSubscriber(EventSubscriberInterface $subscriber)
     {
         foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
@@ -194,6 +206,8 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
      * @param callable[] $listeners The event listeners
      * @param string     $eventName The name of the event to dispatch
      * @param object     $event     The event object to pass to the event handlers/listeners
+     *
+     * @return void
      */
     protected function callListeners(iterable $listeners, string $eventName, object $event)
     {
@@ -210,7 +224,7 @@ protected function callListeners(iterable $listeners, string $eventName, object
     /**
      * Sorts the internal list of listeners for the given event by priority.
      */
-    private function sortListeners(string $eventName)
+    private function sortListeners(string $eventName): void
     {
         krsort($this->listeners[$eventName]);
         $this->sorted[$eventName] = [];
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
index ed233cd270c5a..c6cc4047e4529 100644
--- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
+++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
@@ -113,6 +113,8 @@ public function lint(Expression|string $expression, ?array $names): void
      * @throws \LogicException when registering a function after calling evaluate(), compile() or parse()
      *
      * @see ExpressionFunction
+     *
+     * @return void
      */
     public function register(string $name, callable $compiler, callable $evaluator)
     {
@@ -123,11 +125,17 @@ public function register(string $name, callable $compiler, callable $evaluator)
         $this->functions[$name] = ['compiler' => $compiler, 'evaluator' => $evaluator];
     }
 
+    /**
+     * @return void
+     */
     public function addFunction(ExpressionFunction $function)
     {
         $this->register($function->getName(), $function->getCompiler(), $function->getEvaluator());
     }
 
+    /**
+     * @return void
+     */
     public function registerProvider(ExpressionFunctionProviderInterface $provider)
     {
         foreach ($provider->getFunctions() as $function) {
@@ -135,6 +143,9 @@ public function registerProvider(ExpressionFunctionProviderInterface $provider)
         }
     }
 
+    /**
+     * @return void
+     */
     protected function registerFunctions()
     {
         $this->addFunction(ExpressionFunction::fromPhp('constant'));
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
index 06078da305107..d4ab3e0922770 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
@@ -28,7 +28,7 @@ public function __construct(string $name, Node $arguments)
         );
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $arguments = [];
         foreach ($this->nodes['arguments']->nodes as $node) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/Node.php b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
index eb5046c9bf59f..f6fff09b1ead3 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/Node.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
@@ -57,6 +57,9 @@ public function __toString(): string
         return implode("\n", $repr);
     }
 
+    /**
+     * @return void
+     */
     public function compile(Compiler $compiler)
     {
         foreach ($this->nodes as $node) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
index 9e30d848eb4fc..580ee13095765 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
@@ -35,7 +35,7 @@ public function __construct(string $operator, Node $node)
         );
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler
             ->raw('(')
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
index 92585a574c723..a2911686f0d15 100644
--- a/src/Symfony/Component/ExpressionLanguage/Parser.php
+++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -208,6 +208,9 @@ protected function parseConditionalExpression(Node\Node $expr)
         return $expr;
     }
 
+    /**
+     * @return Node\Node
+     */
     public function parsePrimaryExpression()
     {
         $token = $this->stream->current;
diff --git a/src/Symfony/Component/ExpressionLanguage/TokenStream.php b/src/Symfony/Component/ExpressionLanguage/TokenStream.php
index bbd1d8ab95789..241725b9c5ddc 100644
--- a/src/Symfony/Component/ExpressionLanguage/TokenStream.php
+++ b/src/Symfony/Component/ExpressionLanguage/TokenStream.php
@@ -41,6 +41,8 @@ public function __toString(): string
 
     /**
      * Sets the pointer to the next token and returns the old one.
+     *
+     * @return void
      */
     public function next()
     {
@@ -55,6 +57,8 @@ public function next()
 
     /**
      * @param string|null $message The syntax error message
+     *
+     * @return void
      */
     public function expect(string $type, string $value = null, string $message = null)
     {
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index 1ca852d29feac..2263d58fe7904 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -33,6 +33,8 @@ class Filesystem
      *
      * @throws FileNotFoundException When originFile doesn't exist
      * @throws IOException           When copy fails
+     *
+     * @return void
      */
     public function copy(string $originFile, string $targetFile, bool $overwriteNewerFiles = false)
     {
@@ -83,6 +85,8 @@ public function copy(string $originFile, string $targetFile, bool $overwriteNewe
      * Creates a directory recursively.
      *
      * @throws IOException On any directory creation failure
+     *
+     * @return void
      */
     public function mkdir(string|iterable $dirs, int $mode = 0777)
     {
@@ -124,6 +128,8 @@ public function exists(string|iterable $files): bool
      * @param int|null $atime The access time as a Unix timestamp, if not supplied the current system time is used
      *
      * @throws IOException When touch fails
+     *
+     * @return void
      */
     public function touch(string|iterable $files, int $time = null, int $atime = null)
     {
@@ -138,6 +144,8 @@ public function touch(string|iterable $files, int $time = null, int $atime = nul
      * Removes files or directories.
      *
      * @throws IOException When removal fails
+     *
+     * @return void
      */
     public function remove(string|iterable $files)
     {
@@ -204,6 +212,8 @@ private static function doRemove(array $files, bool $isRecursive): void
      * @param bool $recursive Whether change the mod recursively or not
      *
      * @throws IOException When the change fails
+     *
+     * @return void
      */
     public function chmod(string|iterable $files, int $mode, int $umask = 0000, bool $recursive = false)
     {
@@ -224,6 +234,8 @@ public function chmod(string|iterable $files, int $mode, int $umask = 0000, bool
      * @param bool       $recursive Whether change the owner recursively or not
      *
      * @throws IOException When the change fails
+     *
+     * @return void
      */
     public function chown(string|iterable $files, string|int $user, bool $recursive = false)
     {
@@ -250,6 +262,8 @@ public function chown(string|iterable $files, string|int $user, bool $recursive
      * @param bool       $recursive Whether change the group recursively or not
      *
      * @throws IOException When the change fails
+     *
+     * @return void
      */
     public function chgrp(string|iterable $files, string|int $group, bool $recursive = false)
     {
@@ -274,6 +288,8 @@ public function chgrp(string|iterable $files, string|int $group, bool $recursive
      *
      * @throws IOException When target file or directory already exists
      * @throws IOException When origin cannot be renamed
+     *
+     * @return void
      */
     public function rename(string $origin, string $target, bool $overwrite = false)
     {
@@ -314,6 +330,8 @@ private function isReadable(string $filename): bool
      * Creates a symbolic link or copy a directory.
      *
      * @throws IOException When symlink fails
+     *
+     * @return void
      */
     public function symlink(string $originDir, string $targetDir, bool $copyOnWindows = false)
     {
@@ -351,6 +369,8 @@ public function symlink(string $originDir, string $targetDir, bool $copyOnWindow
      *
      * @throws FileNotFoundException When original file is missing or not a file
      * @throws IOException           When link fails, including if link already exists
+     *
+     * @return void
      */
     public function hardlink(string $originFile, string|iterable $targetFiles)
     {
@@ -507,6 +527,8 @@ public function makePathRelative(string $endPath, string $startPath): string
      *                                    - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
      *
      * @throws IOException When file type is unknown
+     *
+     * @return void
      */
     public function mirror(string $originDir, string $targetDir, \Traversable $iterator = null, array $options = [])
     {
@@ -631,6 +653,8 @@ public function tempnam(string $dir, string $prefix, string $suffix = ''): strin
      * @param string|resource $content The data to write into the file
      *
      * @throws IOException if the file cannot be written to
+     *
+     * @return void
      */
     public function dumpFile(string $filename, $content)
     {
@@ -670,6 +694,8 @@ public function dumpFile(string $filename, $content)
      * @param bool            $lock    Whether the file should be locked when writing to it
      *
      * @throws IOException If the file is not writable
+     *
+     * @return void
      */
     public function appendToFile(string $filename, $content/* , bool $lock = false */)
     {
@@ -728,7 +754,7 @@ private static function box(string $func, mixed ...$args): mixed
     /**
      * @internal
      */
-    public static function handleError(int $type, string $msg)
+    public static function handleError(int $type, string $msg): void
     {
         self::$lastError = $msg;
     }
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index 76083f661e587..62c3f9e24f65a 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -396,6 +396,8 @@ public function ignoreVCSIgnored(bool $ignoreVCSIgnored): static
      * @see ignoreVCS()
      *
      * @param string|string[] $pattern VCS patterns to ignore
+     *
+     * @return void
      */
     public static function addVCSPattern(string|array $pattern)
     {
diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php
index 5d3c1a8480345..cffca7d398bfd 100644
--- a/src/Symfony/Component/Form/AbstractExtension.php
+++ b/src/Symfony/Component/Form/AbstractExtension.php
@@ -128,7 +128,7 @@ protected function loadTypeGuesser()
      *
      * @throws UnexpectedTypeException if any registered type is not an instance of FormTypeInterface
      */
-    private function initTypes()
+    private function initTypes(): void
     {
         $this->types = [];
 
@@ -147,7 +147,7 @@ private function initTypes()
      * @throws UnexpectedTypeException if any registered type extension is not
      *                                 an instance of FormTypeExtensionInterface
      */
-    private function initTypeExtensions()
+    private function initTypeExtensions(): void
     {
         $this->typeExtensions = [];
 
@@ -167,7 +167,7 @@ private function initTypeExtensions()
      *
      * @throws UnexpectedTypeException if the type guesser is not an instance of FormTypeGuesserInterface
      */
-    private function initTypeGuesser()
+    private function initTypeGuesser(): void
     {
         $this->typeGuesserLoaded = true;
 
diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php
index f79f1c1338d30..3f1ab79c2669a 100644
--- a/src/Symfony/Component/Form/AbstractRendererEngine.php
+++ b/src/Symfony/Component/Form/AbstractRendererEngine.php
@@ -61,6 +61,9 @@ public function __construct(array $defaultThemes = [])
         $this->defaultThemes = $defaultThemes;
     }
 
+    /**
+     * @return void
+     */
     public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true)
     {
         $cacheKey = $view->vars[self::CACHE_KEY_VAR];
diff --git a/src/Symfony/Component/Form/AbstractType.php b/src/Symfony/Component/Form/AbstractType.php
index da401930d7833..b163506132d12 100644
--- a/src/Symfony/Component/Form/AbstractType.php
+++ b/src/Symfony/Component/Form/AbstractType.php
@@ -20,18 +20,30 @@
  */
 abstract class AbstractType implements FormTypeInterface
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
     }
 
+    /**
+     * @return void
+     */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
     }
diff --git a/src/Symfony/Component/Form/AbstractTypeExtension.php b/src/Symfony/Component/Form/AbstractTypeExtension.php
index bcd408c170a19..422f28bf33b85 100644
--- a/src/Symfony/Component/Form/AbstractTypeExtension.php
+++ b/src/Symfony/Component/Form/AbstractTypeExtension.php
@@ -18,18 +18,30 @@
  */
 abstract class AbstractTypeExtension implements FormTypeExtensionInterface
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
     }
 
+    /**
+     * @return void
+     */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
     }
diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
index 8c25c19ccf49e..ef09ca58370fa 100644
--- a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
+++ b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
@@ -162,7 +162,7 @@ public function getValuesForChoices(array $choices): array
      *
      * @internal
      */
-    protected function flatten(array $choices, callable $value, ?array &$choicesByValues, ?array &$keysByValues, ?array &$structuredValues)
+    protected function flatten(array $choices, callable $value, ?array &$choicesByValues, ?array &$keysByValues, ?array &$structuredValues): void
     {
         if (null === $choicesByValues) {
             $choicesByValues = [];
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
index 62d1b71d9da56..304105cbc2fea 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
@@ -214,6 +214,9 @@ public function createView(ChoiceListInterface $list, mixed $preferredChoices =
         return $this->views[$hash];
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->lists = [];
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
index c417b84ac5755..b5b8337047cce 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
@@ -140,7 +140,7 @@ public function createView(ChoiceListInterface $list, array|callable $preferredC
         return new ChoiceListView($otherViews, $preferredViews);
     }
 
-    private static function addChoiceView($choice, string $value, $label, array $keys, &$index, $attr, $labelTranslationParameters, ?callable $isPreferred, array &$preferredViews, array &$preferredViewsOrder, array &$otherViews)
+    private static function addChoiceView($choice, string $value, $label, array $keys, &$index, $attr, $labelTranslationParameters, ?callable $isPreferred, array &$preferredViews, array &$preferredViewsOrder, array &$otherViews): void
     {
         // $value may be an integer or a string, since it's stored in the array
         // keys. We want to guarantee it's a string though.
@@ -186,7 +186,7 @@ private static function addChoiceView($choice, string $value, $label, array $key
         $otherViews[$nextIndex] = $view;
     }
 
-    private static function addChoiceViewsFromStructuredValues(array $values, $label, array $choices, array $keys, &$index, $attr, $labelTranslationParameters, ?callable $isPreferred, array &$preferredViews, array &$preferredViewsOrder, array &$otherViews)
+    private static function addChoiceViewsFromStructuredValues(array $values, $label, array $choices, array $keys, &$index, $attr, $labelTranslationParameters, ?callable $isPreferred, array &$preferredViews, array &$preferredViewsOrder, array &$otherViews): void
     {
         foreach ($values as $key => $value) {
             if (null === $value) {
@@ -240,7 +240,7 @@ private static function addChoiceViewsFromStructuredValues(array $values, $label
         }
     }
 
-    private static function addChoiceViewsGroupedByCallable(callable $groupBy, $choice, string $value, $label, array $keys, &$index, $attr, $labelTranslationParameters, ?callable $isPreferred, array &$preferredViews, array &$preferredViewsOrder, array &$otherViews)
+    private static function addChoiceViewsGroupedByCallable(callable $groupBy, $choice, string $value, $label, array $keys, &$index, $attr, $labelTranslationParameters, ?callable $isPreferred, array &$preferredViews, array &$preferredViewsOrder, array &$otherViews): void
     {
         $groupLabels = $groupBy($choice, $keys[$value], $value);
 
diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
index a4975470c9b79..9b6b830341bda 100644
--- a/src/Symfony/Component/Form/Command/DebugCommand.php
+++ b/src/Symfony/Component/Form/Command/DebugCommand.php
@@ -54,6 +54,9 @@ public function __construct(FormRegistryInterface $formRegistry, array $namespac
         $this->fileLinkFormatter = $fileLinkFormatter;
     }
 
+    /**
+     * @return void
+     */
     protected function configure()
     {
         $this
diff --git a/src/Symfony/Component/Form/DependencyInjection/FormPass.php b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
index cba1aeeb2cde6..efb6d5c8bb218 100644
--- a/src/Symfony/Component/Form/DependencyInjection/FormPass.php
+++ b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
@@ -30,6 +30,9 @@ class FormPass implements CompilerPassInterface
 {
     use PriorityTaggedServiceTrait;
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('form.extension')) {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php
index 2345138112d80..119c81107d2a4 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php
@@ -25,6 +25,9 @@
  */
 class CheckboxListMapper implements DataMapperInterface
 {
+    /**
+     * @return void
+     */
     public function mapDataToForms(mixed $choices, \Traversable $checkboxes)
     {
         if (!\is_array($choices ??= [])) {
@@ -37,6 +40,9 @@ public function mapDataToForms(mixed $choices, \Traversable $checkboxes)
         }
     }
 
+    /**
+     * @return void
+     */
     public function mapFormsToData(\Traversable $checkboxes, mixed &$choices)
     {
         if (!\is_array($choices)) {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
index 4ae0fc3c8f738..37fdba0c35890 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
@@ -25,6 +25,9 @@
  */
 class RadioListMapper implements DataMapperInterface
 {
+    /**
+     * @return void
+     */
     public function mapDataToForms(mixed $choice, \Traversable $radios)
     {
         if (!\is_string($choice)) {
@@ -37,6 +40,9 @@ public function mapDataToForms(mixed $choice, \Traversable $radios)
         }
     }
 
+    /**
+     * @return void
+     */
     public function mapFormsToData(\Traversable $radios, mixed &$choice)
     {
         if (null !== $choice && !\is_string($choice)) {
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
index e9288da415ffe..7189977549121 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
@@ -32,6 +32,9 @@ public function __construct(?string $defaultProtocol = 'http')
         $this->defaultProtocol = $defaultProtocol;
     }
 
+    /**
+     * @return void
+     */
     public function onSubmit(FormEvent $event)
     {
         $data = $event->getData();
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
index 4f77342f907ee..62cd0a42a79f9 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
@@ -41,6 +41,9 @@ public static function getSubscribedEvents(): array
         ];
     }
 
+    /**
+     * @return void
+     */
     public function onSubmit(FormEvent $event)
     {
         $dataToMergeInto = $event->getForm()->getNormData();
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index a524e15574d4e..4c06342e54ff2 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -50,6 +50,9 @@ public static function getSubscribedEvents(): array
         ];
     }
 
+    /**
+     * @return void
+     */
     public function preSetData(FormEvent $event)
     {
         $form = $event->getForm();
@@ -72,6 +75,9 @@ public function preSetData(FormEvent $event)
         }
     }
 
+    /**
+     * @return void
+     */
     public function preSubmit(FormEvent $event)
     {
         $form = $event->getForm();
@@ -102,6 +108,9 @@ public function preSubmit(FormEvent $event)
         }
     }
 
+    /**
+     * @return void
+     */
     public function onSubmit(FormEvent $event)
     {
         $form = $event->getForm();
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php
index 090a27158d03d..c9c216b59f437 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php
@@ -36,6 +36,9 @@ public static function getSubscribedEvents(): array
         ];
     }
 
+    /**
+     * @return void
+     */
     public function convertTransformationFailureToFormError(FormEvent $event)
     {
         $form = $event->getForm();
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
index be763c78d2d72..81a55f3cb0e92 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
@@ -23,6 +23,9 @@
  */
 class TrimListener implements EventSubscriberInterface
 {
+    /**
+     * @return void
+     */
     public function preSubmit(FormEvent $event)
     {
         $data = $event->getData();
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php b/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
index 0bc3ebe94399b..5e2ae224816fa 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
@@ -29,12 +29,18 @@
  */
 abstract class BaseType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->setDisabled($options['disabled']);
         $builder->setAutoInitialize($options['auto_initialize']);
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $name = $form->getName();
@@ -119,6 +125,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         ]);
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php b/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php
index 1be317ebd3d23..fa60d016eb64a 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php
@@ -16,6 +16,9 @@
 
 class BirthdayType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php b/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php
index ee39cee56b413..d710546407c94 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ButtonType.php
@@ -31,6 +31,9 @@ public function getBlockPrefix(): string
         return 'button';
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
index b9f5c3f478305..b261f926bb01b 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
@@ -20,6 +20,9 @@
 
 class CheckboxType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // Unlike in other types, where the data is NULL by default, it
@@ -32,6 +35,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->addViewTransformer(new BooleanToStringTransformer($options['value'], $options['false_values']));
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars = array_replace($view->vars, [
@@ -40,6 +46,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         ]);
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $emptyData = fn (FormInterface $form, $viewData) => $viewData;
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
index c310441cc7121..1654d379a83b3 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -21,6 +21,9 @@
 
 class CollectionType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if ($options['allow_add'] && $options['prototype']) {
@@ -48,6 +51,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->addEventSubscriber($resizeListener);
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars = array_replace($view->vars, [
@@ -61,6 +67,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
         $prefixOffset = -2;
@@ -92,6 +101,9 @@ public function finishView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $entryOptionsNormalizer = function (Options $options, $value) {
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
index 26d670634bb2f..6e205fcbc97d5 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
@@ -33,6 +33,9 @@ public function __construct(TranslatorInterface $translator = null)
         $this->translator = $translator;
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if (!$options['html5']) {
@@ -59,6 +62,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         });
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
index 69f284c8233f4..b6472849042dd 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
@@ -22,6 +22,9 @@
 
 class CountryType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
index f697f35416225..1c0ac471b8c45 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
@@ -22,6 +22,9 @@
 
 class CurrencyType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
index db1a14b52b74d..0e4a7555a025f 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
@@ -43,6 +43,9 @@ class DateIntervalType extends AbstractType
         'choice' => ChoiceType::class,
     ];
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if (!$options['with_years'] && !$options['with_months'] && !$options['with_weeks'] && !$options['with_days'] && !$options['with_hours'] && !$options['with_minutes'] && !$options['with_seconds']) {
@@ -145,6 +148,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $vars = [
@@ -157,6 +163,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars = array_replace($view->vars, $vars);
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
index bf7a734a9b2c5..ae47519c53d5a 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -47,6 +47,9 @@ class DateTimeType extends AbstractType
         \IntlDateFormatter::SHORT,
     ];
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $parts = ['year', 'month', 'day', 'hour'];
@@ -197,6 +200,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['widget'] = $options['widget'];
@@ -218,6 +224,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php b/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
index 70e8c8a191ce3..64d01ee67ac12 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
@@ -16,6 +16,9 @@
 
 class EmailType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
index 3bd04a374da8d..560d1e2cb3d80 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -38,6 +38,9 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null)
         ]));
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         parent::buildForm($builder, $options);
@@ -66,6 +69,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->setIsEmptyCallback($options['is_empty_callback']);
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         parent::buildView($view, $form, $options);
@@ -105,6 +111,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         ]);
     }
 
+    /**
+     * @return void
+     */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
         $multipart = false;
@@ -119,6 +128,9 @@ public function finishView(FormView $view, FormInterface $form, array $options)
         $view->vars['multipart'] = $multipart;
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php b/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php
index a69e172bc6586..c4e5eb2ccfa6b 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php
@@ -16,6 +16,9 @@
 
 class HiddenType extends AbstractType
 {
+    /**
+     * @re
10000
turn void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
index 49e37f7490afd..a287b66b7c9e6 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
@@ -20,11 +20,17 @@
 
 class IntegerType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->addViewTransformer(new IntegerToLocalizedStringTransformer($options['grouping'], $options['rounding_mode'], !$options['grouping'] ? 'en' : null));
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         if ($options['grouping']) {
@@ -32,6 +38,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
index f875657eaaaa9..0c6faafec6d0e 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
@@ -23,6 +23,9 @@
 
 class LanguageType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
index 0cdde9e46bb25..5086b0b0e6353 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
@@ -22,6 +22,9 @@
 
 class LocaleType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
index e9ecd409eb9f2..aea35410c1643 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
@@ -24,6 +24,9 @@ class MoneyType extends AbstractType
 {
     protected static $patterns = [];
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // Values used in HTML5 number inputs should be formatted as in "1234.5", ie. 'en' format without grouping,
@@ -39,6 +42,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ;
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['money_pattern'] = self::getPattern($options['currency']);
@@ -48,6 +54,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
index 6d2d9eca2e0c5..c1b5f3e62729f 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
@@ -23,6 +23,9 @@
 
 class NumberType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->addViewTransformer(new NumberToLocalizedStringTransformer(
@@ -37,6 +40,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         if ($options['html5']) {
@@ -46,6 +52,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php b/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
index 495160361d443..0c247f0f3024b 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
@@ -18,6 +18,9 @@
 
 class PasswordType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         if ($options['always_empty'] || !$form->isSubmitted()) {
@@ -25,6 +28,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php b/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
index d006c6d5e185a..f71e288b3e5d9 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
@@ -20,6 +20,9 @@
 
 class PercentType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->addViewTransformer(new PercentToLocalizedStringTransformer(
@@ -30,6 +33,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ));
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['symbol'] = $options['symbol'];
@@ -39,6 +45,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php b/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php
index d40f39106d76b..4b97b0ae21f4c 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/RadioType.php
@@ -16,6 +16,9 @@
 
 class RadioType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php b/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php
index 857028c9c135d..2e33a977d918e 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php
@@ -16,6 +16,9 @@
 
 class RangeType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php b/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
index fb55bf2940c01..4176f93e520f2 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/RepeatedType.php
@@ -18,6 +18,9 @@
 
 class RepeatedType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // Overwrite required option for child fields
@@ -41,6 +44,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ;
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php b/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php
index 76ed42011872a..0dca6e42a8bfb 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php
@@ -16,6 +16,9 @@
 
 class SearchType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/SubmitType.php b/src/Symfony/Component/Form/Extension/Core/Type/SubmitType.php
index dde44576525a4..3f1b5f95c936a 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/SubmitType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/SubmitType.php
@@ -24,6 +24,9 @@
  */
 class SubmitType extends AbstractType implements SubmitButtonTypeInterface
 {
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['clicked'] = $form->isClicked();
@@ -33,6 +36,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefault('validate', true);
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TelType.php b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php
index 8ba7fd843b353..05fdd41626222 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TelType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php
@@ -16,6 +16,9 @@
 
 class TelType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TextType.php b/src/Symfony/Component/Form/Extension/Core/Type/TextType.php
index dd019192bc441..479ce054d8d82 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TextType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TextType.php
@@ -18,6 +18,9 @@
 
 class TextType extends AbstractType implements DataTransformerInterface
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // When empty_data is explicitly set to an empty string,
@@ -30,6 +33,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php b/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php
index 43d8e0eac44b1..40e7580d80b90 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php
@@ -17,6 +17,9 @@
 
 class TextareaType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['pattern'] = null;
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index 78929d79bf464..a22f2122cd543 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -34,6 +34,9 @@ class TimeType extends AbstractType
         'choice' => ChoiceType::class,
     ];
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $parts = ['hour'];
@@ -207,6 +210,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars = array_replace($view->vars, [
@@ -231,6 +237,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
index d6ce3c3435e22..0827fcfc5a9de 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
@@ -25,6 +25,9 @@
 
 class TimezoneType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if ('datetimezone' === $options['input']) {
@@ -34,6 +37,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php
index 4fb9cae664bc9..029ad4d43964e 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php
@@ -28,6 +28,9 @@ public function __construct(TranslatorInterface $translator = null)
         $this->translator = $translator;
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if (!isset($options['constraints'])) {
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UlidType.php b/src/Symfony/Component/Form/Extension/Core/Type/UlidType.php
index 24eab77d8e77b..ea3da07c02c2d 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/UlidType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/UlidType.php
@@ -21,6 +21,9 @@
  */
 class UlidType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
@@ -28,6 +31,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ;
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
index 313fbedbf5334..385c7a25fab55 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
@@ -20,6 +20,9 @@
 
 class UrlType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if (null !== $options['default_protocol']) {
@@ -27,6 +30,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         if ($options['default_protocol']) {
@@ -35,6 +41,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UuidType.php b/src/Symfony/Component/Form/Extension/Core/Type/UuidType.php
index 214d308689d34..7c0f65b9a0924 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/UuidType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/UuidType.php
@@ -21,6 +21,9 @@
  */
 class UuidType extends AbstractType
 {
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
@@ -28,6 +31,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ;
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
index 5b05e0a310544..f0d8f9646747d 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
@@ -28,6 +28,9 @@ class WeekType extends AbstractType
         'choice' => ChoiceType::class,
     ];
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if ('string' === $options['input']) {
@@ -80,6 +83,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['widget'] = $options['widget'];
@@ -89,6 +95,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
diff --git a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
index 732b036de1fbb..eca450a165d42 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
@@ -51,6 +51,9 @@ public function __construct(string $fieldName, CsrfTokenManagerInterface $tokenM
         $this->serverParams = $serverParams ?? new ServerParams();
     }
 
+    /**
+     * @return void
+     */
     public function preSubmit(FormEvent $event)
     {
         $form = $event->getForm();
diff --git a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
index bb0d04f509c1b..8c3d45dec0744 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
@@ -47,6 +47,8 @@ public function __construct(CsrfTokenManagerInterface $defaultTokenManager, bool
 
     /**
      * Adds a CSRF field to the form when the CSRF protection is enabled.
+     *
+     * @return void
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -69,6 +71,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
     /**
      * Adds a CSRF field to the root form view.
+     *
+     * @return void
      */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
@@ -86,6 +90,9 @@ public function finishView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php
index be30912c7cc6b..41a52e091edc6 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php
@@ -43,6 +43,8 @@ public static function getSubscribedEvents(): array
 
     /**
      * Listener for the {@link FormEvents::POST_SET_DATA} event.
+     *
+     * @return void
      */
     public function postSetData(FormEvent $event)
     {
@@ -57,6 +59,8 @@ public function postSetData(FormEvent $event)
 
     /**
      * Listener for the {@link FormEvents::POST_SUBMIT} event.
+     *
+     * @return void
      */
     public function postSubmit(FormEvent $event)
     {
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
index cdc13c9d0394c..b93bfd82a133b 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -76,11 +76,11 @@ public function __construct(FormDataExtractorInterface $dataExtractor)
     /**
      * Does nothing. The data is collected during the form event listeners.
      */
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [
             'forms' => [],
@@ -89,12 +89,12 @@ public function reset()
         ];
     }
 
-    public function associateFormWithView(FormInterface $form, FormView $view)
+    public function associateFormWithView(FormInterface $form, FormView $view): void
     {
         $this->formsByView[spl_object_hash($view)] = spl_object_hash($form);
     }
 
-    public function collectConfiguration(FormInterface $form)
+    public function collectConfiguration(FormInterface $form): void
     {
         $hash = spl_object_hash($form);
 
@@ -112,7 +112,7 @@ public function collectConfiguration(FormInterface $form)
         }
     }
 
-    public function collectDefaultData(FormInterface $form)
+    public function collectDefaultData(FormInterface $form): void
     {
         $hash = spl_object_hash($form);
 
@@ -131,7 +131,7 @@ public function collectDefaultData(FormInterface $form)
         }
     }
 
-    public function collectSubmittedData(FormInterface $form)
+    public function collectSubmittedData(FormInterface $form): void
     {
         $hash = spl_object_hash($form);
 
@@ -162,7 +162,7 @@ public function collectSubmittedData(FormInterface $form)
         }
     }
 
-    public function collectViewVariables(FormView $view)
+    public function collectViewVariables(FormView $view): void
     {
         $hash = spl_object_hash($view);
 
@@ -180,12 +180,12 @@ public function collectViewVariables(FormView $view)
         }
     }
 
-    public function buildPreliminaryFormTree(FormInterface $form)
+    public function buildPreliminaryFormTree(FormInterface $form): void
     {
         $this->data['forms'][$form->getName()] = &$this->recursiveBuildPreliminaryFormTree($form, $this->data['forms_by_hash']);
     }
 
-    public function buildFinalFormTree(FormInterface $form, FormView $view)
+    public function buildFinalFormTree(FormInterface $form, FormView $view): void
     {
         $this->data['forms'][$form->getName()] = &$this->recursiveBuildFinalFormTree($form, $view, $this->data['forms_by_hash']);
     }
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
index d273fbbc757ad..6c8cf3ee24614 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
@@ -71,16 +71,25 @@ public function createView(FormInterface $form, FormView $parent = null): FormVi
         return $this->proxiedType->createView($form, $parent);
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $this->proxiedType->buildForm($builder, $options);
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $this->proxiedType->buildView($view, $form, $options);
     }
 
+    /**
+     * @return void
+     */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
         $this->proxiedType->finishView($view, $form, $options);
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php b/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php
index d014f0e457f72..f1e3c903ec4c5 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php
@@ -32,6 +32,9 @@ public function __construct(FormDataCollectorInterface $dataCollector)
         $this->listener = new DataCollectorListener($dataCollector);
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->addEventSubscriber($this->listener);
diff --git a/src/Symfony/Component/Form/Extension/HtmlSanitizer/Type/TextTypeHtmlSanitizerExtension.php b/src/Symfony/Component/Form/Extension/HtmlSanitizer/Type/TextTypeHtmlSanitizerExtension.php
index 4b2dffe9a13af..8e92ea74a5ea5 100644
--- a/src/Symfony/Component/Form/Extension/HtmlSanitizer/Type/TextTypeHtmlSanitizerExtension.php
+++ b/src/Symfony/Component/Form/Extension/HtmlSanitizer/Type/TextTypeHtmlSanitizerExtension.php
@@ -35,6 +35,9 @@ public static function getExtendedTypes(): iterable
         return [TextType::class];
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
@@ -44,6 +47,9 @@ public function configureOptions(OptionsResolver $resolver)
         ;
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if (!$options['sanitize_html']) {
diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
index 3b1aaebf02648..b4e835c95ae02 100644
--- a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
+++ b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php
@@ -35,6 +35,9 @@ public function __construct(ServerParams $serverParams = null)
         $this->serverParams = $serverParams ?? new ServerParams();
     }
 
+    /**
+     * @return void
+     */
     public function handleRequest(FormInterface $form, mixed $request = null)
     {
         if (!$request instanceof Request) {
diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php b/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php
index 9a5ae66618ddc..cc3e5e1207715 100644
--- a/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php
+++ b/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php
@@ -29,6 +29,9 @@ public function __construct(RequestHandlerInterface $requestHandler = null)
         $this->requestHandler = $requestHandler ?? new HttpFoundationRequestHandler();
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->setRequestHandler($this->requestHandler);
diff --git a/src/Symfony/Component/Form/Extension/PasswordHasher/EventListener/PasswordHasherListener.php b/src/Symfony/Component/Form/Extension/PasswordHasher/EventListener/PasswordHasherListener.php
index 3fccfd8965810..f905a7e034379 100644
--- a/src/Symfony/Component/Form/Extension/PasswordHasher/EventListener/PasswordHasherListener.php
+++ b/src/Symfony/Component/Form/Extension/PasswordHasher/EventListener/PasswordHasherListener.php
@@ -35,6 +35,9 @@ public function __construct(
         $this->propertyAccessor ??= PropertyAccess::createPropertyAccessor();
     }
 
+    /**
+     * @return void
+     */
     public function registerPassword(FormEvent $event)
     {
         $this->assertNotMapped($event->getForm());
@@ -46,6 +49,9 @@ public function registerPassword(FormEvent $event)
         ];
     }
 
+    /**
+     * @return void
+     */
     public function hashPasswords(FormEvent $event)
     {
         $form = $event->getForm();
diff --git a/src/Symfony/Component/Form/Extension/PasswordHasher/Type/FormTypePasswordHasherExtension.php b/src/Symfony/Component/Form/Extension/PasswordHasher/Type/FormTypePasswordHasherExtension.php
index 7294ee5f022d9..5308992863f5d 100644
--- a/src/Symfony/Component/Form/Extension/PasswordHasher/Type/FormTypePasswordHasherExtension.php
+++ b/src/Symfony/Component/Form/Extension/PasswordHasher/Type/FormTypePasswordHasherExtension.php
@@ -27,6 +27,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->addEventListener(FormEvents::POST_SUBMIT, [$this->passwordHasherListener, 'hashPasswords']);
diff --git a/src/Symfony/Component/Form/Extension/PasswordHasher/Type/PasswordTypePasswordHasherExtension.php b/src/Symfony/Component/Form/Extension/PasswordHasher/Type/PasswordTypePasswordHasherExtension.php
index e75a6e9ff2579..6f022fb1bf619 100644
--- a/src/Symfony/Component/Form/Extension/PasswordHasher/Type/PasswordTypePasswordHasherExtension.php
+++ b/src/Symfony/Component/Form/Extension/PasswordHasher/Type/PasswordTypePasswordHasherExtension.php
@@ -29,6 +29,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         if ($options['hash_property_path']) {
@@ -36,6 +39,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
index ada84f14bf89b..d664e9b50008f 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
@@ -29,6 +29,9 @@ class FormValidator extends ConstraintValidator
      */
     private \SplObjectStorage $resolvedGroups;
 
+    /**
+     * @return void
+     */
     public function validate(mixed $form, Constraint $formConstraint)
     {
         if (!$formConstraint instanceof Form) {
diff --git a/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php b/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
index 2963d6f7b02ef..e2d4357622bd6 100644
--- a/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
+++ b/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
@@ -37,6 +37,9 @@ public function __construct(ValidatorInterface $validator, ViolationMapperInterf
         $this->violationMapper = $violationMapper;
     }
 
+    /**
+     * @return void
+     */
     public function validateForm(FormEvent $event)
     {
         $form = $event->getForm();
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
index 9366a20f89ea6..2abc466fe398f 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
@@ -24,6 +24,9 @@
  */
 abstract class BaseValidatorExtension extends AbstractTypeExtension
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         // Make sure that validation groups end up as null, closure or array
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
index b28cf870b0c23..4602918c3a9b8 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
@@ -37,11 +37,17 @@ public function __construct(ValidatorInterface $validator, bool $legacyErrorMess
         $this->violationMapper = new ViolationMapper($formRenderer, $translator);
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->addEventSubscriber(new ValidationListener($this->validator, $this->violationMapper));
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
index 0e8a4ccf14fbc..2e2c21426ae4c 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
@@ -21,6 +21,9 @@
  */
 class RepeatedTypeValidatorExtension extends AbstractTypeExtension
 {
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         // Map errors to the first field
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
index c720e6a0ecbd0..70034135bf912 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
@@ -32,6 +32,9 @@ public function __construct(TranslatorInterface $translator, string $translation
         $this->translationDomain = $translationDomain;
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $translator = $this->translator;
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
index e6bcd29fea991..2f2ccefd30b99 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
@@ -38,6 +38,9 @@ public function __construct(FormRendererInterface $formRenderer = null, Translat
         $this->translator = $translator;
     }
 
+    /**
+     * @return void
+     */
     public function mapViolation(ConstraintViolation $violation, FormInterface $form, bool $allowNonSynchronized = false)
     {
         $this->allowNonSynchronized = $allowNonSynchronized;
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
index a597dcb1391e7..a9a0f15d6e242 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
@@ -193,7 +193,7 @@ public function getIterator(): ViolationPathIterator
     /**
      * Builds the string representation from the elements.
      */
-    private function buildString()
+    private function buildString(): void
     {
         $this->pathAsString = '';
         $data = false;
diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php
index c6215635eccda..33f07b0f1dc05 100644
--- a/src/Symfony/Component/Form/FormBuilder.php
+++ b/src/Symfony/Component/Form/FormBuilder.php
@@ -206,7 +206,7 @@ private function resolveChild(string $name): FormBuilderInterface
     /**
      * Converts all unresolved children into {@link FormBuilder} instances.
      */
-    private function resolveChildren()
+    private function resolveChildren(): void
     {
         foreach ($this->unresolvedChildren as $name => $info) {
             $this->children[$name] = $this->create($name, $info[0], $info[1]);
diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
index 0220399758d0b..9fed3d1a0a5f4 100644
--- a/src/Symfony/Component/Form/FormConfigBuilder.php
+++ b/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -633,7 +633,7 @@ public function setIsEmptyCallback(?callable $isEmptyCallback): static
      *
      * @internal
      */
-    final public static function validateName(?string $name)
+    final public static function validateName(?string $name): void
     {
         if (!self::isValidName($name)) {
             throw new InvalidArgumentException(sprintf('The name "%s" contains illegal characters. Names should start with a letter, digit or underscore and only contain letters, digits, numbers, underscores ("_"), hyphens ("-") and colons (":").', $name));
diff --git a/src/Symfony/Component/Form/FormError.php b/src/Symfony/Component/Form/FormError.php
index aafd723f22673..5b19d6ea5b995 100644
--- a/src/Symfony/Component/Form/FormError.php
+++ b/src/Symfony/Component/Form/FormError.php
@@ -100,6 +100,8 @@ public function getCause(): mixed
      * This method must only be called once.
      *
      * @throws BadMethodCallException If the method is called more than once
+     *
+     * @return void
      */
     public function setOrigin(FormInterface $origin)
     {
diff --git a/src/Symfony/Component/Form/FormEvent.php b/src/Symfony/Component/Form/FormEvent.php
index c9c3053cfe9a9..1e6aa34d63ad6 100644
--- a/src/Symfony/Component/Form/FormEvent.php
+++ b/src/Symfony/Component/Form/FormEvent.php
@@ -45,6 +45,8 @@ public function getData(): mixed
 
     /**
      * Allows updating with some filtered data.
+     *
+     * @return void
      */
     public function setData(mixed $data)
     {
diff --git a/src/Symfony/Component/Form/FormRenderer.php b/src/Symfony/Component/Form/FormRenderer.php
index 12c7c0dddd5cd..18dec4946b83e 100644
--- a/src/Symfony/Component/Form/FormRenderer.php
+++ b/src/Symfony/Component/Form/FormRenderer.php
@@ -42,6 +42,9 @@ public function getEngine(): FormRendererEngineInterface
         return $this->engine;
     }
 
+    /**
+     * @return void
+     */
     public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true)
     {
         $this->engine->setTheme($view, $themes, $useDefaultThemes);
diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php
index fe32f90ceff61..e04fa13b09896 100644
--- a/src/Symfony/Component/Form/FormView.php
+++ b/src/Symfony/Component/Form/FormView.php
@@ -92,6 +92,9 @@ public function isMethodRendered(): bool
         return $this->methodRendered;
     }
 
+    /**
+     * @return void
+     */
     public function setMethodRendered()
     {
         $this->methodRendered = true;
diff --git a/src/Symfony/Component/Form/NativeRequestHandler.php b/src/Symfony/Component/Form/NativeRequestHandler.php
index cf193398c8318..bf240de37e8a3 100644
--- a/src/Symfony/Component/Form/NativeRequestHandler.php
+++ b/src/Symfony/Component/Form/NativeRequestHandler.php
@@ -41,6 +41,8 @@ public function __construct(ServerParams $params = null)
 
     /**
      * @throws Exception\UnexpectedTypeException If the $request is not null
+     *
+     * @return void
      */
     public function handleRequest(FormInterface $form, mixed $request = null)
     {
diff --git a/src/Symfony/Component/Form/ResolvedFormType.php b/src/Symfony/Component/Form/ResolvedFormType.php
index af794a3b7c0d6..f05db1533b71c 100644
--- a/src/Symfony/Component/Form/ResolvedFormType.php
+++ b/src/Symfony/Component/Form/ResolvedFormType.php
@@ -92,6 +92,9 @@ public function createView(FormInterface $form, FormView $parent = null): FormVi
         return $this->newView($parent);
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $this->parent?->buildForm($builder, $options);
@@ -103,6 +106,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $this->parent?->buildView($view, $form, $options);
@@ -114,6 +120,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
         $this->parent?->finishView($view, $form, $options);
diff --git a/src/Symfony/Component/HttpClient/AmpHttpClient.php b/src/Symfony/Component/HttpClient/AmpHttpClient.php
index 8542932d59549..a33763fe1842a 100644
--- a/src/Symfony/Component/HttpClient/AmpHttpClient.php
+++ b/src/Symfony/Component/HttpClient/AmpHttpClient.php
@@ -153,7 +153,7 @@ public function stream(ResponseInterface|iterable $responses, float $timeout = n
         return new ResponseStream(AmpResponse::stream($responses, $timeout));
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->multi->dnsCache = [];
 
diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php
index 5e3fbf507501c..05a8e6b4c6ebc 100644
--- a/src/Symfony/Component/HttpClient/CachingHttpClient.php
+++ b/src/Symfony/Component/HttpClient/CachingHttpClient.php
@@ -135,6 +135,9 @@ public function stream(ResponseInterface|iterable $responses, float $timeout = n
         })());
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         if ($this->client instanceof ResetInterface) {
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
index 5f68a3ee3fb91..23cccad666645 100644
--- a/src/Symfony/Component/HttpClient/CurlHttpClient.php
+++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -324,7 +324,7 @@ public function stream(ResponseInterface|iterable $responses, float $timeout = n
         return new ResponseStream(CurlResponse::stream($responses, $timeout));
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->multi->reset();
     }
diff --git a/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php b/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
index 5242517293330..68101fc2e9174 100644
--- a/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
+++ b/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
@@ -31,17 +31,17 @@ final class HttpClientDataCollector extends DataCollector implements LateDataCol
      */
     private array $clients = [];
 
-    public function registerClient(string $name, TraceableHttpClient $client)
+    public function registerClient(string $name, TraceableHttpClient $client): void
     {
         $this->clients[$name] = $client;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         $this->lateCollect();
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         $this->data['request_count'] = $this->data['request_count'] ?? 0;
         $this->data['error_count'] = $this->data['error_count'] ?? 0;
@@ -86,7 +86,7 @@ public function getName(): string
         return 'http_client';
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [
             'clients' => [],
diff --git a/src/Symfony/Component/HttpClient/DecoratorTrait.php b/src/Symfony/Component/HttpClient/DecoratorTrait.php
index f38664b4353a7..472437e465b13 100644
--- a/src/Symfony/Component/HttpClient/DecoratorTrait.php
+++ b/src/Symfony/Component/HttpClient/DecoratorTrait.php
@@ -48,6 +48,9 @@ public function withOptions(array $options): static
         return $clone;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         if ($this->client instanceof ResetInterface) {
diff --git a/src/Symfony/Component/HttpClient/DependencyInjection/HttpClientPass.php b/src/Symfony/Component/HttpClient/DependencyInjection/HttpClientPass.php
index c42d873fc4f5c..214a655bc6992 100644
--- a/src/Symfony/Component/HttpClient/DependencyInjection/HttpClientPass.php
+++ b/src/Symfony/Component/HttpClient/DependencyInjection/HttpClientPass.php
@@ -19,7 +19,7 @@
 
 final class HttpClientPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('data_collector.http_client')) {
             return;
diff --git a/src/Symfony/Component/HttpClient/HttplugClient.php b/src/Symfony/Component/HttpClient/HttplugClient.php
index 4d539219174be..406ceb4bc5bbe 100644
--- a/src/Symfony/Component/HttpClient/HttplugClient.php
+++ b/src/Symfony/Component/HttpClient/HttplugClient.php
@@ -266,7 +266,7 @@ public function __destruct()
         $this->wait();
     }
 
-    public function reset()
+    public function reset(): void
     {
         if ($this->client instanceof ResetInterface) {
             $this->client->reset();
diff --git a/src/Symfony/Component/HttpClient/Internal/Canary.php b/src/Symfony/Component/HttpClient/Internal/Canary.php
index 968764019a57d..b4438d94d0e37 100644
--- a/src/Symfony/Component/HttpClient/Internal/Canary.php
+++ b/src/Symfony/Component/HttpClient/Internal/Canary.php
@@ -25,7 +25,7 @@ public function __construct(\Closure $canceller)
         $this->canceller = $canceller;
     }
 
-    public function cancel()
+    public function cancel(): void
     {
         if (isset($this->canceller)) {
             $canceller = $this->canceller;
diff --git a/src/Symfony/Component/HttpClient/Internal/CurlClientState.php b/src/Symfony/Component/HttpClient/Internal/CurlClientState.php
index 61fd5ee9b61a4..458d8a1d05deb 100644
--- a/src/Symfony/Component/HttpClient/Internal/CurlClientState.php
+++ b/src/Symfony/Component/HttpClient/Internal/CurlClientState.php
@@ -77,7 +77,7 @@ public function __construct(int $maxHostConnections, int $maxPendingPushes)
         curl_multi_setopt($this->handle, \CURLMOPT_PUSHFUNCTION, static fn ($parent, $pushed, array $requestHeaders) => $multi->handlePush($parent, $pushed, $requestHeaders, $maxPendingPushes));
     }
 
-    public function reset()
+    public function reset(): void
     {
         foreach ($this->pushedResponses as $url => $response) {
             $this->logger?->debug(sprintf('Unused pushed response: "%s"', $url));
diff --git a/src/Symfony/Component/HttpClient/Internal/NativeClientState.php b/src/Symfony/Component/HttpClient/Internal/NativeClientState.php
index b44191e93c7f3..75f23a9a7e8ca 100644
--- a/src/Symfony/Component/HttpClient/Internal/NativeClientState.php
+++ b/src/Symfony/Component/HttpClient/Internal/NativeClientState.php
@@ -34,7 +34,7 @@ public function __construct()
         $this->id = random_int(\PHP_INT_MIN, \PHP_INT_MAX);
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->responseCount = 0;
         $this->dnsCache = [];
diff --git a/src/Symfony/Component/HttpClient/MockHttpClient.php b/src/Symfony/Component/HttpClient/MockHttpClient.php
index 7906b9a96c418..9b8305e41809f 100644
--- a/src/Symfony/Component/HttpClient/MockHttpClient.php
+++ b/src/Symfony/Component/HttpClient/MockHttpClient.php
@@ -106,6 +106,9 @@ public function withOptions(array $options): static
         return $clone;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->requestsCount = 0;
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
index 23acce28de0c1..6357b5507c93b 100644
--- a/src/Symfony/Component/HttpClient/NativeHttpClient.php
+++ b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -261,7 +261,7 @@ public function stream(ResponseInterface|iterable $responses, float $timeout = n
         return new ResponseStream(NativeResponse::stream($responses, $timeout));
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->multi->reset();
     }
diff --git a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php
index 89885abe1f4f7..f334572726a35 100644
--- a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php
+++ b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php
@@ -107,7 +107,7 @@ public function withOptions(array $options): static
         return $clone;
     }
 
-    public function reset()
+    public function reset(): void
     {
         if ($this->client instanceof ResetInterface) {
             $this->client->reset();
diff --git a/src/Symfony/Component/HttpClient/Psr18Client.php b/src/Symfony/Component/HttpClient/Psr18Client.php
index 699acf4498a1f..0be916acb8d9f 100644
--- a/src/Symfony/Component/HttpClient/Psr18Client.php
+++ b/src/Symfony/Component/HttpClient/Psr18Client.php
@@ -191,7 +191,7 @@ public function createUri(string $uri = ''): UriInterface
         throw new \LogicException(sprintf('You cannot use "%s()" as the "nyholm/psr7" package is not installed. Try running "composer require nyholm/psr7".', __METHOD__));
     }
 
-    public function reset()
+    public function reset(): void
     {
         if ($this->client instanceof ResetInterface) {
             $this->client->reset();
diff --git a/src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php b/src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php
index 06f6b7d88a33c..b4cf588a4177d 100644
--- a/src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php
+++ b/src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php
@@ -153,7 +153,7 @@ private static function initialize(self $response): void
         $response->initializer = null;
     }
 
-    private function checkStatusCode()
+    private function checkStatusCode(): void
     {
         $code = $this->getInfo('http_code');
 
diff --git a/src/Symfony/Component/HttpClient/ScopingHttpClient.php b/src/Symfony/Component/HttpClient/ScopingHttpClient.php
index da8ef4c98ecec..a87171d2cad68 100644
--- a/src/Symfony/Component/HttpClient/ScopingHttpClient.php
+++ b/src/Symfony/Component/HttpClient/ScopingHttpClient.php
@@ -93,6 +93,9 @@ public function stream(ResponseInterface|iterable $responses, float $timeout = n
         return $this->client->stream($responses, $timeout);
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         if ($this->client instanceof ResetInterface) {
diff --git a/src/Symfony/Component/HttpClient/TraceableHttpClient.php b/src/Symfony/Component/HttpClient/TraceableHttpClient.php
index b9df9732aa9dd..974e9f6f00646 100644
--- a/src/Symfony/Component/HttpClient/TraceableHttpClient.php
+++ b/src/Symfony/Component/HttpClient/TraceableHttpClient.php
@@ -80,7 +80,7 @@ public function getTracedRequests(): array
         return $this->tracedRequests->getArrayCopy();
     }
 
-    public function reset()
+    public function reset(): void
     {
         if ($this->client instanceof ResetInterface) {
             $this->client->reset();
diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
index ad2cbda63f985..78958f1ae08a6 100644
--- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -351,6 +351,8 @@ public function getContent(): string|false
 
     /**
      * Trust X-Sendfile-Type header.
+     *
+     * @return void
      */
     public static function trustXSendfileTypeHeader()
     {
diff --git a/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php b/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
index 5628ea8bc14de..b09c167cff448 100644
--- a/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
@@ -29,6 +29,9 @@ class ExpressionRequestMatcher extends RequestMatcher
     private ExpressionLanguage $language;
     private Expression|string $expression;
 
+    /**
+     * @return void
+     */
     public function setExpression(ExpressionLanguage $language, Expression|string $expression)
     {
         $this->language = $language;
diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php
index 3ccc45d1d5431..b74a02e2e1e53 100644
--- a/src/Symfony/Component/HttpFoundation/FileBag.php
+++ b/src/Symfony/Component/HttpFoundation/FileBag.php
@@ -31,12 +31,18 @@ public function __construct(array $parameters = [])
         $this->replace($parameters);
     }
 
+    /**
+     * @return void
+     */
     public function replace(array $files = [])
     {
         $this->parameters = [];
         $this->add($files);
     }
 
+    /**
+     * @return void
+     */
     public function set(string $key, mixed $value)
     {
         if (!\is_array($value) && !$value instanceof UploadedFile) {
@@ -46,6 +52,9 @@ public function set(string $key, mixed $value)
         parent::set($key, $this->convertFileInformation($value));
     }
 
+    /**
+     * @return void
+     */
     public function add(array $files = [])
     {
         foreach ($files as $key => $file) {
diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
index b7be1b3827059..081f26a2d095c 100644
--- a/src/Symfony/Component/HttpFoundation/HeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -86,6 +86,8 @@ public function keys(): array
 
     /**
      * Replaces the current HTTP headers by a new set.
+     *
+     * @return void
      */
     public function replace(array $headers = [])
     {
@@ -95,6 +97,8 @@ public function replace(array $headers = [])
 
     /**
      * Adds new headers the current HTTP headers set.
+     *
+     * @return void
      */
     public function add(array $headers)
     {
@@ -126,6 +130,8 @@ public function get(string $key, string $default = null): ?string
      *
      * @param string|string[]|null $values  The value or an array of values
      * @param bool                 $replace Whether to replace the actual value or not (true by default)
+     *
+     * @return void
      */
     public function set(string $key, string|array|null $values, bool $replace = true)
     {
@@ -170,6 +176,8 @@ public function contains(string $key, string $value): bool
 
     /**
      * Removes a header.
+     *
+     * @return void
      */
     public function remove(string $key)
     {
@@ -202,6 +210,8 @@ public function getDate(string $key, \DateTime $default = null): ?\DateTimeInter
 
     /**
      * Adds a custom Cache-Control directive.
+     *
+     * @return void
      */
     public function addCacheControlDirective(string $key, bool|string $value = true)
     {
@@ -228,6 +238,8 @@ public function getCacheControlDirective(string $key): bool|string|null
 
     /**
      * Removes a Cache-Control directive.
+     *
+     * @return void
      */
     public function removeCacheControlDirective(string $key)
     {
diff --git a/src/Symfony/Component/HttpFoundation/InputBag.php b/src/Symfony/Component/HttpFoundation/InputBag.php
index 446b82132b140..d0e069b505c11 100644
--- a/src/Symfony/Component/HttpFoundation/InputBag.php
+++ b/src/Symfony/Component/HttpFoundation/InputBag.php
@@ -43,7 +43,7 @@ public function get(string $key, mixed $default = null): string|int|float|bool|n
     /**
      * Replaces the current input values by a new set.
      */
-    public function replace(array $inputs = [])
+    public function replace(array $inputs = []): void
     {
         $this->parameters = [];
         $this->add($inputs);
@@ -52,7 +52,7 @@ public function replace(array $inputs = [])
     /**
      * Adds input values.
      */
-    public function add(array $inputs = [])
+    public function add(array $inputs = []): void
     {
         foreach ($inputs as $input => $value) {
             $this->set($input, $value);
@@ -64,7 +64,7 @@ public function add(array $inputs = [])
      *
      * @param string|int|float|bool|array|null $value
      */
-    public function set(string $key, mixed $value)
+    public function set(string $key, mixed $value): void
     {
         if (null !== $value && !\is_scalar($value) && !\is_array($value) && !$value instanceof \Stringable) {
             throw new \InvalidArgumentException(sprintf('Expected a scalar, or an array as a 2nd argument to "%s()", "%s" given.', __METHOD__, get_debug_type($value)));
diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
index 9df9604e6c0ef..44d8d96d28213 100644
--- a/src/Symfony/Component/HttpFoundation/ParameterBag.php
+++ b/src/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -60,6 +60,8 @@ public function keys(): array
 
     /**
      * Replaces the current parameters by a new set.
+     *
+     * @return void
      */
     public function replace(array $parameters = [])
     {
@@ -68,6 +70,8 @@ public function replace(array $parameters = [])
 
     /**
      * Adds parameters.
+     *
+     * @return void
      */
     public function add(array $parameters = [])
     {
@@ -79,6 +83,9 @@ public function get(string $key, mixed $default = null): mixed
         return \array_key_exists($key, $this->parameters) ? $this->parameters[$key] : $default;
     }
 
+    /**
+     * @return void
+     */
     public function set(string $key, mixed $value)
     {
         $this->parameters[$key] = $value;
@@ -94,6 +101,8 @@ public function has(string $key): bool
 
     /**
      * Removes a parameter.
+     *
+     * @return void
      */
     public function remove(string $key)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 56d74874c1319..fdb701d00b3ee 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -263,6 +263,8 @@ public function __construct(array $query = [], array $request = [], array $attri
      * @param array                $files      The FILES parameters
      * @param array                $server     The SERVER parameters
      * @param string|resource|null $content    The raw body data
+     *
+     * @return void
      */
     public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null)
     {
@@ -417,6 +419,8 @@ public static function create(string $uri, string $method = 'GET', array $parame
      * This is mainly useful when you need to override the Request class
      * to keep BC with an existing system. It should not be used for any
      * other purpose.
+     *
+     * @return void
      */
     public static function setFactory(?callable $callable)
     {
@@ -521,6 +525,8 @@ public function __toString(): string
      *
      * It overrides $_GET, $_POST, $_REQUEST, $_SERVER, $_COOKIE.
      * $_FILES is never overridden, see rfc1867
+     *
+     * @return void
      */
     public function overrideGlobals()
     {
@@ -561,6 +567,8 @@ public function overrideGlobals()
      *
      * @param array $proxies          A list of trusted proxies, the string 'REMOTE_ADDR' will be replaced with $_SERVER['REMOTE_ADDR']
      * @param int   $trustedHeaderSet A bit field of Request::HEADER_*, to set which headers to trust from your proxies
+     *
+     * @return void
      */
     public static function setTrustedProxies(array $proxies, int $trustedHeaderSet)
     {
@@ -602,6 +610,8 @@ public static function getTrustedHeaderSet(): int
      * You should only list the hosts you manage using regexs.
      *
      * @param array $hostPatterns A list of trusted host patterns
+     *
+     * @return void
      */
     public static function setTrustedHosts(array $hostPatterns)
     {
@@ -648,6 +658,8 @@ public static function normalizeQueryString(?string $qs): string
      * If these methods are not protected against CSRF, this presents a possible vulnerability.
      *
      * The HTTP method can only be overridden when the real HTTP method is POST.
+     *
+     * @return void
      */
     public static function enableHttpMethodParameterOverride()
     {
@@ -733,6 +745,9 @@ public function hasSession(bool $skipIfUninitialized = false): bool
         return null !== $this->session && (!$skipIfUninitialized || $this->session instanceof SessionInterface);
     }
 
+    /**
+     * @return void
+     */
     public function setSession(SessionInterface $session)
     {
         $this->session = $session;
@@ -743,7 +758,7 @@ public function setSession(SessionInterface $session)
      *
      * @param callable(): SessionInterface $factory
      */
-    public function setSessionFactory(callable $factory)
+    public function setSessionFactory(callable $factory): void
     {
         $this->session = $factory;
     }
@@ -1153,6 +1168,8 @@ public function getHost(): string
 
     /**
      * Sets the request method.
+     *
+     * @return void
      */
     public function setMethod(string $method)
     {
@@ -1274,6 +1291,8 @@ public function getFormat(?string $mimeType): ?string
      * Associates a format with mime types.
      *
      * @param string|string[] $mimeTypes The associated mime types (the preferred one must be the first as it will be used as the content type)
+     *
+     * @return void
      */
     public function setFormat(?string $format, string|array $mimeTypes)
     {
@@ -1304,6 +1323,8 @@ public function getRequestFormat(?string $default = 'html'): ?string
 
     /**
      * Sets the request format.
+     *
+     * @return void
      */
     public function setRequestFormat(?string $format)
     {
@@ -1334,6 +1355,8 @@ public function getContentTypeFormat(): ?string
 
     /**
      * Sets the default locale.
+     *
+     * @return void
      */
     public function setDefaultLocale(string $locale)
     {
@@ -1354,6 +1377,8 @@ public function getDefaultLocale(): string
 
     /**
      * Sets the locale.
+     *
+     * @return void
      */
     public function setLocale(string $locale)
     {
@@ -1858,6 +1883,8 @@ protected function preparePathInfo(): string
 
     /**
      * Initializes HTTP request formats.
+     *
+     * @return void
      */
     protected static function initializeFormats()
     {
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
index 28cdd20c55f32..8c5f1d8134635 100644
--- a/src/Symfony/Component/HttpFoundation/RequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
@@ -69,6 +69,8 @@ public function __construct(string $path = null, string $host = null, string|arr
      * Adds a check for the HTTP scheme.
      *
      * @param string|string[]|null $scheme An HTTP scheme or an array of HTTP schemes
+     *
+     * @return void
      */
     public function matchScheme(string|array|null $scheme)
     {
@@ -77,6 +79,8 @@ public function matchScheme(string|array|null $scheme)
 
     /**
      * Adds a check for the URL host name.
+     *
+     * @return void
      */
     public function matchHost(?string $regexp)
     {
@@ -87,6 +91,8 @@ public function matchHost(?string $regexp)
      * Adds a 
10000
check for the the URL port.
      *
      * @param int|null $port The port number to connect to
+     *
+     * @return void
      */
     public function matchPort(?int $port)
     {
@@ -95,6 +101,8 @@ public function matchPort(?int $port)
 
     /**
      * Adds a check for the URL path info.
+     *
+     * @return void
      */
     public function matchPath(?string $regexp)
     {
@@ -105,6 +113,8 @@ public function matchPath(?string $regexp)
      * Adds a check for the client IP.
      *
      * @param string $ip A specific IP address or a range specified using IP/netmask like 192.168.1.0/24
+     *
+     * @return void
      */
     public function matchIp(string $ip)
     {
@@ -115,6 +125,8 @@ public function matchIp(string $ip)
      * Adds a check for the client IP.
      *
      * @param string|string[]|null $ips A specific IP address or a range specified using IP/netmask like 192.168.1.0/24
+     *
+     * @return void
      */
     public function matchIps(string|array|null $ips)
     {
@@ -127,6 +139,8 @@ public function matchIps(string|array|null $ips)
      * Adds a check for the HTTP method.
      *
      * @param string|string[]|null $method An HTTP method or an array of HTTP methods
+     *
+     * @return void
      */
     public function matchMethod(string|array|null $method)
     {
@@ -135,6 +149,8 @@ public function matchMethod(string|array|null $method)
 
     /**
      * Adds a check for request attribute.
+     *
+     * @return void
      */
     public function matchAttribute(string $key, string $regexp)
     {
diff --git a/src/Symfony/Component/HttpFoundation/RequestStack.php b/src/Symfony/Component/HttpFoundation/RequestStack.php
index 6b13fa1e6ec23..5aa8ba793414c 100644
--- a/src/Symfony/Component/HttpFoundation/RequestStack.php
+++ b/src/Symfony/Component/HttpFoundation/RequestStack.php
@@ -31,6 +31,8 @@ class RequestStack
      *
      * This method should generally not be called directly as the stack
      * management should be taken care of by the application itself.
+     *
+     * @return void
      */
     public function push(Request $request)
     {
diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
index 203a8b278d9c4..10450ca5e21d8 100644
--- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
@@ -68,6 +68,9 @@ public function allPreserveCaseWithoutCookies()
         return $headers;
     }
 
+    /**
+     * @return void
+     */
     public function replace(array $headers = [])
     {
         $this->headerNames = [];
@@ -100,6 +103,9 @@ public function all(string $key = null): array
         return $headers;
     }
 
+    /**
+     * @return void
+     */
     public function set(string $key, string|array|null $values, bool $replace = true)
     {
         $uniqueKey = strtr($key, self::UPPER, self::LOWER);
@@ -128,6 +134,9 @@ public function set(string $key, string|array|null $values, bool $replace = true
         }
     }
 
+    /**
+     * @return void
+     */
     public function remove(string $key)
     {
         $uniqueKey = strtr($key, self::UPPER, self::LOWER);
@@ -160,6 +169,9 @@ public function getCacheControlDirective(string $key): bool|string|null
         return $this->computedCacheControl[$key] ?? null;
     }
 
+    /**
+     * @return void
+     */
     public function setCookie(Cookie $cookie)
     {
         $this->cookies[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
@@ -168,6 +180,8 @@ public function setCookie(Cookie $cookie)
 
     /**
      * Removes a cookie from the array, but does not unset it in the browser.
+     *
+     * @return void
      */
     public function removeCookie(string $name, ?string $path = '/', string $domain = null)
     {
@@ -219,6 +233,8 @@ public function getCookies(string $format = self::COOKIES_FLAT): array
 
     /**
      * Clears a cookie in the browser.
+     *
+     * @return void
      */
     public function clearCookie(string $name, ?string $path = '/', string $domain = null, bool $secure = false, bool $httpOnly = true, string $sameSite = null)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
index 665961757982e..ad5a6590a57ac 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
@@ -36,11 +36,17 @@ public function getName(): string
         return $this->name;
     }
 
+    /**
+     * @return void
+     */
     public function setName(string $name)
     {
         $this->name = $name;
     }
 
+    /**
+     * @return void
+     */
     public function initialize(array &$attributes)
     {
         $this->attributes = &$attributes;
@@ -61,6 +67,9 @@ public function get(string $name, mixed $default = null): mixed
         return \array_key_exists($name, $this->attributes) ? $this->attributes[$name] : $default;
     }
 
+    /**
+     * @return void
+     */
     public function set(string $name, mixed $value)
     {
         $this->attributes[$name] = $value;
@@ -71,6 +80,9 @@ public function all(): array
         return $this->attributes;
     }
 
+    /**
+     * @return void
+     */
     public function replace(array $attributes)
     {
         $this->attributes = [];
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
index 00b1ac94866ce..80bbeda0f8828 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
@@ -35,11 +35,17 @@ public function getName(): string
         return $this->name;
     }
 
+    /**
+     * @return void
+     */
     public function setName(string $name)
     {
         $this->name = $name;
     }
 
+    /**
+     * @return void
+     */
     public function initialize(array &$flashes)
     {
         $this->flashes = &$flashes;
@@ -51,6 +57,9 @@ public function initialize(array &$flashes)
         $this->flashes['new'] = [];
     }
 
+    /**
+     * @return void
+     */
     public function add(string $type, mixed $message)
     {
         $this->flashes['new'][$type][] = $message;
@@ -90,11 +99,17 @@ public function all(): array
         return $return;
     }
 
+    /**
+     * @return void
+     */
     public function setAll(array $messages)
     {
         $this->flashes['new'] = $messages;
     }
 
+    /**
+     * @return void
+     */
     public function set(string $type, string|array $messages)
     {
         $this->flashes['new'][$type] = (array) $messages;
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
index a30d9528d1ff8..659d59d18699f 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
@@ -35,16 +35,25 @@ public function getName(): string
         return $this->name;
     }
 
+    /**
+     * @return void
+     */
     public function setName(string $name)
     {
         $this->name = $name;
     }
 
+    /**
+     * @return void
+     */
     public function initialize(array &$flashes)
     {
         $this->flashes = &$flashes;
     }
 
+    /**
+     * @return void
+     */
     public function add(string $type, mixed $message)
     {
         $this->flashes[$type][] = $message;
@@ -81,11 +90,17 @@ public function all(): array
         return $return;
     }
 
+    /**
+     * @return void
+     */
     public function set(string $type, string|array $messages)
     {
         $this->flashes[$type] = (array) $messages;
     }
 
+    /**
+     * @return void
+     */
     public function setAll(array $messages)
     {
         $this->flashes = $messages;
diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
index a55dde4821a96..b45be2f8c36a7 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Session.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -69,6 +69,9 @@ public function get(string $name, mixed $default = null): mixed
         return $this->getAttributeBag()->get($name, $default);
     }
 
+    /**
+     * @return void
+     */
     public function set(string $name, mixed $value)
     {
         $this->getAttributeBag()->set($name, $value);
@@ -79,6 +82,9 @@ public function all(): array
         return $this->getAttributeBag()->all();
     }
 
+    /**
+     * @return void
+     */
     public function replace(array $attributes)
     {
         $this->getAttributeBag()->replace($attributes);
@@ -89,6 +95,9 @@ public function remove(string $name): mixed
         return $this->getAttributeBag()->remove($name);
     }
 
+    /**
+     * @return void
+     */
     public function clear()
     {
         $this->getAttributeBag()->clear();
@@ -154,6 +163,9 @@ public function migrate(bool $destroy = false, int $lifetime = null): bool
         return $this->storage->regenerate($destroy, $lifetime);
     }
 
+    /**
+     * @return void
+     */
     public function save()
     {
         $this->storage->save();
@@ -164,6 +176,9 @@ public function getId(): string
         return $this->storage->getId();
     }
 
+    /**
+     * @return void
+     */
     public function setId(string $id)
     {
         if ($this->storage->getId() !== $id) {
@@ -176,6 +191,9 @@ public function getName(): string
         return $this->storage->getName();
     }
 
+    /**
+     * @return void
+     */
     public function setName(string $name)
     {
         $this->storage->setName($name);
@@ -191,6 +209,9 @@ public function getMetadataBag(): MetadataBag
         return $this->storage->getMetadataBag();
     }
 
+    /**
+     * @return void
+     */
     public function registerBag(SessionBagInterface $bag)
     {
         $this->storage->registerBag(new SessionBagProxy($bag, $this->data, $this->usageIndex, $this->usageReporter));
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
index bc7b22850d8ca..7d7d49ddb4018 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -238,6 +238,8 @@ public function configureSchema(Schema $schema, \Closure $isSameDatabase = null)
      *
      * @throws \PDOException    When the table already exists
      * @throws \DomainException When an unsupported PDO driver is used
+     *
+     * @return void
      */
     public function createTable()
     {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
index f2be617ce59d1..79c03a8e09494 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
@@ -51,6 +51,9 @@ public function __construct(string $storageKey = '_sf2_meta', int $updateThresho
         $this->updateThreshold = $updateThreshold;
     }
 
+    /**
+     * @return void
+     */
     public function initialize(array &$array)
     {
         $this->meta = &$array;
@@ -82,6 +85,8 @@ public function getLifetime(): int
      *                      will leave the system settings unchanged, 0 sets the cookie
      *                      to expire with browser session. Time is in seconds, and is
      *                      not a Unix timestamp.
+     *
+     * @return void
      */
     public function stampNew(int $lifetime = null)
     {
@@ -126,6 +131,8 @@ public function getName(): string
 
     /**
      * Sets name.
+     *
+     * @return void
      */
     public function setName(string $name)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
index 67fa0f95e031a..d30b56d691ec0 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
@@ -68,6 +68,9 @@ public function __construct(string $name = 'MOCKSESSID', MetadataBag $metaBag =
         $this->setMetadataBag($metaBag);
     }
 
+    /**
+     * @return void
+     */
     public function setSessionData(array $array)
     {
         $this->data = $array;
@@ -105,6 +108,9 @@ public function getId(): string
         return $this->id;
     }
 
+    /**
+     * @return void
+     */
     public function setId(string $id)
     {
         if ($this->started) {
@@ -119,11 +125,17 @@ public function getName(): string
         return $this->name;
     }
 
+    /**
+     * @return void
+     */
     public function setName(string $name)
     {
         $this->name = $name;
     }
 
+    /**
+     * @return void
+     */
     public function save()
     {
         if (!$this->started || $this->closed) {
@@ -134,6 +146,9 @@ public function save()
         $this->started = false;
     }
 
+    /**
+     * @return void
+     */
     public function clear()
     {
         // clear out the bags
@@ -148,6 +163,9 @@ public function clear()
         $this->loadSession();
     }
 
+    /**
+     * @return void
+     */
     public function registerBag(SessionBagInterface $bag)
     {
         $this->bags[$bag->getName()] = $bag;
@@ -171,6 +189,9 @@ public function isStarted(): bool
         return $this->started;
     }
 
+    /**
+     * @return void
+     */
     public function setMetadataBag(MetadataBag $bag = null)
     {
         if (1 > \func_num_args()) {
@@ -198,6 +219,9 @@ protected function generateId(): string
         return hash('sha256', uniqid('ss_mock_', true));
     }
 
+    /**
+     * @return void
+     */
     protected function loadSession()
     {
         $bags = array_merge($this->bags, [$this->metadataBag]);
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
index 28771ad54ebb5..95f69f2e1385b 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
@@ -73,6 +73,9 @@ public function regenerate(bool $destroy = false, int $lifetime = null): bool
         return parent::regenerate($destroy, $lifetime);
     }
 
+    /**
+     * @return void
+     */
     public function save()
     {
         if (!$this->started) {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
index 834a5ebd6d5d9..2bf5e8dc19631 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -183,6 +183,9 @@ public function getId(): string
         return $this->saveHandler->getId();
     }
 
+    /**
+     * @return void
+     */
     public function setId(string $id)
     {
         $this->saveHandler->setId($id);
@@ -193,6 +196,9 @@ public function getName(): string
         return $this->saveHandler->getName();
     }
 
+    /**
+     * @return void
+     */
     public function setName(string $name)
     {
         $this->saveHandler->setName($name);
@@ -222,6 +228,9 @@ public function regenerate(bool $destroy = false, int $lifetime = null): bool
         return session_regenerate_id($destroy);
     }
 
+    /**
+     * @return void
+     */
     public function save()
     {
         // Store a copy so we can restore the bags in case the session was not left empty
@@ -261,6 +270,9 @@ public function save()
         $this->started = false;
     }
 
+    /**
+     * @return void
+     */
     public function clear()
     {
         // clear out the bags
@@ -275,6 +287,9 @@ public function clear()
         $this->loadSession();
     }
 
+    /**
+     * @return void
+     */
     public function registerBag(SessionBagInterface $bag)
     {
         if ($this->started) {
@@ -299,6 +314,9 @@ public function getBag(string $name): SessionBagInterface
         return $this->bags[$name];
     }
 
+    /**
+     * @return void
+     */
     public function setMetadataBag(MetadataBag $metaBag = null)
     {
         if (1 > \func_num_args()) {
@@ -330,6 +348,8 @@ public function isStarted(): bool
      * @param array $options Session ini directives [key => value]
      *
      * @see https://php.net/session.configuration
+     *
+     * @return void
      */
     public function setOptions(array $options)
     {
@@ -374,6 +394,8 @@ public function setOptions(array $options)
      * @see https://php.net/sessionhandler
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function setSaveHandler(AbstractProxy|\SessionHandlerInterface $saveHandler = null)
     {
@@ -405,6 +427,8 @@ public function setSaveHandler(AbstractProxy|\SessionHandlerInterface $saveHandl
      * are set to (either PHP's internal, or a custom save handler set with session_set_save_handler()).
      * PHP takes the return value from the read() handler, unserializes it
      * and populates $_SESSION with the result automatically.
+     *
+     * @return void
      */
     protected function loadSession(array &$session = null)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
index eed748f811eb7..28cb3c3d05983 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
@@ -41,6 +41,9 @@ public function start(): bool
         return true;
     }
 
+    /**
+     * @return void
+     */
     public function clear()
     {
         // clear out the bags and nothing else that may be set
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
index 1845ee2c9e9fe..de4fca5fba537 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/AbstractProxy.php
@@ -72,6 +72,8 @@ public function getId(): string
      * Sets the session ID.
      *
      * @throws \LogicException
+     *
+     * @return void
      */
     public function setId(string $id)
     {
@@ -94,6 +96,8 @@ public function getName(): string
      * Sets the session name.
      *
      * @throws \LogicException
+     *
+     * @return void
      */
     public function setName(string $name)
     {
diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
index 4d17cf5db32df..2ddf55f2cb762 100644
--- a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
+++ b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -31,10 +31,16 @@ abstract class Bundle implements BundleInterface
     protected $path;
     private string $namespace;
 
+    /**
+     * @return void
+     */
     public function boot()
     {
     }
 
+    /**
+     * @return void
+     */
     public function shutdown()
     {
     }
@@ -42,6 +48,8 @@ public function shutdown()
     /**
      * This method can be overridden to register compilation passes,
      * other extensions, ...
+     *
+     * @return void
      */
     public function build(ContainerBuilder $container)
     {
@@ -110,6 +118,9 @@ final public function getName(): string
         return $this->name;
     }
 
+    /**
+     * @return void
+     */
     public function registerCommands(Application $application)
     {
     }
@@ -132,7 +143,7 @@ protected function createContainerExtension(): ?ExtensionInterface
         return class_exists($class = $this->getContainerExtensionClass()) ? new $class() : null;
     }
 
-    private function parseClassName()
+    private function parseClassName(): void
     {
         $pos = strrpos(static::class, '\\');
         $this->namespace = false === $pos ? '' : substr(static::class, 0, $pos);
diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php b/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php
index 8ce77e2b74293..0c541f21b858b 100644
--- a/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php
+++ b/src/Symfony/Component/HttpKernel/CacheClearer/ChainCacheClearer.php
@@ -30,7 +30,7 @@ public function __construct(iterable $clearers = [])
         $this->clearers = $clearers;
     }
 
-    public function clear(string $cacheDir)
+    public function clear(string $cacheDir): void
     {
         foreach ($this->clearers as $clearer) {
             $clearer->clear($cacheDir);
diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
index 054f77bc22b3e..3c99b74af3060 100644
--- a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
+++ b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
@@ -57,6 +57,9 @@ public function clearPool(string $name): bool
         return $this->pools[$name]->clear();
     }
 
+    /**
+     * @return void
+     */
     public function clear(string $cacheDir)
     {
         foreach ($this->pools as $pool) {
diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmer.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmer.php
index aef42d62f4265..f940ba4a7233a 100644
--- a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmer.php
+++ b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmer.php
@@ -18,6 +18,9 @@
  */
 abstract class CacheWarmer implements CacheWarmerInterface
 {
+    /**
+     * @return void
+     */
     protected function writeCacheFile(string $file, $content)
     {
         $tmpFile = @tempnam(\dirname($file), basename($file));
diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
index c4d5375f521b7..e5dba5b77683a 100644
--- a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
+++ b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
@@ -36,12 +36,12 @@ public function __construct(iterable $warmers = [], bool $debug = false, string
         $this->deprecationLogsFilepath = $deprecationLogsFilepath;
     }
 
-    public function enableOptionalWarmers()
+    public function enableOptionalWarmers(): void
     {
         $this->optionalsEnabled = true;
     }
 
-    public function enableOnlyOptionalWarmers()
+    public function enableOnlyOptionalWarmers(): void
     {
         $this->onlyOptionalsEnabled = $this->optionalsEnabled = true;
     }
diff --git a/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php
index 6930738a28e31..1c9254e732a7f 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ContainerControllerResolver.php
@@ -54,7 +54,7 @@ protected function instantiateController(string $class): object
         throw new \InvalidArgumentException(sprintf('Controller "%s" does neither exist as service nor as class.', $class), 0, $e);
     }
 
-    private function throwExceptionIfControllerWasRemoved(string $controller, \Throwable $previous)
+    private function throwExceptionIfControllerWasRemoved(string $controller, \Throwable $previous): void
     {
         if ($this->container instanceof Container && isset($this->container->getRemovedIds()[$controller])) {
             throw new \InvalidArgumentException(sprintf('Controller "%s" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?', $controller), 0, $previous);
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php
index fda6a4eaaa92b..016ef2eceb2cc 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/AjaxDataCollector.php
@@ -21,12 +21,12 @@
  */
 class AjaxDataCollector extends DataCollector
 {
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         // all collecting is done client side
     }
 
-    public function reset()
+    public function reset(): void
     {
         // all collecting is done client side
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
index d489b023aa087..9873a9255ad64 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
@@ -29,7 +29,7 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte
     /**
      * Sets the Kernel associated with this Request.
      */
-    public function setKernel(KernelInterface $kernel = null)
+    public function setKernel(KernelInterface $kernel = null): void
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/http-kernel', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -38,7 +38,7 @@ public function setKernel(KernelInterface $kernel = null)
         $this->kernel = $kernel;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         $eom = \DateTimeImmutable::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_MAINTENANCE);
         $eol = \DateTimeImmutable::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_LIFE);
@@ -76,12 +76,12 @@ public function collect(Request $request, Response $response, \Throwable $except
         }
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         $this->data = $this->cloneVar($this->data);
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
index 3a3be3af494bc..698ed31397327 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
@@ -89,14 +89,14 @@ public function __wakeup()
     /**
      * @internal to prevent implementing \Serializable
      */
-    final protected function serialize()
+    final protected function serialize(): void
     {
     }
 
     /**
      * @internal to prevent implementing \Serializable
      */
-    final protected function unserialize(string $data)
+    final protected function unserialize(string $data): void
     {
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
index 1cb865fd66036..8df94ccb8fa23 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
@@ -24,6 +24,8 @@ interface DataCollectorInterface extends ResetInterface
 {
     /**
      * Collects data for the given Request and Response.
+     *
+     * @return void
      */
     public function collect(Request $request, Response $response, \Throwable $exception = null);
 
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
index 48ad9acb6dd11..5738a85144d23 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -68,7 +68,7 @@ public function __clone()
         $this->clonesIndex = ++$this->clonesCount;
     }
 
-    public function dump(Data $data)
+    public function dump(Data $data): void
     {
         $this->stopwatch?->start('dump');
 
@@ -93,7 +93,7 @@ public function dump(Data $data)
         $this->stopwatch?->stop('dump');
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         if (!$this->dataCount) {
             $this->data = [];
@@ -128,7 +128,7 @@ public function collect(Request $request, Response $response, \Throwable $except
         }
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->stopwatch?->reset();
         $this->data = [];
@@ -248,7 +248,7 @@ public function __destruct()
         }
     }
 
-    private function doDump(DataDumperInterface $dumper, Data $data, string $name, string $file, int $line)
+    private function doDump(DataDumperInterface $dumper, Data $data, string $name, string $file, int $line): void
     {
         if ($dumper instanceof CliDumper) {
             $contextDumper = function ($name, $file, $line, $fmt) {
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
index 0c122e6cff71b..944d24c42c6da 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
@@ -38,7 +38,7 @@ public function __construct(EventDispatcherInterface $dispatcher = null, Request
         $this->requestStack = $requestStack;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         $this->currentRequest = $this->requestStack && $this->requestStack->getMainRequest() !== $request ? $request : null;
         $this->data = [
@@ -48,7 +48,7 @@ public function collect(Request $request, Response $response, \Throwable $except
         ];
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
 
@@ -57,7 +57,7 @@ public function reset()
         }
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         if ($this->dispatcher instanceof TraceableEventDispatcher) {
             $this->setCalledListeners($this->dispatcher->getCalledListeners($this->currentRequest));
@@ -71,7 +71,7 @@ public function lateCollect()
     /**
      * @see TraceableEventDispatcher
      */
-    public function setCalledListeners(array $listeners)
+    public function setCalledListeners(array $listeners): void
     {
         $this->data['called_listeners'] = $listeners;
     }
@@ -87,7 +87,7 @@ public function getCalledListeners(): array|Data
     /**
      * @see TraceableEventDispatcher
      */
-    public function setNotCalledListeners(array $listeners)
+    public function setNotCalledListeners(array $listeners): void
     {
         $this->data['not_called_listeners'] = $listeners;
     }
@@ -105,7 +105,7 @@ public function getNotCalledListeners(): array|Data
      *
      * @see TraceableEventDispatcher
      */
-    public function setOrphanedEvents(array $events)
+    public function setOrphanedEvents(array $events): void
     {
         $this->data['orphaned_events'] = $events;
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
index dbe24b414eb60..77601ad90cc3f 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
@@ -22,7 +22,7 @@
  */
 class ExceptionDataCollector extends DataCollector
 {
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         if (null !== $exception) {
             $this->data = [
@@ -31,7 +31,7 @@ public function collect(Request $request, Response $response, \Throwable $except
         }
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LateDataCollectorInterface.php b/src/Symfony/Component/HttpKernel/DataCollector/LateDataCollectorInterface.php
index 012332de479f7..efa1a4f737f63 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/LateDataCollectorInterface.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/LateDataCollectorInterface.php
@@ -20,6 +20,8 @@ interface LateDataCollectorInterface
 {
     /**
      * Collects data as late as possible.
+     *
+     * @return void
      */
     public function lateCollect();
 }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
index 7ea266cecd29e..d10dd365adad7 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
@@ -40,12 +40,12 @@ public function __construct(object $logger = null, string $containerPathPrefix =
         $this->requestStack = $requestStack;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         $this->currentRequest = $this->requestStack && $this->requestStack->getMainRequest() !== $request ? $request : null;
     }
 
-    public function reset()
+    public function reset(): void
     {
         if (isset($this->logger)) {
             $this->logger->clear();
@@ -53,7 +53,7 @@ public function reset()
         $this->data = [];
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         if (isset($this->logger)) {
             $containerDeprecationLogs = $this->getContainerDeprecationLogs();
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
index 474b5bf3fee21..8b88943675c98 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
@@ -26,12 +26,12 @@ public function __construct()
         $this->reset();
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         $this->updateMemoryUsage();
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [
             'memory' => 0,
@@ -39,7 +39,7 @@ public function reset()
         ];
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         $this->updateMemoryUsage();
     }
@@ -54,7 +54,7 @@ public function getMemoryLimit(): int|float
         return $this->data['memory_limit'];
     }
 
-    public function updateMemoryUsage()
+    public function updateMemoryUsage(): void
     {
         $this->data['memory'] = memory_get_peak_usage(true);
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
index fa62bc7de4056..094683ccce4a9 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -44,7 +44,7 @@ public function __construct(RequestStack $requestStack = null)
         $this->requestStack = $requestStack;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         // attributes are serialized and as they can be anything, they need to be converted to strings.
         $attributes = [];
@@ -173,12 +173,12 @@ public function collect(Request $request, Response $response, \Throwable $except
         }
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         $this->data = $this->cloneVar($this->data);
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
         $this->controllers = new \SplObjectStorage();
@@ -400,12 +400,12 @@ public function getForwardToken()
         return $this->data['forward_token'] ?? null;
     }
 
-    public function onKernelController(ControllerEvent $event)
+    public function onKernelController(ControllerEvent $event): void
     {
         $this->controllers[$event->getRequest()] = $event->getController();
     }
 
-    public function onKernelResponse(ResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event): void
     {
         if (!$event->isMainRequest()) {
             return;
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
index d894b7e74c9e4..444138da70346 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
@@ -34,7 +34,7 @@ public function __construct()
     /**
      * @final
      */
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         if ($response instanceof RedirectResponse) {
             $this->data['redirect'] = true;
@@ -48,6 +48,9 @@ public function collect(Request $request, Response $response, \Throwable $except
         unset($this->controllers[$request]);
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->controllers = new \SplObjectStorage();
@@ -69,6 +72,8 @@ protected function guessRoute(Request $request, string|object|array $controller)
 
     /**
      * Remembers the controller associated to each request.
+     *
+     * @return void
      */
     public function onKernelController(ControllerEvent $event)
     {
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
index 1a4169a6d9f34..71881a89f4ea6 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
@@ -33,7 +33,7 @@ public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch
         $this->stopwatch = $stopwatch;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         if (null !== $this->kernel) {
             $startTime = $this->kernel->getStartTime();
@@ -49,14 +49,14 @@ public function collect(Request $request, Response $response, \Throwable $except
         ];
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
 
         $this->stopwatch?->reset();
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         if (null !== $this->stopwatch && isset($this->data['token'])) {
             $this->setEvents($this->stopwatch->getSectionEvents($this->data['token']));
@@ -67,7 +67,7 @@ public function lateCollect()
     /**
      * @param StopwatchEvent[] $events The request events
      */
-    public function setEvents(array $events)
+    public function setEvents(array $events): void
     {
         foreach ($events as $event) {
             $event->ensureStopped();
diff --git a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
index dff3bc9474ab2..4f6c34bc745bf 100644
--- a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
+++ b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
@@ -23,6 +23,9 @@
  */
 class TraceableEventDispatcher extends BaseTraceableEventDispatcher
 {
+    /**
+     * @return void
+     */
     protected function beforeDispatch(string $eventName, object $event)
     {
         switch ($eventName) {
@@ -55,6 +58,9 @@ protected function beforeDispatch(string $eventName, object $event)
         }
     }
 
+    /**
+     * @return void
+     */
     protected function afterDispatch(string $eventName, object $event)
     {
         switch ($eventName) {
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
index 9b691d26ef9d9..1924b1ddb0af6 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
@@ -31,6 +31,9 @@ public function __construct(Kernel $kernel)
         $this->kernel = $kernel;
     }
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $annotatedClasses = [];
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php
index 8401dd4e8c03c..da88e4f78767a 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php
@@ -27,7 +27,7 @@
  */
 abstract class ConfigurableExtension extends Extension
 {
-    final public function load(array $configs, ContainerBuilder $container)
+    final public function load(array $configs, ContainerBuilder $container): void
     {
         $this->loadInternal($this->processConfiguration($this->getConfiguration($configs, $container), $configs), $container);
     }
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
index 281a7782953a0..5bb801c8cde30 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
@@ -28,6 +28,9 @@ class ControllerArgumentValueResolverPass implements CompilerPassInterface
 {
     use PriorityTaggedServiceTrait;
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('argument_resolver')) {
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php b/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php
index c8d546e9d9531..d72efa17242f6 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php
@@ -34,6 +34,8 @@ public function getAnnotatedClassesToCompile(): array
      * Adds annotated classes to the class cache.
      *
      * @param array $annotatedClasses An array of class patterns
+     *
+     * @return void
      */
     public function addAnnotatedClassesToCompile(array $annotatedClasses)
     {
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
index ced62ae38078a..f41d58b81b6ae 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
@@ -25,6 +25,9 @@
  */
 class FragmentRendererPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('fragment.handler')) {
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php
index d780645f1efbf..2b6cb00793bf6 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/LoggerPass.php
@@ -25,6 +25,9 @@
  */
 class LoggerPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $container->setAlias(LoggerInterface::class, 'logger')
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php
index c0bc6eccf261a..cec23e19703f0 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/MergeExtensionConfigurationPass.php
@@ -31,6 +31,9 @@ public function __construct(array $extensions)
         $this->extensions = $extensions;
     }
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         foreach ($this->extensions as $extension) {
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
index c31fb35d71c9b..b294036d4eb98 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -33,6 +33,9 @@
  */
 class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('argument_resolver.service') && !$container->hasDefinition('argument_resolver.not_tagged_controller')) {
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterLocaleAwareServicesPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterLocaleAwareServicesPass.php
index 2141a510d62c0..2a01365bd330c 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterLocaleAwareServicesPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterLocaleAwareServicesPass.php
@@ -23,6 +23,9 @@
  */
 class RegisterLocaleAwareServicesPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('locale_aware_listener')) {
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
index cbc92355d6873..7a21fe0e5943e 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
@@ -21,6 +21,9 @@
  */
 class RemoveEmptyControllerArgumentLocatorsPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $controllerLocator = $container->findDefinition('argument_resolver.controller_locator');
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
index 8418b4da4a68e..da9f8d6320914 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
@@ -23,6 +23,9 @@
  */
 class ResettableServicePass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->has('services_resetter')) {
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ServicesResetter.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ServicesResetter.php
index e7be3b88e7a34..15e40b3ce9b23 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ServicesResetter.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ServicesResetter.php
@@ -36,7 +36,7 @@ public function __construct(\Traversable $resettableServices, array $resetMethod
         $this->resetMethods = $resetMethods;
     }
 
-    public function reset()
+    public function reset(): void
     {
         foreach ($this->resettableServices as $id => $service) {
             foreach ((array) $this->resetMethods[$id] as $resetMethod) {
diff --git a/src/Symfony/Component/HttpKernel/Event/ControllerArgumentsEvent.php b/src/Symfony/Component/HttpKernel/Event/ControllerArgumentsEvent.php
index 0af39671e69f6..64063abf25dde 100644
--- a/src/Symfony/Component/HttpKernel/Event/ControllerArgumentsEvent.php
+++ b/src/Symfony/Component/HttpKernel/Event/ControllerArgumentsEvent.php
@@ -63,7 +63,7 @@ public function getArguments(): array
         return $this->arguments;
     }
 
-    public function setArguments(array $arguments)
+    public function setArguments(array $arguments): void
     {
         $this->arguments = $arguments;
         unset($this->namedArguments);
diff --git a/src/Symfony/Component/HttpKernel/Event/RequestEvent.php b/src/Symfony/Component/HttpKernel/Event/RequestEvent.php
index c7cfcc1e1311e..b81a79b780be9 100644
--- a/src/Symfony/Component/HttpKernel/Event/RequestEvent.php
+++ b/src/Symfony/Component/HttpKernel/Event/RequestEvent.php
@@ -36,6 +36,8 @@ public function getResponse(): ?Response
 
     /**
      * Sets a response and stops event propagation.
+     *
+     * @return void
      */
     public function setResponse(Response $response)
     {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
index c41d6fbef37ab..ea51bcf9b5a82 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
@@ -57,7 +57,7 @@ public function __construct(ContainerInterface $container = null, bool $debug =
         $this->sessionOptions = $sessionOptions;
     }
 
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event): void
     {
         if (!$event->isMainRequest()) {
             return;
@@ -88,7 +88,7 @@ public function onKernelRequest(RequestEvent $event)
         }
     }
 
-    public function onKernelResponse(ResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event): void
     {
         if (!$event->isMainRequest() || (!$this->container->has('initialized_session') && !$event->getRequest()->hasSession())) {
             return;
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php b/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php
index c3fc3fb657229..d4ef3fe498b5b 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php
@@ -34,7 +34,7 @@ public function __construct(array $formats)
     /**
      * Adds request formats.
      */
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event): void
     {
         $request = $event->getRequest();
         foreach ($this->formats as $format => $mimeTypes) {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php b/src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php
index 2230b8f6998bf..723e758cd0c89 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php
@@ -46,6 +46,8 @@ public function __construct(
 
     /**
      * Handles HTTP validation headers.
+     *
+     * @return void
      */
     public function onKernelControllerArguments(ControllerArgumentsEvent $event)
     {
@@ -90,6 +92,8 @@ public function onKernelControllerArguments(ControllerArgumentsEvent $event)
 
     /**
      * Modifies the response to apply HTTP cache headers when needed.
+     *
+     * @return void
      */
     public function onKernelResponse(ResponseEvent $event)
     {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
index 4f9ceb73e3621..76ee7bde711ac 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -67,7 +67,7 @@ public function __construct(callable $exceptionHandler = null, LoggerInterface $
     /**
      * Configures the error handler.
      */
-    public function configure(object $event = null)
+    public function configure(object $event = null): void
     {
         if ($event instanceof ConsoleEvent && !\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
             return;
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php
index 151f96ea7e0d7..4a4090915770e 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php
@@ -36,6 +36,9 @@ public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper
         $this->connection = $connection;
     }
 
+    /**
+     * @return void
+     */
     public function configure()
     {
         $cloner = $this->cloner;
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
index dadd32dda867d..cc6936cfda963 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
@@ -51,6 +51,9 @@ public function __construct(string|object|array|null $controller, LoggerInterfac
         $this->exceptionsMapping = $exceptionsMapping;
     }
 
+    /**
+     * @return void
+     */
     public function logKernelException(ExceptionEvent $event)
     {
         $throwable = $event->getThrowable();
@@ -89,6 +92,9 @@ public function logKernelException(ExceptionEvent $event)
         $this->logException($throwable, sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), $e->getFile(), $e->getLine()), $logLevel);
     }
 
+    /**
+     * @return void
+     */
     public function onKernelException(ExceptionEvent $event)
     {
         if (null === $this->controller) {
@@ -132,6 +138,9 @@ public function removeCspHeader(ResponseEvent $event): void
         }
     }
 
+    /**
+     * @return void
+     */
     public function onControllerArguments(ControllerArgumentsEvent $event)
     {
         $e = $event->getRequest()->attributes->get('exception');
diff --git a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
index 5c2fb09623653..6392d699ff108 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
@@ -50,7 +50,7 @@ public function __construct(UriSigner $signer, string $fragmentPath = '/_fragmen
      *
      * @throws AccessDeniedHttpException if the request does not come from a trusted IP
      */
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event): void
     {
         $request = $event->getRequest();
 
@@ -75,7 +75,7 @@ public function onKernelRequest(RequestEvent $event)
         $request->query->remove('_path');
     }
 
-    protected function validateRequest(Request $request)
+    protected function validateRequest(Request $request): void
     {
         // is the Request safe?
         if (!$request->isMethodSafe()) {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
index 2502fa4be9d23..4516048be7f4c 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -44,12 +44,12 @@ public function __construct(RequestStack $requestStack, string $defaultLocale =
         $this->enabledLocales = $enabledLocales;
     }
 
-    public function setDefaultLocale(KernelEvent $event)
+    public function setDefaultLocale(KernelEvent $event): void
     {
         $event->getRequest()->setDefaultLocale($this->defaultLocale);
     }
 
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event): void
     {
         $request = $event->getRequest();
 
@@ -57,14 +57,14 @@ public function onKernelRequest(RequestEvent $event)
         $this->setRouterContext($request);
     }
 
-    public function onKernelFinishRequest(FinishRequestEvent $event)
+    public function onKernelFinishRequest(FinishRequestEvent $event): void
     {
         if (null !== $parentRequest = $this->requestStack->getParentRequest()) {
             $this->setRouterContext($parentRequest);
         }
     }
 
-    private function setLocale(Request $request)
+    private function setLocale(Request $request): void
     {
         if ($locale = $request->attributes->get('_locale')) {
             $request->setLocale($locale);
@@ -76,7 +76,7 @@ private function setLocale(Request $request)
         }
     }
 
-    private function setRouterContext(Request $request)
+    private function setRouterContext(Request $request): void
     {
         $this->router?->getContext()->setParameter('_locale', $request->getLocale());
     }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
index d63c0493d74c4..716d939fd023a 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
@@ -63,7 +63,7 @@ public function __construct(Profiler $profiler, RequestStack $requestStack, Requ
     /**
      * Handles the onKernelException event.
      */
-    public function onKernelException(ExceptionEvent $event)
+    public function onKernelException(ExceptionEvent $event): void
     {
         if ($this->onlyMainRequests && !$event->isMainRequest()) {
             return;
@@ -75,7 +75,7 @@ public function onKernelException(ExceptionEvent $event)
     /**
      * Handles the onKernelResponse event.
      */
-    public function onKernelResponse(ResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event): void
     {
         if ($this->onlyMainRequests && !$event->isMainRequest()) {
             return;
@@ -119,7 +119,7 @@ public function onKernelResponse(ResponseEvent $event)
         $this->parents[$request] = $this->requestStack->getParentRequest();
     }
 
-    public function onKernelTerminate(TerminateEvent $event)
+    public function onKernelTerminate(TerminateEvent $event): void
     {
         // attach children to parents
         foreach ($this->profiles as $request) {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php b/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php
index 435fd31d1bb77..5825e16e44213 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php
@@ -36,7 +36,7 @@ public function __construct(string $charset, bool $addContentLanguageHeader = fa
     /**
      * Filters the Response.
      */
-    public function onKernelResponse(ResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event): void
     {
         if (!$event->isMainRequest()) {
             return;
diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
index ffdbb89ce59a2..7b358177d9538 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
@@ -68,7 +68,7 @@ public function __construct(UrlMatcherInterface|RequestMatcherInterface $matcher
         $this->debug = $debug;
     }
 
-    private function setCurrentRequest(?Request $request)
+    private function setCurrentRequest(?Request $request): void
     {
         if (null !== $request) {
             try {
@@ -83,12 +83,12 @@ private function setCurrentRequest(?Request $request)
      * After a sub-request is done, we need to reset the routing context to the parent request so that the URL generator
      * operates on the correct context again.
      */
-    public function onKernelFinishRequest()
+    public function onKernelFinishRequest(): void
     {
         $this->setCurrentRequest($this->requestStack->getParentRequest());
     }
 
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event): void
     {
         $request = $event->getRequest();
 
@@ -133,7 +133,7 @@ public function onKernelRequest(RequestEvent $event)
         }
     }
 
-    public function onKernelException(ExceptionEvent $event)
+    public function onKernelException(ExceptionEvent $event): void
     {
         if (!$this->debug || !($e = $event->getThrowable()) instanceof NotFoundHttpException) {
             return;
diff --git a/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php b/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php
index c0b74fdf0ed61..312d5ee23b68e 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php
@@ -33,7 +33,7 @@ class StreamedResponseListener implements EventSubscriberInterface
     /**
      * Filters the Response.
      */
-    public function onKernelResponse(ResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event): void
     {
         if (!$event->isMainRequest()) {
             return;
diff --git a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
index 3d1be0f2e1097..17bdf2b392789 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
@@ -36,7 +36,7 @@ public function __construct(SurrogateInterface $surrogate = null)
     /**
      * Filters the Response.
      */
-    public function onKernelResponse(ResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event): void
     {
         if (!$event->isMainRequest()) {
             return;
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php b/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php
index e2501c57773a5..187633d5d4764 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php
@@ -27,7 +27,7 @@ class ValidateRequestListener implements EventSubscriberInterface
     /**
      * Performs the validatio
10000
n.
      */
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event): void
     {
         if (!$event->isMainRequest()) {
             return;
diff --git a/src/Symfony/Component/HttpKernel/Exception/HttpException.php b/src/Symfony/Component/HttpKernel/Exception/HttpException.php
index 418271065aeae..e12abce0042a1 100644
--- a/src/Symfony/Component/HttpKernel/Exception/HttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/HttpException.php
@@ -39,6 +39,9 @@ public function getHeaders(): array
         return $this->headers;
     }
 
+    /**
+     * @return void
+     */
     public function setHeaders(array $headers)
     {
         $this->headers = $headers;
diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
index dfc03db42d74d..62b21e6d4e083 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
@@ -48,6 +48,8 @@ public function __construct(RequestStack $requestStack, array $renderers = [], b
 
     /**
      * Adds a renderer.
+     *
+     * @return void
      */
     public function addRenderer(FragmentRendererInterface $renderer)
     {
diff --git a/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
index 416b670417b90..47027233a7220 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
@@ -31,6 +31,8 @@ abstract class RoutableFragmentRenderer implements FragmentRendererInterface
      * Sets the fragment path that triggers the fragment listener.
      *
      * @see FragmentListener
+     *
+     * @return void
      */
     public function setFragmentPath(string $path)
     {
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
index ca01a9240b373..f158cca3f9a9a 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
@@ -55,6 +55,9 @@ public function hasSurrogateCapability(Request $request): bool
         return str_contains($value, sprintf('%s/1.0', strtoupper($this->getName())));
     }
 
+    /**
+     * @return void
+     */
     public function addSurrogateCapability(Request $request)
     {
         $current = $request->headers->get('Surrogate-Capability');
@@ -101,6 +104,8 @@ public function handle(HttpCache $cache, string $uri, string $alt, bool $ignoreE
 
     /**
      * Remove the Surrogate from the Surrogate-Control header.
+     *
+     * @return void
      */
     protected function removeFromControl(Response $response)
     {
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
index 9e7c3f898ab83..4730b33c132f1 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
@@ -32,6 +32,9 @@ public function getName(): string
         return 'esi';
     }
 
+    /**
+     * @return void
+     */
     public function addSurrogateControl(Response $response)
     {
         if (str_contains($response->getContent(), '<esi:include')) {
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
index f77a99e0ffa83..60ff78cf276aa 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -127,7 +127,7 @@ public function getTraces(): array
         return $this->traces;
     }
 
-    private function addTraces(Response $response)
+    private function addTraces(Response $response): void
     {
         $traceString = null;
 
@@ -236,6 +236,9 @@ public function handle(Request $request, int $type = HttpKernelInterface::MAIN_R
         return $response;
     }
 
+    /**
+     * @return void
+     */
     public function terminate(Request $request, Response $response)
     {
         // Do not call any listeners in case of a cache hit.
@@ -587,6 +590,8 @@ protected function lock(Request $request, Response $entry): bool
      * Writes the Response to the cache.
      *
      * @throws \Exception
+     *
+     * @return void
      */
     protected function store(Request $request, Response $response)
     {
@@ -611,7 +616,7 @@ protected function store(Request $request, Response $response)
     /**
      * Restores the Response body.
      */
-    private function restoreResponseBody(Request $request, Response $response)
+    private function restoreResponseBody(Request $request, Response $response): void
     {
         if ($response->headers->has('X-Body-Eval')) {
             ob_start();
@@ -640,6 +645,9 @@ private function restoreResponseBody(Request $request, Response $response)
         $response->headers->remove('X-Body-File');
     }
 
+    /**
+     * @return void
+     */
     protected function processResponseBody(Request $request, Response $response)
     {
         if ($this->surrogate?->needsParsing($response)) {
@@ -671,7 +679,7 @@ private function isPrivateRequest(Request $request): bool
     /**
      * Records that an event took place.
      */
-    private function record(Request $request, string $event)
+    private function record(Request $request, string $event): void
     {
         $this->traces[$this->getTraceKey($request)][] = $event;
     }
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
index 0c9f10823a5c4..1bdaab148a9ee 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
@@ -54,6 +54,9 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface
         'expires' => null,
     ];
 
+    /**
+     * @return void
+     */
     public function add(Response $response)
     {
         ++$this->embeddedResponses;
@@ -95,6 +98,9 @@ public function add(Response $response)
         }
     }
 
+    /**
+     * @return void
+     */
     public function update(Response $response)
     {
         // if we have no embedded Response, do nothing
@@ -209,7 +215,7 @@ private function willMakeFinalResponseUncacheable(Response $response): bool
      * as cacheable in a public (shared) cache, but did not provide an explicit lifetime that would serve
      * as an upper bound. In this case, we can proceed and possibly keep the directive on the final response.
      */
-    private function storeRelativeAgeDirective(string $directive, ?int $value, int $age, bool $isHeuristicallyCacheable)
+    private function storeRelativeAgeDirective(string $directive, ?int $value, int $age, bool $isHeuristicallyCacheable): void
     {
         if (null === $value) {
             if ($isHeuristicallyCacheable) {
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
index 4bd1cef0a7885..bde72914a7adc 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
@@ -26,6 +26,9 @@ public function getName(): string
         return 'ssi';
     }
 
+    /**
+     * @return void
+     */
     public function addSurrogateControl(Response $response)
     {
         if (str_contains($response->getContent(), '<!--#include')) {
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
index facd20b94240e..e7ea54ae1547c 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Store.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -55,6 +55,8 @@ public function __construct(string $root, array $options = [])
 
     /**
      * Cleanups storage.
+     *
+     * @return void
      */
     public function cleanup()
     {
@@ -248,6 +250,8 @@ protected function generateContentDigest(Response $response): string
      * Invalidates all cache entries that match the request.
      *
      * @throws \RuntimeException
+     *
+     * @return void
      */
     public function invalidate(Request $request)
     {
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
index 7f5c592506c0f..794a55dc18f9c 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -92,6 +92,9 @@ public function handle(Request $request, int $type = HttpKernelInterface::MAIN_R
         }
     }
 
+    /**
+     * @return void
+     */
     public function terminate(Request $request, Response $response)
     {
         $this->dispatcher->dispatch(new TerminateEvent($this, $request, $response), KernelEvents::TERMINATE);
@@ -100,7 +103,7 @@ public function terminate(Request $request, Response $response)
     /**
      * @internal
      */
-    public function terminateWithException(\Throwable $exception, Request $request = null)
+    public function terminateWithException(\Throwable $exception, Request $request = null): void
     {
         if (!$request ??= $this->requestStack->getMainRequest()) {
             throw $exception;
@@ -207,7 +210,7 @@ private function filterResponse(Response $response, Request $request, int $type)
      * operations such as {@link RequestStack::getParentRequest()} can lead to
      * weird results.
      */
-    private function finishRequest(Request $request, int $type)
+    private function finishRequest(Request $request, int $type): void
     {
         $this->dispatcher->dispatch(new FinishRequestEvent($this, $request, $type), KernelEvents::FINISH_REQUEST);
     }
diff --git a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
index 3077ed0398164..0f3630e7febdd 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
@@ -47,6 +47,8 @@ public function __construct(HttpKernelInterface $kernel, array $server = [], His
 
     /**
      * Sets whether to catch exceptions when the kernel is handling a request.
+     *
+     * @return void
      */
     public function catchExceptions(bool $catchExceptions)
     {
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index ef3a92baf8a64..8157d0a2ada17 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -103,6 +103,9 @@ public function __clone()
         $this->resetServices = false;
     }
 
+    /**
+     * @return void
+     */
     public function boot()
     {
         if (true === $this->booted) {
@@ -131,6 +134,9 @@ public function boot()
         $this->booted = true;
     }
 
+    /**
+     * @return void
+     */
     public function reboot(?string $warmupDir)
     {
         $this->shutdown();
@@ -138,6 +144,9 @@ public function reboot(?string $warmupDir)
         $this->boot();
     }
 
+    /**
+     * @return void
+     */
     public function terminate(Request $request, Response $response)
     {
         if (false === $this->booted) {
@@ -149,6 +158,9 @@ public function terminate(Request $request, Response $response)
         }
     }
 
+    /**
+     * @return void
+     */
     public function shutdown()
     {
         if (false === $this->booted) {
@@ -281,7 +293,7 @@ public function getContainer(): ContainerInterface
     /**
      * @internal
      */
-    public function setAnnotatedClassCache(array $annotatedClasses)
+    public function setAnnotatedClassCache(array $annotatedClasses): void
     {
         file_put_contents(($this->warmupDir ?: $this->getBuildDir()).'/annotations.map', sprintf('<?php return %s;', var_export($annotatedClasses, true)));
     }
@@ -324,6 +336,8 @@ public function getAnnotatedClassesToCompile(): array
      * Initializes bundles.
      *
      * @throws \LogicException if two bundles share a common name
+     *
+     * @return void
      */
     protected function initializeBundles()
     {
@@ -342,6 +356,8 @@ protected function initializeBundles()
      * The extension point similar to the Bundle::build() method.
      *
      * Use this method to register compiler passes and manipulate the container during the building process.
+     *
+     * @return void
      */
     protected function build(ContainerBuilder $container)
     {
@@ -380,6 +396,8 @@ protected function getContainerBaseClass(): string
      *
      * The built version of the service container is used when fresh, otherwise the
      * container is built.
+     *
+     * @return void
      */
     protected function initializeContainer()
     {
@@ -592,6 +610,8 @@ protected function buildContainer(): ContainerBuilder
 
     /**
      * Prepares the ContainerBuilder before it is compiled.
+     *
+     * @return void
      */
     protected function prepareContainer(ContainerBuilder $container)
     {
@@ -643,6 +663,8 @@ protected function getContainerBuilder(): ContainerBuilder
      *
      * @param string $class     The name of the class to generate
      * @param string $baseClass The name of the container's base class
+     *
+     * @return void
      */
     protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container, string $class, string $baseClass)
     {
diff --git a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
index 3add13d5e9149..0fdbfc44bab16 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
@@ -87,6 +87,9 @@ public function find(?string $ip, ?string $url, ?int $limit, ?string $method, in
         return array_values($result);
     }
 
+    /**
+     * @return void
+     */
     public function purge()
     {
         $flags = \FilesystemIterator::SKIP_DOTS;
@@ -295,7 +298,7 @@ private function doRead($token, Profile $profile = null): ?Profile
         return $this->createProfileFromData($token, $data, $profile);
     }
 
-    private function removeExpiredProfiles()
+    private function removeExpiredProfiles(): void
     {
         $minimalProfileTimestamp = time() - 2 * 86400;
         $file = $this->getIndexFilename();
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profile.php b/src/Symfony/Component/HttpKernel/Profiler/Profile.php
index 5ca2d96009534..8de1468ac6d35 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/Profile.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/Profile.php
@@ -44,6 +44,9 @@ public function __construct(string $token)
         $this->token = $token;
     }
 
+    /**
+     * @return void
+     */
     public function setToken(string $token)
     {
         $this->token = $token;
@@ -59,6 +62,8 @@ public function getToken(): string
 
     /**
      * Sets the parent token.
+     *
+     * @return void
      */
     public function setParent(self $parent)
     {
@@ -89,6 +94,9 @@ public function getIp(): ?string
         return $this->ip;
     }
 
+    /**
+     * @return void
+     */
     public function setIp(?string $ip)
     {
         $this->ip = $ip;
@@ -102,6 +110,9 @@ public function getMethod(): ?string
         return $this->method;
     }
 
+    /**
+     * @return void
+     */
     public function setMethod(string $method)
     {
         $this->method = $method;
@@ -115,6 +126,9 @@ public function getUrl(): ?string
         return $this->url;
     }
 
+    /**
+     * @return void
+     */
     public function setUrl(?string $url)
     {
         $this->url = $url;
@@ -125,11 +139,17 @@ public function getTime(): int
         return $this->time ?? 0;
     }
 
+    /**
+     * @return void
+     */
     public function setTime(int $time)
     {
         $this->time = $time;
     }
 
+    /**
+     * @return void
+     */
     public function setStatusCode(int $statusCode)
     {
         $this->statusCode = $statusCode;
@@ -154,6 +174,8 @@ public function getChildren(): array
      * Sets children profiler.
      *
      * @param Profile[] $children
+     *
+     * @return void
      */
     public function setChildren(array $children)
     {
@@ -165,6 +187,8 @@ public function setChildren(array $children)
 
     /**
      * Adds the child token.
+     *
+     * @return void
      */
     public function addChild(self $child)
     {
@@ -211,6 +235,8 @@ public function getCollectors(): array
      * Sets the Collectors associated with this profile.
      *
      * @param DataCollectorInterface[] $collectors
+     *
+     * @return void
      */
     public function setCollectors(array $collectors)
     {
@@ -222,6 +248,8 @@ public function setCollectors(array $collectors)
 
     /**
      * Adds a Collector.
+     *
+     * @return void
      */
     public function addCollector(DataCollectorInterface $collector)
     {
diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
index 884c926b834bc..5d6fad8fe3d83 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
@@ -46,6 +46,8 @@ public function __construct(ProfilerStorageInterface $storage, LoggerInterface $
 
     /**
      * Disables the profiler.
+     *
+     * @return void
      */
     public function disable()
     {
@@ -54,6 +56,8 @@ public function disable()
 
     /**
      * Enables the profiler.
+     *
+     * @return void
      */
     public function enable()
     {
@@ -106,6 +110,8 @@ public function saveProfile(Profile $profile): bool
 
     /**
      * Purges all data from the storage.
+     *
+     * @return void
      */
     public function purge()
     {
@@ -162,6 +168,9 @@ public function collect(Request $request, Response $response, \Throwable $except
         return $profile;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         foreach ($this->collectors as $collector) {
@@ -182,6 +191,8 @@ public function all(): array
      * Sets the Collectors associated with this profiler.
      *
      * @param DataCollectorInterface[] $collectors An array of collectors
+     *
+     * @return void
      */
     public function set(array $collectors = [])
     {
@@ -193,6 +204,8 @@ public function set(array $collectors = [])
 
     /**
      * Adds a Collector.
+     *
+     * @return void
      */
     public function add(DataCollectorInterface $collector)
     {
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
index 3c8d27449c027..bac4be1e7c83f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
@@ -14,7 +14,11 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+use Symfony\Component\VarDumper\Cloner\Data;
 
+/**
+ * @final since Symfony 6.3
+ */
 class CloneVarDataCollector extends DataCollector
 {
     private $varToClone;
@@ -24,16 +28,25 @@ public function __construct($varToClone)
         $this->varToClone = $varToClone;
     }
 
+    /**
+     * @return void
+     */
     public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         $this->data = $this->cloneVar($this->varToClone);
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->data = [];
     }
 
+    /**
+     * @return Data
+     */
     public function getData()
     {
         return $this->data;
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index 2c7c8c5a38674..73800bab3886b 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -647,7 +647,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
             {
             }
 
-            public function boot()
+            public function boot(): void
             {
                 $this->container->compile();
                 parent::dumpContainer(new ConfigCache(tempnam(sys_get_temp_dir(), 'symfony-kernel-deprecated-parameter'), true), $this->container, Container::class, $this->getContainerBaseClass());
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php
index 2db3713eee8c0..c24c54d34d0a7 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php
@@ -43,7 +43,7 @@ public function __construct(string $genrb = 'genrb', string $envVars = '')
         $this->genrb = ($envVars ? $envVars.' ' : '').$genrb;
     }
 
-    public function compile(string $sourcePath, string $targetDir)
+    public function compile(string $sourcePath, string $targetDir): void
     {
         if (is_dir($sourcePath)) {
             $sourcePath .= '/*.txt';
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php
index 7ab254e4dd60e..784f3029a74ff 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php
@@ -53,7 +53,7 @@ public function __construct(BundleReaderInterface $reader)
      *
      * @param array $localeAliases A mapping of locale aliases to locales
      */
-    public function setLocaleAliases(array $localeAliases)
+    public function setLocaleAliases(array $localeAliases): void
     {
         $this->localeAliases = $localeAliases;
     }
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/JsonBundleWriter.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/JsonBundleWriter.php
index 82f6beba696a9..d1c793c44e184 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Writer/JsonBundleWriter.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Writer/JsonBundleWriter.php
@@ -20,7 +20,7 @@
  */
 class JsonBundleWriter implements BundleWriterInterface
 {
-    public function write(string $path, string $locale, mixed $data)
+    public function write(string $path, string $locale, mixed $data): void
     {
         if ($data instanceof \Traversable) {
             $data = iterator_to_array($data);
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/PhpBundleWriter.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/PhpBundleWriter.php
index fd95d16e98cb6..f523db0452db8 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Writer/PhpBundleWriter.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Writer/PhpBundleWriter.php
@@ -20,7 +20,7 @@
  */
 class PhpBundleWriter implements BundleWriterInterface
 {
-    public function write(string $path, string $locale, mixed $data)
+    public function write(string $path, string $locale, mixed $data): void
     {
         $template = <<<'TEMPLATE'
 <?php
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php
index f9e577777406b..59c003923472a 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php
@@ -26,7 +26,7 @@
  */
 class TextBundleWriter implements BundleWriterInterface
 {
-    public function write(string $path, string $locale, mixed $data, bool $fallback = true)
+    public function write(string $path, string $locale, mixed $data, bool $fallback = true): void
     {
         $file = fopen($path.'/'.$locale.'.txt', 'w');
 
@@ -43,7 +43,7 @@ public function write(string $path, string $locale, mixed $data, bool $fallback
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
-    private function writeResourceBundle($file, string $bundleName, mixed $value, bool $fallback)
+    private function writeResourceBundle($file, string $bundleName, mixed $value, bool $fallback): void
     {
         fwrite($file, $bundleName);
 
@@ -60,7 +60,7 @@ private function writeResourceBundle($file, string $bundleName, mixed $value, bo
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
-    private function writeResource($file, mixed $value, int $indentation, bool $requireBraces = true)
+    private function writeResource($file, mixed $value, int $indentation, bool $requireBraces = true): void
     {
         if (\is_int($value)) {
             $this->writeInteger($file, $value);
@@ -109,7 +109,7 @@ private function writeResource($file, mixed $value, int $indentation, bool $requ
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
-    private function writeInteger($file, int $value)
+    private function writeInteger($file, int $value): void
     {
         fprintf($file, ':int{%d}', $value);
     }
@@ -121,7 +121,7 @@ private function writeInteger($file, int $value)
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
-    private function writeIntVector($file, array $value, int $indentation)
+    private function writeIntVector($file, array $value, int $indentation): void
     {
         fwrite($file, ":intvector{\n");
 
@@ -139,7 +139,7 @@ private function writeIntVector($file, array $value, int $indentation)
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
-    private function writeString($file, string $value, bool $requireBraces = true)
+    private function writeString($file, string $value, bool $requireBraces = true): void
     {
         if ($requireBraces) {
             fprintf($file, '{"%s"}', $value);
@@ -157,7 +157,7 @@ private function writeString($file, string $value, bool $requireBraces = true)
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
-    private function writeArray($file, array $value, int $indentation)
+    private function writeArray($file, array $value, int $indentation): void
     {
         fwrite($file, "{\n");
 
@@ -177,7 +177,7 @@ private function writeArray($file, array $value, int $indentation)
      *
      * @param resource $file The file handle to write to
      */
-    private function writeTable($file, iterable $value, int $indentation, bool $fallback = true)
+    private function writeTable($file, iterable $value, int $indentation, bool $fallback = true): void
     {
         if (!$fallback) {
             fwrite($file, ':table(nofallback)');
diff --git a/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php b/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php
index 809c56cee8d55..a3b00d980c2c4 100644
--- a/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php
+++ b/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php
@@ -39,7 +39,7 @@ public function __construct(string $sourceDir, string $icuVersion)
     /**
      * Adds a writer to be used during the data conversion.
      */
-    public function addBundleWriter(string $targetDir, BundleWriterInterface $writer)
+    public function addBundleWriter(string $targetDir, BundleWriterInterface $writer): void
     {
         $this->bundleWriters[$targetDir] = $writer;
     }
diff --git a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php
index f6daf9bd61abd..2e9dbeabd34ec 100644
--- a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php
@@ -42,7 +42,7 @@ protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
         return $this->locales;
     }
 
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir): void
     {
         $filesystem = new Filesystem();
         $filesystem->mkdir([
@@ -53,7 +53,7 @@ protected function compileTemporaryBundles(BundleCompilerInterface $compiler, st
         $compiler->compile($sourceDir.'/region', $tempDir.'/region');
     }
 
-    protected function preGenerate()
+    protected function preGenerate(): void
     {
         // Write parents locale file for the Translation component
         file_put_contents(
diff --git a/src/Symfony/Component/Intl/Locale.php b/src/Symfony/Component/Intl/Locale.php
index 7496e92ff4e72..387b1f5a78303 100644
--- a/src/Symfony/Component/Intl/Locale.php
+++ b/src/Symfony/Component/Intl/Locale.php
@@ -34,7 +34,7 @@ final class Locale extends \Locale
      *
      * @see getFallback()
      */
-    public static function setDefaultFallback(?string $locale)
+    public static function setDefaultFallback(?string $locale): void
     {
         self::$defaultFallback = $locale;
     }
diff --git a/src/Symfony/Component/Intl/Resources/bin/common.php b/src/Symfony/Component/Intl/Resources/bin/common.php
index 6cbab2524508c..37594dab26162 100644
--- a/src/Symfony/Component/Intl/Resources/bin/common.php
+++ b/src/Symfony/Component/Intl/Resources/bin/common.php
@@ -44,14 +44,14 @@ function centered(string $text)
     return str_repeat(' ', $padding).$text;
 }
 
-function cd(string $dir)
+function cd(string $dir): void
 {
     if (false === chdir($dir)) {
         bailout("Could not switch to directory $dir.");
     }
 }
 
-function run(string $command)
+function run(string $command): void
 {
     exec($command, $output, $status);
 
diff --git a/src/Symfony/Component/Intl/Util/GitRepository.php b/src/Symfony/Component/Intl/Util/GitRepository.php
index c5f73f0f1e976..acbe8c49d697d 100644
--- a/src/Symfony/Component/Intl/Util/GitRepository.php
+++ b/src/Symfony/Component/Intl/Util/GitRepository.php
@@ -80,7 +80,7 @@ public function getLastTag(callable $filter = null): string
         return $this->getLastLine($tags);
     }
 
-    public function checkout(string $branch)
+    public function checkout(string $branch): void
     {
         $this->execInPath(sprintf('git checkout %s', escapeshellarg($branch)));
     }
diff --git a/src/Symfony/Component/Intl/Util/IntlTestHelper.php b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
index 3c56c4d4dd550..d22f2e6953e3f 100644
--- a/src/Symfony/Component/Intl/Util/IntlTestHelper.php
+++ b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
@@ -29,6 +29,8 @@ class IntlTestHelper
 {
     /**
      * Should be called before tests that work fine with the stub implementation.
+     *
+     * @return void
      */
     public static function requireIntl(TestCase $testCase, string $minimumIcuVersion = null)
     {
@@ -61,6 +63,8 @@ public static function requireIntl(TestCase $testCase, string $minimumIcuVersion
     /**
      * Should be called before tests that require a feature-complete intl
      * implementation.
+     *
+     * @return void
      */
     public static function requireFullIntl(TestCase $testCase, string $minimumIcuVersion = null)
     {
@@ -81,6 +85,8 @@ public static function requireFullIntl(TestCase $testCase, string $minimumIcuVer
 
     /**
      * Skips the test unless the current system has a 32bit architecture.
+     *
+     * @return void
      */
     public static function require32Bit(TestCase $testCase)
     {
@@ -91,6 +97,8 @@ public static function require32Bit(TestCase $testCase)
 
     /**
      * Skips the test unless the current system has a 64bit architecture.
+     *
+     * @return void
      */
     public static function require64Bit(TestCase $testCase)
     {
diff --git a/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php b/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php
index 4f6b0c8222dab..7c85f09258464 100644
--- a/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php
+++ b/src/Symfony/Component/Ldap/Adapter/AbstractConnection.php
@@ -30,6 +30,9 @@ public function __construct(array $config = [])
         $this->config = $resolver->resolve($config);
     }
 
+    /**
+     * @return void
+     */
     protected function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
index ea4fb6b48d185..2daa651b7a6af 100644
--- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
+++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
@@ -63,6 +63,8 @@ public function isBound(): bool
 
     /**
      * @param string $password WARNING: When the LDAP server allows unauthenticated binds, a blank $password will always be valid
+     *
+     * @return void
      */
     public function bind(string $dn = null, #[\SensitiveParameter] string $password = null)
     {
@@ -96,6 +98,9 @@ public function getResource()
         return $this->connection;
     }
 
+    /**
+     * @return void
+     */
     public function setOption(string $name, array|string|int|bool $value)
     {
         if (!@ldap_set_option($this->connection, ConnectionOptions::getOption($name), $value)) {
@@ -103,6 +108,9 @@ public function setOption(string $name, array|string|int|bool $value)
         }
     }
 
+    /**
+     * @return array|string|int|null
+     */
     public function getOption(string $name)
     {
         if (!@ldap_get_option($this->connection, ConnectionOptions::getOption($name), $ret)) {
@@ -112,6 +120,9 @@ public function getOption(string $name)
         return $ret;
     }
 
+    /**
+     * @return void
+     */
     protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
@@ -138,7 +149,7 @@ protected function configureOptions(OptionsResolver $resolver)
         });
     }
 
-    private function connect()
+    private function connect(): void
     {
         if ($this->connection) {
             return;
@@ -167,7 +178,7 @@ private function connect()
         }
     }
 
-    private function disconnect()
+    private function disconnect(): void
     {
         if ($this->connection) {
             ldap_unbind($this->connection);
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
index e919a1152a121..20f0922384024 100644
--- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
+++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
@@ -111,6 +111,9 @@ public function removeAttributeValues(Entry $entry, string $attribute, array $va
         return $this;
     }
 
+    /**
+     * @return $this
+     */
     public function rename(Entry $entry, string $newRdn, bool $removeOldRdn = true)
     {
         $con = $this->getConnectionResource();
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
index ad1a52aa14419..32d6fc2a43208 100644
--- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
+++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
@@ -160,7 +160,7 @@ public function getResources(): array
     /**
      * Resets pagination on the current connection.
      */
-    private function resetPagination()
+    private function resetPagination(): void
     {
         $con = $this->connection->getResource();
         $this->controlPagedResult(0, false, '');
diff --git a/src/Symfony/Component/Ldap/Entry.php b/src/Symfony/Component/Ldap/Entry.php
index b1a60635ba172..0d008d8ecd5b1 100644
--- a/src/Symfony/Component/Ldap/Entry.php
+++ b/src/Symfony/Component/Ldap/Entry.php
@@ -96,6 +96,8 @@ public function getAttributes(): array
 
     /**
      * Sets a value for the given attribute.
+     *
+     * @return void
      */
     public function setAttribute(string $name, array $value)
     {
@@ -105,6 +107,8 @@ public function setAttribute(string $name, array $value)
 
     /**
      * Removes a given attribute.
+     *
+     * @return void
      */
     public function removeAttribute(string $name)
     {
diff --git a/src/Symfony/Component/Ldap/Ldap.php b/src/Symfony/Component/Ldap/Ldap.php
index f16633f786ce0..c44578a2aa72d 100644
--- a/src/Symfony/Component/Ldap/Ldap.php
+++ b/src/Symfony/Component/Ldap/Ldap.php
@@ -29,7 +29,7 @@ public function __construct(AdapterInterface $adapter)
         $this->adapter = $adapter;
     }
 
-    public function bind(string $dn = null, #[\SensitiveParameter] string $password = null)
+    public function bind(string $dn = null, #[\SensitiveParameter] string $password = null): void
     {
         $this->adapter->getConnection()->bind($dn, $password);
     }
diff --git a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php b/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php
index a1bcfd9546d69..7e535ebde1267 100644
--- a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php
+++ b/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php
@@ -36,6 +36,9 @@ public function __construct(ContainerInterface $ldapLocator)
         $this->ldapLocator = $ldapLocator;
     }
 
+    /**
+     * @return void
+     */
     public function onCheckPassport(CheckPassportEvent $event)
     {
         $passport = $event->getPassport();
diff --git a/src/Symfony/Component/Ldap/Security/LdapUser.php b/src/Symfony/Component/Ldap/Security/LdapUser.php
index b66fd4e047ff0..abc293ac90132 100644
--- a/src/Symfony/Component/Ldap/Security/LdapUser.php
+++ b/src/Symfony/Component/Ldap/Security/LdapUser.php
@@ -75,7 +75,7 @@ public function getUserIdentifier(): string
         return $this->identifier;
     }
 
-    public function eraseCredentials()
+    public function eraseCredentials(): void
     {
         $this->password = null;
     }
@@ -85,7 +85,7 @@ public function getExtraFields(): array
         return $this->extraFields;
     }
 
-    public function setPassword(#[\SensitiveParameter] string $password)
+    public function setPassword(#[\SensitiveParameter] string $password): void
     {
         $this->password = $password;
     }
diff --git a/src/Symfony/Component/Lock/Key.php b/src/Symfony/Component/Lock/Key.php
index a16ac361efeee..f9ca8e79ad205 100644
--- a/src/Symfony/Component/Lock/Key.php
+++ b/src/Symfony/Component/Lock/Key.php
@@ -60,7 +60,7 @@ public function markUnserializable(): void
         $this->serializable = false;
     }
 
-    public function resetLifetime()
+    public function resetLifetime(): void
     {
         $this->expiringTime = null;
     }
@@ -68,7 +68,7 @@ public function resetLifetime()
     /**
      * @param float $ttl the expiration delay of locks in seconds
      */
-    public function reduceLifetime(float $ttl)
+    public function reduceLifetime(float $ttl): void
     {
         $newTime = microtime(true) + $ttl;
 
diff --git a/src/Symfony/Component/Lock/Lock.php b/src/Symfony/Component/Lock/Lock.php
index b1064a94827a7..f529c66da78d7 100644
--- a/src/Symfony/Component/Lock/Lock.php
+++ b/src/Symfony/Component/Lock/Lock.php
@@ -182,7 +182,7 @@ public function acquireRead(bool $blocking = false): bool
         }
     }
 
-    public function refresh(float $ttl = null)
+    public function refresh(float $ttl = null): void
     {
         if (!$ttl ??= $this->ttl) {
             throw new InvalidArgumentException('You have to define an expiration duration.');
@@ -218,7 +218,7 @@ public function isAcquired(): bool
         return $this->dirty = $this->store->exists($this->key);
     }
 
-    public function release()
+    public function release(): void
     {
         try {
             try {
diff --git a/src/Symfony/Component/Lock/NoLock.php b/src/Symfony/Component/Lock/NoLock.php
index 074c6c3bdaef1..50a4f1da4d085 100644
--- a/src/Symfony/Component/Lock/NoLock.php
+++ b/src/Symfony/Component/Lock/NoLock.php
@@ -26,7 +26,7 @@ public function acquire(bool $blocking = false): bool
         return true;
     }
 
-    public function refresh(float $ttl = null)
+    public function refresh(float $ttl = null): void
     {
     }
 
@@ -35,7 +35,7 @@ public function isAcquired(): bool
         return true;
     }
 
-    public function release()
+    public function release(): void
     {
     }
 
diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php
index ca902117e424a..9087874c29bf4 100644
--- a/src/Symfony/Component/Lock/Store/CombinedStore.php
+++ b/src/Symfony/Component/Lock/Store/CombinedStore.php
@@ -53,6 +53,9 @@ public function __construct(array $stores, StrategyInterface $strategy)
         $this->logger = new NullLogger();
     }
 
+    /**
+     * @return void
+     */
     public function save(Key $key)
     {
         $successCount = 0;
@@ -87,6 +90,9 @@ public function save(Key $key)
         throw new LockConflictedException();
     }
 
+    /**
+     * @return void
+     */
     public function saveRead(Key $key)
     {
         $successCount = 0;
@@ -125,6 +131,9 @@ public function saveRead(Key $key)
         throw new LockConflictedException();
     }
 
+    /**
+     * @return void
+     */
     public function putOffExpiration(Key $key, float $ttl)
     {
         $successCount = 0;
@@ -166,6 +175,9 @@ public function putOffExpiration(Key $key, float $ttl)
         throw new LockConflictedException();
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         foreach ($this->stores as $store) {
diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
index 84865ce3659c5..4344a6f41f35d 100644
--- a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
+++ b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php
@@ -53,6 +53,9 @@ public function __construct(#[\SensitiveParameter] Connection|string $connOrUrl)
         }
     }
 
+    /**
+     * @return void
+     */
     public function save(Key $key)
     {
         // prevent concurrency within the same connection
@@ -85,6 +88,9 @@ public function save(Key $key)
         throw new LockConflictedException();
     }
 
+    /**
+     * @return void
+     */
     public function saveRead(Key $key)
     {
         // prevent concurrency within the same connection
@@ -117,6 +123,9 @@ public function saveRead(Key $key)
         throw new LockConflictedException();
     }
 
+    /**
+     * @return void
+     */
     public function putOffExpiration(Key $key, float $ttl)
     {
         // postgresql locks forever.
@@ -126,6 +135,9 @@ public function putOffExpiration(Key $key, float $ttl)
         }
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         // Prevent deleting locks own by an other key in the same connection
@@ -163,6 +175,9 @@ public function exists(Key $key): bool
         return false;
     }
 
+    /**
+     * @return void
+     */
     public function waitAndSave(Key $key)
     {
         // prevent concurrency within the same connection
@@ -186,6 +201,9 @@ public function waitAndSave(Key $key)
         $this->unlockShared($key);
     }
 
+    /**
+     * @return void
+     */
     public function waitAndSaveRead(Key $key)
     {
         // prevent concurrency within the same connection
diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
index 568fcaa10bc09..7e573b369208a 100644
--- a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
+++ b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
@@ -72,6 +72,9 @@ public function __construct(Connection|string $connOrUrl, array $options = [], f
         }
     }
 
+    /**
+     * @return void
+     */
     public function save(Key $key)
     {
         $key->reduceLifetime($this->initialTtl);
@@ -111,6 +114,9 @@ public function save(Key $key)
         $this->checkNotExpired($key);
     }
 
+    /**
+     * @return void
+     */
     public function putOffExpiration(Key $key, $ttl)
     {
         if ($ttl < 1) {
@@ -142,6 +148,9 @@ public function putOffExpiration(Key $key, $ttl)
         $this->checkNotExpired($key);
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         $this->conn->delete($this->table, [
diff --git a/src/Symfony/Component/Lock/Store/ExpiringStoreTrait.php b/src/Symfony/Component/Lock/Store/ExpiringStoreTrait.php
index 0fdc37697b266..8dd8a8b1855e3 100644
--- a/src/Symfony/Component/Lock/Store/ExpiringStoreTrait.php
+++ b/src/Symfony/Component/Lock/Store/ExpiringStoreTrait.php
@@ -16,7 +16,7 @@
 
 trait ExpiringStoreTrait
 {
-    private function checkNotExpired(Key $key)
+    private function checkNotExpired(Key $key): void
     {
         if ($key->isExpired()) {
             try {
diff --git a/src/Symfony/Component/Lock/Store/FlockStore.php b/src/Symfony/Component/Lock/Store/FlockStore.php
index d170da116a44b..edabbb946c50b 100644
--- a/src/Symfony/Component/Lock/Store/FlockStore.php
+++ b/src/Symfony/Component/Lock/Store/FlockStore.php
@@ -50,27 +50,39 @@ public function __construct(string $lockPath = null)
         $this->lockPath = $lockPath;
     }
 
+    /**
+     * @return void
+     */
     public function save(Key $key)
     {
         $this->lock($key, false, false);
     }
 
+    /**
+     * @return void
+     */
     public function saveRead(Key $key)
     {
         $this->lock($key, true, false);
     }
 
+    /**
+     * @return void
+     */
     public function waitAndSave(Key $key)
     {
         $this->lock($key, false, true);
     }
 
+    /**
+     * @return void
+     */
     public function waitAndSaveRead(Key $key)
     {
         $this->lock($key, true, true);
     }
 
-    private function lock(Key $key, bool $read, bool $blocking)
+    private function lock(Key $key, bool $read, bool $blocking): void
     {
         $handle = null;
         // The lock is maybe already acquired.
@@ -120,11 +132,17 @@ private function lock(Key $key, bool $read, bool $blocking)
         $key->markUnserializable();
     }
 
+    /**
+     * @return void
+     */
     public function putOffExpiration(Key $key, float $ttl)
     {
         // do nothing, the flock locks forever.
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         // The lock is maybe not acquired.
diff --git a/src/Symfony/Component/Lock/Store/InMemoryStore.php b/src/Symfony/Component/Lock/Store/InMemoryStore.php
index 2b482876e0d41..34d3ede5c1563 100644
--- a/src/Symfony/Component/Lock/Store/InMemoryStore.php
+++ b/src/Symfony/Component/Lock/Store/InMemoryStore.php
@@ -26,6 +26,9 @@ class InMemoryStore implements SharedLockStoreInterface
     private array $locks = [];
     private array $readLocks = [];
 
+    /**
+     * @return void
+     */
     public function save(Key $key)
     {
         $hashKey = (string) $key;
@@ -54,6 +57,9 @@ public function save(Key $key)
         $this->locks[$hashKey] = $token;
     }
 
+    /**
+     * @return void
+     */
     public function saveRead(Key $key)
     {
         $hashKey = (string) $key;
@@ -78,11 +84,17 @@ public function saveRead(Key $key)
         $this->readLocks[$hashKey][$token] = true;
     }
 
+    /**
+     * @return void
+     */
     public function putOffExpiration(Key $key, float $ttl)
     {
         // do nothing, memory locks forever.
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         $hashKey = (string) $key;
diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php
index c9b0fbde056a7..88233655f960f 100644
--- a/src/Symfony/Component/Lock/Store/MemcachedStore.php
+++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php
@@ -55,6 +55,9 @@ public function __construct(\Memcached $memcached, int $initialTtl = 300)
         $this->initialTtl = $initialTtl;
     }
 
+    /**
+     * @return void
+     */
     public function save(Key $key)
     {
         $token = $this->getUniqueToken($key);
@@ -67,6 +70,9 @@ public function save(Key $key)
         $this->checkNotExpired($key);
     }
 
+    /**
+     * @return void
+     */
     public function putOffExpiration(Key $key, float $ttl)
     {
         if ($ttl < 1) {
@@ -103,6 +109,9 @@ public function putOffExpiration(Key $key, float $ttl)
         $this->checkNotExpired($key);
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         $token = $this->getUniqueToken($key);
diff --git a/src/Symfony/Component/Lock/Store/MongoDbStore.php b/src/Symfony/Component/Lock/Store/MongoDbStore.php
index 792bcff7f64a8..717df9b4e76bc 100644
--- a/src/Symfony/Component/Lock/Store/MongoDbStore.php
+++ b/src/Symfony/Component/Lock/Store/MongoDbStore.php
@@ -190,6 +190,8 @@ private function skimUri(string $uri): string
      * @throws UnsupportedException          if options are not supported by the selected server
      * @throws MongoInvalidArgumentException for parameter/option parsing errors
      * @throws DriverRuntimeException        for other driver errors (e.g. connection errors)
+     *
+     * @return void
      */
     public function createTtlIndex(int $expireAfterSeconds = 0)
     {
@@ -205,6 +207,8 @@ public function createTtlIndex(int $expireAfterSeconds = 0)
 
     /**
      * @throws LockExpiredException when save is called on an expired lock
+     *
+     * @return void
      */
     public function save(Key $key)
     {
@@ -229,6 +233,8 @@ public function save(Key $key)
     /**
      * @throws LockStorageException
      * @throws LockExpiredException
+     *
+     * @return void
      */
     public function putOffExpiration(Key $key, float $ttl)
     {
@@ -246,6 +252,9 @@ public function putOffExpiration(Key $key, float $ttl)
         $this->checkNotExpired($key);
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         $this->getCollection()->deleteOne([ // filter
@@ -272,7 +281,7 @@ public function exists(Key $key): bool
      *
      * @param float $ttl Expiry in seconds from now
      */
-    private function upsert(Key $key, float $ttl)
+    private function upsert(Key $key, float $ttl): void
     {
         $now = microtime(true);
         $token = $this->getUniqueToken($key);
diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php
index 61803278ab76e..85d0de78eaf5b 100644
--- a/src/Symfony/Component/Lock/Store/PdoStore.php
+++ b/src/Symfony/Component/Lock/Store/PdoStore.php
@@ -83,6 +83,9 @@ public function __construct(#[\SensitiveParameter] \PDO|string $connOrDsn, #[\Se
         $this->connectionOptions = $options['db_connection_options'] ?? $this->connectionOptions;
     }
 
+    /**
+     * @return void
+     */
     public function save(Key $key)
     {
         $key->reduceLifetime($this->initialTtl);
@@ -112,6 +115,9 @@ public function save(Key $key)
         $this->checkNotExpired($key);
     }
 
+    /**
+     * @return void
+     */
     public function putOffExpiration(Key $key, float $ttl)
     {
         if ($ttl < 1) {
@@ -137,6 +143,9 @@ public function putOffExpiration(Key $key, float $ttl)
         $this->checkNotExpired($key);
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         $sql = "DELETE FROM $this->table WHERE $this->idCol = :id AND $this->tokenCol = :token";
diff --git a/src/Symfony/Component/Lock/Store/PostgreSqlStore.php b/src/Symfony/Component/Lock/Store/PostgreSqlStore.php
index 8e78c2c2efc95..87a57ea064fe8 100644
--- a/src/Symfony/Component/Lock/Store/PostgreSqlStore.php
+++ b/src/Symfony/Component/Lock/Store/PostgreSqlStore.php
@@ -67,6 +67,9 @@ public function __construct(#[\SensitiveParameter] \PDO|string $connOrDsn, #[\Se
         $this->connectionOptions = $options['db_connection_options'] ?? $this->connectionOptions;
     }
 
+    /**
+     * @return void
+     */
     public function save(Key $key)
     {
         // prevent concurrency within the same connection
@@ -99,6 +102,9 @@ public function save(Key $key)
         throw new LockConflictedException();
     }
 
+    /**
+     * @return void
+     */
     public function saveRead(Key $key)
     {
         // prevent concurrency within the same connection
@@ -132,6 +138,9 @@ public function saveRead(Key $key)
         throw new LockConflictedException();
     }
 
+    /**
+     * @return void
+     */
     public function putOffExpiration(Key $key, float $ttl)
     {
         // postgresql locks forever.
@@ -141,6 +150,9 @@ public function putOffExpiration(Key $key, float $ttl)
         }
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         // Prevent deleting locks own by an other key in the same connection
@@ -179,6 +191,9 @@ public function exists(Key $key): bool
         return false;
     }
 
+    /**
+     * @return void
+     */
     public function waitAndSave(Key $key)
     {
         // prevent concurrency within the same connection
@@ -202,6 +217,9 @@ public function waitAndSave(Key $key)
         $this->unlockShared($key);
     }
 
+    /**
+     * @return void
+     */
     public function waitAndSaveRead(Key $key)
     {
         // prevent concurrency within the same connection
diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php
index 4b29e0f1996ab..51d3f72a9fd26 100644
--- a/src/Symfony/Component/Lock/Store/RedisStore.php
+++ b/src/Symfony/Component/Lock/Store/RedisStore.php
@@ -44,6 +44,9 @@ public function __construct(
         }
     }
 
+    /**
+     * @return void
+     */
     public function save(Key $key)
     {
         $script = '
@@ -89,6 +92,9 @@ public function save(Key $key)
         $this->checkNotExpired($key);
     }
 
+    /**
+     * @return void
+     */
     public function saveRead(Key $key)
     {
         $script = '
@@ -129,6 +135,9 @@ public function saveRead(Key $key)
         $this->checkNotExpired($key);
     }
 
+    /**
+     * @return void
+     */
     public function putOffExpiration(Key $key, float $ttl)
     {
         $script = '
@@ -169,6 +178,9 @@ public function putOffExpiration(Key $key, float $ttl)
         $this->checkNotExpired($key);
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         $script = '
diff --git a/src/Symfony/Component/Lock/Store/SemaphoreStore.php b/src/Symfony/Component/Lock/Store/SemaphoreStore.php
index ba2443ea2d02e..7af6681a46fcf 100644
--- a/src/Symfony/Component/Lock/Store/SemaphoreStore.php
+++ b/src/Symfony/Component/Lock/Store/SemaphoreStore.php
@@ -40,17 +40,23 @@ public function __construct()
         }
     }
 
+    /**
+     * @return void
+     */
     public function save(Key $key)
     {
         $this->lock($key, false);
     }
 
+    /**
+     * @return void
+     */
     public function waitAndSave(Key $key)
     {
         $this->lock($key, true);
     }
 
-    private function lock(Key $key, bool $blocking)
+    private function lock(Key $key, bool $blocking): void
     {
         if ($key->hasState(__CLASS__)) {
             return;
@@ -73,6 +79,9 @@ private function lock(Key $key, bool $blocking)
         $key->markUnserializable();
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         // The lock is maybe not acquired.
@@ -87,6 +96,9 @@ public function delete(Key $key)
         $key->removeState(__CLASS__);
     }
 
+    /**
+     * @return void
+     */
     public function putOffExpiration(Key $key, float $ttl)
     {
         // do nothing, the semaphore locks forever.
diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
index e9e37ad2c3092..3d22eeb786173 100644
--- a/src/Symfony/Component/Lock/Store/ZookeeperStore.php
+++ b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
@@ -56,6 +56,9 @@ public static function createConnection(#[\SensitiveParameter] string $dsn): \Zo
         return new \Zookeeper(implode(',', $hosts));
     }
 
+    /**
+     * @return void
+     */
     public function save(Key $key)
     {
         if ($this->exists($key)) {
@@ -71,6 +74,9 @@ public function save(Key $key)
         $this->checkNotExpired($key);
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         if (!$this->exists($key)) {
@@ -96,6 +102,9 @@ public function exists(Key $key): bool
         }
     }
 
+    /**
+     * @return void
+     */
     public function putOffExpiration(Key $key, float $ttl)
     {
         // do nothing, zookeeper locks forever.
@@ -110,7 +119,7 @@ public function putOffExpiration(Key $key, float $ttl)
      * @throws LockConflictedException
      * @throws LockAcquiringException
      */
-    private function createNewLock(string $node, string $value)
+    private function createNewLock(string $node, string $value): void
     {
         // Default Node Permissions
         $acl = [['perms' => \Zookeeper::PERM_ALL, 'scheme' => 'world', 'id' => 'anyone']];
diff --git a/src/Symfony/Component/Mailer/Command/MailerTestCommand.php b/src/Symfony/Component/Mailer/Command/MailerTestCommand.php
index 8bb19d732a9e0..bfc2779e3d66a 100644
--- a/src/Symfony/Component/Mailer/Command/MailerTestCommand.php
+++ b/src/Symfony/Component/Mailer/Command/MailerTestCommand.php
@@ -33,7 +33,7 @@ public function __construct(private TransportInterface $transport)
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->addArgument('to', InputArgument::REQUIRED, 'The recipient of the message')
diff --git a/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php b/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php
index ce8e59f101bae..86c1c962dfcea 100644
--- a/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php
+++ b/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php
@@ -29,7 +29,7 @@ public function __construct(MessageLoggerListener $logger)
         $this->events = $logger->getEvents();
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         $this->data['events'] = $this->events;
     }
@@ -47,7 +47,7 @@ public function base64Encode(string $data): string
         return base64_encode($data);
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
     }
diff --git a/src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php b/src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php
index 2446e75cae4f0..6c5605fa8efd3 100644
--- a/src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php
+++ b/src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php
@@ -30,6 +30,9 @@ public function __construct()
         $this->events = new MessageEvents();
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->events = new MessageEvents();
diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
index 8d5b0a1b87d39..1b12e4360cd29 100644
--- a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
+++ b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
@@ -120,7 +120,7 @@ protected function getLogger(): LoggerInterface
         return $this->logger;
     }
 
-    private function checkThrottling()
+    private function checkThrottling(): void
     {
         if (0 == $this->rate) {
             return;
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php
index d178bc8b06a17..163ccd8d9d988 100644
--- a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php
+++ b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/ProcessStream.php
@@ -25,7 +25,7 @@ final class ProcessStream extends AbstractStream
 {
     private string $command;
 
-    public function setCommand(string $command)
+    public function setCommand(string $command): void
     {
         $this->command = $command;
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php
index c8ba7f9c73d19..1a1305f5d888e 100644
--- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php
+++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php
@@ -78,6 +78,9 @@ public function setup(): void
         }
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         try {
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
index 15ef89f58b0a0..6cdc7e00e9bea 100644
--- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -312,7 +312,7 @@ public function countMessagesInQueues(): int
     /**
      * @throws \AMQPException
      */
-    private function publishWithDelay(string $body, array $headers, int $delay, AmqpStamp $amqpStamp = null)
+    private function publishWithDelay(string $body, array $headers, int $delay, AmqpStamp $amqpStamp = null): void
     {
         $routingKey = $this->getRoutingKeyForMessage($amqpStamp);
         $isRetryAttempt = $amqpStamp ? $amqpStamp->isRetryAttempt() : false;
@@ -328,7 +328,7 @@ private function publishWithDelay(string $body, array $headers, int $delay, Amqp
         );
     }
 
-    private function publishOnExchange(\AMQPExchange $exchange, string $body, string $routingKey = null, array $headers = [], AmqpStamp $amqpStamp = null)
+    private function publishOnExchange(\AMQPExchange $exchange, string $body, string $routingKey = null, array $headers = [], AmqpStamp $amqpStamp = null): void
     {
         $attributes = $amqpStamp ? $amqpStamp->getAttributes() : [];
         $attributes['headers'] = array_merge($attributes['headers'] ?? [], $headers);
@@ -349,7 +349,7 @@ private function publishOnExchange(\AMQPExchange $exchange, string $body, string
         }
     }
 
-    private function setupDelay(int $delay, ?string $routingKey, bool $isRetryAttempt)
+    private function setupDelay(int $delay, ?string $routingKey, bool $isRetryAttempt): void
     {
         if ($this->autoSetupDelayExchange) {
             $this->setupDelayExchange();
@@ -554,7 +554,7 @@ private function getDefaultPublishRoutingKey(): ?string
         return $this->exchangeOptions['default_publish_routing_key'] ?? null;
     }
 
-    public function purgeQueues()
+    public function purgeQueues(): void
     {
         foreach ($this->getQueueNames() as $queueName) {
             $this->queue($queueName)->purge();
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
index d9c442931addd..62c96374453eb 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -74,7 +74,7 @@ public function __construct(array $configuration, DBALConnection $driverConnecti
         $this->autoSetup = $this->configuration['auto_setup'];
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->queueEmptiedAt = null;
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
index 3691a9383f293..b2c65f1644f52 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
@@ -48,7 +48,7 @@ public function __destruct()
         $this->unlisten();
     }
 
-    public function reset()
+    public function reset(): void
     {
         parent::reset();
         $this->unlisten();
@@ -143,7 +143,7 @@ private function createTriggerFunctionName(): string
         return sprintf('%1$s.notify_%2$s', $tableConfig[0], $tableConfig[1]);
     }
 
-    private function unlisten()
+    private function unlisten(): void
     {
         $this->execu
10000
teStatement(sprintf('UNLISTEN "%s"', $this->configuration['table_name']));
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
index 837480de209f4..9fc4445f62e39 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -262,7 +262,7 @@ private static function parseDsn(string $dsn, array &$options): array
         return $parsedUrl;
     }
 
-    private function claimOldPendingMessages()
+    private function claimOldPendingMessages(): void
     {
         try {
             // This could soon be optimized with https://github.com/antirez/redis/issues/5212 or
diff --git a/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php b/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php
index 29854786e3888..3bb31bab9efa6 100644
--- a/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php
+++ b/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php
@@ -72,7 +72,7 @@ protected function getMessageId(Envelope $envelope): mixed
         return $stamp?->getId();
     }
 
-    protected function displaySingleMessage(Envelope $envelope, SymfonyStyle $io)
+    protected function displaySingleMessage(Envelope $envelope, SymfonyStyle $io): void
     {
         $io->title('Failed Message Details');
 
@@ -148,7 +148,7 @@ protected function displaySingleMessage(Envelope $envelope, SymfonyStyle $io)
         }
     }
 
-    protected function printPendingMessagesMessage(ReceiverInterface $receiver, SymfonyStyle $io)
+    protected function printPendingMessagesMessage(ReceiverInterface $receiver, SymfonyStyle $io): void
     {
         if ($receiver instanceof MessageCountAwareInterface) {
             if (1 === $receiver->getMessageCount()) {
diff --git a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
index 899b894d6d097..a6b0d881df149 100644
--- a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
+++ b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
@@ -124,6 +124,9 @@ protected function configure(): void
         ;
     }
 
+    /**
+     * @return void
+     */
     protected function interact(InputInterface $input, OutputInterface $output)
     {
         $io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
diff --git a/src/Symfony/Component/Messenger/Command/DebugCommand.php b/src/Symfony/Component/Messenger/Command/DebugCommand.php
index 0865fef548836..5767f06a028c3 100644
--- a/src/Symfony/Component/Messenger/Command/DebugCommand.php
+++ b/src/Symfony/Component/Messenger/Command/DebugCommand.php
@@ -38,6 +38,9 @@ public function __construct(array $mapping)
         parent::__construct();
     }
 
+    /**
+     * @return void
+     */
     protected function configure()
     {
         $this
diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
index 77295b6a64370..8ab8fcbc6a6ca 100644
--- a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
+++ b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
@@ -123,7 +123,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    private function runInteractive(string $failureTransportName, SymfonyStyle $io, bool $shouldForce)
+    private function runInteractive(string $failureTransportName, SymfonyStyle $io, bool $shouldForce): void
     {
         $receiver = $this->failureTransports->get($failureTransportName);
         $count = 0;
@@ -203,7 +203,7 @@ private function runWorker(string $failureTransportName, ReceiverInterface $rece
         return $count;
     }
 
-    private function retrySpecificIds(string $failureTransportName, array $ids, SymfonyStyle $io, bool $shouldForce)
+    private function retrySpecificIds(string $failureTransportName, array $ids, SymfonyStyle $io, bool $shouldForce): void
     {
         $receiver = $this->getReceiver($failureTransportName);
 
@@ -227,7 +227,7 @@ private function retrySpecificIds(string $failureTransportName, array $ids, Symf
         }
     }
 
-    private function retrySpecificEnvelopes(array $envelopes, string $failureTransportName, SymfonyStyle $io, bool $shouldForce)
+    private function retrySpecificEnvelopes(array $envelopes, string $failureTransportName, SymfonyStyle $io, bool $shouldForce): void
     {
         $receiver = $this->getReceiver($failureTransportName);
 
diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php
index f64547b8f958c..d4648e2747a99 100644
--- a/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php
+++ b/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php
@@ -84,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    private function listMessages(?string $failedTransportName, SymfonyStyle $io, int $max, string $classFilter = null)
+    private function listMessages(?string $failedTransportName, SymfonyStyle $io, int $max, string $classFilter = null): void
     {
         /** @var ListableReceiverInterface $receiver */
         $receiver = $this->getReceiver($failedTransportName);
@@ -140,7 +140,7 @@ private function listMessages(?string $failedTransportName, SymfonyStyle $io, in
         $io->comment(sprintf('Run <comment>messenger:failed:show {id} --transport=%s -vv</comment> to see message details.', $failedTransportName));
     }
 
-    private function listMessagesPerClass(?string $failedTransportName, SymfonyStyle $io, int $max)
+    private function listMessagesPerClass(?string $failedTransportName, SymfonyStyle $io, int $max): void
     {
         /** @var ListableReceiverInterface $receiver */
         $receiver = $this->getReceiver($failedTransportName);
@@ -172,7 +172,7 @@ private function listMessagesPerClass(?string $failedTransportName, SymfonyStyle
         $io->table(['Class', 'Count'], $countPerClass);
     }
 
-    private function showMessage(?string $failedTransportName, string $id, SymfonyStyle $io)
+    private function showMessage(?string $failedTransportName, string $id, SymfonyStyle $io): void
     {
         /** @var ListableReceiverInterface $receiver */
         $receiver = $this->getReceiver($failedTransportName);
diff --git a/src/Symfony/Component/Messenger/Command/SetupTransportsCommand.php b/src/Symfony/Component/Messenger/Command/SetupTransportsCommand.php
index 98dcfd9e9936a..e506e494871a3 100644
--- a/src/Symfony/Component/Messenger/Command/SetupTransportsCommand.php
+++ b/src/Symfony/Component/Messenger/Command/SetupTransportsCommand.php
@@ -39,6 +39,9 @@ public function __construct(ContainerInterface $transportLocator, array $transpo
         parent::__construct();
     }
 
+    /**
+     * @return void
+     */
     protected function configure()
     {
         $this
diff --git a/src/Symfony/Component/Messenger/Command/StatsCommand.php b/src/Symfony/Component/Messenger/Command/StatsCommand.php
index ec0e802e9c4ff..3b6d6b8a39fa2 100644
--- a/src/Symfony/Component/Messenger/Command/StatsCommand.php
+++ b/src/Symfony/Component/Messenger/Command/StatsCommand.php
@@ -38,6 +38,9 @@ public function __construct(ContainerInterface $transportLocator, array $transpo
         parent::__construct();
     }
 
+    /**
+     * @return void
+     */
     protected function configure()
     {
         $this
diff --git a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
index a652cd55430bf..27907cd762607 100644
--- a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
+++ b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
@@ -32,12 +32,12 @@ public function registerBus(string $name, TraceableMessageBus $bus)
         $this->traceableBuses[$name] = $bus;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         // Noop. Everything is collected live by the traceable buses & cloned as late as possible.
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         $this->data = ['messages' => [], 'buses' => array_keys($this->traceableBuses)];
 
@@ -61,7 +61,7 @@ public function getName(): string
         return 'messenger';
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
         foreach ($this->traceableBuses as $traceableBus) {
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
index 1763fe245a0e8..ac2b97fc3df85 100644
--- a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
+++ b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -33,6 +33,9 @@
  */
 class MessengerPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         $busIds = [];
@@ -55,7 +58,7 @@ public function process(ContainerBuilder $container)
         $this->registerHandlers($container, $busIds);
     }
 
-    private function registerHandlers(ContainerBuilder $container, array $busIds)
+    private function registerHandlers(ContainerBuilder $container, array $busIds): void
     {
         $definitions = [];
         $handlersByBusAndMessage = [];
@@ -256,7 +259,7 @@ private function guessHandledClasses(\ReflectionClass $handlerClass, string $ser
         return ('__invoke' === $methodName) ? [$type->getName()] : [$type->getName() => $methodName];
     }
 
-    private function registerReceivers(ContainerBuilder $container, array $busIds)
+    private function registerReceivers(ContainerBuilder $container, array $busIds): void
     {
         $receiverMapping = [];
         $failureTransportsMap = [];
@@ -347,7 +350,7 @@ private function registerReceivers(ContainerBuilder $container, array $busIds)
         }
     }
 
-    private function registerBusToCollector(ContainerBuilder $container, string $busId)
+    private function registerBusToCollector(ContainerBuilder $container, string $busId): void
     {
         $container->setDefinition(
             $tracedBusId = 'debug.traced.'.$busId,
@@ -357,7 +360,7 @@ private function registerBusToCollector(ContainerBuilder $container, string $bus
         $container->getDefinition('data_collector.messenger')->addMethodCall('registerBus', [$busId, new Reference($tracedBusId)]);
     }
 
-    private function registerBusMiddleware(ContainerBuilder $container, string $busId, array $middlewareCollection)
+    private function registerBusMiddleware(ContainerBuilder $container, string $busId, array $middlewareCollection): void
     {
         $middlewareReferences = [];
         foreach ($middlewareCollection as $middlewareItem) {
diff --git a/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php b/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php
index ec7fb7c9d00d1..76ef196ba0e5c 100644
--- a/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php
+++ b/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php
@@ -42,7 +42,7 @@ public function getEnvelope(): Envelope
         return $this->envelope;
     }
 
-    public function setEnvelope(Envelope $envelope)
+    public function setEnvelope(Envelope $envelope): void
     {
         $this->envelope = $envelope;
     }
diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
index 0f071e82e702d..ba775b0c1784b 100644
--- a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
+++ b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
@@ -48,6 +48,9 @@ public function __construct(ContainerInterface $sendersLocator, ContainerInterfa
         $this->historySize = $historySize;
     }
 
+    /**
+     * @return void
+     */
     public function onMessageFailed(WorkerMessageFailedEvent $event)
     {
         $retryStrategy = $this->getRetryStrategyForTransport($event->getReceiverName());
diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
index 6a56f93006a02..f6cd8aab008ea 100644
--- a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
+++ b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
@@ -35,6 +35,9 @@ public function __construct(ContainerInterface $failureSenders, LoggerInterface
         $this->logger = $logger;
     }
 
+    /**
+     * @return void
+     */
     public function onMessageFailed(WorkerMessageFailedEvent $event)
     {
         if ($event->willRetry()) {
diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
index 5103d4ad84568..fc74a1d70a1ba 100644
--- a/src/Symfony/Component/Messenger/Tests/WorkerTest.php
+++ b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
@@ -666,7 +666,7 @@ class ResettableDummyReceiver extends DummyReceiver implements ResetInterface
 {
     private $hasBeenReset = false;
 
-    public function reset()
+    public function reset(): void
     {
         $this->hasBeenReset = true;
     }
diff --git a/src/Symfony/Component/Messenger/TraceableMessageBus.php b/src/Symfony/Component/Messenger/TraceableMessageBus.php
index cbf3279cf59aa..d8e6dd4ad9a2c 100644
--- a/src/Symfony/Component/Messenger/TraceableMessageBus.php
+++ b/src/Symfony/Component/Messenger/TraceableMessageBus.php
@@ -50,6 +50,9 @@ public function getDispatchedMessages(): array
         return $this->dispatchedMessages;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->dispatchedMessages = [];
diff --git a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
index 40132068aecae..13a97667b548b 100644
--- a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
+++ b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
@@ -91,6 +91,9 @@ public function send(Envelope $envelope): Envelope
         return $envelope;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->sent = $this->queue = $this->rejected = $this->acknowledged = [];
diff --git a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransportFactory.php b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransportFactory.php
index 3e704b1bb3528..774957c3ccb26 100644
--- a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransportFactory.php
+++ b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransportFactory.php
@@ -38,6 +38,9 @@ public function supports(string $dsn, array $options): bool
         return str_starts_with($dsn, 'in-memory://');
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         foreach ($this->createdTransports as $transport) {
diff --git a/src/Symfony/Component/Mime/DependencyInjection/AddMimeTypeGuesserPass.php b/src/Symfony/Component/Mime/DependencyInjection/AddMimeTypeGuesserPass.php
index fd9a40f532412..70fa78633191a 100644
--- a/src/Symfony/Component/Mime/DependencyInjection/AddMimeTypeGuesserPass.php
+++ b/src/Symfony/Component/Mime/DependencyInjection/AddMimeTypeGuesserPass.php
@@ -22,6 +22,9 @@
  */
 class AddMimeTypeGuesserPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if ($container->has('mime_types')) {
diff --git a/src/Symfony/Component/Mime/Header/AbstractHeader.php b/src/Symfony/Component/Mime/Header/AbstractHeader.php
index 98245979fc877..faa5fd8b6f757 100644
--- a/src/Symfony/Component/Mime/Header/AbstractHeader.php
+++ b/src/Symfony/Component/Mime/Header/AbstractHeader.php
@@ -34,6 +34,9 @@ public function __construct(string $name)
         $this->name = $name;
     }
 
+    /**
+     * @return void
+     */
     public function setCharset(string $charset)
     {
         $this->charset = $charset;
@@ -48,6 +51,8 @@ public function getCharset(): ?string
      * Set the language used in this Header.
      *
      * For example, for US English, 'en-us'.
+     *
+     * @return void
      */
     public function setLanguage(string $lang)
     {
@@ -64,6 +69,9 @@ public function getName(): string
         return $this->name;
     }
 
+    /**
+     * @return void
+     */
     public function setMaxLineLength(int $lineLength)
     {
         $this->lineLength = $lineLength;
diff --git a/src/Symfony/Component/Mime/Header/DateHeader.php b/src/Symfony/Component/Mime/Header/DateHeader.php
index b07dfedeb2b8e..67156cb79f53e 100644
--- a/src/Symfony/Component/Mime/Header/DateHeader.php
+++ b/src/Symfony/Component/Mime/Header/DateHeader.php
@@ -30,7 +30,7 @@ public function __construct(string $name, \DateTimeInterface $date)
     /**
      * @param \DateTimeInterface $body
      */
-    public function setBody(mixed $body)
+    public function setBody(mixed $body): void
     {
         $this->setDateTime($body);
     }
@@ -50,7 +50,7 @@ public function getDateTime(): \DateTimeImmutable
      *
      * If a DateTime instance is provided, it is converted to DateTimeImmutable.
      */
-    public function setDateTime(\DateTimeInterface $dateTime)
+    public function setDateTime(\DateTimeInterface $dateTime): void
     {
         if ($dateTime instanceof \DateTime) {
             $immutable = new \DateTimeImmutable('@'.$dateTime->getTimestamp());
diff --git a/src/Symfony/Component/Mime/Header/Headers.php b/src/Symfony/Component/Mime/Header/Headers.php
index 335ebd48ebabe..ef1c44a7fe6d3 100644
--- a/src/Symfony/Component/Mime/Header/Headers.php
+++ b/src/Symfony/Component/Mime/Header/Headers.php
@@ -61,7 +61,7 @@ public function __clone()
         }
     }
 
-    public function setMaxLineLength(int $lineLength)
+    public function setMaxLineLength(int $lineLength): void
     {
         $this->lineLength = $lineLength;
         foreach ($this->all() as $header) {
diff --git a/src/Symfony/Component/Mime/Header/IdentificationHeader.php b/src/Symfony/Component/Mime/Header/IdentificationHeader.php
index 40fd7c36d6946..14e18bf25a550 100644
--- a/src/Symfony/Component/Mime/Header/IdentificationHeader.php
+++ b/src/Symfony/Component/Mime/Header/IdentificationHeader.php
@@ -36,7 +36,7 @@ public function __construct(string $name, string|array $ids)
      *
      * @throws RfcComplianceException
      */
-    public function setBody(mixed $body)
+    public function setBody(mixed $body): void
     {
         $this->setId($body);
     }
@@ -53,7 +53,7 @@ public function getBody(): array
      *
      * @throws RfcComplianceException
      */
-    public function setId(string|array $id)
+    public function setId(string|array $id): void
     {
         $this->setIds(\is_array($id) ? $id : [$id]);
     }
@@ -75,7 +75,7 @@ public function getId(): ?string
      *
      * @throws RfcComplianceException
      */
-    public function setIds(array $ids)
+    public function setIds(array $ids): void
     {
         $this->ids = [];
         $this->idsAsAddresses = [];
diff --git a/src/Symfony/Component/Mime/Header/MailboxHeader.php b/src/Symfony/Component/Mime/Header/MailboxHeader.php
index e79761a5bed65..8ba964b53afad 100644
--- a/src/Symfony/Component/Mime/Header/MailboxHeader.php
+++ b/src/Symfony/Component/Mime/Header/MailboxHeader.php
@@ -35,7 +35,7 @@ public function __construct(string $name, Address $address)
      *
      * @throws RfcComplianceException
      */
-    public function setBody(mixed $body)
+    public function setBody(mixed $body): void
     {
         $this->setAddress($body);
     }
@@ -51,7 +51,7 @@ public function getBody(): Address
     /**
      * @throws RfcComplianceException
      */
-    public function setAddress(Address $address)
+    public function setAddress(Address $address): void
     {
         $this->address = $address;
     }
diff --git a/src/Symfony/Component/Mime/Header/MailboxListHeader.php b/src/Symfony/Component/Mime/Header/MailboxListHeader.php
index 76cf59f36196b..8d902fb757955 100644
--- a/src/Symfony/Component/Mime/Header/MailboxListHeader.php
+++ b/src/Symfony/Component/Mime/Header/MailboxListHeader.php
@@ -38,7 +38,7 @@ public function __construct(string $name, array $addresses)
      *
      * @throws RfcComplianceException
      */
-    public function setBody(mixed $body)
+    public function setBody(mixed $body): void
     {
         $this->setAddresses($body);
     }
@@ -60,7 +60,7 @@ public function getBody(): array
      *
      * @throws RfcComplianceException
      */
-    public function setAddresses(array $addresses)
+    public function setAddresses(array $addresses): void
     {
         $this->addresses = [];
         $this->addAddresses($addresses);
@@ -73,7 +73,7 @@ public function setAddresses(array $addresses)
      *
      * @throws RfcComplianceException
      */
-    public function addAddresses(array $addresses)
+    public function addAddresses(array $addresses): void
     {
         foreach ($addresses as $address) {
             $this->addAddress($address);
@@ -83,7 +83,7 @@ public function addAddresses(array $addresses)
     /**
      * @throws RfcComplianceException
      */
-    public function addAddress(Address $address)
+    public function addAddress(Address $address): void
     {
         $this->addresses[] = $address;
     }
diff --git a/src/Symfony/Component/Mime/Header/ParameterizedHeader.php b/src/Symfony/Component/Mime/Header/ParameterizedHeader.php
index ee2e11346bc89..0618e82bddcae 100644
--- a/src/Symfony/Component/Mime/Header/ParameterizedHeader.php
+++ b/src/Symfony/Component/Mime/Header/ParameterizedHeader.php
@@ -41,7 +41,7 @@ public function __construct(string $name, string $value, array $parameters = [])
         }
     }
 
-    public function setParameter(string $parameter, ?string $value)
+    public function setParameter(string $parameter, ?string $value): void
     {
         $this->setParameters(array_merge($this->getParameters(), [$parameter => $value]));
     }
@@ -54,7 +54,7 @@ public function getParameter(string $parameter): string
     /**
      * @param string[] $parameters
      */
-    public function setParameters(array $parameters)
+    public function setParameters(array $parameters): void
     {
         $this->parameters = $parameters;
     }
diff --git a/src/Symfony/Component/Mime/Header/PathHeader.php b/src/Symfony/Component/Mime/Header/PathHeader.php
index 4c6e6908fd56a..63eb30af01bf8 100644
--- a/src/Symfony/Component/Mime/Header/PathHeader.php
+++ b/src/Symfony/Component/Mime/Header/PathHeader.php
@@ -35,7 +35,7 @@ public function __construct(string $name, Address $address)
      *
      * @throws RfcComplianceException
      */
-    public function setBody(mixed $body)
+    public function setBody(mixed $body): void
     {
         $this->setAddress($body);
     }
@@ -45,7 +45,7 @@ public function getBody(): Address
         return $this->getAddress();
     }
 
-    public function setAddress(Address $address)
+    public function setAddress(Address $address): void
     {
         $this->address = $address;
     }
diff --git a/src/Symfony/Component/Mime/Header/UnstructuredHeader.php b/src/Symfony/Component/Mime/Header/UnstructuredHeader.php
index 668b0be7f0105..61c06d8f508b8 100644
--- a/src/Symfony/Component/Mime/Header/UnstructuredHeader.php
+++ b/src/Symfony/Component/Mime/Header/UnstructuredHeader.php
@@ -29,6 +29,8 @@ public function __construct(string $name, string $value)
 
     /**
      * @param string $body
+     *
+     * @return void
      */
     public function setBody(mixed $body)
     {
@@ -50,6 +52,8 @@ public function getValue(): string
 
     /**
      * Set the (unencoded) value of this header.
+     *
+     * @return void
      */
     public function setValue(string $value)
     {
diff --git a/src/Symfony/Component/Mime/Message.php b/src/Symfony/Component/Mime/Message.php
index 55435d7d72bf4..e636c2e8e5546 100644
--- a/src/Symfony/Component/Mime/Message.php
+++ b/src/Symfony/Component/Mime/Message.php
@@ -125,6 +125,9 @@ public function toIterable(): iterable
         yield from $body->toIterable();
     }
 
+    /**
+     * @return void
+     */
     public function ensureValidity()
     {
         if (!$this->headers->has('To') && !$this->headers->has('Cc') && !$this->headers->has('Bcc')) {
diff --git a/src/Symfony/Component/Mime/MimeTypes.php b/src/Symfony/Component/Mime/MimeTypes.php
index 0cbd5924e41a4..21c8aecf2ac4b 100644
--- a/src/Symfony/Component/Mime/MimeTypes.php
+++ b/src/Symfony/Component/Mime/MimeTypes.php
@@ -58,7 +58,7 @@ public function __construct(array $map = [])
         $this->registerGuesser(new FileinfoMimeTypeGuesser());
     }
 
-    public static function setDefault(self $default)
+    public static function setDefault(self $default): void
     {
         self::$default = $default;
     }
@@ -73,7 +73,7 @@ public static function getDefault(): self
      *
      * The last registered guesser has precedence over the other ones.
      */
-    public function registerGuesser(MimeTypeGuesserInterface $guesser)
+    public function registerGuesser(MimeTypeGuesserInterface $guesser): void
     {
         array_unshift($this->guessers, $guesser);
     }
diff --git a/src/Symfony/Component/Mime/RawMessage.php b/src/Symfony/Component/Mime/RawMessage.php
index ed051aab65f98..90e7caee9ebad 100644
--- a/src/Symfony/Component/Mime/RawMessage.php
+++ b/src/Symfony/Component/Mime/RawMessage.php
@@ -55,6 +55,8 @@ public function toIterable(): iterable
 
     /**
      * @throws LogicException if the message is not valid
+     *
+     * @return void
      */
     public function ensureValidity()
     {
diff --git a/src/Symfony/Component/Notifier/Bridge/Mobyt/MobytOptions.php b/src/Symfony/Component/Notifier/Bridge/Mobyt/MobytOptions.php
index 109e97303a57d..b2357951f4726 100644
--- a/src/Symfony/Component/Notifier/Bridge/Mobyt/MobytOptions.php
+++ b/src/Symfony/Component/Notifier/Bridge/Mobyt/MobytOptions.php
@@ -61,7 +61,7 @@ public function getRecipientId(): ?string
         return $this->options['recipient'] ?? null;
     }
 
-    public function messageType(string $type)
+    public function messageType(string $type): void
     {
         self::validateMessageType($type);
 
diff --git a/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php b/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php
index 20e727020835d..88f37a44ccce5 100644
--- a/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php
+++ b/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php
@@ -29,7 +29,7 @@ public function __construct(NotificationLoggerListener $logger)
         $this->logger = $logger;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         $this->data['events'] = $this->logger->getEvents();
     }
@@ -39,7 +39,7 @@ public function getEvents(): NotificationEvents
         return $this->data['events'];
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
     }
diff --git a/src/Symfony/Component/Notifier/EventListener/NotificationLoggerListener.php b/src/Symfony/Component/Notifier/EventListener/NotificationLoggerListener.php
index 41f1b7a08674a..70ca6aed9c552 100644
--- a/src/Symfony/Component/Notifier/EventListener/NotificationLoggerListener.php
+++ b/src/Symfony/Component/Notifier/EventListener/NotificationLoggerListener.php
@@ -28,6 +28,9 @@ public function __construct()
         $this->events = new NotificationEvents();
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->events = new NotificationEvents();
diff --git a/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php b/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php
index 25a6111a39e83..355c136195f52 100644
--- a/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php
+++ b/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php
@@ -31,6 +31,9 @@ public function __construct(Notifier $notifier)
         $this->notifier = $notifier;
     }
 
+    /**
+     * @return void
+     */
     public function onMessageFailed(WorkerMessageFailedEvent $event)
     {
         if ($event->willRetry()) {
diff --git a/src/Symfony/Component/PasswordHasher/Command/UserPasswordHashCommand.php b/src/Symfony/Component/PasswordHasher/Command/UserPasswordHashCommand.php
index 5fdc89cab91f5..d3c80b9d36c8d 100644
--- a/src/Symfony/Component/PasswordHasher/Command/UserPasswordHashCommand.php
+++ b/src/Symfony/Component/PasswordHasher/Command/UserPasswordHashCommand.php
@@ -49,7 +49,7 @@ public function __construct(PasswordHasherFactoryInterface $hasherFactory, array
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->addArgument('password', InputArgument::OPTIONAL, 'The plain password to hash.')
diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
index d9d1110293326..e3387dfe15e75 100644
--- a/src/Symfony/Component/Process/ExecutableFinder.php
+++ b/src/Symfony/Component/Process/ExecutableFinder.php
@@ -23,6 +23,8 @@ class ExecutableFinder
 
     /**
      * Replaces default suffixes of executable.
+     *
+     * @return void
      */
     public function setSuffixes(array $suffixes)
     {
@@ -31,6 +33,8 @@ public function setSuffixes(array $suffixes)
 
     /**
      * Adds new possible suffix to check for executable.
+     *
+     * @return void
      */
     public function addSuffix(string $suffix)
     {
diff --git a/src/Symfony/Component/Process/InputStream.php b/src/Symfony/Component/Process/InputStream.php
index d703660868d97..25f574f703cb8 100644
--- a/src/Symfony/Component/Process/InputStream.php
+++ b/src/Symfony/Component/Process/InputStream.php
@@ -29,6 +29,8 @@ class InputStream implements \IteratorAggregate
 
     /**
      * Sets a callback that is called when the write buffer becomes empty.
+     *
+     * @return void
      */
     public function onEmpty(callable $onEmpty = null)
     {
@@ -40,6 +42,8 @@ public function onEmpty(callable $onEmpty = null)
      *
      * @param resource|string|int|float|bool|\Traversable|null $input The input to append as scalar,
      *                                                                stream resource or \Traversable
+     *
+     * @return void
      */
     public function write(mixed $input)
     {
@@ -54,6 +58,8 @@ public function write(mixed $input)
 
     /**
      * Closes the write buffer.
+     *
+     * @return void
      */
     public function close()
     {
diff --git a/src/Symfony/Component/Process/PhpProcess.php b/src/Symfony/Component/Process/PhpProcess.php
index 486bc1dac6866..ef54a3d2b0e53 100644
--- a/src/Symfony/Component/Process/PhpProcess.php
+++ b/src/Symfony/Component/Process/PhpProcess.php
@@ -55,6 +55,9 @@ public static function fromShellCommandline(string $command, string $cwd = null,
         throw new LogicException(sprintf('The "%s()" method cannot be called when using "%s".', __METHOD__, self::class));
     }
 
+    /**
+     * @return void
+     */
     public function start(callable $callback = null, array $env = [])
     {
         if (null === $this->getCommandLine()) {
diff --git a/src/Symfony/Component/Process/Pipes/AbstractPipes.php b/src/Symfony/Component/Process/Pipes/AbstractPipes.php
index 51d3af0b52624..ba3a97a3f6b1b 100644
--- a/src/Symfony/Component/Process/Pipes/AbstractPipes.php
+++ b/src/Symfony/Component/Process/Pipes/AbstractPipes.php
@@ -41,7 +41,7 @@ public function __construct(mixed $input)
         }
     }
 
-    public function close()
+    public function close(): void
     {
         foreach ($this->pipes as $pipe) {
             if (\is_resource($pipe)) {
@@ -66,7 +66,7 @@ protected function hasSystemCallBeenInterrupted(): bool
     /**
      * Unblocks streams.
      */
-    protected function unblock()
+    protected function unblock(): void
     {
         if (!$this->blocked) {
             return;
@@ -170,7 +170,7 @@ protected function write(): ?array
     /**
      * @internal
      */
-    public function handleError(int $type, string $msg)
+    public function handleError(int $type, string $msg): void
     {
         $this->lastError = $msg;
     }
diff --git a/src/Symfony/Component/Process/Pipes/PipesInterface.php b/src/Symfony/Component/Process/Pipes/PipesInterface.php
index 50eb5c47e1641..967f8de7fae05 100644
--- a/src/Symfony/Component/Process/Pipes/PipesInterface.php
+++ b/src/Symfony/Component/Process/Pipes/PipesInterface.php
@@ -57,5 +57,5 @@ public function haveReadSupport(): bool;
     /**
      * Closes file handles and pipes.
      */
-    public function close();
+    public function close(): void;
 }
diff --git a/src/Symfony/Component/Process/Pipes/WindowsPipes.php b/src/Symfony/Component/Process/Pipes/WindowsPipes.php
index 9f4dedb289da0..0d6ab12d3bb1c 100644
--- a/src/Symfony/Component/Process/Pipes/WindowsPipes.php
+++ b/src/Symfony/Component/Process/Pipes/WindowsPipes.php
@@ -172,7 +172,7 @@ public function areOpen(): bool
         return $this->pipes && $this->fileHandles;
     }
 
-    public function close()
+    public function close(): void
     {
         parent::close();
         foreach ($this->fileHandles as $type => $handle) {
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index 990d77b7a5ed0..843031f01eee6 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -119,6 +119,9 @@ public function getValue(object|array $objectOrArray, string|PropertyPathInterfa
         return $propertyValues[\count($propertyValues) - 1][self::VALUE];
     }
 
+    /**
+     * @return void
+     */
     public function setValue(object|array &$objectOrArray, string|PropertyPathInterface $propertyPath, mixed $value)
     {
         if (\is_object($objectOrArray) && false === strpbrk((string) $propertyPath, '.[')) {
@@ -497,7 +500,7 @@ private function getReadInfo(string $class, string $property): ?PropertyReadInfo
      *
      * @throws NoSuchIndexException If the array does not implement \ArrayAccess or it is not an array
      */
-    private function writeIndex(array $zval, string|int $index, mixed $value)
+    private function writeIndex(array $zval, string|int $index, mixed $value): void
     {
         if (!$zval[self::VALUE] instanceof \ArrayAccess && !\is_array($zval[self::VALUE])) {
             throw new NoSuchIndexException(sprintf('Cannot modify index "%s" in object of type "%s" because it doesn\'t implement \ArrayAccess.', $index, get_debug_type($zval[self::VALUE])));
@@ -511,7 +514,7 @@ private function writeIndex(array $zval, string|int $index, mixed $value)
      *
      * @throws NoSuchPropertyException if the property does not exist or is not public
      */
-    private function writeProperty(array $zval, string $property, mixed $value)
+    private function writeProperty(array $zval, string $property, mixed $value): void
     {
         if (!\is_object($zval[self::VALUE])) {
             throw new NoSuchPropertyException(sprintf('Cannot write property "%s" to an array. Maybe you should write the property path as "[%1$s]" instead?', $property));
@@ -545,7 +548,7 @@ private function writeProperty(array $zval, string $property, mixed $value)
     /**
      * Adjusts a collection-valued property by calling add*() and remove*() methods.
      */
-    private function writeCollection(array $zval, string $property, iterable $collection, PropertyWriteInfo $addMethod, PropertyWriteInfo $removeMethod)
+    private function writeCollection(array $zval, string $property, iterable $collection, PropertyWriteInfo $addMethod, PropertyWriteInfo $removeMethod): void
     {
         // At this point the add and remove methods have been found
         $previousValue = $this->readProperty($zval, $property);
diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
index 2a3970c713abc..a3c79e667b9ae 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
@@ -33,6 +33,8 @@ public function __construct(PropertyPathInterface|string $path = null)
      *
      * @param int $offset The offset where the appended piece starts in $path
      * @param int $length The length of the appended piece; if 0, the full path is appended
+     *
+     * @return void
      */
     public function append(PropertyPathInterface|string $path, int $offset = 0, int $length = 0)
     {
@@ -54,6 +56,8 @@ public function append(PropertyPathInterface|string $path, int $offset = 0, int
 
     /**
      * Appends an index element to the current path.
+     *
+     * @return void
      */
     public function appendIndex(string $name)
     {
@@ -63,6 +67,8 @@ public function appendIndex(string $name)
 
     /**
      * Appends a property element to the current path.
+     *
+     * @return void
      */
     public function appendProperty(string $name)
     {
@@ -74,6 +80,8 @@ public function appendProperty(string $name)
      * Removes elements from the current path.
      *
      * @throws OutOfBoundsException if offset is invalid
+     *
+     * @return void
      */
     public function remove(int $offset, int $length = 1)
     {
@@ -91,6 +99,8 @@ public function remove(int $offset, int $length = 1)
      * @param int $pathLength The length of the inserted piece; if 0, the full path is inserted
      *
      * @throws OutOfBoundsException If the offset is invalid
+     *
+     * @return void
      */
     public function replace(int $offset, int $length, PropertyPathInterface|string $path, int $pathOffset = 0, int $pathLength = 0)
     {
@@ -121,6 +131,8 @@ public function replace(int $offset, int $length, PropertyPathInterface|string $
      * Replaces a property element by an index element.
      *
      * @throws OutOfBoundsException If the offset is invalid
+     *
+     * @return void
      */
     public function replaceByIndex(int $offset, string $name = null)
     {
@@ -139,6 +151,8 @@ public function replaceByIndex(int $offset, string $name = null)
      * Replaces an index element by a property element.
      *
      * @throws OutOfBoundsException If the offset is invalid
+     *
+     * @return void
      */
     public function replaceByProperty(int $offset, string $name = null)
     {
@@ -196,7 +210,7 @@ public function __toString(): string
      * removed at $offset and another chunk of length $insertionLength
      * can be inserted.
      */
-    private function resize(int $offset, int $cutLength, int $insertionLength)
+    private function resize(int $offset, int $cutLength, int $insertionLength): void
     {
         // Nothing else to do in this case
         if ($insertionLength === $cutLength) {
diff --git a/src/Symfony/Component/PropertyInfo/DependencyInjection/PropertyInfoConstructorPass.php b/src/Symfony/Component/PropertyInfo/DependencyInjection/PropertyInfoConstructorPass.php
index 48a2b5790b665..6c775384d983e 100644
--- a/src/Symfony/Component/PropertyInfo/DependencyInjection/PropertyInfoConstructorPass.php
+++ b/src/Symfony/Component/PropertyInfo/DependencyInjection/PropertyInfoConstructorPass.php
@@ -25,7 +25,7 @@ final class PropertyInfoConstructorPass implements CompilerPassInterface
 {
     use PriorityTaggedServiceTrait;
 
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('property_info.constructor_extractor')) {
             return;
diff --git a/src/Symfony/Component/PropertyInfo/DependencyInjection/PropertyInfoPass.php b/src/Symfony/Component/PropertyInfo/DependencyInjection/PropertyInfoPass.php
index eeda8853e947c..1c240b43dade7 100644
--- a/src/Symfony/Component/PropertyInfo/DependencyInjection/PropertyInfoPass.php
+++ b/src/Symfony/Component/PropertyInfo/DependencyInjection/PropertyInfoPass.php
@@ -25,6 +25,9 @@ class PropertyInfoPass implements CompilerPassInterface
 {
     use PriorityTaggedServiceTrait;
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('property_info')) {
diff --git a/src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php b/src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php
index c3ea2b5b077d1..eca46e737923a 100644
--- a/src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php
+++ b/src/Symfony/Component/RateLimiter/Policy/SlidingWindow.php
@@ -68,7 +68,7 @@ public function isExpired(): bool
         return microtime(true) > $this->windowEndAt;
     }
 
-    public function add(int $hits = 1)
+    public function add(int $hits = 1): void
     {
         $this->hitCount += $hits;
     }
diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
index 974215a097fbe..bb8423101dee8 100644
--- a/src/Symfony/Component/Routing/Annotation/Route.php
+++ b/src/Symfony/Component/Routing/Annotation/Route.php
@@ -76,6 +76,9 @@ public function __construct(
         }
     }
 
+    /**
+     * @return void
+     */
     public function setPath(string $path)
     {
         $this->path = $path;
@@ -89,6 +92,9 @@ public function getPath()
         return $this->path;
     }
 
+    /**
+     * @return void
+     */
     public function setLocalizedPaths(array $localizedPaths)
     {
         $this->localizedPaths = $localizedPaths;
@@ -99,6 +105,9 @@ public function getLocalizedPaths(): array
         return $this->localizedPaths;
     }
 
+    /**
+     * @return void
+     */
     public function setHost(string $pattern)
     {
         $this->host = $pattern;
@@ -112,6 +121,9 @@ public function getHost()
         return $this->host;
     }
 
+    /**
+     * @return void
+     */
     public function setName(string $name)
     {
         $this->name = $name;
@@ -125,6 +137,9 @@ public function getName()
         return $this->name;
     }
 
+    /**
+     * @return void
+     */
     public function setRequirements(array $requirements)
     {
         $this->requirements = $requirements;
@@ -138,6 +153,9 @@ public function getRequirements()
         return $this->requirements;
     }
 
+    /**
+     * @return void
+     */
     public function setOptions(array $options)
     {
         $this->options = $options;
@@ -151,6 +169,9 @@ public function getOptions()
         return $this->options;
     }
 
+    /**
+     * @return void
+     */
     public function setDefaults(array $defaults)
     {
         $this->defaults = $defaults;
@@ -164,6 +185,9 @@ public function getDefaults()
         return $this->defaults;
     }
 
+    /**
+     * @return void
+     */
     public function setSchemes(array|string $schemes)
     {
         $this->schemes = (array) $schemes;
@@ -177,6 +201,9 @@ public function getSchemes()
         return $this->schemes;
     }
 
+    /**
+     * @return void
+     */
     public function setMethods(array|string $methods)
     {
         $this->methods = (array) $methods;
@@ -190,6 +217,9 @@ public function getMethods()
         return $this->methods;
     }
 
+    /**
+     * @return void
+     */
     public function setCondition(?string $condition)
     {
         $this->condition = $condition;
diff --git a/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php b/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php
index a538d83983293..edbecc1f0e176 100644
--- a/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php
+++ b/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php
@@ -25,6 +25,9 @@ class RoutingResolverPass implements CompilerPassInterface
 {
     use PriorityTaggedServiceTrait;
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (false === $container->hasDefinition('routing.resolver')) {
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
index 7e78a0bdd58d3..e3fb17e81c543 100644
--- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php
+++ b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -91,6 +91,9 @@ public function __construct(RouteCollection $routes, RequestContext $context, Lo
         $this->defaultLocale = $defaultLocale;
     }
 
+    /**
+     * @return void
+     */
     public function setContext(RequestContext $context)
     {
         $this->context = $context;
@@ -101,6 +104,9 @@ public function getContext(): RequestContext
         return $this->context;
     }
 
+    /**
+     * @return void
+     */
     public function setStrictRequirements(?bool $enabled)
     {
         $this->strictRequirements = $enabled;
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
index f390b2066c7b0..03d54d5909935 100644
--- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -93,6 +93,8 @@ public function __construct(Reader $reader = null, string $env = null)
 
     /**
      * Sets the annotation class to read route properties from.
+     *
+     * @return void
      */
     public function setRouteAnnotationClass(string $class)
     {
@@ -143,6 +145,8 @@ public function load(mixed $class, string $type = null): RouteCollection
 
     /**
      * @param RouteAnnotation $annot or an object that exposes a similar interface
+     *
+     * @return void
      */
     protected function addRoute(RouteCollection $collection, object $annot, array $globals, \ReflectionClass $class, \ReflectionMethod $method)
     {
@@ -230,6 +234,9 @@ public function supports(mixed $resource, string $type = null): bool
         return \is_string($resource) && preg_match('/^(?:\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$/', $resource) && (!$type || \in_array($type, ['annotation', 'attribute'], true));
     }
 
+    /**
+     * @return void
+     */
     public function setResolver(LoaderResolverInterface $resolver)
     {
     }
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/Traits/HostTrait.php b/src/Symfony/Component/Routing/Loader/Configurator/Traits/HostTrait.php
index edf53d3cfdefb..d275f6c67b4f7 100644
--- a/src/Symfony/Component/Routing/Loader/Configurator/Traits/HostTrait.php
+++ b/src/Symfony/Component/Routing/Loader/Configurator/Traits/HostTrait.php
@@ -18,7 +18,7 @@
  */
 trait HostTrait
 {
-    final protected function addHost(RouteCollection $routes, string|array $hosts)
+    final protected function addHost(RouteCollection $routes, string|array $hosts): void
     {
         if (!$hosts || !\is_array($hosts)) {
             $routes->setHost($hosts ?: '');
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/Traits/PrefixTrait.php b/src/Symfony/Component/Routing/Loader/Configurator/Traits/PrefixTrait.php
index b95dbdd43f8e2..58686380bcf04 100644
--- a/src/Symfony/Component/Routing/Loader/Configurator/Traits/PrefixTrait.php
+++ b/src/Symfony/Component/Routing/Loader/Configurator/Traits/PrefixTrait.php
@@ -21,7 +21,7 @@
  */
 trait PrefixTrait
 {
-    final protected function addPrefix(RouteCollection $routes, string|array $prefix, bool $trailingSlashOnRoot)
+    final protected function addPrefix(RouteCollection $routes, string|array $prefix, bool $trailingSlashOnRoot): void
     {
         if (\is_array($prefix)) {
             foreach ($prefix as $locale => $localePrefix) {
diff --git a/src/Symfony/Component/Routing/Loader/ObjectLoader.php b/src/Symfony/Component/Routing/Loader/ObjectLoader.php
index 4132f209a79b1..a2a57068f14ca 100644
--- a/src/Symfony/Component/Routing/Loader/ObjectLoader.php
+++ b/src/Symfony/Component/Routing/Loader/ObjectLoader.php
@@ -66,7 +66,7 @@ public function load(mixed $resource, string $type = null): RouteCollection
         return $routeCollection;
     }
 
-    private function addClassResource(\ReflectionClass $class, RouteCollection $collection)
+    private function addClassResource(\ReflectionClass $class, RouteCollection $collection): void
     {
         do {
             if (is_file($class->getFileName())) {
diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
index 93c37ebb35500..942cc2214fe8c 100644
--- a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
@@ -63,6 +63,8 @@ public function load(mixed $file, string $type = null): RouteCollection
      * Parses a node from a loaded XML file.
      *
      * @throws \InvalidArgumentException When the XML is invalid
+     *
+     * @return void
      */
     protected function parseNode(RouteCollection $collection, \DOMElement $node, string $path, string $file)
     {
@@ -101,6 +103,8 @@ public function supports(mixed $resource, string $type = null): bool
      * Parses a route and adds it to the RouteCollection.
      *
      * @throws \InvalidArgumentException When the XML is invalid
+     *
+     * @return void
      */
     protected function parseRoute(RouteCollection $collection, \DOMElement $node, string $path)
     {
@@ -148,6 +152,8 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, st
      * Parses an import and adds the routes in the resource to the RouteCollection.
      *
      * @throws \InvalidArgumentException When the XML is invalid
+     *
+     * @return void
      */
     protected function parseImport(RouteCollection $collection, \DOMElement $node, string $path, string $file)
     {
diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
index c30adf1e2ae8a..8bae74b4de865 100644
--- a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
@@ -112,6 +112,8 @@ public function supports(mixed $resource, string $type = null): bool
 
     /**
      * Parses a route and adds it to the RouteCollection.
+     *
+     * @return void
      */
     protected function parseRoute(RouteCollection $collection, string $name, array $config, string $path)
     {
@@ -170,6 +172,8 @@ protected function parseRoute(RouteCollection $collection, string $name, array $
 
     /**
      * Parses an import and adds the routes in the resource to the RouteCollection.
+     *
+     * @return void
      */
     protected function parseImport(RouteCollection $collection, array $config, string $path, string $file)
     {
@@ -240,6 +244,8 @@ protected function parseImport(RouteCollection $collection, array $config, strin
     /**
      * @throws \InvalidArgumentException If one of the provided config keys is not supported,
      *                                   something is missing or the combination is nonsense
+     *
+     * @return void
      */
     protected function validate(mixed $config, string $name, string $path)
     {
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
index 980aa8e51f864..af5969f771ca2 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
@@ -50,6 +50,9 @@ public function dump(array $options = []): string
 EOF;
     }
 
+    /**
+     * @return void
+     */
     public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
     {
         $this->expressionLanguageProviders[] = $provider;
diff --git a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
index b682040b5a44d..417f156415c67 100644
--- a/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
+++ b/src/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php
@@ -44,6 +44,9 @@ public function getTraces(string $pathinfo)
         return $this->traces;
     }
 
+    /**
+     * @return array
+     */
     public function getTracesForRequest(Request $request)
     {
         $this->request = $request;
@@ -157,7 +160,7 @@ protected function matchCollection(string $pathinfo, RouteCollection $routes): a
         return [];
     }
 
-    private function addTrace(string $log, int $level = self::ROUTE_DOES_NOT_MATCH, string $name = null, Route $route = null)
+    private function addTrace(string $log, int $level = self::ROUTE_DOES_NOT_MATCH, string $name = null, Route $route = null): void
     {
         $this->traces[] = [
             'log' => $log,
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
index 68fb25db80032..a0b439a1f47e0 100644
--- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
+++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -62,6 +62,9 @@ public function __construct(RouteCollection $routes, RequestContext $context)
         $this->context = $context;
     }
 
+    /**
+     * @return void
+     */
     public function setContext(RequestContext $context)
     {
         $this->context = $context;
@@ -98,6 +101,9 @@ public function matchRequest(Request $request): array
         return $ret;
     }
 
+    /**
+     * @return void
+     */
     public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
     {
         $this->expressionLanguageProviders[] = $provider;
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
index 2e4ae30c65fc5..f244e62bed344 100644
--- a/src/Symfony/Component/Routing/RouteCollection.php
+++ b/src/Symfony/Component/Routing/RouteCollection.php
@@ -82,6 +82,9 @@ public function count(): int
         return \count($this->routes);
     }
 
+    /**
+     * @return void
+     */
     public function add(string $name, Route $route, int $priority = 0)
     {
         unset($this->routes[$name], $this->priorities[$name], $this->aliases[$name]);
@@ -139,6 +142,8 @@ public function get(string $name): ?Route
      * Removes a route or an array of routes by name from the collection.
      *
      * @param string|string[] $name The route name or an array of route names
+     *
+     * @return void
      */
     public function remove(string|array $name)
     {
@@ -150,6 +155,8 @@ public function remove(string|array $name)
     /**
      * Adds a route collection at the end of the current set by appending all
      * routes of the added collection.
+     *
+     * @return void
      */
     public function addCollection(self $collection)
     {
@@ -177,6 +184,8 @@ public function addCollection(self $collection)
 
     /**
      * Adds a prefix to the path of all child routes.
+     *
+     * @return void
      */
     public function addPrefix(string $prefix, array $defaults = [], array $requirements = [])
     {
@@ -195,6 +204,8 @@ public function addPrefix(string $prefix, array $defaults = [], array $requireme
 
     /**
      * Adds a prefix to the name of all the routes within in the collection.
+     *
+     * @return void
      */
     public function addNamePrefix(string $prefix)
     {
@@ -223,6 +234,8 @@ public function addNamePrefix(string $prefix)
 
     /**
      * Sets the host pattern on all routes.
+     *
+     * @return void
      */
     public function setHost(?string $pattern, array $defaults = [], array $requirements = [])
     {
@@ -237,6 +250,8 @@ public function setHost(?string $pattern, array $defaults = [], array $requireme
      * Sets a condition on all routes.
      *
      * Existing conditions will be overridden.
+     *
+     * @return void
      */
     public function setCondition(?string $condition)
     {
@@ -249,6 +264,8 @@ public function setCondition(?string $condition)
      * Adds defaults to all routes.
      *
      * An existing default value under the same name in a route will be overridden.
+     *
+     * @return void
      */
     public function addDefaults(array $defaults)
     {
@@ -263,6 +280,8 @@ public function addDefaults(array $defaults)
      * Adds requirements to all routes.
      *
      * An existing requirement under the same name in a route will be overridden.
+     *
+     * @return void
      */
     public function addRequirements(array $requirements)
     {
@@ -277,6 +296,8 @@ public function addRequirements(array $requirements)
      * Adds options to all routes.
      *
      * An existing option value under the same name in a route will be overridden.
+     *
+     * @return void
      */
     public function addOptions(array $options)
     {
@@ -291,6 +312,8 @@ public function addOptions(array $options)
      * Sets the schemes (e.g. 'https') all child routes are restricted to.
      *
      * @param string|string[] $schemes The scheme or an array of schemes
+     *
+     * @return void
      */
     public function setSchemes(string|array $schemes)
     {
@@ -303,6 +326,8 @@ public function setSchemes(string|array $schemes)
      * Sets the HTTP methods (e.g. 'POST') all child routes are restricted to.
      *
      * @param string|string[] $methods The method or an array of methods
+     *
+     * @return void
      */
     public function setMethods(string|array $methods)
     {
@@ -324,6 +349,8 @@ public function getResources(): array
     /**
      * Adds a resource for this collection. If the resource already exists
      * it is not added.
+     *
+     * @return void
      */
     public function addResource(ResourceInterface $resource)
     {
diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
index f7f24540621ed..058613072e82c 100644
--- a/src/Symfony/Component/Routing/Router.php
+++ b/src/Symfony/Component/Routing/Router.php
@@ -117,6 +117,8 @@ public function __construct(LoaderInterface $loader, mixed $resource, array $opt
      *                             implementing ConfigurableRequirementsInterface (default is true)
      *
      * @throws \InvalidArgumentException When unsupported option is provided
+     *
+     * @return void
      */
     public function setOptions(array $options)
     {
@@ -150,6 +152,8 @@ public function setOptions(array $options)
      * Sets an option.
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function setOption(string $key, mixed $value)
     {
@@ -179,6 +183,9 @@ public function getRouteCollection()
         return $this->collection ??= $this->loader->load($this->resource, $this->options['resource_type']);
     }
 
+    /**
+     * @return void
+     */
     public function setContext(RequestContext $context)
     {
         $this->context = $context;
@@ -198,6 +205,8 @@ public function getContext(): RequestContext
 
     /**
      * Sets the ConfigCache factory to use.
+     *
+     * @return void
      */
     public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory)
     {
@@ -302,6 +311,9 @@ function (ConfigCacheInterface $cache) {
         return $this->generator;
     }
 
+    /**
+     * @return void
+     */
     public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
     {
         $this->expressionLanguageProviders[] = $provider;
diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php
index e47b29f5a71a4..341883f3c548e 100644
--- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php
+++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/InMemoryTokenProvider.php
@@ -31,6 +31,9 @@ public function loadTokenBySeries(string $series): PersistentTokenInterface
         return $this->tokens[$series];
     }
 
+    /**
+     * @return void
+     */
     public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTime $lastUsed)
     {
         if (!isset($this->tokens[$series])) {
@@ -47,11 +50,17 @@ public function updateToken(string $series, #[\SensitiveParameter] string $token
         $this->tokens[$series] = $token;
     }
 
+    /**
+     * @return void
+     */
     public function deleteTokenBySeries(string $series)
     {
         unset($this->tokens[$series]);
     }
 
+    /**
+     * @return void
+     */
     public function createNewToken(PersistentTokenInterface $token)
     {
         $this->tokens[$token->getSeries()] = $token;
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
index 63185eec03b9d..4416cda6168cd 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
@@ -53,11 +53,17 @@ public function getUser(): ?UserInterface
         return $this->user;
     }
 
+    /**
+     * @return void
+     */
     public function setUser(UserInterface $user)
     {
         $this->user = $user;
     }
 
+    /**
+     * @return void
+     */
     public function eraseCredentials()
     {
         if ($this->getUser() instanceof UserInterface) {
@@ -112,6 +118,9 @@ public function getAttributes(): array
         return $this->attributes;
     }
 
+    /**
+     * @return void
+     */
     public function setAttributes(array $attributes)
     {
         $this->attributes = $attributes;
@@ -131,6 +140,9 @@ public function getAttribute(string $name): mixed
         return $this->attributes[$name];
     }
 
+    /**
+     * @return void
+     */
     public function setAttribute(string $name, mixed $value)
     {
         $this->attributes[$name] = $value;
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
index 47e04eb435fba..3df95e527dd22 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
@@ -43,6 +43,9 @@ public function getUserIdentifier(): string
         return '';
     }
 
+    /**
+     * @return void
+     */
     public function eraseCredentials()
     {
     }
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php
index e1f619a6b8865..0ec6b1cfb972b 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php
@@ -37,6 +37,9 @@ public function getToken(): ?TokenInterface
         return $this->token;
     }
 
+    /**
+     * @return void
+     */
     public function setToken(TokenInterface $token = null)
     {
         if (1 > \func_num_args()) {
@@ -57,6 +60,9 @@ public function setInitializer(?callable $initializer): void
         $this->initializer = null === $initializer ? null : $initializer(...);
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->setToken(null);
diff --git a/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php
index 10299fe5a60ea..48bf3bc80bcce 100644
--- a/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php
+++ b/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php
@@ -72,7 +72,7 @@ public function de
10000
cide(TokenInterface $token, array $attributes, mixed $object =
      * @param array $attributes attributes used for the vote
      * @param int   $vote       vote of the voter
      */
-    public function addVoterVote(VoterInterface $voter, array $attributes, int $vote)
+    public function addVoterVote(VoterInterface $voter, array $attributes, int $vote): void
     {
         $currentLogIndex = \count($this->currentLog) - 1;
         $this->currentLog[$currentLogIndex]['voterDetails'][] = [
diff --git a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
index 126149049bda1..88804d6591e3d 100644
--- a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
+++ b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
@@ -34,6 +34,9 @@ public function getAttributes(): array
         return $this->attributes;
     }
 
+    /**
+     * @return void
+     */
     public function setAttributes(array|string $attributes)
     {
         $this->attributes = (array) $attributes;
@@ -44,6 +47,9 @@ public function getSubject(): mixed
         return $this->subject;
     }
 
+    /**
+     * @return void
+     */
     public function setSubject(mixed $subject)
     {
         $this->subject = $subject;
diff --git a/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php b/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php
index 58053905758cc..5b064929edbb3 100644
--- a/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php
+++ b/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php
@@ -32,6 +32,9 @@ public function getUser(): ?UserInterface
         return $this->user;
     }
 
+    /**
+     * @return void
+     */
     public function setUser(UserInterface $user)
     {
         $this->user = $user;
diff --git a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
index 69ac3d6ec4a4d..adec6f8758893 100644
--- a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
+++ b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
@@ -39,6 +39,9 @@ public function getToken(): ?TokenInterface
         return $this->token;
     }
 
+    /**
+     * @return void
+     */
     public function setToken(TokenInterface $token)
     {
         $this->token = $token;
diff --git a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAccountStatusException.php b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAccountStatusException.php
index 0c59a954a7ce3..829a22cd1bb7c 100644
--- a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAccountStatusException.php
+++ b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAccountStatusException.php
@@ -38,6 +38,8 @@ public function __construct(string $message = '', array $messageData = [], int $
      *
      * @param string $messageKey  The message or message key
      * @param array  $messageData Data to be passed into the translator
+     *
+     * @return void
      */
     public function setSafeMessage(string $messageKey, array $messageData = [])
     {
diff --git a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php
index b935df3a3c1ba..40de92d29fc4b 100644
--- a/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php
+++ b/src/Symfony/Component/Security/Core/Exception/CustomUserMessageAuthenticationException.php
@@ -37,6 +37,8 @@ public function __construct(string $message = '', array $messageData = [], int $
      *
      * @param string $messageKey  The message or message key
      * @param array  $messageData Data to be passed into the translator
+     *
+     * @return void
      */
     public function setSafeMessage(string $messageKey, array $messageData = [])
     {
diff --git a/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php b/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
index 080647c8b34ba..da094d2bbf142 100644
--- a/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
+++ b/src/Symfony/Component/Security/Core/Role/RoleHierarchy.php
@@ -49,6 +49,9 @@ public function getReachableRoleNames(array $roles): array
         return array_values(array_unique($reachableRoles));
     }
 
+    /**
+     * @return void
+     */
     protected function buildRoleMap()
     {
         $this->map = [];
diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUser.php b/src/Symfony/Component/Security/Core/User/InMemoryUser.php
index ca9884174f10f..b4fc8f1d67df5 100644
--- a/src/Symfony/Component/Security/Core/User/InMemoryUser.php
+++ b/src/Symfony/Component/Security/Core/User/InMemoryUser.php
@@ -76,7 +76,7 @@ public function isEnabled(): bool
         return $this->enabled;
     }
 
-    public function eraseCredentials()
+    public function eraseCredentials(): void
     {
     }
 
diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserChecker.php b/src/Symfony/Component/Security/Core/User/InMemoryUserChecker.php
index f738ee00d067d..a493b00e79b99 100644
--- a/src/Symfony/Component/Security/Core/User/InMemoryUserChecker.php
+++ b/src/Symfony/Component/Security/Core/User/InMemoryUserChecker.php
@@ -20,6 +20,9 @@
  */
 class InMemoryUserChecker implements UserCheckerInterface
 {
+    /**
+     * @return void
+     */
     public function checkPreAuth(UserInterface $user)
     {
         if (!$user instanceof InMemoryUser) {
@@ -33,6 +36,9 @@ public function checkPreAuth(UserInterface $user)
         }
     }
 
+    /**
+     * @return void
+     */
     public function checkPostAuth(UserInterface $user)
     {
     }
diff --git a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
index 56e7d35c8b9eb..8fd2205a9d78d 100644
--- a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
+++ b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
@@ -31,6 +31,9 @@ public function __construct(TokenStorageInterface $tokenStorage, PasswordHasherF
         $this->hasherFactory = $hasherFactory;
     }
 
+    /**
+     * @return void
+     */
     public function validate(mixed $password, Constraint $constraint)
     {
         if (!$constraint instanceof UserPassword) {
diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php b/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php
index cf0ce03e9311d..7de8b52969c4a 100644
--- a/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php
+++ b/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php
@@ -51,6 +51,9 @@ public function getToken(string $tokenId): string
         return (string) $_SESSION[$this->namespace][$tokenId];
     }
 
+    /**
+     * @return void
+     */
     public function setToken(string $tokenId, #[\SensitiveParameter] string $token)
     {
         if (!$this->sessionStarted) {
@@ -90,12 +93,15 @@ public function removeToken(string $tokenId): ?string
         return $token;
     }
 
+    /**
+     * @return void
+     */
     public function clear()
     {
         unset($_SESSION[$this->namespace]);
     }
 
-    private function startSession()
+    private function startSession(): void
     {
         if (\PHP_SESSION_NONE === session_status()) {
             session_start();
diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php b/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php
index fdbaf135d7654..4b3c3e56a56ea 100644
--- a/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php
+++ b/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php
@@ -56,6 +56,9 @@ public function getToken(string $tokenId): string
         return (string) $session->get($this->namespace.'/'.$tokenId);
     }
 
+    /**
+     * @return void
+     */
     public function setToken(string $tokenId, #[\SensitiveParameter] string $token)
     {
         $session = $this->getSession();
@@ -86,6 +89,9 @@ public function removeToken(string $tokenId): ?string
         return $session->remove($this->namespace.'/'.$tokenId);
     }
 
+    /**
+     * @return void
+     */
     public function clear()
     {
         $session = $this->getSession();
diff --git a/src/Symfony/Component/Security/Http/AccessMap.php b/src/Symfony/Component/Security/Http/AccessMap.php
index 701428783795a..6c05dffa21e94 100644
--- a/src/Symfony/Component/Security/Http/AccessMap.php
+++ b/src/Symfony/Component/Security/Http/AccessMap.php
@@ -27,6 +27,8 @@ class AccessMap implements AccessMapInterface
     /**
      * @param array       $attributes An array of attributes to pass to the access decision manager (like roles)
      * @param string|null $channel    The channel to enforce (http, https, or null)
+     *
+     * @return void
      */
     public function add(RequestMatcherInterface $requestMatcher, array $attributes = [], string $channel = null)
     {
diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
index 6903005be2b68..c6ffa4527969b 100644
--- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
@@ -59,6 +59,9 @@ public function getOptions(): array
         return $this->options;
     }
 
+    /**
+     * @return void
+     */
     public function setOptions(array $options)
     {
         $this->options = array_merge($this->defaultOptions, $options);
diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
index a6eeffcd2668f..bd9d98c65bb13 100644
--- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
@@ -65,6 +65,9 @@ public function getOptions(): array
         return $this->options;
     }
 
+    /**
+     * @return void
+     */
     public function setOptions(array $options)
     {
         $this->options = array_merge($this->defaultOptions, $options);
diff --git a/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php
index d3ade9b0be73b..e88a04056e42b 100644
--- a/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php
+++ b/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php
@@ -95,6 +95,9 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
         );
     }
 
+    /**
+     * @return void
+     */
     public function setTranslator(?TranslatorInterface $translator)
     {
         $this->translator = $translator;
diff --git a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
index d3427c687d49d..1d2a4b2be1c55 100644
--- a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
+++ b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
@@ -65,6 +65,9 @@ public function getRequest(): Request
         return $this->request;
     }
 
+    /**
+     * @return void
+     */
     public function setResponse(?Response $response)
     {
         $this->response = $response;
diff --git a/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php b/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php
index cdfe72b6b0886..1b708c4efe30e 100644
--- a/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php
+++ b/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php
@@ -49,7 +49,7 @@ public function getToken(): ?TokenInterface
         return $this->token;
     }
 
-    public function setToken(TokenInterface $token)
+    public function setToken(TokenInterface $token): void
     {
         $this->token = $token;
     }
diff --git a/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php b/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
index 518578b511c9b..7ee9f41fcdb4b 100644
--- a/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
+++ b/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
@@ -36,6 +36,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @return void
+     */
     public function onKernelControllerArguments(ControllerArgumentsEvent $event)
     {
         /** @var IsGranted[] $attributes */
diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php
index 69be98678545a..fc56733efacde 100644
--- a/src/Symfony/Component/Security/Http/Firewall.php
+++ b/src/Symfony/Component/Security/Http/Firewall.php
@@ -47,6 +47,9 @@ public function __construct(FirewallMapInterface $map, EventDispatcherInterface
         $this->exceptionListeners = new \SplObjectStorage();
     }
 
+    /**
+     * @return void
+     */
     public function onKernelRequest(RequestEvent $event)
     {
         if (!$event->isMainRequest()) {
@@ -92,6 +95,9 @@ public function onKernelRequest(RequestEvent $event)
         $this->callListeners($event, $authenticationListeners());
     }
 
+    /**
+     * @return void
+     */
     public function onKernelFinishRequest(FinishRequestEvent $event)
     {
         $request = $event->getRequest();
@@ -110,6 +116,9 @@ public static function getSubscribedEvents()
         ];
     }
 
+    /**
+     * @return void
+     */
     protected function callListeners(RequestEvent $event, iterable $listeners)
     {
         foreach ($listeners as $listener) {
diff --git a/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php b/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php
index 062bc22960017..6601338831f3d 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php
@@ -70,7 +70,7 @@ public function supports(Request $request): ?bool
         return false;
     }
 
-    public function authenticate(RequestEvent $event)
+    public function authenticate(RequestEvent $event): void
     {
         $request = $event->getRequest();
 
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
index c7ad4a4a416ad..277e1a02fe6d5 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -79,7 +79,7 @@ public function supports(Request $request): ?bool
     /**
      * Reads the Security Token from the session.
      */
-    public function authenticate(RequestEvent $event)
+    public function authenticate(RequestEvent $event): void
     {
         if (!$this->registered && null !== $this->dispatcher && $event->isMainRequest()) {
             $this->dispatcher->addListener(KernelEvents::RESPONSE, $this->onKernelResponse(...));
@@ -147,7 +147,7 @@ public function authenticate(RequestEvent $event)
     /**
      * Writes the security token into the session.
      */
-    public function onKernelResponse(ResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event): void
     {
         if (!$event->isMainRequest()) {
             return;
diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
index 936fa6d49bde2..5d7545a5a7c69 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
@@ -73,7 +73,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationT
     /**
      * Registers a onKernelException listener to take care of security exceptions.
      */
-    public function register(EventDispatcherInterface $dispatcher)
+    public function register(EventDispatcherInterface $dispatcher): void
     {
         $dispatcher->addListener(KernelEvents::EXCEPTION, $this->onKernelException(...), 1);
     }
@@ -81,7 +81,7 @@ public function register(EventDispatcherInterface $dispatcher)
     /**
      * Unregisters the dispatcher.
      */
-    public function unregister(EventDispatcherInterface $dispatcher)
+    public function unregister(EventDispatcherInterface $dispatcher): void
     {
         $dispatcher->removeListener(KernelEvents::EXCEPTION, $this->onKernelException(...));
     }
@@ -89,7 +89,7 @@ public function unregister(EventDispatcherInterface $dispatcher)
     /**
      * Handles security related exceptions.
      */
-    public function onKernelException(ExceptionEvent $event)
+    public function onKernelException(ExceptionEvent $event): void
     {
         $exception = $event->getThrowable();
         do {
@@ -131,7 +131,7 @@ private function handleAuthenticationException(ExceptionEvent $event, Authentica
         }
     }
 
-    private function handleAccessDeniedException(ExceptionEvent $event, AccessDeniedException $exception)
+    private function handleAccessDeniedException(ExceptionEvent $event, AccessDeniedException $exception): void
     {
         $event->setThrowable(new AccessDeniedHttpException($exception->getMessage(), $exception));
 
@@ -217,7 +217,7 @@ private function startAuthentication(Request $request, AuthenticationException $
         return $response;
     }
 
-    protected function setTargetPath(Request $request)
+    protected function setTargetPath(Request $request): void
     {
         // session isn't required when using HTTP basic authentication mechanism for example
         if ($request->hasSession() && $request->isMethodSafe() && !$request->isXmlHttpRequest()) {
diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
index f7768998abdca..885a0a1eb445b 100644
--- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
@@ -68,7 +68,7 @@ public function supports(Request $request): ?bool
      * @throws LogoutException   if the CSRF token is invalid
      * @throws \RuntimeException if the LogoutSuccessHandlerInterface instance does not return a response
      */
-    public function authenticate(RequestEvent $event)
+    public function authenticate(RequestEvent $event): void
     {
         $request = $event->getRequest();
 
diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
index 5e882f78ee209..e72107190449a 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php
@@ -99,7 +99,7 @@ public function supports(Request $request): ?bool
      *
      * @throws \LogicException if switching to a user failed
      */
-    public function authenticate(RequestEvent $event)
+    public function authenticate(RequestEvent $event): void
     {
         $request = $event->getRequest();
 
diff --git a/src/Symfony/Component/Security/Http/FirewallMap.php b/src/Symfony/Component/Security/Http/FirewallMap.php
index de6c4ac9231f6..36c8c67e38f9a 100644
--- a/src/Symfony/Component/Security/Http/FirewallMap.php
+++ b/src/Symfony/Component/Security/Http/FirewallMap.php
@@ -31,6 +31,8 @@ class FirewallMap implements FirewallMapInterface
 
     /**
      * @param list<callable> $listeners
+     *
+     * @return void
      */
     public function add(RequestMatcherInterface $requestMatcher = null, array $listeners = [], ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null)
     {
diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
index ef625f92b4a25..54f52194c7169 100644
--- a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
+++ b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
@@ -46,6 +46,8 @@ public function __construct(RequestStack $requestStack = null, UrlGeneratorInter
      * @param string|null $csrfTokenId   The ID of the CSRF token
      * @param string|null $csrfParameter The CSRF token parameter name
      * @param string|null $context       The listener context
+     *
+     * @return void
      */
     public function registerListener(string $key, string $logoutPath, ?string $csrfTokenId, ?string $csrfParameter, CsrfTokenManagerInterface $csrfTokenManager = null, string $context = null)
     {
@@ -68,6 +70,9 @@ public function getLogoutUrl(string $key = null): string
         return $this->generateLogoutUrl($key, UrlGeneratorInterface::ABSOLUTE_URL);
     }
 
+    /**
+     * @return void
+     */
     public function setCurrentFirewall(?string $key, string $context = null)
     {
         $this->currentFirewallName = $key;
diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php
index 2b6485b746dad..6c75833c39af5 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php
@@ -87,6 +87,8 @@ public function clearRememberMeCookie(): void
      * Creates the remember-me cookie using the correct configuration.
      *
      * @param RememberMeDetails|null $rememberMeDetails The details for the cookie, or null to clear the remember-me cookie
+     *
+     * @return void
      */
     protected function createCookie(?RememberMeDetails $rememberMeDetails)
     {
diff --git a/src/Symfony/Component/Security/Http/RememberMe/ResponseListener.php b/src/Symfony/Component/Security/Http/RememberMe/ResponseListener.php
index ecdbaf7383c93..e251a6cdec374 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/ResponseListener.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/ResponseListener.php
@@ -30,7 +30,7 @@ class ResponseListener implements EventSubscriberInterface
      */
     public const COOKIE_ATTR_NAME = '_security_remember_me_cookie';
 
-    public function onKernelResponse(ResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event): void
     {
         if (!$event->isMainRequest()) {
             return;
diff --git a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php
index 7e555b0774a6c..63ede6193ab42 100644
--- a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php
+++ b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php
@@ -43,6 +43,9 @@ public function __construct(string $strategy, ClearableTokenStorageInterface $cs
         }
     }
 
+    /**
+     * @return void
+     */
     public function onAuthentication(Request $request, TokenInterface $token)
     {
         switch ($this->strategy) {
diff --git a/src/Symfony/Component/Security/Http/Util/TargetPathTrait.php b/src/Symfony/Component/Security/Http/Util/TargetPathTrait.php
index 67dcc99934fb5..c9ec541f81dbe 100644
--- a/src/Symfony/Component/Security/Http/Util/TargetPathTrait.php
+++ b/src/Symfony/Component/Security/Http/Util/TargetPathTrait.php
@@ -23,7 +23,7 @@ trait TargetPathTrait
      *
      * Usually, you do not need to set this directly.
      */
-    private function saveTargetPath(SessionInterface $session, string $firewallName, string $uri)
+    private function saveTargetPath(SessionInterface $session, string $firewallName, string $uri): void
     {
         $session->set('_security.'.$firewallName.'.target_path', $uri);
     }
@@ -39,7 +39,7 @@ private function getTargetPath(SessionInterface $session, string $firewallName):
     /**
      * Removes the target path from the session.
      */
-    private function removeTargetPath(SessionInterface $session, string $firewallName)
+    private function removeTargetPath(SessionInterface $session, string $firewallName): void
     {
         $session->remove('_security.'.$firewallName.'.target_path');
     }
diff --git a/src/Symfony/Component/Semaphore/Key.php b/src/Symfony/Component/Semaphore/Key.php
index 8d53a4f40dff2..deccee9c370b3 100644
--- a/src/Symfony/Component/Semaphore/Key.php
+++ b/src/Symfony/Component/Semaphore/Key.php
@@ -83,7 +83,7 @@ public function resetLifetime(): void
         $this->expiringTime = null;
     }
 
-    public function reduceLifetime(float $ttlInSeconds)
+    public function reduceLifetime(float $ttlInSeconds): void
     {
         $newTime = microtime(true) + $ttlInSeconds;
 
diff --git a/src/Symfony/Component/Semaphore/Semaphore.php b/src/Symfony/Component/Semaphore/Semaphore.php
index 3dff811a84c12..5e6d06d42b7b9 100644
--- a/src/Symfony/Component/Semaphore/Semaphore.php
+++ b/src/Symfony/Component/Semaphore/Semaphore.php
@@ -90,7 +90,7 @@ public function acquire(): bool
         }
     }
 
-    public function refresh(float $ttlInSecond = null)
+    public function refresh(float $ttlInSecond = null): void
     {
         if (!$ttlInSecond ??= $this->ttlInSecond) {
             throw new InvalidArgumentException('You have to define an expiration duration.');
@@ -121,7 +121,7 @@ public function isAcquired(): bool
         return $this->dirty = $this->store->exists($this->key);
     }
 
-    public function release()
+    public function release(): void
     {
         try {
             $this->store->delete($this->key);
diff --git a/src/Symfony/Component/Semaphore/Store/RedisStore.php b/src/Symfony/Component/Semaphore/Store/RedisStore.php
index f1c6fcc30edd9..0e0f551876401 100644
--- a/src/Symfony/Component/Semaphore/Store/RedisStore.php
+++ b/src/Symfony/Component/Semaphore/Store/RedisStore.php
@@ -31,6 +31,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @return void
+     */
     public function save(Key $key, float $ttlInSecond)
     {
         if (0 > $ttlInSecond) {
@@ -94,6 +97,9 @@ public function save(Key $key, float $ttlInSecond)
         }
     }
 
+    /**
+     * @return void
+     */
     public function putOffExpiration(Key $key, float $ttlInSecond)
     {
         if (0 > $ttlInSecond) {
@@ -136,6 +142,9 @@ public function putOffExpiration(Key $key, float $ttlInSecond)
         }
     }
 
+    /**
+     * @return void
+     */
     public function delete(Key $key)
     {
         $script = '
diff --git a/src/Symfony/Component/Serializer/Debug/TraceableEncoder.php b/src/Symfony/Component/Serializer/Debug/TraceableEncoder.php
index 35fc462d06990..0795d14ca0cfa 100644
--- a/src/Symfony/Component/Serializer/Debug/TraceableEncoder.php
+++ b/src/Symfony/Component/Serializer/Debug/TraceableEncoder.php
@@ -85,7 +85,7 @@ public function supportsDecoding(string $format, array $context = []): bool
         return $this->encoder->supportsDecoding($format, $context);
     }
 
-    public function setSerializer(SerializerInterface $serializer)
+    public function setSerializer(SerializerInterface $serializer): void
     {
         if (!$this->encoder instanceof SerializerAwareInterface) {
             return;
diff --git a/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php b/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php
index fc801ff8ad085..ca41fc6a83f07 100644
--- a/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php
+++ b/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php
@@ -87,7 +87,7 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
         return $this->normalizer->supportsDenormalization($data, $type, $format, $context);
     }
 
-    public function setSerializer(SerializerInterface $serializer)
+    public function setSerializer(SerializerInterface $serializer): void
     {
         if (!$this->normalizer instanceof SerializerAwareInterface) {
             return;
@@ -96,7 +96,7 @@ public function setSerializer(SerializerInterface $serializer)
         $this->normalizer->setSerializer($serializer);
     }
 
-    public function setNormalizer(NormalizerInterface $normalizer)
+    public function setNormalizer(NormalizerInterface $normalizer): void
     {
         if (!$this->normalizer instanceof NormalizerAwareInterface) {
             return;
@@ -105,7 +105,7 @@ public function setNormalizer(NormalizerInterface $normalizer)
         $this->normalizer->setNormalizer($normalizer);
     }
 
-    public function setDenormalizer(DenormalizerInterface $denormalizer)
+    public function setDenormalizer(DenormalizerInterface $denormalizer): void
     {
         if (!$this->normalizer instanceof DenormalizerAwareInterface) {
             return;
diff --git a/src/Symfony/Component/Serializer/DependencyInjection/SerializerPass.php b/src/Symfony/Component/Serializer/DependencyInjection/SerializerPass.php
index 9304621758242..71376d496559c 100644
--- a/src/Symfony/Component/Serializer/DependencyInjection/SerializerPass.php
+++ b/src/Symfony/Component/Serializer/DependencyInjection/SerializerPass.php
@@ -31,6 +31,9 @@ class SerializerPass implements CompilerPassInterface
 {
     use PriorityTaggedServiceTrait;
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('serializer')) {
diff --git a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
index c1893789a11f5..d8cc6e3f33afb 100644
--- a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
@@ -207,7 +207,7 @@ public function supportsDecoding(string $format): bool
     /**
      * Flattens an array and generates keys including the path.
      */
-    private function flatten(iterable $array, array &$result, string $keySeparator, string $parentKey = '', bool $escapeFormulas = false)
+    private function flatten(iterable $array, array &$result, string $keySeparator, string $parentKey = '', bool $escapeFormulas = false): void
     {
         foreach ($array as $key => $value) {
             if (is_iterable($value)) {
diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
index 22cc711a7e2c8..aeee5ac68053d 100644
--- a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
+++ b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
@@ -94,6 +94,9 @@ public function getName(): string
         return $this->name;
     }
 
+    /**
+     * @return void
+     */
     public function addGroup(string $group)
     {
         if (!\in_array($group, $this->groups)) {
@@ -106,6 +109,9 @@ public function getGroups(): array
         return $this->groups;
     }
 
+    /**
+     * @return void
+     */
     public function setMaxDepth(?int $maxDepth)
     {
         $this->maxDepth = $maxDepth;
@@ -116,6 +122,9 @@ public function getMaxDepth(): ?int
         return $this->maxDepth;
     }
 
+    /**
+     * @return void
+     */
     public function setSerializedName(string $serializedName = null)
     {
         if (1 > \func_num_args()) {
@@ -140,6 +149,9 @@ public function getSerializedPath(): ?PropertyPath
         return $this->serializedPath;
     }
 
+    /**
+     * @return void
+     */
     public function setIgnore(bool $ignore)
     {
         $this->ignore = $ignore;
@@ -202,6 +214,9 @@ public function setDenormalizationContextForGroups(array $context, array $groups
         }
     }
 
+    /**
+     * @return void
+     */
     public function merge(AttributeMetadataInterface $attributeMetadata)
     {
         foreach ($attributeMetadata->getGroups() as $group) {
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
index cb166b2128cf3..fc6336ebdbab7 100644
--- a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
+++ b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
@@ -60,6 +60,9 @@ public function getName(): string
         return $this->name;
     }
 
+    /**
+     * @return void
+     */
     public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata)
     {
         $this->attributesMetadata[$attributeMetadata->getName()] = $attributeMetadata;
@@ -70,6 +73,9 @@ public function getAttributesMetadata(): array
         return $this->attributesMetadata;
     }
 
+    /**
+     * @return void
+     */
     public function merge(ClassMetadataInterface $classMetadata)
     {
         foreach ($classMetadata->getAttributesMetadata() as $attributeMetadata) {
@@ -95,6 +101,9 @@ public function getClassDiscriminatorMapping(): ?ClassDiscriminatorMapping
         return $this->classDiscriminatorMapping;
     }
 
+    /**
+     * @return void
+     */
     public function setClassDiscriminatorMapping(ClassDiscriminatorMapping $mapping = null)
     {
         if (1 > \func_num_args()) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareTrait.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareTrait.php
index 82dba8f1861c5..c5cc86ecf63ca 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareTrait.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareTrait.php
@@ -21,6 +21,9 @@ trait DenormalizerAwareTrait
      */
     protected $denormalizer;
 
+    /**
+     * @return void
+     */
     public function setDenormalizer(DenormalizerInterface $denormalizer)
     {
         $this->denormalizer = $denormalizer;
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
index 54b2f7c9d48cb..e08dd5d9ecdaa 100644
--- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -134,6 +134,9 @@ protected function getAttributeValue(object $object, string $attribute, string $
         return null;
     }
 
+    /**
+     * @return void
+     */
     protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
     {
         $setter = 'set'.ucfirst($attribute);
diff --git a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
index 63f6770397aca..a442fc54d5aaf 100644
--- a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
@@ -42,7 +42,7 @@ public function __construct(PropertyNormalizer $normalizer)
         $this->headersProperty = new \ReflectionProperty(Headers::class, 'headers');
     }
 
-    public function setSerializer(SerializerInterface $serializer)
+    public function setSerializer(SerializerInterface $serializer): void
     {
         $this->serializer = $serializer;
         $this->normalizer->setSerializer($serializer);
diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareTrait.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareTrait.php
index a8835c93d0364..40a4fa0e8c44a 100644
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareTrait.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareTrait.php
@@ -21,6 +21,9 @@ trait NormalizerAwareTrait
      */
     protected $normalizer;
 
+    /**
+     * @return void
+     */
     public function setNormalizer(NormalizerInterface $normalizer)
     {
         $this->normalizer = $normalizer;
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index 37d3204aadf9b..8018cb7a49bb6 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -129,6 +129,9 @@ protected function getAttributeValue(object $object, string $attribute, string $
         return $attribute === $this->discriminatorCache[$cacheKey] ? $this->classDiscriminatorResolver->getTypeForMappedObject($object) : $this->propertyAccessor->getValue($object, $attribute);
     }
 
+    /**
+     * @return void
+     */
     protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
     {
         try {
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
index 144f1c448dc97..3dd734055d92d 100644
--- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -171,6 +171,9 @@ protected function getAttributeValue(object $object, string $attribute, string $
         return $reflectionProperty->getValue($object);
     }
 
+    /**
+     * @return void
+     */
     protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
     {
         try {
diff --git a/src/Symfony/Component/Serializer/SerializerAwareTrait.php b/src/Symfony/Component/Serializer/SerializerAwareTrait.php
index 99f4d0f3e09fe..1835568745422 100644
--- a/src/Symfony/Component/Serializer/SerializerAwareTrait.php
+++ b/src/Symfony/Component/Serializer/SerializerAwareTrait.php
@@ -21,6 +21,9 @@ trait SerializerAwareTrait
      */
     protected $serializer;
 
+    /**
+     * @return void
+     */
     public function setSerializer(SerializerInterface $serializer)
     {
         $this->serializer = $serializer;
diff --git a/src/Symfony/Component/Stopwatch/Stopwatch.php b/src/Symfony/Component/Stopwatch/Stopwatch.php
index 3d6c976b458f2..33976a0e879fb 100644
--- a/src/Symfony/Component/Stopwatch/Stopwatch.php
+++ b/src/Symfony/Component/Stopwatch/Stopwatch.php
@@ -58,6 +58,8 @@ public function getSections(): array
      * @param string|null $id The id of the session to re-open, null to create a new one
      *
      * @throws \LogicException When the section to re-open is not reachable
+     *
+     * @return void
      */
     public function openSection(string $id = null)
     {
@@ -80,6 +82,8 @@ public function openSection(string $id = null)
      * @see getSectionEvents()
      *
      * @throws \LogicException When there's no started section to be stopped
+     *
+     * @return void
      */
     public function stopSection(string $id)
     {
@@ -145,6 +149,8 @@ public function getSectionEvents(string $id): array
 
     /**
      * Resets the stopwatch to its original state.
+     *
+     * @return void
      */
     public function reset()
     {
diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
index 518937d0fd10b..3bca2fd61065e 100644
--- a/src/Symfony/Component/Stopwatch/StopwatchEvent.php
+++ b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
@@ -116,6 +116,8 @@ public function lap(): static
 
     /**
      * Stops all non already stopped periods.
+     *
+     * @return void
      */
     public function ensureStopped()
     {
diff --git a/src/Symfony/Component/String/Slugger/AsciiSlugger.php b/src/Symfony/Component/String/Slugger/AsciiSlugger.php
index a573888ce2176..6e550c61cf3ae 100644
--- a/src/Symfony/Component/String/Slugger/AsciiSlugger.php
+++ b/src/Symfony/Component/String/Slugger/AsciiSlugger.php
@@ -74,6 +74,9 @@ public function __construct(string $defaultLocale = null, array|\Closure $symbol
         $this->symbolsMap = $symbolsMap ?? $this->symbolsMap;
     }
 
+    /**
+     * @return void
+     */
     public function setLocale(string $locale)
     {
         $this->defaultLocale = $locale;
diff --git a/src/Symfony/Component/Templating/DelegatingEngine.php b/src/Symfony/Component/Templating/DelegatingEngine.php
index 38d7c733c26b2..bbe500549aa28 100644
--- a/src/Symfony/Component/Templating/DelegatingEngine.php
+++ b/src/Symfony/Component/Templating/DelegatingEngine.php
@@ -38,6 +38,9 @@ public function render(string|TemplateReferenceInterface $name, array $parameter
         return $this->getEngine($name)->render($name, $parameters);
     }
 
+    /**
+     * @return void
+     */
     public function stream(string|TemplateReferenceInterface $name, array $parameters = [])
     {
         $engine = $this->getEngine($name);
@@ -53,6 +56,9 @@ public function exists(string|TemplateReferenceInterface $name): bool
         return $this->getEngine($name)->exists($name);
     }
 
+    /**
+     * @return void
+     */
     public function addEngine(EngineInterface $engine)
     {
         $this->engines[] = $engine;
diff --git a/src/Symfony/Component/Templating/Helper/Helper.php b/src/Symfony/Component/Templating/Helper/Helper.php
index 62d374f9a3ea9..537e8e584ce02 100644
--- a/src/Symfony/Component/Templating/Helper/Helper.php
+++ b/src/Symfony/Component/Templating/Helper/Helper.php
@@ -25,6 +25,8 @@ abstract class Helper implements HelperInterface
 
     /**
      * Sets the default charset.
+     *
+     * @return void
      */
     public function setCharset(string $charset)
     {
diff --git a/src/Symfony/Component/Templating/Helper/SlotsHelper.php b/src/Symfony/Component/Templating/Helper/SlotsHelper.php
index 7fd53862ebf1b..7d5e7e008b7eb 100644
--- a/src/Symfony/Component/Templating/Helper/SlotsHelper.php
+++ b/src/Symfony/Component/Templating/Helper/SlotsHelper.php
@@ -28,6 +28,8 @@ class SlotsHelper extends Helper
      * closed when the stop() method is called.
      *
      * @throws \InvalidArgumentException if a slot with the same name is already started
+     *
+     * @return void
      */
     public function start(string $name)
     {
@@ -46,6 +48,8 @@ public function start(string $name)
      * Stops a slot.
      *
      * @throws \LogicException if no slot has been started
+     *
+     * @return void
      */
     public function stop()
     {
@@ -76,6 +80,8 @@ public function get(string $name, bool|string $default = false): string
 
     /**
      * Sets a slot value.
+     *
+     * @return void
      */
     public function set(string $name, string $content)
     {
diff --git a/src/Symfony/Component/Templating/Loader/ChainLoader.php b/src/Symfony/Component/Templating/Loader/ChainLoader.php
index 1c033a7b25d6b..936a75630b845 100644
--- a/src/Symfony/Component/Templating/Loader/ChainLoader.php
+++ b/src/Symfony/Component/Templating/Loader/ChainLoader.php
@@ -33,6 +33,9 @@ public function __construct(array $loaders = [])
         }
     }
 
+    /**
+     * @return void
+     */
     public function addLoader(LoaderInterface $loader)
     {
         $this->loaders[] = $loader;
diff --git a/src/Symfony/Component/Templating/Loader/Loader.php b/src/Symfony/Component/Templating/Loader/Loader.php
index 7a27665d7f89c..6df5cf2124d5b 100644
--- a/src/Symfony/Component/Templating/Loader/Loader.php
+++ b/src/Symfony/Component/Templating/Loader/Loader.php
@@ -27,6 +27,8 @@ abstract class Loader implements LoaderInterface
 
     /**
      * Sets the debug logger to use for this loader.
+     *
+     * @return void
      */
     public function setLogger(LoggerInterface $logger)
     {
diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php
index b1ccfcd8819f8..0b158be9f2c34 100644
--- a/src/Symfony/Component/Templating/PhpEngine.php
+++ b/src/Symfony/Component/Templating/PhpEngine.php
@@ -194,6 +194,8 @@ public function offsetUnset(mixed $name): void
      * Adds some helpers.
      *
      * @param HelperInterface[] $helpers An array of helper
+     *
+     * @return void
      */
     public function addHelpers(array $helpers)
     {
@@ -206,6 +208,8 @@ public function addHelpers(array $helpers)
      * Sets the helpers.
      *
      * @param HelperInterface[] $helpers An array of helper
+     *
+     * @return void
      */
     public function setHelpers(array $helpers)
     {
@@ -213,6 +217,9 @@ public function setHelpers(array $helpers)
         $this->addHelpers($helpers);
     }
 
+    /**
+     * @return void
+     */
     public function set(HelperInterface $helper, string $alias = null)
     {
         $this->helpers[$helper->getName()] = $helper;
@@ -247,6 +254,8 @@ public function get(string $name): HelperInterface
 
     /**
      * Decorates the current template with another one.
+     *
+     * @return void
      */
     public function extend(string $template)
     {
@@ -277,6 +286,8 @@ public function escape(mixed $value, string $context = 'html'): mixed
 
     /**
      * Sets the charset to use.
+     *
+     * @return void
      */
     public function setCharset(string $charset)
     {
@@ -300,6 +311,8 @@ public function getCharset(): string
 
     /**
      * Adds an escaper for the given context.
+     *
+     * @return void
      */
     public function setEscaper(string $context, callable $escaper)
     {
@@ -321,6 +334,9 @@ public function getEscaper(string $context): callable
         return $this->escapers[$context];
     }
 
+    /**
+     * @return void
+     */
     public function addGlobal(string $name, mixed $value)
     {
         $this->globals[$name] = $value;
@@ -350,6 +366,8 @@ public function getGlobals(): array
      *
      * For each function there is a define to avoid problems with strings being
      * incorrectly specified.
+     *
+     * @return void
      */
     protected function initializeEscapers()
     {
diff --git a/src/Symfony/Component/Translation/Catalogue/MergeOperation.php b/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
index 7a0ce2341d1a3..1b777a8435e7d 100644
--- a/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
+++ b/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
@@ -24,6 +24,9 @@
  */
 class MergeOperation extends AbstractOperation
 {
+    /**
+     * @return void
+     */
     protected function processDomain(string $domain)
     {
         $this->messages[$domain] = [
diff --git a/src/Symfony/Component/Translation/Catalogue/TargetOperation.php b/src/Symfony/Component/Translation/Catalogue/TargetOperation.php
index 6ab60c336330e..2c0ec722eecb7 100644
--- a/src/Symfony/Component/Translation/Catalogue/TargetOperation.php
+++ b/src/Symfony/Component/Translation/Catalogue/TargetOperation.php
@@ -25,6 +25,9 @@
  */
 class TargetOperation extends AbstractOperation
 {
+    /**
+     * @return void
+     */
     protected function processDomain(string $domain)
     {
         $this->messages[$domain] = [
diff --git a/src/Symfony/Component/Translation/Command/TranslationPullCommand.php b/src/Symfony/Component/Translation/Command/TranslationPullCommand.php
index 225deba9822e7..646b92c83243b 100644
--- a/src/Symfony/Component/Translation/Command/TranslationPullCommand.php
+++ b/src/Symfony/Component/Translation/Command/TranslationPullCommand.php
@@ -82,7 +82,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
         }
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $keys = $this->providerCollection->keys();
         $defaultProvider = 1 === \count($keys) ? $keys[0] : null;
diff --git a/src/Symfony/Component/Translation/Command/TranslationPushCommand.php b/src/Symfony/Component/Translation/Command/TranslationPushCommand.php
index a24fcb5914caf..1d04adbc9d15e 100644
--- a/src/Symfony/Component/Translation/Command/TranslationPushCommand.php
+++ b/src/Symfony/Component/Translation/Command/TranslationPushCommand.php
@@ -73,7 +73,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
         }
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $keys = $this->providers->keys();
         $defaultProvider = 1 === \count($keys) ? $keys[0] : null;
diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
index cf195c0446127..73ddae5dcc2ef 100644
--- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php
+++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
@@ -50,6 +50,9 @@ public function __construct(string $name = null, callable $directoryIteratorProv
         $this->requireStrictFileNames = $requireStrictFileNames;
     }
 
+    /**
+     * @return void
+     */
     protected function configure()
     {
         $this
diff --git a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
index e7cf2c1537e7b..cdbba8cf3add9 100644
--- a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
+++ b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
@@ -32,7 +32,7 @@ public function __construct(DataCollectorTranslator $translator)
         $this->translator = $translator;
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         $messages = $this->sanitizeCollectedMessages($this->translator->getCollectedMessages());
 
@@ -42,13 +42,13 @@ public function lateCollect()
         $this->data = $this->cloneVar($this->data);
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         $this->data['locale'] = $this->translator->getLocale();
         $this->data['fallback_locales'] = $this->translator->getFallbackLocales();
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
     }
diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php
index c360c9e2663be..0e584daad1ce5 100644
--- a/src/Symfony/Component/Translation/DataCollectorTranslator.php
+++ b/src/Symfony/Component/Translation/DataCollectorTranslator.php
@@ -48,6 +48,9 @@ public function trans(?string $id, array $parameters = [], string $domain = null
         return $trans;
     }
 
+    /**
+     * @return void
+     */
     public function setLocale(string $locale)
     {
         $this->translator->setLocale($locale);
@@ -105,7 +108,7 @@ public function getCollectedMessages(): array
         return $this->messages;
     }
 
-    private function collectMessage(?string $locale, ?string $domain, string $id, string $translation, ?array $parameters = [])
+    private function collectMessage(?string $locale, ?string $domain, string $id, string $translation, ?array $parameters = []): void
     {
         $domain ??= 'messages';
 
diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php
index 4020a078895b4..2ece6ac7b3f0c 100644
--- a/src/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php
+++ b/src/Symfony/Component/Translation/DependencyInjection/TranslationDumperPass.php
@@ -20,6 +20,9 @@
  */
 class TranslationDumperPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('translation.writer')) {
diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php
index ee7c47ae4e6f9..1baf9341e490d 100644
--- a/src/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php
+++ b/src/Symfony/Component/Translation/DependencyInjection/TranslationExtractorPass.php
@@ -21,6 +21,9 @@
  */
 class TranslationExtractorPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('translation.extractor')) {
diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
index b060171caebdd..9d4418d639965 100644
--- a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
+++ b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
@@ -18,6 +18,9 @@
 
 class TranslatorPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('translator.default')) {
diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php
index b85c0662181d6..ac83f0e26de70 100644
--- a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php
+++ b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php
@@ -39,6 +39,9 @@ class TranslatorPathsPass extends AbstractRecursivePass
      */
     private array $controllers = [];
 
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('translator')) {
diff --git a/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php b/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php
index df2c2a8b1a9dc..8f54752590766 100644
--- a/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php
@@ -40,6 +40,8 @@ public function formatCatalogue(MessageCatalogue $messages, string $domain, arra
 
     /**
      * Sets the delimiter and escape character for CSV.
+     *
+     * @return void
      */
     public function setCsvControl(string $delimiter = ';', string $enclosure = '"')
     {
diff --git a/src/Symfony/Component/Translation/Dumper/FileDumper.php b/src/Symfony/Component/Translation/Dumper/FileDumper.php
index b2db0f30779a9..ed2c278aaf0fd 100644
--- a/src/Symfony/Component/Translation/Dumper/FileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/FileDumper.php
@@ -36,12 +36,17 @@ abstract class FileDumper implements DumperInterface
      * Sets the template for the relative paths to files.
      *
      * @param string $relativePathTemplate A template for the relative paths to files
+     *
+     * @return void
      */
     public function setRelativePathTemplate(string $relativePathTemplate)
     {
         $this->relativePathTemplate = $relativePathTemplate;
     }
 
+    /**
+     * @return void
+     */
     public function dump(MessageCatalogue $messages, array $options = [])
     {
         if (!\array_key_exists('path', $options)) {
diff --git a/src/Symfony/Component/Translation/Extractor/ChainExtractor.php b/src/Symfony/Component/Translation/Extractor/ChainExtractor.php
index 0d2132f73c626..d36f7f385a07c 100644
--- a/src/Symfony/Component/Translation/Extractor/ChainExtractor.php
+++ b/src/Symfony/Component/Translation/Extractor/ChainExtractor.php
@@ -29,12 +29,17 @@ class ChainExtractor implements ExtractorInterface
 
     /**
      * Adds a loader to the translation extractor.
+     *
+     * @return void
      */
     public function addExtractor(string $format, ExtractorInterface $extractor)
     {
         $this->extractors[$format] = $extractor;
     }
 
+    /**
+     * @return void
+     */
     public function setPrefix(string $prefix)
     {
         foreach ($this->extractors as $extractor) {
@@ -42,6 +47,9 @@ public function setPrefix(string $prefix)
         }
     }
 
+    /**
+     * @return void
+     */
     public function extract(string|iterable $directory, MessageCatalogue $catalogue)
     {
         foreach ($this->extractors as $extractor) {
diff --git a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
index 7620b72d6c38e..7f2f96be64b59 100644
--- a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
@@ -52,6 +52,8 @@ protected function loadResource(string $resource): array
 
     /**
      * Sets the delimiter, enclosure, and escape character for CSV.
+     *
+     * @return void
      */
     public function setCsvControl(string $delimiter = ';', string $enclosure = '"', string $escape = '\\')
     {
diff --git a/src/Symfony/Component/Translation/Loader/PoFileLoader.php b/src/Symfony/Component/Translation/Loader/PoFileLoader.php
index 9f7f125d4d8e2..620d97339aed6 100644
--- a/src/Symfony/Component/Translation/Loader/PoFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/PoFileLoader.php
@@ -122,7 +122,7 @@ protected function loadResource(string $resource): array
      * A .po file could contain by error missing plural indexes. We need to
      * fix these before saving them.
      */
-    private function addMessage(array &$messages, array $item)
+    private function addMessage(array &$messages, array $item): void
     {
         if (!empty($item['ids']['singular'])) {
             $id = stripcslashes($item['ids']['singular']);
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
index 0ce3af5338fda..34cad36c4e843 100644
--- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -72,7 +72,7 @@ public function load(mixed $resource, string $locale, string $domain = 'messages
         return $catalogue;
     }
 
-    private function extract(\DOMDocument $dom, MessageCatalogue $catalogue, string $domain)
+    private function extract(\DOMDocument $dom, MessageCatalogue $catalogue, string $domain): void
     {
         $xliffVersion = XliffUtils::getVersionNumber($dom);
 
@@ -88,7 +88,7 @@ private function extract(\DOMDocument $dom, MessageCatalogue $catalogue, string
     /**
      * Extract messages and metadata from DOMDocument into a MessageCatalogue.
      */
-    private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, string $domain)
+    private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, string $domain): void
     {
         $xml = simplexml_import_dom($dom);
         $encoding = $dom->encoding ? strtoupper($dom->encoding) : null;
@@ -145,7 +145,7 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, s
         }
     }
 
-    private function extractXliff2(\DOMDocument $dom, MessageCatalogue $catalogue, string $domain)
+    private function extractXliff2(\DOMDocument $dom, MessageCatalogue $catalogue, string $domain): void
     {
         $xml = simplexml_import_dom($dom);
         $encoding = $dom->encoding ? strtoupper($dom->encoding) : null;
diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php
index 8a81e1f897322..e107bf223cc22 100644
--- a/src/Symfony/Component/Translation/LoggingTranslator.php
+++ b/src/Symfony/Component/Translation/LoggingTranslator.php
@@ -45,6 +45,9 @@ public function trans(?string $id, array $parameters = [], string $domain = null
         return $trans;
     }
 
+    /**
+     * @return void
+     */
     public function setLocale(string $locale)
     {
         $prev = $this->translator->getLocale();
@@ -94,7 +97,7 @@ public function __call(string $method, array $args)
     /**
      * Logs for missing translations.
      */
-    private function log(string $id, ?string $domain, ?string $locale)
+    private function log(string $id, ?string $domain, ?string $locale): void
     {
         $domain ??= 'messages';
 
diff --git a/src/Symfony/Component/Translation/MessageCatalogue.php b/src/Symfony/Component/Translation/MessageCatalogue.php
index 605f28174e4e1..379d947ce7f9b 100644
--- a/src/Symfony/Component/Translation/MessageCatalogue.php
+++ b/src/Symfony/Component/Translation/MessageCatalogue.php
@@ -80,6 +80,9 @@ public function all(string $domain = null): array
         return $allMessages;
     }
 
+    /**
+     * @return void
+     */
     public function set(string $id, string $translation, string $domain = 'messages')
     {
         $this->add([$id => $translation], $domain);
@@ -120,6 +123,9 @@ public function get(string $id, string $domain = 'messages'): string
         return $id;
     }
 
+    /**
+     * @return void
+     */
     public function replace(array $messages, string $domain = 'messages')
     {
         unset($this->messages[$domain], $this->messages[$domain.self::INTL_DOMAIN_SUFFIX]);
@@ -127,6 +133,9 @@ public function replace(array $messages, string $domain = 'messages')
         $this->add($messages, $domain);
     }
 
+    /**
+     * @return void
+     */
     public function add(array $messages, string $domain = 'messages')
     {
         $altDomain = str_ends_with($domain, self::INTL_DOMAIN_SUFFIX) ? substr($domain, 0, -\strlen(self::INTL_DOMAIN_SUFFIX)) : $domain.self::INTL_DOMAIN_SUFFIX;
@@ -140,6 +149,9 @@ public function add(array $messages, string $domain = 'messages')
         }
     }
 
+    /**
+     * @return void
+     */
     public function addCatalogue(MessageCatalogueInterface $catalogue)
     {
         if ($catalogue->getLocale() !== $this->locale) {
@@ -169,6 +181,9 @@ public function addCatalogue(MessageCatalogueInterface $catalogue)
         }
     }
 
+    /**
+     * @return void
+     */
     public function addFallbackCatalogue(MessageCatalogueInterface $catalogue)
     {
         // detect circular references
@@ -208,6 +223,9 @@ public function getResources(): array
         return array_values($this->resources);
     }
 
+    /**
+     * @return void
+     */
     public function addResource(ResourceInterface $resource)
     {
         $this->resources[$resource->__toString()] = $resource;
@@ -232,11 +250,17 @@ public function getMetadata(string $key = '', string $domain = 'messages'): mixe
         return null;
     }
 
+    /**
+     * @return void
+     */
     public function setMetadata(string $key, mixed $value, string $domain = 'messages')
     {
         $this->metadata[$domain][$key] = $value;
     }
 
+    /**
+     * @return void
+     */
     public function deleteMetadata(string $key = '', string $domain = 'messages')
     {
         if ('' == $domain) {
@@ -267,11 +291,17 @@ public function getCatalogueMetadata(string $key = '', string $domain = 'message
         return null;
     }
 
+    /**
+     * @return void
+     */
     public function setCatalogueMetadata(string $key, mixed $value, string $domain = 'messages')
     {
         $this->catalogueMetadata[$domain][$key] = $value;
     }
 
+    /**
+     * @return void
+     */
     public function deleteCatalogueMetadata(string $key = '', string $domain = 'messages')
     {
         if (!$domain) {
@@ -288,7 +318,7 @@ public function deleteCatalogueMetadata(string $key = '', string $domain = 'mess
      *
      * @param array $values Values to add
      */
-    private function addMetadata(array $values)
+    private function addMetadata(array $values): void
     {
         foreach ($values as $domain => $keys) {
             foreach ($keys as $key => $value) {
@@ -297,7 +327,7 @@ private function addMetadata(array $values)
         }
     }
 
-    private function addCatalogueMetadata(array $values)
+    private function addCatalogueMetadata(array $values): void
     {
         foreach ($values as $domain => $keys) {
             foreach ($keys as $key => $value) {
diff --git a/src/Symfony/Component/Translation/Reader/TranslationReader.php b/src/Symfony/Component/Translation/Reader/TranslationReader.php
index fd2ee66959201..01408d4dcdc4b 100644
--- a/src/Symfony/Component/Translation/Reader/TranslationReader.php
+++ b/src/Symfony/Component/Translation/Reader/TranslationReader.php
@@ -33,12 +33,17 @@ class TranslationReader implements TranslationReaderInterface
      * Adds a loader to the translation extractor.
      *
      * @param string $format The format of the loader
+     *
+     * @return void
      */
     public function addLoader(string $format, LoaderInterface $loader)
     {
         $this->loaders[$format] = $loader;
     }
 
+    /**
+     * @return void
+     */
     public function read(string $directory, MessageCatalogue $catalogue)
     {
         if (!is_dir($directory)) {
diff --git a/src/Symfony/Component/Tran
10000
slation/Translator.php b/src/Symfony/Component/Translation/Translator.php
index 54977283cc100..f87218997e724 100644
--- a/src/Symfony/Component/Translation/Translator.php
+++ b/src/Symfony/Component/Translation/Translator.php
@@ -80,6 +80,9 @@ public function __construct(string $locale, MessageFormatterInterface $formatter
         $this->hasIntlFormatter = $formatter instanceof IntlFormatterInterface;
     }
 
+    /**
+     * @return void
+     */
     public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory)
     {
         $this->configCacheFactory = $configCacheFactory;
@@ -89,6 +92,8 @@ public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFa
      * Adds a Loader.
      *
      * @param string $format The name of the loader (@see addResource())
+     *
+     * @return void
      */
     public function addLoader(string $format, LoaderInterface $loader)
     {
@@ -102,6 +107,8 @@ public function addLoader(string $format, LoaderInterface $loader)
      * @param mixed  $resource The resource name
      *
      * @throws InvalidArgumentException If the locale contains invalid characters
+     *
+     * @return void
      */
     public function addResource(string $format, mixed $resource, string $locale, string $domain = null)
     {
@@ -119,6 +126,9 @@ public function addResource(string $format, mixed $resource, string $locale, str
         }
     }
 
+    /**
+     * @return void
+     */
     public function setLocale(string $locale)
     {
         $this->assertValidLocale($locale);
@@ -136,6 +146,8 @@ public function getLocale(): string
      * @param string[] $locales
      *
      * @throws InvalidArgumentException If a locale contains invalid characters
+     *
+     * @return void
      */
     public function setFallbackLocales(array $locales)
     {
@@ -221,6 +233,9 @@ protected function getLoaders(): array
         return $this->loaders;
     }
 
+    /**
+     * @return void
+     */
     protected function loadCatalogue(string $locale)
     {
         if (null === $this->cacheDir) {
@@ -230,6 +245,9 @@ protected function loadCatalogue(string $locale)
         }
     }
 
+    /**
+     * @return void
+     */
     protected function initializeCatalogue(string $locale)
     {
         $this->assertValidLocale($locale);
@@ -414,6 +432,8 @@ protected function computeFallbackLocales(string $locale)
      * Asserts that the locale is valid, throws an Exception if not.
      *
      * @throws InvalidArgumentException If the locale contains invalid characters
+     *
+     * @return void
      */
     protected function assertValidLocale(string $locale)
     {
diff --git a/src/Symfony/Component/Translation/Util/ArrayConverter.php b/src/Symfony/Component/Translation/Util/ArrayConverter.php
index 60b8be6e0d3d9..2f1738de4b386 100644
--- a/src/Symfony/Component/Translation/Util/ArrayConverter.php
+++ b/src/Symfony/Component/Translation/Util/ArrayConverter.php
@@ -82,7 +82,7 @@ private static function &getElementByPath(array &$tree, array $parts)
         return $elem;
     }
 
-    private static function cancelExpand(array &$tree, string $prefix, array $node)
+    private static function cancelExpand(array &$tree, string $prefix, array $node): void
     {
         $prefix .= '.';
 
diff --git a/src/Symfony/Component/Translation/Writer/TranslationWriter.php b/src/Symfony/Component/Translation/Writer/TranslationWriter.php
index 5dd3a5c401d0e..00d40192cd6ac 100644
--- a/src/Symfony/Component/Translation/Writer/TranslationWriter.php
+++ b/src/Symfony/Component/Translation/Writer/TranslationWriter.php
@@ -30,6 +30,8 @@ class TranslationWriter implements TranslationWriterInterface
 
     /**
      * Adds a dumper to the writer.
+     *
+     * @return void
      */
     public function addDumper(string $format, DumperInterface $dumper)
     {
@@ -51,6 +53,8 @@ public function getFormats(): array
      * @param array  $options Options that are passed to the dumper
      *
      * @throws InvalidArgumentException
+     *
+     * @return void
      */
     public function write(MessageCatalogue $catalogue, string $format, array $options = [])
     {
diff --git a/src/Symfony/Component/Validator/Command/DebugCommand.php b/src/Symfony/Component/Validator/Command/DebugCommand.php
index ed41eb8c7c9be..acb00d7242f8d 100644
--- a/src/Symfony/Component/Validator/Command/DebugCommand.php
+++ b/src/Symfony/Component/Validator/Command/DebugCommand.php
@@ -43,6 +43,9 @@ public function __construct(MetadataFactoryInterface $validator)
         $this->validator = $validator;
     }
 
+    /**
+     * @return void
+     */
     protected function configure()
     {
         $this
diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php
index ee1d68c78f50b..d53bbb196fa49 100644
--- a/src/Symfony/Component/Validator/Constraint.php
+++ b/src/Symfony/Component/Validator/Constraint.php
@@ -232,6 +232,8 @@ public function __isset(string $option): bool
 
     /**
      * Adds the given group if this constraint is in the Default group.
+     *
+     * @return void
      */
     public function addImplicitGroupName(string $group)
     {
diff --git a/src/Symfony/Component/Validator/ConstraintValidator.php b/src/Symfony/Component/Validator/ConstraintValidator.php
index 03ae15673eb93..3a3da8da828dc 100644
--- a/src/Symfony/Component/Validator/ConstraintValidator.php
+++ b/src/Symfony/Component/Validator/ConstraintValidator.php
@@ -36,6 +36,9 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface
      */
     protected $context;
 
+    /**
+     * @return void
+     */
     public function initialize(ExecutionContextInterface $context)
     {
         $this->context = $context;
diff --git a/src/Symfony/Component/Validator/ConstraintViolationList.php b/src/Symfony/Component/Validator/ConstraintViolationList.php
index c3c0b413e37b5..0b986245096c2 100644
--- a/src/Symfony/Component/Validator/ConstraintViolationList.php
+++ b/src/Symfony/Component/Validator/ConstraintViolationList.php
@@ -56,11 +56,17 @@ public function __toString(): string
         return $string;
     }
 
+    /**
+     * @return void
+     */
     public function add(ConstraintViolationInterface $violation)
     {
         $this->violations[] = $violation;
     }
 
+    /**
+     * @return void
+     */
     public function addAll(ConstraintViolationListInterface $otherList)
     {
         foreach ($otherList as $violation) {
@@ -82,11 +88,17 @@ public function has(int $offset): bool
         return isset($this->violations[$offset]);
     }
 
+    /**
+     * @return void
+     */
     public function set(int $offset, ConstraintViolationInterface $violation)
     {
         $this->violations[$offset] = $violation;
     }
 
+    /**
+     * @return void
+     */
     public function remove(int $offset)
     {
         unset($this->violations[$offset]);
diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
index bc5a83476203d..29fd4daa8ad45 100644
--- a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
@@ -34,6 +34,9 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null)
         $this->propertyAccessor = $propertyAccessor;
     }
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof AbstractComparison) {
diff --git a/src/Symfony/Component/Validator/Constraints/AllValidator.php b/src/Symfony/Component/Validator/Constraints/AllValidator.php
index dec93db3edc8a..15896f29dad38 100644
--- a/src/Symfony/Component/Validator/Constraints/AllValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/AllValidator.php
@@ -21,6 +21,9 @@
  */
 class AllValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof All) {
diff --git a/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php b/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php
index 99de0a50d3847..5ce9e545ec934 100644
--- a/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php
@@ -20,6 +20,9 @@
  */
 class AtLeastOneOfValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof AtLeastOneOf) {
diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php
index dcb1a90c019f8..3368a26c51b95 100644
--- a/src/Symfony/Component/Validator/Constraints/BicValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/BicValidator.php
@@ -55,6 +55,9 @@ public function __construct(PropertyAccessor $propertyAccessor = null)
         $this->propertyAccessor = $propertyAccessor;
     }
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Bic) {
diff --git a/src/Symfony/Component/Validator/Constraints/BlankValidator.php b/src/Symfony/Component/Validator/Constraints/BlankValidator.php
index 850c3e5dd1181..2551d5e244aea 100644
--- a/src/Symfony/Component/Validator/Constraints/BlankValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/BlankValidator.php
@@ -20,6 +20,9 @@
  */
 class BlankValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Blank) {
diff --git a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php
index 6de2ce54c796a..ea62a5c821cf2 100644
--- a/src/Symfony/Component/Validator/Constraints/CallbackValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/CallbackValidator.php
@@ -23,6 +23,9 @@
  */
 class CallbackValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $object, Constraint $constraint)
     {
         if (!$constraint instanceof Callback) {
diff --git a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
index e1697eed8090d..3e51050158736 100644
--- a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
@@ -93,6 +93,8 @@ class CardSchemeValidator extends ConstraintValidator
 
     /**
      * Validates a creditcard belongs to a specified scheme.
+     *
+     * @return void
      */
     public function validate(mixed $value, Constraint $constraint)
     {
diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
index 9cc89ba25af58..5528252c52f08 100644
--- a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
@@ -27,6 +27,9 @@
  */
 class ChoiceValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Choice) {
diff --git a/src/Symfony/Component/Validator/Constraints/Collection.php b/src/Symfony/Component/Validator/Constraints/Collection.php
index e02bd1457d235..ee50fca169840 100644
--- a/src/Symfony/Component/Validator/Constraints/Collection.php
+++ b/src/Symfony/Component/Validator/Constraints/Collection.php
@@ -57,6 +57,9 @@ public function __construct(mixed $fields = null, array $groups = null, mixed $p
         $this->missingFieldsMessage = $missingFieldsMessage ?? $this->missingFieldsMessage;
     }
 
+    /**
+     * @return void
+     */
     protected function initializeNestedConstraints()
     {
         parent::initializeNestedConstraints();
diff --git a/src/Symfony/Component/Validator/Constraints/CollectionValidator.php b/src/Symfony/Component/Validator/Constraints/CollectionValidator.php
index a8bda3fddc8a4..7bb63e7dedff3 100644
--- a/src/Symfony/Component/Validator/Constraints/CollectionValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/CollectionValidator.php
@@ -21,6 +21,9 @@
  */
 class CollectionValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Collection) {
diff --git a/src/Symfony/Component/Validator/Constraints/Composite.php b/src/Symfony/Component/Validator/Constraints/Composite.php
index a545779f0f31b..df133153802bc 100644
--- a/src/Symfony/Component/Validator/Constraints/Composite.php
+++ b/src/Symfony/Component/Validator/Constraints/Composite.php
@@ -110,6 +110,8 @@ public function __construct(mixed $options = null, array $groups = null, mixed $
 
     /**
      * Implicit group names are forwarded to nested constraints.
+     *
+     * @return void
      */
     public function addImplicitGroupName(string $group)
     {
@@ -146,6 +148,8 @@ public function getNestedConstraints(): array
      * constraints passed to the constructor.
      *
      * @see Collection::initializeNestedConstraints()
+     *
+     * @return void
      */
     protected function initializeNestedConstraints()
     {
diff --git a/src/Symfony/Component/Validator/Constraints/CompoundValidator.php b/src/Symfony/Component/Validator/Constraints/CompoundValidator.php
index 4be423d473360..8f9c713c7922a 100644
--- a/src/Symfony/Component/Validator/Constraints/CompoundValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/CompoundValidator.php
@@ -20,6 +20,9 @@
  */
 class CompoundValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Compound) {
diff --git a/src/Symfony/Component/Validator/Constraints/CountValidator.php b/src/Symfony/Component/Validator/Constraints/CountValidator.php
index 65a814002f72f..3c560235381fe 100644
--- a/src/Symfony/Component/Validator/Constraints/CountValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/CountValidator.php
@@ -21,6 +21,9 @@
  */
 class CountValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Count) {
diff --git a/src/Symfony/Component/Validator/Constraints/CountryValidator.php b/src/Symfony/Component/Validator/Constraints/CountryValidator.php
index 0874b517a873e..54c8da0f9e6ee 100644
--- a/src/Symfony/Component/Validator/Constraints/CountryValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/CountryValidator.php
@@ -24,6 +24,9 @@
  */
 class CountryValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Country) {
diff --git a/src/Symfony/Component/Validator/Constraints/CurrencyValidator.php b/src/Symfony/Component/Validator/Constraints/CurrencyValidator.php
index cfbcd5c5fd1e7..a50ea62ab67a9 100644
--- a/src/Symfony/Component/Validator/Constraints/CurrencyValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/CurrencyValidator.php
@@ -25,6 +25,9 @@
  */
 class CurrencyValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Currency) {
diff --git a/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php b/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
index 02d56c801d9c6..f02ba54daf1ea 100644
--- a/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
@@ -21,6 +21,9 @@
  */
 class DateTimeValidator extends DateValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof DateTime) {
diff --git a/src/Symfony/Component/Validator/Constraints/DateValidator.php b/src/Symfony/Component/Validator/Constraints/DateValidator.php
index cf34c41380d7f..0e3d8484303d0 100644
--- a/src/Symfony/Component/Validator/Constraints/DateValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/DateValidator.php
@@ -33,6 +33,9 @@ public static function checkDate(int $year, int $month, int $day): bool
         return checkdate($month, $day, $year);
     }
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Date) {
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
index ba69201f0d124..43279c08bebef 100644
--- a/src/Symfony/Component/Validator/Constraints/EmailValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -51,6 +51,9 @@ public function __construct(string $defaultMode = Email::VALIDATION_MODE_LOOSE)
         $this->defaultMode = $defaultMode;
     }
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Email) {
diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
index baf6cc7fc07a6..d1fe60a791084 100644
--- a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php
@@ -29,6 +29,9 @@ public function __construct(ExpressionLanguage $expressionLanguage = null)
         $this->expressionLanguage = $expressionLanguage;
     }
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Expression) {
diff --git a/src/Symfony/Component/Validator/Constraints/File.php b/src/Symfony/Component/Validator/Constraints/File.php
index 1b2e001b66be9..2adc56ee0e661 100644
--- a/src/Symfony/Component/Validator/Constraints/File.php
+++ b/src/Symfony/Component/Validator/Constraints/File.php
@@ -151,7 +151,7 @@ public function __isset(string $option): bool
         return parent::__isset($option);
     }
 
-    private function normalizeBinaryFormat(int|string $maxSize)
+    private function normalizeBinaryFormat(int|string $maxSize): void
     {
         $factors = [
             'k' => 1000,
diff --git a/src/Symfony/Component/Validator/Constraints/FileValidator.php b/src/Symfony/Component/Validator/Constraints/FileValidator.php
index 363183ec4d4bb..a632a54f4805e 100644
--- a/src/Symfony/Component/Validator/Constraints/FileValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/FileValidator.php
@@ -38,6 +38,9 @@ class FileValidator extends ConstraintValidator
         self::MIB_BYTES => 'MiB',
     ];
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof File) {
diff --git a/src/Symfony/Component/Validator/Constraints/HostnameValidator.php b/src/Symfony/Component/Validator/Constraints/HostnameValidator.php
index b4fba3a724620..8b0fa60e203a7 100644
--- a/src/Symfony/Component/Validator/Constraints/HostnameValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/HostnameValidator.php
@@ -31,6 +31,9 @@ class HostnameValidator extends ConstraintValidator
         'test',
     ];
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Hostname) {
diff --git a/src/Symfony/Component/Validator/Constraints/IbanValidator.php b/src/Symfony/Component/Validator/Constraints/IbanValidator.php
index 43b62b5d392f8..b1b17aac35377 100644
--- a/src/Symfony/Component/Validator/Constraints/IbanValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IbanValidator.php
@@ -137,6 +137,9 @@ class IbanValidator extends ConstraintValidator
         'YT' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Mayotte
     ];
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Iban) {
diff --git a/src/Symfony/Component/Validator/Constraints/ImageValidator.php b/src/Symfony/Component/Validator/Constraints/ImageValidator.php
index 28aaa89558418..93386e6f88d23 100644
--- a/src/Symfony/Component/Validator/Constraints/ImageValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/ImageValidator.php
@@ -25,6 +25,9 @@
  */
 class ImageValidator extends FileValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Image) {
diff --git a/src/Symfony/Component/Validator/Constraints/IpValidator.php b/src/Symfony/Component/Validator/Constraints/IpValidator.php
index 0ed8240a25ee6..2f71a880450c4 100644
--- a/src/Symfony/Component/Validator/Constraints/IpValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IpValidator.php
@@ -24,6 +24,9 @@
  */
 class IpValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Ip) {
diff --git a/src/Symfony/Component/Validator/Constraints/IsFalseValidator.php b/src/Symfony/Component/Validator/Constraints/IsFalseValidator.php
index 8ada67f7cd827..76a24ad7897c5 100644
--- a/src/Symfony/Component/Validator/Constraints/IsFalseValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IsFalseValidator.php
@@ -20,6 +20,9 @@
  */
 class IsFalseValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof IsFalse) {
diff --git a/src/Symfony/Component/Validator/Constraints/IsNullValidator.php b/src/Symfony/Component/Validator/Constraints/IsNullValidator.php
index 000821abd6c10..628aacf267096 100644
--- a/src/Symfony/Component/Validator/Constraints/IsNullValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IsNullValidator.php
@@ -20,6 +20,9 @@
  */
 class IsNullValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof IsNull) {
diff --git a/src/Symfony/Component/Validator/Constraints/IsTrueValidator.php b/src/Symfony/Component/Validator/Constraints/IsTrueValidator.php
index e7e5e98dd1e2c..644bbf70cb610 100644
--- a/src/Symfony/Component/Validator/Constraints/IsTrueValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IsTrueValidator.php
@@ -20,6 +20,9 @@
  */
 class IsTrueValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof IsTrue) {
diff --git a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
index da14aed66b5d8..c6445b16a5e06 100644
--- a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
@@ -27,6 +27,9 @@
  */
 class IsbnValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Isbn) {
diff --git a/src/Symfony/Component/Validator/Constraints/IsinValidator.php b/src/Symfony/Component/Validator/Constraints/IsinValidator.php
index 3a3fc76f051ce..21539cbcb7a86 100644
--- a/src/Symfony/Component/Validator/Constraints/IsinValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IsinValidator.php
@@ -23,6 +23,9 @@
  */
 class IsinValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Isin) {
diff --git a/src/Symfony/Component/Validator/Constraints/IssnValidator.php b/src/Symfony/Component/Validator/Constraints/IssnValidator.php
index 3006d587ebed1..1962322b49dc1 100644
--- a/src/Symfony/Component/Validator/Constraints/IssnValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IssnValidator.php
@@ -26,6 +26,9 @@
  */
 class IssnValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Issn) {
diff --git a/src/Symfony/Component/Validator/Constraints/JsonValidator.php b/src/Symfony/Component/Validator/Constraints/JsonValidator.php
index dd7a47eb3ef05..f12424ae8b8c3 100644
--- a/src/Symfony/Component/Validator/Constraints/JsonValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/JsonValidator.php
@@ -20,6 +20,9 @@
  */
 class JsonValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Json) {
diff --git a/src/Symfony/Component/Validator/Constraints/LanguageValidator.php b/src/Symfony/Component/Validator/Constraints/LanguageValidator.php
index e62c4b3d2634e..4706c3356946f 100644
--- a/src/Symfony/Component/Validator/Constraints/LanguageValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/LanguageValidator.php
@@ -24,6 +24,9 @@
  */
 class LanguageValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Language) {
diff --git a/src/Symfony/Component/Validator/Constraints/LengthValidator.php b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
index d488d88c778c7..98044c7c532a2 100644
--- a/src/Symfony/Component/Validator/Constraints/LengthValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
@@ -21,6 +21,9 @@
  */
 class LengthValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Length) {
diff --git a/src/Symfony/Component/Validator/Constraints/LocaleValidator.php b/src/Symfony/Component/Validator/Constraints/LocaleValidator.php
index 461df3396ef0b..4cd0b120b4f67 100644
--- a/src/Symfony/Component/Validator/Constraints/LocaleValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/LocaleValidator.php
@@ -24,6 +24,9 @@
  */
 class LocaleValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Locale) {
diff --git a/src/Symfony/Component/Validator/Constraints/LuhnValidator.php b/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
index 75b12aa681693..a3f871e339f05 100644
--- a/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
@@ -30,6 +30,9 @@
  */
 class LuhnValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Luhn) {
diff --git a/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php b/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
index 828780ba1b277..fa6c794c02b3d 100644
--- a/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
@@ -21,6 +21,9 @@
  */
 class NotBlankValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof NotBlank) {
diff --git a/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php b/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php
index b5cdc1b0a98eb..38945518079c4 100644
--- a/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php
@@ -51,6 +51,8 @@ public function __construct(HttpClientInterface $httpClient = null, string $char
 
     /**
      * @throws ExceptionInterface
+     *
+     * @return void
      */
     public function validate(mixed $value, Constraint $constraint)
     {
diff --git a/src/Symfony/Component/Validator/Constraints/NotNullValidator.php b/src/Symfony/Component/Validator/Constraints/NotNullValidator.php
index 235efabc109aa..3f8f9512804a7 100644
--- a/src/Symfony/Component/Validator/Constraints/NotNullValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/NotNullValidator.php
@@ -20,6 +20,9 @@
  */
 class NotNullValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof NotNull) {
diff --git a/src/Symfony/Component/Validator/Constraints/RangeValidator.php b/src/Symfony/Component/Validator/Constraints/RangeValidator.php
index e754131372ad5..18c399cd08f6d 100644
--- a/src/Symfony/Component/Validator/Constraints/RangeValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/RangeValidator.php
@@ -31,6 +31,9 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null)
         $this->propertyAccessor = $propertyAccessor;
     }
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Range) {
diff --git a/src/Symfony/Component/Validator/Constraints/RegexValidator.php b/src/Symfony/Component/Validator/Constraints/RegexValidator.php
index b31431bedd20d..4e9ae9039ffa1 100644
--- a/src/Symfony/Component/Validator/Constraints/RegexValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/RegexValidator.php
@@ -24,6 +24,9 @@
  */
 class RegexValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Regex) {
diff --git a/src/Symfony/Component/Validator/Constraints/SequentiallyValidator.php b/src/Symfony/Component/Validator/Constraints/SequentiallyValidator.php
index 709897da7422b..d076f3cfdda03 100644
--- a/src/Symfony/Component/Validator/Constraints/SequentiallyValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/SequentiallyValidator.php
@@ -20,6 +20,9 @@
  */
 class SequentiallyValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Sequentially) {
diff --git a/src/Symfony/Component/Validator/Constraints/TimeValidator.php b/src/Symfony/Component/Validator/Constraints/TimeValidator.php
index f1ebccaa262c1..c6d111cfe3874 100644
--- a/src/Symfony/Component/Validator/Constraints/TimeValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/TimeValidator.php
@@ -33,6 +33,9 @@ public static function checkTime(int $hour, int $minute, float $second): bool
         return $hour >= 0 && $hour < 24 && $minute >= 0 && $minute < 60 && $second >= 0 && $second < 60;
     }
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Time) {
diff --git a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
index 35fdf710ba32a..20d81e8809da3 100644
--- a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
@@ -26,6 +26,9 @@
  */
 class TimezoneValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Timezone) {
diff --git a/src/Symfony/Component/Validator/Constraints/TypeValidator.php b/src/Symfony/Component/Validator/Constraints/TypeValidator.php
index 67bbbb1cc2fd5..ad9e31457268f 100644
--- a/src/Symfony/Component/Validator/Constraints/TypeValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/TypeValidator.php
@@ -52,6 +52,9 @@ class TypeValidator extends ConstraintValidator
         'xdigit' => 'ctype_xdigit',
     ];
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Type) {
diff --git a/src/Symfony/Component/Validator/Constraints/UlidValidator.php b/src/Symfony/Component/Validator/Constraints/UlidValidator.php
index 3a4f8ee8d4e43..ad47f66d4f094 100644
--- a/src/Symfony/Component/Validator/Constraints/UlidValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/UlidValidator.php
@@ -24,6 +24,9 @@
  */
 class UlidValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Ulid) {
diff --git a/src/Symfony/Component/Validator/Constraints/UniqueValidator.php b/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
index 07921e2e4ec58..1e692fe682a21 100644
--- a/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
@@ -21,6 +21,9 @@
  */
 class UniqueValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Unique) {
diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
index 18776a9ca438d..4a73040a24e23 100644
--- a/src/Symfony/Component/Validator/Constraints/UrlValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -45,6 +45,9 @@ class UrlValidator extends ConstraintValidator
             (?:\# (?:[\pL\pN\-._\~!$&\'()*+,;=:@/?]|%%[0-9A-Fa-f]{2})* )?       # a fragment (optional)
         $~ixu';
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Url) {
diff --git a/src/Symfony/Component/Validator/Constraints/UuidValidator.php b/src/Symfony/Component/Validator/Constraints/UuidValidator.php
index 88f9e9674ad11..1fc87912375c5 100644
--- a/src/Symfony/Component/Validator/Constraints/UuidValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/UuidValidator.php
@@ -59,6 +59,9 @@ class UuidValidator extends ConstraintValidator
     public const LOOSE_MAX_LENGTH = 39;
     public const LOOSE_FIRST_HYPHEN_POSITION = 4;
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Uuid) {
@@ -88,7 +91,7 @@ public function validate(mixed $value, Constraint $constraint)
         $this->validateLoose($value, $constraint);
     }
 
-    private function validateLoose(string $value, Uuid $constraint)
+    private function validateLoose(string $value, Uuid $constraint): void
     {
         // Error priority:
         // 1. ERROR_INVALID_CHARACTERS
@@ -159,7 +162,7 @@ private function validateLoose(string $value, Uuid $constraint)
         }
     }
 
-    private function validateStrict(string $value, Uuid $constraint)
+    private function validateStrict(string $value, Uuid $constraint): void
     {
         // Error priority:
         // 1. ERROR_INVALID_CHARACTERS
diff --git a/src/Symfony/Component/Validator/Constraints/Valid.php b/src/Symfony/Component/Validator/Constraints/Valid.php
index fef8b2da92371..46c5ee355ba57 100644
--- a/src/Symfony/Component/Validator/Constraints/Valid.php
+++ b/src/Symfony/Component/Validator/Constraints/Valid.php
@@ -41,6 +41,9 @@ public function __get(string $option): mixed
         return parent::__get($option);
     }
 
+    /**
+     * @return void
+     */
     public function addImplicitGroupName(string $group)
     {
         if (null !== $this->groups) {
diff --git a/src/Symfony/Component/Validator/Constraints/ValidValidator.php b/src/Symfony/Component/Validator/Constraints/ValidValidator.php
index ea057c6017623..7c960ffee137e 100644
--- a/src/Symfony/Component/Validator/Constraints/ValidValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/ValidValidator.php
@@ -20,6 +20,9 @@
  */
 class ValidValidator extends ConstraintValidator
 {
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof Valid) {
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContext.php b/src/Symfony/Component/Validator/Context/ExecutionContext.php
index f595758c8253d..bca57fa94c96d 100644
--- a/src/Symfony/Component/Validator/Context/ExecutionContext.php
+++ b/src/Symfony/Component/Validator/Context/ExecutionContext.php
@@ -121,7 +121,7 @@ public function __construct(ValidatorInterface $validator, mixed $root, Translat
         $this->cachedObjectsRefs = new \SplObjectStorage();
     }
 
-    public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath)
+    public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath): void
     {
         $this->value = $value;
         $this->object = $object;
@@ -129,17 +129,17 @@ public function setNode(mixed $value, ?object $object, MetadataInterface $metada
         $this->propertyPath = $propertyPath;
     }
 
-    public function setGroup(?string $group)
+    public function setGroup(?string $group): void
     {
         $this->group = $group;
     }
 
-    public function setConstraint(Constraint $constraint)
+    public function setConstraint(Constraint $constraint): void
     {
         $this->constraint = $constraint;
     }
 
-    public function addViolation(string $message, array $parameters = [])
+    public function addViolation(string $message, array $parameters = []): void
     {
         $this->violations->add(new ConstraintViolation(
             $this->translator->trans($message, $parameters, $this->translationDomain),
@@ -228,7 +228,7 @@ public function getPropertyPath(string $subPath = ''): string
         return PropertyPath::append($this->propertyPath, $subPath);
     }
 
-    public function markGroupAsValidated(string $cacheKey, string $groupHash)
+    public function markGroupAsValidated(string $cacheKey, string $groupHash): void
     {
         if (!isset($this->validatedObjects[$cacheKey])) {
             $this->validatedObjects[$cacheKey] = [];
@@ -242,7 +242,7 @@ public function isGroupValidated(string $cacheKey, string $groupHash): bool
         return isset($this->validatedObjects[$cacheKey][$groupHash]);
     }
 
-    public function markConstraintAsValidated(string $cacheKey, string $constraintHash)
+    public function markConstraintAsValidated(string $cacheKey, string $constraintHash): void
     {
         $this->validatedConstraints[$cacheKey.':'.$constraintHash] = true;
     }
@@ -252,7 +252,7 @@ public function isConstraintValidated(string $cacheKey, string $constraintHash):
         return isset($this->validatedConstraints[$cacheKey.':'.$constraintHash]);
     }
 
-    public function markObjectAsInitialized(string $cacheKey)
+    public function markObjectAsInitialized(string $cacheKey): void
     {
         $this->initializedObjects[$cacheKey] = true;
     }
diff --git a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
index e787112764084..25734da878ce2 100644
--- a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
+++ b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
@@ -37,12 +37,12 @@ public function __construct(TraceableValidator $validator)
         $this->reset();
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         // Everything is collected once, on kernel terminate.
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [
             'calls' => $this->cloneVar([]),
@@ -50,7 +50,7 @@ public function reset()
         ];
     }
 
-    public function lateCollect()
+    public function lateCollect(): void
     {
         $collected = $this->validator->getCollectedData();
         $this->data['calls'] = $this->cloneVar($collected);
diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php
index e0607111a41c6..b1680b7cd4689 100644
--- a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php
+++ b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php
@@ -22,6 +22,9 @@
  */
 class AddAutoMappingConfigurationPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasParameter('validator.auto_mapping') || !$container->hasDefinition('validator.builder')) {
diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php
index 64fb342019786..4bcae00efa85a 100644
--- a/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php
+++ b/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php
@@ -22,6 +22,9 @@
  */
 class AddConstraintValidatorsPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('validator.validator_factory')) {
diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php
index ff8863701533c..d53e3c85e71af 100644
--- a/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php
+++ b/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php
@@ -21,6 +21,9 @@
  */
 class AddValidatorInitializersPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('validator.builder')) {
diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
index 5d958985d312c..33c0bc45f077e 100644
--- a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
+++ b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
@@ -317,6 +317,8 @@ public function addGetterMethodConstraints(string $property, string $method, arr
 
     /**
      * Merges the constraints of the given metadata into this object.
+     *
+     * @return void
      */
     public function mergeConstraints(self $source)
     {
@@ -424,6 +426,8 @@ public function getReflectionClass(): \ReflectionClass
      * Sets whether a group sequence provider should be used.
      *
      * @throws GroupDefinitionException
+     *
+     * @return void
      */
     public function setGroupSequenceProvider(bool $active)
     {
@@ -448,14 +452,14 @@ public function getCascadingStrategy(): int
         return $this->cascadingStrategy;
     }
 
-    private function addPropertyMetadata(PropertyMetadataInterface $metadata)
+    private function addPropertyMetadata(PropertyMetadataInterface $metadata): void
     {
         $property = $metadata->getPropertyName();
 
         $this->members[$property][] = $metadata;
     }
 
-    private function checkConstraint(Constraint $constraint)
+    private function checkConstraint(Constraint $constraint): void
     {
         if (!\in_array(Constraint::CLASS_CONSTRAINT, (array) $constraint->getTargets(), true)) {
             throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on classes.', get_debug_type($constraint)));
diff --git a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
index 6c191298c0c87..565c04bd6b016 100644
--- a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
+++ b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
@@ -108,7 +108,7 @@ public function getMetadataFor(mixed $value): MetadataInterface
         return $this->loadedClasses[$class] = $metadata;
     }
 
-    private function mergeConstraints(ClassMetadata $metadata)
+    private function mergeConstraints(ClassMetadata $metadata): void
     {
         if ($metadata->getReflectionClass()->isInterface()) {
             return;
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
index 333f0fd7913d3..3f0c0aa46fa97 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php
@@ -49,6 +49,8 @@ abstract class AbstractLoader implements LoaderInterface
      *     $this->addNamespaceAlias('mynamespace', '\\Acme\\Package\\Constraints\\');
      *
      *     $constraint = $this->newConstraint('mynamespace:NotNull');
+     *
+     * @return void
      */
     protected function addNamespaceAlias(string $alias, string $namespace)
     {
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php
index 9975364d2c30e..89929bd43df24 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php
@@ -144,7 +144,7 @@ private function getTypeConstraint(string $builtinType, PropertyInfoType $type):
         return new Type(['type' => $builtinType]);
     }
 
-    private function handleAllConstraint(string $property, ?All $allConstraint, PropertyInfoType $propertyInfoType, ClassMetadata $metadata)
+    private function handleAllConstraint(string $property, ?All $allConstraint, PropertyInfoType $propertyInfoType, ClassMetadata $metadata): void
     {
         $containsTypeConstraint = false;
         $containsNotNullConstraint = false;
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
index b999452cf1b79..2af7ec6f6c22b 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
@@ -179,7 +179,7 @@ protected function parseFile(string $path): \SimpleXMLElement
         return simplexml_import_dom($dom);
     }
 
-    private function loadClassesFromXml()
+    private function loadClassesFromXml(): void
     {
         parent::__construct($this->file);
 
@@ -198,7 +198,7 @@ private function loadClassesFromXml()
         }
     }
 
-    private function loadClassMetadataFromXml(ClassMetadata $metadata, \SimpleXMLElement $classDescription)
+    private function loadClassMetadataFromXml(ClassMetadata $metadata, \SimpleXMLElement $classDescription): void
     {
         if (\count($classDescription->{'group-sequence-provider'}) > 0) {
             $metadata->setGroupSequenceProvider(true);
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
index 4a2a8ee873b26..ce0326d37949d 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
@@ -131,7 +131,7 @@ private function parseFile(string $path): array
         return $classes;
     }
 
-    private function loadClassesFromYaml()
+    private function loadClassesFromYaml(): void
     {
         parent::__construct($this->file);
 
@@ -147,7 +147,7 @@ private function loadClassesFromYaml()
         }
     }
 
-    private function loadClassMetadataFromYaml(ClassMetadata $metadata, array $classDescription)
+    private function loadClassMetadataFromYaml(ClassMetadata $metadata, array $classDescription): void
     {
         if (isset($classDescription['group_sequence_provider'])) {
             $metadata->setGroupSequenceProvider(
diff --git a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
index 1749dd78d2631..e7389f7b8e448 100644
--- a/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
+++ b/src/Symfony/Component/Validator/Mapping/MemberMetadata.php
@@ -148,7 +148,7 @@ public function getReflectionMember(object|string $objectOrClassName): \Reflecti
      */
     abstract protected function newReflectionMember(object|string $objectOrClassName): \ReflectionMethod|\ReflectionProperty;
 
-    private function checkConstraint(Constraint $constraint)
+    private function checkConstraint(Constraint $constraint): void
     {
         if (!\in_array(Constraint::PROPERTY_CONSTRAINT, (array) $constraint->getTargets(), true)) {
             throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on properties or getters.', get_debug_type($constraint)));
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
index 2c6f1fec8059f..156140f1910ba 100644
--- a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
+++ b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -286,7 +286,7 @@ protected function normalizeGroups(string|GroupSequence|array $groups): array
      *                                      metadata factory does not implement
      *                                      {@link ClassMetadataInterface}
      */
-    private function validateObject(object $object, string $propertyPath, array $groups, int $traversalStrategy, ExecutionContextInterface $context)
+    private function validateObject(object $object, string $propertyPath, array $groups, int $traversalStrategy, ExecutionContextInterface $context): void
     {
         try {
             $classMetadata = $this->metadataFactory->getMetadataFor($object);
@@ -331,7 +331,7 @@ private function validateObject(object $object, string $propertyPath, array $gro
      *
      * Nested arrays are also iterated.
      */
-    private function validateEachObjectIn(iterable $collection, string $propertyPath, array $groups, ExecutionContextInterface $context)
+    private function validateEachObjectIn(iterable $collection, string $propertyPath, array $groups, ExecutionContextInterface $context): void
     {
         foreach ($collection as $key => $value) {
             if (\is_array($value)) {
@@ -392,7 +392,7 @@ private function validateEachObjectIn(iterable $collection, string $propertyPath
      *
      * @see TraversalStrategy
      */
-    private function validateClassNode(object $object, ?string $cacheKey, ClassMetadataInterface $metadata, string $propertyPath, array $groups, ?array $cascadedGroups, int $traversalStrategy, ExecutionContextInterface $context)
+    private function validateClassNode(object $object, ?string $cacheKey, ClassMetadataInterface $metadata, string $propertyPath, array $groups, ?array $cascadedGroups, int $traversalStrategy, ExecutionContextInterface $context): void
     {
         $context->setNode($object, $object, $metadata, $propertyPath);
 
@@ -558,7 +558,7 @@ private function validateClassNode(object $object, ?string $cacheKey, ClassMetad
      *
      * @see TraversalStrategy
      */
-    private function validateGenericNode(mixed $value, ?object $object, ?string $cacheKey, ?MetadataInterface $metadata, string $propertyPath, array $groups, ?array $cascadedGroups, int $traversalStrategy, ExecutionContextInterface $context)
+    private function validateGenericNode(mixed $value, ?object $object, ?string $cacheKey, ?MetadataInterface $metadata, string $propertyPath, array $groups, ?array $cascadedGroups, int $traversalStrategy, ExecutionContextInterface $context): void
     {
         $context->setNode($value, $object, $metadata, $propertyPath);
 
@@ -659,7 +659,7 @@ private function validateGenericNode(mixed $value, ?object $object, ?string $cac
      * If any of the constraints generates a violation, subsequent groups in the
      * group sequence are skipped.
      */
-    private function stepThroughGroupSequence(mixed $value, ?object $object, ?string $cacheKey, ?MetadataInterface $metadata, string $propertyPath, int $traversalStrategy, GroupSequence $groupSequence, ?string $cascadedGroup, ExecutionContextInterface $context)
+    private function stepThroughGroupSequence(mixed $value, ?object $object, ?string $cacheKey, ?MetadataInterface $metadata, string $propertyPath, int $traversalStrategy, GroupSequence $groupSequence, ?string $cascadedGroup, ExecutionContextInterface $context): void
     {
         $violationCount = \count($context->getViolations());
         $cascadedGroups = $cascadedGroup ? [$cascadedGroup] : null;
@@ -702,7 +702,7 @@ private function stepThroughGroupSequence(mixed $value, ?object $object, ?string
     /**
      * Validates a node's value against all constraints in the given group.
      */
-    private function validateInGroup(mixed $value, ?string $cacheKey, MetadataInterface $metadata, string $group, ExecutionContextInterface $context)
+    private function validateInGroup(mixed $value, ?string $cacheKey, MetadataInterface $metadata, string $group, ExecutionContextInterface $context): void
     {
         $context->setGroup($group);
 
diff --git a/src/Symfony/Component/Validator/Validator/TraceableValidator.php b/src/Symfony/Component/Validator/Validator/TraceableValidator.php
index cfcff1fa29d06..241ce901b5c5e 100644
--- a/src/Symfony/Component/Validator/Validator/TraceableValidator.php
+++ b/src/Symfony/Component/Validator/Validator/TraceableValidator.php
@@ -38,6 +38,9 @@ public function getCollectedData(): array
         return $this->collectedData;
     }
 
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->collectedData = [];
diff --git a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php
index 849d52ae28581..c67589dc1402d 100644
--- a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php
+++ b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php
@@ -108,7 +108,7 @@ public function setCause(mixed $cause): static
         return $this;
     }
 
-    public function addViolation()
+    public function addViolation(): void
     {
         if (null === $this->plural) {
             $translatedMessage = $this->translator->trans(
diff --git a/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php b/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php
index 9e91592bd2655..fcaa1b768ad2d 100644
--- a/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php
@@ -31,6 +31,9 @@
  */
 class RdKafkaCaster
 {
+    /**
+     * @return array
+     */
     public static function castKafkaConsumer(KafkaConsumer $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -123,6 +126,9 @@ public static function castTopicConf(TopicConf $c, array $a, Stub $stub, bool $i
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castRdKafka(\RdKafka $c, array $a, Stub $stub, bool $isNested)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
index 0569278cffb5f..591751fce26b9 100644
--- a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@@ -84,7 +84,7 @@ public static function unsetClosureFileInfo(\Closure $c, array $a)
         return $a;
     }
 
-    public static function castGenerator(\Generator $c, array $a, Stub $stub, bool $isNested)
+    public static function castGenerator(\Generator $c, array $a, Stub $stub, bool $isNested): array
     {
         // Cannot create ReflectionGenerator based on a terminated Generator
         try {
@@ -447,7 +447,7 @@ public static function getSignature(array $a)
         return $signature;
     }
 
-    private static function addExtra(array &$a, \Reflector $c)
+    private static function addExtra(array &$a, \Reflector $c): void
     {
         $x = isset($a[Caster::PREFIX_VIRTUAL.'extra']) ? $a[Caster::PREFIX_VIRTUAL.'extra']->value : [];
 
@@ -463,7 +463,7 @@ private static function addExtra(array &$a, \Reflector $c)
         }
     }
 
-    private static function addMap(array &$a, object $c, array $map, string $prefix = Caster::PREFIX_VIRTUAL)
+    private static function addMap(array &$a, object $c, array $map, string $prefix = Caster::PREFIX_VIRTUAL): void
     {
         foreach ($map as $k => $m) {
             if ('isDisabled' === $k) {
diff --git a/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php b/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
index f8c5344617206..f3bbf3be4f0dc 100644
--- a/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
@@ -46,7 +46,7 @@ public static function castProcess($process, array $a, Stub $stub, bool $isNeste
         return proc_get_status($process);
     }
 
-    public static function castStream($stream, array $a, Stub $stub, bool $isNested)
+    public static function castStream($stream, array $a, Stub $stub, bool $isNested): array
     {
         $a = stream_get_meta_data($stream) + static::castStreamContext($stream, $a, $stub, $isNested);
         if ($a['uri'] ?? false) {
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
index 599c59ecf6e54..9df2b79f0acd8 100644
--- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -232,6 +232,8 @@ public function __construct(array $casters = null)
      * see e.g. static::$defaultCasters.
      *
      * @param callable[] $casters A map of casters
+     *
+     * @return void
      */
     public function addCasters(array $casters)
     {
@@ -242,6 +244,8 @@ public function addCasters(array $casters)
 
     /**
      * Sets the maximum number of items to clone past the minimum depth in nested structures.
+     *
+     * @return void
      */
     public function setMaxItems(int $maxItems)
     {
@@ -250,6 +254,8 @@ public function setMaxItems(int $maxItems)
 
     /**
      * Sets the maximum cloned length for strings.
+     *
+     * @return void
      */
     public function setMaxString(int $maxString)
     {
@@ -259,6 +265,8 @@ public function setMaxString(int $maxString)
     /**
      * Sets the minimum tree depth where we are guaranteed to clone all the items.  After this
      * depth is reached, only setMaxItems items will be cloned.
+     *
+     * @return void
      */
     public function setMinDepth(int $minDepth)
     {
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
index d87d56906e6eb..056b3dfb6a153 100644
--- a/src/Symfony/Component/VarDumper/Cloner/Data.php
+++ b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -262,6 +262,8 @@ public function seek(string|int $key): ?static
 
     /**
      * Dumps data with a DumperInterface dumper.
+     *
+     * @return void
      */
     public function dump(DumperInterface $dumper)
     {
@@ -286,7 +288,7 @@ public function dump(DumperInterface $dumper)
      *
      * @param mixed $item A Stub object or the original value being dumped
      */
-    private function dumpItem(DumperInterface $dumper, Cursor $cursor, array &$refs, mixed $item)
+    private function dumpItem(DumperInterface $dumper, Cursor $cursor, array &$refs, mixed $item): void
     {
         $cursor->refIndex = 0;
         $cursor->softRefTo = $cursor->softRefHandle = $cursor->softRefCount = 0;
diff --git a/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php b/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php
index 1b06e694f7c05..b64a884b99bf3 100644
--- a/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php
+++ b/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php
@@ -54,7 +54,7 @@ public function __construct(DumpServer $server, array $descriptors = [])
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->addOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format (%s)', implode(', ', $this->getAvailableFormats())), 'cli')
diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
index 2740b879eda28..053a90972bc0a 100644
--- a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
@@ -155,6 +155,8 @@ public function dump(Data $data, $output = null): ?string
      *
      * @param int $depth The recursive depth in the dumped structure for the line being dumped,
      *                   or -1 to signal the end-of-dump to the line dumper callable
+     *
+     * @return void
      */
     protected function dumpLine(int $depth)
     {
@@ -164,6 +166,8 @@ protected function dumpLine(int $depth)
 
     /**
      * Generic line dumper callback.
+     *
+     * @return void
      */
     protected function echoLine(string $line, int $depth, string $indentPad)
     {
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
index 7d6810e44050a..f5780a87ed82a 100644
--- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -86,6 +86,8 @@ public function __construct($output = null, string $charset = null, int $flags =
 
     /**
      * Enables/disables colored output.
+     *
+     * @return void
      */
     public function setColors(bool $colors)
     {
@@ -94,6 +96,8 @@ public function setColors(bool $colors)
 
     /**
      * Sets the maximum number of characters per line for dumped strings.
+     *
+     * @return void
      */
     public function setMaxStringWidth(int $maxStringWidth)
     {
@@ -104,6 +108,8 @@ public function setMaxStringWidth(int $maxStringWidth)
      * Configures styles.
      *
      * @param array $styles A map of style names to style definitions
+     *
+     * @return void
      */
     public function setStyles(array $styles)
     {
@@ -114,12 +120,17 @@ public function setStyles(array $styles)
      * Configures display options.
      *
      * @param array $displayOptions A map of display options to customize the behavior
+     *
+     * @return void
      */
     public function setDisplayOptions(array $displayOptions)
     {
         $this->displayOptions = $displayOptions + $this->displayOptions;
     }
 
+    /**
+     * @return void
+     */
     public function dumpScalar(Cursor $cursor, string $type, string|int|float|bool|null $value)
     {
         $this->dumpKey($cursor);
@@ -175,6 +186,9 @@ public function dumpScalar(Cursor $cursor, string $type, string|int|float|bool|n
         $this->endValue($cursor);
     }
 
+    /**
+     * @return void
+     */
     public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut)
     {
         $this->dumpKey($cur
10000
sor);
@@ -260,6 +274,9 @@ public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut)
         }
     }
 
+    /**
+     * @return void
+     */
     public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild)
     {
         $this->colors ??= $this->supportsColors();
@@ -296,6 +313,9 @@ public function enterHash(Cursor $cursor, int $type, string|int|null $class, boo
         }
     }
 
+    /**
+     * @return void
+     */
     public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut)
     {
         if (empty($cursor->attr['cut_hash'])) {
@@ -311,6 +331,8 @@ public function leaveHash(Cursor $cursor, int $type, string|int|null $class, boo
      *
      * @param bool $hasChild When the dump of the hash has child item
      * @param int  $cut      The number of items the hash has been cut by
+     *
+     * @return void
      */
     protected function dumpEllipsis(Cursor $cursor, bool $hasChild, int $cut)
     {
@@ -327,6 +349,8 @@ protected function dumpEllipsis(Cursor $cursor, bool $hasChild, int $cut)
 
     /**
      * Dumps a key in a hash structure.
+     *
+     * @return void
      */
     protected function dumpKey(Cursor $cursor)
     {
@@ -530,6 +554,9 @@ protected function supportsColors(): bool
         return static::$defaultColors = $this->hasColorSupport($h);
     }
 
+    /**
+     * @return void
+     */
     protected function dumpLine(int $depth, bool $endOfValue = false)
     {
         if ($this->colors) {
@@ -538,6 +565,9 @@ protected function dumpLine(int $depth, bool $endOfValue = false)
         parent::dumpLine($depth);
     }
 
+    /**
+     * @return void
+     */
     protected function endValue(Cursor $cursor)
     {
         if (-1 === $cursor->hashType) {
diff --git a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
index c10cd4442f6f6..a2e8f8c7b24da 100644
--- a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
@@ -31,6 +31,9 @@ public function __construct(DataDumperInterface $wrappedDumper, array $contextPr
         $this->contextProviders = $contextProviders;
     }
 
+    /**
+     * @return void
+     */
     public function dump(Data $data)
     {
         $context = $data->getContext();
diff --git a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
index f2c891b6a12c0..546490d9aeb07 100644
--- a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
@@ -41,6 +41,9 @@ public function getContextProviders(): array
         return $this->connection->getContextProviders();
     }
 
+    /**
+     * @return void
+     */
     public function dump(Data $data)
     {
         if (!$this->connection->write($data) && $this->wrappedDumper) {
diff --git a/src/Symfony/Component/VarDumper/Server/Connection.php b/src/Symfony/Component/VarDumper/Server/Connection.php
index 23fa456bdef99..692752deafb40 100644
--- a/src/Symfony/Component/VarDumper/Server/Connection.php
+++ b/src/Symfony/Component/VarDumper/Server/Connection.php
@@ -62,7 +62,7 @@ public function write(Data $data): bool
         $context = array_filter($context);
         $encodedPayload = base64_encode(serialize([$data, $context]))."\n";
 
-        set_error_handler([self::class, 'nullErrorHandler']);
+        set_error_handler(fn () => true);
         try {
             if (-1 !== stream_socket_sendto($this->socket, $encodedPayload)) {
                 return true;
@@ -82,17 +82,12 @@ public function write(Data $data): bool
         return false;
     }
 
-    private static function nullErrorHandler(int $t, string $m)
-    {
-        // no-op
-    }
-
     /**
      * @psalm-return false|resource
      */
     private function createSocket()
     {
-        set_error_handler([self::class, 'nullErrorHandler']);
+        set_error_handler(fn () => true);
         try {
             return stream_socket_client($this->host, $errno, $errstr, 3, \STREAM_CLIENT_CONNECT | \STREAM_CLIENT_ASYNC_CONNECT);
         } finally {
diff --git a/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php b/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php
index 6af81a2e66da7..e769591ead767 100644
--- a/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php
+++ b/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php
@@ -36,7 +36,7 @@ public function __construct()
         $this->serializer = new HttpHeaderSerializer();
     }
 
-    public function onKernelResponse(ResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event): void
     {
         if (!$event->isMainRequest()) {
             return;
diff --git a/src/Symfony/Component/Workflow/Definition.php b/src/Symfony/Component/Workflow/Definition.php
index c3a0637b0c59a..cdb180976895e 100644
--- a/src/Symfony/Component/Workflow/Definition.php
+++ b/src/Symfony/Component/Workflow/Definition.php
@@ -76,7 +76,7 @@ public function getMetadataStore(): MetadataStoreInterface
         return $this->metadataStore;
     }
 
-    private function setInitialPlaces(string|array $places = null)
+    private function setInitialPlaces(string|array $places = null): void
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/workflow', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -96,7 +96,7 @@ private function setInitialPlaces(string|array $places = null)
         $this->initialPlaces = $places;
     }
 
-    private function addPlace(string $place)
+    private function addPlace(string $place): void
     {
         if (!\count($this->places)) {
             $this->initialPlaces = [$place];
@@ -105,7 +105,7 @@ private function addPlace(string $place)
         $this->places[$place] = $place;
     }
 
-    private function addTransition(Transition $transition)
+    private function addTransition(Transition $transition): void
     {
         $name = $transition->getName();
 
diff --git a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php b/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
index de89269e7d4a9..8d82824eb0f0f 100644
--- a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
+++ b/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
@@ -27,6 +27,9 @@ public function __construct(LoggerInterface $logger)
         $this->logger = $logger;
     }
 
+    /**
+     * @return void
+     */
     public function onLeave(Event $event)
     {
         foreach ($event->getTransition()->getFroms() as $place) {
@@ -34,11 +37,17 @@ public function onLeave(Event $event)
         }
     }
 
+    /**
+     * @return void
+     */
     public function onTransition(Event $event)
     {
         $this->logger->info(sprintf('Transition "%s" for subject of class "%s" in workflow "%s".', $event->getTransition()->getName(), $event->getSubject()::class, $event->getWorkflowName()));
     }
 
+    /**
+     * @return void
+     */
     public function onEnter(Event $event)
     {
         foreach ($event->getTransition()->getTos() as $place) {
diff --git a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
index 91957a4204ffe..ab5ea511105c8 100644
--- a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
+++ b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
@@ -22,6 +22,9 @@
  */
 class ExpressionLanguage extends BaseExpressionLanguage
 {
+    /**
+     * @return void
+     */
     protected function registerFunctions()
     {
         parent::registerFunctions();
diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
index 5c873d8b99e9e..c207b1a655daf 100644
--- a/src/Symfony/Component/Workflow/EventListener/GuardListener.php
+++ b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
@@ -43,6 +43,9 @@ public function __construct(array $configuration, ExpressionLanguage $expression
         $this->validator = $validator;
     }
 
+    /**
+     * @return void
+     */
     public function onTransition(GuardEvent $event, string $eventName)
     {
         if (!isset($this->configuration[$eventName])) {
@@ -62,7 +65,7 @@ public function onTransition(GuardEvent $event, string $eventName)
         }
     }
 
-    private function validateGuardExpression(GuardEvent $event, string $expression)
+    private function validateGuardExpression(GuardEvent $event, string $expression): void
     {
         if (!$this->expressionLanguage->evaluate($expression, $this->getVariables($event))) {
             $blocker = TransitionBlocker::createBlockedByExpressionGuardListener($expression);
diff --git a/src/Symfony/Component/Workflow/Marking.php b/src/Symfony/Component/Workflow/Marking.php
index dba7c3dcfbf54..95a83f0cfd243 100644
--- a/src/Symfony/Component/Workflow/Marking.php
+++ b/src/Symfony/Component/Workflow/Marking.php
@@ -31,11 +31,17 @@ public function __construct(array $representation = [])
         }
     }
 
+    /**
+     * @return void
+     */
     public function mark(string $place)
     {
         $this->places[$place] = 1;
     }
 
+    /**
+     * @return void
+     */
     public function unmark(string $place)
     {
         unset($this->places[$place]);
diff --git a/src/Symfony/Component/Workflow/MarkingStore/MethodMarkingStore.php b/src/Symfony/Component/Workflow/MarkingStore/MethodMarkingStore.php
index b1602dc72e459..78d3307e6ac6c 100644
--- a/src/Symfony/Component/Workflow/MarkingStore/MethodMarkingStore.php
+++ b/src/Symfony/Component/Workflow/MarkingStore/MethodMarkingStore.php
@@ -74,7 +74,7 @@ public function getMarking(object $subject): Marking
         return new Marking($marking);
     }
 
-    public function setMarking(object $subject, Marking $marking, array $context = [])
+    public function setMarking(object $subject, Marking $marking, array $context = []): void
     {
         $marking = $marking->getPlaces();
 
diff --git a/src/Symfony/Component/Workflow/Registry.php b/src/Symfony/Component/Workflow/Registry.php
index 9f3171f937cd4..287d8b750f9b4 100644
--- a/src/Symfony/Component/Workflow/Registry.php
+++ b/src/Symfony/Component/Workflow/Registry.php
@@ -24,6 +24,9 @@ class Registry
 {
     private array $workflows = [];
 
+    /**
+     * @return void
+     */
     public function addWorkflow(WorkflowInterface $workflow, WorkflowSupportStrategyInterface $supportStrategy)
     {
         $this->workflows[] = [$workflow, $supportStrategy];
diff --git a/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php b/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php
index d4e78cac2754e..20afc8d937b81 100644
--- a/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php
+++ b/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php
@@ -19,6 +19,9 @@
  */
 class StateMachineValidator implements DefinitionValidatorInterface
 {
+    /**
+     * @return void
+     */
     public function validate(Definition $definition, string $name)
     {
         $transitionFromNames = [];
diff --git a/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php b/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php
index 6a5c76d95f7fa..c13c2814c3f28 100644
--- a/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php
+++ b/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php
@@ -27,6 +27,9 @@ public function __construct(bool $singlePlace = false)
         $this->singlePlace = $singlePlace;
     }
 
+    /**
+     * @return void
+     */
     public function validate(Definition $definition, string $name)
     {
         // Make sure all transitions for one place has unique name.
diff --git a/src/Symfony/Component/Yaml/Command/LintCommand.php b/src/Symfony/Component/Yaml/Command/LintCommand.php
index 6962c51295f03..de11d48d0ffcf 100644
--- a/src/Symfony/Component/Yaml/Command/LintCommand.php
+++ b/src/Symfony/Component/Yaml/Command/LintCommand.php
@@ -50,6 +50,9 @@ public function __construct(string $name = null, callable $directoryIteratorProv
         $this->isReadableProvider = null === $isReadableProvider ? null : $isReadableProvider(...);
     }
 
+    /**
+     * @return void
+     */
     protected function configure()
     {
         $this
diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php
index 07c59b9668514..c1a77ad15704b 100644
--- a/src/Symfony/Component/Yaml/Exception/ParseException.php
+++ b/src/Symfony/Component/Yaml/Exception/ParseException.php
@@ -51,6 +51,8 @@ public function getSnippet(): string
 
     /**
      * Sets the snippet of code near the error.
+     *
+     * @return void
      */
     public function setSnippet(string $snippet)
     {
@@ -71,6 +73,8 @@ public function getParsedFile(): string
 
     /**
      * Sets the filename where the error occurred.
+     *
+     * @return void
      */
     public function setParsedFile(string $parsedFile)
     {
@@ -89,6 +93,8 @@ public function getParsedLine(): int
 
     /**
      * Sets the line where the error occurred.
+     *
+     * @return void
      */
     public function setParsedLine(int $parsedLine)
     {
@@ -97,7 +103,7 @@ public function setParsedLine(int $parsedLine)
         $this->updateRepr();
     }
 
-    private function updateRepr()
+    private function updateRepr(): void
     {
         $this->message = $this->rawMessage;
 
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index 54da91ef48d90..586ae2ce86a4b 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -34,7 +34,7 @@ class Inline
     private static bool $objectForMap = false;
     private static bool $constantSupport = false;
 
-    public static function initialize(int $flags, int $parsedLineNumber = null, string $parsedFilename = null)
+    public static function initialize(int $flags, int $parsedLineNumber = null, string $parsedFilename = null): void
     {
         self::$exceptionOnInvalidType = (bool) (Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE & $flags);
         self::$objectSupport = (bool) (Yaml::PARSE_OBJECT & $flags);
diff --git a/src/Symfony/Contracts/Translation/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php
index 46e9170742059..e3b0adff05980 100644
--- a/src/Symfony/Contracts/Translation/TranslatorTrait.php
+++ b/src/Symfony/Contracts/Translation/TranslatorTrait.php
@@ -22,6 +22,9 @@ trait TranslatorTrait
 {
     private ?string $locale = null;
 
+    /**
+     * @return void
+     */
     public function setLocale(string $locale)
     {
         $this->locale = $locale;

From 12f901f43810dbb79c13aa1e1cf6b771970cbe1e Mon Sep 17 00:00:00 2001
From: Mathieu <math.lechat@gmail.com>
Date: Mon, 13 Feb 2023 19:19:59 +0100
Subject: [PATCH 198/475] [Validator] Add a `NoSuspiciousCharacters` constraint
 to validate a string is not a spoof attempt

---
 .../Resources/config/validator.php            |   7 +
 .../Bundle/FrameworkBundle/composer.json      |   2 +-
 src/Symfony/Component/Validator/CHANGELOG.md  |   1 +
 .../Constraints/NoSuspiciousCharacters.php    | 113 +++++++++++++
 .../NoSuspiciousCharactersValidator.php       | 119 +++++++++++++
 .../NoSuspiciousCharactersValidatorTest.php   | 156 ++++++++++++++++++
 6 files changed, 397 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/Validator/Constraints/NoSuspiciousCharacters.php
 create mode 100644 src/Symfony/Component/Validator/Constraints/NoSuspiciousCharactersValidator.php
 create mode 100644 src/Symfony/Component/Validator/Tests/Constraints/NoSuspiciousCharactersValidatorTest.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php
index c397e73d42505..5d4abc6d6209d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php
@@ -16,6 +16,7 @@
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Validator\Constraints\EmailValidator;
 use Symfony\Component\Validator\Constraints\ExpressionValidator;
+use Symfony\Component\Validator\Constraints\NoSuspiciousCharactersValidator;
 use Symfony\Component\Validator\Constraints\NotCompromisedPasswordValidator;
 use Symfony\Component\Validator\Constraints\WhenValidator;
 use Symfony\Component\Validator\ContainerConstraintValidatorFactory;
@@ -102,6 +103,12 @@
                 'alias' => WhenValidator::class,
             ])
 
+        ->set('validator.no_suspicious_characters', NoSuspiciousCharactersValidator::class)
+            ->args([param('kernel.enabled_locales')])
+            ->tag('validator.constraint_validator', [
+                'alias' => NoSuspiciousCharactersValidator::class,
+            ])
+
         ->set('validator.property_info_loader', PropertyInfoLoader::class)
             ->args([
                 service('property_info'),
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 6f81c313b0c54..ea24276493236 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -60,7 +60,7 @@
         "symfony/string": "^5.4|^6.0",
         "symfony/translation": "^5.4|^6.0",
         "symfony/twig-bundle": "^5.4|^6.0",
-        "symfony/validator": "^5.4|^6.0",
+        "symfony/validator": "^6.3",
         "symfony/workflow": "^5.4|^6.0",
         "symfony/yaml": "^5.4|^6.0",
         "symfony/property-info": "^5.4|^6.0",
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
index fbd40a2077ebb..e358e8f23299a 100644
--- a/src/Symfony/Component/Validator/CHANGELOG.md
+++ b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * Add method `getConstraint()` to `ConstraintViolationInterface`
  * Add `Uuid::TIME_BASED_VERSIONS` to match that a UUID being validated embeds a timestamp
  * Add the `pattern` parameter in violations of the `Regex` constraint
+ * Add a `NoSuspiciousCharacters` constraint to validate a string is not a spoofing attempt
 
 6.2
 ---
diff --git a/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharacters.php b/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharacters.php
new file mode 100644
index 0000000000000..7548703f342a0
--- /dev/null
+++ b/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharacters.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Exception\LogicException;
+
+/**
+ * @Annotation
+ * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
+ *
+ * @author Mathieu Lechat <mathieu.lechat@les-tilleuls.coop>
+ */
+#[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
+class NoSuspiciousCharacters extends Constraint
+{
+    public const RESTRICTION_LEVEL_ERROR = '1ece07dc-dca2-45f1-ba47-8d7dc3a12774';
+    public const INVISIBLE_ERROR = '6ed60e6c-179b-4e93-8a6c-667d85c6de5e';
+    public const MIXED_NUMBERS_ERROR = '9f01fc26-3bc4-44b1-a6b1-c08e2412053a';
+    public const HIDDEN_OVERLAY_ERROR = '56380dc5-0476-4f04-bbaa-b68cd1c2d974';
+
+    protected const ERROR_NAMES = [
+        self::RESTRICTION_LEVEL_ERROR => 'RESTRICTION_LEVEL_ERROR',
+        self::INVISIBLE_ERROR => 'INVISIBLE_ERROR',
+        self::MIXED_NUMBERS_ERROR => 'MIXED_NUMBERS_ERROR',
+        self::HIDDEN_OVERLAY_ERROR => 'INVALID_CASE_ERROR',
+    ];
+
+    /**
+     * Check a string for the presence of invisible characters such as zero-width spaces,
+     * or character sequences that are likely not to display such as multiple occurrences of the same non-spacing mark.
+     */
+    public const CHECK_INVISIBLE = 32;
+
+    /**
+     * Check that a string does not mix numbers from different numbering systems;
+     * for example “8” (Digit Eight) and “৪” (Bengali Digit Four).
+     */
+    public const CHECK_MIXED_NUMBERS = 128;
+
+    /**
+     * Check that a string does not have a combining character following a character in which it would be hidden;
+     * for example “i” (Latin Small Letter I) followed by a U+0307 (Combining Dot Above).
+     */
+    public const CHECK_HIDDEN_OVERLAY = 256;
+
+    /** @see https://unicode.org/reports/tr39/#ascii_only */
+    public const RESTRICTION_LEVEL_ASCII = 268435456;
+
+    /** @see https://unicode.org/reports/tr39/#single_script */
+    public const RESTRICTION_LEVEL_SINGLE_SCRIPT = 536870912;
+
+    /** @see https://unicode.org/reports/tr39/#highly_restrictive */
+    public const RESTRICTION_LEVEL_HIGH = 805306368;
+
+    /** @see https://unicode.org/reports/tr39/#moderately_restrictive */
+    public const RESTRICTION_LEVEL_MODERATE = 1073741824;
+
+    /** @see https://unicode.org/reports/tr39/#minimally_restrictive */
+    public const RESTRICTION_LEVEL_MINIMAL = 1342177280;
+
+    /** @see https://unicode.org/reports/tr39/#unrestricted */
+    public const RESTRICTION_LEVEL_NONE = 1610612736;
+
+    public string $restrictionLevelMessage = 'This value contains characters that are not allowed by the current restriction-level.';
+    public string $invisibleMessage = 'Using invisible characters is not allowed.';
+    public string $mixedNumbersMessage = 'Mixing numbers from different scripts is not allowed.';
+    public string $hiddenOverlayMessage = 'Using hidden overlay characters is not allowed.';
+
+    public int $checks = self::CHECK_INVISIBLE | self::CHECK_MIXED_NUMBERS | self::CHECK_HIDDEN_OVERLAY;
+    public ?int $restrictionLevel = null;
+    public ?array $locales = null;
+
+    /**
+     * @param int-mask-of<self::CHECK_*>|null $checks
+     * @param self::RESTRICTION_LEVEL_*|null  $restrictionLevel
+     */
+    public function __construct(
+        array $options = null,
+        string $restrictionLevelMessage = null,
+        string $invisibleMessage = null,
+        string $mixedNumbersMessage = null,
+        string $hiddenOverlayMessage = null,
+        int $checks = null,
+        int $restrictionLevel = null,
+        array $locales = null,
+        array $groups = null,
+        mixed $payload = null
+    ) {
+        if (!class_exists(\Spoofchecker::class)) {
+            throw new LogicException('The intl extension is required to use the NoSuspiciousCharacters constraint.');
+        }
+
+        parent::__construct($options, $groups, $payload);
+
+        $this->restrictionLevelMessage ??= $restrictionLevelMessage;
+        $this->invisibleMessage ??= $invisibleMessage;
+        $this->mixedNumbersMessage ??= $mixedNumbersMessage;
+        $this->hiddenOverlayMessage ??= $hiddenOverlayMessage;
+        $this->checks ??= $checks;
+        $this->restrictionLevel ??= $restrictionLevel;
+        $this->locales ??= $locales;
+    }
+}
diff --git a/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharactersValidator.php b/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharactersValidator.php
new file mode 100644
index 0000000000000..e3d2f347606ab
--- /dev/null
+++ b/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharactersValidator.php
@@ -0,0 +1,119 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\LogicException;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+
+/**
+ * @author Mathieu Lechat <mathieu.lechat@les-tilleuls.coop>
+ */
+class NoSuspiciousCharactersValidator extends ConstraintValidator
+{
+    private const CHECK_RESTRICTION_LEVEL = 16;
+    private const CHECK_SINGLE_SCRIPT = 16;
+    private const CHECK_CHAR_LIMIT = 64;
+
+    private const CHECK_ERROR = [
+        self::CHECK_RESTRICTION_LEVEL => [
+            'code' => NoSuspiciousCharacters::RESTRICTION_LEVEL_ERROR,
+            'messageProperty' => 'restrictionLevelMessage',
+        ],
+        NoSuspiciousCharacters::CHECK_INVISIBLE => [
+            'code' => NoSuspiciousCharacters::INVISIBLE_ERROR,
+            'messageProperty' => 'invisibleMessage',
+        ],
+        self::CHECK_CHAR_LIMIT => [
+            'code' => NoSuspiciousCharacters::RESTRICTION_LEVEL_ERROR,
+            'messageProperty' => 'restrictionLevelMessage',
+        ],
+        NoSuspiciousCharacters::CHECK_MIXED_NUMBERS => [
+            'code' => NoSuspiciousCharacters::MIXED_NUMBERS_ERROR,
+            'messageProperty' => 'mixedNumbersMessage',
+        ],
+        NoSuspiciousCharacters::CHECK_HIDDEN_OVERLAY => [
+            'code' => NoSuspiciousCharacters::HIDDEN_OVERLAY_ERROR,
+            'messageProperty' => 'hiddenOverlayMessage',
+        ],
+    ];
+
+    /**
+     * @param string[] $defaultLocales
+     */
+    public function __construct(private readonly array $defaultLocales = [])
+    {
+    }
+
+    public function validate(mixed $value, Constraint $constraint)
+    {
+        if (!$constraint instanceof NoSuspiciousCharacters) {
+            throw new UnexpectedTypeException($constraint, NoSuspiciousCharacters::class);
+        }
+
+        if (null === $value || '' === $value) {
+            return;
+        }
+
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
+            throw new UnexpectedValueException($value, 'string');
+        }
+
+        if ('' === $value = (string) $value) {
+            return;
+        }
+
+        $checker = new \Spoofchecker();
+        $checks = $constraint->checks;
+
+        if (method_exists($checker, 'setRestrictionLevel')) {
+            $checks |= self::CHECK_RESTRICTION_LEVEL;
+            $checker->setRestrictionLevel($constraint->restrictionLevel ?? NoSuspiciousCharacters::RESTRICTION_LEVEL_MODERATE);
+        } elseif (NoSuspiciousCharacters::RESTRICTION_LEVEL_MINIMAL === $constraint->restrictionLevel) {
+            $checks |= self::CHECK_CHAR_LIMIT;
+        } elseif (NoSuspiciousCharacters::RESTRICTION_LEVEL_SINGLE_SCRIPT === $constraint->restrictionLevel) {
+            $checks |= self::CHECK_SINGLE_SCRIPT | self::CHECK_CHAR_LIMIT;
+        } elseif ($constraint->restrictionLevel) {
+            throw new LogicException('You can only use one of RESTRICTION_LEVEL_NONE, RESTRICTION_LEVEL_MINIMAL or RESTRICTION_LEVEL_SINGLE_SCRIPT with intl compiled against ICU < 58.');
+        } else {
+            $checks |= self::CHECK_SINGLE_SCRIPT;
+        }
+
+        $checker->setAllowedLocales(implode(',', $constraint->locales ?? $this->defaultLocales));
+
+        $checker->setChecks($checks);
+
+        if (!$checker->isSuspicious($value)) {
+            return;
+        }
+
+        foreach (self::CHECK_ERROR as $check => $error) {
+            if (!($checks & $check)) {
+                continue;
+            }
+
+            $checker->setChecks($check);
+
+            if (!$checker->isSuspicious($value)) {
+                continue;
+            }
+
+            $this->context->buildViolation($constraint->{$error['messageProperty']})
+                ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setCode($error['code'])
+                ->addViolation()
+            ;
+        }
+    }
+}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/NoSuspiciousCharactersValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/NoSuspiciousCharactersValidatorTest.php
new file mode 100644
index 0000000000000..6894d2f95e5e4
--- /dev/null
+++ b/src/Symfony/Component/Validator/Tests/Constraints/NoSuspiciousCharactersValidatorTest.php
@@ -0,0 +1,156 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Constraints;
+
+use Symfony\Component\Validator\Constraints\NoSuspiciousCharacters;
+use Symfony\Component\Validator\Constraints\NoSuspiciousCharactersValidator;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+
+/**
+ * @requires extension intl
+ *
+ * @extends ConstraintValidatorTestCase<NoSuspiciousCharactersValidator>
+ */
+class NoSuspiciousCharactersValidatorTest extends ConstraintValidatorTestCase
+{
+    protected function createValidator(): NoSuspiciousCharactersValidator
+    {
+        return new NoSuspiciousCharactersValidator();
+    }
+
+    /**
+     * @dataProvider provideNonSuspiciousStrings
+     */
+    public function testNonSuspiciousStrings(string $string, array $options = [])
+    {
+        $this->validator->validate($string, new NoSuspiciousCharacters($options));
+
+        $this->assertNoViolation();
+    }
+
+    public static function provideNonSuspiciousStrings(): iterable
+    {
+        yield 'Characters from Common script can only fail RESTRICTION_LEVEL_ASCII' => [
+            'I ❤️ Unicode',
+            ['restrictionLevel' => NoSuspiciousCharacters::RESTRICTION_LEVEL_SINGLE_SCRIPT],
+        ];
+
+        yield 'RESTRICTION_LEVEL_MINIMAL cannot fail without configured locales' => [
+            'àㄚԱπ৪',
+            [
+                'restrictionLevel' => NoSuspiciousCharacters::RESTRICTION_LEVEL_MINIMAL,
+                'locales' => [],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideSuspiciousStrings
+     */
+    public function testSuspiciousStrings(string $string, array $options, string $errorCode, string $errorMessage)
+    {
+        $this->validator->validate($string, new NoSuspiciousCharacters($options));
+
+        $this->buildViolation($errorMessage)
+            ->setCode($errorCode)
+            ->setParameter('{{ value }}', '"'.$string.'"')
+            ->assertRaised();
+    }
+
+    public static function provideSuspiciousStrings(): iterable
+    {
+        yield 'Fails RESTRICTION_LEVEL check because of character outside ASCII range' => [
+            'à',
+            ['restrictionLevel' => NoSuspiciousCharacters::RESTRICTION_LEVEL_ASCII],
+            NoSuspiciousCharacters::RESTRICTION_LEVEL_ERROR,
+            'This value contains characters that are not allowed by the current restriction-level.',
+        ];
+
+        yield 'Fails RESTRICTION_LEVEL check because of mixed-script string' => [
+            'àㄚ',
+            [
+                'restrictionLevel' => NoSuspiciousCharacters::RESTRICTION_LEVEL_SINGLE_SCRIPT,
+                'locales' => ['en', 'zh_Hant_TW'],
+            ],
+            NoSuspiciousCharacters::RESTRICTION_LEVEL_ERROR,
+            'This value contains characters that are not allowed by the current restriction-level.',
+        ];
+
+        yield 'Fails RESTRICTION_LEVEL check because RESTRICTION_LEVEL_HIGH disallows Armenian script' => [
+            'àԱ',
+            [
+                'restrictionLevel' => NoSuspiciousCharacters::RESTRICTION_LEVEL_HIGH,
+                'locales' => ['en', 'hy_AM'],
+            ],
+            NoSuspiciousCharacters::RESTRICTION_LEVEL_ERROR,
+            'This value contains characters that are not allowed by the current restriction-level.',
+        ];
+
+        yield 'Fails RESTRICTION_LEVEL check because RESTRICTION_LEVEL_MODERATE disallows Greek script' => [
+            'àπ',
+            [
+                'restrictionLevel' => NoSuspiciousCharacters::RESTRICTION_LEVEL_MODERATE,
+                'locales' => ['en', 'el_GR'],
+            ],
+            NoSuspiciousCharacters::RESTRICTION_LEVEL_ERROR,
+            'This value contains characters that are not allowed by the current restriction-level.',
+        ];
+
+        yield 'Fails RESTRICTION_LEVEL check because of characters missing from the configured locales’ scripts' => [
+            'àπ',
+            [
+                'restrictionLevel' => NoSuspiciousCharacters::RESTRICTION_LEVEL_MINIMAL,
+                'locales' => ['en'],
+            ],
+            NoSuspiciousCharacters::RESTRICTION_LEVEL_ERROR,
+            'This value contains characters that are not allowed by the current restriction-level.',
+        ];
+
+        yield 'Fails INVISIBLE check because of duplicated non-spacing mark' => [
+            'à̀',
+            [
+                'checks' => NoSuspiciousCharacters::CHECK_INVISIBLE,
+            ],
+            NoSuspiciousCharacters::INVISIBLE_ERROR,
+            'Using invisible characters is not allowed.',
+        ];
+
+        yield 'Fails MIXED_NUMBERS check because of different numbering systems' => [
+            '8৪',
+            [
+                'checks' => NoSuspiciousCharacters::CHECK_MIXED_NUMBERS,
+            ],
+            NoSuspiciousCharacters::MIXED_NUMBERS_ERROR,
+            'Mixing numbers from different scripts is not allowed.',
+        ];
+
+        yield 'Fails HIDDEN_OVERLAY check because of hidden combining character' => [
+            'i̇',
+            [
+                'checks' => NoSuspiciousCharacters::CHECK_HIDDEN_OVERLAY,
+            ],
+            NoSuspiciousCharacters::HIDDEN_OVERLAY_ERROR,
+            'Using hidden overlay characters is not allowed.',
+        ];
+    }
+
+    public function testConstants()
+    {
+        $this->assertSame(\Spoofchecker::INVISIBLE, NoSuspiciousCharacters::CHECK_INVISIBLE);
+        $this->assertSame(\Spoofchecker::ASCII, NoSuspiciousCharacters::RESTRICTION_LEVEL_ASCII);
+        $this->assertSame(\Spoofchecker::SINGLE_SCRIPT_RESTRICTIVE, NoSuspiciousCharacters::RESTRICTION_LEVEL_SINGLE_SCRIPT);
+        $this->assertSame(\Spoofchecker::HIGHLY_RESTRICTIVE, NoSuspiciousCharacters::RESTRICTION_LEVEL_HIGH);
+        $this->assertSame(\Spoofchecker::MODERATELY_RESTRICTIVE, NoSuspiciousCharacters::RESTRICTION_LEVEL_MODERATE);
+        $this->assertSame(\Spoofchecker::MINIMALLY_RESTRICTIVE, NoSuspiciousCharacters::RESTRICTION_LEVEL_MINIMAL);
+        $this->assertSame(\Spoofchecker::UNRESTRICTIVE, NoSuspiciousCharacters::RESTRICTION_LEVEL_NONE);
+    }
+}

From b06b81809709acf62abefe3805bc907ba06fd58e Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 14 Feb 2023 14:19:26 +0100
Subject: [PATCH 199/475] [Yaml] Fix parsing sub-second dates on x86

---
 src/Symfony/Component/Yaml/CHANGELOG.md       |  2 +-
 src/Symfony/Component/Yaml/Inline.php         | 36 ++++++++-----------
 .../Component/Yaml/Tests/InlineTest.php       |  2 +-
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
index beb6c3ccd6255..0c2021f48b2ef 100644
--- a/src/Symfony/Component/Yaml/CHANGELOG.md
+++ b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -4,7 +4,7 @@ CHANGELOG
 6.3
 ---
 
- * Add support to dump int keys as strings by using the `Yaml::DUMP_NUMERIC_KEY_AS_STRING` flag.
+ * Add support to dump int keys as strings by using the `Yaml::DUMP_NUMERIC_KEY_AS_STRING` flag
 
 6.2
 ---
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index 586ae2ce86a4b..c2a93bab6c5da 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -110,16 +110,11 @@ public static function dump(mixed $value, int $flags = 0): string
 
                 return self::dumpNull($flags);
             case $value instanceof \DateTimeInterface:
-                $length = \strlen(rtrim($value->format('u'), '0'));
-                if (0 === $length) {
-                    $format = 'c';
-                } elseif ($length < 4) {
-                    $format = 'Y-m-d\TH:i:s.vP';
-                } else {
-                    $format = 'Y-m-d\TH:i:s.uP';
-                }
-
-                return $value->format($format);
+                return $value->format(match (true) {
+                    !$length = \strlen(rtrim($value->format('u'), '0')) => 'c',
+                    $length < 4 => 'Y-m-d\TH:i:s.vP',
+                    default => 'Y-m-d\TH:i:s.uP',
+                });
             case $value instanceof \UnitEnum:
                 return sprintf('!php/const %s::%s', $value::class, $value->name);
             case \is_object($value):
@@ -721,20 +716,19 @@ private static function evaluateScalar(string $scalar, int $flags, array &$refer
                             return $time;
                         }
 
-                        $length = \strlen(rtrim($time->format('u'), '0'));
-                        if (0 === $length) {
-                            try {
-                                if (false !== $scalar = $time->getTimestamp()) {
-                                    return $scalar;
-                                }
-                            } catch (\ValueError) {
-                                // no-op
-                            }
+                        if ('' !== rtrim($time->format('u'), '0')) {
+                            return (float) $time->format('U.u');
+                        }
 
-                            return (int) $time->format('U');
+                        try {
+                            if (false !== $scalar = $time->getTimestamp()) {
+                                return $scalar;
+                            }
+                        } catch (\ValueError) {
+                            // no-op
                         }
 
-                        return (float) $time->format('U.u');
+                        return $time->format('U');
                 }
         }
 
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
index c49e4e9c7db76..2f9f58350f0a0 100644
--- a/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -565,7 +565,7 @@ public static function getTestsForDump()
      */
     public function testParseTimestampAsUnixTimestampByDefault(string $yaml, int $year, int $month, int $day, int $hour, int $minute, int $second, int $microsecond)
     {
-        $expectedDate = (new \DateTimeImmutable($yaml))->format('U');
+        $expectedDate = (new \DateTimeImmutable($yaml, new \DateTimeZone('UTC')))->format('U');
         $this->assertSame($microsecond ? (float) "$expectedDate.$microsecond" : (int) $expectedDate, Inline::parse($yaml));
     }
 

From ca64537546c697d649db4b1148e4d30e720c4bf6 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 15 Feb 2023 15:38:50 +0100
Subject: [PATCH 200/475] [Config] cleanup exception message on missing class

---
 .../Component/Config/Resource/ClassExistenceResource.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
index f6423746a6cac..2f262bac87b28 100644
--- a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
+++ b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
@@ -160,7 +160,7 @@ public static function throwOnRequiredClass(string $class, \Exception $previous
 
         $message = sprintf('Class "%s" not found.', $class);
 
-        if (self::$autoloadedClass !== $class) {
+        if ($class !== (self::$autoloadedClass ?? $class)) {
             $message = substr_replace($message, sprintf(' while loading "%s"', self::$autoloadedClass), -1, 0);
         }
 

From f15fbb63659b78fbf772ecddb0c49e3b52897f61 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 15 Feb 2023 17:30:18 +0100
Subject: [PATCH 201/475] [Notifier] fix tests

---
 .../Mastodon/Tests/MastodonTransportTest.php       | 14 ++++++--------
 .../Notifier/Bridge/Mastodon/composer.json         |  2 +-
 .../Bridge/Twitter/Tests/TwitterTransportTest.php  | 14 ++++++--------
 .../Notifier/Bridge/Twitter/composer.json          |  2 +-
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportTest.php
index 17f4fb6fa4d0e..68390eda750a3 100644
--- a/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportTest.php
@@ -17,7 +17,6 @@
 use Symfony\Component\Notifier\Bridge\Mastodon\MastodonOptions;
 use Symfony\Component\Notifier\Bridge\Mastodon\MastodonTransport;
 use Symfony\Component\Notifier\Message\ChatMessage;
-use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -27,25 +26,24 @@
  */
 class MastodonTransportTest extends TransportTestCase
 {
-    public function createTransport(HttpClientInterface $client = null): MastodonTransport
+    public static function createTransport(HttpClientInterface $client = null): MastodonTransport
     {
-        return (new MastodonTransport('testAccessToken', $client ?? $this->createMock(HttpClientInterface::class)))->setHost('host.test');
+        return (new MastodonTransport('testAccessToken', $client ?? new MockHttpClient()))->setHost('host.test');
     }
 
-    public function toStringProvider(): iterable
+    public static function toStringProvider(): iterable
     {
-        yield ['mastodon://host.test', $this->createTransport()];
+        yield ['mastodon://host.test', self::createTransport()];
     }
 
-    public function supportedMessagesProvider(): iterable
+    public static function supportedMessagesProvider(): iterable
     {
         yield [new ChatMessage('Hello World!')];
     }
 
-    public function unsupportedMessagesProvider(): iterable
+    public static function unsupportedMessagesProvider(): iterable
     {
         yield [new SmsMessage('0611223344', 'Hello World!')];
-        yield [$this->createMock(MessageInterface::class)];
     }
 
     public function testBasicStatus()
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json b/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json
index 25b30dfc4edb5..86f548f24c8f0 100644
--- a/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "symfony/http-client": "^5.4|^6.0",
-        "symfony/notifier": "^6.2"
+        "symfony/notifier": "^6.2.7"
     },
     "require-dev": {
         "symfony/mime": "^6.2"
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportTest.php
index c859d9fea9438..c9abfe130ac5a 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportTest.php
@@ -17,32 +17,30 @@
 use Symfony\Component\Notifier\Bridge\Twitter\TwitterOptions;
 use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransport;
 use Symfony\Component\Notifier\Message\ChatMessage;
-use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 class TwitterTransportTest extends TransportTestCase
 {
-    public function createTransport(HttpClientInterface $client = null): TwitterTransport
+    public static function createTransport(HttpClientInterface $client = null): TwitterTransport
     {
-        return new TwitterTransport('APIK', 'APIS', 'TOKEN', 'SECRET', $client ?? $this->createMock(HttpClientInterface::class));
+        return new TwitterTransport('APIK', 'APIS', 'TOKEN', 'SECRET', $client ?? new MockHttpClient());
     }
 
-    public function toStringProvider(): iterable
+    public static function toStringProvider(): iterable
     {
-        yield ['twitter://api.twitter.com', $this->createTransport()];
+        yield ['twitter://api.twitter.com', self::createTransport()];
     }
 
-    public function supportedMessagesProvider(): iterable
+    public static function supportedMessagesProvider(): iterable
     {
         yield [new ChatMessage('Hello!')];
     }
 
-    public function unsupportedMessagesProvider(): iterable
+    public static function unsupportedMessagesProvider(): iterable
     {
         yield [new SmsMessage('0611223344', 'Hello!')];
-        yield [$this->createMock(MessageInterface::class)];
     }
 
     public function testBasicTweet()
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json b/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json
index a3ba07d0aed26..a3722597839d5 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "symfony/http-client": "^5.4.21|^6.2.7",
-        "symfony/notifier": "^6.2"
+        "symfony/notifier": "^6.2.7"
     },
     "require-dev": {
         "symfony/mime": "^6.2"

From bce4c2709794757b2089f92222b8d6e31ea95633 Mon Sep 17 00:00:00 2001
From: James Gilliland <neclimdul@gmail.com>
Date: Tue, 14 Feb 2023 10:18:19 -0600
Subject: [PATCH 202/475] [HttpFoundation] Deprecate passing invalid URI to
 Request::create

Fixes: #47084

Passing an invalid URI to Request::create triggers an undefined code
path. In PHP7 the false value returned by parse_url would quietly be
treated as a an array through type coercion leading to unexpected
results. In PHP8 this triggers a deprecation exposing the bug.
---
 src/Symfony/Component/HttpFoundation/Request.php         | 4 ++++
 .../Component/HttpFoundation/Tests/RequestTest.php       | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index fdb701d00b3ee..054c155e628cb 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -342,6 +342,10 @@ public static function create(string $uri, string $method = 'GET', array $parame
         $server['REQUEST_METHOD'] = strtoupper($method);
 
         $components = parse_url($uri);
+        if (false === $components) {
+            trigger_deprecation('symfony/http-foundation', '6.3', 'Calling "%s()" with an invalid URI is deprecated.', __METHOD__);
+            $components = [];
+        }
         if (isset($components['host'])) {
             $server['SERVER_NAME'] = $components['host'];
             $server['HTTP_HOST'] = $components['host'];
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index dbba2b9af2a9f..2de9b5aebb158 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -2554,6 +2554,15 @@ public function testReservedFlags()
             $this->assertNotSame(0b10000000, $value, sprintf('The constant "%s" should not use the reserved value "0b10000000".', $constant));
         }
     }
+
+    /**
+     * @group legacy
+     */
+    public function testInvalidUriCreationDeprecated()
+    {
+        $this->expectDeprecation('Since symfony/http-foundation 6.3: Calling "Symfony\Component\HttpFoundation\Request::create()" with an invalid URI is deprecated.');
+        Request::create('/invalid-path:123');
+    }
 }
 
 class RequestContentProxy extends Request

From b768d9bd27bd363e7b93b0a32e86a8808f6873c4 Mon Sep 17 00:00:00 2001
From: Yoann MOROCUTTI <Yoann.MOROCUTTI@boursorama.fr>
Date: Mon, 13 Feb 2023 18:56:18 +0100
Subject: [PATCH 203/475] [Twig] Twig templates loaded with TemplateCacheWarmer
 are no longer returned to avoid them being preloaded in OPCache as it may
 load a lot of files in memory without improving than much performance.

---
 .../TwigBundle/CacheWarmer/TemplateCacheWarmer.php     | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
index d26ddf358aaba..4e748ddc61228 100644
--- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
+++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
@@ -42,15 +42,9 @@ public function warmUp(string $cacheDir): array
     {
         $this->twig ??= $this->container->get('twig');
 
-        $files = [];
-
         foreach ($this->iterator as $template) {
             try {
-                $template = $this->twig->load($template);
-
-                if (\is_callable([$template, 'unwrap'])) {
-                    $files[] = (new \ReflectionClass($template->unwrap()))->getFileName();
-                }
+                $this->twig->load($template);
             } catch (Error) {
                 /*
                  * Problem during compilation, give up for this template (e.g. syntax errors).
@@ -63,7 +57,7 @@ public function warmUp(string $cacheDir): array
             }
         }
 
-        return $files;
+        return [];
     }
 
     public function isOptional(): bool

From 5b8f59a452ddbb38fad7d4ab7d87775dbd368de3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 16 Feb 2023 09:33:33 +0100
Subject: [PATCH 204/475] Fix PHPUnit deprecation

---
 .../Bridge/Doctrine/Tests/LegacyManagerRegistryTest.php        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/LegacyManagerRegistryTest.php b/src/Symfony/Bridge/Doctrine/Tests/LegacyManagerRegistryTest.php
index 2989d0b61f228..7e525e35b1db4 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/LegacyManagerRegistryTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/LegacyManagerRegistryTest.php
@@ -46,7 +46,8 @@ public function testResetService()
         $registry->resetManager();
 
         $this->assertSame($foo, $container->get('foo'));
-        $this->assertObjectNotHasAttribute('bar', $foo);
+        $this->assertInstanceOf(\stdClass::class, $foo);
+        $this->assertFalse(property_exists($foo, 'bar'));
     }
 
     /**

From 7dc3460497f7f1952e16f51504e2fd492dd2c4e1 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 16 Feb 2023 09:46:14 +0100
Subject: [PATCH 205/475] Fix merge

---
 .../Tests/BandwidthTransportTest.php          | 18 ++++++++---------
 .../Isendpro/Tests/IsendproTransportTest.php  | 16 +++++++--------
 .../Tests/LineNotifyTransportTest.php         | 16 +++++++--------
 .../Tests/PagerDutyTransportTest.php          | 17 ++++++++--------
 .../Bridge/Plivo/Tests/PlivoTransportTest.php | 18 ++++++++---------
 .../Tests/RingCentralTransportTest.php        | 20 +++++++++----------
 .../Termii/Tests/TermiiTransportTest.php      | 19 +++++++++---------
 .../Twilio/Tests/TwilioTransportTest.php      |  2 +-
 8 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportTest.php
index 23533452ff695..33add325280f3 100644
--- a/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportTest.php
@@ -15,17 +15,17 @@
 use Symfony\Component\Notifier\Bridge\Bandwidth\BandwidthTransport;
 use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Message\ChatMessage;
-use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Component\Notifier\Tests\Transport\DummyMessage;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 final class BandwidthTransportTest extends TransportTestCase
 {
-    public function createTransport(HttpClientInterface $client = null, string $from = 'from'): BandwidthTransport
+    public static function createTransport(HttpClientInterface $client = null, string $from = 'from'): BandwidthTransport
     {
-        return new BandwidthTransport('username', 'password', $from, 'account_id', 'application_id', 'priority', $client ?? $this->createMock(HttpClientInterface::class));
+        return new BandwidthTransport('username', 'password', $from, 'account_id', 'application_id', 'priority', $client ?? new MockHttpClient());
     }
 
     public function invalidFromProvider(): iterable
@@ -34,7 +34,7 @@ public function invalidFromProvider(): iterable
         yield 'phone number too short' => ['+1'];
     }
 
-    public function supportedMessagesProvider(): iterable
+    public static function supportedMessagesProvider(): iterable
     {
         yield [new SmsMessage('0611223344', 'Hello!')];
     }
@@ -72,18 +72,18 @@ public function testNoInvalidArgumentExceptionIsThrownIfFromIsValid(string $from
         self::assertSame('foo', $sentMessage->getMessageId());
     }
 
-    public function toStringProvider(): iterable
+    public static function toStringProvider(): iterable
     {
-        yield ['bandwidth://messaging.bandwidth.com?from=from&account_id=account_id&application_id=application_id&priority=priority', $this->createTransport()];
+        yield ['bandwidth://messaging.bandwidth.com?from=from&account_id=account_id&application_id=application_id&priority=priority', self::createTransport()];
     }
 
-    public function unsupportedMessagesProvider(): iterable
+    public static function unsupportedMessagesProvider(): iterable
     {
         yield [new ChatMessage('Hello!')];
-        yield [$this->createMock(MessageInterface::class)];
+        yield [new DummyMessage()];
     }
 
-    public function validFromProvider(): iterable
+    public static function validFromProvider(): iterable
     {
         yield ['+11'];
         yield ['+112'];
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportTest.php
index 990b740f7d92f..63f5663b032c8 100644
--- a/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportTest.php
@@ -15,33 +15,33 @@
 use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransport;
 use Symfony\Component\Notifier\Exception\TransportException;
 use Symfony\Component\Notifier\Message\ChatMessage;
-use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Component\Notifier\Tests\Transport\DummyMessage;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 final class IsendproTransportTest extends TransportTestCase
 {
-    public function createTransport(HttpClientInterface $client = null): IsendproTransport
+    public static function createTransport(HttpClientInterface $client = null): IsendproTransport
     {
-        return (new IsendproTransport('accound_key_id', null, false, false, $client ?? $this->createMock(HttpClientInterface::class)))->setHost('host.test');
+        return (new IsendproTransport('accound_key_id', null, false, false, $client ?? new MockHttpClient()))->setHost('host.test');
     }
 
-    public function toStringProvider(): iterable
+    public static function toStringProvider(): iterable
     {
-        yield ['isendpro://host.test?no_stop=0&sandbox=0', $this->createTransport()];
+        yield ['isendpro://host.test?no_stop=0&sandbox=0', self::createTransport()];
     }
 
-    public function supportedMessagesProvider(): iterable
+    public static function supportedMessagesProvider(): iterable
     {
         yield [new SmsMessage('0611223344', 'Hello!')];
     }
 
-    public function unsupportedMessagesProvider(): iterable
+    public static function unsupportedMessagesProvider(): iterable
     {
         yield [new ChatMessage('Hello!')];
-        yield [$this->createMock(MessageInterface::class)];
+        yield [new DummyMessage()];
     }
 
     public function testSendWithErrorResponseThrowsTransportException()
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php
index 063ff8caec787..07cb5ad0136e4 100644
--- a/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportTest.php
@@ -15,9 +15,9 @@
 use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransport;
 use Symfony\Component\Notifier\Exception\TransportException;
 use Symfony\Component\Notifier\Message\ChatMessage;
-use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Component\Notifier\Tests\Transport\DummyMessage;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
@@ -26,25 +26,25 @@
  */
 final class LineNotifyTransportTest extends TransportTestCase
 {
-    public function createTransport(HttpClientInterface $client = null): LineNotifyTransport
+    public static function createTransport(HttpClientInterface $client = null): LineNotifyTransport
     {
-        return (new LineNotifyTransport('testToken', $client ?? $this->createMock(HttpClientInterface::class)))->setHost('host.test');
+        return (new LineNotifyTransport('testToken', $client ?? new MockHttpClient()))->setHost('host.test');
     }
 
-    public function toStringProvider(): iterable
+    public static function toStringProvider(): iterable
     {
-        yield ['linenotify://host.test', $this->createTransport()];
+        yield ['linenotify://host.test', self::createTransport()];
     }
 
-    public function supportedMessagesProvider(): iterable
+    public static function supportedMessagesProvider(): iterable
     {
         yield [new ChatMessage('Hello!')];
     }
 
-    public function unsupportedMessagesProvider(): iterable
+    public static function unsupportedMessagesProvider(): iterable
     {
         yield [new SmsMessage('0611223344', 'Hello!')];
-        yield [$this->createMock(MessageInterface::class)];
+        yield [new DummyMessage];
     }
 
     public function testSendWithErrorResponseThrows()
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportTest.php b/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportTest.php
index d03f32de0ff5f..da3b55d5df0a7 100644
--- a/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportTest.php
@@ -11,38 +11,39 @@
 
 namespace Symfony\Component\Notifier\Bridge\PagerDuty\Tests;
 
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyOptions;
 use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransport;
 use Symfony\Component\Notifier\Message\ChatMessage;
-use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\PushMessage;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Component\Notifier\Tests\Transport\DummyMessage;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 final class PagerDutyTransportTest extends TransportTestCase
 {
-    public function createTransport(HttpClientInterface $client = null): PagerDutyTransport
+    public static function createTransport(HttpClientInterface $client = null): PagerDutyTransport
     {
-        return (new PagerDutyTransport('testToken', $client ?? $this->createMock(HttpClientInterface::class)))->setHost('test.pagerduty.com');
+        return (new PagerDutyTransport('testToken', $client ?? new MockHttpClient()))->setHost('test.pagerduty.com');
     }
 
-    public function toStringProvider(): iterable
+    public static function toStringProvider(): iterable
     {
-        yield ['pagerduty://test.pagerduty.com', $this->createTransport()];
+        yield ['pagerduty://test.pagerduty.com', self::createTransport()];
     }
 
-    public function supportedMessagesProvider(): iterable
+    public static function supportedMessagesProvider(): iterable
     {
         yield [new PushMessage('Source', 'Summary')];
         yield [new PushMessage('Source', 'Summary', new PagerDutyOptions('e93facc04764012d7bfb002500d5d1a6', 'trigger', 'info'))];
         yield [new PushMessage('Source', 'Summary', new PagerDutyOptions('e93facc04764012d7bfb002500d5d1a6', 'acknowledge', 'info', ['dedup_key' => 'srv01/test']))];
     }
 
-    public function unsupportedMessagesProvider(): iterable
+    public static function unsupportedMessagesProvider(): iterable
     {
         yield [new SmsMessage('0611223344', 'Hello!')];
         yield [new ChatMessage('Hello!')];
-        yield [$this->createMock(MessageInterface::class)];
+        yield [new DummyMessage()];
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportTest.php
index 9dec4768842de..57d9635ad80d6 100644
--- a/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportTest.php
@@ -15,17 +15,17 @@
 use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransport;
 use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Message\ChatMessage;
-use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Component\Notifier\Tests\Transport\DummyMessage;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 final class PlivoTransportTest extends TransportTestCase
 {
-    public function createTransport(HttpClientInterface $client = null, string $from = 'from'): PlivoTransport
+    public static function createTransport(HttpClientInterface $client = null, string $from = 'from'): PlivoTransport
     {
-        return new PlivoTransport('authId', 'authToken', $from, $client ?? $this->createMock(HttpClientInterface::class));
+        return new PlivoTransport('authId', 'authToken', $from, $client ?? new MockHttpClient());
     }
 
     public function invalidFromProvider(): iterable
@@ -36,7 +36,7 @@ public function invalidFromProvider(): iterable
         yield 'phone number too short' => ['+1'];
     }
 
-    public function supportedMessagesProvider(): iterable
+    public static function supportedMessagesProvider(): iterable
     {
         yield [new SmsMessage('0611223344', 'Hello!')];
     }
@@ -76,18 +76,18 @@ public function testNoInvalidArgumentExceptionIsThrownIfFromIsValid(string $from
         self::assertSame('foo', $sentMessage->getMessageId());
     }
 
-    public function toStringProvider(): iterable
+    public static function toStringProvider(): iterable
     {
-        yield ['plivo://api.plivo.com?from=from', $this->createTransport()];
+        yield ['plivo://api.plivo.com?from=from', self::createTransport()];
     }
 
-    public function unsupportedMessagesProvider(): iterable
+    public static function unsupportedMessagesProvider(): iterable
     {
         yield [new ChatMessage('Hello!')];
-        yield [$this->createMock(MessageInterface::class)];
+        yield [new DummyMessage()];
     }
 
-    public function validFromProvider(): iterable
+    public static function validFromProvider(): iterable
     {
         yield ['ab'];
         yield ['abc'];
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportTest.php b/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportTest.php
in
10000
dex 0dbc4d8c1a7ee..419928468cbbc 100644
--- a/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportTest.php
@@ -15,26 +15,26 @@
 use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransport;
 use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Message\ChatMessage;
-use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Component\Notifier\Tests\Transport\DummyMessage;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 final class RingCentralTransportTest extends TransportTestCase
 {
-    public function createTransport(HttpClientInterface $client = null, string $from = 'from'): RingCentralTransport
+    public static function createTransport(HttpClientInterface $client = null, string $from = 'from'): RingCentralTransport
     {
-        return new RingCentralTransport('apiToken', $from, $client ?? $this->createMock(HttpClientInterface::class));
+        return new RingCentralTransport('apiToken', $from, $client ?? new MockHttpClient());
     }
 
-    public function invalidFromProvider(): iterable
+    public static function invalidFromProvider(): iterable
     {
         yield 'no zero at start if phone number' => ['+0'];
         yield 'phone number too short' => ['+1'];
     }
 
-    public function supportedMessagesProvider(): iterable
+    public static function supportedMessagesProvider(): iterable
     {
         yield [new SmsMessage('0611223344', 'Hello!')];
     }
@@ -74,18 +74,18 @@ public function testNoInvalidArgumentExceptionIsThrownIfFromIsValid(string $from
         self::assertSame('foo', $sentMessage->getMessageId());
     }
 
-    public function toStringProvider(): iterable
+    public static function toStringProvider(): iterable
     {
-        yield ['ringcentral://platform.ringcentral.com?from=from', $this->createTransport()];
+        yield ['ringcentral://platform.ringcentral.com?from=from', self::createTransport()];
     }
 
-    public function unsupportedMessagesProvider(): iterable
+    public static function unsupportedMessagesProvider(): iterable
     {
         yield [new ChatMessage('Hello!')];
-        yield [$this->createMock(MessageInterface::class)];
+        yield [new DummyMessage()];
     }
 
-    public function validFromProvider(): iterable
+    public static function validFromProvider(): iterable
     {
         yield ['+11'];
         yield ['+112'];
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportTest.php
index 8d140f6637de7..9d89a6c8d45db 100644
--- a/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportTest.php
@@ -18,17 +18,18 @@
 use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Component\Notifier\Tests\Transport\DummyMessage;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 final class TermiiTransportTest extends TransportTestCase
 {
-    public function createTransport(HttpClientInterface $client = null, string $from = 'from'): TermiiTransport
+    public static function createTransport(HttpClientInterface $client = null, string $from = 'from'): TermiiTransport
     {
-        return new TermiiTransport('apiKey', $from, 'generic', $client ?? $this->createMock(HttpClientInterface::class));
+        return new TermiiTransport('apiKey', $from, 'generic', $client ?? new MockHttpClient());
     }
 
-    public function invalidFromProvider(): iterable
+    public static function invalidFromProvider(): iterable
     {
         yield 'too short' => ['aa'];
         yield 'too long' => ['abcdefghijkl'];
@@ -36,7 +37,7 @@ public function invalidFromProvider(): iterable
         yield 'phone number too short' => ['+1'];
     }
 
-    public function supportedMessagesProvider(): iterable
+    public static function supportedMessagesProvider(): iterable
     {
         yield [new SmsMessage('0611223344', 'Hello!')];
     }
@@ -76,18 +77,18 @@ public function testNoInvalidArgumentExceptionIsThrownIfFromIsValid(string $from
         self::assertSame('foo', $sentMessage->getMessageId());
     }
 
-    public function toStringProvider(): iterable
+    public static function toStringProvider(): iterable
     {
-        yield ['termii://api.ng.termii.com?from=from&channel=generic', $this->createTransport()];
+        yield ['termii://api.ng.termii.com?from=from&channel=generic', self::createTransport()];
     }
 
-    public function unsupportedMessagesProvider(): iterable
+    public static function unsupportedMessagesProvider(): iterable
     {
         yield [new ChatMessage('Hello!')];
-        yield [$this->createMock(MessageInterface::class)];
+        yield [new DummyMessage()];
     }
 
-    public function validFromProvider(): iterable
+    public static function validFromProvider(): iterable
     {
         yield ['abc'];
         yield ['abcd'];
diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportTest.php
index 61ac35ae91502..f34cd46a62c90 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportTest.php
@@ -114,7 +114,7 @@ public function testNoInvalidArgumentExceptionIsThrownIfFromIsValid(string $from
         $this->assertSame('123', $sentMessage->getMessageId());
     }
 
-    public function validFromProvider(): iterable
+    public static function validFromProvider(): iterable
     {
         // alphanumeric sender ids
         yield ['ab'];

From 77c8a60b7c3b25271afc4618008e21056479c7e6 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Wed, 15 Feb 2023 00:58:54 +0100
Subject: [PATCH 206/475] Add missing return types to interfaces

---
 .github/expected-missing-return-types.diff    | 1056 ++++++++++-------
 .../Tests/Fixtures/ContainerAwareFixture.php  |    6 +-
 .../AboutCommand/Fixture/TestAppKernel.php    |    4 +-
 .../Fixture/TestAppKernel.php                 |    4 +-
 .../Controller/ControllerResolverTest.php     |    8 +-
 .../FrameworkExtensionTestCase.php            |    2 +-
 .../DefaultConfigTestExtension.php            |    2 +-
 .../ExtensionWithoutConfigTestExtension.php   |    2 +-
 .../AnnotationReaderPass.php                  |    2 +-
 .../DependencyInjection/TestExtension.php     |    6 +-
 .../Bundle/TestBundle/TestBundle.php          |    2 +-
 .../Tests/Functional/app/AppKernel.php        |    6 +-
 .../Factory/AuthenticatorFactoryInterface.php |    3 +
 .../UserProviderFactoryInterface.php          |    9 +
 .../DependencyInjection/SecurityExtension.php |   25 +-
 .../Fixtures/UserProvider/DummyProvider.php   |    6 +-
 .../SecurityExtensionTest.php                 |    2 +-
 .../AuthenticatorBundle.php                   |    2 +-
 .../Form/UserLoginType.php                    |   12 +-
 .../FirewallEntryPointExtension.php           |    2 +-
 .../FormLoginExtension.php                    |    2 +-
 .../FormLoginBundle/FormLoginBundle.php       |    2 +-
 .../Tests/Functional/Bundle/TestBundle.php    |    2 +-
 .../Controller/ProfilerControllerTest.php     |    5 +-
 .../Functional/WebProfilerBundleKernel.php    |    2 +-
 .../Component/Config/ConfigCacheInterface.php |    2 +
 .../Builder/BuilderAwareInterface.php         |    2 +
 .../Definition/PrototypeNodeInterface.php     |    2 +
 .../Config/Loader/LoaderInterface.php         |    2 +
 .../Descriptor/DescriptorInterface.php        |    3 +
 .../Formatter/OutputFormatterInterface.php    |    4 +
 .../OutputFormatterStyleInterface.php         |   10 +
 .../Console/Helper/HelperInterface.php        |    2 +
 .../Console/Input/InputAwareInterface.php     |    2 +
 .../Console/Input/InputInterface.php          |   10 +
 .../Input/StreamableInputInterface.php        |    2 +
 .../Console/Output/ConsoleOutputInterface.php |    3 +
 .../Console/Output/OutputInterface.php        |    9 +
 .../Console/Style/StyleInterface.php          |   28 +
 .../Argument/ArgumentInterface.php            |    3 +
 .../Compiler/CompilerPassInterface.php        |    2 +
 .../ContainerAwareInterface.php               |    2 +
 .../ContainerInterface.php                    |    6 +
 .../Extension/ExtensionInterface.php          |    2 +
 .../Extension/PrependExtensionInterface.php   |    2 +
 .../ParameterBag/ContainerBagInterface.php    |    2 +
 .../ParameterBag/ParameterBagInterface.php    |   12 +
 .../Compiler/ExtensionCompilerPassTest.php    |    9 +-
 .../MergeExtensionConfigurationPassTest.php   |    8 +-
 .../ValidateEnvPlaceholdersPassTest.php       |    2 +-
 .../Tests/ContainerBuilderTest.php            |   13 +-
 .../Tests/Dumper/PhpDumperTest.php            |    2 +-
 .../Tests/Extension/ExtensionTest.php         |    2 +-
 .../InvalidConfig/InvalidConfigExtension.php  |    2 +-
 .../SemiValidConfigExtension.php              |    2 +-
 .../ValidConfig/ValidConfigExtension.php      |    2 +-
 .../Tests/Fixtures/includes/AcmeExtension.php |    4 +-
 .../Fixtures/includes/ProjectExtension.php    |    4 +-
 .../Debug/TraceableEventDispatcher.php        |   10 +-
 .../EventDispatcherInterface.php              |    9 +
 .../ImmutableEventDispatcher.php              |   12 +
 .../Component/Form/FormTypeInterface.php      |    8 +
 .../Form/Tests/Command/DebugCommandTest.php   |    2 +-
 .../Descriptor/AbstractDescriptorTestCase.php |    2 +-
 .../Csrf/Type/FormTypeCsrfExtensionTest.php   |    2 +-
 .../FormValidatorFunctionalTest.php           |   18 +-
 .../Tests/Fixtures/AlternatingRowType.php     |    2 +-
 .../Form/Tests/Fixtures/AuthorType.php        |    4 +-
 .../Fixtures/BlockPrefixedFooTextType.php     |    2 +-
 .../Form/Tests/Fixtures/ChoiceSubType.php     |    2 +-
 .../Tests/Fixtures/ChoiceTypeExtension.php    |    2 +-
 .../Tests/Fixtures/FooTypeBarExtension.php    |    4 +-
 .../Tests/Fixtures/FooTypeBazExtension.php    |    2 +-
 .../Fixtures/LazyChoiceTypeExtension.php      |    2 +-
 .../Form/Tests/Fixtures/NotMappedType.php     |    2 +-
 .../HttpKernel/Bundle/BundleInterface.php     |    6 +
 .../MergeExtensionConfigurationPassTest.php   |    4 +-
 .../DataCollector/CloneVarDataCollector.php   |   20 +-
 .../ExtensionPresentExtension.php             |    2 +-
 .../Tests/Fixtures/KernelForTest.php          |   13 +-
 .../Tests/Fixtures/KernelWithoutBundles.php   |    4 +-
 .../Component/HttpKernel/Tests/KernelTest.php |   21 +-
 .../Service/ServiceSubscriberTraitTest.php    |    5 +-
 83 files changed, 950 insertions(+), 546 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index b6acfc677e7ee..cefa227ab81de 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -106,6 +106,17 @@ index 83bfffaf27..acbd7e4bc7 100644
 +    public function process(ContainerBuilder $container): void
      {
          $this->updateValidatorMappingFiles($container, 'xml', 'xml');
+diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
+index bf68ec0dcc..509e5f1b0c 100644
+--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
++++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
+@@ -54,5 +54,5 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
+     }
+ 
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if (!$container->hasParameter($this->connectionsParameter)) {
 diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
 index 1a3f227c6d..daf6634922 100644
 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
@@ -740,50 +751,6 @@ index bb5560a7b5..be86cbf98e 100644
 +    protected static function getContainer(): Container
      {
          if (!static::$booted) {
-diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php
-index cc55da770e..112dfbba06 100644
---- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php
-+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php
-@@ -40,5 +40,5 @@ class TestAppKernel extends Kernel
-     }
- 
--    protected function build(ContainerBuilder $container)
-+    protected function build(ContainerBuilder $container): void
-     {
-     }
-diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
-index 678d573586..98ba21fd98 100644
---- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
-+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
-@@ -37,5 +37,5 @@ class TestAppKernel extends Kernel
-     }
- 
--    protected function build(ContainerBuilder $container)
-+    protected function build(ContainerBuilder $container): void
-     {
-         $container->register('logger', NullLogger::class);
-diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
-index 13c368fd58..bde1279ad1 100644
---- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
-+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
-@@ -22,5 +22,5 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
- class TestBundle extends Bundle
- {
--    public function build(ContainerBuilder $container)
-+    public function build(ContainerBuilder $container): void
-     {
-         parent::build($container);
-diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
-index b182e902d7..399403155f 100644
---- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
-+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
-@@ -79,5 +79,5 @@ class AppKernel extends Kernel implements ExtensionInterface, ConfigurationInter
-     }
- 
--    protected function build(ContainerBuilder $container)
-+    protected function build(ContainerBuilder $container): void
-     {
-         $container->register('logger', NullLogger::class);
 diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
 index dac3b6394f..d319cb0824 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -925,6 +892,17 @@ index 24eb1377c5..6367585643 100644
 +    protected function getFailureHandlerId(string $id): string
      {
          return 'security.authentication.failure_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());
+diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php
+index 764e7d35c3..20442e08a0 100644
+--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php
++++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php
+@@ -34,5 +34,5 @@ interface AuthenticatorFactoryInterface
+      * @return void
+      */
+-    public function addConfiguration(NodeDefinition $builder);
++    public function addConfiguration(NodeDefinition $builder): void;
+ 
+     /**
 diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
 index 936f58a084..1a3c89381b 100644
 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php
@@ -975,6 +953,46 @@ index 2f4dca01d1..ca99ad286f 100644
 +    public function addConfiguration(NodeDefinition $node): void
      {
          $node
+diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/UserProviderFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/UserProviderFactoryInterface.php
+index a2c5815e4b..1c9721ccc6 100644
+--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/UserProviderFactoryInterface.php
++++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/UserProviderFactoryInterface.php
+@@ -26,14 +26,14 @@ interface UserProviderFactoryInterface
+      * @return void
+      */
+-    public function create(ContainerBuilder $container, string $id, array $config);
++    public function create(ContainerBuilder $container, string $id, array $config): void;
+ 
+     /**
+      * @return string
+      */
+-    public function getKey();
++    public function getKey(): string;
+ 
+     /**
+      * @return void
+      */
+-    public function addConfiguration(NodeDefinition $builder);
++    public function addConfiguration(NodeDefinition $builder): void;
+ }
+diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+index 8fb375255c..610be84431 100644
+--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
++++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+@@ -82,5 +82,5 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
+      * @return void
+      */
+-    public function prepend(ContainerBuilder $container)
++    public function prepend(ContainerBuilder $container): void
+     {
+         foreach ($this->getSortedFactories() as $factory) {
+@@ -94,5 +94,5 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
+      * @return void
+      */
+-    public function load(array $configs, ContainerBuilder $container)
++    public function load(array $configs, ContainerBuilder $container): void
+     {
+         if (!array_filter($configs)) {
 diff --git a/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php b/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php
 index 0c703f79cf..7d9e956580 100644
 --- a/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php
@@ -1029,57 +1047,6 @@ index bf30dafbee..47fe692328 100644
 +    public function build(ContainerBuilder $container): void
      {
          parent::build($container);
-diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php
-index 730974f17f..6d0f01391a 100644
---- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php
-+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php
-@@ -18,5 +18,5 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
- class AuthenticatorBundle extends Bundle
- {
--    public function build(ContainerBuilder $container)
-+    public function build(ContainerBuilder $container): void
-     {
-         parent::build($container);
-diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
-index 80adb49a88..6dd128c59e 100644
---- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
-+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
-@@ -40,5 +40,5 @@ class UserLoginType extends AbstractType
-     }
- 
--    public function buildForm(FormBuilderInterface $builder, array $options)
-+    public function buildForm(FormBuilderInterface $builder, array $options): void
-     {
-         $builder
-@@ -72,5 +72,5 @@ class UserLoginType extends AbstractType
-     }
- 
--    public function configureOptions(OptionsResolver $resolver)
-+    public function configureOptions(OptionsResolver $resolver): void
-     {
-         /* Note: the form's csrf_token_id must correspond to that for the form login
-diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php
-index 62490a739b..76ac78c3c4 100644
---- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php
-+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php
-@@ -19,5 +19,5 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
- class FormLoginBundle extends Bundle
- {
--    public function build(ContainerBuilder $container)
-+    public function build(ContainerBuilder $container): void
-     {
-         parent::build($container);
-diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php
-index 8336dce245..8652dc73b4 100644
---- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php
-+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php
-@@ -19,5 +19,5 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
- class TestBundle extends Bundle
- {
--    public function build(ContainerBuilder $container)
-+    public function build(ContainerBuilder $container): void
-     {
-         $container->setParameter('container.build_hash', 'test_bundle');
 diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
 index 5c3cff66fc..6c867b1e76 100644
 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -1175,28 +1142,6 @@ index 16e6db29ee..1420b29c99 100644
 +    public function load(array $configs, ContainerBuilder $container): void
      {
          $configuration = $this->getConfiguration($configs, $container);
-diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
-index 3b379f59d4..7bf45f08c2 100644
---- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
-+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
-@@ -447,5 +447,5 @@ class ProfilerControllerTest extends WebTestCase
-      * @return MockObject&DumpDataCollector
-      */
--    private function createDumpDataCollector(): MockObject
-+    private function createDumpDataCollector(): MockObject&DumpDataCollector
-     {
-         $dumpDataCollector = $this->createMock(DumpDataCollector::class);
-diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php
-index d194b2fd83..78395c4b75 100644
---- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php
-+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php
-@@ -77,5 +77,5 @@ class WebProfilerBundleKernel extends Kernel
-     }
- 
--    protected function build(ContainerBuilder $container)
-+    protected function build(ContainerBuilder $container): void
-     {
-         $container->register('data_collector.dump', DumpDataCollector::class);
 diff --git a/src/Symfony/Bundle/WebProfilerBundle/WebProfilerBundle.php b/src/Symfony/Bundle/WebProfilerBundle/WebProfilerBundle.php
 index 264b26c925..2dbc40c735 100644
 --- a/src/Symfony/Bundle/WebProfilerBundle/WebProfilerBundle.php
@@ -1405,10 +1350,10 @@ index 07ef47f5eb..ea659c2fb4 100644
      {
          foreach ($this->adapters as $adapter) {
 diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
-index dc25a395a3..a56e1b74ce 100644
+index d447e9f2fd..1f99e0725e 100644
 --- a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
 +++ b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
-@@ -78,5 +78,5 @@ class MemcachedAdapter extends AbstractAdapter
+@@ -71,5 +71,5 @@ class MemcachedAdapter extends AbstractAdapter
       * @return bool
       */
 -    public static function isSupported()
@@ -1509,6 +1454,17 @@ index 6793bea94c..230575ef42 100644
 +    public function process(ContainerBuilder $container): void
      {
          $container->getParameterBag()->remove('cache.prefix.seed');
+diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
+index 3a9d4f23db..8e9253824d 100644
+--- a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
++++ b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
+@@ -30,5 +30,5 @@ use Symfony\Component\DependencyInjection\Reference;
+ class CachePoolPass implements CompilerPassInterface
+ {
+-    public function process(ContainerBuilder $container)
++    public function process(ContainerBuilder $container): void
+     {
+         if ($container->hasParameter('cache.prefix.seed')) {
 diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPrunerPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPrunerPass.php
 index 00e912686b..58872ec2bc 100644
 --- a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPrunerPass.php
@@ -1531,6 +1487,16 @@ index 2ee96e9b37..f49ed24f68 100644
 +    protected function doUnlink(string $file): bool
      {
          return @unlink($file);
+diff --git a/src/Symfony/Component/Config/ConfigCacheInterface.php b/src/Symfony/Component/Config/ConfigCacheInterface.php
+index be7f0986c3..fa5347e34b 100644
+--- a/src/Symfony/Component/Config/ConfigCacheInterface.php
++++ b/src/Symfony/Component/Config/ConfigCacheInterface.php
+@@ -44,4 +44,4 @@ interface ConfigCacheInterface
+      * @throws \RuntimeException When the cache file cannot be written
+      */
+-    public function write(string $content, array $metadata = null);
++    public function write(string $content, array $metadata = null): void;
+ }
 diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
 index 0f0f18a915..d9b4460b66 100644
 --- a/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -1729,6 +1695,16 @@ index f24271b80f..ce219e95b9 100644
 +    protected function validatePrototypeNode(PrototypedArrayNode $node): void
      {
          $path = $node->getPath();
+diff --git a/src/Symfony/Component/Config/Definition/Builder/BuilderAwareInterface.php b/src/Symfony/Component/Config/Definition/Builder/BuilderAwareInterface.php
+index bb40307e17..998fb85b27 100644
+--- a/src/Symfony/Component/Config/Definition/Builder/BuilderAwareInterface.php
++++ b/src/Symfony/Component/Config/Definition/Builder/BuilderAwareInterface.php
+@@ -24,4 +24,4 @@ interface BuilderAwareInterface
+      * @return void
+      */
+-    public function setBuilder(NodeBuilder $builder);
++    public function setBuilder(NodeBuilder $builder): void;
+ }
 diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
 index 7cda0bc7d8..b2311826f4 100644
 --- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
@@ -1862,6 +1838,16 @@ index 4a3e3253ce..09957cd846 100644
 +    protected function validateType(mixed $value): void
      {
          if (!\is_int($value)) {
+diff --git a/src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php b/src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php
+index 9dce7444b0..46ab38e3ff 100644
+--- a/src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php
++++ b/src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php
+@@ -24,4 +24,4 @@ interface PrototypeNodeInterface extends NodeInterface
+      * @return void
+      */
+-    public function setName(string $name);
++    public function setName(string $name): void;
+ }
 diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
 index 11910fb338..58489913ce 100644
 --- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
@@ -2024,7 +2010,7 @@ index 36e85ad346..bb6d9ca2fe 100644
      {
          return $this->resolve($resource, $type)->load($resource, $type);
 diff --git a/src/Symfony/Component/Config/Loader/LoaderInterface.php b/src/Symfony/Component/Config/Loader/LoaderInterface.php
-index b94a4378f5..db502e12a7 100644
+index 4e0746d4d6..c080bd63a9 100644
 --- a/src/Symfony/Component/Config/Loader/LoaderInterface.php
 +++ b/src/Symfony/Component/Config/Loader/LoaderInterface.php
 @@ -26,5 +26,5 @@ interface LoaderInterface
@@ -2048,6 +2034,12 @@ index b94a4378f5..db502e12a7 100644
 +    public function getResolver(): LoaderResolverInterface;
  
      /**
+@@ -49,4 +49,4 @@ interface LoaderInterface
+      * @return void
+      */
+-    public function setResolver(LoaderResolverInterface $resolver);
++    public function setResolver(LoaderResolverInterface $resolver): void;
+ }
 diff --git a/src/Symfony/Component/Config/Loader/LoaderResolver.php b/src/Symfony/Component/Config/Loader/LoaderResolver.php
 index 670e320122..134e4069e7 100644
 --- a/src/Symfony/Component/Config/Loader/LoaderResolver.php
@@ -2335,6 +2327,16 @@ index 27705ddb63..1b25473f75 100644
 +    public function process(ContainerBuilder $container): void
      {
          $commandServices = $container->findTaggedServiceIds('console.command', true);
+diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
+index ab468a2562..e20f80d56b 100644
+--- a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
++++ b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
+@@ -24,4 +24,4 @@ interface DescriptorInterface
+      * @return void
+      */
+-    public function describe(OutputInterface $output, object $object, array $options = []);
++    public function describe(OutputInterface $output, object $object, array $options = []): void;
+ }
 diff --git a/src/Symfony/Component/Console/EventListener/ErrorListener.php b/src/Symfony/Component/Console/EventListener/ErrorListener.php
 index 9925a5f746..e72fb5fc89 100644
 --- a/src/Symfony/Component/Console/EventListener/ErrorListener.php
@@ -2378,6 +2380,24 @@ index 88519f725d..8d728257fe 100644
 +    public function formatAndWrap(?string $message, int $width): string
      {
          if (null === $message) {
+diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php b/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php
+index 433cd41978..02187a7ffc 100644
+--- a/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php
++++ b/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php
+@@ -24,5 +24,5 @@ interface OutputFormatterInterface
+      * @return void
+      */
+-    public function setDecorated(bool $decorated);
++    public function setDecorated(bool $decorated): void;
+ 
+     /**
+@@ -36,5 +36,5 @@ interface OutputFormatterInterface
+      * @return void
+      */
+-    public function setStyle(string $name, OutputFormatterStyleInterface $style);
++    public function setStyle(string $name, OutputFormatterStyleInterface $style): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
 index 9f1601d16d..68bfe5e98b 100644
 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
@@ -2417,6 +2437,45 @@ index 9f1601d16d..68bfe5e98b 100644
 +    public function setOptions(array $options): void
      {
          $this->color = new Color($this->foreground, $this->background, $this->options = $options);
+diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php
+index 3b15098cbe..3f850e129b 100644
+--- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php
++++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php
+@@ -24,5 +24,5 @@ interface OutputFormatterStyleInterface
+      * @return void
+      */
+-    public function setForeground(?string $color);
++    public function setForeground(?string $color): void;
+ 
+     /**
+@@ -31,5 +31,5 @@ interface OutputFormatterStyleInterface
+      * @return void
+      */
+-    public function setBackground(?string $color);
++    public function setBackground(?string $color): void;
+ 
+     /**
+@@ -38,5 +38,5 @@ interface OutputFormatterStyleInterface
+      * @return void
+      */
+-    public function setOption(string $option);
++    public function setOption(string $option): void;
+ 
+     /**
+@@ -45,5 +45,5 @@ interface OutputFormatterStyleInterface
+      * @return void
+      */
+-    public function unsetOption(string $option);
++    public function unsetOption(string $option): void;
+ 
+     /**
+@@ -52,5 +52,5 @@ interface OutputFormatterStyleInterface
+      * @return void
+      */
+-    public function setOptions(array $options);
++    public function setOptions(array $options): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
 index f98c2eff7c..5d9c2c246f 100644
 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
@@ -2482,10 +2541,17 @@ index 51fd11b260..3acfc88c9a 100644
      {
          $isDecorated = $formatter->isDecorated();
 diff --git a/src/Symfony/Component/Console/Helper/HelperInterface.php b/src/Symfony/Component/Console/Helper/HelperInterface.php
-index 2762cdf05c..737334268a 100644
+index ab626c9385..d9d069d3e5 100644
 --- a/src/Symfony/Component/Console/Helper/HelperInterface.php
 +++ b/src/Symfony/Component/Console/Helper/HelperInterface.php
-@@ -34,4 +34,4 @@ interface HelperInterface
+@@ -24,5 +24,5 @@ interface HelperInterface
+      * @return void
+      */
+-    public function setHelperSet(?HelperSet $helperSet);
++    public function setHelperSet(?HelperSet $helperSet): void;
+ 
+     /**
+@@ -36,4 +36,4 @@ interface HelperInterface
       * @return string
       */
 -    public function getName();
@@ -2692,6 +2758,16 @@ index ff8e9276fd..0be143da1b 100644
 +    public function setDefault(string|bool|int|float|array $default = null): void
      {
          if (1 > \func_num_args()) {
+diff --git a/src/Symfony/Component/Console/Input/InputAwareInterface.php b/src/Symfony/Component/Console/Input/InputAwareInterface.php
+index 0ad27b4558..f5e544930e 100644
+--- a/src/Symfony/Component/Console/Input/InputAwareInterface.php
++++ b/src/Symfony/Component/Console/Input/InputAwareInterface.php
+@@ -25,4 +25,4 @@ interface InputAwareInterface
+      * @return void
+      */
+-    public function setInput(InputInterface $input);
++    public function setInput(InputInterface $input): void;
+ }
 diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
 index 0ee85b4990..0de1fc4193 100644
 --- a/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -2746,7 +2822,7 @@ index 0ee85b4990..0de1fc4193 100644
      {
          if (isset($this->options[$option->getName()]) && !$option->equals($this->options[$option->getName()])) {
 diff --git a/src/Symfony/Component/Console/Input/InputInterface.php b/src/Symfony/Component/Console/Input/InputInterface.php
-index 3af991a76f..742e2508f3 100644
+index aaed5fd01d..e7de9bcdec 100644
 --- a/src/Symfony/Component/Console/Input/InputInterface.php
 +++ b/src/Symfony/Component/Console/Input/InputInterface.php
 @@ -57,5 +57,5 @@ interface InputInterface
@@ -2756,20 +2832,54 @@ index 3af991a76f..742e2508f3 100644
 +    public function getParameterOption(string|array $values, string|bool|int|float|array|null $default = false, bool $onlyParams = false): mixed;
  
      /**
-@@ -87,5 +87,5 @@ interface InputInterface
+@@ -66,5 +66,5 @@ interface InputInterface
+      * @throws RuntimeException
+      */
+-    public function bind(InputDefinition $definition);
++    public function bind(InputDefinition $definition): void;
+ 
+     /**
+@@ -75,5 +75,5 @@ interface InputInterface
+      * @throws RuntimeException When not enough arguments are given
+      */
+-    public function validate();
++    public function validate(): void;
+ 
+     /**
+@@ -91,5 +91,5 @@ interface InputInterface
       * @throws InvalidArgumentException When argument given doesn't exist
       */
 -    public function getArgument(string $name);
 +    public function getArgument(string $name): mixed;
  
      /**
-@@ -115,5 +115,5 @@ interface InputInterface
+@@ -100,5 +100,5 @@ interface InputInterface
+      * @throws InvalidArgumentException When argument given doesn't exist
+      */
+-    public function setArgument(string $name, mixed $value);
++    public function setArgument(string $name, mixed $value): void;
+ 
+     /**
+@@ -121,5 +121,5 @@ interface InputInterface
       * @throws InvalidArgumentException When option given doesn't exist
       */
 -    public function getOption(string $name);
 +    public function getOption(string $name): mixed;
  
      /**
+@@ -130,5 +130,5 @@ interface InputInterface
+      * @throws InvalidArgumentException When option given doesn't exist
+      */
+-    public function setOption(string $name, mixed $value);
++    public function setOption(string $name, mixed $value): void;
+ 
+     /**
+@@ -147,4 +147,4 @@ interface InputInterface
+      * @return void
+      */
+-    public function setInteractive(bool $interactive);
++    public function setInteractive(bool $interactive): void;
+ }
 diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php
 index 231e6cc616..9ba217a593 100644
 --- a/src/Symfony/Component/Console/Input/InputOption.php
@@ -2781,6 +2891,17 @@ index 231e6cc616..9ba217a593 100644
 +    public function setDefault(string|bool|int|float|array $default = null): void
      {
          if (1 > \func_num_args()) {
+diff --git a/src/Symfony/Component/Console/Input/StreamableInputInterface.php b/src/Symfony/Component/Console/Input/StreamableInputInterface.php
+index 4b95fcb11e..b95fab2601 100644
+--- a/src/Symfony/Component/Console/Input/StreamableInputInterface.php
++++ b/src/Symfony/Component/Console/Input/StreamableInputInterface.php
+@@ -29,5 +29,5 @@ interface StreamableInputInterface extends InputInterface
+      * @return void
+      */
+-    public function setStream($stream);
++    public function setStream($stream): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Console/Output/BufferedOutput.php b/src/Symfony/Component/Console/Output/BufferedOutput.php
 index ef5099bfd6..8fb59d794d 100644
 --- a/src/Symfony/Component/Console/Output/BufferedOutput.php
@@ -2824,6 +2945,17 @@ index c1eb7cd14b..c7fc040bb4 100644
 +    public function setErrorOutput(OutputInterface $error): void
      {
          $this->stderr = $error;
+diff --git a/src/Symfony/Component/Console/Output/ConsoleOutputInterface.php b/src/Symfony/Component/Console/Output/ConsoleOutputInterface.php
+index 9c0049c8f9..6ab9a753d5 100644
+--- a/src/Symfony/Component/Console/Output/ConsoleOutputInterface.php
++++ b/src/Symfony/Component/Console/Output/ConsoleOutputInterface.php
+@@ -28,5 +28,5 @@ interface ConsoleOutputInterface extends OutputInterface
+      * @return void
+      */
+-    public function setErrorOutput(OutputInterface $error);
++    public function setErrorOutput(OutputInterface $error): void;
+ 
+     public function section(): ConsoleSectionOutput;
 diff --git a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
 index 689f39d2f0..d04287e801 100644
 --- a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
@@ -2927,6 +3059,38 @@ index 29761351f9..0a599c6042 100644
 +    public function write(string|iterable $messages, bool $newline = false, int $options = self::OUTPUT_NORMAL): void
      {
          if (!is_iterable($messages)) {
+diff --git a/src/Symfony/Component/Console/Output/OutputInterface.php b/src/Symfony/Component/Console/Output/OutputInterface.php
+index f5ab9182f6..c4b59f487a 100644
+--- a/src/Symfony/Component/Console/Output/OutputInterface.php
++++ b/src/Symfony/Component/Console/Output/OutputInterface.php
+@@ -40,5 +40,5 @@ interface OutputInterface
+      * @return void
+      */
+-    public function write(string|iterable $messages, bool $newline = false, int $options = 0);
++    public function write(string|iterable $messages, bool $newline = false, int $options = 0): void;
+ 
+     /**
+@@ -50,5 +50,5 @@ interface OutputInterface
+      * @return void
+      */
+-    public function writeln(string|iterable $messages, int $options = 0);
++    public function writeln(string|iterable $messages, int $options = 0): void;
+ 
+     /**
+@@ -57,5 +57,5 @@ interface OutputInterface
+      * @return void
+      */
+-    public function setVerbosity(int $level);
++    public function setVerbosity(int $level): void;
+ 
+     /**
+@@ -97,5 +97,5 @@ interface OutputInterface
+      * @return void
+      */
+-    public function setFormatter(OutputFormatterInterface $formatter);
++    public function setFormatter(OutputFormatterInterface $formatter): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
 index 155066ea0e..85e07025bc 100644
 --- a/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -3013,6 +3177,107 @@ index ddfa8decc2..e67453d9fe 100644
 +    protected function getErrorOutput(): OutputInterface
      {
          if (!$this->output instanceof ConsoleOutputInterface) {
+diff --git a/src/Symfony/Component/Console/Style/StyleInterface.php b/src/Symfony/Component/Console/Style/StyleInterface.php
+index e25a65bd24..1d4bb7fe71 100644
+--- a/src/Symfony/Component/Console/Style/StyleInterface.php
++++ b/src/Symfony/Component/Console/Style/StyleInterface.php
+@@ -24,5 +24,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function title(string $message);
++    public function title(string $message): void;
+ 
+     /**
+@@ -31,5 +31,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function section(string $message);
++    public function section(string $message): void;
+ 
+     /**
+@@ -38,5 +38,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function listing(array $elements);
++    public function listing(array $elements): void;
+ 
+     /**
+@@ -45,5 +45,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function text(string|array $message);
++    public function text(string|array $message): void;
+ 
+     /**
+@@ -52,5 +52,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function success(string|array $message);
++    public function success(string|array $message): void;
+ 
+     /**
+@@ -59,5 +59,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function error(string|array $message);
++    public function error(string|array $message): void;
+ 
+     /**
+@@ -66,5 +66,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function warning(string|array $message);
++    public function warning(string|array $message): void;
+ 
+     /**
+@@ -73,5 +73,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function note(string|array $message);
++    public function note(string|array $message): void;
+ 
+     /**
+@@ -80,5 +80,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function caution(string|array $message);
++    public function caution(string|array $message): void;
+ 
+     /**
+@@ -87,5 +87,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function table(array $headers, array $rows);
++    public function table(array $headers, array $rows): void;
+ 
+     /**
+@@ -114,5 +114,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function newLine(int $count = 1);
++    public function newLine(int $count = 1): void;
+ 
+     /**
+@@ -121,5 +121,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function progressStart(int $max = 0);
++    public function progressStart(int $max = 0): void;
+ 
+     /**
+@@ -128,5 +128,5 @@ interface StyleInterface
+      * @return void
+      */
+-    public function progressAdvance(int $step = 1);
++    public function progressAdvance(int $step = 1): void;
+ 
+     /**
+@@ -135,4 +135,4 @@ interface StyleInterface
+      * @return void
+      */
+-    public function progressFinish();
++    public function progressFinish(): void;
+ }
 diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
 index 52d9b5edc9..3026cfccf4 100644
 --- a/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -3175,6 +3440,16 @@ index 7f6ae7a600..d79db02567 100644
 +    public function getOffset(string $string): int|false
      {
          $position = strpos($this->source, $string, $this->position);
+diff --git a/src/Symfony/Component/DependencyInjection/Argument/ArgumentInterface.php b/src/Symfony/Component/DependencyInjection/Argument/ArgumentInterface.php
+index 3b39f36625..de2d7f2536 100644
+--- a/src/Symfony/Component/DependencyInjection/Argument/ArgumentInterface.php
++++ b/src/Symfony/Component/DependencyInjection/Argument/ArgumentInterface.php
+@@ -24,4 +24,4 @@ interface ArgumentInterface
+      * @return void
+      */
+-    public function setValues(array $values);
++    public function setValues(array $values): void;
+ }
 diff --git a/src/Symfony/Component/DependencyInjection/Argument/IteratorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/IteratorArgument.php
 index aedd1e659e..92aff35b84 100644
 --- a/src/Symfony/Component/DependencyInjection/Argument/IteratorArgument.php
@@ -3335,6 +3610,16 @@ index c8cbccb4b9..0446970598 100644
 +    public function compile(ContainerBuilder $container): void
      {
          try {
+diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php b/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php
+index 2ad4a048ba..719267be1e 100644
+--- a/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php
+@@ -26,4 +26,4 @@ interface CompilerPassInterface
+      * @return void
+      */
+-    public function process(ContainerBuilder $container);
++    public function process(ContainerBuilder $container): void;
+ }
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
 index 9c1d7e218e..61415b6ade 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -3658,44 +3943,54 @@ index 2d6542660b..20287f9286 100644
      {
          $this->extensionConfig = [];
 diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
-index 05df65cfe8..fe27ddf30b 100644
+index 2bdc9e7d96..4489ecbc12 100644
 --- a/src/Symfony/Component/DependencyInjection/Container.php
 +++ b/src/Symfony/Component/DependencyInjection/Container.php
-@@ -82,5 +82,5 @@ class Container implements ContainerInterface, ResetInterface
+@@ -83,5 +83,5 @@ class Container implements ContainerInterface, ResetInterface
       * @return void
       */
 -    public function compile()
 +    public function compile(): void
      {
          $this->parameterBag->resolve();
-@@ -117,5 +117,5 @@ class Container implements ContainerInterface, ResetInterface
+@@ -118,5 +118,5 @@ class Container implements ContainerInterface, ResetInterface
       * @throws ParameterNotFoundException if the parameter is not defined
       */
 -    public function getParameter(string $name)
 +    public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
      {
          return $this->parameterBag->get($name);
-@@ -130,5 +130,5 @@ class Container implements ContainerInterface, ResetInterface
+@@ -131,5 +131,5 @@ class Container implements ContainerInterface, ResetInterface
       * @return void
       */
 -    public function setParameter(string $name, array|bool|string|int|float|\UnitEnum|null $value)
 +    public function setParameter(string $name, array|bool|string|int|float|\UnitEnum|null $value): void
      {
          $this->parameterBag->set($name, $value);
-@@ -143,5 +143,5 @@ class Container implements ContainerInterface, ResetInterface
+@@ -144,5 +144,5 @@ class Container implements ContainerInterface, ResetInterface
       * @return void
       */
 -    public function set(string $id, ?object $service)
 +    public function set(string $id, ?object $service): void
      {
          // Runs the internal initializer; used by the dumped container to include always-needed files
-@@ -286,5 +286,5 @@ class Container implements ContainerInterface, ResetInterface
+@@ -287,5 +287,5 @@ class Container implements ContainerInterface, ResetInterface
       * @return void
       */
 -    public function reset()
 +    public function reset(): void
      {
          $services = $this->services + $this->privates;
+diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
+index 084a321ab5..09fb37f3aa 100644
+--- a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
++++ b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
+@@ -24,4 +24,4 @@ interface ContainerAwareInterface
+      * @return void
+      */
+-    public function setContainer(?ContainerInterface $container);
++    public function setContainer(?ContainerInterface $container): void;
+ }
 diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
 index ac67b468c5..bc1e395810 100644
 --- a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
@@ -3810,16 +4105,29 @@ index 2329ad570b..dddad4f5b8 100644
      {
          $this->expressionLanguageProviders[] = $provider;
 diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
-index 9e97fb71fc..1cda97c611 100644
+index d2f4c343a1..92771c9628 100644
 --- a/src/Symfony/Component/DependencyInjection/ContainerInterface.php
 +++ b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
-@@ -53,5 +53,5 @@ interface ContainerInterface extends PsrContainerInterface
+@@ -34,5 +34,5 @@ interface ContainerInterface extends PsrContainerInterface
+      * @return void
+      */
+-    public function set(string $id, ?object $service);
++    public function set(string $id, ?object $service): void;
+ 
+     /**
+@@ -56,5 +56,5 @@ interface ContainerInterface extends PsrContainerInterface
       * @throws ParameterNotFoundException if the parameter is not defined
       */
 -    public function getParameter(string $name);
 +    public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null;
  
      public function hasParameter(string $name): bool;
+@@ -63,4 +63,4 @@ interface ContainerInterface extends PsrContainerInterface
+      * @return void
+      */
+-    public function setParameter(string $name, array|bool|string|int|float|\UnitEnum|null $value);
++    public function setParameter(string $name, array|bool|string|int|float|\UnitEnum|null $value): void;
+ }
 diff --git a/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php b/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php
 index 5f22fa53b6..2ebf0e385d 100644
 --- a/src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php
@@ -3966,29 +4274,46 @@ index 00192d0da5..620efa4fd1 100644
      {
          $class = static::class;
 diff --git a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php b/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php
-index 11cda00cc5..07b4990160 100644
+index bd57eef733..3284e19ede 100644
 --- a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php
 +++ b/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php
-@@ -35,5 +35,5 @@ interface ExtensionInterface
+@@ -30,5 +30,5 @@ interface ExtensionInterface
+      * @throws \InvalidArgumentException When provided tag is not defined in this extension
+      */
+-    public function load(array $configs, ContainerBuilder $container);
++    public function load(array $configs, ContainerBuilder $container): void;
+ 
+     /**
+@@ -37,5 +37,5 @@ interface ExtensionInterface
       * @return string
       */
 -    public function getNamespace();
 +    public function getNamespace(): string;
  
      /**
-@@ -42,5 +42,5 @@ interface ExtensionInterface
+@@ -44,5 +44,5 @@ interface ExtensionInterface
       * @return string|false
       */
 -    public function getXsdValidationBasePath();
 +    public function getXsdValidationBasePath(): string|false;
  
      /**
-@@ -51,4 +51,4 @@ interface ExtensionInterface
+@@ -53,4 +53,4 @@ interface ExtensionInterface
       * @return string
       */
 -    public function getAlias();
 +    public function getAlias(): string;
  }
+diff --git a/src/Symfony/Component/DependencyInjection/Extension/PrependExtensionInterface.php b/src/Symfony/Component/DependencyInjection/Extension/PrependExtensionInterface.php
+index 0df94e1092..061e7d7fd9 100644
+--- a/src/Symfony/Component/DependencyInjection/Extension/PrependExtensionInterface.php
++++ b/src/Symfony/Component/DependencyInjection/Extension/PrependExtensionInterface.php
+@@ -21,4 +21,4 @@ interface PrependExtensionInterface
+      * @return void
+      */
+-    public function prepend(ContainerBuilder $container);
++    public function prepend(ContainerBuilder $container): void;
+ }
 diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php
 index f4c6b29258..1402331f9e 100644
 --- a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php
@@ -4024,6 +4349,17 @@ index d6b046c9f6..7a4eaa5abc 100644
 +    protected function setDefinition(string $id, Definition $definition): void
      {
          $this->container->removeBindings($id);
+diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBagInterface.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBagInterface.php
+index eeff6538c5..8ac7149b37 100644
+--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBagInterface.php
++++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBagInterface.php
+@@ -40,5 +40,5 @@ interface ContainerBagInterface extends ContainerInterface
+      * @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
+      */
+-    public function resolveValue(mixed $value);
++    public function resolveValue(mixed $value): mixed;
+ 
+     /**
 diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
 index 9c66e1f944..619e44fc73 100644
 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -4137,6 +4473,52 @@ index 0ad11194dd..7ef6b2e7ab 100644
 +    public function resolve(): void
      {
          if ($this->resolved) {
+diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
+index 18ddfde147..b8651648bd 100644
+--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
++++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
+@@ -29,5 +29,5 @@ interface ParameterBagInterface
+      * @throws LogicException if the ParameterBagInterface cannot be cleared
+      */
+-    public function clear();
++    public function clear(): void;
+ 
+     /**
+@@ -38,5 +38,5 @@ interface ParameterBagInterface
+      * @throws LogicException if the parameter cannot be added
+      */
+-    public function add(array $parameters);
++    public function add(array $parameters): void;
+ 
+     /**
+@@ -57,5 +57,5 @@ interface ParameterBagInterface
+      * @return void
+      */
+-    public function remove(string $name);
++    public function remove(string $name): void;
+ 
+     /**
+@@ -66,5 +66,5 @@ interface ParameterBagInterface
+      * @throws LogicException if the parameter cannot be set
+      */
+-    public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value);
++    public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value): void;
+ 
+     /**
+@@ -78,5 +78,5 @@ interface ParameterBagInterface
+      * @return void
+      */
+-    public function resolve();
++    public function resolve(): void;
+ 
+     /**
+@@ -87,5 +87,5 @@ interface ParameterBagInterface
+      * @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
+      */
+-    public function resolveValue(mixed $value);
++    public function resolveValue(mixed $value): mixed;
+ 
+     /**
 diff --git a/src/Symfony/Component/DependencyInjection/TypedReference.php b/src/Symfony/Component/DependencyInjection/TypedReference.php
 index 9b431cd65b..5fdb0643cd 100644
 --- a/src/Symfony/Component/DependencyInjection/TypedReference.php
@@ -4388,7 +4770,7 @@ index 681a2f7a23..07ca3531a1 100644
      {
          if ('a' !== $node->nodeName && 'area' !== $node->nodeName && 'link' !== $node->nodeName) {
 diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
-index 54e024628f..29c9198dab 100644
+index f1b982315c..ed8ad1fab4 100644
 --- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
 +++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
 @@ -55,5 +55,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
@@ -4405,21 +4787,35 @@ index 54e024628f..29c9198dab 100644
 +    public function addSubscriber(EventSubscriberInterface $subscriber): void
      {
          $this->dispatcher->addSubscriber($subscriber);
-@@ -224,5 +224,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
+@@ -71,5 +71,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
+      * @return void
+      */
+-    public function removeListener(string $eventName, callable|array $listener)
++    public function removeListener(string $eventName, callable|array $listener): void
+     {
+         if (isset($this->wrappedListeners[$eventName])) {
+@@ -89,5 +89,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
+      * @return void
+      */
+-    public function removeSubscriber(EventSubscriberInterface $subscriber)
++    public function removeSubscriber(EventSubscriberInterface $subscriber): void
+     {
+         $this->dispatcher->removeSubscriber($subscriber);
+@@ -230,5 +230,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
       * @return void
       */
 -    public function reset()
 +    public function reset(): void
      {
          $this->callStack = null;
-@@ -247,5 +247,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
+@@ -253,5 +253,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
       * @return void
       */
 -    protected function beforeDispatch(string $eventName, object $event)
 +    protected function beforeDispatch(string $eventName, object $event): void
      {
      }
-@@ -256,5 +256,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
+@@ -262,5 +262,5 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
       * @return void
       */
 -    protected function afterDispatch(string $eventName, object $event)
@@ -4476,6 +4872,37 @@ index 327803af67..2466d748ec 100644
 +    protected function callListeners(iterable $listeners, string $eventName, object $event): void
      {
          $stoppable = $event instanceof StoppableEventInterface;
+diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
+index 3cd94c9388..c423905c11 100644
+--- a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
++++ b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
+@@ -31,5 +31,5 @@ interface EventDispatcherInterface extends ContractsEventDispatcherInterface
+      * @return void
+      */
+-    public function addListener(string $eventName, callable $listener, int $priority = 0);
++    public function addListener(string $eventName, callable $listener, int $priority = 0): void;
+ 
+     /**
+@@ -41,5 +41,5 @@ interface EventDispatcherInterface extends ContractsEventDispatcherInterface
+      * @return void
+      */
+-    public function addSubscriber(EventSubscriberInterface $subscriber);
++    public function addSubscriber(EventSubscriberInterface $subscriber): void;
+ 
+     /**
+@@ -48,10 +48,10 @@ interface EventDispatcherInterface extends ContractsEventDispatcherInterface
+      * @return void
+      */
+-    public function removeListener(string $eventName, callable $listener);
++    public function removeListener(string $eventName, callable $listener): void;
+ 
+     /**
+      * @return void
+      */
+-    public function removeSubscriber(EventSubscriberInterface $subscriber);
++    public function removeSubscriber(EventSubscriberInterface $subscriber): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php b/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
 index 2085e428e9..ca0d6964e5 100644
 --- a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
@@ -4486,6 +4913,38 @@ index 2085e428e9..ca0d6964e5 100644
 -    public static function getSubscribedEvents();
 +    public static function getSubscribedEvents(): array;
  }
+diff --git a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
+index d385d3f833..1fc9f23ea0 100644
+--- a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
++++ b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
+@@ -34,5 +34,5 @@ class ImmutableEventDispatcher implements EventDispatcherInterface
+      * @return never
+      */
+-    public function addListener(string $eventName, callable|array $listener, int $priority = 0)
++    public function addListener(string $eventName, callable|array $listener, int $priority = 0): never
+     {
+         throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
+@@ -42,5 +42,5 @@ class ImmutableEventDispatcher implements EventDispatcherInterface
+      * @return never
+      */
+-    public function addSubscriber(EventSubscriberInterface $subscr
10000
iber)
++    public function addSubscriber(EventSubscriberInterface $subscriber): never
+     {
+         throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
+@@ -50,5 +50,5 @@ class ImmutableEventDispatcher implements EventDispatcherInterface
+      * @return never
+      */
+-    public function removeListener(string $eventName, callable|array $listener)
++    public function removeListener(string $eventName, callable|array $listener): never
+     {
+         throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
+@@ -58,5 +58,5 @@ class ImmutableEventDispatcher implements EventDispatcherInterface
+      * @return never
+      */
+-    public function removeSubscriber(EventSubscriberInterface $subscriber)
++    public function removeSubscriber(EventSubscriberInterface $subscriber): never
+     {
+         throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
 diff --git a/src/Symfony/Component/ExpressionLanguage/Compiler.php b/src/Symfony/Component/ExpressionLanguage/Compiler.php
 index 66471d29ff..98f2f1eab2 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Compiler.php
@@ -4711,7 +5170,7 @@ index 241725b9c5..420932897f 100644
      {
          $token = $this->current;
 diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
-index 2263d58fe7..8a1b84d368 100644
+index 75fd81a9ac..e71e98a57a 100644
 --- a/src/Symfony/Component/Filesystem/Filesystem.php
 +++ b/src/Symfony/Component/Filesystem/Filesystem.php
 @@ -37,5 +37,5 @@ class Filesystem
@@ -6176,17 +6635,45 @@ index 61e2c5f80d..4d6b335474 100644
 +    public function guessPattern(string $class, string $property): ?Guess\ValueGuess;
  }
 diff --git a/src/Symfony/Component/Form/FormTypeInterface.php b/src/Symfony/Component/Form/FormTypeInterface.php
-index 2b9066a511..1c9e9f5a26 100644
+index 0c586d3f71..6c625cf403 100644
 --- a/src/Symfony/Component/Form/FormTypeInterface.php
 +++ b/src/Symfony/Component/Form/FormTypeInterface.php
-@@ -77,5 +77,5 @@ interface FormTypeInterface
+@@ -31,5 +31,5 @@ interface FormTypeInterface
+      * @see FormTypeExtensionInterface::buildForm()
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options);
++    public function buildForm(FormBuilderInterface $builder, array $options): void;
+ 
+     /**
+@@ -49,5 +49,5 @@ interface FormTypeInterface
+      * @see FormTypeExtensionInterface::buildView()
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options);
++    public function buildView(FormView $view, FormInterface $form, array $options): void;
+ 
+     /**
+@@ -68,5 +68,5 @@ interface FormTypeInterface
+      * @see FormTypeExtensionInterface::finishView()
+      */
+-    public function finishView(FormView $view, FormInterface $form, array $options);
++    public function finishView(FormView $view, FormInterface $form, array $options): void;
+ 
+     /**
+@@ -75,5 +75,5 @@ interface FormTypeInterface
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver);
++    public function configureOptions(OptionsResolver $resolver): void;
+ 
+     /**
+@@ -85,5 +85,5 @@ interface FormTypeInterface
       * @return string
       */
 -    public function getBlockPrefix();
 +    public function getBlockPrefix(): string;
  
      /**
-@@ -84,4 +84,4 @@ interface FormTypeInterface
+@@ -92,4 +92,4 @@ interface FormTypeInterface
       * @return string|null
       */
 -    public function getParent();
@@ -6239,191 +6726,6 @@ index f05db1533b..0e67c63c66 100644
 +    public function finishView(FormView $view, FormInterface $form, array $options): void
      {
          $this->parent?->finishView($view, $form, $options);
-diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
-index 31ab27884b..2f4d043122 100644
---- a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
-+++ b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
-@@ -285,5 +285,5 @@ TXT
- class FooType extends AbstractType
- {
--    public function configureOptions(OptionsResolver $resolver)
-+    public function configureOptions(OptionsResolver $resolver): void
-     {
-         $resolver->setRequired('foo');
-diff --git a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
-index 3fea781b6c..d5fb003766 100644
---- a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
-+++ b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
-@@ -160,5 +160,5 @@ abstract class AbstractDescriptorTestCase extends TestCase
- class FooType extends AbstractType
- {
--    public function configureOptions(OptionsResolver $resolver)
-+    public function configureOptions(OptionsResolver $resolver): void
-     {
-         $resolver->setRequired('foo');
-diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
-index b8e2cf7bca..f20e51c340 100644
---- a/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
-+++ b/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
-@@ -24,5 +24,5 @@ use Symfony\Component\Translation\IdentityTranslator;
- class FormTypeCsrfExtensionTest_ChildType extends AbstractType
- {
--    public function buildForm(FormBuilderInterface $builder, array $options)
-+    public function buildForm(FormBuilderInterface $builder, array $options): void
-     {
-         // The form needs a child in order to trigger CSRF protection by
-diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
-index f712805e00..f002fec9ed 100644
---- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
-+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
-@@ -495,5 +495,5 @@ class Foo
- class FooType extends AbstractType
- {
--    public function buildForm(FormBuilderInterface $builder, array $options)
-+    public function buildForm(FormBuilderInterface $builder, array $options): void
-     {
-         $builder
-@@ -505,5 +505,5 @@ class FooType extends AbstractType
-     }
- 
--    public function configureOptions(OptionsResolver $resolver)
-+    public function configureOptions(OptionsResolver $resolver): void
-     {
-         $resolver->setDefault('data_class', Foo::class);
-@@ -526,5 +526,5 @@ class Review
- class ReviewType extends AbstractType
- {
--    public function buildForm(FormBuilderInterface $builder, array $options)
-+    public function buildForm(FormBuilderInterface $builder, array $options): void
-     {
-         $builder
-@@ -539,5 +539,5 @@ class ReviewType extends AbstractType
-     }
- 
--    public function configureOptions(OptionsResolver $resolver)
-+    public function configureOptions(OptionsResolver $resolver): void
-     {
-         $resolver->setDefault('data_class', Review::class);
-@@ -557,5 +557,5 @@ class Customer
- class CustomerType extends AbstractType
- {
--    public function buildForm(FormBuilderInterface $builder, array $options)
-+    public function buildForm(FormBuilderInterface $builder, array $options): void
-     {
-         $builder
-@@ -564,5 +564,5 @@ class CustomerType extends AbstractType
-     }
- 
--    public function configureOptions(OptionsResolver $resolver)
-+    public function configureOptions(OptionsResolver $resolver): void
-     {
-         $resolver->setDefault('data_class', Customer::class);
-diff --git a/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php b/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php
-index 556166f554..3e0bb40c2b 100644
---- a/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php
-+++ b/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php
-@@ -10,5 +10,5 @@ use Symfony\Component\Form\FormEvents;
- class AlternatingRowType extends AbstractType
- {
--    public function buildForm(FormBuilderInterface $builder, array $options)
-+    public function buildForm(FormBuilderInterface $builder, array $options): void
-     {
-         $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
-diff --git a/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php b/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php
-index 84c988984f..a55dbfeacc 100644
---- a/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php
-+++ b/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php
-@@ -9,5 +9,5 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
- class AuthorType extends AbstractType
- {
--    public function buildForm(FormBuilderInterface $builder, array $options)
-+    public function buildForm(FormBuilderInterface $builder, array $options): void
-     {
-         $builder
-@@ -17,5 +17,5 @@ class AuthorType extends AbstractType
-     }
- 
--    public function configureOptions(OptionsResolver $resolver)
-+    public function configureOptions(OptionsResolver $resolver): void
-     {
-         $resolver->setDefaults([
-diff --git a/src/Symfony/Component/Form/Tests/Fixtures/BlockPrefixedFooTextType.php b/src/Symfony/Component/Form/Tests/Fixtures/BlockPrefixedFooTextType.php
-index 3fda7a55dd..fa145a49c2 100644
---- a/src/Symfony/Component/Form/Tests/Fixtures/BlockPrefixedFooTextType.php
-+++ b/src/Symfony/Component/Form/Tests/Fixtures/BlockPrefixedFooTextType.php
-@@ -17,5 +17,5 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
- class BlockPrefixedFooTextType extends AbstractType
- {
--    public function configureOptions(OptionsResolver $resolver)
-+    public function configureOptions(OptionsResolver $resolver): void
-     {
-         $resolver->setDefault('block_prefix', 'foo');
-diff --git a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
-index 7399dfe36b..38b22b87e5 100644
---- a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
-+++ b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
-@@ -21,5 +21,5 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
- class ChoiceSubType extends AbstractType
- {
--    public function configureOptions(OptionsResolver $resolver)
-+    public function configureOptions(OptionsResolver $resolver): void
-     {
-         $resolver->setDefaults(['expanded' => true]);
-diff --git a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php
-index 1751531d19..3549763f16 100644
---- a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php
-+++ b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php
-@@ -19,5 +19,5 @@ class ChoiceTypeExtension extends AbstractTypeExtension
-     public static $extendedType;
- 
--    public function configureOptions(OptionsResolver $resolver)
-+    public function configureOptions(OptionsResolver $resolver): void
-     {
-         $resolver->setDefault('choices', [
-diff --git a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php
-index 70c710e922..abd8edd6b8 100644
---- a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php
-+++ b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php
-@@ -17,5 +17,5 @@ use Symfony\Component\Form\FormBuilderInterface;
- class FooTypeBarExtension extends AbstractTypeExtension
- {
--    public function buildForm(FormBuilderInterface $builder, array $options)
-+    public function buildForm(FormBuilderInterface $builder, array $options): void
-     {
-         $builder->setAttribute('bar', 'x');
-diff --git a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBazExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBazExtension.php
-index a11f158844..9720439eb1 100644
---- a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBazExtension.php
-+++ b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBazExtension.php
-@@ -17,5 +17,5 @@ use Symfony\Component\Form\FormBuilderInterface;
- class FooTypeBazExtension extends AbstractTypeExtension
- {
--    public function buildForm(FormBuilderInterface $builder, array $options)
-+    public function buildForm(FormBuilderInterface $builder, array $options): void
-     {
-         $builder->setAttribute('baz', 'x');
-diff --git a/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
-index ccd5b3f489..0c7e294144 100644
---- a/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
-+++ b/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
-@@ -20,5 +20,5 @@ class LazyChoiceTypeExtension extends AbstractTypeExtension
-     public static $extendedType;
- 
--    public function configureOptions(OptionsResolver $resolver)
-+    public function configureOptions(OptionsResolver $resolver): void
-     {
-         $resolver->setDefault('choice_loader', ChoiceList::lazy($this, fn () => [
-diff --git a/src/Symfony/Component/Form/Tests/Fixtures/NotMappedType.php b/src/Symfony/Component/Form/Tests/Fixtures/NotMappedType.php
-index 14c340b891..3d55122e79 100644
---- a/src/Symfony/Component/Form/Tests/Fixtures/NotMappedType.php
-+++ b/src/Symfony/Component/Form/Tests/Fixtures/NotMappedType.php
-@@ -17,5 +17,5 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
- class NotMappedType extends AbstractType
- {
--    public function configureOptions(OptionsResolver $resolver)
-+    public function configureOptions(OptionsResolver $resolver): void
-     {
-         $resolver->setDefault('mapped', false);
 diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php
 index 05a8e6b4c6..232bed6fac 100644
 --- a/src/Symfony/Component/HttpClient/CachingHttpClient.php
@@ -7235,6 +7537,31 @@ index 2ddf55f2cb..52049a92b4 100644
 +    public function registerCommands(Application $application): void
      {
      }
+diff --git a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
+index 02cb9641db..abe408eb24 100644
+--- a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
++++ b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
+@@ -28,5 +28,5 @@ interface BundleInterface extends ContainerAwareInterface
+      * @return void
+      */
+-    public function boot();
++    public function boot(): void;
+ 
+     /**
+@@ -35,5 +35,5 @@ interface BundleInterface extends ContainerAwareInterface
+      * @return void
+      */
+-    public function shutdown();
++    public function shutdown(): void;
+ 
+     /**
+@@ -44,5 +44,5 @@ interface BundleInterface extends ContainerAwareInterface
+      * @return void
+      */
+-    public function build(ContainerBuilder $container);
++    public function build(ContainerBuilder $container): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
 index 3c99b74af3..fdb68feb2c 100644
 --- a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
@@ -8064,64 +8391,6 @@ index 5d6fad8fe3..e723e1e445 100644
 +    public function add(DataCollectorInterface $collector): void
      {
          $this->collectors[$collector->getName()] = $collector;
-diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
-index bac4be1e7c..b51ac22632 100644
---- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
-+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
-@@ -32,5 +32,5 @@ class CloneVarDataCollector extends DataCollector
-      * @return void
-      */
--    public function collect(Request $request, Response $response, \Throwable $exception = null)
-+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
-     {
-         $this->data = $this->cloneVar($this->varToClone);
-@@ -40,5 +40,5 @@ class CloneVarDataCollector extends DataCollector
-      * @return void
-      */
--    public function reset()
-+    public function reset(): void
-     {
-         $this->data = [];
-@@ -48,5 +48,5 @@ class CloneVarDataCollector extends DataCollector
-      * @return Data
-      */
--    public function getData()
-+    public function getData(): Data
-     {
-         return $this->data;
-diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
-index dd05d5bf6b..019add95c5 100644
---- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
-+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
-@@ -50,5 +50,5 @@ class KernelForTest extends Kernel
-     }
- 
--    protected function initializeContainer()
-+    protected function initializeContainer(): void
-     {
-         if ($this->fakeContainer) {
-diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php
-index 0a6470e6e6..e9a417b98d 100644
---- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php
-+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php
-@@ -32,5 +32,5 @@ class KernelWithoutBundles extends Kernel
-     }
- 
--    protected function build(ContainerBuilder $container)
-+    protected function build(ContainerBuilder $container): void
-     {
-         $container->setParameter('test_executed', true);
-diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
-index 73800bab38..03f12833c7 100644
---- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
-+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
-@@ -778,5 +778,5 @@ class CustomProjectDirKernel extends Kernel implements WarmableInterface
-     }
- 
--    protected function build(ContainerBuilder $container)
-+    protected function build(ContainerBuilder $container): void
-     {
-         if ($build = $this->buildContainer) {
 diff --git a/src/Symfony/Component/Intl/Util/IntlTestHelper.php b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
 index d22f2e6953..1dcdcdf4ea 100644
 --- a/src/Symfony/Component/Intl/Util/IntlTestHelper.php
@@ -13137,17 +13406,6 @@ index c1a77ad157..1e926dc83a 100644
 +    public function setParsedLine(int $parsedLine): void
      {
          $this->parsedLine = $parsedLine;
-diff --git a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
-index 06340a61bb..2654d15b9a 100644
---- a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
-+++ b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
-@@ -80,5 +80,5 @@ class ParentTestService
-      * @return ContainerInterface|null
-      */
--    public function setContainer(ContainerInterface $container)
-+    public function setContainer(ContainerInterface $container): ?ContainerInterface
-     {
-         return $container;
 diff --git a/src/Symfony/Contracts/Translation/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php
 index e3b0adff05..19d90162ab 100644
 --- a/src/Symfony/Contracts/Translation/TranslatorTrait.php
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/ContainerAwareFixture.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/ContainerAwareFixture.php
index fbad8e05c56f6..1f2f60b61c6bc 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/ContainerAwareFixture.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/ContainerAwareFixture.php
@@ -18,14 +18,14 @@
 
 class ContainerAwareFixture implements FixtureInterface, ContainerAwareInterface
 {
-    public $container;
+    public ?ContainerInterface $container = null;
 
-    public function setContainer(?ContainerInterface $container)
+    public function setContainer(?ContainerInterface $container): void
     {
         $this->container = $container;
     }
 
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php
index cc55da770ed2d..4d4810d286005 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/AboutCommand/Fixture/TestAppKernel.php
@@ -30,7 +30,7 @@ public function getProjectDir(): string
         return __DIR__.'/test';
     }
 
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(static function (ContainerBuilder $container) {
             $container->loadFromExtension('framework', [
@@ -39,7 +39,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         });
     }
 
-    protected function build(ContainerBuilder $container)
+    protected function build(ContainerBuilder $container): void
     {
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
index 678d573586f3a..4522a7d59d8f3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php
@@ -31,12 +31,12 @@ public function getProjectDir(): string
         return __DIR__.'/test';
     }
 
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(__DIR__.\DIRECTORY_SEPARATOR.'config.yml');
     }
 
-    protected function build(ContainerBuilder $container)
+    protected function build(ContainerBuilder $container): void
     {
         $container->register('logger', NullLogger::class);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
index 6f5b870e3350e..5f2584b15744b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
@@ -170,14 +170,14 @@ protected function createMockContainer()
 
 class ContainerAwareController implements ContainerAwareInterface
 {
-    private $container;
+    private ?Container $container = null;
 
-    public function setContainer(?ContainerInterface $container)
+    public function setContainer(?ContainerInterface $container): void
     {
         $this->container = $container;
     }
 
-    public function getContainer()
+    public function getContainer(): ?Container
     {
         return $this->container;
     }
@@ -193,7 +193,7 @@ public function __invoke()
 
 class DummyController extends AbstractController
 {
-    public function getContainer()
+    public function getContainer(): Psr11ContainerInterface
     {
         return $this->container;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
index 4672fe1237f02..41219021e37b9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -2350,7 +2350,7 @@ private function assertCachePoolServiceDefinitionIsCreated(ContainerBuilder $con
  */
 class TestAnnotationsPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $container->setDefinition('annotation_reader', $container->getDefinition('annotations.cached_reader'));
         $container->removeDefinition('annotations.cached_reader');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/DefaultConfigTestBundle/DependencyInjection/DefaultConfigTestExtension.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/DefaultConfigTestBundle/DependencyInjection/DefaultConfigTestExtension.php
index 400384f616f29..67d7b2bdac997 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/DefaultConfigTestBundle/DependencyInjection/DefaultConfigTestExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/DefaultConfigTestBundle/DependencyInjection/DefaultConfigTestExtension.php
@@ -16,7 +16,7 @@
 
 class DefaultConfigTestExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/ExtensionWithoutConfigTestBundle/DependencyInjection/ExtensionWithoutConfigTestExtension.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/ExtensionWithoutConfigTestBundle/DependencyInjection/ExtensionWithoutConfigTestExtension.php
index 497a7a99d6d2b..560f84e62df4f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/ExtensionWithoutConfigTestBundle/DependencyInjection/ExtensionWithoutConfigTestExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/ExtensionWithoutConfigTestBundle/DependencyInjection/ExtensionWithoutConfigTestExtension.php
@@ -16,7 +16,7 @@
 
 class ExtensionWithoutConfigTestExtension implements ExtensionInterface
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php
index 53555fd664174..9e61c5ae76f64 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php
@@ -16,7 +16,7 @@
 
 class AnnotationReaderPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         // simulate using "annotation_reader" in a compiler pass
         $container->get('test.annotation_reader');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
index 80cee0f1ae344..b0cd9ff916816 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
@@ -21,7 +21,7 @@ class TestExtension extends Extension implements PrependExtensionInterface
 {
     private $customConfig;
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = $this->getConfiguration($configs, $container);
         $this->processConfiguration($configuration, $configs);
@@ -29,7 +29,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setAlias('test.annotation_reader', new Alias('annotation_reader', true));
     }
 
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         $container->prependExtensionConfig('test', ['custom' => 'foo']);
     }
@@ -39,7 +39,7 @@ public function getConfiguration(array $config, ContainerBuilder $container): ?C
         return new Configuration($this->customConfig);
     }
 
-    public function setCustomConfig($customConfig)
+    public function setCustomConfig($customConfig): void
     {
         $this->customConfig = $customConfig;
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
index 13c368fd585e4..bde1279ad1ec3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
@@ -21,7 +21,7 @@
 
 class TestBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
index b182e902d7392..3f99eff48d57c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
@@ -73,12 +73,12 @@ public function getLogDir(): string
         return sys_get_temp_dir().'/'.$this->varDir.'/'.$this->testCase.'/logs';
     }
 
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load($this->rootConfig);
     }
 
-    protected function build(ContainerBuilder $container)
+    protected function build(ContainerBuilder $container): void
     {
         $container->register('logger', NullLogger::class);
         $container->registerExtension(new TestDumpExtension());
@@ -117,7 +117,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         return $treeBuilder;
     }
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php
index 1ef3f74f79aa5..764e7d35c3810 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php
@@ -30,6 +30,9 @@ public function getPriority(): int;
      */
     public function getKey(): string;
 
+    /**
+     * @return void
+     */
     public function addConfiguration(NodeDefinition $builder);
 
     /**
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/UserProviderFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/UserProviderFactoryInterface.php
index 6d9481c59cb4a..a2c5815e4bfac 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/UserProviderFactoryInterface.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/UserProviderFactoryInterface.php
@@ -22,9 +22,18 @@
  */
 interface UserProviderFactoryInterface
 {
+    /**
+     * @return void
+     */
     public function create(ContainerBuilder $container, string $id, array $config);
 
+    /**
+     * @return string
+     */
     public function getKey();
 
+    /**
+     * @return void
+     */
     public function addConfiguration(NodeDefinition $builder);
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index af9f9190d1982..8fb375255c771 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -78,6 +78,9 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
     private array $sortedFactories = [];
     private array $userProviderFactories = [];
 
+    /**
+     * @return void
+     */
     public function prepend(ContainerBuilder $container)
     {
         foreach ($this->getSortedFactories() as $factory) {
@@ -87,6 +90,9 @@ public function prepend(ContainerBuilder $container)
         }
     }
 
+    /**
+     * @return void
+     */
     public function load(array $configs, ContainerBuilder $container)
     {
         if (!array_filter($configs)) {
@@ -200,7 +206,7 @@ private function createStrategyDefinition(string $strategy, bool $allowIfAllAbst
         };
     }
 
-    private function createRoleHierarchy(array $config, ContainerBuilder $container)
+    private function createRoleHierarchy(array $config, ContainerBuilder $container): void
     {
         if (!isset($config['role_hierarchy']) || 0 === \count($config['role_hierarchy'])) {
             $container->removeDefinition('security.access.role_hierarchy_voter');
@@ -212,7 +218,7 @@ private function createRoleHierarchy(array $config, ContainerBuilder $container)
         $container->removeDefinition('security.access.simple_role_voter');
     }
 
-    private function createAuthorization(array $config, ContainerBuilder $container)
+    private function createAuthorization(array $config, ContainerBuilder $container): void
     {
         foreach ($config['access_control'] as $access) {
             if (isset($access['request_matcher'])) {
@@ -265,7 +271,7 @@ private function createAuthorization(array $config, ContainerBuilder $container)
         }
     }
 
-    private function createFirewalls(array $config, ContainerBuilder $container)
+    private function createFirewalls(array $config, ContainerBuilder $container): void
     {
         if (!isset($config['firewalls'])) {
             return;
@@ -692,7 +698,7 @@ private function createMissingUserProvider(ContainerBuilder $container, string $
         return $userProvider;
     }
 
-    private function createHashers(array $hashers, ContainerBuilder $container)
+    private function createHashers(array $hashers, ContainerBuilder $container): void
     {
         $hasherMap = [];
         foreach ($hashers as $class => $hasher) {
@@ -705,7 +711,12 @@ private function createHashers(array $hashers, ContainerBuilder $container)
         ;
     }
 
-    private function createHasher(array $config)
+    /**
+     * @param array<string, mixed> $config
+     *
+     * @return Reference|array<string, mixed>
+     */
+    private function createHasher(array $config): Reference|array
     {
         // a custom hasher service
         if (isset($config['id'])) {
@@ -996,13 +1007,13 @@ private function createRequestMatcher(ContainerBuilder $container, string $path
         return $this->requestMatchers[$id] = new Reference($id);
     }
 
-    public function addAuthenticatorFactory(AuthenticatorFactoryInterface $factory)
+    public function addAuthenticatorFactory(AuthenticatorFactoryInterface $factory): void
     {
         $this->factories[] = [$factory->getPriority(), $factory];
         $this->sortedFactories = [];
     }
 
-    public function addUserProviderFactory(UserProviderFactoryInterface $factory)
+    public function addUserProviderFactory(UserProviderFactoryInterface $factory): void
     {
         $this->userProviderFactories[] = $factory;
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/UserProvider/DummyProvider.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/UserProvider/DummyProvider.php
index 55d3d6e9a2f10..ffefb8dbdb2fa 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/UserProvider/DummyProvider.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/UserProvider/DummyProvider.php
@@ -8,16 +8,16 @@
 
 class DummyProvider implements UserProviderFactoryInterface
 {
-    public function create(ContainerBuilder $container, $id, $config)
+    public function create(ContainerBuilder $container, $id, $config): void
     {
     }
 
-    public function getKey()
+    public function getKey(): string
     {
         return 'foo';
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
index de4f93435c48c..cee0647702654 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -956,7 +956,7 @@ public function getKey(): string
         return 'custom_listener';
     }
 
-    public function addConfiguration(NodeDefinition $builder)
+    public function addConfiguration(NodeDefinition $builder): void
     {
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php
index 730974f17f169..6d0f01391ac7e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/AuthenticatorBundle/AuthenticatorBundle.php
@@ -17,7 +17,7 @@
 
 class AuthenticatorBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
index 80adb49a8892e..5868a0b3a9094 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
@@ -32,14 +32,12 @@
  */
 class UserLoginType extends AbstractType
 {
-    private $requestStack;
-
-    public function __construct(RequestStack $requestStack)
-    {
-        $this->requestStack = $requestStack;
+    public function __construct(
+        private readonly RequestStack $requestStack,
+    ) {
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('username', TextType::class)
@@ -71,7 +69,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         });
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         /* Note: the form's csrf_token_id must correspond to that for the form login
          * listener in order for the CSRF token to validate successfully.
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FirewallEntryPointBundle/DependencyInjection/FirewallEntryPointExtension.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FirewallEntryPointBundle/DependencyInjection/FirewallEntryPointExtension.php
index dfedac3735f53..eb33a4ce8f211 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FirewallEntryPointBundle/DependencyInjection/FirewallEntryPointExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FirewallEntryPointBundle/DependencyInjection/FirewallEntryPointExtension.php
@@ -18,7 +18,7 @@
 
 class FirewallEntryPointExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php
index 2c81ca6416171..0eac0017d0d51 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php
@@ -18,7 +18,7 @@
 
 class FormLoginExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $container
             ->register('localized_form_failure_handler', LocalizedFormFailureHandler::class)
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php
index 62490a739bdcc..76ac78c3c488c 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/FormLoginBundle.php
@@ -18,7 +18,7 @@
 
 class FormLoginBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php
index 8336dce245792..8652dc73b41d1 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php
@@ -18,7 +18,7 @@
 
 class TestBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         $container->setParameter('container.build_hash', 'test_bundle');
         $container->setParameter('container.build_time', time());
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
index ec254cc3791c4..86fd36e137d71 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
@@ -443,10 +443,7 @@ public function testDumpPanel()
         $this->assertDefaultPanel($dumpDataCollector->getName(), $profile);
     }
 
-    /**
-     * @return MockObject&DumpDataCollector
-     */
-    private function createDumpDataCollector(): MockObject
+    private function createDumpDataCollector(): MockObject&DumpDataCollector
     {
         $dumpDataCollector = $this->createMock(DumpDataCollector::class);
         $dumpDataCollector
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php
index d194b2fd830a0..78395c4b75a2d 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Functional/WebProfilerBundleKernel.php
@@ -76,7 +76,7 @@ public function getLogDir(): string
         return sys_get_temp_dir().'/log-'.spl_object_hash($this);
     }
 
-    protected function build(ContainerBuilder $container)
+    protected function build(ContainerBuilder $container): void
     {
         $container->register('data_collector.dump', DumpDataCollector::class);
         $container->register('logger', NullLogger::class);
diff --git a/src/Symfony/Component/Config/ConfigCacheInterface.php b/src/Symfony/Component/Config/ConfigCacheInterface.php
index e1763fc5c8145..be7f0986c3a51 100644
--- a/src/Symfony/Component/Config/ConfigCacheInterface.php
+++ b/src/Symfony/Component/Config/ConfigCacheInterface.php
@@ -39,6 +39,8 @@ public function isFresh(): bool;
      * @param string                   $content  The content to write into the cache
      * @param ResourceInterface[]|null $metadata An array of ResourceInterface instances
      *
+     * @return void
+     *
      * @throws \RuntimeException When the cache file cannot be written
      */
     public function write(string $content, array $metadata = null);
diff --git a/src/Symfony/Component/Config/Definition/Builder/BuilderAwareInterface.php b/src/Symfony/Component/Config/Definition/Builder/BuilderAwareInterface.php
index f30b8736cf3a3..bb40307e17421 100644
--- a/src/Symfony/Component/Config/Definition/Builder/BuilderAwareInterface.php
+++ b/src/Symfony/Component/Config/Definition/Builder/BuilderAwareInterface.php
@@ -20,6 +20,8 @@ interface BuilderAwareInterface
 {
     /**
      * Sets a custom children builder.
+     *
+     * @return void
      */
     public function setBuilder(NodeBuilder $builder);
 }
diff --git a/src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php b/src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php
index b160aa94a4963..9dce7444b0aa6 100644
--- a/src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php
+++ b/src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php
@@ -20,6 +20,8 @@ interface PrototypeNodeInterface extends NodeInterface
 {
     /**
      * Sets the name of the node.
+     *
+     * @return void
      */
     public function setName(string $name);
 }
diff --git a/src/Symfony/Component/Config/Loader/LoaderInterface.php b/src/Symfony/Component/Config/Loader/LoaderInterface.php
index b94a4378f5304..4e0746d4d60ca 100644
--- a/src/Symfony/Component/Config/Loader/LoaderInterface.php
+++ b/src/Symfony/Component/Config/Loader/LoaderInterface.php
@@ -45,6 +45,8 @@ public function getResolver();
 
     /**
      * Sets the loader resolver.
+     *
+     * @return void
      */
     public function setResolver(LoaderResolverInterface $resolver);
 }
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
index ebea30367ec2a..ab468a2562b4b 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
@@ -20,5 +20,8 @@
  */
 interface DescriptorInterface
 {
+    /**
+     * @return void
+     */
     public function describe(OutputInterface $output, object $object, array $options = []);
 }
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php b/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php
index b94e51dedb7a8..433cd41978b52 100644
--- a/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php
+++ b/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php
@@ -20,6 +20,8 @@ interface OutputFormatterInterface
 {
     /**
      * Sets the decorated flag.
+     *
+     * @return void
      */
     public function setDecorated(bool $decorated);
 
@@ -30,6 +32,8 @@ public function isDecorated(): bool;
 
     /**
      * Sets a new style.
+     *
+     * @return void
      */
     public function setStyle(string $name, OutputFormatterStyleInterface $style);
 
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php
index 7ed67d9a1120b..3b15098cbe5f4 100644
--- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php
+++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php
@@ -20,26 +20,36 @@ interface OutputFormatterStyleInterface
 {
     /**
      * Sets style foreground color.
+     *
+     * @return void
      */
     public function setForeground(?string $color);
 
     /**
      * Sets style background color.
+     *
+     * @return void
      */
     public function setBackground(?string $color);
 
     /**
      * Sets some specific style option.
+     *
+     * @return void
      */
     public function setOption(string $option);
 
     /**
      * Unsets some specific style option.
+     *
+     * @return void
      */
     public function unsetOption(string $option);
 
     /**
      * Sets multiple style options at once.
+     *
+     * @return void
      */
     public function setOptions(array $options);
 
diff --git a/src/Symfony/Component/Console/Helper/HelperInterface.php b/src/Symfony/Component/Console/Helper/HelperInterface.php
index 2762cdf05ca06..ab626c93852a2 100644
--- a/src/Symfony/Component/Console/Helper/HelperInterface.php
+++ b/src/Symfony/Component/Console/Helper/HelperInterface.php
@@ -20,6 +20,8 @@ interface HelperInterface
 {
     /**
      * Sets the helper set associated with this helper.
+     *
+     * @return void
      */
     public function setHelperSet(?HelperSet $helperSet);
 
diff --git a/src/Symfony/Component/Console/Input/InputAwareInterface.php b/src/Symfony/Component/Console/Input/InputAwareInterface.php
index 5a288de5d45fa..0ad27b4558dfd 100644
--- a/src/Symfony/Component/Console/Input/InputAwareInterface.php
+++ b/src/Symfony/Component/Console/Input/InputAwareInterface.php
@@ -21,6 +21,8 @@ interface InputAwareInterface
 {
     /**
      * Sets the Console Input.
+     *
+     * @return void
      */
     public function setInput(InputInterface $input);
 }
diff --git a/src/Symfony/Component/Console/Input/InputInterface.php b/src/Symfony/Component/Console/Input/InputInterface.php
index 3af991a76fbb8..aaed5fd01dba6 100644
--- a/src/Symfony/Component/Console/Input/InputInterface.php
+++ b/src/Symfony/Component/Console/Input/InputInterface.php
@@ -61,6 +61,8 @@ public function getParameterOption(string|array $values, string|bool|int|float|a
     /**
      * Binds the current Input instance with the given arguments and options.
      *
+     * @return void
+     *
      * @throws RuntimeException
      */
     public function bind(InputDefinition $definition);
@@ -68,6 +70,8 @@ public function bind(InputDefinition $definition);
     /**
      * Validates the input.
      *
+     * @return void
+     *
      * @throws RuntimeException When not enough arguments are given
      */
     public function validate();
@@ -91,6 +95,8 @@ public function getArgument(string $name);
     /**
      * Sets an argument value by name.
      *
+     * @return void
+     *
      * @throws InvalidArgumentException When argument given doesn't exist
      */
     public function setArgument(string $name, mixed $value);
@@ -119,6 +125,8 @@ public function getOption(string $name);
     /**
      * Sets an option value by name.
      *
+     * @return void
+     *
      * @throws InvalidArgumentException When option given doesn't exist
      */
     public function setOption(string $name, mixed $value);
@@ -135,6 +143,8 @@ public function isInteractive(): bool;
 
     /**
      * Sets the input interactivity.
+     *
+     * @return void
      */
     public function setInteractive(bool $interactive);
 }
diff --git a/src/Symfony/Component/Console/Input/StreamableInputInterface.php b/src/Symfony/Component/Console/Input/StreamableInputInterface.php
index d7e462f244431..4b95fcb11ea4e 100644
--- a/src/Symfony/Component/Console/Input/StreamableInputInterface.php
+++ b/src/Symfony/Component/Console/Input/StreamableInputInterface.php
@@ -25,6 +25,8 @@ interface StreamableInputInterface extends InputInterface
      * This is mainly useful for testing purpose.
      *
      * @param resource $stream The input stream
+     *
+     * @return void
      */
     public function setStream($stream);
 
diff --git a/src/Symfony/Component/Console/Output/ConsoleOutputInterface.php b/src/Symfony/Component/Console/Output/ConsoleOutputInterface.php
index 6b4babc6dda8f..9c0049c8f9d36 100644
--- a/src/Symfony/Component/Console/Output/ConsoleOutputInterface.php
+++ b/src/Symfony/Component/Console/Output/ConsoleOutputInterface.php
@@ -24,6 +24,9 @@ interface ConsoleOutputInterface extends OutputInterface
      */
     public function getErrorOutput(): OutputInterface;
 
+    /**
+     * @return void
+     */
     public function setErrorOutput(OutputInterface $error);
 
     public function section(): ConsoleSectionOutput;
diff --git a/src/Symfony/Component/Console/Output/OutputInterface.php b/src/Symfony/Component/Console/Output/OutputInterface.php
index bc927c51e9d26..f5ab9182f6b0a 100644
--- a/src/Symfony/Component/Console/Output/OutputInterface.php
+++ b/src/Symfony/Component/Console/Output/OutputInterface.php
@@ -36,6 +36,8 @@ interface OutputInterface
      * @param bool $newline Whether to add a newline
      * @param int  $options A bitmask of options (one of the OUTPUT or VERBOSITY constants),
      *                      0 is considered the same as self::OUTPUT_NORMAL | self::VERBOSITY_NORMAL
+     *
+     * @return void
      */
     public function write(string|iterable $messages, bool $newline = false, int $options = 0);
 
@@ -44,11 +46,15 @@ public function write(string|iterable $messages, bool $newline = false, int $opt
      *
      * @param int $options A bitmask of options (one of the OUTPUT or VERBOSITY constants),
      *                     0 is considered the same as self::OUTPUT_NORMAL | self::VERBOSITY_NORMAL
+     *
+     * @return void
      */
     public function writeln(string|iterable $messages, int $options = 0);
 
     /**
      * Sets the verbosity of the output.
+     *
+     * @return void
      */
     public function setVerbosity(int $level);
 
@@ -87,6 +93,9 @@ public function setDecorated(bool $decorated);
      */
     public function isDecorated(): bool;
 
+    /**
+     * @return void
+     */
     public function setFormatter(OutputFormatterInterface $formatter);
 
     /**
diff --git a/src/Symfony/Component/Console/Style/StyleInterface.php b/src/Symfony/Component/Console/Style/StyleInterface.php
index 0bb1233946ec7..e25a65bd247bf 100644
--- a/src/Symfony/Component/Console/Style/StyleInterface.php
+++ b/src/Symfony/Component/Console/Style/StyleInterface.php
@@ -20,51 +20,71 @@ interface StyleInterface
 {
     /**
      * Formats a command title.
+     *
+     * @return void
      */
     public function title(string $message);
 
     /**
      * Formats a section title.
+     *
+     * @return void
      */
     public function section(string $message);
 
     /**
      * Formats a list.
+     *
+     * @return void
      */
     public function listing(array $elements);
 
     /**
      * Formats informational text.
+     *
+     * @return void
      */
     public function text(string|array $message);
 
     /**
      * Formats a success result bar.
+     *
+     * @return void
      */
     public function success(string|array $message);
 
     /**
      * Formats an error result bar.
+     *
+     * @return void
      */
     public function error(string|array $message);
 
     /**
      * Formats an warning result bar.
+     *
+     * @return void
      */
     public function warning(string|array $message);
 
     /**
      * Formats a note admonition.
+     *
+     * @return void
      */
     public function note(string|array $message);
 
     /**
      * Formats a caution admonition.
+     *
+     * @return void
      */
     public function caution(string|array $message);
 
     /**
      * Formats a table.
+     *
+     * @return void
      */
     public function table(array $headers, array $rows);
 
@@ -90,21 +110,29 @@ public function choice(string $question, array $choices, mixed $default = null):
 
     /**
      * Add newline(s).
+     *
+     * @return void
      */
     public function newLine(int $count = 1);
 
     /**
      * Starts the progress output.
+     *
+     * @return void
      */
     public function progressStart(int $max = 0);
 
     /**
      * Advances the progress output X steps.
+     *
+     * @return void
      */
     public function progressAdvance(int $step = 1);
 
     /**
      * Finishes the progress output.
+     *
+     * @return void
      */
     public function progressFinish();
 }
diff --git a/src/Symfony/Component/DependencyInjection/Argument/ArgumentInterface.php b/src/Symfony/Component/DependencyInjection/Argument/ArgumentInterface.php
index d27a7bfe4beb9..3b39f36625cb2 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/ArgumentInterface.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/ArgumentInterface.php
@@ -20,5 +20,8 @@ interface ArgumentInterface
 {
     public function getValues(): array;
 
+    /**
+     * @return void
+     */
     public function setValues(array $values);
 }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php b/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php
index 308500605893d..2ad4a048ba8f4 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php
@@ -22,6 +22,8 @@ interface CompilerPassInterface
 {
     /**
      * You can modify the container here before it is dumped to PHP code.
+     *
+     * @return void
      */
     public function process(ContainerBuilder $container);
 }
diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
index c2280a22fd07b..084a321ab52f5 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
@@ -20,6 +20,8 @@ interface ContainerAwareInterface
 {
     /**
      * Sets the container.
+     *
+     * @return void
      */
     public function setContainer(?ContainerInterface $container);
 }
diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
index 9e97fb71fc41e..d2f4c343a12d7 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerInterface.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
@@ -30,6 +30,9 @@ interface ContainerInterface extends PsrContainerInterface
     public const IGNORE_ON_INVALID_REFERENCE = 3;
     public const IGNORE_ON_UNINITIALIZED_REFERENCE = 4;
 
+    /**
+     * @return void
+     */
     public function set(string $id, ?object $service);
 
     /**
@@ -56,5 +59,8 @@ public function getParameter(string $name);
 
     public function hasParameter(string $name): bool;
 
+    /**
+     * @return void
+     */
     public function setParameter(string $name, array|bool|string|int|float|\UnitEnum|null $value);
 }
diff --git a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php b/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php
index 11cda00cc57b1..bd57eef7334d0 100644
--- a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php
+++ b/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php
@@ -25,6 +25,8 @@ interface ExtensionInterface
      *
      * @param array<array<mixed>> $configs
      *
+     * @return void
+     *
      * @throws \InvalidArgumentException When provided tag is not defined in this extension
      */
     public function load(array $configs, ContainerBuilder $container);
diff --git a/src/Symfony/Component/DependencyInjection/Extension/PrependExtensionInterface.php b/src/Symfony/Component/DependencyInjection/Extension/PrependExtensionInterface.php
index 5bd18d79feac9..0df94e1092fa5 100644
--- a/src/Symfony/Component/DependencyInjection/Extension/PrependExtensionInterface.php
+++ b/src/Symfony/Component/DependencyInjection/Extension/PrependExtensionInterface.php
@@ -17,6 +17,8 @@ interface PrependExtensionInterface
 {
     /**
      * Allow an extension to prepend the extension configurations.
+     *
+     * @return void
      */
     public function prepend(ContainerBuilder $container);
 }
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBagInterface.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBagInterface.php
index 7c014e9b7c621..eeff6538c566e 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBagInterface.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBagInterface.php
@@ -33,6 +33,8 @@ public function all(): array;
      *
      * @param TValue $value
      *
+     * @return mixed
+     *
      * @psalm-return (TValue is scalar ? array|scalar : array<array|scalar>)
      *
      * @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
index 0ac3323ff4a59..18ddfde147d0c 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
@@ -24,6 +24,8 @@ interface ParameterBagInterface
     /**
      * Clears all parameters.
      *
+     * @return void
+     *
      * @throws LogicException if the ParameterBagInterface cannot be cleared
      */
     public function clear();
@@ -31,6 +33,8 @@ public function clear();
     /**
      * Adds parameters to the service container parameters.
      *
+     * @return void
+     *
      * @throws LogicException if the parameter cannot be added
      */
     public function add(array $parameters);
@@ -49,12 +53,16 @@ public function get(string $name): array|bool|string|int|float|\UnitEnum|null;
 
     /**
      * Removes a parameter.
+     *
+     * @return void
      */
     public function remove(string $name);
 
     /**
      * Sets a service container parameter.
      *
+     * @return void
+     *
      * @throws LogicException if the parameter cannot be set
      */
     public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value);
@@ -66,12 +74,16 @@ public function has(string $name): bool;
 
     /**
      * Replaces parameter placeholders (%name%) by their values for all parameters.
+     *
+     * @return void
      */
     public function resolve();
 
     /**
      * Replaces parameter placeholders (%name%) by their values.
      *
+     * @return mixed
+     *
      * @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
      */
     public function resolveValue(mixed $value);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php
index fb23f570162c6..5877f74de373a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php
@@ -54,11 +54,8 @@ public function testProcess()
 
 class DummyExtension extends Extension
 {
-    private $alias;
-
-    public function __construct($alias)
+    public function __construct(private readonly string $alias)
     {
-        $this->alias = $alias;
     }
 
     public function getAlias(): string
@@ -66,11 +63,11 @@ public function getAlias(): string
         return $this->alias;
     }
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $container->register($this->alias);
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/Merge
10000
ExtensionConfigurationPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
index 007cb61130e54..110672384cf2c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
@@ -174,7 +174,7 @@ public function getConfiguration(array $config, ContainerBuilder $container): ?C
         return new FooConfiguration();
     }
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
@@ -190,7 +190,7 @@ public function load(array $configs, ContainerBuilder $container)
 
 class BarExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $container->resolveEnvPlaceholders('%env(int:FOO)%', true);
     }
@@ -208,7 +208,7 @@ public function getConfiguration(array $config, ContainerBuilder $container): ?C
         return new FooConfiguration();
     }
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         throw new \Exception();
     }
@@ -240,7 +240,7 @@ public function getConfiguration(array $config, ContainerBuilder $container): ?C
         return new TestCccConfiguration();
     }
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = $this->getConfiguration($configs, $container);
         $this->processConfiguration($configuration, $configs);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
index ffb05d78c78fc..9c82e3d8d32e7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
@@ -389,7 +389,7 @@ public function getConfiguration(array $config, ContainerBuilder $container): ?C
         return $this->configuration;
     }
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         if (!array_filter($configs)) {
             return;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index 704e73a04f6d2..f3d0bb270cb19 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -151,11 +151,11 @@ public function testDeprecateParameterThrowsWhenParameterIsUndefined()
     public function testDeprecateParameterThrowsWhenParameterBagIsNotInternal()
     {
         $builder = new ContainerBuilder(new class() implements ParameterBagInterface {
-            public function clear()
+            public function clear(): void
             {
             }
 
-            public function add(array $parameters)
+            public function add(array $parameters): void
             {
             }
 
@@ -169,11 +169,11 @@ public function get(string $name): array|bool|string|int|float|\UnitEnum|null
                 return null;
             }
 
-            public function remove(string $name)
+            public function remove(string $name): void
             {
             }
 
-            public function set(string $name, \UnitEnum|float|int|bool|array|string|null $value)
+            public function set(string $name, \UnitEnum|float|int|bool|array|string|null $value): void
             {
             }
 
@@ -182,12 +182,13 @@ public function has(string $name): bool
                 return false;
             }
 
-            public function resolve()
+            public function resolve(): void
             {
             }
 
-            public function resolveValue(mixed $value)
+            public function resolveValue(mixed $value): mixed
             {
+                return null;
             }
 
             public function escapeValue(mixed $value): mixed
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 765b847d6e40e..5cf5c2c8b9889 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -959,7 +959,7 @@ public function testServiceSubscriber()
         $container->register(TestDefinition1::class, TestDefinition1::class)->setPublic(true);
 
         $container->addCompilerPass(new class() implements CompilerPassInterface {
-            public function process(ContainerBuilder $container)
+            public function process(ContainerBuilder $container): void
             {
                 $container->setDefinition('late_alias', new Definition(TestDefinition1::class))->setPublic(true);
                 $container->setAlias(TestDefinition1::class, 'late_alias')->setPublic(true);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Extension/ExtensionTest.php b/src/Symfony/Component/DependencyInjection/Tests/Extension/ExtensionTest.php
index 48d8b0078688e..d2b5128c0f8e6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Extension/ExtensionTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Extension/ExtensionTest.php
@@ -83,7 +83,7 @@ public function testInvalidConfiguration()
 
 class EnableableExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/InvalidConfig/InvalidConfigExtension.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/InvalidConfig/InvalidConfigExtension.php
index d11d0dfcaa166..75d135569ca56 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/InvalidConfig/InvalidConfigExtension.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/InvalidConfig/InvalidConfigExtension.php
@@ -7,7 +7,7 @@
 
 class InvalidConfigExtension extends BaseExtension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/SemiValidConfig/SemiValidConfigExtension.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/SemiValidConfig/SemiValidConfigExtension.php
index 4e84a2d15f617..8ef45018bdaab 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/SemiValidConfig/SemiValidConfigExtension.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/SemiValidConfig/SemiValidConfigExtension.php
@@ -7,7 +7,7 @@
 
 class SemiValidConfigExtension extends BaseExtension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/ValidConfig/ValidConfigExtension.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/ValidConfig/ValidConfigExtension.php
index 2ae903de0a335..83b4dbcaf9bb0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/ValidConfig/ValidConfigExtension.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/ValidConfig/ValidConfigExtension.php
@@ -11,7 +11,7 @@ public function __construct($optional = null)
     {
     }
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/AcmeExtension.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/AcmeExtension.php
index 6a61c5c077703..fc51017fef929 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/AcmeExtension.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/AcmeExtension.php
@@ -5,11 +5,9 @@
 
 class AcmeExtension implements ExtensionInterface
 {
-    public function load(array $configs, ContainerBuilder $configuration)
+    public function load(array $configs, ContainerBuilder $configuration): void
     {
         $configuration->setParameter('acme.configs', $configs);
-
-        return $configuration;
     }
 
     public function getXsdValidationBasePath(): string|false
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php
index 5e6f3dba90d12..c1145726b8255 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php
@@ -5,7 +5,7 @@
 
 class ProjectExtension implements ExtensionInterface
 {
-    public function load(array $configs, ContainerBuilder $configuration)
+    public function load(array $configs, ContainerBuilder $configuration): void
     {
         $configuration->setParameter('project.configs', $configs);
         $configs = array_filter($configs);
@@ -21,8 +21,6 @@ public function load(array $configs, ContainerBuilder $configuration)
 
         $configuration->register('project.service.foo', 'FooClass')->setPublic(true);
         $configuration->setParameter('project.parameter.foo', $config['foo'] ?? 'foobar');
-
-        return $configuration;
     }
 
     public function getXsdValidationBasePath(): string|false
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
index 54e024628fb1c..f1b982315ce52 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -67,6 +67,9 @@ public function addSubscriber(EventSubscriberInterface $subscriber)
         $this->dispatcher->addSubscriber($subscriber);
     }
 
+    /**
+     * @return void
+     */
     public function removeListener(string $eventName, callable|array $listener)
     {
         if (isset($this->wrappedListeners[$eventName])) {
@@ -79,12 +82,15 @@ public function removeListener(string $eventName, callable|array $listener)
             }
         }
 
-        return $this->dispatcher->removeListener($eventName, $listener);
+        $this->dispatcher->removeListener($eventName, $listener);
     }
 
+    /**
+     * @return void
+     */
     public function removeSubscriber(EventSubscriberInterface $subscriber)
     {
-        return $this->dispatcher->removeSubscriber($subscriber);
+        $this->dispatcher->removeSubscriber($subscriber);
     }
 
     public function getListeners(string $eventName = null): array
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
index 97a3017a44c88..3cd94c93886f8 100644
--- a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
+++ b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
@@ -27,6 +27,8 @@ interface EventDispatcherInterface extends ContractsEventDispatcherInterface
      *
      * @param int $priority The higher this value, the earlier an event
      *                      listener will be triggered in the chain (defaults to 0)
+     *
+     * @return void
      */
     public function addListener(string $eventName, callable $listener, int $priority = 0);
 
@@ -35,14 +37,21 @@ public function addListener(string $eventName, callable $listener, int $priority
      *
      * The subscriber is asked for all the events it is
      * interested in and added as a listener for these events.
+     *
+     * @return void
      */
     public function addSubscriber(EventSubscriberInterface $subscriber);
 
     /**
      * Removes an event listener from the specified events.
+     *
+     * @return void
      */
     public function removeListener(string $eventName, callable $listener);
 
+    /**
+     * @return void
+     */
     public function removeSubscriber(EventSubscriberInterface $subscriber);
 
     /**
diff --git a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
index 182ba080d54f6..d385d3f8339ec 100644
--- a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
@@ -30,21 +30,33 @@ public function dispatch(object $event, string $eventName = null): object
         return $this->dispatcher->dispatch($event, $eventName);
     }
 
+    /**
+     * @return never
+     */
     public function addListener(string $eventName, callable|array $listener, int $priority = 0)
     {
         throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
     }
 
+    /**
+     * @return never
+     */
     public function addSubscriber(EventSubscriberInterface $subscriber)
     {
         throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
     }
 
+    /**
+     * @return never
+     */
     public function removeListener(string $eventName, callable|array $listener)
     {
         throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
     }
 
+    /**
+     * @return never
+     */
     public function removeSubscriber(EventSubscriberInterface $subscriber)
     {
         throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
diff --git a/src/Symfony/Component/Form/FormTypeInterface.php b/src/Symfony/Component/Form/FormTypeInterface.php
index 2b9066a511f42..0c586d3f71b91 100644
--- a/src/Symfony/Component/Form/FormTypeInterface.php
+++ b/src/Symfony/Component/Form/FormTypeInterface.php
@@ -26,6 +26,8 @@ interface FormTypeInterface
      *
      * @param array<string, mixed> $options
      *
+     * @return void
+     *
      * @see FormTypeExtensionInterface::buildForm()
      */
     public function buildForm(FormBuilderInterface $builder, array $options);
@@ -42,6 +44,8 @@ public function buildForm(FormBuilderInterface $builder, array $options);
      *
      * @param array<string, mixed> $options
      *
+     * @return void
+     *
      * @see FormTypeExtensionInterface::buildView()
      */
     public function buildView(FormView $view, FormInterface $form, array $options);
@@ -59,12 +63,16 @@ public function buildView(FormView $view, FormInterface $form, array $options);
      *
      * @param array<string, mixed> $options
      *
+     * @return void
+     *
      * @see FormTypeExtensionInterface::finishView()
      */
     public function finishView(FormView $view, FormInterface $form, array $options);
 
     /**
      * Configures the options for this type.
+     *
+     * @return void
      */
     public function configureOptions(OptionsResolver $resolver);
 
diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
index 9cc1025fc7f64..4537099c2dc47 100644
--- a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
+++ b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
@@ -284,7 +284,7 @@ private function createCommandTester(array $namespaces = ['Symfony\Component\For
 
 class FooType extends AbstractType
 {
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setRequired('foo');
         $resolver->setDefined('bar');
diff --git a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
index 33641f23d8c08..3201ab9f72770 100644
--- a/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
+++ b/src/Symfony/Component/Form/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
@@ -159,7 +159,7 @@ private function getFixtureFilename($name)
 
 class FooType extends AbstractType
 {
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setRequired('foo');
         $resolver->setDefined('bar');
diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
index 7fcc80fee7de5..81418527eefe9 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
@@ -23,7 +23,7 @@
 
 class FormTypeCsrfExtensionTest_ChildType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         // The form needs a child in order to trigger CSRF protection by
         // default
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
index f712805e004e0..e1698e6b9b769 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
@@ -486,7 +486,7 @@ class Foo
     public $bar;
     public $baz;
 
-    public static function loadValidatorMetadata(ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata): void
     {
         $metadata->addPropertyConstraint('bar', new NotBlank());
     }
@@ -494,7 +494,7 @@ public static function loadValidatorMetadata(ClassMetadata $metadata)
 
 class FooType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('bar')
@@ -504,7 +504,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ;
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefault('data_class', Foo::class);
     }
@@ -516,7 +516,7 @@ class Review
     public $title;
     public $author;
 
-    public static function loadValidatorMetadata(ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata): void
     {
         $metadata->addPropertyConstraint('title', new NotBlank());
         $metadata->addPropertyConstraint('rating', new NotBlank());
@@ -525,7 +525,7 @@ public static function loadValidatorMetadata(ClassMetadata $metadata)
 
 class ReviewType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('rating', IntegerType::class, [
@@ -538,7 +538,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ;
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefault('data_class', Review::class);
     }
@@ -548,7 +548,7 @@ class Customer
 {
     public $email;
 
-    public static function loadValidatorMetadata(ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata): void
     {
         $metadata->addPropertyConstraint('email', new NotBlank());
     }
@@ -556,14 +556,14 @@ public static function loadValidatorMetadata(ClassMetadata $metadata)
 
 class CustomerType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('email')
         ;
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefault('data_class', Customer::class);
     }
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php b/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php
index 556166f5547ed..3e0bb40c2b172 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/AlternatingRowType.php
@@ -9,7 +9,7 @@
 
 class AlternatingRowType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
             $form = $event->getForm();
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php b/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php
index 84c988984f64d..a55dbfeaccea2 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/AuthorType.php
@@ -8,7 +8,7 @@
 
 class AuthorType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('firstName')
@@ -16,7 +16,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ;
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\Author',
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/BlockPrefixedFooTextType.php b/src/Symfony/Component/Form/Tests/Fixtures/BlockPrefixedFooTextType.php
index 3fda7a55dd14d..fa145a49c27e2 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/BlockPrefixedFooTextType.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/BlockPrefixedFooTextType.php
@@ -16,7 +16,7 @@
 
 class BlockPrefixedFooTextType extends AbstractType
 {
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefault('block_prefix', 'foo');
     }
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
index 7399dfe36bdba..38b22b87e5085 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceSubType.php
@@ -20,7 +20,7 @@
  */
 class ChoiceSubType extends AbstractType
 {
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(['expanded' => true]);
         $resolver->setNormalizer('choices', fn () => [
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php
index 1751531d19adc..3549763f16646 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/ChoiceTypeExtension.php
@@ -18,7 +18,7 @@ class ChoiceTypeExtension extends AbstractTypeExtension
 {
     public static $extendedType;
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefault('choices', [
             'A' => 'a',
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php
index 70c710e922fdf..477f36148e7b6 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBarExtension.php
@@ -16,12 +16,12 @@
 
 class FooTypeBarExtension extends AbstractTypeExtension
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder->setAttribute('bar', 'x');
     }
 
-    public function getAllowedOptionValues()
+    public function getAllowedOptionValues(): array
     {
         return [
             'a_or_b' => ['c'],
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBazExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBazExtension.php
index a11f158844732..9720439eb1515 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBazExtension.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/FooTypeBazExtension.php
@@ -16,7 +16,7 @@
 
 class FooTypeBazExtension extends AbstractTypeExtension
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder->setAttribute('baz', 'x');
     }
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
index ccd5b3f4890f5..0c7e29414443e 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/LazyChoiceTypeExtension.php
@@ -19,7 +19,7 @@ class LazyChoiceTypeExtension extends AbstractTypeExtension
 {
     public static $extendedType;
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefault('choice_loader', ChoiceList::lazy($this, fn () => [
             'Lazy A' => 'lazy_a',
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/NotMappedType.php b/src/Symfony/Component/Form/Tests/Fixtures/NotMappedType.php
index 14c340b8917af..3d55122e795ae 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/NotMappedType.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/NotMappedType.php
@@ -16,7 +16,7 @@
 
 class NotMappedType extends AbstractType
 {
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefault('mapped', false);
     }
diff --git a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
index 5490632552df6..02cb9641db053 100644
--- a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
+++ b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
@@ -24,11 +24,15 @@ interface BundleInterface extends ContainerAwareInterface
 {
     /**
      * Boots the Bundle.
+     *
+     * @return void
      */
     public function boot();
 
     /**
      * Shutdowns the Bundle.
+     *
+     * @return void
      */
     public function shutdown();
 
@@ -36,6 +40,8 @@ public function shutdown();
      * Builds the bundle.
      *
      * It is only ever called once when the cache is empty.
+     *
+     * @return void
      */
     public function build(ContainerBuilder $container);
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
index ec12d626a2e26..c22e05636ad71 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
@@ -58,7 +58,7 @@ public function testFooBundle()
 
 class LoadedExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $container->register('loaded.foo');
     }
@@ -66,7 +66,7 @@ public function load(array $configs, ContainerBuilder $container)
 
 class NotLoadedExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $container->register('not_loaded.bar');
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
index bac4be1e7c83f..44fd69f68cd95 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/DataCollector/CloneVarDataCollector.php
@@ -16,10 +16,7 @@
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
 use Symfony\Component\VarDumper\Cloner\Data;
 
-/**
- * @final since Symfony 6.3
- */
-class CloneVarDataCollector extends DataCollector
+final class CloneVarDataCollector extends DataCollector
 {
     private $varToClone;
 
@@ -28,26 +25,17 @@ public function __construct($varToClone)
         $this->varToClone = $varToClone;
     }
 
-    /**
-     * @return void
-     */
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         $this->data = $this->cloneVar($this->varToClone);
     }
 
-    /**
-     * @return void
-     */
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
     }
 
-    /**
-     * @return Data
-     */
-    public function getData()
+    public function getData(): Data
     {
         return $this->data;
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionPresentBundle/DependencyInjection/ExtensionPresentExtension.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionPresentBundle/DependencyInjection/ExtensionPresentExtension.php
index 108571718d1be..f1090571af869 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionPresentBundle/DependencyInjection/ExtensionPresentExtension.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionPresentBundle/DependencyInjection/ExtensionPresentExtension.php
@@ -16,7 +16,7 @@
 
 class ExtensionPresentExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
index dd05d5bf6bf36..9146e469100c7 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
@@ -17,15 +17,12 @@
 
 class KernelForTest extends Kernel
 {
-    private $fakeContainer;
-
-    public function __construct(string $environment, bool $debug, bool $fakeContainer = true)
+    public function __construct(string $environment, bool $debug, private readonly bool $fakeContainer = true)
     {
         parent::__construct($environment, $debug);
-        $this->fakeContainer = $fakeContainer;
     }
 
-    public function getBundleMap()
+    public function getBundleMap(): array
     {
         return [];
     }
@@ -35,11 +32,11 @@ public function registerBundles(): iterable
         return [];
     }
 
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
     }
 
-    public function isBooted()
+    public function isBooted(): bool
     {
         return $this->booted;
     }
@@ -49,7 +46,7 @@ public function getProjectDir(): string
         return __DIR__;
     }
 
-    protected function initializeContainer()
+    protected function initializeContainer(): void
     {
         if ($this->fakeContainer) {
             $this->container = new ContainerBuilder();
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php
index 0a6470e6e6891..31c2044dc1ecb 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelWithoutBundles.php
@@ -22,7 +22,7 @@ public function registerBundles(): iterable
         return [];
     }
 
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
     }
 
@@ -31,7 +31,7 @@ public function getProjectDir(): string
         return __DIR__;
     }
 
-    protected function build(ContainerBuilder $container)
+    protected function build(ContainerBuilder $container): void
     {
         $container->setParameter('test_executed', true);
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index 98956c57fa028..a9fbc752d2d0e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -517,7 +517,7 @@ public function testKernelReset()
     public function testKernelExtension()
     {
         $kernel = new class() extends CustomProjectDirKernel implements ExtensionInterface {
-            public function load(array $configs, ContainerBuilder $container)
+            public function load(array $configs, ContainerBuilder $container): void
             {
                 $container->setParameter('test.extension-registered', true);
             }
@@ -726,7 +726,7 @@ class TestKernel implements HttpKernelInterface
 {
     public $terminateCalled = false;
 
-    public function terminate()
+    public function terminate(): void
     {
         $this->terminateCalled = true;
     }
@@ -745,15 +745,14 @@ class CustomProjectDirKernel extends Kernel implements WarmableInterface
 {
     public $warmedUp = false;
     private $baseDir;
-    private $buildContainer;
-    private $httpKernel;
 
-    public function __construct(\Closure $buildContainer = null, HttpKernelInterface $httpKernel = null, $env = 'custom')
-    {
+    public function __construct(
+        private readonly ?\Closure $buildContainer = null,
+        private readonly ?HttpKernelInterface $httpKernel = null,
+        $env = 'custom',
+    ) {
         parent::__construct($env, true);
 
-        $this->buildContainer = $buildContainer;
-        $this->httpKernel = $httpKernel;
     }
 
     public function registerBundles(): iterable
@@ -761,7 +760,7 @@ public function registerBundles(): iterable
         return [];
     }
 
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
     }
 
@@ -777,7 +776,7 @@ public function warmUp(string $cacheDir): array
         return [];
     }
 
-    protected function build(ContainerBuilder $container)
+    protected function build(ContainerBuilder $container): void
     {
         if ($build = $this->buildContainer) {
             $build($container);
@@ -798,7 +797,7 @@ public function __construct()
         Kernel::__construct('pass', true);
     }
 
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $container->setParameter('test.processed', true);
     }
diff --git a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
index 06340a61bb398..e9c90870fa5ea 100644
--- a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
+++ b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
@@ -76,10 +76,7 @@ public function aParentService(): Service1
     {
     }
 
-    /**
-     * @return ContainerInterface|null
-     */
-    public function setContainer(ContainerInterface $container)
+    public function setContainer(ContainerInterface $container): ?ContainerInterface
     {
         return $container;
     }

From 5973765432a436c637230efcecbc3adac97d9b68 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 16 Feb 2023 10:16:42 +0100
Subject: [PATCH 207/475] Fix tests

---
 .../Tests/Controller/ControllerResolverTest.php               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
index 5f2584b15744b..2c042917acc85 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
@@ -170,14 +170,14 @@ protected function createMockContainer()
 
 class ContainerAwareController implements ContainerAwareInterface
 {
-    private ?Container $container = null;
+    private ?ContainerInterface $container = null;
 
     public function setContainer(?ContainerInterface $container): void
     {
         $this->container = $container;
     }
 
-    public function getContainer(): ?Container
+    public function getContainer(): ?ContainerInterface
     {
         return $this->container;
     }

From 1eb0ae035092f672550fa06a8064406208deb4a4 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 16 Feb 2023 11:50:28 +0100
Subject: [PATCH 208/475] [Validator] Add missing return types to
 ExecutionContextInterface

---
 .../Context/ExecutionContextInterface.php          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
index c81eef8ab4659..365e0dd05c4f7 100644
--- a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
+++ b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
@@ -66,6 +66,8 @@ interface ExecutionContextInterface
      *
      * @param string|\Stringable $message The error message as a string or a stringable object
      * @param array              $params  The parameters substituted in the error message
+     *
+     * @return void
      */
     public function addViolation(string $message, array $params = []);
 
@@ -125,7 +127,7 @@ public function getObject(): ?object;
      * @internal Used by the validator engine. Should not be called by user
      *           code.
      */
-    public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath);
+    public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath): void;
 
     /**
      * Sets the currently validated group.
@@ -135,7 +137,7 @@ public function setNode(mixed $value, ?object $object, MetadataInterface $metada
      * @internal Used by the validator engine. Should not be called by user
      *           code.
      */
-    public function setGroup(?string $group);
+    public function setGroup(?string $group): void;
 
     /**
      * Sets the currently validated constraint.
@@ -143,7 +145,7 @@ public function setGroup(?string $group);
      * @internal Used by the validator engine. Should not be called by user
      *           code.
      */
-    public function setConstraint(Constraint $constraint);
+    public function setConstraint(Constraint $constraint): void;
 
     /**
      * Marks an object as validated in a specific validation group.
@@ -155,7 +157,7 @@ public function setConstraint(Constraint $constraint);
      * @internal Used by the validator engine. Should not be called by user
      *           code.
      */
-    public function markGroupAsValidated(string $cacheKey, string $groupHash);
+    public function markGroupAsValidated(string $cacheKey, string $groupHash): void;
 
     /**
      * Returns whether an object was validated in a specific validation group.
@@ -177,7 +179,7 @@ public function isGroupValidated(string $cacheKey, string $groupHash): bool;
      * @internal Used by the validator engine. Should not be called by user
      *           code.
      */
-    public function markConstraintAsValidated(string $cacheKey, string $constraintHash);
+    public function markConstraintAsValidated(string $cacheKey, string $constraintHash): void;
 
     /**
      * Returns whether a constraint was validated for an object.
@@ -199,7 +201,7 @@ public function isConstraintValidated(string $cacheKey, string $constraintHash):
      *
      * @see ObjectInitializerInterface
      */
-    public function markObjectAsInitialized(string $cacheKey);
+    public function markObjectAsInitialized(string $cacheKey): void;
 
     /**
      * Returns whether an object was initialized.

From 371ae2ec25b260e09b7bb82014f8150632cec119 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Thu, 16 Feb 2023 13:09:52 +0100
Subject: [PATCH 209/475] Fix expected missing return types

---
 .github/expected-missing-return-types.diff | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index 539497f37cf9f..1ca9191978941 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -12033,6 +12033,17 @@ index 7c960ffee1..3952a146b0 100644
 +    public function validate(mixed $value, Constraint $constraint): void
      {
          if (!$constraint instanceof Valid) {
+diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
+index 365e0dd05c..81c2698665 100644
+--- a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
++++ b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
+@@ -70,5 +70,5 @@ interface ExecutionContextInterface
+      * @return void
+      */
+-    public function addViolation(string $message, array $params = []);
++    public function addViolation(string $message, array $params = []): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php
 index b1680b7cd4..805d093001 100644
 --- a/src/Symfony/Component/Validator/DependencyInjection/AddAutoMappingConfigurationPass.php

From 63a86d92df1e8f0cb1e80c0f4dbe188b17993aa3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 16 Feb 2023 11:55:45 +0100
Subject: [PATCH 210/475] [Contracts] Add missing return types

---
 .github/expected-missing-return-types.diff           | 12 ++++++++++++
 .github/workflows/unit-tests.yml                     |  2 ++
 .../Validator/Type/UploadValidatorExtensionTest.php  |  2 +-
 .../Component/HttpClient/Response/MockResponse.php   |  9 ++++++---
 src/Symfony/Contracts/Service/ResetInterface.php     |  3 +++
 .../Contracts/Translation/LocaleAwareInterface.php   |  2 ++
 6 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index 1ca9191978941..e899e3aede6c4 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -3,6 +3,7 @@ sed -i 's/ *"\*\*\/Tests\/"//' composer.json
 composer u -o
 SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php
 head=$(sed '/^diff /Q' .github/expected-missing-return-types.diff)
+git checkout src/Symfony/Contracts/Service/ResetInterface.php
 (echo "$head" && echo && git diff -U2 src/) > .github/expected-missing-return-types.diff
 git checkout composer.json src/
 
@@ -13417,6 +13418,17 @@ index c1a77ad157..1e926dc83a 100644
 +    public function setParsedLine(int $parsedLine): void
      {
          $this->parsedLine = $parsedLine;
+diff --git a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
+index db40ba13e0..48928ca959 100644
+--- a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
++++ b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
+@@ -21,5 +21,5 @@ interface LocaleAwareInterface
+      * @throws \InvalidArgumentException If the locale contains invalid characters
+      */
+-    public function setLocale(string $locale);
++    public function setLocale(string $locale): void;
+ 
+     /**
 diff --git a/src/Symfony/Contracts/Translation/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php
 index e3b0adff05..19d90162ab 100644
 --- a/src/Symfony/Contracts/Translation/TranslatorTrait.php
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index a1b7732c2e020..cf7b5df215476 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -143,7 +143,9 @@ jobs:
           git add .
           composer install -q --optimize-autoloader
           SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php
+          git checkout src/Symfony/Contracts/Service/ResetInterface.php
           SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php # ensure the script is idempotent
+          git checkout src/Symfony/Contracts/Service/ResetInterface.php
           git diff --exit-code
 
       - name: Run tests
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
index 0533883f701f2..96c39c5cae524 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
@@ -42,7 +42,7 @@ public function trans($id, array $parameters = [], $domain = null, $locale = nul
         return 'translated max {{ max }}!';
     }
 
-    public function setLocale($locale)
+    public function setLocale($locale): void
     {
     }
 
diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php
index 350e9c49f85fa..63ec2b5df65f0 100644
--- a/src/Symfony/Component/HttpClient/Response/MockResponse.php
+++ b/src/Symfony/Component/HttpClient/Response/MockResponse.php
@@ -26,9 +26,7 @@
 class MockResponse implements ResponseInterface, StreamableInterface
 {
     use CommonResponseTrait;
-    use TransportResponseTrait {
-        doDestruct as public __destruct;
-    }
+    use TransportResponseTrait;
 
     private string|iterable $body;
     private array $requestOptions = [];
@@ -106,6 +104,11 @@ public function cancel(): void
         }
     }
 
+    public function __destruct()
+    {
+        $this->doDestruct();
+    }
+
     protected function close(): void
     {
         $this->inflate = null;
diff --git a/src/Symfony/Contracts/Service/ResetInterface.php b/src/Symfony/Contracts/Service/ResetInterface.php
index 1af1075eeeca7..a4f389b01f80d 100644
--- a/src/Symfony/Contracts/Service/ResetInterface.php
+++ b/src/Symfony/Contracts/Service/ResetInterface.php
@@ -26,5 +26,8 @@
  */
 interface ResetInterface
 {
+    /**
+     * @return void
+     */
     public function reset();
 }
diff --git a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
index 6923b977e453c..db40ba13e05bf 100644
--- a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
+++ b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
@@ -16,6 +16,8 @@ interface LocaleAwareInterface
     /**
      * Sets the current locale.
      *
+     * @return void
+     *
      * @throws \InvalidArgumentException If the locale contains invalid characters
      */
     public function setLocale(string $locale);

From c8b39b0e35a384b4144e749a2df21048854993af Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Fri, 17 Feb 2023 00:26:18 +0100
Subject: [PATCH 211/475] [Form] Add missing return types to interfaces

---
 .github/expected-missing-return-types.diff    | 159 +++++++++++++++++-
 .../Component/Form/DataMapperInterface.php    |  14 +-
 .../FormDataCollectorInterface.php            |  14 ++
 .../Form/FormRendererEngineInterface.php      |   2 +
 .../Component/Form/FormRendererInterface.php  |   2 +
 .../Form/FormTypeExtensionInterface.php       |   9 +
 .../Form/RequestHandlerInterface.php          |   2 +
 .../Form/ResolvedFormTypeInterface.php        |   6 +
 .../Extension/Core/Type/FormTypeTest.php      |  10 +-
 9 files changed, 206 insertions(+), 12 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index e899e3aede6c4..c048aa8c7eb46 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -5420,6 +5420,23 @@ index 9b6b830341..9c656316e4 100644
 +    protected function configure(): void
      {
          $this
+diff --git a/src/Symfony/Component/Form/DataMapperInterface.php b/src/Symfony/Component/Form/DataMapperInterface.php
+index 7979db836d..ac37f715f1 100644
+--- a/src/Symfony/Component/Form/DataMapperInterface.php
++++ b/src/Symfony/Component/Form/DataMapperInterface.php
+@@ -30,5 +30,5 @@ interface DataMapperInterface
+      * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported
+      */
+-    public function mapDataToForms(mixed $viewData, \Traversable $forms);
++    public function mapDataToForms(mixed $viewData, \Traversable $forms): void;
+ 
+     /**
+@@ -63,4 +63,4 @@ interface DataMapperInterface
+      * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported
+      */
+-    public function mapFormsToData(\Traversable $forms, mixed &$viewData);
++    public function mapFormsToData(\Traversable $forms, mixed &$viewData): void;
+ }
 diff --git a/src/Symfony/Component/Form/DataTransformerInterface.php b/src/Symfony/Component/Form/DataTransformerInterface.php
 index 85fb99d218..6cc654f681 100644
 --- a/src/Symfony/Component/Form/DataTransformerInterface.php
@@ -6332,6 +6349,59 @@ index 41a52e091e..fce936b740 100644
 +    public function postSubmit(FormEvent $event): void
      {
          if ($event->getForm()->isRoot()) {
+diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php
+index 346c101fe3..40ed4b5e8f 100644
+--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php
++++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php
+@@ -29,5 +29,5 @@ interface FormDataCollectorInterface extends DataCollectorInterface
+      * @return void
+      */
+-    public function collectConfiguration(FormInterface $form);
++    public function collectConfiguration(FormInterface $form): void;
+ 
+     /**
+@@ -36,5 +36,5 @@ interface FormDataCollectorInterface extends DataCollectorInterface
+      * @return void
+      */
+-    public function collectDefaultData(FormInterface $form);
++    public function collectDefaultData(FormInterface $form): void;
+ 
+     /**
+@@ -43,5 +43,5 @@ interface FormDataCollectorInterface extends DataCollectorInterface
+      * @return void
+      */
+-    public function collectSubmittedData(FormInterface $form);
++    public function collectSubmittedData(FormInterface $form): void;
+ 
+     /**
+@@ -50,5 +50,5 @@ interface FormDataCollectorInterface extends DataCollectorInterface
+      * @return void
+      */
+-    public function collectViewVariables(FormView $view);
++    public function collectViewVariables(FormView $view): void;
+ 
+     /**
+@@ -57,5 +57,5 @@ interface FormDataCollectorInterface extends DataCollectorInterface
+      * @return void
+      */
+-    public function associateFormWithView(FormInterface $form, FormView $view);
++    public function associateFormWithView(FormInterface $form, FormView $view): void;
+ 
+     /**
+@@ -67,5 +67,5 @@ interface FormDataCollectorInterface extends DataCollectorInterface
+      * @return void
+      */
+-    public function buildPreliminaryFormTree(FormInterface $form);
++    public function buildPreliminaryFormTree(FormInterface $form): void;
+ 
+     /**
+@@ -89,5 +89,5 @@ interface FormDataCollectorInterface extends DataCollectorInterface
+      * @return void
+      */
+-    public function buildFinalFormTree(FormInterface $form, FormView $view);
++    public function buildFinalFormTree(FormInterface $form, FormView $view): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
 index 6c8cf3ee24..0d8fba357e 100644
 --- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
@@ -6595,15 +6665,64 @@ index 18dec4946b..9272277b5c 100644
      {
          $this->engine->setTheme($view, $themes, $useDefaultThemes);
 diff --git a/src/Symfony/Component/Form/FormRendererEngineInterface.php b/src/Symfony/Component/Form/FormRendererEngineInterface.php
-index aa249270a0..3c9d04ff9a 100644
+index e7de3544a1..739c7b835e 100644
 --- a/src/Symfony/Component/Form/FormRendererEngineInterface.php
 +++ b/src/Symfony/Component/Form/FormRendererEngineInterface.php
-@@ -131,4 +131,4 @@ interface FormRendererEngineInterface
+@@ -28,5 +28,5 @@ interface FormRendererEngineInterface
+      * @return void
+      */
+-    public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true);
++    public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true): void;
+ 
+     /**
+@@ -133,4 +133,4 @@ interface FormRendererEngineInterface
       * @return string
       */
 -    public function renderBlock(FormView $view, mixed $resource, string $blockName, array $variables = []);
 +    public function renderBlock(FormView $view, mixed $resource, string $blockName, array $variables = []): string;
  }
+diff --git a/src/Symfony/Component/Form/FormRendererInterface.php b/src/Symfony/Component/Form/FormRendererInterface.php
+index 8e805727ce..188a668c77 100644
+--- a/src/Symfony/Component/Form/FormRendererInterface.php
++++ b/src/Symfony/Component/Form/FormRendererInterface.php
+@@ -35,5 +35,5 @@ interface FormRendererInterface
+      * @return void
+      */
+-    public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true);
++    public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true): void;
+ 
+     /**
+diff --git a/src/Symfony/Component/Form/FormTypeExtensionInterface.php b/src/Symfony/Component/Form/FormTypeExtensionInterface.php
+index 1937834515..25712a13d7 100644
+--- a/src/Symfony/Component/Form/FormTypeExtensionInterface.php
++++ b/src/Symfony/Component/Form/FormTypeExtensionInterface.php
+@@ -31,5 +31,5 @@ interface FormTypeExtensionInterface
+      * @see FormTypeInterface::buildForm()
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options);
++    public function buildForm(FormBuilderInterface $builder, array $options): void;
+ 
+     /**
+@@ -45,5 +45,5 @@ interface FormTypeExtensionInterface
+      * @see FormTypeInterface::buildView()
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options);
++    public function buildView(FormView $view, FormInterface $form, array $options): void;
+ 
+     /**
+@@ -59,10 +59,10 @@ interface FormTypeExtensionInterface
+      * @see FormTypeInterface::finishView()
+      */
+-    public function finishView(FormView $view, FormInterface $form, array $options);
++    public function finishView(FormView $view, FormInterface $form, array $options): void;
+ 
+     /**
+      * @return void
+      */
+-    public function configureOptions(OptionsResolver $resolver);
++    public function configureOptions(OptionsResolver $resolver): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Form/FormTypeGuesserInterface.php b/src/Symfony/Component/Form/FormTypeGuesserInterface.php
 index 61e2c5f80d..4d6b335474 100644
 --- a/src/Symfony/Component/Form/FormTypeGuesserInterface.php
@@ -6702,6 +6821,17 @@ index 11c4d4d9c0..a09361d59a 100644
 +    public function handleRequest(FormInterface $form, mixed $request = null): void
      {
          if (null !== $request) {
+diff --git a/src/Symfony/Component/Form/RequestHandlerInterface.php b/src/Symfony/Component/Form/RequestHandlerInterface.php
+index 39fd458ee4..ccd77ccecc 100644
+--- a/src/Symfony/Component/Form/RequestHandlerInterface.php
++++ b/src/Symfony/Component/Form/RequestHandlerInterface.php
+@@ -24,5 +24,5 @@ interface RequestHandlerInterface
+      * @return void
+      */
+-    public function handleRequest(FormInterface $form, mixed $request = null);
++    public function handleRequest(FormInterface $form, mixed $request = null): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Form/ResolvedFormType.php b/src/Symfony/Component/Form/ResolvedFormType.php
 index f05db1533b..0e67c63c66 100644
 --- a/src/Symfony/Component/Form/ResolvedFormType.php
@@ -6727,6 +6857,31 @@ index f05db1533b..0e67c63c66 100644
 +    public function finishView(FormView $view, FormInterface $form, array $options): void
      {
          $this->parent?->finishView($view, $form, $options);
+diff --git a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
+index e0b96a5ac3..7982e0cab3 100644
+--- a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
++++ b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
+@@ -60,5 +60,5 @@ interface ResolvedFormTypeInterface
+      * @return void
+      */
+-    public function buildForm(FormBuilderInterface $builder, array $options);
++    public function buildForm(FormBuilderInterface $builder, array $options): void;
+ 
+     /**
+@@ -69,5 +69,5 @@ interface ResolvedFormTypeInterface
+      * @return void
+      */
+-    public function buildView(FormView $view, FormInterface $form, array $options);
++    public function buildView(FormView $view, FormInterface $form, array $options): void;
+ 
+     /**
+@@ -78,5 +78,5 @@ interface ResolvedFormTypeInterface
+      * @return void
+      */
+-    public function finishView(FormView $view, FormInterface $form, array $options);
++    public function finishView(FormView $view, FormInterface $form, array $options): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php
 index 05a8e6b4c6..232bed6fac 100644
 --- a/src/Symfony/Component/HttpClient/CachingHttpClient.php
diff --git a/src/Symfony/Component/Form/DataMapperInterface.php b/src/Symfony/Component/Form/DataMapperInterface.php
index b668de3f35ebb..f04137aec64e4 100644
--- a/src/Symfony/Component/Form/DataMapperInterface.php
+++ b/src/Symfony/Component/Form/DataMapperInterface.php
@@ -22,8 +22,10 @@ interface DataMapperInterface
      * The method is responsible for calling {@link FormInterface::setData()}
      * on the children of compound forms, defining their underlying model data.
      *
-     * @param mixed                        $viewData View data of the compound form being initialized
-     * @param FormInterface[]|\Traversable $forms    A list of {@link FormInterface} instances
+     * @param mixed                              $viewData View data of the compound form being initialized
+     * @param \Traversable<mixed, FormInterface> $forms    A list of {@link FormInterface} instances
+     *
+     * @return void
      *
      * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported
      */
@@ -52,9 +54,11 @@ public function mapDataToForms(mixed $viewData, \Traversable $forms);
      * The model data can be an array or an object, so this second argument is always passed
      * by reference.
      *
-     * @param FormInterface[]|\Traversable $forms    A list of {@link FormInterface} instances
-     * @param mixed                        $viewData The compound form's view data that get mapped
-     *                                               its children model data
+     * @param \Traversable<mixed, FormInterface> $forms     A list of {@link FormInterface} instances
+     * @param mixed                              &$viewData The compound form's view data that get mapped
+     *                                                      its children model data
+     *
+     * @return void
      *
      * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported
      */
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php
index 0e1d32bfc857c..346c101fe32a8 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php
@@ -25,26 +25,36 @@ interface FormDataCollectorInterface extends DataCollectorInterface
 {
     /**
      * Stores configuration data of the given form and its children.
+     *
+     * @return void
      */
     public function collectConfiguration(FormInterface $form);
 
     /**
      * Stores the default data of the given form and its children.
+     *
+     * @return void
      */
     public function collectDefaultData(FormInterface $form);
 
     /**
      * Stores the submitted data of the given form and its children.
+     *
+     * @return void
      */
     public function collectSubmittedData(FormInterface $form);
 
     /**
      * Stores the view variables of the given form view and its children.
+     *
+     * @return void
      */
     public function collectViewVariables(FormView $view);
 
     /**
      * Specifies that the given objects represent the same conceptual form.
+     *
+     * @return void
      */
     public function associateFormWithView(FormInterface $form, FormView $view);
 
@@ -53,6 +63,8 @@ public function associateFormWithView(FormInterface $form, FormView $view);
      * a tree-like data structure.
      *
      * The result can be queried using {@link getData()}.
+     *
+     * @return void
      */
     public function buildPreliminaryFormTree(FormInterface $form);
 
@@ -73,6 +85,8 @@ public function buildPreliminaryFormTree(FormInterface $form);
      * tree, only the view data will be included in the result. If a
      * corresponding {@link FormInterface} exists otherwise, call
      * {@link associateFormWithView()} before calling this method.
+     *
+     * @return void
      */
     public function buildFinalFormTree(FormInterface $form, FormView $view);
 
diff --git a/src/Symfony/Component/Form/FormRendererEngineInterface.php b/src/Symfony/Component/Form/FormRendererEngineInterface.php
index aa249270a0688..e7de3544a17c4 100644
--- a/src/Symfony/Component/Form/FormRendererEngineInterface.php
+++ b/src/Symfony/Component/Form/FormRendererEngineInterface.php
@@ -24,6 +24,8 @@ interface FormRendererEngineInterface
      * @param FormView $view   The view to assign the theme(s) to
      * @param mixed    $themes The theme(s). The type of these themes
      *                         is open to the implementation.
+     *
+     * @return void
      */
     public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true);
 
diff --git a/src/Symfony/Component/Form/FormRendererInterface.php b/src/Symfo
10000
ny/Component/Form/FormRendererInterface.php
index 240cd14113e35..8e805727cea68 100644
--- a/src/Symfony/Component/Form/FormRendererInterface.php
+++ b/src/Symfony/Component/Form/FormRendererInterface.php
@@ -31,6 +31,8 @@ public function getEngine(): FormRendererEngineInterface;
      *                                   is open to the implementation.
      * @param bool     $useDefaultThemes If true, will use default themes specified
      *                                   in the renderer
+     *
+     * @return void
      */
     public function setTheme(FormView $view, mixed $themes, bool $useDefaultThemes = true);
 
diff --git a/src/Symfony/Component/Form/FormTypeExtensionInterface.php b/src/Symfony/Component/Form/FormTypeExtensionInterface.php
index 3c7b46ce9c7f2..1937834515ceb 100644
--- a/src/Symfony/Component/Form/FormTypeExtensionInterface.php
+++ b/src/Symfony/Component/Form/FormTypeExtensionInterface.php
@@ -26,6 +26,8 @@ interface FormTypeExtensionInterface
      *
      * @param array<string, mixed> $options
      *
+     * @return void
+     *
      * @see FormTypeInterface::buildForm()
      */
     public function buildForm(FormBuilderInterface $builder, array $options);
@@ -38,6 +40,8 @@ public function buildForm(FormBuilderInterface $builder, array $options);
      *
      * @param array<string, mixed> $options
      *
+     * @return void
+     *
      * @see FormTypeInterface::buildView()
      */
     public function buildView(FormView $view, FormInterface $form, array $options);
@@ -50,10 +54,15 @@ public function buildView(FormView $view, FormInterface $form, array $options);
      *
      * @param array<string, mixed> $options
      *
+     * @return void
+     *
      * @see FormTypeInterface::finishView()
      */
     public function finishView(FormView $view, FormInterface $form, array $options);
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver);
 
     /**
diff --git a/src/Symfony/Component/Form/RequestHandlerInterface.php b/src/Symfony/Component/Form/RequestHandlerInterface.php
index 8eb8f1a688ac5..39fd458ee40ca 100644
--- a/src/Symfony/Component/Form/RequestHandlerInterface.php
+++ b/src/Symfony/Component/Form/RequestHandlerInterface.php
@@ -20,6 +20,8 @@ interface RequestHandlerInterface
 {
     /**
      * Submits a form if it was submitted.
+     *
+     * @return void
      */
     public function handleRequest(FormInterface $form, mixed $request = null);
 
diff --git a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
index f101177701eba..e0b96a5ac36d1 100644
--- a/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
+++ b/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
@@ -56,6 +56,8 @@ public function createView(FormInterface $form, FormView $parent = null): FormVi
 
     /**
      * Configures a form builder for the type hierarchy.
+     *
+     * @return void
      */
     public function buildForm(FormBuilderInterface $builder, array $options);
 
@@ -63,6 +65,8 @@ public function buildForm(FormBuilderInterface $builder, array $options);
      * Configures a form view for the type hierarchy.
      *
      * It is called before the children of the view are built.
+     *
+     * @return void
      */
     public function buildView(FormView $view, FormInterface $form, array $options);
 
@@ -70,6 +74,8 @@ public function buildView(FormView $view, FormInterface $form, array $options);
      * Finishes a form view for the type hierarchy.
      *
      * It is called after the children of the view have been built.
+     *
+     * @return void
      */
     public function finishView(FormView $view, FormInterface $form, array $options);
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
index cb1bf802a52ac..be89c559f6d3c 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
@@ -883,14 +883,14 @@ public function getCurrency()
 
 class MoneyDataMapper implements DataMapperInterface
 {
-    public function mapDataToForms($data, $forms)
+    public function mapDataToForms(mixed $viewData, \Traversable $forms): void
     {
         $forms = iterator_to_array($forms);
-        $forms['amount']->setData($data ? $data->getAmount() : 0);
-        $forms['currency']->setData($data ? $data->getCurrency() : 'EUR');
+        $forms['amount']->setData($viewData ? $viewData->getAmount() : 0);
+        $forms['currency']->setData($viewData ? $viewData->getCurrency() : 'EUR');
     }
 
-    public function mapFormsToData($forms, &$data)
+    public function mapFormsToData(\Traversable $forms, mixed &$viewData): void
     {
         $forms = iterator_to_array($forms);
 
@@ -902,7 +902,7 @@ public function mapFormsToData($forms, &$data)
             throw $failure;
         }
 
-        $data = new Money(
+        $viewData = new Money(
             $forms['amount']->getData(),
             $forms['currency']->getData()
         );

From 421b46cb816f137adeffaaccf693d8940a4ff74a Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Fri, 17 Feb 2023 19:25:28 +0100
Subject: [PATCH 212/475] [Messenger] Allow to define batch size when using
 `BatchHandlerTrait` with `getBatchSize()`

---
 src/Symfony/Component/Messenger/CHANGELOG.md               | 1 +
 .../Component/Messenger/Handler/BatchHandlerTrait.php      | 7 ++++++-
 .../Tests/Middleware/HandleMessageMiddlewareTest.php       | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
index b60f066320d64..49eb0e52e21eb 100644
--- a/src/Symfony/Component/Messenger/CHANGELOG.md
+++ b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
    `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport` and
    `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransportFactory`
  * Allow passing a string instead of an array in `TransportNamesStamp`
+ * Allow to define batch size when using `BatchHandlerTrait` with `getBatchSize()`
 
 6.2
 ---
diff --git a/src/Symfony/Component/Messenger/Handler/BatchHandlerTrait.php b/src/Symfony/Component/Messenger/Handler/BatchHandlerTrait.php
index 07ce0791518e2..0e1cdccc16acc 100644
--- a/src/Symfony/Component/Messenger/Handler/BatchHandlerTrait.php
+++ b/src/Symfony/Component/Messenger/Handler/BatchHandlerTrait.php
@@ -55,7 +55,7 @@ private function handle(object $message, ?Acknowledger $ack): mixed
 
     private function shouldFlush(): bool
     {
-        return 10 <= \count($this->jobs);
+        return $this->getBatchSize() <= \count($this->jobs);
     }
 
     /**
@@ -64,4 +64,9 @@ private function shouldFlush(): bool
      * @list<array{0: object, 1: Acknowledger}> $jobs A list of pairs of messages and their corresponding acknowledgers
      */
     abstract private function process(array $jobs): void;
+
+    private function getBatchSize(): int
+    {
+        return 10;
+    }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php
index 63dccc8d0b695..4d54f83bb7767 100644
--- a/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php
@@ -179,9 +179,9 @@ public function __invoke(DummyMessage $message, Acknowledger $ack = null)
                 return $this->handle($message, $ack);
             }
 
-            private function shouldFlush()
+            private function getBatchSize(): int
             {
-                return 2 <= \count($this->jobs);
+                return 2;
             }
 
             private function process(array $jobs): void

From 3bb91bca7884618587206defee71f10641f4b093 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Sat, 18 Feb 2023 11:44:05 +0100
Subject: [PATCH 213/475] fix tests

---
 .../Bandwidth/Tests/BandwidthTransportFactoryTest.php  | 10 +++++-----
 .../Isendpro/Tests/IsendproTransportFactoryTest.php    | 10 +++++-----
 .../Tests/LineNotifyTransportFactoryTest.php           |  8 ++++----
 .../Mastodon/Tests/MastodonTransportFactoryTest.php    |  8 ++++----
 .../PagerDuty/Tests/PagerDutyTransportFactoryTest.php  |  8 ++++----
 .../Bridge/Plivo/Tests/PlivoTransportFactoryTest.php   | 10 +++++-----
 .../Tests/RingCentralTransportFactoryTest.php          | 10 +++++-----
 .../Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php |  5 -----
 .../Bridge/Termii/Tests/TermiiTransportFactoryTest.php | 10 +++++-----
 .../Twitter/Tests/TwitterTransportFactoryTest.php      |  8 ++++----
 10 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportFactoryTest.php
index e9115f0887e51..562b5e3c4824a 100644
--- a/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Bandwidth/Tests/BandwidthTransportFactoryTest.php
@@ -21,31 +21,31 @@ public function createFactory(): BandwidthTransportFactory
         return new BandwidthTransportFactory();
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
         yield ['bandwidth://host.test?from=0611223344&account_id=account_id&application_id=application_id&priority=priority', 'bandwidth://username:password@host.test?from=0611223344&account_id=account_id&application_id=application_id&priority=priority'];
         yield ['bandwidth://host.test?from=0611223344&account_id=account_id&application_id=application_id', 'bandwidth://username:password@host.test?from=0611223344&account_id=account_id&application_id=application_id'];
     }
 
-    public function incompleteDsnProvider(): iterable
+    public static function incompleteDsnProvider(): iterable
     {
         yield 'missing password' => ['bandwidth://username@default?account_id=account_id&application_id=application_id&priority=priority'];
     }
 
-    public function missingRequiredOptionProvider(): iterable
+    public static function missingRequiredOptionProvider(): iterable
     {
         yield 'missing option: from' => ['bandwidth://username:password@default?account_id=account_id&application_id=application_id&priority=priority'];
         yield 'missing option: account_id' => ['bandwidth://username:password@default?from=0611223344&application_id=application_id&priority=priority'];
         yield 'missing option: application_id' => ['bandwidth://username:password@default?from=0611223344&account_id=account_id&priority=priority'];
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [true, 'bandwidth://username:password@default?from=0611223344&account_id=account_id&application_id=application_id&priority=priority'];
         yield [false, 'somethingElse://username:password@default?from=0611223344&account_id=account_id&application_id=application_id&priority=priority'];
     }
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://username:password@default?from=0611223344&account_id=account_id&application_id=application_id&priority=priority'];
         yield ['somethingElse://username:password@default?account_id=account_id&application_id=application_id&priority=priority']; // missing "from" option
diff --git a/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportFactoryTest.php
index ceda78493ccd0..dc2f7a9d1914f 100644
--- a/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Isendpro/Tests/IsendproTransportFactoryTest.php
@@ -21,7 +21,7 @@ public function createFactory(): IsendproTransportFactory
         return new IsendproTransportFactory();
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
         yield [
             'isendpro://host.test?no_stop=0&sandbox=0',
@@ -54,23 +54,23 @@ public function createProvider(): iterable
         ];
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [true, 'isendpro://account_key_id@host?from=FROM'];
         yield [false, 'somethingElse://account_key_id@default'];
     }
 
-    public function incompleteDsnProvider(): iterable
+    public static function incompleteDsnProvider(): iterable
     {
         yield 'missing credentials' => ['isendpro://host?from=FROM'];
     }
 
-    public function missingRequiredOptionProvider(): iterable
+    public static function missingRequiredOptionProvider(): iterable
     {
         yield 'missing option: account_key_id' => ['isendpro://default'];
     }
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://account_key_id@default'];
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportFactoryTest.php
index 703cfe15aa8ab..8e5caa2d466ef 100644
--- a/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/LineNotify/Tests/LineNotifyTransportFactoryTest.php
@@ -22,13 +22,13 @@ public function createFactory(): LineNotifyTransportFactory
         return new LineNotifyTransportFactory();
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [true, 'linenotify://host'];
         yield [false, 'somethingElse://host'];
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
         yield [
             'linenotify://host.test',
@@ -36,12 +36,12 @@ public function createProvider(): iterable
         ];
     }
 
-    public function incompleteDsnProvider(): iterable
+    public static function incompleteDsnProvider(): iterable
     {
         yield 'missing token' => ['linenotify://host.test'];
     }
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://token@host'];
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportFactoryTest.php
index 08f87f7650497..a21f6ca6777e8 100644
--- a/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/Tests/MastodonTransportFactoryTest.php
@@ -24,7 +24,7 @@ public function createFactory(): MastodonTransportFactory
         return new MastodonTransportFactory();
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
         yield [
             'mastodon://host.test',
@@ -47,18 +47,18 @@ public function createProvider(): iterable
         ];
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [true, 'mastodon://token@host'];
         yield [false, 'somethingElse://token@host'];
     }
 
-    public function incompleteDsnProvider(): iterable
+    public static function incompleteDsnProvider(): iterable
     {
         yield 'missing token' => ['mastodon://host.test'];
     }
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://token@host'];
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportFactoryTest.php
index bbc96f24b0e4b..37c7cde49598c 100644
--- a/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/Tests/PagerDutyTransportFactoryTest.php
@@ -21,7 +21,7 @@ public function createFactory(): PagerDutyTransportFactory
         return new PagerDutyTransportFactory();
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
         yield [
             'pagerduty://subdomain.pagerduty.com',
@@ -30,19 +30,19 @@ public function createProvider(): iterable
         ];
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [true, 'pagerduty://host'];
         yield [false, 'somethingElse://host'];
     }
 
-    public function incompleteDsnProvider(): iterable
+    public static function incompleteDsnProvider(): iterable
     {
         yield 'missing token' => ['pagerduty://@host'];
         yield 'wrong host' => ['pagerduty://token@host.com'];
     }
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://token@host'];
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportFactoryTest.php
index fa5d29f5e3f83..baff73a029284 100644
--- a/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Plivo/Tests/PlivoTransportFactoryTest.php
@@ -21,28 +21,28 @@ public function createFactory(): PlivoTransportFactory
         return new PlivoTransportFactory();
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
         yield ['plivo://host.test?from=0611223344', 'plivo://authId:authToken@host.test?from=0611223344'];
     }
 
-    public function incompleteDsnProvider(): iterable
+    public static function incompleteDsnProvider(): iterable
     {
         yield 'missing auth token' => ['plivo://authId@default?from=FROM'];
     }
 
-    public function missingRequiredOptionProvider(): iterable
+    public static function missingRequiredOptionProvider(): iterable
     {
         yield 'missing option: from' => ['plivo://authId:authToken@default'];
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [true, 'plivo://authId:authToken@default?from=0611223344'];
         yield [false, 'somethingElse://authId:authToken@default?from=0611223344'];
     }
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://authId:authToken@default?from=0611223344'];
         yield ['somethingElse://authId:authToken@default']; // missing "from" option
diff --git a/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportFactoryTest.php
index 636aed7e70fd8..24de16eefe0b0 100644
--- a/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/RingCentral/Tests/RingCentralTransportFactoryTest.php
@@ -21,28 +21,28 @@ public function createFactory(): RingCentralTransportFactory
         return new RingCentralTransportFactory();
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
         yield ['ringcentral://host.test?from=0611223344', 'ringcentral://apiToken@host.test?from=0611223344'];
     }
 
-    public function incompleteDsnProvider(): iterable
+    public static function incompleteDsnProvider(): iterable
     {
         yield 'missing auth token' => ['ringcentral://@default?from=FROM'];
     }
 
-    public function missingRequiredOptionProvider(): iterable
+    public static function missingRequiredOptionProvider(): iterable
     {
         yield 'missing option: from' => ['ringcentral://apiToken@default'];
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [true, 'ringcentral://apiToken@default?from=0611223344'];
         yield [false, 'somethingElse://apiToken@default?from=0611223344'];
     }
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://apiToken@default?from=0611223344'];
         yield ['somethingElse://apiToken@default']; // missing "from" option
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php
index 314f12c96e9b4..02995eb4bad5a 100644
--- a/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Smsapi/Tests/SmsapiTransportFactoryTest.php
@@ -90,11 +90,6 @@ public static function incompleteDsnProvider(): iterable
         yield 'missing token' => ['smsapi://host.test?from=testFrom'];
     }
 
-    public static function missingRequiredOptionProvider(): iterable
-    {
-        yield 'missing option: from' => ['smsapi://token@host'];
-    }
-
     public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://token@host?from=testFrom'];
diff --git a/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportFactoryTest.php
index d831141c88f85..5d255b4a9f16a 100644
--- a/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Termii/Tests/TermiiTransportFactoryTest.php
@@ -21,29 +21,29 @@ public function createFactory(): TermiiTransportFactory
         return new TermiiTransportFactory();
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
         yield ['termii://host.test?from=0611223344&channel=generic', 'termii://apiKey@host.test?from=0611223344&channel=generic'];
     }
 
-    public function incompleteDsnProvider(): iterable
+    public static function incompleteDsnProvider(): iterable
     {
         yield 'missing auth ID' => ['termii://@default?from=FROM'];
     }
 
-    public function missingRequiredOptionProvider(): iterable
+    public static function missingRequiredOptionProvider(): iterable
     {
         yield 'missing option: from' => ['termii://apiKey@default?channel=generic'];
         yield 'missing option: channel' => ['termii://apiKey@default?from=0611223344'];
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [true, 'termii://apiKey@default?from=0611223344&channel=generic'];
         yield [false, 'somethingElse://apiKey@default?from=0611223344&channel=generic'];
     }
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://apiKey@default?from=0611223344&channel=generic'];
         yield ['somethingElse://apiKey@default']; // missing "from" option
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php
index a3f0bcb02139e..3238489dcc4c0 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/Tests/TwitterTransportFactoryTest.php
@@ -21,23 +21,23 @@ public function createFactory(): TwitterTransportFactory
         return new TwitterTransportFactory();
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
         yield ['twitter://host.test', 'twitter://A:B:C:D@host.test'];
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [true, 'twitter://default'];
         yield [false, 'somethingElse://default'];
     }
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://default'];
     }
 
-    public function incompleteDsnProvider(): iterable
+    public static function incompleteDsnProvider(): iterable
     {
         yield ['twitter://A:B@default', 'Invalid "twitter://default" notifier DSN: Access Token is missing'];
     }

From 9f0a6f217d58c85b53e28e81b6cdb5414ab3cdbb Mon Sep 17 00:00:00 2001
From: Antoine Makdessi <amakdessi@me.com>
Date: Sat, 18 Feb 2023 11:35:20 +0000
Subject: [PATCH 214/475] Update composer.json

---
 src/Symfony/Bundle/WebProfilerBundle/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
index a5aefe35b9baa..58e1081f245bb 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/composer.json
+++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -2,7 +2,7 @@
     "name": "symfony/web-profiler-bundle",
     "type": "symfony-bundle",
     "description": "Provides a development tool that gives detailed information about the execution of any request",
-    "keywords": [],
+    "keywords": ["dev"],
     "homepage": "https://symfony.com",
     "license": "MIT",
     "authors": [

From 80d8cc112cfbe30459d3e933197fd7ab4a89a2da Mon Sep 17 00:00:00 2001
From: Alan Poulain <contact@alanpoulain.eu>
Date: Thu, 16 Feb 2023 16:33:48 +0100
Subject: [PATCH 215/475] feat(di): add AsAlias attribute

---
 .../DependencyInjection/Attribute/AsAlias.php | 27 +++++++
 .../DependencyInjection/CHANGELOG.md          |  1 +
 .../DependencyInjection/Loader/FileLoader.php | 34 ++++++++-
 .../PrototypeAsAlias/AliasBarInterface.php    |  7 ++
 .../PrototypeAsAlias/AliasFooInterface.php    |  7 ++
 .../Fixtures/PrototypeAsAlias/WithAsAlias.php | 10 +++
 .../PrototypeAsAlias/WithAsAliasDuplicate.php | 10 +++
 .../WithAsAliasIdMultipleInterface.php        | 10 +++
 .../PrototypeAsAlias/WithAsAliasInterface.php | 10 +++
 .../PrototypeAsAlias/WithAsAliasMultiple.php  | 11 +++
 .../WithAsAliasMultipleInterface.php          | 10 +++
 .../Tests/Loader/FileLoaderTest.php           | 75 +++++++++++++++++++
 12 files changed, 210 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Attribute/AsAlias.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/AliasBarInterface.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/AliasFooInterface.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAlias.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasDuplicate.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasIdMultipleInterface.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasInterface.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasMultiple.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasMultipleInterface.php

diff --git a/src/Symfony/Component/DependencyInjection/Attribute/AsAlias.php b/src/Symfony/Component/DependencyInjection/Attribute/AsAlias.php
new file mode 100644
index 0000000000000..8068959899733
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Attribute/AsAlias.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Attribute;
+
+/**
+ * An attribute to tell under which alias a service should be registered or to use the implemented interface if no parameter is given.
+ *
+ * @author Alan Poulain <contact@alanpoulain.eu>
+ */
+#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]
+final class AsAlias
+{
+    public function __construct(
+        public ?string $id = null,
+        public bool $public = false,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index d40f439080c34..d4a0da19a799b 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
  * Deprecate undefined and numeric keys with `service_locator` config
  * Fail if Target attribute does not exist during compilation
  * Enable deprecating parameters with `ContainerBuilder::deprecateParameter()`
+ * Add `#[AsAlias]` attribute to tell under which alias a service should be registered or to use the implemented interface if no parameter is given
 
 6.2
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
index d6b046c9f6982..056b1658b5657 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -17,12 +17,15 @@
 use Symfony\Component\Config\Loader\FileLoader as BaseFileLoader;
 use Symfony\Component\Config\Loader\Loader;
 use Symfony\Component\Config\Resource\GlobResource;
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Attribute\AsAlias;
 use Symfony\Component\DependencyInjection\Attribute\When;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\RegisterAutoconfigureAttributesPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
 
 /**
  * FileLoader is the abstract class used by all built-in loaders that are file based.
@@ -38,6 +41,8 @@ abstract class FileLoader extends BaseFileLoader
     protected $instanceof = [];
     protected $interfaces = [];
     protected $singlyImplemented = [];
+    /** @var array<string, Alias> */
+    protected $aliases = [];
     protected $autoRegisterAliasesForSinglyImplementedInterfaces = true;
 
     public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null)
@@ -140,12 +145,37 @@ public function registerClasses(Definition $prototype, string $namespace, string
 
                     continue;
                 }
+                $interfaces = [];
                 foreach (class_implements($class, false) as $interface) {
                     $this->singlyImplemented[$interface] = ($this->singlyImplemented[$interface] ?? $class) !== $class ? false : $class;
+                    $interfaces[] = $interface;
+                }
+
+                if (!$autoconfigureAttributes) {
+                    continue;
+                }
+                $r = $this->container->getReflectionClass($class);
+                $defaultAlias = 1 === \count($interfaces) ? $interfaces[0] : null;
+                foreach ($r->getAttributes(AsAlias::class) as $attr) {
+                    /** @var AsAlias $attribute */
+                    $attribute = $attr->newInstance();
+                    $alias = $attribute->id ?? $defaultAlias;
+                    $public = $attribute->public;
+                    if (null === $alias) {
+                        throw new LogicException(sprintf('Alias cannot be automatically determined for class "%s". If you have used the #[AsAlias] attribute with a class implementing multiple interfaces, add the interface you want to alias to the first parameter of #[AsAlias].', $class));
+                    }
+                    if (isset($this->aliases[$alias])) {
+                        throw new LogicException(sprintf('The "%s" alias has already been defined with the #[AsAlias] attribute in "%s".', $alias, $this->aliases[$alias]));
+                    }
+                    $this->aliases[$alias] = new Alias($class, $public);
                 }
             }
         }
 
+        foreach ($this->aliases as $alias => $aliasDefinition) {
+            $this->container->setAlias($alias, $aliasDefinition);
+        }
+
         if ($this->autoRegisterAliasesForSinglyImplementedInterfaces) {
             $this->registerAliasesForSinglyImplementedInterfaces();
         }
@@ -157,12 +187,12 @@ public function registerClasses(Definition $prototype, string $namespace, string
     public function registerAliasesForSinglyImplementedInterfaces()
     {
         foreach ($this->interfaces as $interface) {
-            if (!empty($this->singlyImplemented[$interface]) && !$this->container->has($interface)) {
+            if (!empty($this->singlyImplemented[$interface]) && !isset($this->aliases[$interface]) && !$this->container->has($interface)) {
                 $this->container->setAlias($interface, $this->singlyImplemented[$interface]);
             }
         }
 
-        $this->interfaces = $this->singlyImplemented = [];
+        $this->interfaces = $this->singlyImplemented = $this->aliases = [];
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/AliasBarInterface.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/AliasBarInterface.php
new file mode 100644
index 0000000000000..732d8ab58f7ca
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/AliasBarInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias;
+
+interface AliasBarInterface
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/AliasFooInterface.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/AliasFooInterface.php
new file mode 100644
index 0000000000000..4cc0822fecc90
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/AliasFooInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias;
+
+interface AliasFooInterface
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAlias.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAlias.php
new file mode 100644
index 0000000000000..78e1409627d97
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAlias.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias;
+
+use Symfony\Component\DependencyInjection\Attribute\AsAlias;
+
+#[AsAlias(id: AliasFooInterface::class)]
+class WithAsAlias
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasDuplicate.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasDuplicate.php
new file mode 100644
index 0000000000000..b274464c3fea4
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasDuplicate.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias;
+
+use Symfony\Component\DependencyInjection\Attribute\AsAlias;
+
+#[AsAlias(id: AliasFooInterface::class)]
+class WithAsAliasDuplicate
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasIdMultipleInterface.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasIdMultipleInterface.php
new file mode 100644
index 0000000000000..4b814c3b947fc
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasIdMultipleInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias;
+
+use Symfony\Component\DependencyInjection\Attribute\AsAlias;
+
+#[AsAlias(id: AliasBarInterface::class)]
+class WithAsAliasIdMultipleInterface implements AliasFooInterface, AliasBarInterface
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasInterface.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasInterface.php
new file mode 100644
index 0000000000000..948961bc8c5f6
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias;
+
+use Symfony\Component\DependencyInjection\Attribute\AsAlias;
+
+#[AsAlias]
+class WithAsAliasInterface implements AliasFooInterface
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasMultiple.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasMultiple.php
new file mode 100644
index 0000000000000..3b0045bdff174
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasMultiple.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias;
+
+use Symfony\Component\DependencyInjection\Attribute\AsAlias;
+
+#[AsAlias(id: AliasFooInterface::class, public: true)]
+#[AsAlias(id: 'some-alias')]
+class WithAsAliasMultiple
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasMultipleInterface.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasMultipleInterface.php
new file mode 100644
index 0000000000000..10aba97fd7cff
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/PrototypeAsAlias/WithAsAliasMultipleInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias;
+
+use Symfony\Component\DependencyInjection\Attribute\AsAlias;
+
+#[AsAlias]
+class WithAsAliasMultipleInterface implements AliasFooInterface, AliasBarInterface
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
index 8e4eabab2695d..96278fb758076 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -14,10 +14,12 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Loader\FileLoader;
 use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
@@ -32,6 +34,12 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\OtherDir\Baz;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\BarInterface;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\AliasBarInterface;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\AliasFooInterface;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\WithAsAlias;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\WithAsAliasIdMultipleInterface;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\WithAsAliasInterface;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\WithAsAliasMultiple;
 
 class FileLoaderTest extends TestCase
 {
@@ -274,6 +282,73 @@ public function testRegisterClassesWithWhenEnv(?string $env, bool $expected)
 
         $this->assertSame($expected, $container->has(Foo::class));
     }
+
+    /**
+     * @dataProvider provideResourcesWithAsAliasAttributes
+     */
+    public function testRegisterClassesWithAsAlias(string $resource, array $expectedAliases)
+    {
+        $container = new ContainerBuilder();
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
+        $loader->registerClasses(
+            (new Definition())->setAutoconfigured(true),
+            'Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\\',
+            $resource
+        );
+
+        $this->assertEquals($expectedAliases, $container->getAliases());
+    }
+
+    public static function provideResourcesWithAsAliasAttributes(): iterable
+    {
+        yield 'Private' => ['PrototypeAsAlias/{WithAsAlias,AliasFooInterface}.php', [AliasFooInterface::class => new Alias(WithAsAlias::class)]];
+        yield 'Interface' => ['PrototypeAsAlias/{WithAsAliasInterface,AliasFooInterface}.php', [AliasFooInterface::class => new Alias(WithAsAliasInterface::class)]];
+        yield 'Multiple' => ['PrototypeAsAlias/{WithAsAliasMultiple,AliasFooInterface}.php', [
+            AliasFooInterface::class => new Alias(WithAsAliasMultiple::class, true),
+            'some-alias' => new Alias(WithAsAliasMultiple::class),
+        ]];
+        yield 'Multiple with id' => ['PrototypeAsAlias/{WithAsAliasIdMultipleInterface,AliasBarInterface,AliasFooInterface}.php', [
+            AliasBarInterface::class => new Alias(WithAsAliasIdMultipleInterface::class),
+            AliasFooInterface::class => new Alias(WithAsAliasIdMultipleInterface::class),
+        ]];
+    }
+
+    /**
+     * @dataProvider provideResourcesWithDuplicatedAsAliasAttributes
+     */
+    public function testRegisterClassesWithDuplicatedAsAlias(string $resource, string $expectedExceptionMessage)
+    {
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage($expectedExceptionMessage);
+
+        $container = new ContainerBuilder();
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
+        $loader->registerClasses(
+            (new Definition())->setAutoconfigured(true),
+            'Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\\',
+            $resource
+        );
+    }
+
+    public static function provideResourcesWithDuplicatedAsAliasAttributes(): iterable
+    {
+        yield 'Duplicated' => ['PrototypeAsAlias/{WithAsAlias,WithAsAliasDuplicate,AliasFooInterface}.php', 'The "Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\AliasFooInterface" alias has already been defined with the #[AsAlias] attribute in "Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\WithAsAlias".'];
+        yield 'Interface duplicated' => ['PrototypeAsAlias/{WithAsAliasInterface,WithAsAlias,AliasFooInterface}.php', 'The "Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\AliasFooInterface" alias has already been defined with the #[AsAlias] attribute in "Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\WithAsAlias".'];
+    }
+
+    public function testRegisterClassesWithAsAliasAndImplementingMultipleInterfaces()
+    {
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('Alias cannot be automatically determined for class "Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\WithAsAliasMultipleInterface". If you have used the #[AsAlias] attribute with a class implementing multiple interfaces, add the interface you want to alias to the first parameter of #[AsAlias].');
+
+        $container = new ContainerBuilder();
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
+        $loader->registerClasses(
+            (new Definition())->setAutoconfigured(true),
+            'Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\\',
+            'PrototypeAsAlias/{WithAsAliasMultipleInterface,AliasBarInterface,AliasFooInterface}.php'
+        );
+    }
 }
 
 class TestFileLoader extends FileLoader

From 6f5226044d65a0b667ea04d86f32b711f35878ac Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Fri, 17 Feb 2023 22:11:20 +0100
Subject: [PATCH 216/475] Remove unused local variable

---
 src/Symfony/Component/Cache/Adapter/AbstractAdapter.php      | 2 +-
 src/Symfony/Component/Cache/LockRegistry.php                 | 1 -
 .../Component/Config/Resource/ReflectionClassResource.php    | 2 --
 src/Symfony/Component/Console/Helper/QuestionHelper.php      | 2 +-
 .../Component/DependencyInjection/Loader/XmlFileLoader.php   | 2 +-
 src/Symfony/Component/ErrorHandler/DebugClassLoader.php      | 2 +-
 src/Symfony/Component/ErrorHandler/ErrorHandler.php          | 5 ++---
 src/Symfony/Component/HttpClient/Response/CurlResponse.php   | 4 ++--
 src/Symfony/Component/HttpKernel/Event/ControllerEvent.php   | 2 +-
 9 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
index 3b742a6bfaf54..d887fdc7b3329 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -47,7 +47,7 @@ protected function __construct(string $namespace = '', int $defaultLifetime = 0)
             static function ($key, $value, $isHit) {
                 $item = new CacheItem();
                 $item->key = $key;
-                $item->value = $v = $value;
+                $item->value = $value;
                 $item->isHit = $isHit;
                 $item->unpack();
 
diff --git a/src/Symfony/Component/Cache/LockRegistry.php b/src/Symfony/Component/Cache/LockRegistry.php
index c263a1c5c69a6..9339e6a2c5f0d 100644
--- a/src/Symfony/Component/Cache/LockRegistry.php
+++ b/src/Symfony/Component/Cache/LockRegistry.php
@@ -101,7 +101,6 @@ public static function compute(callable $callback, ItemInterface $item, bool &$s
 
         while (true) {
             try {
-                $locked = false;
                 // race to get the lock in non-blocking mode
                 $locked = flock($lock, \LOCK_EX | \LOCK_NB, $wouldBlock);
 
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
index 8498f94e40143..dbd47e66de25c 100644
--- a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
+++ b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -154,8 +154,6 @@ private function generateSignature(\ReflectionClass $class): iterable
             }
         }
 
-        $defined = \Closure::bind(static fn ($c) => \defined($c), null, $class->name);
-
         foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) as $m) {
             foreach ($m->getAttributes() as $a) {
                 $attributes[] = [$a->getName(), (string) $a];
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index c595ca1968b36..40c6a656638f8 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -159,7 +159,7 @@ private function getDefaultAnswer(Question $question): mixed
         }
 
         if ($validator = $question->getValidator()) {
-            return \call_user_func($question->getValidator(), $default);
+            return \call_user_func($validator, $default);
         } elseif ($question instanceof ChoiceQuestion) {
             $choices = $question->getChoices();
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 7dc85a69a1a0c..93a23052f6a6f 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -252,7 +252,7 @@ private function parseDefinition(\DOMElement $service, string $file, Definition
         foreach (['class', 'public', 'shared', 'synthetic', 'abstract'] as $key) {
             if ($value = $service->getAttribute($key)) {
                 $method = 'set'.$key;
-                $definition->$method($value = XmlUtils::phpize($value));
+                $definition->$method(XmlUtils::phpize($value));
             }
         }
 
diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
index 7aac2332e2b31..16af2d06321e4 100644
--- a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
+++ b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -758,7 +758,7 @@ private function darwinRealpath(string $real): string
                 if ('.' !== $f[0]) {
                     $dirFiles[$f] = $f;
                     if ($f === $file) {
-                        $kFile = $k = $file;
+                        $kFile = $file;
                     } elseif ($f !== $k = strtolower($f)) {
                         $dirFiles[$k] = $f;
                     }
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
index 581bfbee917de..d372c632ac39d 100644
--- a/src/Symfony/Component/ErrorHandler/ErrorHandler.php
+++ b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -452,11 +452,10 @@ public function handleError(int $type, string $message, string $file, int $line)
 
             if ($throw || $this->tracedErrors & $type) {
                 $backtrace = $errorAsException->getTrace();
-                $lightTrace = $this->cleanTrace($backtrace, $type, $file, $line, $throw);
-                ($this->configureException)($errorAsException, $lightTrace, $file, $line);
+                $backtrace = $this->cleanTrace($backtrace, $type, $file, $line, $throw);
+                ($this->configureException)($errorAsException, $backtrace, $file, $line);
             } else {
                 ($this->configureException)($errorAsException, []);
-                $backtrace = [];
             }
         }
 
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
index 66881d9e95ad7..8386b850fbab6 100644
--- a/src/Symfony/Component/HttpClient/Response/CurlResponse.php
+++ b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -168,7 +168,7 @@ public function __construct(CurlClientState $multi, \CurlHandle|string $ch, arra
         });
 
         $this->initializer = static function (self $response) {
-            $waitFor = curl_getinfo($ch = $response->handle, \CURLINFO_PRIVATE);
+            $waitFor = curl_getinfo($response->handle, \CURLINFO_PRIVATE);
 
             return 'H' === $waitFor[0];
         };
@@ -267,7 +267,7 @@ private static function schedule(self $response, array &$runningResponses): void
             $runningResponses[$i] = [$response->multi, [$response->id => $response]];
         }
 
-        if ('_0' === curl_getinfo($ch = $response->handle, \CURLINFO_PRIVATE)) {
+        if ('_0' === curl_getinfo($response->handle, \CURLINFO_PRIVATE)) {
             // Response already completed
             $response->multi->handlesActivity[$response->id][] = null;
             $response->multi->handlesActivity[$response->id][] = null !== $response->info['error'] ? new TransportException($response->info['error']) : null;
diff --git a/src/Symfony/Component/HttpKernel/Event/ControllerEvent.php b/src/Symfony/Component/HttpKernel/Event/ControllerEvent.php
index b012263b93a61..d07d886db0e5d 100644
--- a/src/Symfony/Component/HttpKernel/Event/ControllerEvent.php
+++ b/src/Symfony/Component/HttpKernel/Event/ControllerEvent.php
@@ -69,7 +69,7 @@ public function setController(callable $controller, array $attributes = null): v
 
         if (\is_array($controller) && method_exists(...$controller)) {
             $this->controllerReflector = new \ReflectionMethod(...$controller);
-        } elseif (\is_string($controller) && false !== $i = strpos($controller, '::')) {
+        } elseif (\is_string($controller) && str_contains($controller, '::')) {
             $this->controllerReflector = new \ReflectionMethod($controller);
         } else {
             $this->controllerReflector = new \ReflectionFunction($controller(...));

From 2ca9cf898892f229fcddefc201837c1c4db5453d Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Fri, 17 Feb 2023 21:43:42 +0100
Subject: [PATCH 217/475] [Mailer][Translation][Notifier] Remove some `static`
 occurrences that may cause unstable tests

---
 .../Transport/SesTransportFactoryTest.php     | 51 ++++++-------
 .../Transport/GmailTransportFactoryTest.php   | 12 ++--
 .../InfobipApiTransportFactoryTest.php        | 17 ++---
 .../MailPaceTransportFactoryTest.php          | 19 ++---
 .../MandrillTransportFactoryTest.php          | 25 +++----
 .../Transport/MailgunTransportFactoryTest.php | 27 +++----
 .../Transport/MailjetTransportFactoryTest.php | 19 ++---
 .../OhMySmtpTransportFactoryTest.php          | 19 ++---
 .../PostmarkTransportFactoryTest.php          | 23 +++---
 .../Mailer/Bridge/Postmark/composer.json      |  1 +
 .../SendgridTransportFactoryTest.php          | 19 ++---
 .../SendinblueTransportFactoryTest.php        | 14 ++--
 src/Symfony/Component/Mailer/CHANGELOG.md     | 14 ++--
 .../Mailer/Test/TransportFactoryTestCase.php  | 26 +++----
 .../Tests/Command/MailerTestCommandTest.php   | 12 ++--
 .../Transport/NullTransportFactoryTest.php    |  8 ++-
 .../SendmailTransportFactoryTest.php          | 10 +--
 .../Smtp/EsmtpTransportFactoryTest.php        | 29 ++++----
 .../Crowdin/Tests/CrowdinProviderTest.php     | 62 ++++++++--------
 .../Bridge/Loco/Tests/LocoProviderTest.php    | 72 +++++++++----------
 .../LocoProviderWithoutTranslatorBagTest.php  |  7 +-
 .../Lokalise/Tests/LokaliseProviderTest.php   | 44 ++++++------
 .../Component/Translation/CHANGELOG.md        | 14 ++--
 .../Translation/Test/ProviderTestCase.php     | 47 ++++++------
 24 files changed, 301 insertions(+), 290 deletions(-)

diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php
index 6e7d9e4670cbc..4452c9c571fe1 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php
@@ -13,6 +13,8 @@
 
 use AsyncAws\Core\Configuration;
 use AsyncAws\Ses\SesClient;
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesApiAsyncAwsTransport;
 use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesHttpAsyncAwsTransport;
 use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesSmtpTransport;
@@ -23,9 +25,9 @@
 
 class SesTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new SesTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new SesTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -63,108 +65,107 @@ public static function supportsProvider(): iterable
 
     public static function createProvider(): iterable
     {
-        $client = self::getClient();
-        $dispatcher = self::getDispatcher();
-        $logger = self::getLogger();
+        $client = new MockHttpClient();
+        $logger = new NullLogger();
 
         yield [
             new Dsn('ses+api', 'default', self::USER, self::PASSWORD),
-            new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1']), null, $client, $logger), $dispatcher, $logger),
+            new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses+api', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-2']),
-            new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2']), null, $client, $logger), $dispatcher, $logger),
+            new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses+api', 'example.com', self::USER, self::PASSWORD, 8080),
-            new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080']), null, $client, $logger), $dispatcher, $logger),
+            new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses+api', 'default', self::USER, self::PASSWORD, null, ['session_token' => 'se$sion']),
-            new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
+            new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses+api', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-2', 'session_token' => 'se$sion']),
-            new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
+            new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses+api', 'example.com', self::USER, self::PASSWORD, 8080, ['session_token' => 'se$sion']),
-            new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
+            new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses+https', 'default', self::USER, self::PASSWORD),
-            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1']), null, $client, $logger), $dispatcher, $logger),
+            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses', 'default', self::USER, self::PASSWORD),
-            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1']), null, $client, $logger), $dispatcher, $logger),
+            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses+https', 'example.com', self::USER, self::PASSWORD, 8080),
-            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080']), null, $client, $logger), $dispatcher, $logger),
+            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses+https', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-2']),
-            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2']), null, $client, $logger), $dispatcher, $logger),
+            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses+https', 'default', self::USER, self::PASSWORD, null, ['session_token' => 'se$sion']),
-            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
+            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses', 'default', self::USER, self::PASSWORD, null, ['session_token' => 'se$sion']),
-            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
+            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses+https', 'example.com', self::USER, self::PASSWORD, 8080, ['session_token' => 'se$sion']),
-            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
+            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region'
10000
 => 'eu-west-1', 'endpoint' => 'https://example.com:8080', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses+https', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-2', 'session_token' => 'se$sion']),
-            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
+            new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
         ];
 
         yield [
             new Dsn('ses+smtp', 'default', self::USER, self::PASSWORD),
-            new SesSmtpTransport(self::USER, self::PASSWORD, null, $dispatcher, $logger),
+            new SesSmtpTransport(self::USER, self::PASSWORD, null, null, $logger),
         ];
 
         yield [
             new Dsn('ses+smtp', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
-            new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger),
+            new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', null, $logger),
         ];
 
         yield [
             new Dsn('ses+smtps', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
-            new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger),
+            new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', null, $logger),
         ];
 
         yield [
             new Dsn('ses+smtps', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1', 'ping_threshold' => '10']),
-            (new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger))->setPingThreshold(10),
+            (new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', null, $logger))->setPingThreshold(10),
         ];
 
         yield [
             new Dsn('ses+smtp', 'custom.vpc.endpoint', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
-            new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger, 'custom.vpc.endpoint'),
+            new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', null, $logger, 'custom.vpc.endpoint'),
         ];
 
         yield [
             new Dsn('ses+smtps', 'custom.vpc.endpoint', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
-            new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger, 'custom.vpc.endpoint'),
+            new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', null, $logger, 'custom.vpc.endpoint'),
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php
index 8045ad9e198a3..f8e58d393eddf 100644
--- a/src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Bridge\Google\Tests\Transport;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Bridge\Google\Transport\GmailSmtpTransport;
 use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
 use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
@@ -19,9 +21,9 @@
 
 class GmailTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new GmailTransportFactory(self::getDispatcher(), null, self::getLogger());
+        return new GmailTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -51,17 +53,17 @@ public static function createProvider(): iterable
     {
         yield [
             new Dsn('gmail', 'default', self::USER, self::PASSWORD),
-            new GmailSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
+            new GmailSmtpTransport(self::USER, self::PASSWORD, null, new NullLogger()),
         ];
 
         yield [
             new Dsn('gmail+smtp', 'default', self::USER, self::PASSWORD),
-            new GmailSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
+            new GmailSmtpTransport(self::USER, self::PASSWORD, null, new NullLogger()),
         ];
 
         yield [
             new Dsn('gmail+smtps', 'default', self::USER, self::PASSWORD),
-            new GmailSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
+            new GmailSmtpTransport(self::USER, self::PASSWORD, null, new NullLogger()),
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Infobip/Tests/Transport/InfobipApiTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Infobip/Tests/Transport/InfobipApiTransportFactoryTest.php
index 14d998501fa06..f29ada5af97c2 100644
--- a/src/Symfony/Component/Mailer/Bridge/Infobip/Tests/Transport/InfobipApiTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Infobip/Tests/Transport/InfobipApiTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Bridge\Infobip\Tests\Transport;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipApiTransport;
 use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipSmtpTransport;
 use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipTransportFactory;
@@ -20,9 +22,9 @@
 
 class InfobipApiTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new InfobipTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new InfobipTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -55,27 +57,26 @@ public static function supportsProvider(): iterable
 
     public static function createProvider(): iterable
     {
-        $dispatcher = self::getDispatcher();
-        $logger = self::getLogger();
+        $logger = new NullLogger();
 
         yield [
             new Dsn('infobip+api', 'example.com', self::PASSWORD),
-            (new InfobipApiTransport(self::PASSWORD, self::getClient(), $dispatcher, $logger))->setHost('example.com'),
+            (new InfobipApiTransport(self::PASSWORD, new MockHttpClient(), null, $logger))->setHost('example.com'),
         ];
 
         yield [
             new Dsn('infobip', 'default', self::PASSWORD),
-            new InfobipSmtpTransport(self::PASSWORD, $dispatcher, $logger),
+            new InfobipSmtpTransport(self::PASSWORD, null, $logger),
         ];
 
         yield [
             new Dsn('infobip+smtp', 'default', self::PASSWORD),
-            new InfobipSmtpTransport(self::PASSWORD, $dispatcher, $logger),
+            new InfobipSmtpTransport(self::PASSWORD, null, $logger),
         ];
 
         yield [
             new Dsn('infobip+smtps', 'default', self::PASSWORD),
-            new InfobipSmtpTransport(self::PASSWORD, $dispatcher, $logger),
+            new InfobipSmtpTransport(self::PASSWORD, null, $logger),
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/MailPace/Tests/Transport/MailPaceTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/MailPace/Tests/Transport/MailPaceTransportFactoryTest.php
index 1bbd14a8fad46..6baf5a33b2197 100644
--- a/src/Symfony/Component/Mailer/Bridge/MailPace/Tests/Transport/MailPaceTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/MailPace/Tests/Transport/MailPaceTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Bridge\MailPace\Tests\Transport;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceApiTransport;
 use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceSmtpTransport;
 use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceTransportFactory;
@@ -20,9 +22,9 @@
 
 final class MailPaceTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new MailPaceTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new MailPaceTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -55,32 +57,31 @@ public static function supportsProvider(): iterable
 
     public static function createProvider(): iterable
     {
-        $dispatcher = self::getDispatcher();
-        $logger = self::getLogger();
+        $logger = new NullLogger();
 
         yield [
             new Dsn('mailpace+api', 'default', self::USER),
-            new MailPaceApiTransport(self::USER, self::getClient(), $dispatcher, $logger),
+            new MailPaceApiTransport(self::USER, new MockHttpClient(), null, $logger),
         ];
 
         yield [
             new Dsn('mailpace+api', 'example.com', self::USER, '', 8080),
-            (new MailPaceApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
+            (new MailPaceApiTransport(self::USER, new MockHttpClient(), null, $logger))->setHost('example.com')->setPort(8080),
         ];
 
         yield [
             new Dsn('mailpace', 'default', self::USER),
-            new MailPaceSmtpTransport(self::USER, $dispatcher, $logger),
+            new MailPaceSmtpTransport(self::USER, null, $logger),
         ];
 
         yield [
             new Dsn('mailpace+smtp', 'default', self::USER),
-            new MailPaceSmtpTransport(self::USER, $dispatcher, $logger),
+            new MailPaceSmtpTransport(self::USER, null, $logger),
         ];
 
         yield [
             new Dsn('mailpace+smtps', 'default', self::USER),
-            new MailPaceSmtpTransport(self::USER, $dispatcher, $logger),
+            new MailPaceSmtpTransport(self::USER, null, $logger),
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillTransportFactoryTest.php
index 4aac3cb613563..78ca4e3acd25f 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Bridge\Mailchimp\Tests\Transport;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillApiTransport;
 use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillHttpTransport;
 use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillSmtpTransport;
@@ -21,9 +23,9 @@
 
 class MandrillTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new MandrillTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new MandrillTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -61,43 +63,42 @@ public static function supportsProvider(): iterable
 
     public static function createProvider(): iterable
     {
-        $client = self::getClient();
-        $dispatcher = self::getDispatcher();
-        $logger = self::getLogger();
+        $client = new MockHttpClient();
+        $logger = new NullLogger();
 
         yield [
             new Dsn('mandrill+api', 'default', self::USER),
-            new MandrillApiTransport(self::USER, $client, $dispatcher, $logger),
+            new MandrillApiTransport(self::USER, $client, null, $logger),
         ];
 
         yield [
             new Dsn('mandrill+api', 'example.com', self::USER, '', 8080),
-            (new MandrillApiTransport(self::USER, $client, $dispatcher, $logger))->setHost('example.com')->setPort(8080),
+            (new MandrillApiTransport(self::USER, $client, null, $logger))->setHost('example.com')->setPort(8080),
         ];
 
         yield [
             new Dsn('mandrill', 'default', self::USER),
-            new MandrillHttpTransport(self::USER, $client, $dispatcher, $logger),
+            new MandrillHttpTransport(self::USER, $client, null, $logger),
         ];
 
         yield [
             new Dsn('mandrill+https', 'default', self::USER),
-            new MandrillHttpTransport(self::USER, $client, $dispatcher, $logger),
+            new MandrillHttpTransport(self::USER, $client, null, $logger),
         ];
 
         yield [
             new Dsn('mandrill+https', 'example.com', self::USER, '', 8080),
-            (new MandrillHttpTransport(self::USER, $client, $dispatcher, $logger))->setHost('example.com')->setPort(8080),
+            (new MandrillHttpTransport(self::USER, $client, null, $logger))->setHost('example.com')->setPort(8080),
         ];
 
         yield [
             new Dsn('mandrill+smtp', 'default', self::USER, self::PASSWORD),
-            new MandrillSmtpTransport(self::USER, self::PASSWORD, $dispatcher, $logger),
+            new MandrillSmtpTransport(self::USER, self::PASSWORD, null, $logger),
         ];
 
         yield [
             new Dsn('mandrill+smtps', 'default', self::USER, self::PASSWORD),
-            new MandrillSmtpTransport(self::USER, self::PASSWORD, $dispatcher, $logger),
+            new MandrillSmtpTransport(self::USER, self::PASSWORD, null, $logger),
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php
index a5c9ef978fb7e..a88f1e153a8ff 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Bridge\Mailgun\Tests\Transport;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunApiTransport;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunHttpTransport;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunSmtpTransport;
@@ -21,9 +23,9 @@
 
 class MailgunTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new MailgunTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new MailgunTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -61,48 +63,47 @@ public static function supportsProvider(): iterable
 
     public static function createProvider(): iterable
     {
-        $client = self::getClient();
-        $dispatcher = self::getDispatcher();
-        $logger = self::getLogger();
+        $client = new MockHttpClient();
+        $logger = new NullLogger();
 
         yield [
             new Dsn('mailgun+api', 'default', self::USER, self::PASSWORD),
-            new MailgunApiTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger),
+            new MailgunApiTransport(self::USER, self::PASSWORD, null, $client, null, $logger),
         ];
 
         yield [
             new Dsn('mailgun+api', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu']),
-            new MailgunApiTransport(self::USER, self::PASSWORD, 'eu', $client, $dispatcher, $logger),
+            new MailgunApiTransport(self::USER, self::PASSWORD, 'eu', $client, null, $logger),
         ];
 
         yield [
             new Dsn('mailgun+api', 'example.com', self::USER, self::PASSWORD, 8080),
-            (new MailgunApiTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger))->setHost('example.com')->setPort(8080),
+            (new MailgunApiTransport(self::USER, self::PASSWORD, null, $client, null, $logger))->setHost('example.com')->setPort(8080),
         ];
 
         yield [
             new Dsn('mailgun', 'default', self::USER, self::PASSWORD),
-            new MailgunHttpTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger),
+            new MailgunHttpTransport(self::USER, self::PASSWORD, null, $client, null, $logger),
         ];
 
         yield [
             new Dsn('mailgun+https', 'default', self::USER, self::PASSWORD),
-            new MailgunHttpTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger),
+            new MailgunHttpTransport(self::USER, self::PASSWORD, null, $client, null, $logger),
         ];
 
         yield [
             new Dsn('mailgun+https', 'example.com', self::USER, self::PASSWORD, 8080),
-            (new MailgunHttpTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger))->setHost('example.com')->setPort(8080),
+            (new MailgunHttpTransport(self::USER, self::PASSWORD, null, $client, null, $logger))->setHost('example.com')->setPort(8080),
         ];
 
         yield [
             new Dsn('mailgun+smtp', 'default', self::USER, self::PASSWORD),
-            new MailgunSmtpTransport(self::USER, self::PASSWORD, null, $dispatcher, $logger),
+            new MailgunSmtpTransport(self::USER, self::PASSWORD, null, null, $logger),
         ];
 
         yield [
             new Dsn('mailgun+smtps', 'default', self::USER, self::PASSWORD),
-            new MailgunSmtpTransport(self::USER, self::PASSWORD, null, $dispatcher, $logger),
+            new MailgunSmtpTransport(self::USER, self::PASSWORD, null, null, $logger),
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetTransportFactoryTest.php
index d06acbfec785f..224ef14eef907 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Bridge\Mailjet\Tests\Transport;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetApiTransport;
 use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetSmtpTransport;
 use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
@@ -20,9 +22,9 @@
 
 class MailjetTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new MailjetTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new MailjetTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -55,32 +57,31 @@ public static function supportsProvider(): iterable
 
     public static function createProvider(): iterable
     {
-        $dispatcher = self::getDispatcher();
-        $logger = self::getLogger();
+        $logger = new NullLogger();
 
         yield [
             new Dsn('mailjet+api', 'default', self::USER, self::PASSWORD),
-            new MailjetApiTransport(self::USER, self::PASSWORD, self::getClient(), $dispatcher, $logger),
+            new MailjetApiTransport(self::USER, self::PASSWORD, new MockHttpClient(), null, $logger),
         ];
 
         yield [
             new Dsn('mailjet+api', 'example.com', self::USER, self::PASSWORD),
-            (new MailjetApiTransport(self::USER, self::PASSWORD, self::getClient(), $dispatcher, $logger))->setHost('example.com'),
+            (new MailjetApiTransport(self::USER, self::PASSWORD, new MockHttpClient(), null, $logger))->setHost('example.com'),
         ];
 
         yield [
             new Dsn('mailjet', 'default', self::USER, self::PASSWORD),
-            new MailjetSmtpTransport(self::USER, self::PASSWORD, $dispatcher, $logger),
+            new MailjetSmtpTransport(self::USER, self::PASSWORD, null, $logger),
         ];
 
         yield [
             new Dsn('mailjet+smtp', 'default', self::USER, self::PASSWORD),
-            new MailjetSmtpTransport(self::USER, self::PASSWORD, $dispatcher, $logger),
+            new MailjetSmtpTransport(self::USER, self::PASSWORD, null, $logger),
         ];
 
         yield [
             new Dsn('mailjet+smtps', 'default', self::USER, self::PASSWORD),
-            new MailjetSmtpTransport(self::USER, self::PASSWORD, $dispatcher, $logger),
+            new MailjetSmtpTransport(self::USER, self::PASSWORD, null, $logger),
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Tests/Transport/OhMySmtpTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Tests/Transport/OhMySmtpTransportFactoryTest.php
index b183ed52983e9..503f0410791d0 100644
--- a/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Tests/Transport/OhMySmtpTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/OhMySmtp/Tests/Transport/OhMySmtpTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Bridge\OhMySmtp\Tests\Transport;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpApiTransport;
 use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpSmtpTransport;
 use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory;
@@ -23,9 +25,9 @@
  */
 final class OhMySmtpTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new OhMySmtpTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new OhMySmtpTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -58,32 +60,31 @@ public static function supportsProvider(): iterable
 
     public static function createProvider(): iterable
     {
-        $dispatcher = self::getDispatcher();
-        $logger = self::getLogger();
+        $logger = new NullLogger();
 
         yield [
             new Dsn('ohmysmtp+api', 'default', self::USER),
-            new OhMySmtpApiTransport(self::USER, self::getClient(), $dispatcher, $logger),
+            new OhMySmtpApiTransport(self::USER, new MockHttpClient(), null, $logger),
         ];
 
         yield [
             new Dsn('ohmysmtp+api', 'example.com', self::USER, '', 8080),
-            (new OhMySmtpApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
+            (new OhMySmtpApiTransport(self::USER, new MockHttpClient(), null, $logger))->setHost('example.com')->setPort(8080),
         ];
 
         yield [
             new Dsn('ohmysmtp', 'default', self::USER),
-            new OhMySmtpSmtpTransport(self::USER, $dispatcher, $logger),
+            new OhMySmtpSmtpTransport(self::USER, null, $logger),
         ];
 
         yield [
             new Dsn('ohmysmtp+smtp', 'default', self::USER),
-            new OhMySmtpSmtpTransport(self::USER, $dispatcher, $logger),
+            new OhMySmtpSmtpTransport(self::USER, null, $logger),
         ];
 
         yield [
             new Dsn('ohmysmtp+smtps', 'default', self::USER),
-            new OhMySmtpSmtpTransport(self::USER, $dispatcher, $logger),
+            new OhMySmtpSmtpTransport(self::USER, null, $logger),
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkTransportFactoryTest.php
index ccbd1f18e7daa..33a6b66ab1d89 100644
--- a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Bridge\Postmark\Tests\Transport;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkApiTransport;
 use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkSmtpTransport;
 use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
@@ -20,9 +22,9 @@
 
 class PostmarkTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new PostmarkTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new PostmarkTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -55,42 +57,41 @@ public static function supportsProvider(): iterable
 
     public static function createProvider(): iterable
     {
-        $dispatcher = self::getDispatcher();
-        $logger = self::getLogger();
+        $logger = new NullLogger();
 
         yield [
             new Dsn('postmark+api', 'default', self::USER),
-            new PostmarkApiTransport(self::USER, self::getClient(), $dispatcher, $logger),
+            new PostmarkApiTransport(self::USER, new MockHttpClient(), null, $logger),
         ];
 
         yield [
             new Dsn('postmark+api', 'example.com', self::USER, '', 8080),
-            (new PostmarkApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
+            (new PostmarkApiTransport(self::USER, new MockHttpClient(), null, $logger))->setHost('example.com')->setPort(8080),
         ];
 
         yield [
             new Dsn('postmark+api', 'example.com', self::USER, '', 8080, ['message_stream' => 'broadcasts']),
-            (new PostmarkApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080)->setMessageStream('broadcasts'),
+            (new PostmarkApiTransport(self::USER, new MockHttpClient(), null, $logger))->setHost('example.com')->setPort(8080)->setMessageStream('broadcasts'),
         ];
 
         yield [
             new Dsn('postmark', 'default', self::USER),
-            new PostmarkSmtpTransport(self::USER, $dispatcher, $logger),
+            new PostmarkSmtpTransport(self::USER, null, $logger),
         ];
 
         yield [
             new Dsn('postmark+smtp', 'default', self::USER),
-            new PostmarkSmtpTransport(self::USER, $dispatcher, $logger),
+            new PostmarkSmtpTransport(self::USER, null, $logger),
         ];
 
         yield [
             new Dsn('postmark+smtps', 'default', self::USER),
-            new PostmarkSmtpTransport(self::USER, $dispatcher, $logger),
+            new PostmarkSmtpTransport(self::USER, null, $logger),
         ];
 
         yield [
             new Dsn('postmark+smtps', 'default', self::USER, null, null, ['message_stream' => 'broadcasts']),
-            (new PostmarkSmtpTransport(self::USER, $dispatcher, $logger))->setMessageStream('broadcasts'),
+            (new PostmarkSmtpTransport(self::USER, null, $logger))->setMessageStream('broadcasts'),
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json
index d0081d29a3716..77ff5324abf99 100644
--- a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json
@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=8.1",
+        "psr/event-dispatcher": "^1",
         "symfony/mailer": "^5.4.21|^6.2.7"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Transport/SendgridTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Transport/SendgridTransportFactoryTest.php
index a7ceb80b1dfa1..433e905add6c5 100644
--- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Transport/SendgridTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Transport/SendgridTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Bridge\Sendgrid\Tests\Transport;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridApiTransport;
 use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridSmtpTransport;
 use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
@@ -20,9 +22,9 @@
 
 class SendgridTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new SendgridTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new SendgridTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -55,32 +57,31 @@ public static function supportsProvider(): iterable
 
     public static function createProvider(): iterable
     {
-        $dispatcher = self::getDispatcher();
-        $logger = self::getLogger();
+        $logger = new NullLogger();
 
         yield [
             new Dsn('sendgrid+api', 'default', self::USER),
-            new SendgridApiTransport(self::USER, self::getClient(), $dispatcher, $logger),
+            new SendgridApiTransport(self::USER, new MockHttpClient(), null, $logger),
         ];
 
         yield [
             new Dsn('sendgrid+api', 'example.com', self::USER, '', 8080),
-            (new SendgridApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
+            (new SendgridApiTransport(self::USER, new MockHttpClient(), null, $logger))->setHost('example.com')->setPort(8080),
         ];
 
         yield [
             new Dsn('sendgrid', 'default', self::USER),
-            new SendgridSmtpTransport(self::USER, $dispatcher, $logger),
+            new SendgridSmtpTransport(self::USER, null, $logger),
         ];
 
         yield [
             new Dsn('sendgrid+smtp', 'default', self::USER),
-            new SendgridSmtpTransport(self::USER, $dispatcher, $logger),
+            new SendgridSmtpTransport(self::USER, null, $logger),
         ];
 
         yield [
             new Dsn('sendgrid+smtps', 'default', self::USER),
-            new SendgridSmtpTransport(self::USER, $dispatcher, $logger),
+            new SendgridSmtpTransport(self::USER, null, $logger),
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendinblue/Tests/Transport/SendinblueTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Sendinblue/Tests/Transport/SendinblueTransportFactoryTest.php
index bcc9ad22bea30..08a5048c53d9e 100644
--- a/src/Symfony/Component/Mailer/Bridge/Sendinblue/Tests/Transport/SendinblueTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Sendinblue/Tests/Transport/SendinblueTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Bridge\Sendinblue\Tests\Transport;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Bridge\Sendinblue\Transport\SendinblueApiTransport;
 use Symfony\Component\Mailer\Bridge\Sendinblue\Transport\SendinblueSmtpTransport;
 use Symfony\Component\Mailer\Bridge\Sendinblue\Transport\SendinblueTransportFactory;
@@ -20,9 +22,9 @@
 
 class SendinblueTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new SendinblueTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new SendinblueTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -52,22 +54,22 @@ public static function createProvider(): iterable
     {
         yield [
             new Dsn('sendinblue', 'default', self::USER, self::PASSWORD),
-            new SendinblueSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
+            new SendinblueSmtpTransport(self::USER, self::PASSWORD, null, new NullLogger()),
         ];
 
         yield [
             new Dsn('sendinblue+smtp', 'default', self::USER, self::PASSWORD),
-            new SendinblueSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
+            new SendinblueSmtpTransport(self::USER, self::PASSWORD, null, new NullLogger()),
         ];
 
         yield [
             new Dsn('sendinblue+smtp', 'default', self::USER, self::PASSWORD, 465),
-            new SendinblueSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
+            new SendinblueSmtpTransport(self::USER, self::PASSWORD, null, new NullLogger()),
         ];
 
         yield [
             new Dsn('sendinblue+api', 'default', self::USER),
-            new SendinblueApiTransport(self::USER, self::getClient(), self::getDispatcher(), self::getLogger()),
+            new SendinblueApiTransport(self::USER, new MockHttpClient(), null, new NullLogger()),
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/CHANGELOG.md b/src/Symfony/Component/Mailer/CHANGELOG.md
index 4ebc0b2532e7e..6724bf10e18cd 100644
--- a/src/Symfony/Component/Mailer/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/CHANGELOG.md
@@ -6,6 +6,12 @@ CHANGELOG
 
  * Add `MessageEvent::reject()` to allow rejecting an email before sending it
 
+6.2.7
+-----
+
+ * [BC BREAK] The following data providers for `TransportFactoryTestCase` are now static:
+  `supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
+
 6.2
 ---
 
@@ -23,14 +29,6 @@ CHANGELOG
 
  * The `HttpTransportException` class takes a string at first argument
 
-5.4.21
-------
-
- * [BC BREAK] The following data providers for `TransportFactoryTestCase` are now static:
-  `supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
- * [BC BREAK] The following data providers for `TransportTestCase` are now static:
-  `toStringProvider()`, `supportedMessagesProvider()` and `unsupportedMessagesProvider()`
-
 5.4
 ---
 
diff --git a/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php b/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php
index eda10fe70de05..7bcd8989877a5 100644
--- a/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php
+++ b/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php
@@ -13,8 +13,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
-use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Exception\IncompleteDsnException;
 use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
 use Symfony\Component\Mailer\Transport\Dsn;
@@ -33,11 +31,11 @@ abstract class TransportFactoryTestCase extends TestCase
     protected const USER = 'u$er';
     protected const PASSWORD = 'pa$s';
 
-    protected static $dispatcher;
-    protected static $client;
-    protected static $logger;
+    protected $dispatcher;
+    protected $client;
+    protected $logger;
 
-    abstract public static function getFactory(): TransportFactoryInterface;
+    abstract public function getFactory(): TransportFactoryInterface;
 
     abstract public static function supportsProvider(): iterable;
 
@@ -102,22 +100,18 @@ public function testIncompleteDsnException(Dsn $dsn)
         $factory->create($dsn);
     }
 
-    protected static function getDispatcher(): EventDispatcherInterface
+    protected function getDispatcher(): EventDispatcherInterface
     {
-        return self::$dispatcher ??= new class() implements EventDispatcherInterface {
-            public function dispatch($event, string $eventName = null): object
-            {
-            }
-        };
+        return $this->dispatcher ??= $this->createMock(EventDispatcherInterface::class);
     }
 
-    protected static function getClient(): HttpClientInterface
+    protected function getClient(): HttpClientInterface
     {
-        return self::$client ??= new MockHttpClient();
+        return $this->client ??= $this->createMock(HttpClientInterface::class);
     }
 
-    protected static function getLogger(): LoggerInterface
+    protected function getLogger(): LoggerInterface
     {
-        return self::$logger ??= new NullLogger();
+        return $this->logger ??= $this->createMock(LoggerInterface::class);
     }
 }
diff --git a/src/Symfony/Component/Mailer/Tests/Command/MailerTestCommandTest.php b/src/Symfony/Component/Mailer/Tests/Command/MailerTestCommandTest.php
index cef3d706dd5d8..ae6cbb4da8cad 100644
--- a/src/Symfony/Component/Mailer/Tests/Command/MailerTestCommandTest.php
+++ b/src/Symfony/Component/Mailer/Tests/Command/MailerTestCommandTest.php
@@ -30,10 +30,12 @@ public function testSendsEmail()
         $mailer
             ->expects($this->once())
             ->method('send')
-            ->with(self::callback(static fn (Email $message): bool => $message->getFrom()[0]->getAddress() === $from &&
-            $message->getTo()[0]->getAddress() === $to &&
-            $message->getSubject() === $subject &&
-            $message->getTextBody() === $body))
+            ->with(self::callback(static fn (Email $message) => [$from, $to, $subject, $body] === [
+                $message->getFrom()[0]->getAddress(),
+                $message->getTo()[0]->getAddress(),
+                $message->getSubject(),
+                $message->getTextBody(),
+            ]))
         ;
 
         $tester = new CommandTester(new MailerTestCommand($mailer));
@@ -53,7 +55,7 @@ public function testUsesCustomTransport()
         $mailer
             ->expects($this->once())
             ->method('send')
-            ->with(self::callback(static fn (Email $message): bool => $message->getHeaders()->getHeaderBody('X-Transport') === $transport))
+            ->with(self::callback(static fn (Email $message) => $message->getHeaders()->getHeaderBody('X-Transport') === $transport))
         ;
 
         $tester = new CommandTester(new MailerTestCommand($mailer));
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/NullTransportFactoryTest.php b/src/Symfony/Component/Mailer/Tests/Transport/NullTransportFactoryTest.php
index 50c35cb271747..b28935a75d4f5 100644
--- a/src/Symfony/Component/Mailer/Tests/Transport/NullTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Tests/Transport/NullTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Tests\Transport;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
 use Symfony\Component\Mailer\Transport\Dsn;
 use Symfony\Component\Mailer\Transport\NullTransport;
@@ -19,9 +21,9 @@
 
 class NullTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new NullTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new NullTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -36,7 +38,7 @@ public static function createProvider(): iterable
     {
         yield [
             new Dsn('null', 'null'),
-            new NullTransport(self::getDispatcher(), self::getLogger()),
+            new NullTransport(null, new NullLogger()),
         ];
     }
 }
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/SendmailTransportFactoryTest.php b/src/Symfony/Component/Mailer/Tests/Transport/SendmailTransportFactoryTest.php
index d13f23eb9d1bf..a3d08f5933359 100644
--- a/src/Symfony/Component/Mailer/Tests/Transport/SendmailTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Tests/Transport/SendmailTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Tests\Transport;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
 use Symfony\Component\Mailer\Transport\Dsn;
 use Symfony\Component\Mailer\Transport\SendmailTransport;
@@ -19,9 +21,9 @@
 
 class SendmailTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new SendmailTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new SendmailTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -36,12 +38,12 @@ public static function createProvider(): iterable
     {
         yield [
             new Dsn('sendmail+smtp', 'default'),
-            new SendmailTransport(null, self::getDispatcher(), self::getLogger()),
+            new SendmailTransport(null, null, new NullLogger()),
         ];
 
         yield [
             new Dsn('sendmail+smtp', 'default', null, null, null, ['command' => '/usr/sbin/sendmail -oi -t']),
-            new SendmailTransport('/usr/sbin/sendmail -oi -t', self::getDispatcher(), self::getLogger()),
+            new SendmailTransport('/usr/sbin/sendmail -oi -t', null, new NullLogger()),
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php
index 65346e254fade..bcdf669be2b2a 100644
--- a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Mailer\Tests\Transport\Smtp;
 
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
 use Symfony\Component\Mailer\Transport\Dsn;
 use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
@@ -20,9 +22,9 @@
 
 class EsmtpTransportFactoryTest extends TransportFactoryTestCase
 {
-    public static function getFactory(): TransportFactoryInterface
+    public function getFactory(): TransportFactoryInterface
     {
-        return new EsmtpTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
+        return new EsmtpTransportFactory(null, new MockHttpClient(), new NullLogger());
     }
 
     public static function supportsProvider(): iterable
@@ -45,17 +47,16 @@ public static function supportsProvider(): iterable
 
     public static function createProvider(): iterable
     {
-        $eventDispatcher = self::getDispatcher();
-        $logger = self::getLogger();
+        $logger = new NullLogger();
 
-        $transport = new EsmtpTransport('localhost', 25, false, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('localhost', 25, false, null, $logger);
 
         yield [
             new Dsn('smtp', 'localhost'),
             $transport,
         ];
 
-        $transport = new EsmtpTransport('example.com', 99, true, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('example.com', 99, true, null, $logger);
         $transport->setUsername(self::USER);
         $transport->setPassword(self::PASSWORD);
 
@@ -64,21 +65,21 @@ public static function createProvider(): iterable
             $transport,
         ];
 
-        $transport = new EsmtpTransport('example.com', 465, true, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('example.com', 465, true, null, $logger);
 
         yield [
             new Dsn('smtps', 'example.com'),
             $transport,
         ];
 
-        $transport = new EsmtpTransport('example.com', 465, true, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('example.com', 465, true, null, $logger);
 
         yield [
             new Dsn('smtps', 'example.com', '', '', 465),
             $transport,
         ];
 
-        $transport = new EsmtpTransport('example.com', 465, true, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('example.com', 465, true, null, $logger);
         /** @var SocketStream $stream */
         $stream = $transport->getStream();
         $streamOptions = $stream->getStreamOptions();
@@ -101,14 +102,14 @@ public static function createProvider(): iterable
             $transport,
         ];
 
-        $transport = new EsmtpTransport('example.com', 465, true, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('example.com', 465, true, null, $logger);
 
         yield [
             Dsn::fromString('smtps://:@example.com?verify_peer='),
             $transport,
         ];
 
-        $transport = new EsmtpTransport('example.com', 465, true, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('example.com', 465, true, null, $logger);
         $transport->setLocalDomain('example.com');
 
         yield [
@@ -116,7 +117,7 @@ public static function createProvider(): iterable
             $transport,
         ];
 
-        $transport = new EsmtpTransport('example.com', 465, true, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('example.com', 465, true, null, $logger);
         $transport->setMaxPerSecond(2.0);
 
         yield [
@@ -124,7 +125,7 @@ public static function createProvider(): iterable
             $transport,
         ];
 
-        $transport = new EsmtpTransport('example.com', 465, true, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('example.com', 465, true, null, $logger);
         $transport->setRestartThreshold(10, 1);
 
         yield [
@@ -132,7 +133,7 @@ public static function createProvider(): iterable
             $transport,
         ];
 
-        $transport = new EsmtpTransport('example.com', 465, true, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('example.com', 465, true, null, $logger);
         $transport->setPingThreshold(10);
 
         yield [
diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php b/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php
index 1cb0b5d54e88f..1fcc2934cf7eb 100644
--- a/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Translation\Bridge\Crowdin\Tests;
 
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Component\Translation\Bridge\Crowdin\CrowdinProvider;
@@ -23,46 +24,47 @@
 use Symfony\Component\Translation\Provider\ProviderInterface;
 use Symfony\Component\Translation\Test\ProviderTestCase;
 use Symfony\Component\Translation\TranslatorBag;
+use Symfony\Component\Translation\TranslatorBagInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 class CrowdinProviderTest extends ProviderTestCase
 {
-    public static function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint): ProviderInterface
+    public static function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint, TranslatorBagInterface $translatorBag = null): ProviderInterface
     {
-        return new CrowdinProvider($client, $loader, $logger, self::getXliffFileDumper(), $defaultLocale, $endpoint);
+        return new CrowdinProvider($client, $loader, $logger, new XliffFileDumper(), $defaultLocale, $endpoint);
     }
 
     public static function toStringProvider(): iterable
     {
         yield [
-            self::createProvider(self::getClient()->withOptions([
+            self::createProvider((new MockHttpClient())->withOptions([
                 'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
                 'auth_bearer' => 'API_TOKEN',
-            ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com'),
+            ]), new ArrayLoader(), new NullLogger(), 'en', 'api.crowdin.com'),
             'crowdin://api.crowdin.com',
         ];
 
         yield [
-            self::createProvider(self::getClient()->withOptions([
+            self::createProvider((new MockHttpClient())->withOptions([
                 'base_uri' => 'https://domain.api.crowdin.com/api/v2/projects/1/',
                 'auth_bearer' => 'API_TOKEN',
-            ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'domain.api.crowdin.com'),
+            ]), new ArrayLoader(), new NullLogger(), 'en', 'domain.api.crowdin.com'),
             'crowdin://domain.api.crowdin.com',
         ];
 
         yield [
-            self::createProvider(self::getClient()->withOptions([
+            self::createProvider((new MockHttpClient())->withOptions([
                 'base_uri' => 'https://api.crowdin.com:99/api/v2/projects/1/',
                 'auth_bearer' => 'API_TOKEN',
-            ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com:99'),
+            ]), new ArrayLoader(), new NullLogger(), 'en', 'api.crowdin.com:99'),
             'crowdin://api.crowdin.com:99',
         ];
     }
 
     public function testCompleteWriteProcessAddFiles()
     {
-        self::$xliffFileDumper = new XliffFileDumper();
+        $this->xliffFileDumper = new XliffFileDumper();
 
         $expectedMessagesFileContent = <<<'XLIFF'
 <?xml version="1.0" encoding="utf-8"?>
@@ -151,14 +153,14 @@ public function testCompleteWriteProcessAddFiles()
         $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
 
         $provider->write($translatorBag);
     }
 
     public function testWriteAddFileServerError()
     {
-        self::$xliffFileDumper = new XliffFileDumper();
+        $this->xliffFileDumper = new XliffFileDumper();
 
         $expectedMessagesFileContent = <<<'XLIFF'
 <?xml version="1.0" encoding="utf-8"?>
@@ -213,7 +215,7 @@ public function testWriteAddFileServerError()
         $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to create a File in Crowdin for domain "messages".');
@@ -223,7 +225,7 @@ public function testWriteAddFileServerError()
 
     public function testWriteUpdateFileServerError()
     {
-        self::$xliffFileDumper = new XliffFileDumper();
+        $this->xliffFileDumper = new XliffFileDumper();
 
         $expectedMessagesFileContent = <<<'XLIFF'
 <?xml version="1.0" encoding="utf-8"?>
@@ -285,7 +287,7 @@ public function testWriteUpdateFileServerError()
         $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to update file in Crowdin for file ID "12" and domain "messages".');
@@ -295,7 +297,7 @@ public function testWriteUpdateFileServerError()
 
     public function testWriteUploadTranslationsServerError()
     {
-        self::$xliffFileDumper = new XliffFileDumper();
+        $this->xliffFileDumper = new XliffFileDumper();
 
         $expectedMessagesTranslationsContent = <<<'XLIFF'
 <?xml version="1.0" encoding="utf-8"?>
@@ -392,7 +394,7 @@ public function testWriteUploadTranslationsServerError()
         $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to upload translations to Crowdin.');
@@ -402,7 +404,7 @@ public function testWriteUploadTranslationsServerError()
 
     public function testCompleteWriteProcessUpdateFiles()
     {
-        self::$xliffFileDumper = new XliffFileDumper();
+        $this->xliffFileDumper = new XliffFileDumper();
 
         $expectedMessagesFileContent = <<<'XLIFF'
 <?xml version="1.0" encoding="utf-8"?>
@@ -466,7 +468,7 @@ public function testCompleteWriteProcessUpdateFiles()
         $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
 
         $provider->write($translatorBag);
     }
@@ -476,7 +478,7 @@ public function testCompleteWriteProcessUpdateFiles()
      */
     public function testCompleteWriteProcessAddFileAndUploadTranslations(TranslatorBag $translatorBag, string $expectedLocale, string $expectedMessagesTranslationsContent)
     {
-        self::$xliffFileDumper = new XliffFileDumper();
+        $this->xliffFileDumper = new XliffFileDumper();
 
         $expectedMessagesFileContent = <<<'XLIFF'
 <?xml version="1.0" encoding="utf-8"?>
@@ -547,7 +549,7 @@ public function testCompleteWriteProcessAddFileAndUploadTranslations(TranslatorB
         $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
 
         $provider->write($translatorBag);
     }
@@ -645,15 +647,15 @@ public function testReadForOneLocaleAndOneDomain(string $locale, string $domain,
             },
         ];
 
-        static::$loader = $this->createMock(LoaderInterface::class);
-        static::$loader->expects($this->once())
+        $loader = $this->getLoader();
+        $loader->expects($this->once())
             ->method('load')
             ->willReturn($expectedTranslatorBag->getCatalogue($locale));
 
         $crowdinProvider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2');
 
         $translatorBag = $crowdinProvider->read([$domain], [$locale]);
 
@@ -758,7 +760,7 @@ public function testReadForDefaultLocaleAndOneDomain(string $locale, string $dom
             },
         ];
 
-        $loader = $this->createMock(LoaderInterface::class);
+        $loader = $this->getLoader();
         $loader->expects($this->once())
             ->method('load')
             ->willReturn($expectedTranslatorBag->getCatalogue($locale));
@@ -766,7 +768,7 @@ public function testReadForDefaultLocaleAndOneDomain(string $locale, string $dom
         $crowdinProvider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), $loader, self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2');
 
         $translatorBag = $crowdinProvider->read([$domain], [$locale]);
 
@@ -835,7 +837,7 @@ public function testReadServerException()
         $crowdinProvider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to export file.');
@@ -876,7 +878,7 @@ public function testReadDownloadServerException()
         $crowdinProvider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to download file content.');
@@ -948,7 +950,7 @@ public function testDelete()
         $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
 
         $provider->delete($translatorBag);
     }
@@ -987,7 +989,7 @@ public function testDeleteListStringServerException()
         $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to list strings for file "12".');
@@ -1052,7 +1054,7 @@ public function testDeleteDeleteStringServerException()
         $provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
             'auth_bearer' => 'API_TOKEN',
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.crowdin.com/api/v2/projects/1/');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to delete string.');
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php
index 006873b0e48fa..2f093aeecb148 100644
--- a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php
+++ b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Translation\Bridge\Loco\Tests;
 
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Component\Translation\Bridge\Loco\LocoProvider;
@@ -29,40 +30,40 @@
 
 class LocoProviderTest extends ProviderTestCase
 {
-    public static function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint): ProviderInterface
+    public static function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint, TranslatorBagInterface $translatorBag = null): ProviderInterface
     {
-        return new LocoProvider($client, $loader, $logger, $defaultLocale, $endpoint, self::getTranslatorBag());
+        return new LocoProvider($client, $loader, $logger, $defaultLocale, $endpoint, $translatorBag ?? new TranslatorBag());
     }
 
     public static function toStringProvider(): iterable
     {
         yield [
-            self::createProvider(self::getClient()->withOptions([
+            self::createProvider((new MockHttpClient())->withOptions([
                 'base_uri' => 'https://localise.biz/api/',
                 'headers' => [
                     'Authorization' => 'Loco API_KEY',
                 ],
-            ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'localise.biz/api/'),
+            ]), new ArrayLoader(), new NullLogger(), 'en', 'localise.biz/api/'),
             'loco://localise.biz/api/',
         ];
 
         yield [
-            self::createProvider(self::getClient()->withOptions([
+            self::createProvider((new MockHttpClient())->withOptions([
                 'base_uri' => 'https://example.com',
                 'headers' => [
                     'Authorization' => 'Loco API_KEY',
                 ],
-            ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'example.com'),
+            ]), new ArrayLoader(), new NullLogger(), 'en', 'example.com'),
             'loco://example.com',
         ];
 
         yield [
-            self::createProvider(self::getClient()->withOptions([
+            self::createProvider((new MockHttpClient())->withOptions([
                 'base_uri' => 'https://example.com:99',
                 'headers' => [
                     'Authorization' => 'Loco API_KEY',
                 ],
-            ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'example.com:99'),
+            ]), new ArrayLoader(), new NullLogger(), 'en', 'example.com:99'),
             'loco://example.com:99',
         ];
     }
@@ -247,7 +248,7 @@ public function testCompleteWriteProcess()
         $provider = self::createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://localise.biz/api/',
             'headers' => ['Authorization' => 'Loco API_KEY'],
-        ]), self::getLoader(), self::getLogg
10000
er(), self::getDefaultLocale(), 'localise.biz/api/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/');
 
         $provider->write($translatorBag);
     }
@@ -281,7 +282,7 @@ public function testWriteCreateAssetServerError()
         $provider = self::createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://localise.biz/api/',
             'headers' => ['Authorization' => 'Loco API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'localise.biz/api/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to add new translation key "a" to Loco: (status code: "500").');
@@ -333,7 +334,7 @@ public function testWriteCreateTagServerError()
         $provider = self::createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://localise.biz/api/',
             'headers' => ['Authorization' => 'Loco API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'localise.biz/api/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to create tag "messages" on Loco.');
@@ -393,7 +394,7 @@ public function testWriteTagAssetsServerError()
         $provider = self::createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://localise.biz/api/',
             'headers' => ['Authorization' => 'Loco API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'localise.biz/api/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to tag assets with "messages" on Loco.');
@@ -453,7 +454,7 @@ public function testWriteTagAssetsServerErrorWithComma()
         $provider = self::createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://localise.biz/api/',
             'headers' => ['Authorization' => 'Loco API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'localise.biz/api/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to tag asset "messages__a,messages__b" with "messages" on Loco.');
@@ -527,7 +528,7 @@ public function testWriteCreateLocaleServerError()
         $provider = self::createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://localise.biz/api/',
             'headers' => ['Authorization' => 'Loco API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'localise.biz/api/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to create locale "en" on Loco.');
@@ -604,7 +605,7 @@ public function testWriteGetAssetsIdsServerError()
         $provider = self::createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://localise.biz/api/',
             'headers' => ['Authorization' => 'Loco API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'localise.biz/api/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to get assets from Loco.');
@@ -689,7 +690,7 @@ public function testWriteTranslateAssetsServerError()
         $provider = self::createProvider((new MockHttpClient($responses))->withOptions([
             'base_uri' => 'https://localise.biz/api/',
             'headers' => ['Authorization' => 'Loco API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'localise.biz/api/');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'localise.biz/api/');
 
         $this->expectException(ProviderException::class);
         $this->expectExceptionMessage('Unable to add translation for key "messages__a" in locale "en" to Loco.');
@@ -702,13 +703,12 @@ public function testWriteTranslateAssetsServerError()
      */
     public function testReadForOneLocaleAndOneDomain(string $locale, string $domain, string $responseContent, TranslatorBag $expectedTranslatorBag)
     {
-        static::$loader = $this->createMock(LoaderInterface::class);
-        static::$loader->expects($this->once())
+        $loader = $this->getLoader();
+        $loader->expects($this->once())
             ->method('load')
             ->willReturn((new XliffFileLoader())->load($responseContent, $locale, $domain));
 
-        static::$translatorBag = $this->createMock(TranslatorBagInterface::class);
-        static::$translatorBag->expects($this->any())
+        $this->getTranslatorBag()->expects($this->any())
             ->method('getCatalogue')
             ->willReturn(new MessageCatalogue($locale));
 
@@ -717,7 +717,7 @@ public function testReadForOneLocaleAndOneDomain(string $locale, string $domain,
             'headers' => [
                 'Authorization' => 'Loco API_KEY',
             ],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'localise.biz/api/');
+        ]), $loader, new NullLogger(), 'en', 'localise.biz/api/', $this->getTranslatorBag());
         $translatorBag = $provider->read([$domain], [$locale]);
         // We don't want to assert equality of metadata here, due to the ArrayLoader usage.
         foreach ($translatorBag->getCatalogues() as $catalogue) {
@@ -744,14 +744,13 @@ public function testReadForManyLocalesAndManyDomains(array $locales, array $doma
             }
         }
 
-        static::$loader = $this->createMock(LoaderInterface::class);
-        static::$loader->expects($this->exactly(\count($consecutiveLoadArguments)))
+        $loader = $this->getLoader();
+        $loader->expects($this->exactly(\count($consecutiveLoadArguments)))
             ->method('load')
             ->withConsecutive(...$consecutiveLoadArguments)
             ->willReturnOnConsecutiveCalls(...$consecutiveLoadReturns);
 
-        static::$translatorBag = $this->createMock(TranslatorBagInterface::class);
-        static::$translatorBag->expects($this->any())
+        $this->getTranslatorBag()->expects($this->any())
             ->method('getCatalogue')
             ->willReturn(new MessageCatalogue($locale));
 
@@ -760,7 +759,7 @@ public function testReadForManyLocalesAndManyDomains(array $locales, array $doma
             'headers' => [
                 'Authorization' => 'Loco API_KEY',
             ],
-        ]), static::getLoader(), self::getLogger(), self::getDefaultLocale(), 'localise.biz/api/');
+        ]), $loader, $this->getLogger(), 'en', 'localise.biz/api/', $this->getTranslatorBag());
         $translatorBag = $provider->read($domains, $locales);
         // We don't want to assert equality of metadata here, due to the ArrayLoader usage.
         foreach ($translatorBag->getCatalogues() as $catalogue) {
@@ -798,8 +797,8 @@ public function testReadWithLastModified(array $locales, array $domains, array $
             }
         }
 
-        static::$loader = $this->createMock(LoaderInterface::class);
-        static::$loader->expects($this->exactly(\count($consecutiveLoadArguments)))
+        $loader = $this->getLoader();
+        $loader->expects($this->exactly(\count($consecutiveLoadArguments)))
             ->method('load')
             ->withConsecutive(...$consecutiveLoadArguments)
             ->willReturnOnConsecutiveCalls(...$consecutiveLoadReturns);
@@ -812,7 +811,7 @@ public function testReadWithLastModified(array $locales, array $domains, array $
             'localise.biz/api/'
         );
 
-        self::$translatorBag = $provider->read($domains, $locales);
+        $this->translatorBag = $provider->read($domains, $locales);
 
         $responses = [];
 
@@ -839,7 +838,8 @@ public function testReadWithLastModified(array $locales, array $domains, array $
             $this->getLoader(),
             $this->getLogger(),
             $this->getDefaultLocale(),
-            'localise.biz/api/'
+            'localise.biz/api/',
+            $this->getTranslatorBag()
         );
 
         $translatorBag = $provider->read($domains, $locales);
@@ -888,9 +888,9 @@ function (string $method, string $url): MockResponse {
                     return new MockResponse();
                 },
             ], 'https://localise.biz/api/'),
-            self::getLoader(),
-            self::getLogger(),
-            self::getDefaultLocale(),
+            $this->getLoader(),
+            $this->getLogger(),
+            $this->getDefaultLocale(),
             'localise.biz/api/'
         );
 
@@ -920,9 +920,9 @@ function (string $method, string $url): MockResponse {
                     return new MockResponse('', ['http_code' => 500]);
                 },
             ], 'https://localise.biz/api/'),
-            self::getLoader(),
-            self::getLogger(),
-            self::getDefaultLocale(),
+            $this->getLoader(),
+            $this->getLogger(),
+            $this->getDefaultLocale(),
             'localise.biz/api/'
         );
 
diff --git a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderWithoutTranslatorBagTest.php b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderWithoutTranslatorBagTest.php
index 834e0e0c224ed..ef312248e2a12 100644
--- a/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderWithoutTranslatorBagTest.php
+++ b/src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderWithoutTranslatorBagTest.php
@@ -19,12 +19,13 @@
 use Symfony\Component\Translation\Loader\XliffFileLoader;
 use Symfony\Component\Translation\Provider\ProviderInterface;
 use Symfony\Component\Translation\TranslatorBag;
+use Symfony\Component\Translation\TranslatorBagInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 class LocoProviderWithoutTranslatorBagTest extends LocoProviderTest
 {
-    public static function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint): ProviderInterface
+    public static function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint, TranslatorBagInterface $translatorBag = null): ProviderInterface
     {
         return new LocoProvider($client, $loader, $logger, $defaultLocale, $endpoint, null);
     }
@@ -59,8 +60,8 @@ public function testReadWithLastModified(array $locales, array $domains, array $
             }
         }
 
-        static::$loader = $this->createMock(LoaderInterface::class);
-        static::$loader->expects($this->exactly(\count($consecutiveLoadArguments) * 2))
+        $loader = $this->getLoader();
+        $loader->expects($this->exactly(\count($consecutiveLoadArguments) * 2))
             ->method('load')
             ->withConsecutive(...$consecutiveLoadArguments, ...$consecutiveLoadArguments)
             ->willReturnOnConsecutiveCalls(...$consecutiveLoadReturns, ...$consecutiveLoadReturns);
diff --git a/src/Symfony/Component/Translation/Bridge/Lokalise/Tests/LokaliseProviderTest.php b/src/Symfony/Component/Translation/Bridge/Lokalise/Tests/LokaliseProviderTest.php
index 14a420c4d0124..501d3b37b67b2 100644
--- a/src/Symfony/Component/Translation/Bridge/Lokalise/Tests/LokaliseProviderTest.php
+++ b/src/Symfony/Component/Translation/Bridge/Lokalise/Tests/LokaliseProviderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Translation\Bridge\Lokalise\Tests;
 
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Component\Translation\Bridge\Lokalise\LokaliseProvider;
@@ -23,12 +24,13 @@
 use Symfony\Component\Translation\Provider\ProviderInterface;
 use Symfony\Component\Translation\Test\ProviderTestCase;
 use Symfony\Component\Translation\TranslatorBag;
+use Symfony\Component\Translation\TranslatorBagInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 class LokaliseProviderTest extends ProviderTestCase
 {
-    public static function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint): ProviderInterface
+    public static function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint, TranslatorBagInterface $translatorBag = null): ProviderInterface
     {
         return new LokaliseProvider($client, $loader, $logger, $defaultLocale, $endpoint);
     }
@@ -36,26 +38,26 @@ public static function createProvider(HttpClientInterface $client, LoaderInterfa
     public static function toStringProvider(): iterable
     {
         yield [
-            self::createProvider(self::getclient()->withOptions([
+            self::createProvider((new MockHttpClient())->withOptions([
                 'base_uri' => 'https://api.lokalise.com/api2/projects/PROJECT_ID/',
                 'headers' => ['X-Api-Token' => 'API_KEY'],
-            ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.lokalise.com'),
+            ]), new ArrayLoader(), new NullLogger(), 'en', 'api.lokalise.com'),
             'lokalise://api.lokalise.com',
         ];
 
         yield [
-            self::createProvider(self::getclient()->withOptions([
+            self::createProvider((new MockHttpClient())->withOptions([
                 'base_uri' => 'https://example.com',
                 'headers' => ['X-Api-Token' => 'API_KEY'],
-            ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'example.com'),
+            ]), new ArrayLoader(), new NullLogger(), 'en', 'example.com'),
             'lokalise://example.com',
         ];
 
         yield [
-            self::createProvider(self::getclient()->withOptions([
+            self::createProvider((new MockHttpClient())->withOptions([
                 'base_uri' => 'https://example.com:99',
                 'headers' => ['X-Api-Token' => 'API_KEY'],
-            ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'example.com:99'),
+            ]), new ArrayLoader(), new NullLogger(), 'en', 'example.com:99'),
             'lokalise://example.com:99',
         ];
     }
@@ -232,7 +234,7 @@ public function testCompleteWriteProcess()
         ]))->withOptions([
             'base_uri' => 'https://api.lokalise.com/api2/projects/PROJECT_ID/',
             'headers' => ['X-Api-Token' => 'API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.lokalise.com');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.lokalise.com');
 
         $translatorBag = new TranslatorBag();
         $translatorBag->addCatalogue(new MessageCatalogue('en', [
@@ -262,7 +264,7 @@ public function testWriteGetLanguageServerError()
         ]))->withOptions([
             'base_uri' => 'https://api.lokalise.com/api2/projects/PROJECT_ID/',
             'headers' => ['X-Api-Token' => 'API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.lokalise.com');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.lokalise.com');
 
         $translatorBag = new TranslatorBag();
         $translatorBag->addCatalogue(new MessageCatalogue('en', [
@@ -304,7 +306,7 @@ public function testWriteCreateLanguageServerError()
         ]))->withOptions([
             'base_uri' => 'https://api.lokalise.com/api2/projects/PROJECT_ID/',
             'headers' => ['X-Api-Token' => 'API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.lokalise.com');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.lokalise.com');
 
         $translatorBag = new TranslatorBag();
         $translatorBag->addCatalogue(new MessageCatalogue('en', [
@@ -362,7 +364,7 @@ public function testWriteGetKeysIdsServerError()
         ]))->withOptions([
             'base_uri' => 'https://api.lokalise.com/api2/projects/PROJECT_ID/',
             'headers' => ['X-Api-Token' => 'API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.lokalise.com');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.lokalise.com');
 
         $translatorBag = new TranslatorBag();
         $translatorBag->addCatalogue(new MessageCatalogue('en', [
@@ -443,7 +445,7 @@ public function testWriteCreateKeysServerError()
         ]))->withOptions([
             'base_uri' => 'https://api.lokalise.com/api2/projects/PROJECT_ID/',
             'headers' => ['X-Api-Token' => 'API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.lokalise.com');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.lokalise.com');
 
         $translatorBag = new TranslatorBag();
         $translatorBag->addCatalogue(new MessageCatalogue('en', [
@@ -536,7 +538,7 @@ public function testWriteUploadTranslationsServerError()
         ]))->withOptions([
             'base_uri' => 'https://api.lokalise.com/api2/projects/PROJECT_ID/',
             'headers' => ['X-Api-Token' => 'API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.lokalise.com');
+        ]), $this->getLoader(), $this->getLogger(), $this->getDefaultLocale(), 'api.lokalise.com');
 
         $translatorBag = new TranslatorBag();
         $translatorBag->addCatalogue(new MessageCatalogue('en', [
@@ -580,15 +582,15 @@ public function testReadForOneLocaleAndOneDomain(string $locale, string $domain,
             ]));
         };
 
-        static::$loader = $this->createMock(LoaderInterface::class);
-        static::$loader->expects($this->once())
+        $loader = $this->getLoader();
+        $loader->expects($this->once())
             ->method('load')
             ->willReturn((new XliffFileLoader())->load($responseContent, $locale, $domain));
 
         $provider = self::createProvider((new MockHttpClient($response))->withOptions([
             'base_uri' => 'https://api.lokalise.com/api2/projects/PROJECT_ID/',
             'headers' => ['X-Api-Token' => 'API_KEY'],
-        ]), self::getLoader(), self::getLogger(), self::getDefaultLocale(), 'api.lokalise.com');
+        ]), $loader, $this->getLogger(), $this->getDefaultLocale(), 'api.lokalise.com');
         $translatorBag = $provider->read([$domain], [$locale]);
 
         // We don't want to assert equality of metadata here, due to the ArrayLoader usage.
@@ -623,7 +625,7 @@ public function testReadForManyLocalesAndManyDomains(array $locales, array $doma
             }, []),
         ]));
 
-        $loader = self::getLoader();
+        $loader = $this->getLoader();
         $loader->expects($this->exactly(\count($consecutiveLoadArguments)))
             ->method('load')
             ->withConsecutive(...$consecutiveLoadArguments)
@@ -632,7 +634,7 @@ public function testReadForManyLocalesAndManyDomains(array $locales, array $doma
         $provider = self::createProvider((new MockHttpClient($response))->withOptions([
             'base_uri' => 'https://api.lokalise.com/api2/projects/PROJECT_ID/',
             'headers' => ['X-Api-Token' => 'API_KEY'],
-        ]), $loader, self::getLogger(), self::getDefaultLocale(), 'api.lokalise.com');
+        ]), $loader, $this->getLogger(), $this->getDefaultLocale(), 'api.lokalise.com');
 
         $translatorBag = $provider->read($domains, $locales);
         // We don't want to assert equality of metadata here, due to the ArrayLoader usage.
@@ -714,9 +716,9 @@ public function testDeleteProcess()
                 $getKeysIdsForValidatorsDomainResponse,
                 $deleteResponse,
             ], 'https://api.lokalise.com/api2/projects/PROJECT_ID/'),
-            self::getLoader(),
-            self::getLogger(),
-            self::getDefaultLocale(),
+            $this->getLoader(),
+            $this->getLogger(),
+            $this->getDefaultLocale(),
             'api.lokalise.com'
         );
 
diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
index 7dc8b56c48538..07ba0d031029e 100644
--- a/src/Symfony/Component/Translation/CHANGELOG.md
+++ b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+6.2.7
+-----
+
+ * [BC BREAK] The following data providers for `ProviderFactoryTestCase` are now static:
+   `supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
+ * [BC BREAK] `ProviderTestCase::toStringProvider()` is now static
+
 6.2
 ---
 
@@ -14,13 +21,6 @@ CHANGELOG
  * Parameters implementing `TranslatableInterface` are processed
  * Add the file extension to the `XliffFileDumper` constructor
 
-5.4.21
-------
-
- * [BC BREAK] The following data providers for `ProviderFactoryTestCase` are now static:
-   `supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
- * [BC BREAK] `ProviderTestCase::toStringProvider()` is now static
-
 5.4
 ---
 
diff --git a/src/Symfony/Component/Translation/Test/ProviderTestCase.php b/src/Symfony/Component/Translation/Test/ProviderTestCase.php
index 06a1b51d0de09..ee2c2f33429bd 100644
--- a/src/Symfony/Component/Translation/Test/ProviderTestCase.php
+++ b/src/Symfony/Component/Translation/Test/ProviderTestCase.php
@@ -11,15 +11,13 @@
 
 namespace Symfony\Component\Translation\Test;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Translation\Dumper\XliffFileDumper;
 use Symfony\Component\Translation\Loader\LoaderInterface;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Provider\ProviderInterface;
-use Symfony\Component\Translation\TranslatorBag;
 use Symfony\Component\Translation\TranslatorBagInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -32,14 +30,14 @@
  */
 abstract class ProviderTestCase extends TestCase
 {
-    protected static HttpClientInterface $client;
-    protected static LoggerInterface $logger;
-    protected static string $defaultLocale;
-    protected static LoaderInterface $loader;
-    protected static XliffFileDumper $xliffFileDumper;
-    protected static TranslatorBagInterface $translatorBag;
+    protected HttpClientInterface $client;
+    protected LoggerInterface|MockObject $logger;
+    protected string $defaultLocale;
+    protected LoaderInterface|MockObject $loader;
+    protected XliffFileDumper|MockObject $xliffFileDumper;
+    protected TranslatorBagInterface|MockObject $translatorBag;
 
-    abstract public static function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint): ProviderInterface;
+    abstract public static function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint, TranslatorBagInterface $translatorBag = null): ProviderInterface;
 
     /**
      * @return iterable<array{0: ProviderInterface, 1: string}>
@@ -54,38 +52,33 @@ public function testToString(ProviderInterface $provider, string $expected)
         $this->assertSame($expected, (string) $provider);
     }
 
-    protected static function getClient(): MockHttpClient
+    protected function getClient(): MockHttpClient
     {
-        return static::$client ??= new MockHttpClient();
+        return $this->client ??= new MockHttpClient();
     }
 
-    protected static function getLoader(): LoaderInterface
+    protected function getLoader(): LoaderInterface
     {
-        return static::$loader ??= new class() implements LoaderInterface {
-            public function load($resource, string $locale, string $domain = 'messages'): MessageCatalogue
-            {
-                return new MessageCatalogue($locale);
-            }
-        };
+        return $this->loader ??= $this->createMock(LoaderInterface::class);
     }
 
-    protected static function getLogger(): LoggerInterface
+    protected function getLogger(): LoggerInterface
     {
-        return static::$logger ??= new NullLogger();
+        return $this->logger ??= $this->createMock(LoggerInterface::class);
     }
 
-    protected static function getDefaultLocale(): string
+    protected function getDefaultLocale(): string
     {
-        return static::$defaultLocale ??= 'en';
+        return $this->defaultLocale ??= 'en';
     }
 
-    protected static function getXliffFileDumper(): XliffFileDumper
+    protected function getXliffFileDumper(): XliffFileDumper
     {
-        return static::$xliffFileDumper ??= new XliffFileDumper();
+        return $this->xliffFileDumper ??= $this->createMock(XliffFileDumper::class);
     }
 
-    protected static function getTranslatorBag(): TranslatorBagInterface
+    protected function getTranslatorBag(): TranslatorBagInterface
     {
-        return self::$translatorBag ??= new TranslatorBag();
+        return $this->translatorBag ??= $this->createMock(TranslatorBagInterface::class);
     }
 }

From aa94e6e28cfdef6ab613783cf16ed4a91f48a8ff Mon Sep 17 00:00:00 2001
From: Antoine Makdessi <amakdessi@me.com>
Date: Sat, 18 Feb 2023 18:20:50 +0100
Subject: [PATCH 218/475] [TwigBundle] add alias deprecation for
 Twig_Environment

---
 src/Symfony/Bundle/TwigBundle/CHANGELOG.md              | 5 +++++
 src/Symfony/Bundle/TwigBundle/Resources/config/twig.php | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
index 5502812c27ec1..ba5a3f08850d8 100644
--- a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Deprecate the `Twig_Environment` autowiring alias, use `Twig\Environment` instead
+
 6.2
 ---
 
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
index aa5c543b30f40..00ed07c588e05 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
@@ -68,6 +68,7 @@
             ->tag('container.preload', ['class' => TemplateWrapper::class])
 
         ->alias('Twig_Environment', 'twig')
+            ->deprecate('symfony/twig-bundle', '6.3', 'The "%alias_id%" service alias is deprecated, use "'.Environment::class.'" or "twig" instead.')
         ->alias(Environment::class, 'twig')
 
         ->set('twig.app_variable', AppVariable::class)

From bdc4c103a09935a831babf2b70e856de2fd17fa6 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Thu, 16 Feb 2023 16:37:32 +0100
Subject: [PATCH 219/475] [DependencyInjection] Allow trimming service
 parameters value in XML configuration files

---
 src/Symfony/Component/DependencyInjection/CHANGELOG.md     | 1 +
 .../Component/DependencyInjection/Loader/XmlFileLoader.php | 7 ++++---
 .../Loader/schema/dic/services/services-1.0.xsd            | 1 +
 .../DependencyInjection/Tests/Fixtures/xml/services2.xml   | 7 +++++++
 .../DependencyInjection/Tests/Loader/XmlFileLoaderTest.php | 3 +++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index d4a0da19a799b..9bcc904541389 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -12,6 +12,7 @@ CHANGELOG
  * Fail if Target attribute does not exist during compilation
  * Enable deprecating parameters with `ContainerBuilder::deprecateParameter()`
  * Add `#[AsAlias]` attribute to tell under which alias a service should be registered or to use the implemented interface if no parameter is given
+ * Allow to trim XML service parameters value by using `trim="true"` attribute
 
 6.2
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 93a23052f6a6f..6350b3af307d2 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -478,6 +478,7 @@ private function getArgumentsAsPhp(\DOMElement $node, string $name, string $file
                 $key = $arg->getAttribute('key');
             }
 
+            $trim = $arg->hasAttribute('trim') && XmlUtils::phpize($arg->getAttribute('trim'));
             $onInvalid = $arg->getAttribute('on-invalid');
             $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
             if ('ignore' == $onInvalid) {
@@ -550,7 +551,7 @@ private function getArgumentsAsPhp(\DOMElement $node, string $name, string $file
                         $excludes = [$arg->getAttribute('exclude')];
                     }
 
-                    $arguments[$key] = new TaggedIteratorArgument($arg->getAttribute('tag'), $arg->getAttribute('index-by') ?: null, $arg->getAttribute('default-index-method') ?: null, $forLocator, $arg->getAttribute('default-priority-method') ?: null, $excludes, $arg->getAttribute('exclude-self') ?: true);
+                    $arguments[$key] = new TaggedIteratorArgument($arg->getAttribute('tag'), $arg->getAttribute('index-by') ?: null, $arg->getAttribute('default-index-method') ?: null, $forLocator, $arg->getAttribute('default-priority-method') ?: null, $excludes, !$arg->hasAttribute('exclude-self') || XmlUtils::phpize($arg->getAttribute('exclude-self')));
 
                     if ($forLocator) {
                         $arguments[$key] = new ServiceLocatorArgument($arguments[$key]);
@@ -566,13 +567,13 @@ private function getArgumentsAsPhp(\DOMElement $node, string $name, string $file
                     $arguments[$key] = new AbstractArgument($arg->nodeValue);
                     break;
                 case 'string':
-                    $arguments[$key] = $arg->nodeValue;
+                    $arguments[$key] = $trim ? trim($arg->nodeValue) : $arg->nodeValue;
                     break;
                 case 'constant':
                     $arguments[$key] = \constant(trim($arg->nodeValue));
                     break;
                 default:
-                    $arguments[$key] = XmlUtils::phpize($arg->nodeValue);
+                    $arguments[$key] = XmlUtils::phpize($trim ? trim($arg->nodeValue) : $arg->nodeValue);
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
index 83e430a859445..c5263185bd0dc 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
+++ b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
@@ -258,6 +258,7 @@
     <xsd:attribute name="id" type="xsd:string" />
     <xsd:attribute name="key" type="xsd:string" />
     <xsd:attribute name="on-invalid" type="invalid_sequence" />
+    <xsd:attribute name="trim" type="xsd:boolean" />
   </xsd:complexType>
 
   <xsd:complexType name="property" mixed="true">
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services2.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services2.xml
index be6caee20ef62..163e81ef3516a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services2.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services2.xml
@@ -18,6 +18,13 @@
       <parameter key="float">1.3</parameter>
       <parameter>1000.3</parameter>
       <parameter>a string</parameter>
+      <parameter trim="false"> a string not trimmed </parameter>
+      <parameter trim="true">
+        a trimmed string
+      </parameter>
+      <parameter type="string" trim="true">
+        an explicit trimmed string
+      </parameter>
       <parameter type="collection">
         <parameter>foo</parameter>
         <parameter>bar</parameter>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
index 13d6725db698b..84acd50972016 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -140,6 +140,9 @@ public function testLoadParameters()
                 'float' => 1.3,
                 1000.3,
                 'a string',
+                ' a string not trimmed ',
+                'a trimmed string',
+                'an explicit trimmed string',
                 ['foo', 'bar'],
             ],
             'mixedcase' => ['MixedCaseKey' => 'value'],

From 49ce885db89c5b4156ff15c05a46644bc5b5c582 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Thu, 16 Feb 2023 18:39:07 +0100
Subject: [PATCH 220/475] [DependencyInjection] Improve dumping closure of
 service closure

---
 .../DependencyInjection/Dumper/PhpDumper.php   |  4 ++++
 .../Tests/Dumper/PhpDumperTest.php             |  5 +++++
 .../Tests/Fixtures/php/closure.php             | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 667c23c4dc600..aab5d6ec6683d 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1156,6 +1156,10 @@ private function addNewInstance(Definition $definition, string $return = '', str
 
             if (['Closure', 'fromCallable'] === $callable && [0] === array_keys($definition->getArguments())) {
                 $callable = $definition->getArgument(0);
+                if ($callable instanceof ServiceClosureArgument) {
+                    return $return.$this->dumpValue($callable).$tail;
+                }
+
                 $arguments = ['...'];
 
                 if ($callable instanceof Reference || $callable instanceof Definition) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 5cf5c2c8b9889..eb8eaf34d25ed 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -1601,6 +1601,11 @@ public function testClosure()
             ->setFactory(['Closure', 'fromCallable'])
             ->setArguments([new Reference('bar')]);
         $container->register('bar', 'stdClass');
+        $container->register('closure_of_service_closure', 'Closure')
+            ->setPublic('true')
+            ->setFactory(['Closure', 'fromCallable'])
+            ->setArguments([new ServiceClosureArgument(new Reference('bar2'))]);
+        $container->register('bar2', 'stdClass');
         $container->compile();
         $dumper = new PhpDumper($container);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php
index 41cae53e5dcc4..c231064711667 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php
@@ -23,6 +23,7 @@ public function __construct()
         $this->services = $this->privates = [];
         $this->methodMap = [
             'closure' => 'getClosureService',
+            'closure_of_service_closure' => 'getClosureOfServiceClosureService',
         ];
 
         $this->aliases = [];
@@ -42,6 +43,7 @@ public function getRemovedIds(): array
     {
         return [
             'bar' => true,
+            'bar2' => true,
         ];
     }
 
@@ -54,4 +56,20 @@ protected static function getClosureService($container)
     {
         return $container->services['closure'] = (new \stdClass())->__invoke(...);
     }
+
+    /**
+     * Gets the public 'closure_of_service_closure' shared service.
+     *
+     * @return \Closure
+     */
+    protected static function getClosureOfServiceClosureService($container)
+    {
+        $containerRef = $container->ref;
+
+        return $container->services['closure_of_service_closure'] = #[\Closure(name: 'bar2', class: 'stdClass')] static function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            return ($container->privates['bar2'] ??= new \stdClass());
+        };
+    }
 }

From c463133308e532d604c4c4ee522ab3fa5d551199 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Fri, 17 Feb 2023 15:59:43 -0500
Subject: [PATCH 221/475] [DI] allow extending `Autowire` attribute

---
 .../Component/DependencyInjection/CHANGELOG.md     |  1 +
 .../DependencyInjection/Compiler/AutowirePass.php  |  6 +++---
 .../Tests/Compiler/AutowirePassTest.php            |  6 ++++--
 .../Fixtures/includes/autowiring_classes_80.php    | 11 +++++++++++
 src/Symfony/Component/HttpKernel/CHANGELOG.md      |  1 +
 .../RegisterControllerArgumentLocatorsPass.php     |  2 +-
 .../RegisterControllerArgumentLocatorsPassTest.php | 14 +++++++++++++-
 7 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 9bcc904541389..7a6ef6b65836f 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG
  * Enable deprecating parameters with `ContainerBuilder::deprecateParameter()`
  * Add `#[AsAlias]` attribute to tell under which alias a service should be registered or to use the implemented interface if no parameter is given
  * Allow to trim XML service parameters value by using `trim="true"` attribute
+ * Allow extending the `Autowire` attribute
 
 6.2
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 762f22d9dcf51..3bcaa812cf485 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -292,11 +292,11 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
             }
 
             if ($checkAttributes) {
-                foreach ($parameter->getAttributes() as $attribute) {
-                    if (\in_array($attribute->getName(), [TaggedIterator::class, TaggedLocator::class, Autowire::class, MapDecorated::class], true)) {
+                foreach ([TaggedIterator::class, TaggedLocator::class, Autowire::class, MapDecorated::class] as $attributeClass) {
+                    foreach ($parameter->getAttributes($attributeClass, Autowire::class === $attributeClass ? \ReflectionAttribute::IS_INSTANCEOF : 0) as $attribute) {
                         $arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());
 
-                        continue 2;
+                        continue 3;
                     }
                 }
             }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index ed7316fd707d1..bdf07b10ff077 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -1235,7 +1235,7 @@ public function testAutowireAttribute()
 
         $definition = $container->getDefinition(AutowireAttribute::class);
 
-        $this->assertCount(9, $definition->getArguments());
+        $this->assertCount(10, $definition->getArguments());
         $this->assertEquals(new Reference('some.id'), $definition->getArgument(0));
         $this->assertEquals(new Expression("parameter('some.parameter')"), $definition->getArgument(1));
         $this->assertSame('foo/bar', $definition->getArgument(2));
@@ -1244,7 +1244,8 @@ public function testAutowireAttribute()
         $this->assertEquals(new Expression("parameter('some.parameter')"), $definition->getArgument(5));
         $this->assertSame('bar', $definition->getArgument(6));
         $this->assertSame('@bar', $definition->getArgument(7));
-        $this->assertEquals(new Reference('invalid.id', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(8));
+        $this->assertSame('foo', $definition->getArgument(8));
+        $this->assertEquals(new Reference('invalid.id', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(9));
 
         $container->compile();
 
@@ -1257,6 +1258,7 @@ public function testAutowireAttribute()
         $this->assertSame('foo', $service->expressionAsValue);
         $this->assertSame('bar', $service->rawValue);
         $this->assertSame('@bar', $service->escapedRawValue);
+        $this->assertSame('foo', $service->customAutowire);
         $this->assertNull($service->invalid);
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
index c1f56eb1cffb4..863b33e7ce4b5 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
@@ -33,6 +33,15 @@ class AutowireProperty
     public Foo $foo;
 }
 
+#[\Attribute(\Attribute::TARGET_PARAMETER)]
+class CustomAutowire extends Autowire
+{
+    public function __construct(string $parameter)
+    {
+        parent::__construct(param: $parameter);
+    }
+}
+
 class AutowireAttribute
 {
     public function __construct(
@@ -52,6 +61,8 @@ public function __construct(
         public string $rawValue,
         #[Autowire('@@bar')]
         public string $escapedRawValue,
+        #[CustomAutowire('some.parameter')]
+        public string $customAutowire,
         #[Autowire(service: 'invalid.id')]
         public ?\stdClass $invalid = null,
     ) {
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 650bd9bc75b49..c70f632a5249c 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * Add `#[WithHttpStatus]` for defining status codes for exceptions
  * Use an instance of `Psr\Clock\ClockInterface` to generate the current date time in `DateTimeValueResolver`
  * Add `#[WithLogLevel]` for defining log levels for exceptions
+ * Allow extending the `Autowire` attribute
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
index b294036d4eb98..d0e05340d8c6a 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -146,7 +146,7 @@ public function process(ContainerBuilder $container)
                         $args[$p->name] = $bindingValue;
 
                         continue;
-                    } elseif (!$autowire || (!($autowireAttributes ??= $p->getAttributes(Autowire::class)) && (!$type || '\\' !== $target[0]))) {
+                    } elseif (!$autowire || (!($autowireAttributes ??= $p->getAttributes(Autowire::class, \ReflectionAttribute::IS_INSTANCEOF)) && (!$type || '\\' !== $target[0]))) {
                         continue;
                     } elseif (is_subclass_of($type, \UnitEnum::class)) {
                         // do not attempt to register enum typed arguments if not already present in bindings
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
index 8420040366a79..13523d1d65e6d 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -482,7 +482,7 @@ public function testAutowireAttribute()
 
         $locator = $container->get($locatorId)->get('foo::fooAction');
 
-        $this->assertCount(7, $locator->getProvidedServices());
+        $this->assertCount(8, $locator->getProvidedServices());
         $this->assertInstanceOf(\stdClass::class, $locator->get('service1'));
         $this->assertSame('foo/bar', $locator->get('value'));
         $this->assertSame('foo', $locator->get('expression'));
@@ -490,6 +490,7 @@ public function testAutowireAttribute()
         $this->assertInstanceOf(\stdClass::class, $locator->get('expressionAsValue'));
         $this->assertSame('bar', $locator->get('rawValue'));
         $this->assertSame('@bar', $locator->get('escapedRawValue'));
+        $this->assertSame('foo', $locator->get('customAutowire'));
         $this->assertFalse($locator->has('service2'));
     }
 }
@@ -580,6 +581,15 @@ public function fooAction(Response $response, ?Response $nullableResponse)
     }
 }
 
+#[\Attribute(\Attribute::TARGET_PARAMETER)]
+class CustomAutowire extends Autowire
+{
+    public function __construct(string $parameter)
+    {
+        parent::__construct(param: $parameter);
+    }
+}
+
 class WithAutowireAttribute
 {
     public function fooAction(
@@ -597,6 +607,8 @@ public function fooAction(
         string $rawValue,
         #[Autowire('@@bar')]
         string $escapedRawValue,
+        #[CustomAutowire('some.parameter')]
+        string $customAutowire,
         #[Autowire(service: 'invalid.id')]
         \stdClass $service2 = null,
     ) {

From d60f400ed21e5c00b7f62f8fb7f61a5ad7cab028 Mon Sep 17 00:00:00 2001
From: Michael Dawart <md@neuewerte.de>
Date: Fri, 17 Feb 2023 20:05:15 +0100
Subject: [PATCH 222/475] [Mailer] Add option to enable Sandbox via dsn option
 sandbox=true

---
 .../Mailer/Bridge/Mailjet/CHANGELOG.md        |  5 ++
 .../Component/Mailer/Bridge/Mailjet/README.md |  1 +
 .../Transport/MailjetApiTransportTest.php     | 54 ++++++++++++++++++-
 .../Mailjet/Transport/MailjetApiTransport.php |  5 +-
 .../Transport/MailjetTransportFactory.php     |  3 +-
 5 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/Mailjet/CHANGELOG.md
index 0d994e934e55a..8795f1e1008da 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailjet/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add sandbox option
+
 5.2.0
 -----
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/README.md b/src/Symfony/Component/Mailer/Bridge/Mailjet/README.md
index 634c674528fb2..318367c2e9b89 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailjet/README.md
+++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/README.md
@@ -8,6 +8,7 @@ Configuration examples:
 ```dotenv
 # API
 MAILER_DSN=mailjet+api://$PUBLIC_KEY:$PRIVATE_KEY@default
+MAILER_DSN=mailjet+api://$PUBLIC_KEY:$PRIVATE_KEY@default?sandbox=true
 # SMTP
 MAILER_DSN=mailjet+smtp://$PUBLIC_KEY:$PRIVATE_KEY@default
 ```
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetApiTransportTest.php
index 7a82b88800f50..93abf9415de6f 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetApiTransportTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetApiTransportTest.php
@@ -318,7 +318,6 @@ public function testHeaderToMessage()
 
         $transport = new MailjetApiTransport(self::USER, self::PASSWORD);
         $method = new \ReflectionMethod(MailjetApiTransport::class, 'getPayload');
-        $method->setAccessible(true);
         self::assertSame(
             [
                 'Messages' => [
@@ -364,6 +363,59 @@ public function testHeaderToMessage()
                         'TrackOpen' => 'account_default',
                     ],
                 ],
+                'SandBoxMode' => false,
+            ],
+            $method->invoke($transport, $email, $envelope)
+        );
+
+        $transport = new MailjetApiTransport(self::USER, self::PASSWORD, sandbox: true);
+        $method = new \ReflectionMethod(MailjetApiTransport::class, 'getPayload');
+        self::assertSame(
+            [
+                'Messages' => [
+                    [
+                        'From' => [
+                            'Email' => 'foo@example.com',
+                            'Name' => 'Foo',
+                        ],
+                        'To' => [
+                            [
+                                'Email' => 'bar@example.com',
+                                'Name' => '',
+                            ],
+                        ],
+                        'Subject' => 'Sending email to mailjet API',
+                        'Attachments' => [],
+                        'InlinedAttachments' => [],
+                        'ReplyTo' => [
+                            'Email' => 'qux@example.com',
+                            'Name' => 'Qux',
+                        ],
+                        'Headers' => [
+                            'X-authorized-header' => 'authorized',
+                        ],
+                        'TemplateLanguage' => true,
+                        'TemplateID' => 12345,
+                        'TemplateErrorReporting' => [
+                            'Email' => 'errors@mailjet.com',
+                            'Name' => 'Error Email',
+                        ],
+                        'TemplateErrorDeliver' => true,
+                        'Variables' => [
+                            'varname1' => 'value1',
+                            'varname2' => 'value2',
+                            'varname3' => 'value3',
+                        ],
+                        'CustomID' => 'CustomValue',
+                        'EventPayload' => 'Eticket,1234,row,15,seat,B',
+                        'CustomCampaign' => 'SendAPI_campaign',
+                        'DeduplicateCampaign' => true,
+                        'Priority' => 2,
+                        'TrackClick' => 'account_default',
+                        'TrackOpen' => 'account_default',
+                    ],
+                ],
+                'SandBoxMode' => true,
             ],
             $method->invoke($transport, $email, $envelope)
         );
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php
index 2f48cd5de046d..22002f36f2b03 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php
@@ -53,11 +53,13 @@ class MailjetApiTransport extends AbstractApiTransport
 
     private string $privateKey;
     private string $publicKey;
+    private bool $sandbox;
 
-    public function __construct(string $publicKey, string $privateKey, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+    public function __construct(string $publicKey, string $privateKey, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null, bool $sandbox = false)
     {
         $this->publicKey = $publicKey;
         $this->privateKey = $privateKey;
+        $this->sandbox = $sandbox;
 
         parent::__construct($client, $dispatcher, $logger);
     }
@@ -153,6 +155,7 @@ private function getPayload(Email $email, Envelope $envelope): array
 
         return [
             'Messages' => [$message],
+            'SandBoxMode' => $this->sandbox,
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetTransportFactory.php
index 4ff2698be608a..938b87d74f31f 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetTransportFactory.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetTransportFactory.php
@@ -24,9 +24,10 @@ public function create(Dsn $dsn): TransportInterface
         $user = $this->getUser($dsn);
         $password = $this->getPassword($dsn);
         $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
+        $sandbox = filter_var($dsn->getOption('sandbox', false), \FILTER_VALIDATE_BOOL);
 
         if ('mailjet+api' === $scheme) {
-            return (new MailjetApiTransport($user, $password, $this->client, $this->dispatcher, $this->logger))->setHost($host);
+            return (new MailjetApiTransport($user, $password, $this->client, $this->dispatcher, $this->logger, $sandbox))->setHost($host);
         }
 
         if (\in_array($scheme, ['mailjet+smtp', 'mailjet+smtps', 'mailjet'])) {

From 00dfb25fe3e9ca9b4af535bcd5fb31e85d125d53 Mon Sep 17 00:00:00 2001
From: Yanick Witschi <yanick.witschi@terminal42.ch>
Date: Thu, 9 Feb 2023 17:04:15 +0100
Subject: [PATCH 223/475] [HttpKernel] Add `skip_response_headers` to the
 `HttpCache` options

---
 src/Symfony/Component/HttpKernel/CHANGELOG.md |  2 +-
 .../HttpKernel/HttpCache/HttpCache.php        | 19 +++++++++-
 .../Tests/HttpCache/HttpCacheTest.php         | 37 +++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index c70f632a5249c..d5bf22a1d967c 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -9,7 +9,7 @@ CHANGELOG
  * Add `#[WithHttpStatus]` for defining status codes for exceptions
  * Use an instance of `Psr\Clock\ClockInterface` to generate the current date time in `DateTimeValueResolver`
  * Add `#[WithLogLevel]` for defining log levels for exceptions
- * Allow extending the `Autowire` attribute
+ * Add `skip_response_headers` to the `HttpCache` options
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
index 78531624fbcaf..f17c07c071f9c 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -60,6 +60,9 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
      *                            on responses that don't explicitly state whether the response is
      *                            public or private via a Cache-Control directive. (default: Authorization and Cookie)
      *
+     *   * skip_response_headers  Set of response headers that are never cached even if a response is cacheable (public).
+     *                            (default: Set-Cookie)
+     *
      *   * allow_reload           Specifies whether the client can force a cache reload by including a
      *                            Cache-Control "no-cache" directive in the request. Set it to ``true``
      *                            for compliance with RFC 2616. (default: false)
@@ -97,6 +100,7 @@ public function __construct(HttpKernelInterface $kernel, StoreInterface $store,
             'debug' => false,
             'default_ttl' => 0,
             'private_headers' => ['Authorization', 'Cookie'],
+            'skip_response_headers' => ['Set-Cookie'],
             'allow_reload' => false,
             'allow_revalidate' => false,
             'stale_while_revalidate' => 2,
@@ -596,8 +600,17 @@ protected function lock(Request $request, Response $entry): bool
     protected function store(Request $request, Response $response)
     {
         try {
-            $this->store->write($request, $response);
+            $restoreHeaders = [];
+            foreach ($this->options['skip_response_headers'] as $header) {
+                if (!$response->headers->has($header)) {
+                    continue;
+                }
 
+                $restoreHeaders[$header] = $response->headers->all($header);
+                $response->headers->remove($header);
+            }
+
+            $this->store->write($request, $response);
             $this->record($request, 'store');
 
             $response->headers->set('Age', $response->getAge());
@@ -607,6 +620,10 @@ protected function store(Request $request, Response $response)
             if ($this->options['debug']) {
                 throw $e;
             }
+        } finally {
+            foreach ($restoreHeaders as $header => $values) {
+                $response->headers->set($header, $values);
+            }
         }
 
         // now that the response is cached, release the lock
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
index 29610d75324eb..64a8cbdc77d00 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
@@ -1740,6 +1740,43 @@ public function testResponsesThatMustNotBeUsedStaleIfError($responseHeaders, $sl
         $this->assertEquals(500, $this->response->getStatusCode());
     }
 
+    public function testSkipsConfiguredResponseHeadersForStore()
+    {
+        $storeMock = $this->createMock(StoreInterface::class);
+        $storeMock
+            ->expects($this->once())
+            ->method('write')
+            ->with(
+                $this->isInstanceOf(Request::class),
+                $this->callback(function (Response $response) {
+                    $this->assertFalse($response->headers->has('Set-Cookie'));
+                    $this->assertFalse($response->headers->has('Another-One-To-Skip'));
+                    $this->assertTrue($response->headers->has('Cache-Control'));
+                    $this->assertTrue($response->headers->has('Another-One-To-Keep'));
+
+                    return true;
+                })
+            );
+
+        $this->setNextResponse(200, [
+            'Cache-Control' => 'public, s-maxage=20',
+            'Set-Cookie' => 'foobar=value; path=/',
+            'Another-One-To-Skip' => 'foobar',
+            'Another-One-To-Keep' => 'foobar',
+        ]);
+
+        $httpCache = new HttpCache($this->kernel, $storeMock, null, [
+            'skip_response_headers' => ['Set-Cookie', 'Another-One-To-Skip', 'I-do-Not-Exist'],
+        ]);
+
+        $response = $httpCache->handle(Request::create('/'));
+
+        $this->assertSame('foobar=value; path=/', $response->headers->get('Set-Cookie'));
+        $this->assertSame('foobar', $response->headers->get('Another-One-To-Skip'));
+        $this->assertSame('foobar', $response->headers->get('Another-One-To-Keep'));
+        $this->assertFalse($response->headers->has('I-do-Not-Exist'));
+    }
+
     public static function getResponseDataThatMustNotBeServedStaleIfError()
     {
         // All data sets assume that a 10s stale-if-error grace period has been configured

From 75452ffc78cd914304ad082a2a053c138e90b437 Mon Sep 17 00:00:00 2001
From: spackmat <gregor@der-meyer.de>
Date: Tue, 21 Feb 2023 11:50:54 +0100
Subject: [PATCH 224/475] [Validator] Implement countUnit option for Length
 constraint

---
 src/Symfony/Component/Validator/CHANGELOG.md  |  1 +
 .../Validator/Constraints/Length.php          | 21 +++++++
 .../Validator/Constraints/LengthValidator.php | 10 +++-
 .../Tests/Constraints/LengthTest.php          | 19 +++++++
 .../Tests/Constraints/LengthValidatorTest.php | 57 +++++++++++++++++++
 5 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
index e358e8f23299a..ec3eacc6bbd68 100644
--- a/src/Symfony/Component/Validator/CHANGELOG.md
+++ b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Add `Uuid::TIME_BASED_VERSIONS` to match that a UUID being validated embeds a timestamp
  * Add the `pattern` parameter in violations of the `Regex` constraint
  * Add a `NoSuspiciousCharacters` constraint to validate a string is not a spoofing attempt
+ * Add the `countUnit` option to the `Length` constraint to allow counting the string length either by code points (like before, now the default setting `Length::COUNT_CODEPOINTS`), bytes (`Length::COUNT_BYTES`) or graphemes (`Length::COUNT_GRAPHEMES`)
 
 6.2
 ---
diff --git a/src/Symfony/Component/Validator/Constraints/Length.php b/src/Symfony/Component/Validator/Constraints/Length.php
index a25bf520ea608..59360ace13fe1 100644
--- a/src/Symfony/Component/Validator/Constraints/Length.php
+++ b/src/Symfony/Component/Validator/Constraints/Length.php
@@ -36,6 +36,16 @@ class Length extends Constraint
         self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
     ];
 
+    public const COUNT_BYTES = 'bytes';
+    public const COUNT_CODEPOINTS = 'codepoints';
+    public const COUNT_GRAPHEMES = 'graphemes';
+
+    private const VALID_COUNT_UNITS = [
+        self::COUNT_BYTES,
+        self::COUNT_CODEPOINTS,
+        self::COUNT_GRAPHEMES,
+    ];
+
     /**
      * @deprecated since Symfony 6.1, use const ERROR_NAMES instead
      */
@@ -49,13 +59,19 @@ class Length extends Constraint
     public $min;
     public $charset = 'UTF-8';
     public $normalizer;
+    /* @var self::COUNT_* */
+    public string $countUnit = self::COUNT_CODEPOINTS;
 
+    /**
+     * @param self::COUNT_*|null $countUnit
+     */
     public function __construct(
         int|array $exactly = null,
         int $min = null,
         int $max = null,
         string $charset = null,
         callable $normalizer = null,
+        string $countUnit = null,
         string $exactMessage = null,
         string $minMessage = null,
         string $maxMessage = null,
@@ -84,6 +100,7 @@ public function __construct(
         $this->max = $max;
         $this->charset = $charset ?? $this->charset;
         $this->normalizer = $normalizer ?? $this->normalizer;
+        $this->countUnit = $countUnit ?? $this->countUnit;
         $this->exactMessage = $exactMessage ?? $this->exactMessage;
         $this->minMessage = $minMessage ?? $this->minMessage;
         $this->maxMessage = $maxMessage ?? $this->maxMessage;
@@ -96,5 +113,9 @@ public function __construct(
         if (null !== $this->normalizer && !\is_callable($this->normalizer)) {
             throw new InvalidArgumentException(sprintf('The "normalizer" option must be a valid callable ("%s" given).', get_debug_type($this->normalizer)));
         }
+
+        if (!\in_array($this->countUnit, self::VALID_COUNT_UNITS)) {
+            throw new InvalidArgumentException(sprintf('The "countUnit" option must be one of the "%s"::COUNT_* constants ("%s" given).', __CLASS__, $this->countUnit));
+        }
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/LengthValidator.php b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
index 98044c7c532a2..f70adf1cba13c 100644
--- a/src/Symfony/Component/Validator/Constraints/LengthValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
@@ -54,7 +54,13 @@ public function validate(mixed $value, Constraint $constraint)
             $invalidCharset = true;
         }
 
-        if ($invalidCharset) {
+        $length = $invalidCharset ? 0 : match ($constraint->countUnit) {
+            Length::COUNT_BYTES => \strlen($stringValue),
+            Length::COUNT_CODEPOINTS => mb_strlen($stringValue, $constraint->charset),
+            Length::COUNT_GRAPHEMES => grapheme_strlen($stringValue),
+  
10000
      };
+
+        if ($invalidCharset || false === ($length ?? false)) {
             $this->context->buildViolation($constraint->charsetMessage)
                 ->setParameter('{{ value }}', $this->formatValue($stringValue))
                 ->setParameter('{{ charset }}', $constraint->charset)
@@ -65,8 +71,6 @@ public function validate(mixed $value, Constraint $constraint)
             return;
         }
 
-        $length = mb_strlen($stringValue, $constraint->charset);
-
         if (null !== $constraint->max && $length > $constraint->max) {
             $exactlyOptionEnabled = $constraint->min == $constraint->max;
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LengthTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LengthTest.php
index 119ea3aa676f3..c3b8606c3d994 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LengthTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LengthTest.php
@@ -43,6 +43,25 @@ public function testInvalidNormalizerObjectThrowsException()
         new Length(['min' => 0, 'max' => 10, 'normalizer' => new \stdClass()]);
     }
 
+    public function testDefaultCountUnitIsUsed()
+    {
+        $length = new Length(['min' => 0, 'max' => 10]);
+        $this->assertSame(Length::COUNT_CODEPOINTS, $length->countUnit);
+    }
+
+    public function testNonDefaultCountUnitCanBeSet()
+    {
+        $length = new Length(['min' => 0, 'max' => 10, 'countUnit' => Length::COUNT_GRAPHEMES]);
+        $this->assertSame(Length::COUNT_GRAPHEMES, $length->countUnit);
+    }
+
+    public function testInvalidCountUnitThrowsException()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(sprintf('The "countUnit" option must be one of the "%s"::COUNT_* constants ("%s" given).', Length::class, 'nonExistentCountUnit'));
+        new Length(['min' => 0, 'max' => 10, 'countUnit' => 'nonExistentCountUnit']);
+    }
+
     public function testConstraintDefaultOption()
     {
         $constraint = new Length(5);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
index a1fdbf69b15f5..5dbe7523b74f9 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
@@ -18,6 +18,9 @@
 
 class LengthValidatorTest extends ConstraintValidatorTestCase
 {
+    // 🧚‍♀️ "Woman Fairy" emoji ZWJ sequence
+    private const SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES = "\u{1F9DA}\u{200D}\u{2640}\u{FE0F}";
+
     protected function createValidator(): LengthValidator
     {
         return new LengthValidator();
@@ -156,6 +159,30 @@ public function testValidNormalizedValues($value)
         $this->assertNoViolation();
     }
 
+    public function testValidGraphemesValues()
+    {
+        $constraint = new Length(min: 1, max: 1, countUnit: Length::COUNT_GRAPHEMES);
+        $this->validator->validate(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES, $constraint);
+
+        $this->assertNoViolation();
+    }
+
+    public function testValidCodepointsValues()
+    {
+        $constraint = new Length(min: 4, max: 4, countUnit: Length::COUNT_CODEPOINTS);
+        $this->validator->validate(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES, $constraint);
+
+        $this->assertNoViolation();
+    }
+
+    public function testValidBytesValues()
+    {
+        $constraint = new Length(min: 13, max: 13, countUnit: Length::COUNT_BYTES);
+        $this->validator->validate(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES, $constraint);
+
+        $this->assertNoViolation();
+    }
+
     /**
      * @dataProvider getThreeOrLessCharacters
      */
@@ -321,4 +348,34 @@ public function testOneCharset($value, $charset, $isValid)
                 ->assertRaised();
         }
     }
+
+    public function testInvalidValuesExactDefaultCountUnitWithGraphemeInput()
+    {
+        $constraint = new Length(min: 1, max: 1, exactMessage: 'myMessage');
+
+        $this->validator->validate(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES, $constraint);
+
+        $this->buildViolation('myMessage')
+            ->setParameter('{{ value }}', '"'.self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES.'"')
+            ->setParameter('{{ limit }}', 1)
+            ->setInvalidValue(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES)
+            ->setPlural(1)
+            ->setCode(Length::NOT_EQUAL_LENGTH_ERROR)
+            ->assertRaised();
+    }
+
+    public function testInvalidValuesExactBytesCountUnitWithGraphemeInput()
+    {
+        $constraint = new Length(min: 1, max: 1, countUnit: Length::COUNT_BYTES, exactMessage: 'myMessage');
+
+        $this->validator->validate(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES, $constraint);
+
+        $this->buildViolation('myMessage')
+            ->setParameter('{{ value }}', '"'.self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES.'"')
+            ->setParameter('{{ limit }}', 1)
+            ->setInvalidValue(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES)
+            ->setPlural(1)
+            ->setCode(Length::NOT_EQUAL_LENGTH_ERROR)
+            ->assertRaised();
+    }
 }

From 8a5d04907af45ee05b9a833c0b0e05237c327838 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:28:01 +0100
Subject: [PATCH 225/475] Print value type on dump error

When your Definition contains invalid values, like an object or resource, an error is thrown.

Often, it's hard to tell what causes it. By showing the type of the value, it can help developers
resolve the problem faster.
---
 src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php  | 2 +-
 src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php  | 2 +-
 src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php | 2 +-
 .../DependencyInjection/Tests/Dumper/PhpDumperTest.php          | 2 +-
 .../DependencyInjection/Tests/Dumper/XmlDumperTest.php          | 2 +-
 .../DependencyInjection/Tests/Dumper/YamlDumperTest.php         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index aab5d6ec6683d..2c0a77ddf8e51 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1954,7 +1954,7 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
         } elseif ($value instanceof AbstractArgument) {
             throw new RuntimeException($value->getTextWithContext());
         } elseif (\is_object($value) || \is_resource($value)) {
-            throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
+            throw new RuntimeException(sprintf('Unable to dump a service container if a parameter is an object or a resource, got "%s".', get_debug_type($value)));
         }
 
         return $this->export($value);
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
index 9ceeee09e5c0d..c3b3c6b33d7cf 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -414,7 +414,7 @@ public static function phpToXml(mixed $value): string
             case $value instanceof \UnitEnum:
                 return sprintf('%s::%s', $value::class, $value->name);
             case \is_object($value) || \is_resource($value):
-                throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
+                throw new RuntimeException(sprintf('Unable to dump a service container if a parameter is an object or a resource, got "%s".', get_debug_type($value)));
             default:
                 return (string) $value;
         }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
index 17d684f2be276..f0bce187a650c 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -307,7 +307,7 @@ private function dumpValue(mixed $value): mixed
         } elseif ($value instanceof AbstractArgument) {
             return new TaggedValue('abstract', $value->getText());
         } elseif (\is_object($value) || \is_resource($value)) {
-            throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
+            throw new RuntimeException(sprintf('Unable to dump a service container if a parameter is an object or a resource, got "%s".', get_debug_type($value)));
         }
 
         return $value;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index eb8eaf34d25ed..2c5c61b5bea59 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -203,7 +203,7 @@ public function testAddService()
             $this->fail('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
         } catch (\Exception $e) {
             $this->assertInstanceOf(RuntimeException::class, $e, '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
-            $this->assertEquals('Unable to dump a service container if a parameter is an object or a resource.', $e->getMessage(), '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+            $this->assertEquals('Unable to dump a service container if a parameter is an object or a resource, got "stdClass".', $e->getMessage(), '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
         }
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
index 77fae7535a938..4ff6c31875bee 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
@@ -63,7 +63,7 @@ public function testAddService()
             $this->fail('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
         } catch (\Exception $e) {
             $this->assertInstanceOf(\RuntimeException::class, $e, '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
-            $this->assertEquals('Unable to dump a service container if a parameter is an object or a resource.', $e->getMessage(), '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+            $this->assertEquals('Unable to dump a service container if a parameter is an object or a resource, got "stdClass".', $e->getMessage(), '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
         }
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
index d64f046f50ce6..684b6aa2c14d9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
@@ -65,7 +65,7 @@ public function testAddService()
             $this->fail('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
         } catch (\Exception $e) {
             $this->assertInstanceOf(\RuntimeException::class, $e, '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
-            $this->assertEquals('Unable to dump a service container if a parameter is an object or a resource.', $e->getMessage(), '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+            $this->assertEquals('Unable to dump a service container if a parameter is an object or a resource, got "stdClass".', $e->getMessage(), '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
         }
     }
 

From a46e46f39a21fd545fa3f2ead0ab31bd16a59503 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:52:47 +0100
Subject: [PATCH 226/475] Only dump array keys when value is not a list

When the value is a list, there is no point in dumping the keys.
---
 .../Component/DependencyInjection/Dumper/PhpDumper.php      | 3 ++-
 .../Tests/Fixtures/php/services10_as_files.txt              | 2 +-
 .../Tests/Fixtures/php/services_adawson.php                 | 2 +-
 .../Tests/Fixtures/php/services_almost_circular_private.php | 4 ++--
 .../Tests/Fixtures/php/services_almost_circular_public.php  | 4 ++--
 .../Tests/Fixtures/php/services_uninitialized_ref.php       | 6 +++---
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 2c0a77ddf8e51..6e31079ef726e 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1796,9 +1796,10 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
             if ($value && $interpolate && false !== $param = array_search($value, $this->container->getParameterBag()->all(), true)) {
                 return $this->dumpValue("%$param%");
             }
+            $isList = array_is_list($value);
             $code = [];
             foreach ($value as $k => $v) {
-                $code[] = sprintf('%s => %s', $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate));
+                $code[] = $isList ? $this->dumpValue($v, $interpolate) : sprintf('%s => %s', $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate));
             }
 
             return sprintf('[%s]', implode(', ', $code));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
index 5cbb72f802159..ba1bbd6ec9912 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
@@ -31,7 +31,7 @@ class getClosureService extends ProjectServiceContainer
 
         $container->services['closure'] = $instance = new \stdClass();
 
-        $instance->closures = [0 => #[\Closure(name: 'foo', class: 'FooClass')] static function () use ($containerRef): ?\stdClass {
+        $instance->closures = [#[\Closure(name: 'foo', class: 'FooClass')] static function () use ($containerRef): ?\stdClass {
             $container = $containerRef->get();
 
             return ($container->services['foo'] ?? null);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php
index ff6b744a8fa9c..052eef5504a08 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php
@@ -63,7 +63,7 @@ protected static function getBusService($container)
 
         $b = ($container->privates['App\\Schema'] ?? self::getSchemaService($container));
         $c = new \App\Registry();
-        $c->processor = [0 => $a, 1 => $instance];
+        $c->processor = [$a, $instance];
 
         $d = new \App\Processor($c, $a);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
index f37e9635736b0..0bcd17e9e5fb7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -385,7 +385,7 @@ protected static function getManager3Service($container, $lazyLoad = true)
             return $container->services['manager3'];
         }
         $b = new \stdClass();
-        $b->listener = [0 => $a];
+        $b->listener = [$a];
 
         return $container->services['manager3'] = new \stdClass($b);
     }
@@ -588,7 +588,7 @@ protected static function getManager4Service($container, $lazyLoad = true)
 
         $container->privates['manager4'] = $instance = new \stdClass($a);
 
-        $a->listener = [0 => ($container->services['listener4'] ?? self::getListener4Service($container))];
+        $a->listener = [($container->services['listener4'] ?? self::getListener4Service($container))];
 
         return $instance;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
index 50081e7e4617a..b1d80181f8fa9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
@@ -219,7 +219,7 @@ protected static function getConnection3Service($container)
     {
         $container->services['connection3'] = $instance = new \stdClass();
 
-        $instance->listener = [0 => ($container->services['listener3'] ?? self::getListener3Service($container))];
+        $instance->listener = [($container->services['listener3'] ?? self::getListener3Service($container))];
 
         return $instance;
     }
@@ -233,7 +233,7 @@ protected static function getConnection4Service($container)
     {
         $container->services['connection4'] = $instance = new \stdClass();
 
-        $instance->listener = [0 => ($container->services['listener4'] ?? self::getListener4Service($container))];
+        $instance->listener = [($container->services['listener4'] ?? self::getListener4Service($container))];
 
         return $instance;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
index 35b5a3260f008..2b1553e6100d7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -62,15 +62,15 @@ protected static function getBarService($container)
         $instance->foo1 = ($container->services['foo1'] ?? null);
         $instance->foo2 = null;
         $instance->foo3 = ($container->privates['foo3'] ?? null);
-        $instance->closures = [0 => #[\Closure(name: 'foo1', class: 'stdClass')] static function () use ($containerRef) {
+        $instance->closures = [#[\Closure(name: 'foo1', class: 'stdClass')] static function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->services['foo1'] ?? null);
-        }, 1 => #[\Closure(name: 'foo2')] static function () use ($containerRef) {
+        }, #[\Closure(name: 'foo2')] static function () use ($containerRef) {
             $container = $containerRef->get();
 
             return null;
-        }, 2 => #[\Closure(name: 'foo3', class: 'stdClass')] static function () use ($containerRef) {
+        }, #[\Closure(name: 'foo3', class: 'stdClass')] static function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->privates['foo3'] ?? null);

From 9a94e00c3a64fb9efe142db76d35aff37fb6fa51 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 15:54:35 +0100
Subject: [PATCH 227/475] Remove static from closures

As per request from @nicolas-grekas.

https://github.com/symfony/symfony/pull/49472#issuecomment-1438595345
---
 .../DependencyInjection/Dumper/PhpDumper.php     | 14 +++++++-------
 .../Tests/Fixtures/php/closure.php               |  2 +-
 .../Tests/Fixtures/php/services10_as_files.txt   |  2 +-
 .../Tests/Fixtures/php/services9_as_files.txt    | 14 +++++++-------
 .../Tests/Fixtures/php/services9_compiled.php    | 12 ++++++------
 .../Fixtures/php/services9_inlined_factories.txt | 16 ++++++++--------
 .../php/services9_lazy_inlined_factories.txt     |  2 +-
 .../php/services_almost_circular_private.php     |  6 +++---
 .../php/services_almost_circular_public.php      |  8 ++++----
 .../php/services_closure_argument_compiled.php   |  4 ++--
 .../Fixtures/php/services_errored_definition.php | 12 ++++++------
 .../Fixtures/php/services_inline_requires.php    |  2 +-
 .../Tests/Fixtures/php/services_locator.php      | 12 ++++++------
 .../php/services_non_shared_duplicates.php       |  4 ++--
 .../Tests/Fixtures/php/services_rot13_env.php    |  2 +-
 .../php/services_service_locator_argument.php    |  4 ++--
 .../Tests/Fixtures/php/services_subscriber.php   |  2 +-
 .../Fixtures/php/services_uninitialized_ref.php  | 10 +++++-----
 18 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 6e31079ef726e..2aa53d0fa9190 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -244,7 +244,7 @@ public function dump(array $options = []): string|array
         if ($this->addGetService) {
             $code = preg_replace(
                 "/(\r?\n\r?\n    public function __construct.+?\\{\r?\n) ++([^\r\n]++)/s",
-                "\n    protected \Closure \$getService;$1        \$containerRef = $2\n        \$this->getService = static function () use (\$containerRef) { return \$containerRef->get()->getService(...\\func_get_args()); };",
+                "\n    protected \Closure \$getService;$1        \$containerRef = $2\n        \$this->getService = function () use (\$containerRef) { return \$containerRef->get()->getService(...\\func_get_args()); };",
                 $code,
                 1
             );
@@ -941,7 +941,7 @@ protected static function {$methodName}(\$container$lazyInitialization)
                 $c = implode("\n", array_map(fn ($line) => $line ? '    '.$line : $line, explode("\n", $c)));
                 $lazyloadInitialization = $definition->isLazy() ? ', $lazyLoad = true' : '';
 
-                $c = sprintf("        %s = static function (\$container%s) {\n%s        };\n\n        return %1\$s(\$container);\n", $factory, $lazyloadInitialization, $c);
+                $c = sprintf("        %s = function (\$container%s) {\n%s        };\n\n        return %1\$s(\$container);\n", $factory, $lazyloadInitialization, $c);
             }
 
             $code .= $c;
@@ -1545,7 +1545,7 @@ private function addInlineRequires(bool $hasProxyClasses): string
             $code .= "\n            include_once __DIR__.'/proxy-classes.php';";
         }
 
-        return $code ? sprintf("\n        \$this->privates['service_container'] = static function (\$container) {%s\n        };\n", $code) : '';
+        return $code ? sprintf("\n        \$this->privates['service_container'] = function (\$container) {%s\n        };\n", $code) : '';
     }
 
     private function addDefaultParametersMethod(): string
@@ -1831,7 +1831,7 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
                     }
                     $this->addContainerRef = true;
 
-                    return sprintf("%sstatic function () use (\$containerRef)%s {\n            \$container = \$containerRef->get();\n\n            %s\n        }", $attribute, $returnedType, $code);
+                    return sprintf("%sfunction () use (\$containerRef)%s {\n            \$container = \$containerRef->get();\n\n            %s\n        }", $attribute, $returnedType, $code);
                 }
 
                 if ($value instanceof IteratorArgument) {
@@ -1839,15 +1839,15 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
                     $code = [];
 
                     if (!$values = $value->getValues()) {
-                        $code[] = 'new RewindableGenerator(static function () {';
+                        $code[] = 'new RewindableGenerator(function () {';
                         $code[] = '            return new \EmptyIterator();';
                     } else {
                         $this->addContainerRef = true;
-                        $code[] = 'new RewindableGenerator(static function () use ($containerRef) {';
+                        $code[] = 'new RewindableGenerator(function () use ($containerRef) {';
                         $code[] = '            $container = $containerRef->get();';
                         $code[] = '';
                         $countCode = [];
-                        $countCode[] = 'static function () use ($containerRef) {';
+                        $countCode[] = 'function () use ($containerRef) {';
 
                         foreach ($values as $k => $v) {
                             ($c = $this->getServiceConditionals($v)) ? $operands[] = "(int) ($c)" : ++$operands[0];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php
index c231064711667..1444190c5b645 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure.php
@@ -66,7 +66,7 @@ protected static function getClosureOfServiceClosureService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['closure_of_service_closure'] = #[\Closure(name: 'bar2', class: 'stdClass')] static function () use ($containerRef) {
+        return $container->services['closure_of_service_closure'] = #[\Closure(name: 'bar2', class: 'stdClass')] function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->privates['bar2'] ??= new \stdClass());
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
index ba1bbd6ec9912..c6e71e52e1b5f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
@@ -31,7 +31,7 @@ class getClosureService extends ProjectServiceContainer
 
         $container->services['closure'] = $instance = new \stdClass();
 
-        $instance->closures = [#[\Closure(name: 'foo', class: 'FooClass')] static function () use ($containerRef): ?\stdClass {
+        $instance->closures = [#[\Closure(name: 'foo', class: 'FooClass')] function () use ($containerRef): ?\stdClass {
             $container = $containerRef->get();
 
             return ($container->services['foo'] ?? null);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index 461787826da66..9a5026f304b15 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -319,7 +319,7 @@ class getFooBarService extends ProjectServiceContainer
      */
     public static function do($container, $lazyLoad = true)
     {
-        $container->factories['foo_bar'] = static function ($container) {
+        $container->factories['foo_bar'] = function ($container) {
             return new \Bar\FooClass(($container->services['deprecated_service'] ?? $container->load('getDeprecatedServiceService')));
         };
 
@@ -363,12 +363,12 @@ class getLazyContextService extends ProjectServiceContainer
     {
         $containerRef = $container->ref;
 
-        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 'k1' => ($container->services['foo.baz'] ?? $container->load('getFoo_BazService'));
             yield 'k2' => $container;
-        }, 2), new RewindableGenerator(static function () {
+        }, 2), new RewindableGenerator(function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -387,11 +387,11 @@ class getLazyContextIgnoreInvalidRefService extends ProjectServiceContainer
     {
         $containerRef = $container->ref;
 
-        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 0 => ($container->services['foo.baz'] ?? $container->load('getFoo_BazService'));
-        }, 1), new RewindableGenerator(static function () {
+        }, 1), new RewindableGenerator(function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -455,7 +455,7 @@ class getNonSharedFooService extends ProjectServiceContainer
     {
         include_once $container->targetDir.''.'/Fixtures/includes/foo.php';
 
-        $container->factories['non_shared_foo'] = static function ($container) {
+        $container->factories['non_shared_foo'] = function ($container) {
             return new \Bar\FooClass();
         };
 
@@ -521,7 +521,7 @@ class getTaggedIteratorService extends ProjectServiceContainer
     {
         $containerRef = $container->ref;
 
-        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 0 => ($container->services['foo'] ?? $container->load('getFooService'));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index 7b4c50ffb94d7..cec7e9798c764 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -298,7 +298,7 @@ protected static function getFoo_BazService($container)
      */
     protected static function getFooBarService($container)
     {
-        $container->factories['foo_bar'] = static function ($container) {
+        $container->factories['foo_bar'] = function ($container) {
             return new \Bar\FooClass(($container->services['deprecated_service'] ?? self::getDeprecatedServiceService($container)));
         };
 
@@ -332,12 +332,12 @@ protected static function getLazyContextService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 'k1' => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
             yield 'k2' => $container;
-        }, 2), new RewindableGenerator(static function () {
+        }, 2), new RewindableGenerator(function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -351,11 +351,11 @@ protected static function getLazyContextIgnoreInvalidRefService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 0 => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
-        }, 1), new RewindableGenerator(static function () {
+        }, 1), new RewindableGenerator(function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -434,7 +434,7 @@ protected static function getTaggedIteratorService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 0 => ($container->services['foo'] ?? self::getFooService($container));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
index b561ff647f05c..b6fb7fe482a6d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
@@ -86,7 +86,7 @@ class ProjectServiceContainer extends Container
             'decorated' => 'decorator_service_with_name',
         ];
 
-        $this->privates['service_container'] = static function ($container) {
+        $this->privates['service_container'] = function ($container) {
             include_once $container->targetDir.''.'/Fixtures/includes/foo.php';
         };
     }
@@ -319,7 +319,7 @@ class ProjectServiceContainer extends Container
      */
     protected static function getFooBarService($container)
     {
-        $container->factories['foo_bar'] = static function ($container) {
+        $container->factories['foo_bar'] = function ($container) {
             return new \Bar\FooClass(($container->services['deprecated_service'] ?? self::getDeprecatedServiceService($container)));
         };
 
@@ -355,12 +355,12 @@ class ProjectServiceContainer extends Container
 
         include_once $container->targetDir.''.'/Fixtures/includes/classes.php';
 
-        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 'k1' => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
             yield 'k2' => $container;
-        }, 2), new RewindableGenerator(static function () {
+        }, 2), new RewindableGenerator(function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -376,11 +376,11 @@ class ProjectServiceContainer extends Container
 
         include_once $container->targetDir.''.'/Fixtures/includes/classes.php';
 
-        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 0 => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
-        }, 1), new RewindableGenerator(static function () {
+        }, 1), new RewindableGenerator(function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -429,7 +429,7 @@ class ProjectServiceContainer extends Container
     {
         include_once $container->targetDir.''.'/Fixtures/includes/foo.php';
 
-        $container->factories['non_shared_foo'] = static function ($container) {
+        $container->factories['non_shared_foo'] = function ($container) {
             return new \Bar\FooClass();
         };
 
@@ -475,7 +475,7 @@ class ProjectServiceContainer extends Container
     {
         $containerRef = $container->ref;
 
-        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 0 => ($container->services['foo'] ?? self::getFooService($container));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
index 965dc91661cce..21cbc4a3ff1b1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -48,7 +48,7 @@ class ProjectServiceContainer extends Container
 
         $this->aliases = [];
 
-        $this->privates['service_container'] = static function ($container) {
+        $this->privates['service_container'] = function ($container) {
             include_once __DIR__.'/proxy-classes.php';
         };
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
index 0bcd17e9e5fb7..f48ced0ebc0f0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -201,7 +201,7 @@ protected static function getDoctrine_EntityManagerService($container)
         $containerRef = $container->ref;
 
         $a = new \stdClass();
-        $a->resolver = new \stdClass(new RewindableGenerator(static function () use ($containerRef) {
+        $a->resolver = new \stdClass(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 0 => ($container->privates['doctrine.listener'] ?? self::getDoctrine_ListenerService($container));
@@ -528,7 +528,7 @@ protected static function getMailer_TransportService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->privates['mailer.transport'] = (new \FactoryCircular(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->privates['mailer.transport'] = (new \FactoryCircular(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 0 => ($container->privates['mailer.transport_factory.amazon'] ?? self::getMailer_TransportFactory_AmazonService($container));
@@ -559,7 +559,7 @@ protected static function getMailer_TransportFactory_AmazonService($container)
      */
     protected static function getMailerInline_MailerService($container)
     {
-        return $container->privates['mailer_inline.mailer'] = new \stdClass((new \FactoryCircular(new RewindableGenerator(static function () {
+        return $container->privates['mailer_inline.mailer'] = new \stdClass((new \FactoryCircular(new RewindableGenerator(function () {
             return new \EmptyIterator();
         }, 0)))->create());
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
index b1d80181f8fa9..2c306549ec483 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
@@ -275,7 +275,7 @@ protected static function getDoctrine_EntityListenerResolverService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['doctrine.entity_listener_resolver'] = new \stdClass(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['doctrine.entity_listener_resolver'] = new \stdClass(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 0 => ($container->services['doctrine.listener'] ?? self::getDoctrine_ListenerService($container));
@@ -356,7 +356,7 @@ protected static function getFoo2Service($container)
      */
     protected static function getFoo4Service($container)
     {
-        $container->factories['foo4'] = static function ($container) {
+        $container->factories['foo4'] = function ($container) {
             $instance = new \stdClass();
 
             $instance->foobar = ($container->services['foobar4'] ?? self::getFoobar4Service($container));
@@ -528,7 +528,7 @@ protected static function getMailer_TransportFactoryService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['mailer.transport_factory'] = new \FactoryCircular(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['mailer.transport_factory'] = new \FactoryCircular(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 0 => ($container->services['mailer.transport_factory.amazon'] ?? self::getMailer_TransportFactory_AmazonService($container));
@@ -559,7 +559,7 @@ protected static function getMailer_TransportFactory_AmazonService($container)
      */
     protected static function getMailerInline_TransportFactoryService($container)
     {
-        return $container->services['mailer_inline.transport_factory'] = new \FactoryCircular(new RewindableGenerator(static function () {
+        return $container->services['mailer_inline.transport_factory'] = new \FactoryCircular(new RewindableGenerator(function () {
             return new \EmptyIterator();
         }, 0));
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php
index ca6262cb29d17..111ebd4506978 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php
@@ -59,7 +59,7 @@ protected static function getServiceClosureService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['service_closure'] = new \Bar(#[\Closure(name: 'foo', class: 'Foo')] static function () use ($containerRef) {
+        return $container->services['service_closure'] = new \Bar(#[\Closure(name: 'foo', class: 'Foo')] function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->services['foo'] ??= new \Foo());
@@ -75,7 +75,7 @@ protected static function getServiceClosureInvalidService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['service_closure_invalid'] = new \Bar(static function () use ($containerRef) {
+        return $container->services['service_closure_invalid'] = new \Bar(function () use ($containerRef) {
             $container = $containerRef->get();
 
             return NULL;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
index 82409d438413e..3b014fcc47a8b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
@@ -298,7 +298,7 @@ protected static function getFoo_BazService($container)
      */
     protected static function getFooBarService($container)
     {
-        $container->factories['foo_bar'] = static function ($container) {
+        $container->factories['foo_bar'] = function ($container) {
             return new \Bar\FooClass(($container->services['deprecated_service'] ?? self::getDeprecatedServiceService($container)));
         };
 
@@ -332,12 +332,12 @@ protected static function getLazyContextService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 'k1' => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
             yield 'k2' => $container;
-        }, 2), new RewindableGenerator(static function () {
+        }, 2), new RewindableGenerator(function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -351,11 +351,11 @@ protected static function getLazyContextIgnoreInvalidRefService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 0 => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
-        }, 1), new RewindableGenerator(static function () {
+        }, 1), new RewindableGenerator(function () {
             return new \EmptyIterator();
         }, 0));
     }
@@ -434,7 +434,7 @@ protected static function getTaggedIteratorService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(static function () use ($containerRef) {
+        return $container->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             yield 0 => ($container->services['foo'] ?? self::getFooService($container));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
index f184f64dca43a..733bb618cf05b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
@@ -29,7 +29,7 @@ public function __construct()
 
         $this->aliases = [];
 
-        $this->privates['service_container'] = static function ($container) {
+        $this->privates['service_container'] = function ($container) {
             include_once \dirname(__DIR__, 1).'/includes/HotPath/I1.php';
             include_once \dirname(__DIR__, 1).'/includes/HotPath/P1.php';
             include_once \dirname(__DIR__, 1).'/includes/HotPath/T1.php';
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
index 4239d82f1e721..eafe779392fa4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
@@ -74,15 +74,15 @@ protected static function getFooServiceService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['foo_service'] = new \Symfony\Component\DependencyInjection\ServiceLocator(['bar' => #[\Closure(name: 'bar_service', class: 'stdClass')] static function () use ($containerRef) {
+        return $container->services['foo_service'] = new \Symfony\Component\DependencyInjection\ServiceLocator(['bar' => #[\Closure(name: 'bar_service', class: 'stdClass')] function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->services['bar_service'] ?? self::getBarServiceService($container));
-        }, 'baz' => #[\Closure(name: 'baz_service', class: 'stdClass')] static function () use ($containerRef): \stdClass {
+        }, 'baz' => #[\Closure(name: 'baz_service', class: 'stdClass')] function () use ($containerRef): \stdClass {
             $container = $containerRef->get();
 
             return ($container->privates['baz_service'] ??= new \stdClass());
-        }, 'nil' => static function () use ($containerRef) {
+        }, 'nil' => function () use ($containerRef) {
             $container = $containerRef->get();
 
             return NULL;
@@ -128,7 +128,7 @@ protected static function getTranslator1Service($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['translator_1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_1' => #[\Closure(name: 'translator.loader_1', class: 'stdClass')] static function () use ($containerRef) {
+        return $container->services['translator_1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_1' => #[\Closure(name: 'translator.loader_1', class: 'stdClass')] function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->services['translator.loader_1'] ??= new \stdClass());
@@ -144,7 +144,7 @@ protected static function getTranslator2Service($container)
     {
         $containerRef = $container->ref;
 
-        $container->services['translator_2'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_2' => #[\Closure(name: 'translator.loader_2', class: 'stdClass')] static function () use ($containerRef) {
+        $container->services['translator_2'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_2' => #[\Closure(name: 'translator.loader_2', class: 'stdClass')] function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->services['translator.loader_2'] ??= new \stdClass());
@@ -164,7 +164,7 @@ protected static function getTranslator3Service($container)
     {
         $containerRef = $container->ref;
 
-        $container->services['translator_3'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_3' => #[\Closure(name: 'translator.loader_3', class: 'stdClass')] static function () use ($containerRef) {
+        $container->services['translator_3'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_3' => #[\Closure(name: 'translator.loader_3', class: 'stdClass')] function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->services['translator.loader_3'] ??= new \stdClass());
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php
index 4ce242bb265d8..17318d1ebbc3a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php
@@ -21,7 +21,7 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $containerRef = $this->ref = \WeakReference::create($this);
-        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
+        $this->getService = function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
@@ -80,7 +80,7 @@ protected static function getBazService($container)
      */
     protected static function getFooService($container)
     {
-        $container->factories['service_container']['foo'] = static function ($container) {
+        $container->factories['service_container']['foo'] = function ($container) {
             return new \stdClass();
         };
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
index 60700526ead94..265d45ca1f92c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -21,7 +21,7 @@ class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container
     public function __construct()
     {
         $containerRef = $this->ref = \WeakReference::create($this);
-        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
+        $this->getService = function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php
index d28800abf0540..029c64cdd101d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php
@@ -21,7 +21,7 @@ class Symfony_DI_PhpDumper_Service_Locator_Argument extends Container
     public function __construct()
     {
         $containerRef = $this->ref = \WeakReference::create($this);
-        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
+        $this->getService = function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->services = $this->privates = [];
         $this->syntheticIds = [
             'foo5' => true,
@@ -107,7 +107,7 @@ protected static function getFoo2Service($container)
      */
     protected static function getFoo3Service($container)
     {
-        $container->factories['service_container']['foo3'] = static function ($container) {
+        $container->factories['service_container']['foo3'] = function ($container) {
             return new \stdClass();
         };
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
index 77ed9e02882a4..6910fe69ef6da 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
@@ -21,7 +21,7 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $containerRef = $this->ref = \WeakReference::create($this);
-        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
+        $this->getService = function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->services = $this->privates = [];
         $this->methodMap = [
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => 'getTestServiceSubscriberService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
index 2b1553e6100d7..68535dd312dbb 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -62,20 +62,20 @@ protected static function getBarService($container)
         $instance->foo1 = ($container->services['foo1'] ?? null);
         $instance->foo2 = null;
         $instance->foo3 = ($container->privates['foo3'] ?? null);
-        $instance->closures = [#[\Closure(name: 'foo1', class: 'stdClass')] static function () use ($containerRef) {
+        $instance->closures = [#[\Closure(name: 'foo1', class: 'stdClass')] function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->services['foo1'] ?? null);
-        }, #[\Closure(name: 'foo2')] static function () use ($containerRef) {
+        }, #[\Closure(name: 'foo2')] function () use ($containerRef) {
             $container = $containerRef->get();
 
             return null;
-        }, #[\Closure(name: 'foo3', class: 'stdClass')] static function () use ($containerRef) {
+        }, #[\Closure(name: 'foo3', class: 'stdClass')] function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->privates['foo3'] ?? null);
         }];
-        $instance->iter = new RewindableGenerator(static function () use ($containerRef) {
+        $instance->iter = new RewindableGenerator(function () use ($containerRef) {
             $container = $containerRef->get();
 
             if (isset($container->services['foo1'])) {
@@ -87,7 +87,7 @@ protected static function getBarService($container)
             if (isset($container->privates['foo3'])) {
                 yield 'foo3' => ($container->privates['foo3'] ?? null);
             }
-        }, static function () use ($containerRef) {
+        }, function () use ($containerRef) {
             $container = $containerRef->get();
 
             return 0 + (int) (isset($container->services['foo1'])) + (int) (false) + (int) (isset($container->privates['foo3']));

From dba658b8c11719fc13e10ad66013b3a9a855a05f Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 16:04:59 +0100
Subject: [PATCH 228/475] Use short arrow closure for EmptyIterator

---
 .../DependencyInjection/Dumper/PhpDumper.php  | 48 +++++++++----------
 .../Tests/Fixtures/php/services9_as_files.txt |  8 +---
 .../Tests/Fixtures/php/services9_compiled.php |  8 +---
 .../php/services9_inlined_factories.txt       |  8 +---
 .../php/services_almost_circular_private.php  |  4 +-
 .../php/services_almost_circular_public.php   |  4 +-
 .../php/services_errored_definition.php       |  8 +---
 7 files changed, 34 insertions(+), 54 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 2aa53d0fa9190..d1246b2e91e5f 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1835,36 +1835,36 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
                 }
 
                 if ($value instanceof IteratorArgument) {
-                    $operands = [0];
+                    if (!$values = $value->getValues()) {
+                        return 'new RewindableGenerator(fn () => new \EmptyIterator(), 0)';
+                    }
+
+                    $this->addContainerRef = true;
+
                     $code = [];
+                    $code[] = 'new RewindableGenerator(function () use ($containerRef) {';
+                    $code[] = '            $container = $containerRef->get();';
+                    $code[] = '';
 
-                    if (!$values = $value->getValues()) {
-                        $code[] = 'new RewindableGenerator(function () {';
-                        $code[] = '            return new \EmptyIterator();';
-                    } else {
-                        $this->addContainerRef = true;
-                        $code[] = 'new RewindableGenerator(function () use ($containerRef) {';
-                        $code[] = '            $container = $containerRef->get();';
-                        $code[] = '';
-                        $countCode = [];
-                        $countCode[] = 'function () use ($containerRef) {';
-
-                        foreach ($values as $k => $v) {
-                            ($c = $this->getServiceConditionals($v)) ? $operands[] = "(int) ($c)" : ++$operands[0];
-                            $v = $this->wrapServiceConditionals($v, sprintf("        yield %s => %s;\n", $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate)));
-                            foreach (explode("\n", $v) as $v) {
-                                if ($v) {
-                                    $code[] = '    '.$v;
-                                }
+                    $countCode = [];
+                    $countCode[] = 'function () use ($containerRef) {';
+
+                    $operands = [0];
+                    foreach ($values as $k => $v) {
+                        ($c = $this->getServiceConditionals($v)) ? $operands[] = "(int) ($c)" : ++$operands[0];
+                        $v = $this->wrapServiceConditionals($v, sprintf("        yield %s => %s;\n", $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate)));
+                        foreach (explode("\n", $v) as $v) {
+                            if ($v) {
+                                $code[] = '    '.$v;
                             }
                         }
-
-                        $countCode[] = '            $container = $containerRef->get();';
-                        $countCode[] = '';
-                        $countCode[] = sprintf('            return %s;', implode(' + ', $operands));
-                        $countCode[] = '        }';
                     }
 
+                    $countCode[] = '            $container = $containerRef->get();';
+                    $countCode[] = '';
+                    $countCode[] = sprintf('            return %s;', implode(' + ', $operands));
+                    $countCode[] = '        }';
+
                     $code[] = sprintf('        }, %s)', \count($operands) > 1 ? implode("\n", $countCode) : $operands[0]);
 
                     return implode("\n", $code);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index 9a5026f304b15..1897adcc09e47 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -368,9 +368,7 @@ class getLazyContextService extends ProjectServiceContainer
 
             yield 'k1' => ($container->services['foo.baz'] ?? $container->l
10000
oad('getFoo_BazService'));
             yield 'k2' => $container;
-        }, 2), new RewindableGenerator(function () {
-            return new \EmptyIterator();
-        }, 0));
+        }, 2), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
 }
 
@@ -391,9 +389,7 @@ class getLazyContextIgnoreInvalidRefService extends ProjectServiceContainer
             $container = $containerRef->get();
 
             yield 0 => ($container->services['foo.baz'] ?? $container->load('getFoo_BazService'));
-        }, 1), new RewindableGenerator(function () {
-            return new \EmptyIterator();
-        }, 0));
+        }, 1), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
 }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index cec7e9798c764..765cc4a54b587 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -337,9 +337,7 @@ protected static function getLazyContextService($container)
 
             yield 'k1' => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
             yield 'k2' => $container;
-        }, 2), new RewindableGenerator(function () {
-            return new \EmptyIterator();
-        }, 0));
+        }, 2), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
 
     /**
@@ -355,9 +353,7 @@ protected static function getLazyContextIgnoreInvalidRefService($container)
             $container = $containerRef->get();
 
             yield 0 => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
-        }, 1), new RewindableGenerator(function () {
-            return new \EmptyIterator();
-        }, 0));
+        }, 1), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
index b6fb7fe482a6d..2d9268f755eae 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
@@ -360,9 +360,7 @@ class ProjectServiceContainer extends Container
 
             yield 'k1' => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
             yield 'k2' => $container;
-        }, 2), new RewindableGenerator(function () {
-            return new \EmptyIterator();
-        }, 0));
+        }, 2), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
 
     /**
@@ -380,9 +378,7 @@ class ProjectServiceContainer extends Container
             $container = $containerRef->get();
 
             yield 0 => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
-        }, 1), new RewindableGenerator(function () {
-            return new \EmptyIterator();
-        }, 0));
+        }, 1), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
index f48ced0ebc0f0..c1b00ed757b48 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -559,9 +559,7 @@ protected static function getMailer_TransportFactory_AmazonService($container)
      */
     protected static function getMailerInline_MailerService($container)
     {
-        return $container->privates['mailer_inline.mailer'] = new \stdClass((new \FactoryCircular(new RewindableGenerator(function () {
-            return new \EmptyIterator();
-        }, 0)))->create());
+        return $container->privates['mailer_inline.mailer'] = new \stdClass((new \FactoryCircular(new RewindableGenerator(fn () => new \EmptyIterator(), 0)))->create());
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
index 2c306549ec483..f17a8aaa1bbeb 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
@@ -559,9 +559,7 @@ protected static function getMailer_TransportFactory_AmazonService($container)
      */
     protected static function getMailerInline_TransportFactoryService($container)
     {
-        return $container->services['mailer_inline.transport_factory'] = new \FactoryCircular(new RewindableGenerator(function () {
-            return new \EmptyIterator();
-        }, 0));
+        return $container->services['mailer_inline.transport_factory'] = new \FactoryCircular(new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
index 3b014fcc47a8b..b6595bb34a7b7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
@@ -337,9 +337,7 @@ protected static function getLazyContextService($container)
 
             yield 'k1' => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
             yield 'k2' => $container;
-        }, 2), new RewindableGenerator(function () {
-            return new \EmptyIterator();
-        }, 0));
+        }, 2), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
 
     /**
@@ -355,9 +353,7 @@ protected static function getLazyContextIgnoreInvalidRefService($container)
             $container = $containerRef->get();
 
             yield 0 => ($container->services['foo.baz'] ?? self::getFoo_BazService($container));
-        }, 1), new RewindableGenerator(function () {
-            return new \EmptyIterator();
-        }, 0));
+        }, 1), new RewindableGenerator(fn () => new \EmptyIterator(), 0));
     }
 
     /**

From a9db56dee3a4ecde2a632a7ca634daf6fa83f386 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 16:15:24 +0100
Subject: [PATCH 229/475] Make some functions static again

I removed a bit too much in 9a94e00c3a64fb9efe142db76d35aff37fb6fa51

As per comment of @stof https://github.com/symfony/symfony/pull/49474#discussion_r1113196882
---
 .../Component/DependencyInjection/Dumper/PhpDumper.php        | 4 ++--
 .../Tests/Fixtures/php/services9_inlined_factories.txt        | 2 +-
 .../Tests/Fixtures/php/services9_lazy_inlined_factories.txt   | 2 +-
 .../Tests/Fixtures/php/services_inline_requires.php           | 2 +-
 .../Tests/Fixtures/php/services_non_shared_duplicates.php     | 2 +-
 .../Tests/Fixtures/php/services_rot13_env.php                 | 2 +-
 .../Tests/Fixtures/php/services_service_locator_argument.php  | 2 +-
 .../Tests/Fixtures/php/services_subscriber.php                | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 2aa53d0fa9190..1c6fcfd55616b 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -244,7 +244,7 @@ public function dump(array $options = []): string|array
         if ($this->addGetService) {
             $code = preg_replace(
                 "/(\r?\n\r?\n    public function __construct.+?\\{\r?\n) ++([^\r\n]++)/s",
-                "\n    protected \Closure \$getService;$1        \$containerRef = $2\n        \$this->getService = function () use (\$containerRef) { return \$containerRef->get()->getService(...\\func_get_args()); };",
+                "\n    protected \Closure \$getService;$1        \$containerRef = $2\n        \$this->getService = static function () use (\$containerRef) { return \$containerRef->get()->getService(...\\func_get_args()); };",
                 $code,
                 1
             );
@@ -1545,7 +1545,7 @@ private function addInlineRequires(bool $hasProxyClasses): string
             $code .= "\n            include_once __DIR__.'/proxy-classes.php';";
         }
 
-        return $code ? sprintf("\n        \$this->privates['service_container'] = function (\$container) {%s\n        };\n", $code) : '';
+        return $code ? sprintf("\n        \$this->privates['service_container'] = static function (\$container) {%s\n        };\n", $code) : '';
     }
 
     private function addDefaultParametersMethod(): string
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
index b6fb7fe482a6d..15302edff3f23 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
@@ -86,7 +86,7 @@ class ProjectServiceContainer extends Container
             'decorated' => 'decorator_service_with_name',
         ];
 
-        $this->privates['service_container'] = function ($container) {
+        $this->privates['service_container'] = static function ($container) {
             include_once $container->targetDir.''.'/Fixtures/includes/foo.php';
         };
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
index 21cbc4a3ff1b1..965dc91661cce 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -48,7 +48,7 @@ class ProjectServiceContainer extends Container
 
         $this->aliases = [];
 
-        $this->privates['service_container'] = function ($container) {
+        $this->privates['service_container'] = static function ($container) {
             include_once __DIR__.'/proxy-classes.php';
         };
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
index 733bb618cf05b..f184f64dca43a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
@@ -29,7 +29,7 @@ public function __construct()
 
         $this->aliases = [];
 
-        $this->privates['service_container'] = function ($container) {
+        $this->privates['service_container'] = static function ($container) {
             include_once \dirname(__DIR__, 1).'/includes/HotPath/I1.php';
             include_once \dirname(__DIR__, 1).'/includes/HotPath/P1.php';
             include_once \dirname(__DIR__, 1).'/includes/HotPath/T1.php';
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php
index 17318d1ebbc3a..30f5075304d2f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_duplicates.php
@@ -21,7 +21,7 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $containerRef = $this->ref = \WeakReference::create($this);
-        $this->getService = function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
+        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->services = $this->privates = [];
         $this->methodMap = [
             'bar' => 'getBarService',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
index 265d45ca1f92c..60700526ead94 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -21,7 +21,7 @@ class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container
     public function __construct()
     {
         $containerRef = $this->ref = \WeakReference::create($this);
-        $this->getService = function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
+        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php
index 029c64cdd101d..f999184479893 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_service_locator_argument.php
@@ -21,7 +21,7 @@ class Symfony_DI_PhpDumper_Service_Locator_Argument extends Container
     public function __construct()
     {
         $containerRef = $this->ref = \WeakReference::create($this);
-        $this->getService = function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
+        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->services = $this->privates = [];
         $this->syntheticIds = [
             'foo5' => true,
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
index 6910fe69ef6da..77ed9e02882a4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
@@ -21,7 +21,7 @@ class ProjectServiceContainer extends Container
     public function __construct()
     {
         $containerRef = $this->ref = \WeakReference::create($this);
-        $this->getService = function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
+        $this->getService = static function () use ($containerRef) { return $containerRef->get()->getService(...\func_get_args()); };
         $this->services = $this->privates = [];
         $this->methodMap = [
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => 'getTestServiceSubscriberService',

From 0f1b865341a029e12809ec9fd48ffe8053b235f9 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 16:18:31 +0100
Subject: [PATCH 230/475] Only include $containerRef in compiled container when
 needed

---
 .../DependencyInjection/Dumper/PhpDumper.php          | 11 +++++++----
 .../php/services_closure_argument_compiled.php        |  8 +-------
 .../Tests/Fixtures/php/services_locator.php           |  6 +-----
 .../Tests/Fixtures/php/services_uninitialized_ref.php |  6 +-----
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 2aa53d0fa9190..399f991cc6b1c 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1817,8 +1817,6 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
                         $returnedType = sprintf(': %s\%s', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $value->getInvalidBehavior() ? '' : '?', str_replace(['|', '&'], ['|\\', '&\\'], $value->getType()));
                     }
 
-                    $code = sprintf('return %s;', $code);
-
                     $attribute = '';
                     if ($value instanceof Reference) {
                         $attribute = 'name: '.$this->dumpValue((string) $value, $interpolate);
@@ -1829,9 +1827,14 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
 
                         $attribute = sprintf('#[\Closure(%s)] ', $attribute);
                     }
-                    $this->addContainerRef = true;
 
-                    return sprintf("%sfunction () use (\$containerRef)%s {\n            \$container = \$containerRef->get();\n\n            %s\n        }", $attribute, $returnedType, $code);
+                    if (str_contains($code, '$container')) {
+                        $this->addContainerRef = true;
+
+                        return sprintf("%sfunction () use (\$containerRef)%s {\n            \$container = \$containerRef->get();\n\n            return %s;\n        }", $attribute, $returnedType, $code);
+                    }
+
+                    return sprintf('%sfn ()%s => %s', $attribute, $returnedType, $code);
                 }
 
                 if ($value instanceof IteratorArgument) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php
index 111ebd4506978..a9dcc3ceb10c3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_closure_argument_compiled.php
@@ -73,12 +73,6 @@ protected static function getServiceClosureService($container)
      */
     protected static function getServiceClosureInvalidService($container)
     {
-        $containerRef = $container->ref;
-
-        return $container->services['service_closure_invalid'] = new \Bar(function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return NULL;
-        });
+        return $container->services['service_closure_invalid'] = new \Bar(fn () => NULL);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
index eafe779392fa4..793dd0e84b173 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
@@ -82,11 +82,7 @@ protected static function getFooServiceService($container)
             $container = $containerRef->get();
 
             return ($container->privates['baz_service'] ??= new \stdClass());
-        }, 'nil' => function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return NULL;
-        }]);
+        }, 'nil' => fn () => NULL]);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
index 68535dd312dbb..b42db843a12c9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -66,11 +66,7 @@ protected static function getBarService($container)
             $container = $containerRef->get();
 
             return ($container->services['foo1'] ?? null);
-        }, #[\Closure(name: 'foo2')] function () use ($containerRef) {
-            $container = $containerRef->get();
-
-            return null;
-        }, #[\Closure(name: 'foo3', class: 'stdClass')] function () use ($containerRef) {
+        }, #[\Closure(name: 'foo2')] fn () => null, #[\Closure(name: 'foo3', class: 'stdClass')] function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->privates['foo3'] ?? null);

From 26e6a56694293b9332b19b86dea177557fc548b3 Mon Sep 17 00:00:00 2001
From: HypeMC <hypemc@gmail.com>
Date: Tue, 7 Feb 2023 08:28:04 +0100
Subject: [PATCH 231/475] [FrameworkBundle][HttpKernel] Configure ErrorHandler
 on boot

---
 .../Bundle/FrameworkBundle/CHANGELOG.md       |   1 +
 .../FrameworkExtension.php                    |   6 +-
 .../FrameworkBundle/FrameworkBundle.php       |   3 +-
 .../Resources/config/debug_prod.php           |   9 +-
 .../FrameworkExtensionTestCase.php            |  22 ++--
 .../Bundle/FrameworkBundle/composer.json      |   2 +-
 .../Debug/ErrorHandlerConfigurator.php        | 107 ++++++++++++++++++
 .../EventListener/DebugHandlersListener.php   |  93 ++-------------
 .../Debug/ErrorHandlerConfiguratorTest.php    |  97 ++++++++++++++++
 .../DebugHandlersListenerTest.php             |  91 +--------------
 10 files changed, 240 insertions(+), 191 deletions(-)
 create mode 100644 src/Symfony/Component/HttpKernel/Debug/ErrorHandlerConfigurator.php
 create mode 100644 src/Symfony/Component/HttpKernel/Tests/Debug/ErrorHandlerConfiguratorTest.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 67e0dbe1ceb22..71dab79801fe4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG
  * Deprecate the `notifier.logger_notification_listener` service, use the `notifier.notification_logger_listener` service instead
  * Allow setting private services with the test container
  * Register alias for argument for workflow services with workflow name only
+ * Configure the `ErrorHandler` on `FrameworkBundle::boot()`
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 7d1d6dd5a407e..6dd5ca619c0bb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1095,12 +1095,12 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
             $loader->load('debug.php');
         }
 
-        $definition = $container->findDefinition('debug.debug_handlers_listener');
+        $definition = $container->findDefinition('debug.error_handler_configurator');
 
         if (false === $config['log']) {
-            $definition->replaceArgument(1, null);
+            $definition->replaceArgument(0, null);
         } elseif (true !== $config['log']) {
-            $definition->replaceArgument(2, $config['log']);
+            $definition->replaceArgument(1, $config['log']);
         }
 
         if (!$config['throw']) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index c5af22c91316f..7f48810e50475 100644
--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -94,7 +94,8 @@ class FrameworkBundle extends Bundle
      */
     public function boot()
     {
-        ErrorHandler::register(null, false)->throwAt($this->container->getParameter('debug.error_handler.throw_at'), true);
+        $handler = ErrorHandler::register(null, false);
+        $this->container->get('debug.error_handler_configurator')->configure($handler);
 
         if ($this->container->getParameter('kernel.http_method_override')) {
             Request::enableHttpMethodParameterOverride();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.php
index f381b018f0629..7f71e2ee93094 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use Symfony\Component\HttpKernel\Debug\ErrorHandlerConfigurator;
 use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
 use Symfony\Component\HttpKernel\EventListener\DebugHandlersListener;
 
@@ -18,9 +19,9 @@
     $container->parameters()->set('debug.error_handler.throw_at', -1);
 
     $container->services()
-        ->set('debug.debug_handlers_listener', DebugHandlersListener::class)
+        ->set('debug.error_handler_configurator', ErrorHandlerConfigurator::class)
+            ->public()
             ->args([
-                null, // Exception handler
                 service('monolog.logger.php')->nullOnInvalid(),
                 null, // Log levels map for enabled error levels
                 param('debug.error_handler.throw_at'),
@@ -28,9 +29,11 @@
                 param('kernel.debug'),
                 service('monolog.logger.deprecation')->nullOnInvalid(),
             ])
-            ->tag('kernel.event_subscriber')
             ->tag('monolog.logger', ['channel' => 'php'])
 
+        ->set('debug.debug_handlers_listener', DebugHandlersListener::class)
+            ->tag('kernel.event_subscriber')
+
         ->set('debug.file_link_formatter', FileLinkFormatter::class)
             ->args([param('debug.file_link_format')])
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
index 4672fe1237f02..03af03b765875 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -541,9 +541,9 @@ public function testEnabledPhpErrorsConfig()
     {
         $container = $this->createContainerFromFile('php_errors_enabled');
 
-        $definition = $container->getDefinition('debug.debug_handlers_listener');
-        $this->assertEquals(new Reference('monolog.logger.php', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(1));
-        $this->assertNull($definition->getArgument(2));
+        $definition = $container->getDefinition('debug.error_handler_configurator');
+        $this->assertEquals(new Reference('monolog.logger.php', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(0));
+        $this->assertNull($definition->getArgument(1));
         $this->assertSame(-1, $container->getParameter('debug.error_handler.throw_at'));
     }
 
@@ -551,9 +551,9 @@ public function testDisabledPhpErrorsConfig()
     {
         $container = $this->createContainerFromFile('php_errors_disabled');
 
-        $definition = $container->getDefinition('debug.debug_handlers_listener');
+        $definition = $container->getDefinition('debug.error_handler_configurator');
+        $this->assertNull($definition->getArgument(0));
         $this->assertNull($definition->getArgument(1));
-        $this->assertNull($definition->getArgument(2));
         $this->assertSame(0, $container->getParameter('debug.error_handler.throw_at'));
     }
 
@@ -561,21 +561,21 @@ public function testPhpErrorsWithLogLevel()
     {
         $container = $this->createContainerFromFile('php_errors_log_level');
 
-        $definition = $container->getDefinition('debug.debug_handlers_listener');
-        $this->assertEquals(new Reference('monolog.logger.php', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(1));
-        $this->assertSame(8, $definition->getArgument(2));
+        $definition = $container->getDefinition('debug.error_handler_configurator');
+        $this->assertEquals(new Reference('monolog.logger.php', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(0));
+        $this->assertSame(8, $definition->getArgument(1));
     }
 
     public function testPhpErrorsWithLogLevels()
     {
         $container = $this->createContainerFromFile('php_errors_log_levels');
 
-        $definition = $container->getDefinition('debug.debug_handlers_listener');
-        $this->assertEquals(new Reference('monolog.logger.php', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(1));
+        $definition = $container->getDefinition('debug.error_handler_configurator');
+        $this->assertEquals(new Reference('monolog.logger.php', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(0));
         $this->assertSame([
             \E_NOTICE => \Psr\Log\LogLevel::ERROR,
             \E_WARNING => \Psr\Log\LogLevel::ERROR,
-        ], $definition->getArgument(2));
+        ], $definition->getArgument(1));
     }
 
     public function testExceptionsConfig()
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 6f81c313b0c54..6a801e1651ba6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -26,7 +26,7 @@
         "symfony/error-handler": "^6.1",
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/http-foundation": "^6.2",
-        "symfony/http-kernel": "^6.2.1",
+        "symfony/http-kernel": "^6.3",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "^5.4|^6.0",
         "symfony/finder": "^5.4|^6.0",
diff --git a/src/Symfony/Component/HttpKernel/Debug/ErrorHandlerConfigurator.php b/src/Symfony/Component/HttpKernel/Debug/ErrorHandlerConfigurator.php
new file mode 100644
index 0000000000000..49f188c22d9d0
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Debug/ErrorHandlerConfigurator.php
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Debug;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\ErrorHandler\ErrorHandler;
+
+/**
+ * Configures the error handler.
+ *
+ * @final
+ *
+ * @internal
+ */
+class ErrorHandlerConfigurator
+{
+    private ?LoggerInterface $logger;
+    private ?LoggerInterface $deprecationLogger;
+    private array|int|null $levels;
+    private ?int $throwAt;
+    private bool $scream;
+    private bool $scope;
+
+    /**
+     * @param array|int|null $levels  An array map of E_* to LogLevel::* or an integer bit field of E_* constants
+     * @param int|null       $throwAt Thrown errors in a bit field of E_* constants, or null to keep the current value
+     * @param bool           $scream  Enables/disables screaming mode, where even silenced errors are logged
+     * @param bool           $scope   Enables/disables scoping mode
+     */
+    public function __construct(LoggerInterface $logger = null, array|int|null $levels = \E_ALL, ?int $throwAt = \E_ALL, bool $scream = true, bool $scope = true, LoggerInterface $deprecationLogger = null)
+    {
+        $this->logger = $logger;
+        $this->levels = $levels ?? \E_ALL;
+        $this->throwAt = \is_int($throwAt) ? $throwAt : (null === $throwAt ? null : ($throwAt ? \E_ALL : null));
+        $this->scream = $scream;
+        $this->scope = $scope;
+        $this->deprecationLogger = $deprecationLogger;
+    }
+
+    /**
+     * Configures the error handler.
+     */
+    public function configure(ErrorHandler $handler): void
+    {
+        if ($this->logger || $this->deprecationLogger) {
+            $this->setDefaultLoggers($handler);
+            if (\is_array($this->levels)) {
+                $levels = 0;
+                foreach ($this->levels as $type => $log) {
+                    $levels |= $type;
+                }
+            } else {
+                $levels = $this->levels;
+            }
+
+            if ($this->scream) {
+                $handler->screamAt($levels);
+            }
+            if ($this->scope) {
+                $handler->scopeAt($levels & ~\E_USER_DEPRECATED & ~\E_DEPRECATED);
+            } else {
+                $handler->scopeAt(0, true);
+            }
+            $this->logger = $this->deprecationLogger = $this->levels = null;
+        }
+        if (null !== $this->throwAt) {
+            $handler->throwAt($this->throwAt, true);
+        }
+    }
+
+    private function setDefaultLoggers(ErrorHandler $handler): void
+    {
+        if (\is_array($this->levels)) {
+            $levelsDeprecatedOnly = [];
+            $levelsWithoutDeprecated = [];
+            foreach ($this->levels as $type => $log) {
+                if (\E_DEPRECATED == $type || \E_USER_DEPRECATED == $type) {
+                    $levelsDeprecatedOnly[$type] = $log;
+                } else {
+                    $levelsWithoutDeprecated[$type] = $log;
+                }
+            }
+        } else {
+            $levelsDeprecatedOnly = $this->levels & (\E_DEPRECATED | \E_USER_DEPRECATED);
+            $levelsWithoutDeprecated = $this->levels & ~\E_DEPRECATED & ~\E_USER_DEPRECATED;
+        }
+
+        $defaultLoggerLevels = $this->levels;
+        if ($this->deprecationLogger && $levelsDeprecatedOnly) {
+            $handler->setDefaultLogger($this->deprecationLogger, $levelsDeprecatedOnly);
+            $defaultLoggerLevels = $levelsWithoutDeprecated;
+        }
+
+        if ($this->logger && $defaultLoggerLevels) {
+            $handler->setDefaultLogger($this->logger, $defaultLoggerLevels);
+        }
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
index 76ee7bde711ac..e3e8924928fbb 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
-use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\Console\Event\ConsoleEvent;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
@@ -21,7 +20,7 @@
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
- * Configures errors and exceptions handlers.
+ * Sets an exception handler.
  *
  * @author Nicolas Grekas <p@tchwork.com>
  *
@@ -33,35 +32,19 @@ class DebugHandlersListener implements EventSubscriberInterface
 {
     private string|object|null $earlyHandler;
     private ?\Closure $exceptionHandler;
-    private ?LoggerInterface $logger;
-    private ?LoggerInterface $deprecationLogger;
-    private array|int|null $levels;
-    private ?int $throwAt;
-    private bool $scream;
-    private bool $scope;
     private bool $firstCall = true;
     private bool $hasTerminatedWithException = false;
 
     /**
-     * @param callable|null  $exceptionHandler A handler that must support \Throwable instances that will be called on Exception
-     * @param array|int|null $levels           An array map of E_* to LogLevel::* or an integer bit field of E_* constants
-     * @param int|null       $throwAt          Thrown errors in a bit field of E_* constants, or null to keep the current value
-     * @param bool           $scream           Enables/disables screaming mode, where even silenced errors are logged
-     * @param bool           $scope            Enables/disables scoping mode
+     * @param callable|null $exceptionHandler A handler that must support \Throwable instances that will be called on Exception
      */
-    public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, array|int|null $levels = \E_ALL, ?int $throwAt = \E_ALL, bool $scream = true, bool $scope = true, LoggerInterface $deprecationLogger = null)
+    public function __construct(callable $exceptionHandler = null)
     {
         $handler = set_exception_handler('is_int');
         $this->earlyHandler = \is_array($handler) ? $handler[0] : null;
         restore_exception_handler();
 
         $this->exceptionHandler = null === $exceptionHandler ? null : $exceptionHandler(...);
-        $this->logger = $logger;
-        $this->levels = $levels ?? \E_ALL;
-        $this->throwAt = \is_int($throwAt) ? $throwAt : (null === $throwAt ? null : ($throwAt ? \E_ALL : null));
-        $this->scream = $scream;
-        $this->scope = $scope;
-        $this->deprecationLogger = $deprecationLogger;
     }
 
     /**
@@ -77,40 +60,6 @@ public function configure(object $event = null): void
         }
         $this->firstCall = $this->hasTerminatedWithException = false;
 
-        $handler = set_exception_handler('is_int');
-        $handler = \is_array($handler) ? $handler[0] : null;
-        restore_exception_handler();
-
-        if (!$handler instanceof ErrorHandler) {
-            $handler = $this->earlyHandler;
-        }
-
-        if ($handler instanceof ErrorHandler) {
-            if ($this->logger || $this->deprecationLogger) {
-                $this->setDefaultLoggers($handler);
-                if (\is_array($this->levels)) {
-                    $levels = 0;
-                    foreach ($this->levels as $type => $log) {
-                        $levels |= $type;
-                    }
-                } else {
-                    $levels = $this->levels;
-                }
-
-                if ($this->scream) {
-                    $handler->screamAt($levels);
-                }
-                if ($this->scope) {
-                    $handler->scopeAt($levels & ~\E_USER_DEPRECATED & ~\E_DEPRECATED);
-                } else {
-                    $handler->scopeAt(0, true);
-                }
-                $this->logger = $this->deprecationLogger = $this->levels = null;
-            }
-            if (null !== $this->throwAt) {
-                $handler->throwAt($this->throwAt, true);
-            }
-        }
         if (!$this->exceptionHandler) {
             if ($event instanceof KernelEvent) {
                 if (method_exists($kernel = $event->getKernel(), 'terminateWithException')) {
@@ -136,6 +85,14 @@ public function configure(object $event = null): void
             }
         }
         if ($this->exceptionHandler) {
+            $handler = set_exception_handler('is_int');
+            $handler = \is_array($handler) ? $handler[0] : null;
+            restore_exception_handler();
+
+            if (!$handler instanceof ErrorHandler) {
+                $handler = $this->earlyHandler;
+            }
+
             if ($handler instanceof ErrorHandler) {
                 $handler->setExceptionHandler($this->exceptionHandler);
             }
@@ -143,34 +100,6 @@ public function configure(object $event = null): void
         }
     }
 
-    private function setDefaultLoggers(ErrorHandler $handler): void
-    {
-        if (\is_array($this->levels)) {
-            $levelsDeprecatedOnly = [];
-            $levelsWithoutDeprecated = [];
-            foreach ($this->levels as $type => $log) {
-                if (\E_DEPRECATED == $type || \E_USER_DEPRECATED == $type) {
-                    $levelsDeprecatedOnly[$type] = $log;
-                } else {
-                    $levelsWithoutDeprecated[$type] = $log;
-                }
-            }
-        } else {
-            $levelsDeprecatedOnly = $this->levels & (\E_DEPRECATED | \E_USER_DEPRECATED);
-            $levelsWithoutDeprecated = $this->levels & ~\E_DEPRECATED & ~\E_USER_DEPRECATED;
-        }
-
-        $defaultLoggerLevels = $this->levels;
-        if ($this->deprecationLogger && $levelsDeprecatedOnly) {
-            $handler->setDefaultLogger($this->deprecationLogger, $levelsDeprecatedOnly);
-            $defaultLoggerLevels = $levelsWithoutDeprecated;
-        }
-
-        if ($this->logger && $defaultLoggerLevels) {
-            $handler->setDefaultLogger($this->logger, $defaultLoggerLevels);
-        }
-    }
-
     public static function getSubscribedEvents(): array
     {
         $events = [KernelEvents::REQUEST => ['configure', 2048]];
diff --git a/src/Symfony/Component/HttpKernel/Tests/Debug/ErrorHandlerConfiguratorTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/ErrorHandlerConfiguratorTest.php
new file mode 100644
index 0000000000000..a89cee0772d09
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Tests/Debug/ErrorHandlerConfiguratorTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Debug;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+use Symfony\Component\ErrorHandler\ErrorHandler;
+use Symfony\Component\HttpKernel\Debug\ErrorHandlerConfigurator;
+
+class ErrorHandlerConfiguratorTest extends TestCase
+{
+    public function testConfigure()
+    {
+        $logger = $this->createMock(LoggerInterface::class);
+        $configurator = new ErrorHandlerConfigurator($logger);
+        $handler = new ErrorHandler();
+
+        $configurator->configure($handler);
+
+        $loggers = $handler->setLoggers([]);
+
+        $this->assertArrayHasKey(\E_DEPRECATED, $loggers);
+        $this->assertSame([$logger, LogLevel::INFO], $loggers[\E_DEPRECATED]);
+    }
+
+    /**
+     * @dataProvider provideLevelsAssignedToLoggers
+     */
+    public function testLevelsAssignedToLoggers(bool $hasLogger, bool $hasDeprecationLogger, array|int $levels, array|int|null $expectedLoggerLevels, array|int|null $expectedDeprecationLoggerLevels)
+    {
+        $handler = $this->createMock(ErrorHandler::class);
+
+        $expectedCalls = [];
+        $logger = null;
+        $deprecationLogger = null;
+
+        if ($hasDeprecationLogger) {
+            $deprecationLogger = $this->createMock(LoggerInterface::class);
+            if (null !== $expectedDeprecationLoggerLevels) {
+                $expectedCalls[] = [$deprecationLogger, $expectedDeprecationLoggerLevels];
+            }
+        }
+
+        if ($hasLogger) {
+            $logger = $this->createMock(LoggerInterface::class);
+            if (null !== $expectedLoggerLevels) {
+                $expectedCalls[] = [$logger, $expectedLoggerLevels];
+            }
+        }
+
+        $handler
+            ->expects($this->exactly(\count($expectedCalls)))
+            ->method('setDefaultLogger')
+            ->withConsecutive(...$expectedCalls);
+
+        $configurator = new ErrorHandlerConfigurator($logger, $levels, null, true, true, $deprecationLogger);
+
+        $configurator->configure($handler);
+    }
+
+    public static function provideLevelsAssignedToLoggers(): iterable
+    {
+        yield [false, false, 0, null, null];
+        yield [false, false, \E_ALL, null, null];
+        yield [false, false, [], null, null];
+        yield [false, false, [\E_WARNING => LogLevel::WARNING, \E_USER_DEPRECATED => LogLevel::NOTICE], null, null];
+
+        yield [true, false, \E_ALL, \E_ALL, null];
+        yield [true, false, \E_DEPRECATED, \E_DEPRECATED, null];
+        yield [true, false, [], null, null];
+        yield [true, false, [\E_WARNING => LogLevel::WARNING, \E_DEPRECATED => LogLevel::NOTICE], [\E_WARNING => LogLevel::WARNING, \E_DEPRECATED => LogLevel::NOTICE], null];
+
+        yield [false, true, 0, null, null];
+        yield [false, true, \E_ALL, null, \E_DEPRECATED | \E_USER_DEPRECATED];
+        yield [false, true, \E_ERROR, null, null];
+        yield [false, true, [], null, null];
+        yield [false, true, [\E_ERROR => LogLevel::ERROR, \E_DEPRECATED => LogLevel::DEBUG], null, [\E_DEPRECATED => LogLevel::DEBUG]];
+
+        yield [true, true, 0, null, null];
+        yield [true, true, \E_ALL, \E_ALL & ~(\E_DEPRECATED | \E_USER_DEPRECATED), \E_DEPRECATED | \E_USER_DEPRECATED];
+        yield [true, true, \E_ERROR, \E_ERROR, null];
+        yield [true, true, \E_USER_DEPRECATED, null, \E_USER_DEPRECATED];
+        yield [true, true, [\E_ERROR => LogLevel::ERROR, \E_DEPRECATED => LogLevel::DEBUG], [\E_ERROR => LogLevel::ERROR], [\E_DEPRECATED => LogLevel::DEBUG]];
+        yield [true, true, [\E_ERROR => LogLevel::ALERT], [\E_ERROR => LogLevel::ALERT], null];
+        yield [true, true, [\E_USER_DEPRECATED => LogLevel::NOTICE], null, [\E_USER_DEPRECATED => LogLevel::NOTICE]];
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php
index 9cabf84331e28..5ccd1b5343b9e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\ConsoleEvents;
@@ -36,9 +34,8 @@ class DebugHandlersListenerTest extends TestCase
 {
     public function testConfigure()
     {
-        $logger = $this->createMock(LoggerInterface::class);
         $userHandler = function () {};
-        $listener = new DebugHandlersListener($userHandler, $logger);
+        $listener = new DebugHandlersListener($userHandler);
         $eHandler = new ErrorHandler();
 
         $exception = null;
@@ -57,11 +54,6 @@ public function testConfigure()
         }
 
         $this->assertSame($userHandler, $eHandler->setExceptionHandler('var_dump'));
-
-        $loggers = $eHandler->setLoggers([]);
-
-        $this->assertArrayHasKey(\E_DEPRECATED, $loggers);
-        $this->assertSame([$logger, LogLevel::INFO], $loggers[\E_DEPRECATED]);
     }
 
     public function testConfigureForHttpKernelWithNoTerminateWithException()
@@ -153,85 +145,4 @@ public function testReplaceExistingExceptionHandler()
 
         $this->assertSame($userHandler, $eHandler->setExceptionHandler('var_dump'));
     }
-
-    public static function provideLevelsAssignedToLoggers(): array
-    {
-        return [
-            [false, false, '0', null, null],
-            [false, false, \E_ALL, null, null],
-            [false, false, [], null, null],
-            [false, false, [\E_WARNING => LogLevel::WARNING, \E_USER_DEPRECATED => LogLevel::NOTICE], null, null],
-
-            [true, false, \E_ALL, \E_ALL, null],
-            [true, false, \E_DEPRECATED, \E_DEPRECATED, null],
-            [true, false, [], null, null],
-            [true, false, [\E_WARNING => LogLevel::WARNING, \E_DEPRECATED => LogLevel::NOTICE], [\E_WARNING => LogLevel::WARNING, \E_DEPRECATED => LogLevel::NOTICE], null],
-
-            [false, true, '0', null, null],
-            [false, true, \E_ALL, null, \E_DEPRECATED | \E_USER_DEPRECATED],
-            [false, true, \E_ERROR, null, null],
-            [false, true, [], null, null],
-            [false, true, [\E_ERROR => LogLevel::ERROR, \E_DEPRECATED => LogLevel::DEBUG], null, [\E_DEPRECATED => LogLevel::DEBUG]],
-
-            [true, true, '0', null, null],
-            [true, true, \E_ALL, \E_ALL & ~(\E_DEPRECATED | \E_USER_DEPRECATED), \E_DEPRECATED | \E_USER_DEPRECATED],
-            [true, true, \E_ERROR, \E_ERROR, null],
-            [true, true, \E_USER_DEPRECATED, null, \E_USER_DEPRECATED],
-            [true, true, [\E_ERROR => LogLevel::ERROR, \E_DEPRECATED => LogLevel::DEBUG], [\E_ERROR => LogLevel::ERROR], [\E_DEPRECATED => LogLevel::DEBUG]],
-            [true, true, [\E_ERROR => LogLevel::ALERT], [\E_ERROR => LogLevel::ALERT], null],
-            [true, true, [\E_USER_DEPRECATED => LogLevel::NOTICE], null, [\E_USER_DEPRECATED => LogLevel::NOTICE]],
-        ];
-    }
-
-    /**
-     * @dataProvider provideLevelsAssignedToLoggers
-     *
-     * @param array|string      $levels
-     * @param array|string|null $expectedLoggerLevels
-     * @param array|string|null $expectedDeprecationLoggerLevels
-     */
-    public function testLevelsAssignedToLoggers(bool $hasLogger, bool $hasDeprecationLogger, $levels, $expectedLoggerLevels, $expectedDeprecationLoggerLevels)
-    {
-        $handler = $this->createMock(ErrorHandler::class);
-
-        $expectedCalls = [];
-        $logger = null;
-
-        $deprecationLogger = null;
-        if ($hasDeprecationLogger) {
-            $deprecationLogger = $this->createMock(LoggerInterface::class);
-            if (null !== $expectedDeprecationLoggerLevels) {
-                $expectedCalls[] = [$deprecationLogger, $expectedDeprecationLoggerLevels];
-            }
-        }
-
-        if ($hasLogger) {
-            $logger = $this->createMock(LoggerInterface::class);
-            if (null !== $expectedLoggerLevels) {
-                $expectedCalls[] = [$logger, $expectedLoggerLevels];
-            }
-        }
-
-        $handler
-            ->expects($this->exactly(\count($expectedCalls)))
-            ->method('setDefaultLogger')
-            ->withConsecutive(...$expectedCalls);
-
-        $sut = new DebugHandlersListener(null, $logger, $levels, null, true, true, $deprecationLogger);
-        $prevHander = set_exception_handler([$handler, 'handleError']);
-
-        try {
-            $handler
-                ->method('handleError')
-                ->willReturnCallback(function () use ($prevHander) {
-                    $prevHander(...\func_get_args());
-                });
-
-            $sut->configure();
-            set_exception_handler($prevHander);
-        } catch (\Exception $e) {
-            set_exception_handler($prevHander);
-            throw $e;
-        }
-    }
 }

From e263666845003f33791590e2543abc78f81402bc Mon Sep 17 00:00:00 2001
From: maxbeckers <beckers.maximilian@gmail.com>
Date: Tue, 21 Feb 2023 12:57:25 +0100
Subject: [PATCH 232/475] Fix Integration tests skipped with Redis cluster

---
 .../Transport/RedisExtIntegrationTest.php     |  5 +--
 .../Transport/RelayExtIntegrationTest.php     | 35 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
index 2c93880d9d889..ec3b625a7a420 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php
@@ -35,7 +35,7 @@ protected function setUp(): void
         }
 
         try {
-            $this->redis = new \Redis();
+            $this->redis = $this->createRedisClient();
             $this->connection = Connection::fromDsn(getenv('MESSENGER_REDIS_DSN'), ['sentinel_master' => getenv('MESSENGER_REDIS_SENTINEL_MASTER') ?: null], $this->redis);
             $this->connection->cleanup();
             $this->connection->setup();
@@ -222,7 +222,8 @@ public function testLazySentinel()
         $connection = Connection::fromDsn(getenv('MESSENGER_REDIS_DSN'),
             ['lazy' => true,
              'delete_after_ack' => true,
-             'sentinel_master' => getenv('MESSENGER_REDIS_SENTINEL_MASTER') ?: null, ], $this->redis);
+             'sentinel_master' => getenv('MESSENGER_REDIS_SENTINEL_MASTER') ?: null,
+            ], $this->redis);
 
         $connection->add('1', []);
         $this->assertNotEmpty($message = $connection->get());
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RelayExtIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RelayExtIntegrationTest.php
index bd33434a064c8..c8e0cd237ed3f 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RelayExtIntegrationTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RelayExtIntegrationTest.php
@@ -25,4 +25,39 @@ protected function createRedisClient(): \Redis|Relay
     {
         return new Relay();
     }
+
+    public function testConnectionSendAndGetDelayed()
+    {
+        self::markTestSkipped('This test doesn\'t work with relay.');
+    }
+
+    public function testConnectionSendDelayedMessagesWithSameContent()
+    {
+        self::markTestSkipped('This test doesn\'t work with relay.');
+    }
+
+    public function testLazy()
+    {
+        self::markTestSkipped('This test doesn\'t work with relay.');
+    }
+
+    public function testDbIndex()
+    {
+        self::markTestSkipped('This test doesn\'t work with relay.');
+    }
+
+    public function testGetNonBlocking()
+    {
+        self::markTestSkipped('This test doesn\'t work with relay.');
+    }
+
+    public function testGetAfterReject()
+    {
+        self::markTestSkipped('This test doesn\'t work with relay.');
+    }
+
+    public function testJsonError()
+    {
+        self::markTestSkipped('This test doesn\'t work with relay.');
+    }
 }

From 2d56efa180b99b64d377e1facfa961fbe3a5875e Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Tue, 21 Feb 2023 19:05:31 +0100
Subject: [PATCH 233/475] [Mailer] Reflect sandbox state in
 `MailjetApiTransport::__toString()`

---
 .../Mailjet/Tests/Transport/MailjetApiTransportTest.php       | 4 ++++
 .../Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetApiTransportTest.php
index 93abf9415de6f..7d208b7e39c1c 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetApiTransportTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetApiTransportTest.php
@@ -45,6 +45,10 @@ public static function getTransportData()
                 (new MailjetApiTransport(self::USER, self::PASSWORD))->setHost('example.com'),
                 'mailjet+api://example.com',
             ],
+            [
+                (new MailjetApiTransport(self::USER, self::PASSWORD, sandbox: true))->setHost('example.com'),
+                'mailjet+api://example.com?sandbox=true',
+            ],
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php
index 22002f36f2b03..9a29315e932dd 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php
@@ -66,7 +66,7 @@ public function __construct(string $publicKey, string $privateKey, HttpClientInt
 
     public function __toString(): string
     {
-        return sprintf('mailjet+api://%s', $this->getEndpoint());
+        return sprintf('mailjet+api://%s', $this->getEndpoint().($this->sandbox ? '?sandbox=true' : ''));
     }
 
     protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $envelope): ResponseInterface

From d0f32d4a7422c35e55c7bff86eb2ff526c494a3d Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Tue, 21 Feb 2023 19:48:11 +0100
Subject: [PATCH 234/475] Remove unused local variable

---
 src/Symfony/Bridge/Monolog/Handler/MailerHandler.php            | 1 -
 src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php         | 2 +-
 .../Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php      | 2 --
 .../Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php | 1 -
 .../Component/Mailer/Transport/AbstractHttpTransport.php        | 1 -
 .../Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSender.php    | 1 -
 .../Component/Notifier/Bridge/GoogleChat/GoogleChatOptions.php  | 2 +-
 .../Component/PropertyInfo/Extractor/ReflectionExtractor.php    | 1 -
 .../Serializer/Normalizer/AbstractObjectNormalizer.php          | 1 -
 src/Symfony/Component/Translation/Loader/QtFileLoader.php       | 1 -
 src/Symfony/Component/VarExporter/LazyGhostTrait.php            | 1 -
 11 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
index 7ee64c62f1558..718be59c13088 100644
--- a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
@@ -103,7 +103,6 @@ protected function getSubjectFormatter(string $format): FormatterInterface
      */
     protected function buildMessage(string $content, array $records): Email
     {
-        $message = null;
         if ($this->messageTemplate instanceof Email) {
             $message = clone $this->messageTemplate;
         } elseif (\is_callable($this->messageTemplate)) {
diff --git a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
index 08427180f2715..c1ce2898dab37 100644
--- a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
+++ b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
@@ -35,7 +35,7 @@ private function doInvoke(array|LogRecord $record): array|LogRecord
     {
         $key = $this->requestStack && ($request = $this->requestStack->getCurrentRequest()) ? spl_object_id($request) : '';
 
-        $timestamp = $timestampRfc3339 = false;
+        $timestampRfc3339 = false;
         if ($record['datetime'] instanceof \DateTimeInterface) {
             $timestamp = $record['datetime']->getTimestamp();
             $timestampRfc3339 = $record['datetime']->format(\DateTimeInterface::RFC3339_EXTENDED);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
index 9a7ea28f35cf9..fa3c9b284bf06 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php
@@ -91,8 +91,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $workflowName = $input->getArgument('name');
 
-        $workflow = null;
-
         if (isset($this->workflows)) {
             if (!$this->workflows->has($workflowName)) {
                 throw new InvalidArgumentException(sprintf('The workflow named "%s" cannot be found.', $workflowName));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
index cec6239618a4a..17870bb96a69b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -120,7 +120,6 @@ protected function describeContainerDeprecations(ContainerBuilder $builder, arra
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($deprecationsXML = $dom->createElement('deprecations'));
 
-        $formattedLogs = [];
         $remainingCount = 0;
         foreach ($logs as $log) {
             $deprecationsXML->appendChild($deprecationXML = $dom->createElement('deprecation'));
diff --git a/src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php
index d671c05aa589c..b3fb5a2a0622b 100644
--- a/src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php
+++ b/src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php
@@ -66,7 +66,6 @@ abstract protected function doSendHttp(SentMessage $message): ResponseInterface;
 
     protected function doSend(SentMessage $message): void
     {
-        $response = null;
         try {
             $response = $this->doSendHttp($message);
             $message->appendDebug($response->getInfo('debug') ?? '');
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSender.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSender.php
index 818cf175a8ee9..ca13e0c737311 100644
--- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSender.php
+++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSender.php
@@ -42,7 +42,6 @@ public function send(Envelope $envelope): Envelope
 
         $messageGroupId = null;
         $messageDeduplicationId = null;
-        $xrayTraceId = null;
 
         /** @var AmazonSqsFifoStamp|null $amazonSqsFifoStamp */
         $amazonSqsFifoStamp = $envelope->last(AmazonSqsFifoStamp::class);
diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatOptions.php b/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatOptions.php
index 0550d725a0d6c..231a5df4361d5 100644
--- a/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatOptions.php
+++ b/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatOptions.php
@@ -39,7 +39,7 @@ public static function fromNotification(Notification $notification): self
         }
 
         if ($exception = $notification->getExceptionAsString()) {
-            $text .= "\r\n".'```'.$notification->getExceptionAsString().'```';
+            $text .= "\r\n".'```'.$exception.'```';
         }
 
         $options->text($text);
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
index 2a1237e0e0c30..bd22664a345bb 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -182,7 +182,6 @@ public function getTypesFromConstructor(string $class, string $property): ?array
 
     private function getReflectionParameterFromConstructor(string $property, \ReflectionMethod $reflectionConstructor): ?\ReflectionParameter
     {
-        $reflectionParameter = null;
         foreach ($reflectionConstructor->getParameters() as $reflectionParameter) {
             if ($reflectionParameter->getName() === $property) {
                 return $reflectionParameter;
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index e64cfc8802ec1..d3d8b872c6c7f 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -766,7 +766,6 @@ private function getNestedAttributes(string $class): array
             if (!$serializedPath = $metadata->getSerializedPath()) {
                 continue;
             }
-            $serializedPath = $metadata->getSerializedPath();
             $pathIdentifier = implode(',', $serializedPath->getElements());
             if (isset($serializedPaths[$pathIdentifier])) {
                 throw new LogicException(sprintf('Duplicate serialized path: "%s" used for properties "%s" and "%s".', $pathIdentifier, $serializedPaths[$pathIdentifier], $name));
diff --git a/src/Symfony/Component/Translation/Loader/QtFileLoader.php b/src/Symfony/Component/Translation/Loader/QtFileLoader.php
index d91e0a1f477d6..235f85ee91198 100644
--- a/src/Symfony/Component/Translation/Loader/QtFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/QtFileLoader.php
@@ -64,7 +64,6 @@ public function load(mixed $resource, string $locale, string $domain = 'messages
                         $domain
                     );
                 }
-                $translation = $translation->nextSibling;
             }
 
             if (class_exists(FileResource::class)) {
diff --git a/src/Symfony/Component/VarExporter/LazyGhostTrait.php b/src/Symfony/Component/VarExporter/LazyGhostTrait.php
index 467e4d9105b8f..13e33f59c9bd8 100644
--- a/src/Symfony/Component/VarExporter/LazyGhostTrait.php
+++ b/src/Symfony/Component/VarExporter/LazyGhostTrait.php
@@ -232,7 +232,6 @@ public function __set($name, $value): void
     {
         $propertyScopes = Hydrator::$propertyScopes[$this::class] ??= Hydrator::getPropertyScopes($this::class);
         $scope = null;
-        $state = null;
 
         if ([$class, , $readonlyScope] = $propertyScopes[$name] ?? null) {
             $scope = Re
10000
gistry::getScope($propertyScopes, $class, $name, $readonlyScope);

From f9e76c1e4788b6fbcfe41be0d0cca7eb50b58df2 Mon Sep 17 00:00:00 2001
From: maxbeckers <beckers.maximilian@gmail.com>
Date: Wed, 22 Feb 2023 07:49:27 +0100
Subject: [PATCH 235/475] [Security] Add logout configuration for
 Clear-Site-Data header

---
 .../DependencyInjection/MainConfiguration.php |  9 ++++
 .../DependencyInjection/SecurityExtension.php |  7 +++
 .../Resources/config/schema/security-1.0.xsd  | 15 +++++-
 .../Resources/config/security_listeners.php   |  4 ++
 .../CompleteConfigurationTestCase.php         |  8 +++
 .../Fixtures/php/logout_clear_site_data.php   | 20 ++++++++
 .../Fixtures/xml/logout_clear_site_data.xml   | 22 +++++++++
 .../Fixtures/yml/logout_clear_site_data.yml   | 13 +++++
 .../SecurityExtensionTest.php                 | 42 ++++++++++++++++
 .../ClearSiteDataLogoutListener.php           | 49 +++++++++++++++++++
 .../ClearSiteDataLogoutListenerTest.php       | 48 ++++++++++++++++++
 11 files changed, 235 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/logout_clear_site_data.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/logout_clear_site_data.xml
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/logout_clear_site_data.yml
 create mode 100644 src/Symfony/Component/Security/Http/EventListener/ClearSiteDataLogoutListener.php
 create mode 100644 src/Symfony/Component/Security/Http/Tests/EventListener/ClearSiteDataLogoutListenerTest.php

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index bdb56a9f26bbf..c6ba45edc2e47 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -251,6 +251,15 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                     ->scalarNode('path')->defaultValue('/logout')->end()
                     ->scalarNode('target')->defaultValue('/')->end()
                     ->booleanNode('invalidate_session')->defaultTrue()->end()
+                    ->arrayNode('clear_site_data')
+                        ->performNoDeepMerging()
+                        ->beforeNormalization()->ifString()->then(fn ($v) => $v ? array_map('trim', explode(',', $v)) : [])->end()
+                        ->enumPrototype()
+                            ->values([
+                                '*', 'cache', 'cookies', 'storage', 'executionContexts',
+                            ])
+                        ->end()
+                    ->end()
                 ->end()
                 ->fixXmlConfig('delete_cookie')
                 ->children()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 8fb375255c771..cfb8662fba717 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -480,6 +480,13 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
                     ->addTag('kernel.event_subscriber', ['dispatcher' => $firewallEventDispatcherId]);
             }
 
+            // add clear site data listener
+            if ($firewall['logout']['clear_site_data'] ?? false) {
+                $container->setDefinition('security.logout.listener.clear_site_data.'.$id, new ChildDefinition('security.logout.listener.clear_site_data'))
+                    ->addArgument($firewall['logout']['clear_site_data'])
+                    ->addTag('kernel.event_subscriber', ['dispatcher' => $firewallEventDispatcherId]);
+            }
+
             // register with LogoutUrlGenerator
             $container
                 ->getDefinition('security.logout_url_generator')
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd b/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd
index 33140fdae8d11..f0835052a6848 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd
@@ -171,9 +171,10 @@
     </xsd:complexType>
 
     <xsd:complexType name="logout">
-        <xsd:sequence>
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
             <xsd:element name="delete-cookie" type="delete_cookie" minOccurs="0" maxOccurs="unbounded" />
-        </xsd:sequence>
+            <xsd:element name="clear-site-data" type="clear_site_data" minOccurs="0" maxOccurs="unbounded" />
+        </xsd:choice>
         <xsd:attribute name="csrf-parameter" type="xsd:string" />
         <xsd:attribute name="csrf-token-generator" type="xsd:string" />
         <xsd:attribute name="csrf-token-id" type="xsd:string" />
@@ -407,4 +408,14 @@
         </xsd:simpleContent>
     </xsd:complexType>
 
+    <xsd:simpleType name="clear_site_data">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="*" />
+            <xsd:enumeration value="cache" />
+            <xsd:enumeration value="cookies" />
+            <xsd:enumeration value="storage" />
+            <xsd:enumeration value="executionContexts" />
+        </xsd:restriction>
+    </xsd:simpleType>
+
 </xsd:schema>
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.php
index 921aa90b8d730..952b1d75625ad 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.php
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Security\Http\Authentication\CustomAuthenticationSuccessHandler;
 use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureHandler;
 use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler;
+use Symfony\Component\Security\Http\EventListener\ClearSiteDataLogoutListener;
 use Symfony\Component\Security\Http\EventListener\CookieClearingLogoutListener;
 use Symfony\Component\Security\Http\EventListener\DefaultLogoutListener;
 use Symfony\Component\Security\Http\EventListener\SessionLogoutListener;
@@ -64,6 +65,9 @@
         ->set('security.logout.listener.session', SessionLogoutListener::class)
             ->abstract()
 
+        ->set('security.logout.listener.clear_site_data', ClearSiteDataLogoutListener::class)
+            ->abstract()
+
         ->set('security.logout.listener.cookie_clearing', CookieClearingLogoutListener::class)
             ->abstract()
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTestCase.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTestCase.php
index f89700c871268..44193e4ec0a58 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTestCase.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTestCase.php
@@ -181,6 +181,7 @@ public function testFirewalls()
                     'invalidate_session' => true,
                     'delete_cookies' => [],
                     'enable_csrf' => null,
+                    'clear_site_data' => [],
                 ],
             ],
             [
@@ -708,6 +709,13 @@ public function testFirewallListenerWithProvider()
         $this->addToAssertionCount(1);
     }
 
+    public function testFirewallLogoutClearSiteData()
+    {
+        $container = $this->getContainer('logout_clear_site_data');
+        $ClearSiteDataConfig = $container->getDefinition('security.firewall.map.config.main')->getArgument(12)['clear_site_data'];
+        $this->assertSame(['cookies', 'executionContexts'], $ClearSiteDataConfig);
+    }
+
     protected function getContainer($file)
     {
         $file .= '.'.$this->getFileExtension();
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/logout_clear_site_data.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/logout_clear_site_data.php
new file mode 100644
index 0000000000000..3d02a68bb83df
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/logout_clear_site_data.php
@@ -0,0 +1,20 @@
+<?php
+
+$container->loadFromExtension('security', [
+    'providers' => [
+        'default' => ['id' => 'foo'],
+    ],
+
+    'firewalls' => [
+        'main' => [
+            'provider' => 'default',
+            'form_login' => true,
+            'logout' => [
+                'clear-site-data' => [
+                    'cookies',
+                    'executionContexts',
+                ],
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/logout_clear_site_data.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/logout_clear_site_data.xml
new file mode 100644
index 0000000000000..e0eec6eb46d58
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/logout_clear_site_data.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<srv:container xmlns="http://symfony.com/schema/dic/security"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:srv="http://symfony.com/schema/dic/services"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services
+        https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/security
+        https://symfony.com/schema/dic/security/security-1.0.xsd">
+
+    <config>
+        <provider name="default" id="foo" />
+
+        <firewall name="main" provider="default">
+            <form-login />
+            <logout>
+                <clear-site-data>cookies</clear-site-data>
+                <clear-site-data>executionContexts</clear-site-data>
+            </logout>
+        </firewall>
+    </config>
+</srv:container>
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/logout_clear_site_data.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/logout_clear_site_data.yml
new file mode 100644
index 0000000000000..f5e6b83436d63
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/logout_clear_site_data.yml
@@ -0,0 +1,13 @@
+security:
+    providers:
+        default:
+            id: foo
+
+    firewalls:
+        main:
+            provider: default
+            form_login: true
+            logout:
+                clear_site_data:
+                    - cookies
+                    - executionContexts
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
index cee0647702654..d004b489078a0 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -848,6 +848,48 @@ public function testConfigureCustomFirewallListener()
         $this->assertContains('custom_firewall_listener_id', $firewallListeners);
     }
 
+    public function testClearSiteDataLogoutListenerEnabled()
+    {
+        $container = $this->getRawContainer();
+
+        $firewallId = 'logout_firewall';
+        $container->loadFromExtension('security', [
+            'firewalls' => [
+                $firewallId => [
+                    'logout' => [
+                        'clear_site_data' => ['*'],
+                    ],
+                ],
+            ],
+        ]);
+
+        $container->compile();
+
+        $this->assertTrue($container->has('security.logout.listener.clear_site_data.'.$firewallId));
+        $listenerArgument = $container->getDefinition('security.logout.listener.clear_site_data.'.$firewallId)->getArgument(0);
+        $this->assertSame(['*'], $listenerArgument);
+    }
+
+    public function testClearSiteDataLogoutListenerDisabled()
+    {
+        $container = $this->getRawContainer();
+
+        $firewallId = 'logout_firewall';
+        $container->loadFromExtension('security', [
+            'firewalls' => [
+                $firewallId => [
+                    'logout' => [
+                        'clear_site_data' => [],
+                    ],
+                ],
+            ],
+        ]);
+
+        $container->compile();
+
+        $this->assertFalse($container->has('security.logout.listener.clear_site_data.'.$firewallId));
+    }
+
     /**
      * @group legacy
      */
diff --git a/src/Symfony/Component/Security/Http/EventListener/ClearSiteDataLogoutListener.php b/src/Symfony/Component/Security/Http/EventListener/ClearSiteDataLogoutListener.php
new file mode 100644
index 0000000000000..77ca07a642835
--- /dev/null
+++ b/src/Symfony/Component/Security/Http/EventListener/ClearSiteDataLogoutListener.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\EventListener;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Security\Http\Event\LogoutEvent;
+
+/**
+ * Handler for Clear-Site-Data header during logout.
+ *
+ * @author Max Beckers <beckers.maximilian@gmail.com>
+ *
+ * @final
+ */
+class ClearSiteDataLogoutListener implements EventSubscriberInterface
+{
+    private const HEADER_NAME = 'Clear-Site-Data';
+
+    /**
+     * @param string[] $cookieValue The value for the Clear-Site-Data header.
+     *                              Can be '*' or a subset of 'cache', 'cookies', 'storage', 'executionContexts'.
+     */
+    public function __construct(private readonly array $cookieValue)
+    {
+    }
+
+    public function onLogout(LogoutEvent $event): void
+    {
+        if (!$event->getResponse()?->headers->has(static::HEADER_NAME)) {
+            $event->getResponse()->headers->set(static::HEADER_NAME, implode(', ', array_map(fn ($v) => '"'.$v.'"', $this->cookieValue)));
+        }
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            LogoutEvent::class => 'onLogout',
+        ];
+    }
+}
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/ClearSiteDataLogoutListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/ClearSiteDataLogoutListenerTest.php
new file mode 100644
index 0000000000000..c295502d7691a
--- /dev/null
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/ClearSiteDataLogoutListenerTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Http\Event\LogoutEvent;
+use Symfony\Component\Security\Http\EventListener\ClearSiteDataLogoutListener;
+
+class ClearSiteDataLogoutListenerTest extends TestCase
+{
+    /**
+     * @dataProvider provideClearSiteDataConfig
+     */
+    public function testLogout(array $clearSiteDataConfig, string $expectedHeader)
+    {
+        $response = new Response();
+        $event = new LogoutEvent(new Request(), null);
+        $event->setResponse($response);
+
+        $listener = new ClearSiteDataLogoutListener($clearSiteDataConfig);
+
+        $headerCountBefore = $response->headers->count();
+
+        $listener->onLogout($event);
+
+        $this->assertEquals(++$headerCountBefore, $response->headers->count());
+
+        $this->assertNotNull($response->headers->get('Clear-Site-Data'));
+        $this->assertEquals($expectedHeader, $response->headers->get('Clear-Site-Data'));
+    }
+
+    public static function provideClearSiteDataConfig(): iterable
+    {
+        yield [['*'], '"*"'];
+        yield [['cache', 'cookies', 'storage', 'executionContexts'], '"cache", "cookies", "storage", "executionContexts"'];
+    }
+}

From 467fb3d151e6b45bd51abbe234257dc96a3d4944 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Wed, 22 Feb 2023 10:36:14 +0100
Subject: [PATCH 236/475] Allow disabling dumping of container to XML

In debug mode, when the container is compiled, an XML file is automatically generated. This file
is used by various commands like:
- `debug:container`
- `lint:container`
- `config:dump-reference`
- `debug:autowiring`
- `debug:router`

But generating this file comes with a price. When your container grows, the XML file grows, and the
time to compile this file increases.

In our large application this file became 20MB and took 2 seconds to generate every time the cache
needed to be recompiled. For us, the benefit of this file does not outweigh the decrease in
performance.

Therefore I'd like to disable this dumping and accept the consequences for less debug possibilities.

To disable this, one can set the `debug.container.dump` parameter to `false`.
---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md     |  1 +
 .../Command/BuildDebugContainerTrait.php            |  2 +-
 .../Command/ContainerLintCommand.php                |  2 +-
 .../Console/Descriptor/Descriptor.php               |  2 +-
 .../Compiler/ContainerBuilderDebugDumpPass.php      |  4 ++++
 .../DependencyInjection/FrameworkExtension.php      |  2 +-
 .../Tests/Functional/ContainerDebugCommandTest.php  | 13 +++++++++++++
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 71dab79801fe4..f530786ac6bfa 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG
  * Allow setting private services with the test container
  * Register alias for argument for workflow services with workflow name only
  * Configure the `ErrorHandler` on `FrameworkBundle::boot()`
+ * Allow setting `debug.container.dump` to `false` to disable dumping the container to XML
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/BuildDebugContainerTrait.php b/src/Symfony/Bundle/FrameworkBundle/Command/BuildDebugContainerTrait.php
index 5ac0c8cbc2cb1..0b1038e1cb424 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/BuildDebugContainerTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/BuildDebugContainerTrait.php
@@ -39,7 +39,7 @@ protected function getContainerBuilder(KernelInterface $kernel): ContainerBuilde
             return $this->containerBuilder;
         }
 
-        if (!$kernel->isDebug() || !(new ConfigCache($kernel->getContainer()->getParameter('debug.container.dump'), true))->isFresh()) {
+        if (!$kernel->isDebug() || !$kernel->getContainer()->getParameter('debug.container.dump') || !(new ConfigCache($kernel->getContainer()->getParameter('debug.container.dump'), true))->isFresh()) {
             $buildContainer = \Closure::bind(function () {
                 $this->initializeBundles();
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php
index 5bbaf40ea0271..af08235512e33 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php
@@ -77,7 +77,7 @@ private function getContainerBuilder(): ContainerBuilder
         $kernel = $this->getApplication()->getKernel();
         $kernelContainer = $kernel->getContainer();
 
-        if (!$kernel->isDebug() || !(new ConfigCache($kernelContainer->getParameter('debug.container.dump'), true))->isFresh()) {
+        if (!$kernel->isDebug() || !$kernelContainer->getParameter('debug.container.dump') || !(new ConfigCache($kernelContainer->getParameter('debug.container.dump'), true))->isFresh()) {
             if (!$kernel instanceof Kernel) {
                 throw new RuntimeException(sprintf('This command does not support the application kernel: "%s" does not extend "%s".', get_debug_type($kernel), Kernel::class));
             }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
index 807f8d1bc8c21..eb5aa54ed17ad 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -292,7 +292,7 @@ private function getContainerEnvVars(ContainerBuilder $container): array
             return [];
         }
 
-        if (!is_file($container->getParameter('debug.container.dump'))) {
+        if (!$container->getParameter('debug.container.dump') || !is_file($container->getParameter('debug.container.dump'))) {
             return [];
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
index af20aaa9519c5..1e08ef314941a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
@@ -30,6 +30,10 @@ class ContainerBuilderDebugDumpPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
+        if (!$container->getParameter('debug.container.dump')) {
+            return;
+        }
+
         $cache = new ConfigCache($container->getParameter('debug.container.dump'), true);
         if (!$cache->isFresh()) {
             $cache->write((new XmlDumper($container))->dump(), $container->getResources());
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 6e2e63bfbcc05..c726519d3d18b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1087,7 +1087,7 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
 
         $debug = $container->getParameter('kernel.debug');
 
-        if ($debug) {
+        if ($debug && !$container->hasParameter('debug.container.dump')) {
             $container->setParameter('debug.container.dump', '%kernel.build_dir%/%kernel.container_class%.xml');
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
index e9c71fb4a4616..b3624cc5c9e74 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
@@ -50,6 +50,19 @@ public function testNoDebug()
         $this->assertStringContainsString('public', $tester->getDisplay());
     }
 
+    public function testNoDumpedXML()
+    {
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml', 'debug' => true, 'debug.container.dump' => false]);
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(['command' => 'debug:container']);
+
+        $this->assertStringContainsString('public', $tester->getDisplay());
+    }
+
     public function testPrivateAlias()
     {
         static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);

From 010aa39f3c51f642190f695f0f0e662baa604238 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Tue, 21 Feb 2023 19:25:27 +0100
Subject: [PATCH 237/475] [FrameworkBundle] Add
 `framework.http_cache.skip_response_headers` option

---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md               | 1 +
 .../FrameworkBundle/DependencyInjection/Configuration.php     | 4 ++++
 .../DependencyInjection/FrameworkExtension.php                | 4 ++++
 .../Tests/DependencyInjection/ConfigurationTest.php           | 1 +
 src/Symfony/Component/HttpClient/CachingHttpClient.php        | 1 +
 5 files changed, 11 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index f530786ac6bfa..671253a34f8c2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -15,6 +15,7 @@ CHANGELOG
  * Register alias for argument for workflow services with workflow name only
  * Configure the `ErrorHandler` on `FrameworkBundle::boot()`
  * Allow setting `debug.container.dump` to `false` to disable dumping the container to XML
+ * Add `framework.http_cache.skip_response_headers` option
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 53c1526866923..24b06a79e3f4e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -263,6 +263,10 @@ private function addHttpCacheSection(ArrayNodeDefinition $rootNode): void
                             ->performNoDeepMerging()
                             ->scalarPrototype()->end()
                         ->end()
+                        ->arrayNode('skip_response_headers')
+                            ->performNoDeepMerging()
+                            ->scalarPrototype()->end()
+                        ->end()
                         ->booleanNode('allow_reload')->end()
                         ->booleanNode('allow_revalidate')->end()
                         ->integerNode('stale_while_revalidate')->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index c726519d3d18b..529e2d7efcce5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -762,6 +762,10 @@ private function registerHttpCacheConfiguration(array $config, ContainerBuilder
             unset($options['private_headers']);
         }
 
+        if (!$options['skip_response_headers']) {
+            unset($options['skip_response_headers']);
+        }
+
         $container->getDefinition('http_cache')
             ->setPublic($config['enabled'])
             ->replaceArgument(3, $options);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index 7aa944dcdeb12..6be5ac85a10c6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -671,6 +671,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
                 'enabled' => false,
                 'debug' => '%kernel.debug%',
                 'private_headers' => [],
+                'skip_response_headers' => [],
             ],
             'rate_limiter' => [
                 'enabled' => !class_exists(FullStack::class) && class_exists(TokenBucketLimiter::class),
diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php
index 05a8e6b4c6ebc..0b6e49580615e 100644
--- a/src/Symfony/Component/HttpClient/CachingHttpClient.php
+++ b/src/Symfony/Component/HttpClient/CachingHttpClient.php
@@ -52,6 +52,7 @@ public function __construct(HttpClientInterface $client, StoreInterface $store,
         unset($defaultOptions['debug']);
         unset($defaultOptions['default_ttl']);
         unset($defaultOptions['private_headers']);
+        unset($defaultOptions['skip_response_headers']);
         unset($defaultOptions['allow_reload']);
         unset($defaultOptions['allow_revalidate']);
         unset($defaultOptions['stale_while_revalidate']);

From 107a6a31f839e4d68c5344987c4f9bea8875244f Mon Sep 17 00:00:00 2001
From: Kevin Auvinet <kevin.auvinet@yousign.com>
Date: Fri, 17 Feb 2023 08:51:53 +0100
Subject: [PATCH 238/475] [Validator] Add the option filenameMaxLength to the
 File constraint

---
 src/Symfony/Component/Validator/CHANGELOG.md  |  1 +
 .../Component/Validator/Constraints/File.php  |  8 +++
 .../Validator/Constraints/FileValidator.php   | 10 ++++
 .../Component/Validator/Constraints/Image.php |  4 ++
 .../Constraints/FileValidatorTestCase.php     | 49 +++++++++++++++++--
 5 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
index ec3eacc6bbd68..d3cf3dd76dd4c 100644
--- a/src/Symfony/Component/Validator/CHANGELOG.md
+++ b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * Add the `pattern` parameter in violations of the `Regex` constraint
  * Add a `NoSuspiciousCharacters` constraint to validate a string is not a spoofing attempt
  * Add the `countUnit` option to the `Length` constraint to allow counting the string length either by code points (like before, now the default setting `Length::COUNT_CODEPOINTS`), bytes (`Length::COUNT_BYTES`) or graphemes (`Length::COUNT_GRAPHEMES`)
+ * Add the `filenameMaxLength` option to the `File` constraint
 
 6.2
 ---
diff --git a/src/Symfony/Component/Validator/Constraints/File.php b/src/Symfony/Component/Validator/Constraints/File.php
index 2adc56ee0e661..ed145ff381f69 100644
--- a/src/Symfony/Component/Validator/Constraints/File.php
+++ b/src/Symfony/Component/Validator/Constraints/File.php
@@ -33,6 +33,7 @@ class File extends Constraint
     public const TOO_LARGE_ERROR = 'df8637af-d466-48c6-a59d-e7126250a654';
     public const INVALID_MIME_TYPE_ERROR = '744f00bc-4389-4c74-92de-9a43cde55534';
     public const INVALID_EXTENSION_ERROR = 'c8c7315c-6186-4719-8b71-5659e16bdcb7';
+    public const FILENAME_TOO_LONG = 'e5706483-91a8-49d8-9a59-5e81a3c634a8';
 
     protected const ERROR_NAMES = [
         self::NOT_FOUND_ERROR => 'NOT_FOUND_ERROR',
@@ -40,6 +41,7 @@ class File extends Constraint
         self::EMPTY_ERROR => 'EMPTY_ERROR',
         self::TOO_LARGE_ERROR => 'TOO_LARGE_ERROR',
         self::INVALID_MIME_TYPE_ERROR => 'INVALID_MIME_TYPE_ERROR',
+        self::FILENAME_TOO_LONG => 'FILENAME_TOO_LONG',
     ];
 
     /**
@@ -49,6 +51,7 @@ class File extends Constraint
 
     public $binaryFormat;
     public $mimeTypes = [];
+    public ?int $filenameMaxLength = null;
     public array|string|null $extensions = [];
     public $notFoundMessage = 'The file could not be found.';
     public $notReadableMessage = 'The file is not readable.';
@@ -56,6 +59,7 @@ class File extends Constraint
     public $mimeTypesMessage = 'The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.';
     public string $extensionsMessage = 'The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.';
     public $disallowEmptyMessage = 'An empty file is not allowed.';
+    public $filenameTooLongMessage = 'The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less.';
 
     public $uploadIniSizeErrorMessage = 'The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.';
     public $uploadFormSizeErrorMessage = 'The file is too large.';
@@ -76,11 +80,13 @@ public function __construct(
         int|string $maxSize = null,
         bool $binaryFormat = null,
         array|string $mimeTypes = null,
+        int $filenameMaxLength = null,
         string $notFoundMessage = null,
         string $notReadableMessage = null,
         string $maxSizeMessage = null,
         string $mimeTypesMessage = null,
         string $disallowEmptyMessage = null,
+        string $filenameTooLongMessage = null,
 
         string $uploadIniSizeErrorMessage = null,
         string $uploadFormSizeErrorMessage = null,
@@ -101,6 +107,7 @@ public function __construct(
         $this->maxSize = $maxSize ?? $this->maxSize;
         $this->binaryFormat = $binaryFormat ?? $this->binaryFormat;
         $this->mimeTypes = $mimeTypes ?? $this->mimeTypes;
+        $this->filenameMaxLength = $filenameMaxLength ?? $this->filenameMaxLength;
         $this->extensions = $extensions ?? $this->extensions;
         $this->notFoundMessage = $notFoundMessage ?? $this->notFoundMessage;
         $this->notReadableMessage = $notReadableMessage ?? $this->notReadableMessage;
@@ -108,6 +115,7 @@ public function __construct(
         $this->mimeTypesMessage = $mimeTypesMessage ?? $this->mimeTypesMessage;
         $this->extensionsMessage = $extensionsMessage ?? $this->extensionsMessage;
         $this->disallowEmptyMessage = $disallowEmptyMessage ?? $this->disallowEmptyMessage;
+        $this->filenameTooLongMessage = $filenameTooLongMessage ?? $this->filenameTooLongMessage;
         $this->uploadIniSizeErrorMessage = $uploadIniSizeErrorMessage ?? $this->uploadIniSizeErrorMessage;
         $this->uploadFormSizeErrorMessage = $uploadFormSizeErrorMessage ?? $this->uploadFormSizeErrorMessage;
         $this->uploadPartialErrorMessage = $uploadPartialErrorMessage ?? $this->uploadPartialErrorMessage;
diff --git a/src/Symfony/Component/Validator/Constraints/FileValidator.php b/src/Symfony/Component/Validator/Constraints/FileValidator.php
index a632a54f4805e..6346ad098fbe9 100644
--- a/src/Symfony/Component/Validator/Constraints/FileValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/FileValidator.php
@@ -143,6 +143,16 @@ public function validate(mixed $value, Constraint $constraint)
         $sizeInBytes = filesize($path);
         $basename = $value instanceof UploadedFile ? $value->getClientOriginalName() : basename($path);
 
+        if ($constraint->filenameMaxLength && $constraint->filenameMaxLength < $filenameLength = \strlen($basename)) {
+            $this->context->buildViolation($constraint->filenameTooLongMessage)
+                ->setParameter('{{ filename_max_length }}', $this->formatValue($constraint->filenameMaxLength))
+                ->setCode(File::FILENAME_TOO_LONG)
+                ->setPlural($constraint->filenameMaxLength)
+                ->addViolation();
+
+            return;
+        }
+
         if (0 === $sizeInBytes) {
             $this->context->buildViolation($constraint->disallowEmptyMessage)
                 ->setParameter('{{ file }}', $this->formatValue($path))
diff --git a/src/Symfony/Component/Validator/Constraints/Image.php b/src/Symfony/Component/Validator/Constraints/Image.php
index 0a569c7102481..c61b408367aa3 100644
--- a/src/Symfony/Component/Validator/Constraints/Image.php
+++ b/src/Symfony/Component/Validator/Constraints/Image.php
@@ -98,6 +98,7 @@ public function __construct(
         int|string $maxSize = null,
         bool $binaryFormat = null,
         array $mimeTypes = null,
+        int $filenameMaxLength = null,
         int $minWidth = null,
         int $maxWidth = null,
         int $maxHeight = null,
@@ -115,6 +116,7 @@ public function __construct(
         string $maxSizeMessage = null,
         string $mimeTypesMessage = null,
         string $disallowEmptyMessage = null,
+        string $filenameTooLongMessage = null,
         string $uploadIniSizeErrorMessage = null,
         string $uploadFormSizeErrorMessage = null,
         string $uploadPartialErrorMessage = null,
@@ -144,11 +146,13 @@ public function __construct(
             $maxSize,
             $binaryFormat,
             $mimeTypes,
+            $filenameMaxLength,
             $notFoundMessage,
             $notReadableMessage,
             $maxSizeMessage,
             $mimeTypesMessage,
             $disallowEmptyMessage,
+            $filenameTooLongMessage,
             $uploadIniSizeErrorMessage,
             $uploadFormSizeErrorMessage,
             $uploadPartialErrorMessage,
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php
index 21e47a535f96c..ffc0e9bd5bb9d 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php
@@ -531,7 +531,7 @@ public function testNegativeMaxSize()
     }
 
     /**
-     * @dataProvider validExtensionProvider
+     * @dataProvider providerValidExtension
      */
     public function testExtensionValid(string $name)
     {
@@ -551,7 +551,7 @@ public function testExtensionValid(string $name)
         $this->assertNoViolation();
     }
 
-    private static function validExtensionProvider(): iterable
+    public static function providerValidExtension(): iterable
     {
         yield ['test.gif'];
         yield ['test.png.gif'];
@@ -560,7 +560,7 @@ private static function validExtensionProvider(): iterable
     }
 
     /**
-     * @dataProvider invalidExtensionProvider
+     * @dataProvider provideInvalidExtension
      */
     public function testExtensionInvalid(string $name, string $extension)
     {
@@ -582,7 +582,7 @@ public function testExtensionInvalid(string $name, string $extension)
             ->assertRaised();
     }
 
-    private static function invalidExtensionProvider(): iterable
+    public static function provideInvalidExtension(): iterable
     {
         yield ['test.gif', 'gif'];
         yield ['test.png.gif', 'gif'];
@@ -658,5 +658,46 @@ public function testUploadedFileExtensions()
         $this->assertNoViolation();
     }
 
+    /**
+     * @dataProvider provideFilenameMaxLengthIsTooLong
+     */
+    public function testFilenameMaxLengthIsTooLong(File $constraintFile, string $messageViolation)
+    {
+        file_put_contents($this->path, '1');
+
+        $file = new UploadedFile($this->path, 'myFileWithATooLongOriginalFileName', null, null, true);
+        $this->validator->validate($file, $constraintFile);
+
+        $this->buildViolation($messageViolation)
+            ->setParameters([
+                '{{ filename_max_length }}' => $constraintFile->nameMaxLength,
+            ])
+            ->setCode(File::FILENAME_TOO_LONG)
+            ->assertRaised();
+    }
+
+    public static function provideFilenameMaxLengthIsTooLong(): \Generator
+    {
+        yield 'Simple case with only the parameter "filenameMaxLength" ' => [
+            new File(filenameMaxLength: 30),
+            'The filename is too long. It should have {{ filename_max_length }} characters or less.',
+        ];
+
+        yield 'Case with the parameter "filenameMaxLength" and a custom error message' => [
+            new File(filenameMaxLength: 20, filenameTooLongMessage: 'Your filename is too long. Please use at maximum {{ filename_max_length }} characters'),
+            'Your filename is too long. Please use at maximum {{ filename_max_length }} characters',
+        ];
+    }
+
+    public function testFilenameMaxLength()
+    {
+        file_put_contents($this->path, '1');
+
+        $file = new UploadedFile($this->path, 'tinyOriginalFileName', null, null, true);
+        $this->validator->validate($file, new File(filenameMaxLength: 20));
+
+        $this->assertNoViolation();
+    }
+
     abstract protected function getFile($filename);
 }

From 57915137d2449e91de42dae8e443d58c1f0602dd Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Fri, 27 Jan 2023 22:13:36 +0100
Subject: [PATCH 239/475] [FrameworkBundle][HttpKernel] Display warmers
 duration on debug verbosity for `cache:clear` command

---
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  1 +
 .../Command/CacheClearCommand.php             |  8 +--
 .../CacheWarmer/CacheWarmerAggregate.php      |  9 +++-
 .../CacheWarmer/CacheWarmerAggregateTest.php  | 51 +++++++++++++++++++
 4 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 671253a34f8c2..15f0060b1ca6c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -16,6 +16,7 @@ CHANGELOG
  * Configure the `ErrorHandler` on `FrameworkBundle::boot()`
  * Allow setting `debug.container.dump` to `false` to disable dumping the container to XML
  * Add `framework.http_cache.skip_response_headers` option
+ * Display warmers duration on debug verbosity for `cache:clear` command
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
index aa8c47f57166f..612105dfba59c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -132,7 +132,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $warmer = $kernel->getContainer()->get('cache_warmer');
                 // non optional warmers already ran during container compilation
                 $warmer->enableOnlyOptionalWarmers();
-                $preload = (array) $warmer->warmUp($realCacheDir);
+                $preload = (array) $warmer->warmUp($realCacheDir, $io);
 
                 if ($preload && file_exists($preloadFile = $realCacheDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {
                     Preloader::append($preloadFile, $preload);
@@ -145,7 +145,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 if ($output->isVerbose()) {
                     $io->comment('Warming up cache...');
                 }
-                $this->warmup($warmupDir, $realCacheDir, !$input->getOption('no-optional-warmers'));
+                $this->warmup($io, $warmupDir, $realCacheDir, !$input->getOption('no-optional-warmers'));
             }
 
             if (!$fs->exists($warmupDir.'/'.$containerDir)) {
@@ -219,7 +219,7 @@ private function isNfs(string $dir): bool
         return false;
     }
 
-    private function warmup(string $warmupDir, string $realBuildDir, bool $enableOptionalWarmers = true): void
+    private function warmup(SymfonyStyle $io, string $warmupDir, string $realBuildDir, bool $enableOptionalWarmers = true): void
     {
         // create a temporary kernel
         $kernel = $this->getApplication()->getKernel();
@@ -233,7 +233,7 @@ private function warmup(string $warmupDir, string $realBuildDir, bool $enableOpt
             $warmer = $kernel->getContainer()->get('cache_warmer');
             // non optional warmers already ran during container compilation
             $warmer->enableOnlyOptionalWarmers();
-            $preload = (array) $warmer->warmUp($warmupDir);
+            $preload = (array) $warmer->warmUp($warmupDir, $io);
 
             if ($preload && file_exists($preloadFile = $warmupDir.'/'.$kernel->getContainer()->getParameter('kernel.container_class').'.preload.php')) {
                 Preloader::append($preloadFile, $preload);
diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
index e5dba5b77683a..30132921672ca 100644
--- a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
+++ b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\CacheWarmer;
 
+use Symfony\Component\Console\Style\SymfonyStyle;
+
 /**
  * Aggregates several cache warmers into a single one.
  *
@@ -46,7 +48,7 @@ public function enableOnlyOptionalWarmers(): void
         $this->onlyOptionalsEnabled = $this->optionalsEnabled = true;
     }
 
-    public function warmUp(string $cacheDir): array
+    public function warmUp(string $cacheDir, SymfonyStyle $io = null): array
     {
         if ($collectDeprecations = $this->debug && !\defined('PHPUNIT_COMPOSER_INSTALL')) {
             $collectedLogs = [];
@@ -93,12 +95,17 @@ public function warmUp(string $cacheDir): array
                     continue;
                 }
 
+                $start = microtime(true);
                 foreach ((array) $warmer->warmUp($cacheDir) as $item) {
                     if (is_dir($item) || (str_starts_with($item, \dirname($cacheDir)) && !is_file($item))) {
                         throw new \LogicException(sprintf('"%s::warmUp()" should return a list of files or classes but "%s" is none of them.', $warmer::class, $item));
                     }
                     $preload[] = $item;
                 }
+
+                if ($io?->isDebug()) {
+                    $io->info(sprintf('"%s" completed in %0.2fms.', $warmer::class, 1000 * (microtime(true) - $start)));
+                }
             }
         } finally {
             if ($collectDeprecations) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
index 563486db15664..fd1e6105808c8 100644
--- a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\Tests\CacheWarmer;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 
@@ -91,4 +92,54 @@ public function testWarmupChecksInvalidFiles()
         $this->expectException(\LogicException::class);
         $aggregate->warmUp(__DIR__);
     }
+
+    public function testWarmupWhenDebugDisplaysWarmupDuration()
+    {
+        $warmer = $this->createMock(CacheWarmerInterface::class);
+        $io = $this->createMock(SymfonyStyle::class);
+
+        $io
+            ->expects($this->once())
+            ->method('isDebug')
+            ->willReturn(true)
+        ;
+
+        $io
+            ->expects($this->once())
+            ->method('info')
+            ->with($this->matchesRegularExpression('/"(.+)" completed in (.+)ms\./'))
+        ;
+
+        $warmer
+            ->expects($this->once())
+            ->method('warmUp');
+
+        $aggregate = new CacheWarmerAggregate([$warmer]);
+        $aggregate->warmUp(__DIR__, $io);
+    }
+
+    public function testWarmupWhenNotDebugDoesntDisplayWarmupDuration()
+    {
+        $warmer = $this->createMock(CacheWarmerInterface::class);
+        $io = $this->createMock(SymfonyStyle::class);
+
+        $io
+            ->expects($this->once())
+            ->method('isDebug')
+            ->willReturn(false)
+        ;
+
+        $io
+            ->expects($this->never())
+            ->method('info')
+            ->with($this->matchesRegularExpression('/"(.+)" completed in (.+)ms\./'))
+        ;
+
+        $warmer
+            ->expects($this->once())
+            ->method('warmUp');
+
+        $aggregate = new CacheWarmerAggregate([$warmer]);
+        $aggregate->warmUp(__DIR__, $io);
+    }
 }

From 6d5ac9002eebe9c59ef1f161efffccdffc9c39aa Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 22 Feb 2023 20:22:51 +0100
Subject: [PATCH 240/475] Fix merge

---
 .../Validator/Tests/Constraints/FileValidatorTestCase.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php
index ffc0e9bd5bb9d..84cad2394640d 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php
@@ -670,7 +670,7 @@ public function testFilenameMaxLengthIsTooLong(File $constraintFile, string $mes
 
         $this->buildViolation($messageViolation)
             ->setParameters([
-                '{{ filename_max_length }}' => $constraintFile->nameMaxLength,
+                '{{ filename_max_length }}' => $constraintFile->filenameMaxLength,
             ])
             ->setCode(File::FILENAME_TOO_LONG)
             ->assertRaised();

From 892b08f8d90c5e4e8500efe9fb66be92347664c4 Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Wed, 22 Feb 2023 21:14:08 +0100
Subject: [PATCH 241/475] [String] Remove unused private constant

---
 src/Symfony/Component/String/AbstractUnicodeString.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/AbstractUnicodeString.php
index 8e97a7267e12a..ec1c78b44672f 100644
--- a/src/Symfony/Component/String/AbstractUnicodeString.php
+++ b/src/Symfony/Component/String/AbstractUnicodeString.php
@@ -40,10 +40,6 @@ abstract class AbstractUnicodeString extends AbstractString
     private const FOLD_FROM = ['İ', 'µ', 'ſ', "\xCD\x85", 'ς', 'ϐ', 'ϑ', 'ϕ', 'ϖ', 'ϰ', 'ϱ', 'ϵ', 'ẛ', "\xE1\xBE\xBE", 'ß', 'ʼn', 'ǰ', 'ΐ', 'ΰ', 'և', 'ẖ', 'ẗ', 'ẘ', 'ẙ', 'ẚ', 'ẞ', 'ὐ', 'ὒ', 'ὔ', 'ὖ', 'ᾀ', 'ᾁ', 'ᾂ', 'ᾃ', 'ᾄ', 'ᾅ', 'ᾆ', 'ᾇ', 'ᾈ', 'ᾉ', 'ᾊ', 'ᾋ', 'ᾌ', 'ᾍ', 'ᾎ', 'ᾏ', 'ᾐ', 'ᾑ', 'ᾒ', 'ᾓ', 'ᾔ', 'ᾕ', 'ᾖ', 'ᾗ', 'ᾘ', 'ᾙ', 'ᾚ', 'ᾛ', 'ᾜ', 'ᾝ', 'ᾞ', 'ᾟ', 'ᾠ', 'ᾡ', 'ᾢ', 'ᾣ', 'ᾤ', 'ᾥ', 'ᾦ', 'ᾧ', 'ᾨ', 'ᾩ', 'ᾪ', 'ᾫ', 'ᾬ', 'ᾭ', 'ᾮ', 'ᾯ', 'ᾲ', 'ᾳ', 'ᾴ', 'ᾶ', 'ᾷ', 'ᾼ', 'ῂ', 'ῃ', 'ῄ', 'ῆ', 'ῇ', 'ῌ', 'ῒ', 'ῖ', 'ῗ', 'ῢ', 'ῤ', 'ῦ', 'ῧ', 'ῲ', 'ῳ', 'ῴ', 'ῶ', 'ῷ', 'ῼ', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'ſt', 'st', 'ﬓ', 'ﬔ', 'ﬕ', 'ﬖ', 'ﬗ'];
     private const FOLD_TO = ['i̇', 'μ', 's', 'ι', 'σ', 'β', 'θ', 'φ', 'π', 'κ', 'ρ', 'ε', 'ṡ', 'ι', 'ss', 'ʼn', 'ǰ', 'ΐ', 'ΰ', 'եւ', 'ẖ', 'ẗ', 'ẘ', 'ẙ', 'aʾ', 'ss', 'ὐ', 'ὒ', 'ὔ', 'ὖ', 'ἀι', 'ἁι', 'ἂι', 'ἃι', 'ἄι', 'ἅι', 'ἆι', 'ἇι', 'ἀι', 'ἁι', 'ἂι', 'ἃι', 'ἄι', 'ἅι', 'ἆι', 'ἇι', 'ἠι', 'ἡι', 'ἢι', 'ἣι', 'ἤι', 'ἥι', 'ἦι', 'ἧι', 'ἠι', 'ἡι', 'ἢι', 'ἣι', 'ἤι', 'ἥι', 'ἦι', 'ἧι', 'ὠι', 'ὡι', 'ὢι', 'ὣι', 'ὤι', 'ὥι', 'ὦι', 'ὧι', 'ὠι', 'ὡι', 'ὢι', 'ὣι', 'ὤι', 'ὥι', 'ὦι', 'ὧι', 'ὰι', 'αι', 'άι', 'ᾶ', 'ᾶι', 'αι', 'ὴι', 'ηι', 'ήι', 'ῆ', 'ῆι', 'ηι', 'ῒ', 'ῖ', 'ῗ', 'ῢ', 'ῤ', 'ῦ', 'ῧ', 'ὼι', 'ωι', 'ώι', 'ῶ', 'ῶι', 'ωι', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'st', 'st', 'մն', 'մե', 'մի', 'վն', 'մխ'];
 
-    // the subset of upper case mappings that map one code point to many code points
-    private const UPPER_FROM = ['ß', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'ſt', 'st', 'և', 'ﬓ', 'ﬔ', 'ﬕ', 'ﬖ', 'ﬗ', 'ʼn', 'ΐ', 'ΰ', 'ǰ', 'ẖ', 'ẗ', 'ẘ', 'ẙ', 'ẚ', 'ὐ', 'ὒ', 'ὔ', 'ὖ', 'ᾶ', 'ῆ', 'ῒ', 'ΐ', 'ῖ', 'ῗ', 'ῢ', 'ΰ', 'ῤ', 'ῦ', 'ῧ', 'ῶ'];
-    private const UPPER_TO = ['SS', 'FF', 'FI', 'FL', 'FFI', 'FFL', 'ST', 'ST', 'ԵՒ', 'ՄՆ', 'ՄԵ', 'ՄԻ', 'ՎՆ', 'ՄԽ', 'ʼN', 'Ϊ́', 'Ϋ́', 'J̌', 'H̱', 'T̈', 'W̊', 'Y̊', 'Aʾ', 'Υ̓', 'Υ̓̀', 'Υ̓́', 'Υ̓͂', 'Α͂', 'Η͂', 'Ϊ̀', 'Ϊ́', 'Ι͂', 'Ϊ͂', 'Ϋ̀', 'Ϋ́', 'Ρ̓', 'Υ͂', 'Ϋ͂', 'Ω͂'];
-
     // the subset of https://github.com/unicode-org/cldr/blob/master/common/transforms/Latin-ASCII.xml that is not in NFKD
     private const TRANSLIT_FROM = ['Æ', 'Ð', 'Ø', 'Þ', 'ß', 'æ', 'ð', 'ø', 'þ', 'Đ', 'đ', 'Ħ', 'ħ', 'ı', 'ĸ', 'Ŀ', 'ŀ', 'Ł', 'ł', 'ʼn', 'Ŋ', 'ŋ', 'Œ', 'œ', 'Ŧ', 'ŧ', 'ƀ', 'Ɓ', 'Ƃ', 'ƃ', 'Ƈ', 'ƈ', 'Ɖ', 'Ɗ', 'Ƌ', 'ƌ', 'Ɛ', 'Ƒ', 'ƒ', 'Ɠ', 'ƕ', 'Ɩ', 'Ɨ', 'Ƙ', 'ƙ', 'ƚ', 'Ɲ', 'ƞ', 'Ƣ', 'ƣ', 'Ƥ', 'ƥ', 'ƫ', 'Ƭ', 'ƭ', 'Ʈ', 'Ʋ', 'Ƴ', 'ƴ', 'Ƶ', 'ƶ', 'DŽ', 'Dž', 'dž', 'Ǥ', 'ǥ', 'ȡ', 'Ȥ', 'ȥ', 'ȴ', 'ȵ', 'ȶ', 'ȷ', 'ȸ', 'ȹ', 'Ⱥ', 'Ȼ', 'ȼ', 'Ƚ', 'Ⱦ', 'ȿ', 'ɀ', 'Ƀ', 'Ʉ', 'Ɇ', 'ɇ', 'Ɉ', 'ɉ', 'Ɍ', 'ɍ', 'Ɏ', 'ɏ', 'ɓ', 'ɕ', 'ɖ', 'ɗ', 'ɛ', 'ɟ', 'ɠ', 'ɡ', 'ɢ', 'ɦ', 'ɧ', 'ɨ', 'ɪ', 'ɫ', 'ɬ', 'ɭ', 'ɱ', 'ɲ', 'ɳ', 'ɴ', 'ɶ', 'ɼ', 'ɽ', 'ɾ', 'ʀ', 'ʂ', 'ʈ', 'ʉ', 'ʋ', 'ʏ', 'ʐ', 'ʑ', 'ʙ', 'ʛ', 'ʜ', 'ʝ', 'ʟ', 'ʠ', 'ʣ', 'ʥ', 'ʦ', 'ʪ', 'ʫ', 'ᴀ', 'ᴁ', 'ᴃ', 'ᴄ', 'ᴅ', 'ᴆ', 'ᴇ', 'ᴊ', 'ᴋ', 'ᴌ', 'ᴍ', 'ᴏ', 'ᴘ', 'ᴛ', 'ᴜ', 'ᴠ', 'ᴡ', 'ᴢ', 'ᵫ', 'ᵬ', 'ᵭ', 'ᵮ', 'ᵯ', 'ᵰ', 'ᵱ', 'ᵲ', 'ᵳ', 'ᵴ', 'ᵵ', 'ᵶ', 'ᵺ', 'ᵻ', 'ᵽ', 'ᵾ', 'ᶀ', 'ᶁ', 'ᶂ', 'ᶃ', 'ᶄ', 'ᶅ', 'ᶆ', 'ᶇ', 'ᶈ', 'ᶉ', 'ᶊ', 'ᶌ', 'ᶍ', 'ᶎ', 'ᶏ', 'ᶑ', 'ᶒ', 'ᶓ', 'ᶖ', 'ᶙ', 'ẚ', 'ẜ', 'ẝ', 'ẞ', 'Ỻ', 'ỻ', 'Ỽ', 'ỽ', 'Ỿ', 'ỿ', '©', '®', '₠', '₢', '₣', '₤', '₧', '₺', '₹', 'ℌ', '℞', '㎧', '㎮', '㏆', '㏗', '㏞', '㏟', '¼', '½', '¾', '⅓', '⅔', '⅕', '⅖', '⅗', '⅘', '⅙', '⅚', '⅛', '⅜', '⅝', '⅞', '⅟', '〇', '‘', '’', '‚', '‛', '“', '”', '„', '‟', '′', '″', '〝', '〞', '«', '»', '‹', '›', '‐', '‑', '‒', '–', '—', '―', '︱', '︲', '﹘', '‖', '⁄', '⁅', '⁆', '⁎', '、', '。', '〈', '〉', '《', '》', '〔', '〕', '〘', '〙', '〚', '〛', '︑', '︒', '︹', '︺', '︽', '︾', '︿', '﹀', '﹑', '﹝', '﹞', '｟', '｠', '｡', '､', '×', '÷', '−', '∕', '∖', '∣', '∥', '≪', '≫', '⦅', '⦆'];
     private const TRANSLIT_TO = ['AE', 'D', 'O', 'TH', 'ss', 'ae', 'd', 'o', 'th', 'D', 'd', 'H', 'h', 'i', 'q', 'L', 'l', 'L', 'l', '\'n', 'N', 'n', 'OE', 'oe', 'T', 't', 'b', 'B', 'B', 'b', 'C', 'c', 'D', 'D', 'D', 'd', 'E', 'F', 'f', 'G', 'hv', 'I', 'I', 'K', 'k', 'l', 'N', 'n', 'OI', 'oi', 'P', 'p', 't', 'T', 't', 'T', 'V', 'Y', 'y', 'Z', 'z', 'DZ', 'Dz', 'dz', 'G', 'g', 'd', 'Z', 'z', 'l', 'n', 't', 'j', 'db', 'qp', 'A', 'C', 'c', 'L', 'T', 's', 'z', 'B', 'U', 'E', 'e', 'J', 'j', 'R', 'r', 'Y', 'y', 'b', 'c', 'd', 'd', 'e', 'j', 'g', 'g', 'G', 'h', 'h', 'i', 'I', 'l', 'l', 'l', 'm', 'n', 'n', 'N', 'OE', 'r', 'r', 'r', 'R', 's', 't', 'u', 'v', 'Y', 'z', 'z', 'B', 'G', 'H', 'j', 'L', 'q', 'dz', 'dz', 'ts', 'ls', 'lz', 'A', 'AE', 'B', 'C', 'D', 'D', 'E', 'J', 'K', 'L', 'M', 'O', 'P', 'T', 'U', 'V', 'W', 'Z', 'ue', 'b', 'd', 'f', 'm', 'n', 'p', 'r', 'r', 's', 't', 'z', 'th', 'I', 'p', 'U', 'b', 'd', 'f', 'g', 'k', 'l', 'm', 'n', 'p', 'r', 's', 'v', 'x', 'z', 'a', 'd', 'e', 'e', 'i', 'u', 'a', 's', 's', 'SS', 'LL', 'll', 'V', 'v', 'Y', 'y', '(C)', '(R)', 'CE', 'Cr', 'Fr.', 'L.', 'Pts', 'TL', 'Rs', 'x', 'Rx', 'm/s', 'rad/s', 'C/kg', 'pH', 'V/m', 'A/m', ' 1/4', ' 1/2', ' 3/4', ' 1/3', ' 2/3', ' 1/5', ' 2/5', ' 3/5', ' 4/5', ' 1/6', ' 5/6', ' 1/8', ' 3/8', ' 5/8', ' 7/8', ' 1/', '0', '\'', '\'', ',', '\'', '"', '"', ',,', '"', '\'', '"', '"', '"', '<<', '>>', '<', '>', '-', '-', '-', '-', '-', '-', '-', '-', '-', '||', '/', '[', ']', '*', ',', '.', '<', '>', '<<', '>>', '[', ']', '[', ']', '[', ']', ',', '.', '[', ']', '<<', '>>', '<', '>', ',', '[', ']', '((', '))', '.', ',', '*', '/', '-', '/', '\\', '|', '||', '<<', '>>', '((', '))'];

From cd64c67b4c0dbc63316dd21e3aa3ea5583b0efd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Tue, 21 Feb 2023 19:54:43 +0100
Subject: [PATCH 242/475] [DependencyInjection] Add support for Exclude
 attribute

---
 .../DependencyInjection/Attribute/Exclude.php | 22 +++++++++++++++++
 .../DependencyInjection/CHANGELOG.md          |  1 +
 .../DependencyInjection/Loader/FileLoader.php | 24 ++++++++++++-------
 .../Tests/Fixtures/Utils/NotAService.php      | 10 ++++++++
 .../Tests/Loader/FileLoaderTest.php           | 19 +++++++++++++++
 5 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Attribute/Exclude.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/Utils/NotAService.php

diff --git a/src/Symfony/Component/DependencyInjection/Attribute/Exclude.php b/src/Symfony/Component/DependencyInjection/Attribute/Exclude.php
new file mode 100644
index 0000000000000..43efdcf1a7875
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Attribute/Exclude.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Attribute;
+
+/**
+ * An attribute to tell the class should not be registered as service.
+ *
+ * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ */
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class Exclude
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 7a6ef6b65836f..1d2caa272249c 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG
  * Add `#[AsAlias]` attribute to tell under which alias a service should be registered or to use the implemented interface if no parameter is given
  * Allow to trim XML service parameters value by using `trim="true"` attribute
  * Allow extending the `Autowire` attribute
+ * Add `#[Exclude]` to skip autoregistering a class
 
 6.2
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
index 056b1658b5657..62ac252dd7ba4 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -19,6 +19,7 @@
 use Symfony\Component\Config\Resource\GlobResource;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Attribute\AsAlias;
+use Symfony\Component\DependencyInjection\Attribute\Exclude;
 use Symfony\Component\DependencyInjection\Attribute\When;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\RegisterAutoconfigureAttributesPass;
@@ -122,18 +123,23 @@ public function registerClasses(Definition $prototype, string $namespace, string
         $serializedPrototype = serialize($prototype);
 
         foreach ($classes as $class => $errorMessage) {
-            if (null === $errorMessage && $autoconfigureAttributes && $this->env) {
+            if (null === $errorMessage && $autoconfigureAttributes) {
                 $r = $this->container->getReflectionClass($class);
-                $attribute = null;
-                foreach ($r->getAttributes(When::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
-                    if ($this->env === $attribute->newInstance()->env) {
-                        $attribute = null;
-                        break;
-                    }
-                }
-                if (null !== $attribute) {
+                if ($r->getAttributes(Exclude::class)[0] ?? null) {
                     continue;
                 }
+                if ($this->env) {
+                    $attribute = null;
+                    foreach ($r->getAttributes(When::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
+                        if ($this->env === $attribute->newInstance()->env) {
+                            $attribute = null;
+                            break;
+                        }
+                    }
+                    if (null !== $attribute) {
+                        continue;
+                    }
+                }
             }
 
             if (interface_exists($class, false)) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Utils/NotAService.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Utils/NotAService.php
new file mode 100644
index 0000000000000..ef3e2dc734997
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Utils/NotAService.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Utils;
+
+use Symfony\Component\DependencyInjection\Attribute\Exclude;
+
+#[Exclude]
+class NotAService
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
index 96278fb758076..9e8db2a998e44 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -40,6 +40,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\WithAsAliasIdMultipleInterface;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\WithAsAliasInterface;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\PrototypeAsAlias\WithAsAliasMultiple;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Utils\NotAService;
 
 class FileLoaderTest extends TestCase
 {
@@ -145,6 +146,24 @@ public function testRegisterClassesWithExclude()
         );
     }
 
+    /**
+     * @testWith [true]
+     *           [false]
+     */
+    public function testRegisterClassesWithExcludeAttribute(bool $autoconfigure)
+    {
+        $container = new ContainerBuilder();
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
+
+        $loader->registerClasses(
+            (new Definition())->setAutoconfigured($autoconfigure),
+            'Symfony\Component\DependencyInjection\Tests\Fixtures\Utils\\',
+            'Utils/*',
+        );
+
+        $this->assertSame(!$autoconfigure, $container->hasDefinition(NotAService::class));
+    }
+
     public function testRegisterClassesWithExcludeAsArray()
     {
         $container = new ContainerBuilder();

From 4c0c38396747003d81844da2d27c538d8ea7cae1 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 23 Feb 2023 10:33:31 +0100
Subject: [PATCH 243/475] Fix tests

---
 .../Validator/Tests/Constraints/FileValidatorTestCase.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php
index 84cad2394640d..981d91dbcc5ee 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php
@@ -673,6 +673,7 @@ public function testFilenameMaxLengthIsTooLong(File $constraintFile, string $mes
                 '{{ filename_max_length }}' => $constraintFile->filenameMaxLength,
             ])
             ->setCode(File::FILENAME_TOO_LONG)
+            ->setPlural($constraintFile->filenameMaxLength)
             ->assertRaised();
     }
 
@@ -680,7 +681,7 @@ public static function provideFilenameMaxLengthIsTooLong(): \Generator
     {
         yield 'Simple case with only the parameter "filenameMaxLength" ' => [
             new File(filenameMaxLength: 30),
-            'The filename is too long. It should have {{ filename_max_length }} characters or less.',
+            'The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less.',
         ];
 
         yield 'Case with the parameter "filenameMaxLength" and a custom error message' => [

From fdc22ef92aa7794d70e743787adef516114e1b1e Mon Sep 17 00:00:00 2001
From: Ramunas Pabreza <doobas@gmail.com>
Date: Tue, 21 Feb 2023 10:47:53 +0200
Subject: [PATCH 244/475] [Mailer] Add MailerSend bridge

---
 .../FrameworkExtension.php                    |   2 +
 .../Resources/config/mailer_transports.php    |   5 +
 .../Mailer/Bridge/MailerSend/.gitattributes   |   4 +
 .../Mailer/Bridge/MailerSend/.gitignore       |   2 +
 .../Mailer/Bridge/MailerSend/CHANGELOG.md     |   7 +
 .../Mailer/Bridge/MailerSend/LIC
10000
ENSE          |  19 ++
 .../Mailer/Bridge/MailerSend/README.md        |  21 ++
 .../Transport/MailerSendApiTransportTest.php  | 198 ++++++++++++++++++
 .../MailerSendTransportFactoryTest.php        |  92 ++++++++
 .../Transport/MailerSendApiTransport.php      | 169 +++++++++++++++
 .../Transport/MailerSendSmtpTransport.php     |  30 +++
 .../Transport/MailerSendTransportFactory.php  |  41 ++++
 .../Mailer/Bridge/MailerSend/composer.json    |  36 ++++
 .../Mailer/Bridge/MailerSend/phpunit.xml.dist |  31 +++
 .../Exception/UnsupportedSchemeException.php  |   4 +
 .../UnsupportedSchemeExceptionTest.php        |   3 +
 src/Symfony/Component/Mailer/Transport.php    |   2 +
 17 files changed, 666 insertions(+)
 create mode 100644 src/Symfony/Component/Mailer/Bridge/MailerSend/.gitattributes
 create mode 100644 src/Symfony/Component/Mailer/Bridge/MailerSend/.gitignore
 create mode 100644 src/Symfony/Component/Mailer/Bridge/MailerSend/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Mailer/Bridge/MailerSend/LICENSE
 create mode 100644 src/Symfony/Component/Mailer/Bridge/MailerSend/README.md
 create mode 100644 src/Symfony/Component/Mailer/Bridge/MailerSend/Tests/Transport/MailerSendApiTransportTest.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/MailerSend/Tests/Transport/MailerSendTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendApiTransport.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendSmtpTransport.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendTransportFactory.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/MailerSend/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 529e2d7efcce5..842eb8eab4425 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -98,6 +98,7 @@
 use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
 use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipTransportFactory as InfobipMailerTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
+use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
 use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceTransportFactory;
@@ -2458,6 +2459,7 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
         $classToServices = [
             GmailTransportFactory::class => 'mailer.transport_factory.gmail',
             InfobipMailerTransportFactory::class => 'mailer.transport_factory.infobip',
+            MailerSendTransportFactory::class => 'mailer.transport_factory.mailersend',
             MailgunTransportFactory::class => 'mailer.transport_factory.mailgun',
             MailjetTransportFactory::class => 'mailer.transport_factory.mailjet',
             MailPaceTransportFactory::class => 'mailer.transport_factory.mailpace',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.php
index e20594093c9dd..d352eb5bee856 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
 use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
+use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
 use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceTransportFactory;
@@ -51,6 +52,10 @@
             ->parent('mailer.transport_factory.abstract')
             ->tag('mailer.transport_factory')
 
+        ->set('mailer.transport_factory.mailersend', MailerSendTransportFactory::class)
+            ->parent('mailer.transport_factory.abstract')
+            ->tag('mailer.transport_factory')
+
         ->set('mailer.transport_factory.mailchimp', MandrillTransportFactory::class)
             ->parent('mailer.transport_factory.abstract')
             ->tag('mailer.transport_factory')
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/.gitattributes b/src/Symfony/Component/Mailer/Bridge/MailerSend/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/.gitignore b/src/Symfony/Component/Mailer/Bridge/MailerSend/.gitignore
new file mode 100644
index 0000000000000..d1502b087b4d4
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/.gitignore
@@ -0,0 +1,2 @@
+vendor/
+composer.lock
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/MailerSend/CHANGELOG.md
new file mode 100644
index 0000000000000..1f2c8f86cde72
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+ * Add the bridge
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/LICENSE b/src/Symfony/Component/Mailer/Bridge/MailerSend/LICENSE
new file mode 100644
index 0000000000000..3ed9f412ce53d
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2023-present Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/README.md b/src/Symfony/Component/Mailer/Bridge/MailerSend/README.md
new file mode 100644
index 0000000000000..d6d2ca12f1896
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/README.md
@@ -0,0 +1,21 @@
+MailerSend Bridge
+=================
+
+Provides MailerSend integration for Symfony Mailer.
+
+## Configuration example:
+
+```env
+# API
+MAILER_DSN=mailersend+api://$MAILERSEND_API_KEY@default
+# SMTP
+MAILER_DSN=mailersend+smtp://$MAILERSEND_SMTP_USERNAME:$MAILERSEND_SMTP_PASSWORD@default
+```
+
+Resources
+---------
+
+* [Contributing](https://symfony.com/doc/current/contributing/index.html)
+* [Report issues](https://github.com/symfony/symfony/issues) and
+  [send Pull Requests](https://github.com/symfony/symfony/pulls)
+  in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/Tests/Transport/MailerSendApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/MailerSend/Tests/Transport/MailerSendApiTransportTest.php
new file mode 100644
index 0000000000000..f34b1538f9d6c
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/Tests/Transport/MailerSendApiTransportTest.php
@@ -0,0 +1,198 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Bridge\MailerSend\Tests\Transport;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendApiTransport;
+use Symfony\Component\Mailer\Exception\HttpTransportException;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Email;
+use Symfony\Component\Mime\Part\DataPart;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+class MailerSendApiTransportTest extends TestCase
+{
+    /**
+     * @dataProvider getTransportData
+     */
+    public function testToString(MailerSendApiTransport $transport, string $expected)
+    {
+        $this->assertSame($expected, (string) $transport);
+    }
+
+    public static function getTransportData()
+    {
+        yield [
+            new MailerSendApiTransport('ACCESS_KEY'),
+            'mailersend+api://api.mailersend.com',
+        ];
+
+        yield [
+            (new MailerSendApiTransport('ACCESS_KEY'))->setHost('example.com'),
+            'mailersend+api://example.com',
+        ];
+
+        yield [
+            (new MailerSendApiTransport('ACCESS_KEY'))->setHost('example.com')->setPort(99),
+            'mailersend+api://example.com:99',
+        ];
+    }
+
+    public function testSendBasicEmail()
+    {
+        $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface {
+            $this->assertSame('POST', $method);
+            $this->assertSame('https://api.mailersend.com/v1/email', $url);
+
+            $body = json_decode($options['body'], true);
+            $this->assertSame('test_from@example.com', $body['from']['email']);
+            $this->assertSame('Test from name', $body['from']['name']);
+            $this->assertSame('test_to@example.com', $body['to'][0]['email']);
+            $this->assertSame('Test to name', $body['to'][0]['name']);
+            $this->assertSame('Test subject', $body['subject']);
+            $this->assertSame('Lorem ipsum.', $body['text']);
+            $this->assertSame('<html><body><p>Lorem ipsum.</p></body></html>', $body['html']);
+
+            return new MockResponse('', [
+                'http_code' => 202,
+                'response_headers' => ['x-message-id' => 'test_message_id'],
+            ]);
+        });
+
+        $transport = new MailerSendApiTransport('ACCESS_KEY', $client);
+
+        $mail = new Email();
+        $mail->subject('Test subject')
+            ->to(new Address('test_to@example.com', 'Test to name'))
+            ->from(new Address('test_from@example.com', 'Test from name'))
+            ->addCc('test_cc@example.com')
+            ->addBcc('test_bcc@example.com')
+            ->addReplyTo('test_reply_to@example.com')
+            ->text('Lorem ipsum.')
+            ->html('<html><body><p>Lorem ipsum.</p></body></html>');
+
+        $message = $transport->send($mail);
+
+        $this->assertSame('test_message_id', $message->getMessageId());
+    }
+
+    public function testSendEmailWithAttachment()
+    {
+        $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface {
+            $this->assertSame('POST', $method);
+            $this->assertSame('https://api.mailersend.com/v1/email', $url);
+
+            $body = json_decode($options['body'], true);
+
+            $this->assertSame('content', base64_decode($body['attachments'][0]['content']));
+            $this->assertSame('attachment.txt', $body['attachments'][0]['filename']);
+            $this->assertSame('inline content', base64_decode($body['attachments'][1]['content']));
+            $this->assertSame('inline.txt', $body['attachments'][1]['filename']);
+            $this->assertSame('inline', $body['attachments'][1]['disposition']);
+            $this->assertSame('test_cid@symfony', $body['attachments'][1]['id']);
+
+            return new MockResponse('', [
+                'http_code' => 202,
+                'response_headers' => ['x-message-id' => 'test_message_id'],
+            ]);
+        });
+
+        $transport = new MailerSendApiTransport('ACCESS_KEY', $client);
+
+        $mail = new Email();
+        $mail->subject('Test subject')
+            ->to(new Address('test_to@example.com', 'Test to name'))
+            ->from(new Address('test_from@example.com', 'Test from name'))
+            ->addCc('test_cc@example.com')
+            ->addBcc('test_bcc@example.com')
+            ->addReplyTo('test_reply_to@example.com')
+            ->html('<html><body><p>Lorem ipsum.</p><img src="cid:test_cid@symfony"></body></html>')
+            ->addPart(new DataPart('content', 'attachment.txt', 'text/plain'))
+            ->addPart((new DataPart('inline content', 'inline.txt', 'text/plain'))->asInline()->setContentId('test_cid@symfony'));
+
+        $message = $transport->send($mail);
+
+        $this->assertSame('test_message_id', $message->getMessageId());
+    }
+
+    public function testSendThrowsForErrorResponse()
+    {
+        $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface {
+            return new MockResponse(json_encode(['message' => 'i\'m a teapot']), [
+                'http_code' => 418,
+            ]);
+        });
+
+        $transport = new MailerSendApiTransport('ACCESS_KEY', $client);
+
+        $mail = new Email();
+        $mail->subject('Test subject')
+            ->to(new Address('test_to@example.com', 'Test to name'))
+            ->from(new Address('test_from@example.com', 'Test from name'))
+            ->text('Lorem ipsum.');
+
+        $this->expectException(HttpTransportException::class);
+        $this->expectExceptionMessage('Unable to send an email: i\'m a teapot (code 418).');
+        $transport->send($mail);
+    }
+
+    public function testSendThrowsForAllSuppressed()
+    {
+        $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface {
+            return new MockResponse(json_encode([
+                'message' => 'There are some warnings for your request.',
+                'warnings' => [
+                    [
+                        'type' => 'ALL_SUPPRESSED',
+                    ],
+                ],
+            ], \JSON_THROW_ON_ERROR), [
+                'http_code' => 202,
+            ]);
+        });
+
+        $transport = new MailerSendApiTransport('ACCESS_KEY', $client);
+
+        $mail = new Email();
+        $mail->subject('Test subject')
+            ->to(new Address('test_to@example.com', 'Test to name'))
+            ->from(new Address('test_from@example.com', 'Test from name'))
+            ->text('Lorem ipsum.');
+
+        $this->expectException(HttpTransportException::class);
+        $this->expectExceptionMessage('Unable to send an email: There are some warnings for your request.');
+        $transport->send($mail);
+    }
+
+    public function testSendThrowsForBadResponse()
+    {
+        $client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface {
+            return new MockResponse('test', [
+                'http_code' => 202,
+            ]);
+        });
+
+        $transport = new MailerSendApiTransport('ACCESS_KEY', $client);
+
+        $mail = new Email();
+        $mail->subject('Test subject')
+            ->to(new Address('test_to@example.com', 'Test to name'))
+            ->from(new Address('test_from@example.com', 'Test from name'))
+            ->text('Lorem ipsum.');
+
+        $this->expectException(HttpTransportException::class);
+        $this->expectExceptionMessage('Unable to send an email: "test" (code 202).');
+        $transport->send($mail);
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/Tests/Transport/MailerSendTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/MailerSend/Tests/Transport/MailerSendTransportFactoryTest.php
new file mode 100644
index 0000000000000..604bc42f786a9
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/Tests/Transport/MailerSendTransportFactoryTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Bridge\MailerSend\Tests\Transport;
+
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendApiTransport;
+use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendSmtpTransport;
+use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendTransportFactory;
+use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
+use Symfony\Component\Mailer\Transport\Dsn;
+use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
+
+class MailerSendTransportFactoryTest extends TransportFactoryTestCase
+{
+    public function getFactory(): TransportFactoryInterface
+    {
+        return new MailerSendTransportFactory(null, new MockHttpClient(), new NullLogger());
+    }
+
+    public static function supportsProvider(): iterable
+    {
+        yield [
+            new Dsn('mailersend', 'default'),
+            true,
+        ];
+
+        yield [
+            new Dsn('mailersend+smtp', 'default'),
+            true,
+        ];
+
+        yield [
+            new Dsn('mailersend+smtp', 'example.com'),
+            true,
+        ];
+
+        yield [
+            new Dsn('mailersend+api', 'default'),
+            true,
+        ];
+    }
+
+    public static function createProvider(): iterable
+    {
+        yield [
+            new Dsn('mailersend', 'default', self::USER, self::PASSWORD),
+            new MailerSendSmtpTransport(self::USER, self::PASSWORD, null, new NullLogger()),
+        ];
+
+        yield [
+            new Dsn('mailersend+smtp', 'default', self::USER, self::PASSWORD),
+            new MailerSendSmtpTransport(self::USER, self::PASSWORD, null, new NullLogger()),
+        ];
+
+        yield [
+            new Dsn('mailersend+smtp', 'default', self::USER, self::PASSWORD, 465),
+            new MailerSendSmtpTransport(self::USER, self::PASSWORD, null, new NullLogger()),
+        ];
+
+        yield [
+            new Dsn('mailersend+api', 'default', self::USER),
+            new MailerSendApiTransport(self::USER, new MockHttpClient(), null, new NullLogger()),
+        ];
+    }
+
+    public static function unsupportedSchemeProvider(): iterable
+    {
+        yield [
+            new Dsn('mailersend+foo', 'default', self::USER, self::PASSWORD),
+            'The "mailersend+foo" scheme is not supported; supported schemes for mailer "mailersend" are: "mailersend", "mailersend+smtp", "mailersend+api".',
+        ];
+    }
+
+    public static function incompleteDsnProvider(): iterable
+    {
+        yield [new Dsn('mailersend+smtp', 'default', self::USER)];
+
+        yield [new Dsn('mailersend+smtp', 'default', null, self::PASSWORD)];
+
+        yield [new Dsn('mailersend+api', 'default')];
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendApiTransport.php b/src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendApiTransport.php
new file mode 100644
index 0000000000000..3531d94253f55
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendApiTransport.php
@@ -0,0 +1,169 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Bridge\MailerSend\Transport;
+
+use Psr\EventDispatcher\EventDispatcherInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpClient\Exception\JsonException;
+use Symfony\Component\Mailer\Envelope;
+use Symfony\Component\Mailer\Exception\HttpTransportException;
+use Symfony\Component\Mailer\SentMessage;
+use Symfony\Component\Mailer\Transport\AbstractApiTransport;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Email;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+/**
+ * @see https://developers.mailersend.com/api/v1/email.html
+ */
+final class MailerSendApiTransport extends AbstractApiTransport
+{
+    private string $key;
+
+    public function __construct(#[\SensitiveParameter] string $key, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+    {
+        $this->key = $key;
+
+        parent::__construct($client, $dispatcher, $logger);
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('mailersend+api://%s', $this->getEndpoint());
+    }
+
+    protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $envelope): ResponseInterface
+    {
+        $response = $this->client->request('POST', 'https://'.$this->getEndpoint().'/v1/email', [
+            'json' => $this->getPayload($email, $envelope),
+            'headers' => [
+                'Authorization' => 'Bearer '.$this->key,
+            ],
+        ]);
+
+        try {
+            $statusCode = $response->getStatusCode();
+            $content = $response->getContent(false);
+            $headers = $response->getHeaders(false);
+        } catch (TransportExceptionInterface $e) {
+            throw new HttpTransportException('Could not reach the remote MailerSend server.', $response, 0, $e);
+        }
+
+        try {
+            $result = '' !== $content ? $response->toArray(false) : null;
+        } catch (JsonException $e) {
+            throw new HttpTransportException(sprintf('Unable to send an email: "%s" (code %d).', $content, $statusCode), $response, 0, $e);
+        }
+
+        if (202 !== $statusCode) {
+            throw new HttpTransportException('Unable to send an email: '.($result['message'] ?? '').sprintf(' (code %d).', $statusCode), $response);
+        }
+
+        if (isset($result['warnings'][0]['type']) && 'ALL_SUPPRESSED' === $result['warnings'][0]['type']) {
+            throw new HttpTransportException('Unable to send an email: '.$result['message'] ?? 'All suppressed', $response);
+        }
+
+        if (isset($headers['x-message-id'][0])) {
+            $sentMessage->setMessageId($headers['x-message-id'][0]);
+        }
+
+        return $response;
+    }
+
+    private function getPayload(Email $email, Envelope $envelope): array
+    {
+        $sender = $envelope->getSender();
+
+        $payload = [
+            'from' => array_filter([
+                'email' => $sender->getAddress(),
+                'name' => $sender->getName(),
+            ]),
+            'to' => $this->prepareAddresses($this->getRecipients($email, $envelope)),
+            'subject' => $email->getSubject(),
+        ];
+
+        if ($attachments = $this->prepareAttachments($email)) {
+            $payload['attachments'] = $attachments;
+        }
+
+        if ($replyTo = $email->getReplyTo()) {
+            $payload['reply_to'] = current($this->prepareAddresses($replyTo));
+        }
+
+        if ($cc = $email->getCc()) {
+            $payload['cc'] = $this->prepareAddresses($cc);
+        }
+
+        if ($bcc = $email->getBcc()) {
+            $payload['bcc'] = $this->prepareAddresses($bcc);
+        }
+
+        if ($email->getTextBody()) {
+            $payload['text'] = $email->getTextBody();
+        }
+
+        if ($email->getHtmlBody()) {
+            $payload['html'] = $email->getHtmlBody();
+        }
+
+        return $payload;
+    }
+
+    /**
+     * @param Address[] $addresses
+     */
+    private function prepareAddresses(array $addresses): array
+    {
+        $recipients = [];
+
+        foreach ($addresses as $address) {
+            $recipients[] = [
+                'email' => $address->getAddress(),
+                'name' => $address->getName(),
+            ];
+        }
+
+        return $recipients;
+    }
+
+    private function prepareAttachments(Email $email): array
+    {
+        $attachments = [];
+
+        foreach ($email->getAttachments() as $attachment) {
+            $headers = $attachment->getPreparedHeaders();
+            $filename = $headers->getHeaderParameter('Content-Disposition', 'filename');
+
+            $att = [
+                'content' => $attachment->bodyToString(),
+                'filename' => $filename,
+            ];
+
+            if ('inline' === $headers->getHeaderBody('Content-Disposition')) {
+                $att['disposition'] = 'inline';
+                $att['id'] = $attachment->getContentId();
+            }
+
+            $attachments[] = $att;
+        }
+
+        return $attachments;
+    }
+
+    private function getEndpoint(): string
+    {
+        return ($this->host ?: 'api.mailersend.com').($this->port ? ':'.$this->port : '');
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendSmtpTransport.php
new file mode 100644
index 0000000000000..2d418fdaf6160
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendSmtpTransport.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Bridge\MailerSend\Transport;
+
+use Psr\EventDispatcher\EventDispatcherInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
+
+/**
+ * @author Yann LUCAS
+ */
+final class MailerSendSmtpTransport extends EsmtpTransport
+{
+    public function __construct(string $username, #[\SensitiveParameter] string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+    {
+        parent::__construct('smtp.mailersend.net', 587, true, $dispatcher, $logger);
+
+        $this->setUsername($username);
+        $this->setPassword($password);
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendTransportFactory.php
new file mode 100644
index 0000000000000..002eac5bd37b4
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendTransportFactory.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Bridge\MailerSend\Transport;
+
+use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
+use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
+use Symfony\Component\Mailer\Transport\Dsn;
+use Symfony\Component\Mailer\Transport\TransportInterface;
+
+/**
+ * @author Yann LUCAS
+ */
+final class MailerSendTransportFactory extends AbstractTransportFactory
+{
+    public function create(Dsn $dsn): TransportInterface
+    {
+        return match ($dsn->getScheme()) {
+            'mailersend+api' => (new MailerSendApiTransport($this->getUser($dsn), $this->client, $this->dispatcher, $this->logger))
+                ->setHost('default' === $dsn->getHost() ? null : $dsn->getHost())
+                ->setPort($dsn->getPort()),
+
+            'mailersend', 'mailersend+smtp' => new MailerSendSmtpTransport($this->getUser($dsn), $this->getPassword($dsn), $this->dispatcher, $this->logger),
+
+            default => throw new UnsupportedSchemeException($dsn, 'mailersend', $this->getSupportedSchemes())
+        };
+    }
+
+    protected function getSupportedSchemes(): array
+    {
+        return ['mailersend', 'mailersend+smtp', 'mailersend+api'];
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json b/src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json
new file mode 100644
index 0000000000000..dc22965d21797
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "symfony/mailersend-mailer",
+    "type": "symfony-mailer-bridge",
+    "description": "Symfony MailerSend Mailer Bridge",
+    "keywords": [],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Ramunas Pabreza",
+            "email": "doobas@gmail.com"
+        },
+        {
+            "name": "Tautvydas Tijunaitis",
+            "email": "fosron@gmail.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/mailer": "^5.4|^6.0"
+    },
+    "require-dev": {
+        "symfony/http-client": "^5.4|^6.0"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\MailerSend\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/MailerSend/phpunit.xml.dist
new file mode 100644
index 0000000000000..993980b956171
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony MailerSend Mailer Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory>./</directory>
+        </include>
+        <exclude>
+            <directory>./Resources</directory>
+            <directory>./Tests</directory>
+            <directory>./vendor</directory>
+        </exclude>
+    </coverage>
+</phpunit>
diff --git a/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php
index 1a86a0701d990..a1dc2515756ce 100644
--- a/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php
@@ -28,6 +28,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\Infobip\Transport\InfobipTransportFactory::class,
             'package' => 'symfony/infobip-mailer',
         ],
+        'mailersend' => [
+            'class' => Bridge\MailerSend\Transport\MailerSendTransportFactory::class,
+            'package' => 'symfony/mailersend-mailer',
+        ],
         'mailgun' => [
             'class' => Bridge\Mailgun\Transport\MailgunTransportFactory::class,
             'package' => 'symfony/mailgun-mailer',
diff --git a/src/Symfony/Component/Mailer/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Mailer/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 445f028a85aa7..53c283fb65c62 100644
--- a/src/Symfony/Component/Mailer/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Mailer/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
 use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
+use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
 use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory;
@@ -37,6 +38,7 @@ public static function setUpBeforeClass(): void
         ClassExistsMock::withMockedClasses([
             GmailTransportFactory::class => false,
             InfobipTransportFactory::class => false,
+            MailerSendTransportFactory::class => false,
             MailgunTransportFactory::class => false,
             MailjetTransportFactory::class => false,
             MandrillTransportFactory::class => false,
@@ -65,6 +67,7 @@ public static function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \
     {
         yield ['gmail', 'symfony/google-mailer'];
         yield ['infobip', 'symfony/infobip-mailer'];
+        yield ['mailersend', 'symfony/mailersend-mailer'];
         yield ['mailgun', 'symfony/mailgun-mailer'];
         yield ['mailjet', 'symfony/mailjet-mailer'];
         yield ['mandrill', 'symfony/mailchimp-mailer'];
diff --git a/src/Symfony/Component/Mailer/Transport.php b/src/Symfony/Component/Mailer/Transport.php
index 11286a26b0204..2c6fdd5505e70 100644
--- a/src/Symfony/Component/Mailer/Transport.php
+++ b/src/Symfony/Component/Mailer/Transport.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
 use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
+use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
 use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory;
@@ -46,6 +47,7 @@ final class Transport
     private const FACTORY_CLASSES = [
         GmailTransportFactory::class,
         InfobipTransportFactory::class,
+        MailerSendTransportFactory::class,
         MailgunTransportFactory::class,
         MailjetTransportFactory::class,
         MandrillTransportFactory::class,

From 383ff0bfc5600aed76d41100bc4df942382013b5 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 23 Feb 2023 10:48:00 +0100
Subject: [PATCH 245/475] [Mailer] Fix composer.json

---
 src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json b/src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json
index dc22965d21797..b2d7936e726c2 100644
--- a/src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "symfony/mailersend-mailer",
+    "name": "symfony/mailer-send-mailer",
     "type": "symfony-mailer-bridge",
     "description": "Symfony MailerSend Mailer Bridge",
     "keywords": [],
@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/mailer": "^5.4|^6.0"
+        "symfony/mailer": "^5.4.21|^6.2.7"
     },
     "require-dev": {
         "symfony/http-client": "^5.4|^6.0"

From 44ac38fe248af5a5b7157a2a9cba350c8a52024f Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Thu, 23 Feb 2023 12:42:48 +0100
Subject: [PATCH 246/475] [DependencyInjection] Exclude current id from
 non-existent references alternatives

---
 ...CheckExceptionOnInvalidReferenceBehaviorPass.php |  2 +-
 ...kExceptionOnInvalidReferenceBehaviorPassTest.php | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
index 6e86da0d576d0..8f828d3221efb 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
@@ -90,7 +90,7 @@ private function getAlternatives(string $id): array
     {
         $alternatives = [];
         foreach ($this->container->getServiceIds() as $knownId) {
-            if ('' === $knownId || '.' === $knownId[0]) {
+            if ('' === $knownId || '.' === $knownId[0] || $knownId === $this->currentId) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
index b2bd5023d8f6a..2fd831ecc5ee0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
@@ -124,6 +124,19 @@ public function testProcessThrowsExceptionOnInvalidReferenceWithAlternatives()
         $this->process($container);
     }
 
+    public function testCurrentIdIsExcludedFromAlternatives()
+    {
+        $this->expectException(ServiceNotFoundException::class);
+        $this->expectExceptionMessage('The service "app.my_service" has a dependency on a non-existent service "app.my_service2".');
+
+        $container = new ContainerBuilder();
+        $container
+            ->register('app.my_service', \stdClass::class)
+            ->addArgument(new Reference('app.my_service2'));
+
+        $this->process($container);
+    }
+
     private function process(ContainerBuilder $container)
     {
         $pass = new CheckExceptionOnInvalidReferenceBehaviorPass();

From 0f07fd5ab1ca7d18ad35bbd46b20e847ca115bdc Mon Sep 17 00:00:00 2001
From: Charly Goblet <charly.goblet@gmail.com>
Date: Mon, 20 Feb 2023 13:36:07 +0100
Subject: [PATCH 247/475] [Notifier] Add Pushover bridge

---
 .../FrameworkExtension.php                    |   2 +
 .../Resources/config/notifier_transports.php  |   5 +
 .../Notifier/Bridge/Pushover/.gitattributes   |   4 +
 .../Notifier/Bridge/Pushover/.gitignore       |   3 +
 .../Notifier/Bridge/Pushover/CHANGELOG.md     |   7 +
 .../Notifier/Bridge/Pushover/LICENSE          |  19 ++
 .../Bridge/Pushover/PushoverOptions.php       | 188 ++++++++++++++++++
 .../Bridge/Pushover/PushoverTransport.php     |  89 +++++++++
 .../Pushover/PushoverTransportFactory.php     |  42 ++++
 .../Notifier/Bridge/Pushover/README.md        |  24 +++
 .../Tests/PushoverTransportFactoryTest.php    |  39 ++++
 .../Pushover/Tests/PushoverTransportTest.php  | 123 ++++++++++++
 .../Notifier/Bridge/Pushover/composer.json    |  36 ++++
 .../Notifier/Bridge/Pushover/phpunit.xml.dist |  31 +++
 .../Exception/UnsupportedSchemeException.php  |   4 +
 src/Symfony/Component/Notifier/Transport.php  |   2 +
 16 files changed, 618 insertions(+)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Pushover/.gitattributes
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Pushover/.gitignore
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Pushover/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Pushover/LICENSE
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Pushover/PushoverOptions.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Pushover/PushoverTransport.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Pushover/PushoverTransportFactory.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Pushover/README.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Pushover/Tests/PushoverTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Pushover/Tests/PushoverTransportTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Pushover/composer.json
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Pushover/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 842eb8eab4425..694b89fcdb546 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -166,6 +166,7 @@
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
 use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory;
 use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
+use Symfony\Component\Notifier\Bridge\Pushover\PushoverTransportFactory;
 use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
@@ -2606,6 +2607,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             OvhCloudTransportFactory::class => 'notifier.transport_factory.ovh-cloud',
             PagerDutyTransportFactory::class => 'notifier.transport_factory.pager-duty',
             PlivoTransportFactory::class => 'notifier.transport_factory.plivo',
+            PushoverTransportFactory::class => 'notifier.transport_factory.pushover',
             RingCentralTransportFactory::class => 'notifier.transport_factory.ring-central',
             RocketChatTransportFactory::class => 'notifier.transport_factory.rocket-chat',
             SendberryTransportFactory::class => 'notifier.transport_factory.sendberry',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
index c5e0371d933ba..41471838cf309 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -50,6 +50,7 @@
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
 use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory;
 use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
+use Symfony\Component\Notifier\Bridge\Pushover\PushoverTransportFactory;
 use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
@@ -331,5 +332,9 @@
         ->set('notifier.transport_factory.pager-duty', PagerDutyTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
+
+        ->set('notifier.transport_factory.pushover', PushoverTransportFactory::class)
+            ->parent('notifier.transport_factory.abstract')
+            ->tag('texter.transport_factory')
     ;
 };
diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/.gitattributes b/src/Symfony/Component/Notifier/Bridge/Pushover/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/.gitignore b/src/Symfony/Component/Notifier/Bridge/Pushover/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Pushover/CHANGELOG.md
new file mode 100644
index 0000000000000..1f2c8f86cde72
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+ * Add the bridge
diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/LICENSE b/src/Symfony/Component/Notifier/Bridge/Pushover/LICENSE
new file mode 100644
index 0000000000000..3ed9f412ce53d
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2023-present Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverOptions.php b/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverOptions.php
new file mode 100644
index 0000000000000..36b12150a0a1e
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverOptions.php
@@ -0,0 +1,188 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Pushover;
+
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Message\MessageOptionsInterface;
+use Symfony\Component\Notifier\Notification\Notification;
+
+/**
+ * @author mocodo <https://github.com/mocodo>
+ *
+ * @see https://pushover.net/api
+ */
+final class PushoverOptions implements MessageOptionsInterface
+{
+    private const PRIORITIES = [-2, -1, 0, 1, 2];
+
+    private const SOUNDS = [
+        'pushover',
+        'bike',
+        'bugle',
+        'cashregister',
+        'classical',
+        'cosmic',
+        'falling',
+        'gamelan',
+        'incoming',
+        'intermission',
+        'magic',
+        'mechanical',
+        'pianobar',
+        'siren',
+        'spacealarm',
+        'tugboat',
+        'alien',
+        'climb',
+        'persistent',
+        'echo',
+        'vibrate',
+        'none',
+    ];
+
+    private array $options;
+
+    public function __construct(array $options = [])
+    {
+        $this->options = $options;
+    }
+
+    public static function fromNotification(Notification $notification): self
+    {
+        $options = new self();
+        $options->title($notification->getSubject());
+        $priority = match ($notification->getImportance()) {
+            Notification::IMPORTANCE_URGENT => 2,
+            Notification::IMPORTANCE_HIGH => 1,
+            Notification::IMPORTANCE_MEDIUM => 0,
+            Notification::IMPORTANCE_LOW => -1
+        };
+        $options->priority($priority);
+
+        return $options;
+    }
+
+    public function toArray(): array
+    {
+        $options = $this->options;
+        unset($options['attachment']);
+
+        return $options;
+    }
+
+    public function getRecipientId(): ?string
+    {
+        return $this->options['device'] ?? null;
+    }
+
+    /**
+     * @see https://pushover.net/api#identifiers
+     *
+     * @return $this
+     */
+    public function device(string $device): static
+    {
+        $this->options['device'] = $device;
+
+        return $this;
+    }
+
+    /**
+     * @see https://pushover.net/api#html
+     *
+     * @return $this
+     */
+    public function asHtml(bool $bool): static
+    {
+        $this->options['html'] = $bool ? 1 : 0;
+
+        return $this;
+    }
+
+    /**
+     * @see https://pushover.net/api#priority
+     *
+     * @return $this
+     */
+    public function priority(int $priority): static
+    {
+        if (!\in_array($priority, self::PRIORITIES, true)) {
+            throw new InvalidArgumentException(sprintf('Pushover notification priority must be one of "%s".', implode(', ', self::PRIORITIES)));
+        }
+
+        $this->options['priority'] = $priority;
+
+        return $this;
+    }
+
+    /**
+     * @see https://pushover.net/api#sounds
+     *
+     * @return $this
+     */
+    public function sound(string $sound): static
+    {
+        if (!\in_array($sound, self::SOUNDS, true)) {
+            throw new InvalidArgumentException(sprintf('Pushover notification sound must be one of "%s".', implode(', ', self::SOUNDS)));
+        }
+
+        $this->options['sound'] = $sound;
+
+        return $this;
+    }
+
+    /**
+     * @see https://pushover.net/api#timestamp
+     *
+     * @return $this
+     */
+    public function timestamp(int $timestamp): static
+    {
+        $this->options['timestamp'] = $timestamp;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function title(string $title): static
+    {
+        $this->options['title'] = $title;
+
+        return $this;
+    }
+
+    /**
+     * @see https://pushover.net/api#urls
+     *
+     * @return $this
+     */
+    public function url(string $url): static
+    {
+        $this->options['url'] = $url;
+
+        return $this;
+    }
+
+    /**
+     * @see https://pushover.net/api#urls
+     *
+     * @return $this
+     */
+    public function urlTitle(string $urlTitle): static
+    {
+        $this->options['url_title'] = $urlTitle;
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverTransport.php b/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverTransport.php
new file mode 100644
index 0000000000000..be7e6f75dbed0
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverTransport.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Pushover;
+
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\PushMessage;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Transport\AbstractTransport;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @author mocodo <https://github.com/mocodo>
+ */
+final class PushoverTransport extends AbstractTransport
+{
+    protected const HOST = 'api.pushover.net';
+
+    public function __construct(
+        #[\SensitiveParameter] private readonly string $userKey,
+        #[\SensitiveParameter] private readonly string $appToken,
+        HttpClientInterface $client = null,
+        EventDispatcherInterface $dispatcher = null,
+    ) {
+        parent::__construct($client, $dispatcher);
+    }
+
+    public function supports(MessageInterface $message): bool
+    {
+        return $message instanceof PushMessage;
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('pushover://%s', $this->getEndpoint());
+    }
+
+    protected function doSend(MessageInterface $message): SentMessage
+    {
+        if (!$message instanceof PushMessage) {
+            throw new UnsupportedMessageTypeException(__CLASS__, PushMessage::class, $message);
+        }
+
+        $opts = $message->getOptions();
+        $options = $opts ? $opts->toArray() : [];
+        $options['message'] = $message->getContent();
+        $options['title'] = $message->getSubject();
+        $options['token'] = $this->appToken;
+        $options['user'] = $this->userKey;
+
+        $endpoint = sprintf('https://%s/1/messages.json', self::HOST);
+        $response = $this->client->request('POST', $endpoint, [
+            'body' => $options,
+        ]);
+
+        try {
+            $statusCode = $response->getStatusCode();
+        } catch (TransportExceptionInterface $e) {
+            throw new TransportException('Could not reach the remote Pushover server.', $response, 0, $e);
+        }
+
+        if (200 !== $statusCode) {
+            throw new TransportException(sprintf('Unable to send the Pushover push notification: "%s".', $response->getContent(false)), $response);
+        }
+
+        $result = $response->toArray(false);
+
+        if (!isset($result['request'])) {
+            throw new TransportException(sprintf('Unable to send the Pushover push notification: "%s".', $result->getContent(false)), $response);
+        }
+
+        $sentMessage = new SentMessage($message, (string) $this);
+        $sentMessage->setMessageId($result['request']);
+
+        return $sentMessage;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverTransportFactory.php
new file mode 100644
index 0000000000000..1e55e361bdf36
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverTransportFactory.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Pushover;
+
+use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
+use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
+use Symfony\Component\Notifier\Transport\Dsn;
+use Symfony\Component\Notifier\Transport\TransportInterface;
+
+/**
+ * @author mocodo <https://github.com/mocodo>
+ */
+final class PushoverTransportFactory extends AbstractTransportFactory
+{
+    public function create(Dsn $dsn): TransportInterface
+    {
+        if ('pushover' !== $dsn->getScheme()) {
+            throw new UnsupportedSchemeException($dsn, 'pushover', $this->getSupportedSchemes());
+        }
+
+        $userKey = $dsn->getUser();
+        $appToken = $dsn->getPassword();
+        $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
+        $port = $dsn->getPort();
+
+        return (new PushoverTransport($userKey, $appToken, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
+    }
+
+    protected function getSupportedSchemes(): array
+    {
+        return ['pushover'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/README.md b/src/Symfony/Component/Notifier/Bridge/Pushover/README.md
new file mode 100644
index 0000000000000..f46c98345eddb
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/README.md
@@ -0,0 +1,24 @@
+Pushover Notifier
+=================
+
+Provides [Pushover](https://pushover.net) integration for Symfony Notifier.
+
+DSN example
+-----------
+
+```
+PUSHOVER_DSN=pushover://USER_KEY:APP_TOKEN@default
+```
+
+where:
+
+- `USER_KEY` is your user/group key (or that of your target user), viewable when logged into your Pushover's dashboard
+- `APP_TOKEN` is your application's API token
+
+Resources
+---------
+
+* [Contributing](https://symfony.com/doc/current/contributing/index.html)
+* [Report issues](https://github.com/symfony/symfony/issues) and
+  [send Pull Requests](https://github.com/symfony/symfony/pulls)
+  in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/Tests/PushoverTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Pushover/Tests/PushoverTransportFactoryTest.php
new file mode 100644
index 0000000000000..a22389dafda0d
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/Tests/PushoverTransportFactoryTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Pushover\Tests;
+
+use Symfony\Component\Notifier\Bridge\Pushover\PushoverTransportFactory;
+use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+
+final class PushoverTransportFactoryTest extends TransportFactoryTestCase
+{
+    public function createFactory(): PushoverTransportFactory
+    {
+        return new PushoverTransportFactory();
+    }
+
+    public static function createProvider(): iterable
+    {
+        yield ['pushover://api.pushover.net', 'pushover://userKey:appToken@api.pushover.net'];
+    }
+
+    public static function supportsProvider(): iterable
+    {
+        yield [true, 'pushover://userKey@appToken'];
+        yield [false, 'somethingElse://userKey@appToken'];
+    }
+
+    public static function unsupportedSchemeProvider(): iterable
+    {
+        yield ['somethingElse://userKey@appToken'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/Tests/PushoverTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Pushover/Tests/PushoverTransportTest.php
new file mode 100644
index 0000000000000..9b2af410122c8
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/Tests/PushoverTransportTest.php
@@ -0,0 +1,123 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Pushover\Tests;
+
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\Notifier\Bridge\Pushover\PushoverTransport;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\PushMessage;
+use Symfony\Component\Notifier\Notification\Notification;
+use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Component\Notifier\Tests\Transport\DummyMessage;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+final class PushoverTransportTest extends TransportTestCase
+{
+    public static function createTransport(HttpClientInterface $client = null): PushoverTransport
+    {
+        return new PushoverTransport('userKey', 'appToken', $client ?? new MockHttpClient());
+    }
+
+    public static function toStringProvider(): iterable
+    {
+        yield ['pushover://api.pushover.net', self::createTransport()];
+    }
+
+    public static function supportedMessagesProvider(): iterable
+    {
+        yield [new PushMessage('Hello!', 'World')];
+    }
+
+    public static function unsupportedMessagesProvider(): iterable
+    {
+        yield [new ChatMessage('Hello!')];
+        yield [new DummyMessage()];
+    }
+
+    public function testSendWithOptions()
+    {
+        $messageSubject = 'testMessageSubject';
+        $messageContent = 'testMessageContent';
+
+        $response = $this->createMock(ResponseInterface::class);
+
+        $response->expects($this->exactly(2))
+            ->method('getStatusCode')
+            ->willReturn(200);
+
+        $response->expects($this->once())
+            ->method('getContent')
+            ->willReturn(json_encode(['status' => 1, 'request' => 'uuid']));
+
+        $expectedBody = http_build_query([
+            'message' => 'testMessageContent',
+            'title' => 'testMessageSubject',
+            'token' => 'appToken',
+            'user' => 'userKey',
+        ]);
+
+        $client = new MockHttpClient(function (string $method, string $url, array $options = []) use (
+            $response,
+            $expectedBody
+        ): ResponseInterface {
+            $this->assertSame($expectedBody, $options['body']);
+
+            return $response;
+        });
+        $transport = self::createTransport($client);
+
+        $sentMessage = $transport->send(new PushMessage($messageSubject, $messageContent));
+
+        $this->assertSame('uuid', $sentMessage->getMessageId());
+    }
+
+    public function testSendWithNotification()
+    {
+        $messageSubject = 'testMessageSubject';
+        $messageContent = 'testMessageContent';
+
+        $response = $this->createMock(ResponseInterface::class);
+
+        $response->expects($this->exactly(2))
+            ->method('getStatusCode')
+            ->willReturn(200);
+
+        $response->expects($this->once())
+            ->method('getContent')
+            ->willReturn(json_encode(['status' => 1, 'request' => 'uuid']));
+
+        $notification = (new Notification($messageSubject))->content($messageContent);
+        $pushMessage = PushMessage::fromNotification($notification);
+
+        $expectedBody = http_build_query([
+            'message' => 'testMessageContent',
+            'title' => 'testMessageSubject',
+            'token' => 'appToken',
+            'user' => 'userKey',
+        ]);
+
+        $client = new MockHttpClient(function (string $method, string $url, array $options = []) use (
+            $response,
+            $expectedBody
+        ): ResponseInterface {
+            $this->assertSame($expectedBody, $options['body']);
+
+            return $response;
+        });
+        $transport = self::createTransport($client);
+
+        $sentMessage = $transport->send($pushMessage);
+
+        $this->assertSame('uuid', $sentMessage->getMessageId());
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/composer.json b/src/Symfony/Component/Notifier/Bridge/Pushover/composer.json
new file mode 100644
index 0000000000000..faa5a061a3bca
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "symfony/pushover-notifier",
+    "type": "symfony-notifier-bridge",
+    "description": "Symfony Pushover Notifier Bridge",
+    "keywords": [
+        "pushover",
+        "notifier"
+    ],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "mocodo",
+            "homepage": "https://github.com/mocodo"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/notifier": "^6.3"
+    },
+    "require-dev": {
+        "symfony/event-dispatcher": "^5.4|^6.0"
+    },
+    "autoload": {
+        "psr-4": {"Symfony\\Component\\Notifier\\Bridge\\Pushover\\": ""},
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/Pushover/phpunit.xml.dist
new file mode 100644
index 0000000000000..89349c102ebde
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
+         backupGlobals=
10000
"false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony Pushover Notifier Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index 86aa5f3930634..f0312937fa587 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -164,6 +164,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\Plivo\PlivoTransportFactory::class,
             'package' => 'symfony/plivo-notifier',
         ],
+        'pushover' => [
+            'class' => Bridge\Pushover\PushoverTransportFactory::class,
+            'package' => 'symfony/pushover-notifier',
+        ],
         'ringcentral' => [
             'class' => Bridge\RingCentral\RingCentralTransportFactory::class,
             'package' => 'symfony/ring-central-notifier',
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
index 260c57cb349b7..9dcf3348cc68a 100644
--- a/src/Symfony/Component/Notifier/Transport.php
+++ b/src/Symfony/Component/Notifier/Transport.php
@@ -42,6 +42,7 @@
 use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
 use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory;
 use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
+use Symfony\Component\Notifier\Bridge\Pushover\PushoverTransportFactory;
 use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
@@ -111,6 +112,7 @@ final class Transport
         OvhCloudTransportFactory::class,
         PagerDutyTransportFactory::class,
         PlivoTransportFactory::class,
+        PushoverTransportFactory::class,
         RingCentralTransportFactory::class,
         RocketChatTransportFactory::class,
         SendberryTransportFactory::class,

From 2460efeb1afa4beb80fd8927e9b997146f9e8ba2 Mon Sep 17 00:00:00 2001
From: Jack Worman <jworman@healthcall.com>
Date: Thu, 26 Jan 2023 12:56:19 -0500
Subject: [PATCH 248/475] Add cache contracts template annotations

---
 .../Contracts/Cache/CacheInterface.php        | 20 +++++++++++--------
 .../Contracts/Cache/CallbackInterface.php     |  4 +++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Contracts/Cache/CacheInterface.php b/src/Symfony/Contracts/Cache/CacheInterface.php
index 0d4f4030b5db9..a4fcea731e596 100644
--- a/src/Symfony/Contracts/Cache/CacheInterface.php
+++ b/src/Symfony/Contracts/Cache/CacheInterface.php
@@ -29,14 +29,18 @@ interface CacheInterface
      * requested key, that could be used e.g. for expiration control. It could also
      * be an ItemInterface instance when its additional features are needed.
      *
-     * @param string                     $key       The key of the item to retrieve from the cache
-     * @param callable|CallbackInterface $callback  Should return the computed value for the given key/item
-     * @param float|null                 $beta      A float that, as it grows, controls the likeliness of triggering
-     *                                              early expiration. 0 disables it, INF forces immediate expiration.
-     *                                              The default (or providing null) is implementation dependent but should
-     *                                              typically be 1.0, which should provide optimal stampede protection.
-     *                                              See https://en.wikipedia.org/wiki/Cache_stampede#Probabilistic_early_expiration
-     * @param array                      &$metadata The metadata of the cached item {@see ItemInterface::getMetadata()}
+     * @template T
+     *
+     * @param string $key The key of the item to retrieve from the cache
+     * @param (callable(CacheItemInterface,bool):T)|(callable(ItemInterface,bool):T)|CallbackInterface<T> $callback
+     * @param float|null $beta      A float that, as it grows, controls the likeliness of triggering
+     *                              early expiration. 0 disables it, INF forces immediate expiration.
+     *                              The default (or providing null) is implementation dependent but should
+     *                              typically be 1.0, which should provide optimal stampede protection.
+     *                              See https://en.wikipedia.org/wiki/Cache_stampede#Probabilistic_early_expiration
+     * @param array      &$metadata The metadata of the cached item {@see ItemInterface::getMetadata()}
+     *
+     * @return T
      *
      * @throws InvalidArgumentException When $key is not valid or when $beta is negative
      */
diff --git a/src/Symfony/Contracts/Cache/CallbackInterface.php b/src/Symfony/Contracts/Cache/CallbackInterface.php
index 437a3c9396616..15941e9c9d7d3 100644
--- a/src/Symfony/Contracts/Cache/CallbackInterface.php
+++ b/src/Symfony/Contracts/Cache/CallbackInterface.php
@@ -17,6 +17,8 @@
  * Computes and returns the cached value of an item.
  *
  * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @template T
  */
 interface CallbackInterface
 {
@@ -24,7 +26,7 @@ interface CallbackInterface
      * @param CacheItemInterface|ItemInterface $item  The item to compute the value for
      * @param bool                             &$save Should be set to false when the value should not be saved in the pool
      *
-     * @return mixed The computed value for the passed item
+     * @return T The computed value for the passed item
      */
     public function __invoke(CacheItemInterface $item, bool &$save): mixed;
 }

From 53322dcd572825595d244baa5f7e729a4e22c32c Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Wed, 22 Feb 2023 21:03:28 +0100
Subject: [PATCH 249/475] Remove unused private methods

---
 .../Tests/Exception/FlattenExceptionTest.php  |  5 ---
 .../Factory/DefaultChoiceListFactoryTest.php  | 38 -------------------
 .../Bridge/Redis/Transport/Connection.php     |  5 ---
 .../Configurator/CollectionConfigurator.php   |  5 ---
 .../VarDumper/Tests/Dumper/CliDumperTest.php  | 18 ---------
 5 files changed, 71 deletions(-)

diff --git a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
index 5dd17dd2fc238..73d419ad4cd58 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
@@ -292,9 +292,4 @@ public function testToStringParent()
         $this->assertSame($exception->getTraceAsString(), $flattened->getTraceAsString());
         $this->assertSame($exception->__toString(), $flattened->getAsString());
     }
-
-    private function createException($foo): \Exception
-    {
-        return new \Exception();
-    }
 }
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
index 35526a98f671b..dfbbd2b5b8166 100644
--- a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
+++ b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
@@ -854,25 +854,6 @@ public function testCreateViewFlatlabelTranslationParametersClosureReceivesValue
         $this->assertFlatViewWithlabelTranslationParameters($view);
     }
 
-    private function assertScalarListWithChoiceValues(ChoiceListInterface $list)
-    {
-        $this->assertSame(['a', 'b', 'c', 'd'], $list->getValues());
-
-        $this->assertSame([
-            'a' => 'a',
-            'b' => 'b',
-            'c' => 'c',
-            'd' => 'd',
-        ], $list->getChoices());
-
-        $this->assertSame([
-            'a' => 'A',
-            'b' => 'B',
-            'c' => 'C',
-            'd' => 'D',
-        ], $list->getOriginalKeys());
-    }
-
     private function assertObjectListWithGeneratedValues(ChoiceListInterface $list)
     {
         $this->assertSame(['0', '1', '2', '3'], $list->getValues());
@@ -892,25 +873,6 @@ private function assertObjectListWithGeneratedValues(ChoiceListInterface $list)
         ], $list->getOriginalKeys());
     }
 
-    private function assertScalarListWithCustomValues(ChoiceListInterface $list)
-    {
-        $this->assertSame(['a', 'b', '1', '2'], $list->getValues());
-
-        $this->assertSame([
-            'a' => 'a',
-            'b' => 'b',
-            1 => 'c',
-            2 => 'd',
-        ], $list->getChoices());
-
-        $this->assertSame([
-            'a' => 'A',
-            'b' => 'B',
-            1 => 'C',
-            2 => 'D',
-        ], $list->getOriginalKeys());
-    }
-
     private function assertObjectListWithCustomValues(ChoiceListInterface $list)
     {
         $this->assertSame(['a', 'b', '1', '2'], $list->getValues());
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
index 44d99d11d7cc7..8bcc69c9ab4cb 100644
--- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -524,11 +524,6 @@ public function setup(): void
         $this->autoSetup = false;
     }
 
-    private function getCurrentTimeInMilliseconds(): int
-    {
-        return (int) (microtime(true) * 1000);
-    }
-
     public function cleanup(): void
     {
         static $unlink = true;
diff --git a/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php
index e29dcb2b35f01..b8a0861f4ab40 100644
--- a/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php
+++ b/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php
@@ -114,9 +114,4 @@ final public function host(string|array $host): static
 
         return $this;
     }
-
-    private function createRoute(string $path): Route
-    {
-        return (clone $this->route)->setPath($path);
-    }
 }
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
index d2377886784d5..b1eb29eb78877 100644
--- a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
@@ -449,22 +449,4 @@ public function testDumpArrayWithColor($value, $flags, $expectedOut)
 
         $this->assertSame($expectedOut, $out);
     }
-
-    private function getSpecialVars()
-    {
-        foreach (array_keys($GLOBALS) as $var) {
-            if ('GLOBALS' !== $var) {
-                unset($GLOBALS[$var]);
-            }
-        }
-
-        $var = function &() {
-            $var = [];
-            $var[] = &$var;
-
-            return $var;
-        };
-
-        return eval('return [$var(), $GLOBALS, &$GLOBALS];');
-    }
 }

From 803a54e51ee4c6248f1754a9fbc14043f3d9663d Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Wed, 8 Feb 2023 17:56:17 +0100
Subject: [PATCH 250/475] [HttpClient] Add UriTemplateHttpClient

---
 .../DependencyInjection/Configuration.php     |   5 +
 .../FrameworkExtension.php                    |  38 +++++-
 .../Resources/config/http_client.php          |  21 +++
 .../FrameworkExtensionTestCase.php            |   5 +-
 src/Symfony/Component/HttpClient/CHANGELOG.md |   5 +
 .../Component/HttpClient/HttpClientTrait.php  |   4 +
 .../Component/HttpClient/HttpOptions.php      |  10 ++
 .../Tests/UriTemplateHttpClientTest.php       | 129 ++++++++++++++++++
 .../HttpClient/UriTemplateHttpClient.php      |  84 ++++++++++++
 9 files changed, 297 insertions(+), 4 deletions(-)
 create mode 100644 src/Symfony/Component/HttpClient/Tests/UriTemplateHttpClientTest.php
 create mode 100644 src/Symfony/Component/HttpClient/UriTemplateHttpClient.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 24b06a79e3f4e..4a0cc846d224a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1655,6 +1655,11 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e
                                     ->normalizeKeys(false)
                                     ->variablePrototype()->end()
                                 ->end()
+                                ->arrayNode('vars')
+                                    ->info('Associative array: the default vars used to expand the templated URI.')
+                                    ->normalizeKeys(false)
+                                    ->variablePrototype()->end()
+                                ->end()
                                 ->integerNode('max_redirects')
                                     ->info('The maximum number of redirects to follow.')
                                 ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 842eb8eab4425..f734612cd5a31 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -80,6 +80,7 @@
 use Symfony\Component\HttpClient\Retry\GenericRetryStrategy;
 use Symfony\Component\HttpClient\RetryableHttpClient;
 use Symfony\Component\HttpClient\ScopingHttpClient;
+use Symfony\Component\HttpClient\UriTemplateHttpClient;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\AsController;
 use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface;
@@ -2338,6 +2339,8 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
         $options = $config['default_options'] ?? [];
         $retryOptions = $options['retry_failed'] ?? ['enabled' => false];
         unset($options['retry_failed']);
+        $defaultUriTemplateVars = $options['vars'] ?? [];
+        unset($options['vars']);
         $container->getDefinition('http_client')->setArguments([$options, $config['max_host_connections'] ?? 6]);
 
         if (!$hasPsr18 = ContainerBuilder::willBeAvailable('psr/http-client', ClientInterface::class, ['symfony/framework-bundle', 'symfony/http-client'])) {
@@ -2349,11 +2352,31 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
             $container->removeDefinition(HttpClient::class);
         }
 
-        if ($this->readConfigEnabled('http_client.retry_failed', $container, $retryOptions)) {
+        if ($hasRetryFailed = $this->readConfigEnabled('http_client.retry_failed', $container, $retryOptions)) {
             $this->registerRetryableHttpClient($retryOptions, 'http_client', $container);
         }
 
-        $httpClientId = ($retryOptions['enabled'] ?? false) ? 'http_client.retryable.inner' : ($this->isInitializedConfigEnabled('profiler') ? '.debug.http_client.inner' : 'http_client');
+        if ($hasUriTemplate = class_exists(UriTemplateHttpClient::class)) {
+            if (ContainerBuilder::willBeAvailable('guzzlehttp/uri-template', \GuzzleHttp\UriTemplate\UriTemplate::class, [])) {
+                $container->setAlias('http_client.uri_template_expander', 'http_client.uri_template_expander.guzzle');
+            } elseif (ContainerBuilder::willBeAvailable('rize/uri-template', \Rize\UriTemplate::class, [])) {
+                $container->setAlias('http_client.uri_template_expander', 'http_client.uri_template_expander.rize');
+            }
+
+            $container
+                ->getDefinition('http_client.uri_template')
+                ->setArgument(2, $defaultUriTemplateVars);
+        } elseif ($defaultUriTemplateVars) {
+            throw new LogicException('Support for URI template requires symfony/http-client 6.3 or higher, try upgrading.');
+        }
+
+        $httpClientId = match (true) {
+            $hasUriTemplate => 'http_client.uri_template.inner',
+            $hasRetryFailed => 'http_client.retryable.inner',
+            $this->isInitializedConfigEnabled('profiler') => '.debug.http_client.inner',
+            default => 'http_client',
+        };
+
         foreach ($config['scoped_clients'] as $name => $scopeConfig) {
             if ('http_client' === $name) {
                 throw new InvalidArgumentException(sprintf('Invalid scope name: "%s" is reserved.', $name));
@@ -2384,6 +2407,17 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
                 $this->registerRetryableHttpClient($retryOptions, $name, $container);
             }
 
+            if ($hasUriTemplate) {
+                $container
+                    ->register($name.'.uri_template', UriTemplateHttpClient::class)
+                    ->setDecoratedService($name, null, 7) // Between TraceableHttpClient (5) and RetryableHttpClient (10)
+                    ->setArguments([
+                        new Reference('.inner'),
+                        new Reference('http_client.uri_template_expander', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                        $defaultUriTemplateVars,
+                    ]);
+            }
+
             $container->registerAliasForArgument($name, HttpClientInterface::class);
 
             if ($hasPsr18) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php
index ba70b90ad654b..7a9f2e3b14c92 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php
@@ -18,6 +18,7 @@
 use Symfony\Component\HttpClient\HttplugClient;
 use Symfony\Component\HttpClient\Psr18Client;
 use Symfony\Component\HttpClient\Retry\GenericRetryStrategy;
+use Symfony\Component\HttpClient\UriTemplateHttpClient;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 return static function (ContainerConfigurator $container) {
@@ -60,5 +61,25 @@
                 abstract_arg('max delay ms'),
                 abstract_arg('jitter'),
             ])
+
+        ->set('http_client.uri_template', UriTemplateHttpClient::class)
+            ->decorate('http_client', null, 7) // Between TraceableHttpClient (5) and RetryableHttpClient (10)
+            ->args([
+                service('.inner'),
+                service('http_client.uri_template_expander')->nullOnInvalid(),
+                abstract_arg('default vars'),
+            ])
+
+        ->set('http_client.uri_template_expander.guzzle', \Closure::class)
+            ->factory([\Closure::class, 'fromCallable'])
+            ->args([
+                [\GuzzleHttp\UriTemplate\UriTemplate::class, 'expand'],
+            ])
+
+        ->set('http_client.uri_template_expander.rize', \Closure::class)
+            ->factory([\Closure::class, 'fromCallable'])
+            ->args([
+                [inline_service(\Rize\UriTemplate::class), 'expand'],
+            ])
     ;
 };
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
index 848481ee59669..e53bedf6ee497 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -55,6 +55,7 @@
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\RetryableHttpClient;
 use Symfony\Component\HttpClient\ScopingHttpClient;
+use Symfony\Component\HttpClient\UriTemplateHttpClient;
 use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
 use Symfony\Component\HttpKernel\Fragment\FragmentUriGeneratorInterface;
 use Symfony\Component\Messenger\Transport\TransportFactory;
@@ -2003,7 +2004,7 @@ public function testHttpClientMockResponseFactory()
     {
         $container = $this->createContainerFromFile('http_client_mock_response_factory');
 
-        $definition = $container->getDefinition('http_client.mock_client');
+        $definition = $container->getDefinition(($uriTemplateHttpClientExists = class_exists(UriTemplateHttpClient::class)) ? 'http_client.uri_template.inner.mock_client' : 'http_client.mock_client');
 
         $this->assertSame(MockHttpClient::class, $definition->getClass());
         $this->assertCount(1, $definition->getArguments());
@@ -2011,7 +2012,7 @@ public function testHttpClientMockResponseFactory()
         $argument = $definition->getArgument(0);
 
         $this->assertInstanceOf(Reference::class, $argument);
-        $this->assertSame('http_client', current($definition->getDecoratedService()));
+        $this->assertSame($uriTemplateHttpClientExists ? 'http_client.uri_template.inner' : 'http_client', current($definition->getDecoratedService()));
         $this->assertSame('my_response_factory', (string) $argument);
     }
 
diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
index d6d50d2d5f9d7..2523499e752c9 100644
--- a/src/Symfony/Component/HttpClient/CHANGELOG.md
+++ b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `UriTemplateHttpClient` to use URI templates as specified in the RFC 6570
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
index 38c544b4b1234..767893bf4bcae 100644
--- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
+++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -245,6 +245,10 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
                 throw new InvalidArgumentException(sprintf('Option "auth_ntlm" is not supported by "%s", '.$msg, __CLASS__, CurlHttpClient::class));
             }
 
+            if ('vars' === $name) {
+                throw new InvalidArgumentException(sprintf('Option "vars" is not supported by "%s", try using "%s" instead.', __CLASS__, UriTemplateHttpClient::class));
+            }
+
             $alternatives = [];
 
             foreach ($defaultOptions as $k => $v) {
diff --git a/src/Symfony/Component/HttpClient/HttpOptions.php b/src/Symfony/Component/HttpClient/HttpOptions.php
index a07fac7eda833..57590d3c131fc 100644
--- a/src/Symfony/Component/HttpClient/HttpOptions.php
+++ b/src/Symfony/Component/HttpClient/HttpOptions.php
@@ -135,6 +135,16 @@ public function setBaseUri(string $uri): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
+    public function setVars(array $vars): static
+    {
+        $this->options['vars'] = $vars;
+
+        return $this;
+    }
+
     /**
      * @return $this
      */
diff --git a/src/Symfony/Component/HttpClient/Tests/UriTemplateHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/UriTemplateHttpClientTest.php
new file mode 100644
index 0000000000000..23e48b50d8c03
--- /dev/null
+++ b/src/Symfony/Component/HttpClient/Tests/UriTemplateHttpClientTest.php
@@ -0,0 +1,129 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpClient\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+use Symfony\Component\HttpClient\UriTemplateHttpClient;
+
+final class UriTemplateHttpClientTest extends TestCase
+{
+    public function testExpanderIsCalled()
+    {
+        $client = new UriTemplateHttpClient(
+            new MockHttpClient(),
+            function (string $url, array $vars): string {
+                $this->assertSame('https://foo.tld/{version}/{resource}{?page}', $url);
+                $this->assertSame([
+                    'version' => 'v2',
+                    'resource' => 'users',
+                    'page' => 33,
+                ], $vars);
+
+                return 'https://foo.tld/v2/users?page=33';
+            },
+            [
+                'version' => 'v2',
+            ],
+        );
+        $this->assertSame('https://foo.tld/v2/users?page=33', $client->request('GET', 'https://foo.tld/{version}/{resource}{?page}', [
+            'vars' => [
+                'resource' => 'users',
+                'page' => 33,
+            ],
+        ])->getInfo('url'));
+    }
+
+    public function testWithOptionsAppendsVarsToDefaultVars()
+    {
+        $client = new UriTemplateHttpClient(
+            new MockHttpClient(),
+            function (string $url, array $vars): string {
+                $this->assertSame('https://foo.tld/{bar}', $url);
+                $this->assertSame([
+                    'bar' => 'ccc',
+                ], $vars);
+
+                return 'https://foo.tld/ccc';
+            },
+        );
+        $this->assertSame('https://foo.tld/{bar}', $client->request('GET', 'https://foo.tld/{bar}')->getInfo('url'));
+
+        $client = $client->withOptions([
+            'vars' => [
+                'bar' => 'ccc',
+            ],
+        ]);
+        $this->assertSame('https://foo.tld/ccc', $client->request('GET', 'https://foo.tld/{bar}')->getInfo('url'));
+    }
+
+    public function testExpanderIsNotCalledWithEmptyVars()
+    {
+        $this->expectNotToPerformAssertions();
+
+        $client = new UriTemplateHttpClient(new MockHttpClient(), $this->fail(...));
+        $client->request('GET', 'https://foo.tld/bar', [
+            'vars' => [],
+        ]);
+    }
+
+    public function testExpanderIsNotCalledWithNoVarsAtAll()
+    {
+        $this->expectNotToPerformAssertions();
+
+        $client = new UriTemplateHttpClient(new MockHttpClient(), $this->fail(...));
+        $client->request('GET', 'https://foo.tld/bar');
+    }
+
+    public function testRequestWithNonArrayVarsOption()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The "vars" option must be an array.');
+
+        (new UriTemplateHttpClient(new MockHttpClient()))->request('GET', 'https://foo.tld', [
+            'vars' => 'should be an array',
+        ]);
+    }
+
+    public function testWithOptionsWithNonArrayVarsOption()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The "vars" option must be an array.');
+
+        (new UriTemplateHttpClient(new MockHttpClient()))->withOptions([
+            'vars' => new \stdClass(),
+        ]);
+    }
+
+    public function testVarsOptionIsNotPropagated()
+    {
+        $client = new UriTemplateHttpClient(
+            new MockHttpClient(function (string $method, string $url, array $options): MockResponse {
+                $this->assertArrayNotHasKey('vars', $options);
+
+                return new MockResponse();
+            }),
+            static fn (): string => 'ccc',
+        );
+
+        $client->withOptions([
+            'vars' => [
+                'foo' => 'bar',
+            ],
+        ])->request('GET', 'https://foo.tld', [
+            'vars' => [
+                'foo2' => 'bar2',
+            ],
+        ]);
+    }
+}
diff --git a/src/Symfony/Component/HttpClient/UriTemplateHttpClient.php b/src/Symfony/Component/HttpClient/UriTemplateHttpClient.php
new file mode 100644
index 0000000000000..55ae724f12207
--- /dev/null
+++ b/src/Symfony/Component/HttpClient/UriTemplateHttpClient.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpClient;
+
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+use Symfony\Contracts\Service\ResetInterface;
+
+class UriTemplateHttpClient implements HttpClientInterface, ResetInterface
+{
+    use DecoratorTrait;
+
+    /**
+     * @param (\Closure(string $url, array $vars): string)|null $expander
+     */
+    public function __construct(HttpClientInterface $client = null, private ?\Closure $expander = null, private array $defaultVars = [])
+    {
+        $this->client = $client ?? HttpClient::create();
+    }
+
+    public function request(string $method, string $url, array $options = []): ResponseInterface
+    {
+        $vars = $this->defaultVars;
+
+        if (\array_key_exists('vars', $options)) {
+            if (!\is_array($options['vars'])) {
+                throw new \InvalidArgumentException('The "vars" option must be an array.');
+            }
+
+            $vars = [...$vars, ...$options['vars']];
+            unset($options['vars']);
+        }
+
+        if ($vars) {
+            $url = ($this->expander ??= $this->createExpanderFromPopularVendors())($url, $vars);
+        }
+
+        return $this->client->request($method, $url, $options);
+    }
+
+    public function withOptions(array $options): static
+    {
+        if (!\is_array($options['vars'] ?? [])) {
+            throw new \InvalidArgumentException('The "vars" option must be an array.');
+        }
+
+        $clone = clone $this;
+        $clone->defaultVars = [...$clone->defaultVars, ...$options['vars'] ?? []];
+        unset($options['vars']);
+
+        $clone->client = $this->client->withOptions($options);
+
+        return $clone;
+    }
+
+    /**
+     * @return \Closure(string $url, array $vars): string
+     */
+    private function createExpanderFromPopularVendors(): \Closure
+    {
+        if (class_exists(\GuzzleHttp\UriTemplate\UriTemplate::class)) {
+            return \GuzzleHttp\UriTemplate\UriTemplate::expand(...);
+        }
+
+        if (class_exists(\League\Uri\UriTemplate::class)) {
+            return static fn (string $url, array $vars): string => (new \League\Uri\UriTemplate($url))->expand($vars);
+        }
+
+        if (class_exists(\Rize\UriTemplate::class)) {
+            return (new \Rize\UriTemplate())->expand(...);
+        }
+
+        throw new \LogicException('Support for URI template requires a vendor to expand the URI. Run "composer require guzzlehttp/uri-template" or pass your own expander \Closure implementation.');
+    }
+}

From e78461ebbd76f25b01bf761e8f675cb64f919ae4 Mon Sep 17 00:00:00 2001
From: Markus Baumer <markus@baumer.dev>
Date: Fri, 6 Jan 2023 18:39:18 +0100
Subject: [PATCH 251/475] [Security] Add remember me option for JSON logins

---
 .../Authenticator/JsonLoginAuthenticator.php  |  3 +-
 .../Component/Security/Http/CHANGELOG.md      |  5 ++
 .../CheckRememberMeConditionsListener.php     | 22 ++++++-
 .../CheckRememberMeConditionsListenerTest.php | 65 +++++++++++++++++--
 4 files changed, 86 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
index 49c5f9a52096d..aa147b57ea7d6 100644
--- a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
+++ b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
@@ -26,6 +26,7 @@
 use Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\PasswordUpgradeBadge;
+use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\Credentials\PasswordCredentials;
 use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
@@ -88,7 +89,7 @@ public function authenticate(Request $request): Passport
         }
 
         $userBadge = new UserBadge($credentials['username'], $this->userProvider->loadUserByIdentifier(...));
-        $passport = new Passport($userBadge, new PasswordCredentials($credentials['password']));
+        $passport = new Passport($userBadge, new PasswordCredentials($credentials['password']), [new RememberMeBadge()]);
 
         if ($this->userProvider instanceof PasswordUpgraderInterface) {
             $passport->addBadge(new PasswordUpgradeBadge($credentials['password'], $this->userProvider));
diff --git a/src/Symfony/Component/Security/Http/CHANGELOG.md b/src/Symfony/Component/Security/Http/CHANGELOG.md
index 7c590bd999702..df2bdfd0dc1bf 100644
--- a/src/Symfony/Component/Security/Http/CHANGELOG.md
+++ b/src/Symfony/Component/Security/Http/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `RememberMeBadge` to `JsonLoginAuthenticator` and enable reading parameter in JSON request body
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php b/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php
index b9023c62628a8..3fe1721d1f3ab 100644
--- a/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php
+++ b/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php
@@ -13,6 +13,7 @@
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge;
 use Symfony\Component\Security\Http\Event\LoginSuccessEvent;
 use Symfony\Component\Security\Http\ParameterBagUtils;
@@ -54,7 +55,7 @@ public function onSuccessfulLogin(LoginSuccessEvent $event): void
         /** @var RememberMeBadge $badge */
         $badge = $passport->getBadge(RememberMeBadge::class);
         if (!$this->options['always_remember_me']) {
-            $parameter = ParameterBagUtils::getRequestParameterValue($event->getRequest(), $this->options['remember_me_parameter']);
+            $parameter = $this->getParameter($event->getRequest(), $this->options['remember_me_parameter']);
             if (!('true' === $parameter || 'on' === $parameter || '1' === $parameter || 'yes' === $parameter || true === $parameter)) {
                 $this->logger?->debug('Remember me disabled; request does not contain remember me parameter ("{parameter}").', ['parameter' => $this->options['remember_me_parameter']]);
 
@@ -69,4 +70,23 @@ public static function getSubscribedEvents(): array
     {
         return [LoginSuccessEvent::class => ['onSuccessfulLogin', -32]];
     }
+
+    private function getParameter(Request $request, string $parameterName): mixed
+    {
+        $parameter = ParameterBagUtils::getRequestParameterValue($request, $parameterName);
+        if (null !== $parameter) {
+            return $parameter;
+        }
+
+        if ('application/json' === $request->headers->get('Content-Type')) {
+            $data = json_decode($request->getContent());
+            if (!$data instanceof \stdClass) {
+                return null;
+            }
+
+            return $data->{$parameterName} ?? null;
+        }
+
+        return null;
+    }
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php
index 342f9075a0ea8..adc7c7917410a 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php
@@ -33,13 +33,12 @@ class CheckRememberMeConditionsListenerTest extends TestCase
     protected function setUp(): void
     {
         $this->listener = new CheckRememberMeConditionsListener();
-        $this->request = Request::create('/login');
-        $this->request->request->set('_remember_me', true);
-        $this->response = new Response();
     }
 
-    public function testSuccessfulLoginWithoutSupportingAuthenticator()
+    public function testSuccessfulHttpLoginWithoutSupportingAuthenticator()
     {
+        $this->createHttpRequest();
+
         $passport = $this->createPassport([]);
 
         $this->listener->onSuccessfulLogin($this->createLoginSuccessfulEvent($passport));
@@ -47,6 +46,16 @@ public function testSuccessfulLoginWithoutSupportingAuthenticator()
         $this->assertFalse($passport->hasBadge(RememberMeBadge::class));
     }
 
+    public function testSuccessfulJsonLoginWithoutSupportingAuthenticator()
+    {
+        $this->createJsonRequest();
+
+        $passport = $this->createPassport([]);
+        $this->listener->onSuccessfulLogin($this->createLoginSuccessfulEvent($passport));
+
+        $this->assertFalse($passport->hasBadge(RememberMeBadge::class));
+    }
+
     public function testSuccessfulLoginWithoutRequestParameter()
     {
         $this->request = Request::create('/login');
@@ -57,10 +66,22 @@ public function testSuccessfulLoginWithoutRequestParameter()
         $this->assertFalse($passport->getBadge(RememberMeBadge::class)->isEnabled());
     }
 
-    public function testSuccessfulLoginWhenRememberMeAlwaysIsTrue()
+    public function testSuccessfulHttpLoginWhenRememberMeAlwaysIsTrue()
     {
+        $this->createHttpRequest();
+
+        $passport = $this->createPassport();
+
+        $this->listener->onSuccessfulLogin($this->createLoginSuccessfulEvent($passport));
+
+        $this->assertTrue($passport->getBadge(RememberMeBadge::class)->isEnabled());
+    }
+
+    public function testSuccessfulJsonLoginWhenRememberMeAlwaysIsTrue()
+    {
+        $this->createJsonRequest();
+
         $passport = $this->createPassport();
-        $listener = new CheckRememberMeConditionsListener(['always_remember_me' => true]);
 
         $this->listener->onSuccessfulLogin($this->createLoginSuccessfulEvent($passport));
 
@@ -70,8 +91,10 @@ public function testSuccessfulLoginWhenRememberMeAlwaysIsTrue()
     /**
      * @dataProvider provideRememberMeOptInValues
      */
-    public function testSuccessfulLoginWithOptInRequestParameter($optInValue)
+    public function testSuccessfulHttpLoginWithOptInRequestParameter($optInValue)
     {
+        $this->createHttpRequest();
+
         $this->request->request->set('_remember_me', $optInValue);
         $passport = $this->createPassport();
 
@@ -80,6 +103,20 @@ public function testSuccessfulLoginWithOptInRequestParameter($optInValue)
         $this->assertTrue($passport->getBadge(RememberMeBadge::class)->isEnabled());
     }
 
+    /**
+     * @dataProvider provideRememberMeOptInValues
+     */
+    public function testSuccessfulJsonLoginWithOptInRequestParameter($optInValue)
+    {
+        $this->createJsonRequest(['_remember_me' => $optInValue]);
+
+        $passport = $this->createPassport();
+
+        $this->listener->onSuccessfulLogin($this->createLoginSuccessfulEvent($passport));
+
+        $this->assertTrue($passport->getBadge(RememberMeBadge::class)->isEnabled());
+    }
+
     public static function provideRememberMeOptInValues()
     {
         yield ['true'];
@@ -89,6 +126,20 @@ public static function provideRememberMeOptInValues()
         yield [true];
     }
 
+    private function createHttpRequest(): void
+    {
+        $this->request = Request::create('/login');
+        $this->request->request->set('_remember_me', true);
+        $this->response = new Response();
+    }
+
+    private function createJsonRequest(mixed $content = ['_remember_me' => true]): void
+    {
+        $this->request = Request::create('/login', 'POST', [], [], [], [], json_encode($content));
+        $this->request->headers->add(['Content-Type' => 'application/json']);
+        $this->response = new Response();
+    }
+
     private function createLoginSuccessfulEvent(Passport $passport)
     {
         return new LoginSuccessEvent($this->createMock(AuthenticatorInterface::class), $passport, $this->createMock(TokenInterface::class), $this->request, $this->response, 'main_firewall');

From 5fe525fd2fb004df1fd6e6531fa37db34293fc10 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 24 Feb 2023 10:09:44 +0100
Subject: [PATCH 252/475] [Security] Allow passing remember-me parameters via
 RememberMeBadge

---
 .../Authenticator/JsonLoginAuthenticator.php  | 17 ++++++-------
 .../Passport/Badge/RememberMeBadge.php        |  5 ++++
 .../CheckRememberMeConditionsListener.php     | 24 ++-----------------
 .../Security/Http/ParameterBagUtils.php       | 14 +++++++----
 .../CheckRememberMeConditionsListenerTest.php |  8 +++----
 5 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
index aa147b57ea7d6..8f1dc60b12688 100644
--- a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
+++ b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
@@ -81,7 +81,12 @@ public function supports(Request $request): ?bool
     public function authenticate(Request $request): Passport
     {
         try {
-            $credentials = $this->getCredentials($request);
+            $data = json_decode($request->getContent());
+            if (!$data instanceof \stdClass) {
+                throw new BadRequestHttpException('Invalid JSON.');
+            }
+
+            $credentials = $this->getCredentials($data);
         } catch (BadRequestHttpException $e) {
             $request->setRequestFormat('json');
 
@@ -89,7 +94,7 @@ public function authenticate(Request $request): Passport
         }
 
         $userBadge = new UserBadge($credentials['username'], $this->userProvider->loadUserByIdentifier(...));
-        $passport = new Passport($userBadge, new PasswordCredentials($credentials['password']), [new RememberMeBadge()]);
+        $passport = new Passport($userBadge, new PasswordCredentials($credentials['password']), [new RememberMeBadge((array) $data)]);
 
         if ($this->userProvider instanceof PasswordUpgraderInterface) {
             $passport->addBadge(new PasswordUpgradeBadge($credentials['password'], $this->userProvider));
@@ -137,13 +142,8 @@ public function setTranslator(TranslatorInterface $translator)
         $this->translator = $translator;
     }
 
-    private function getCredentials(Request $request): array
+    private function getCredentials(\stdClass $data): array
     {
-        $data = json_decode($request->getContent());
-        if (!$data instanceof \stdClass) {
-            throw new BadRequestHttpException('Invalid JSON.');
-        }
-
         $credentials = [];
         try {
             $credentials['username'] = $this->propertyAccessor->getValue($data, $this->options['username_path']);
@@ -157,6 +157,7 @@ private function getCredentials(Request $request): array
 
         try {
             $credentials['password'] = $this->propertyAccessor->getValue($data, $this->options['password_path']);
+            $this->propertyAccessor->setValue($data, $this->options['password_path'], null);
 
             if (!\is_string($credentials['password'])) {
                 throw new BadRequestHttpException(sprintf('The key "%s" must be a string.', $this->options['password_path']));
diff --git a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/RememberMeBadge.php b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/RememberMeBadge.php
index 3bf055ffc7e0f..3b35ff447293e 100644
--- a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/RememberMeBadge.php
+++ b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/RememberMeBadge.php
@@ -28,6 +28,11 @@ class RememberMeBadge implements BadgeInterface
 {
     private bool $enabled = false;
 
+    public function __construct(
+        public readonly array $parameters = [],
+    ) {
+    }
+
     /**
      * Enables remember-me cookie creation.
      *
diff --git a/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php b/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php
index 3fe1721d1f3ab..e241fa091b5aa 100644
--- a/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php
+++ b/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php
@@ -13,7 +13,6 @@
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge;
 use Symfony\Component\Security\Http\Event\LoginSuccessEvent;
 use Symfony\Component\Security\Http\ParameterBagUtils;
@@ -55,8 +54,8 @@ public function onSuccessfulLogin(LoginSuccessEvent $event): void
         /** @var RememberMeBadge $badge */
         $badge = $passport->getBadge(RememberMeBadge::class);
         if (!$this->options['always_remember_me']) {
-            $parameter = $this->getParameter($event->getRequest(), $this->options['remember_me_parameter']);
-            if (!('true' === $parameter || 'on' === $parameter || '1' === $parameter || 'yes' === $parameter || true === $parameter)) {
+            $parameter = ParameterBagUtils::getRequestParameterValue($event->getRequest(), $this->options['remember_me_parameter'], $badge->parameters);
+            if (!filter_var($parameter, \FILTER_VALIDATE_BOOL)) {
                 $this->logger?->debug('Remember me disabled; request does not contain remember me parameter ("{parameter}").', ['parameter' => $this->options['remember_me_parameter']]);
 
                 return;
@@ -70,23 +69,4 @@ public static function getSubscribedEvents(): array
     {
         return [LoginSuccessEvent::class => ['onSuccessfulLogin', -32]];
     }
-
-    private function getParameter(Request $request, string $parameterName): mixed
-    {
-        $parameter = ParameterBagUtils::getRequestParameterValue($request, $parameterName);
-        if (null !== $parameter) {
-            return $parameter;
-        }
-
-        if ('application/json' === $request->headers->get('Content-Type')) {
-            $data = json_decode($request->getContent());
-            if (!$data instanceof \stdClass) {
-                return null;
-            }
-
-            return $data->{$parameterName} ?? null;
-        }
-
-        return null;
-    }
 }
diff --git a/src/Symfony/Component/Security/Http/ParameterBagUtils.php b/src/Symfony/Component/Security/Http/ParameterBagUtils.php
index 7f5f735eab864..429103e0332f2 100644
--- a/src/Symfony/Component/Security/Http/ParameterBagUtils.php
+++ b/src/Symfony/Component/Security/Http/ParameterBagUtils.php
@@ -60,22 +60,28 @@ public static function getParameterBagValue(ParameterBag $parameters, string $pa
      *
      * @throws InvalidArgumentException when the given path is malformed
      */
-    public static function getRequestParameterValue(Request $request, string $path): mixed
+    public static function getRequestParameterValue(Request $request, string $path, array $parameters = []): mixed
     {
         if (false === $pos = strpos($path, '[')) {
-            return $request->get($path);
+            return $parameters[$path] ?? $request->get($path);
         }
 
         $root = substr($path, 0, $pos);
 
-        if (null === $value = $request->get($root)) {
+        if (null === $value = $parameters[$root] ?? $request->get($root)) {
             return null;
         }
 
         self::$propertyAccessor ??= PropertyAccess::createPropertyAccessor();
 
         try {
-            return self::$propertyAccessor->getValue($value, substr($path, $pos));
+            $value = self::$propertyAccessor->getValue($value, substr($path, $pos));
+
+            if (null === $value && isset($parameters[$root]) && null !== $value = $request->get($root)) {
+                $value = self::$propertyAccessor->getValue($value, substr($path, $pos));
+            }
+
+            return $value;
         } catch (AccessException) {
             return null;
         }
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php
index adc7c7917410a..4d97ece3894e1 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/CheckRememberMeConditionsListenerTest.php
@@ -59,7 +59,7 @@ public function testSuccessfulJsonLoginWithoutSupportingAuthenticator()
     public function testSuccessfulLoginWithoutRequestParameter()
     {
         $this->request = Request::create('/login');
-        $passport = $this->createPassport();
+        $passport = $this->createPassport([new RememberMeBadge()]);
 
         $this->listener->onSuccessfulLogin($this->createLoginSuccessfulEvent($passport));
 
@@ -110,7 +110,7 @@ public function testSuccessfulJsonLoginWithOptInRequestParameter($optInValue)
     {
         $this->createJsonRequest(['_remember_me' => $optInValue]);
 
-        $passport = $this->createPassport();
+        $passport = $this->createPassport([new RememberMeBadge(['_remember_me' => $optInValue])]);
 
         $this->listener->onSuccessfulLogin($this->createLoginSuccessfulEvent($passport));
 
@@ -133,7 +133,7 @@ private function createHttpRequest(): void
         $this->response = new Response();
     }
 
-    private function createJsonRequest(mixed $content = ['_remember_me' => true]): void
+    private function createJsonRequest(array $content = ['_remember_me' => true]): void
     {
         $this->request = Request::create('/login', 'POST', [], [], [], [], json_encode($content));
         $this->request->headers->add(['Content-Type' => 'application/json']);
@@ -147,6 +147,6 @@ private function createLoginSuccessfulEvent(Passport $passport)
 
     private function createPassport(array $badges = null)
     {
-        return new SelfValidatingPassport(new UserBadge('test', fn ($username) => new InMemoryUser($username, null)), $badges ?? [new RememberMeBadge()]);
+        return new SelfValidatingPassport(new UserBadge('test', fn ($username) => new InMemoryUser($username, null)), $badges ?? [new RememberMeBadge(['_remember_me' => true])]);
     }
 }

From 2eedecf616a5d72a6c0c92f2953dd357977f1cc7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 24 Feb 2023 11:49:11 +0100
Subject: [PATCH 253/475] Fix tests

---
 src/Symfony/Bundle/FrameworkBundle/composer.json       |  4 ++--
 src/Symfony/Component/Cache/Traits/RelayProxy.php      | 10 +++++-----
 .../Component/Mailer/Bridge/MailerSend/composer.json   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index c4795220b6c4a..d1afd4e9c04cd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -45,7 +45,7 @@
         "symfony/form": "^5.4|^6.0",
         "symfony/expression-language": "^5.4|^6.0",
         "symfony/html-sanitizer": "^6.1",
-        "symfony/http-client": "^5.4|^6.0",
+        "symfony/http-client": "^6.3",
         "symfony/lock": "^5.4|^6.0",
         "symfony/mailer": "^5.4|^6.0",
         "symfony/messenger": "^6.3",
@@ -80,7 +80,7 @@
         "symfony/console": "<5.4",
         "symfony/dotenv": "<5.4",
         "symfony/dom-crawler": "<6.3",
-        "symfony/http-client": "<5.4",
+        "symfony/http-client": "<6.3",
         "symfony/form": "<5.4",
         "symfony/lock": "<5.4",
         "symfony/mailer": "<5.4",
diff --git a/src/Symfony/Component/Cache/Traits/RelayProxy.php b/src/Symfony/Component/Cache/Traits/RelayProxy.php
index 32dee4ac1e9e7..ffdd18dd53236 100644
--- a/src/Symfony/Component/Cache/Traits/RelayProxy.php
+++ b/src/Symfony/Component/Cache/Traits/RelayProxy.php
@@ -247,14 +247,14 @@ public function flushall($async = false): \Relay\Relay|bool
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->flushall($async);
     }
 
-    public function fcall($name, $argv = [], $keys = [], $handler = null): mixed
+    public function fcall($name, $keys = [], $argv = [], $handler = null): mixed
     {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->fcall($name, $argv, $keys, $handler);
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->fcall($name, $keys, $argv, $handler);
     }
 
-    public function fcall_ro($name, $argv = [], $keys = [], $handler = null): mixed
+    public function fcall_ro($name, $keys = [], $argv = [], $handler = null): mixed
     {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->fcall_ro($name, $argv, $keys, $handler);
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->fcall_ro($name, $keys, $argv, $handler);
     }
 
     public function function($op, ...$args): mixed
@@ -517,7 +517,7 @@ public function pfadd($key, $elements): \Relay\Relay|false|int
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pfadd($key, $elements);
     }
 
-    public function pfcount($key): \Relay\Relay|int
+    public function pfcount($key): \Relay\Relay|false|int
     {
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->pfcount($key);
     }
diff --git a/src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json b/src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json
index b2d7936e726c2..5c28c2ee4dbdc 100644
--- a/src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json
+++ b/src/Symfony/Component/Mailer/Bridge/MailerSend/composer.json
@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/mailer": "^5.4.21|^6.2.7"
+        "symfony/mailer": "^6.3"
     },
     "require-dev": {
         "symfony/http-client": "^5.4|^6.0"

From 248ee46c11230fbcd4fb8cbe0853be13ecf9180b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 24 Feb 2023 11:56:00 +0100
Subject: [PATCH 254/475] Fix tests

---
 .../Tests/Constraints/LengthValidatorTest.php | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
index 5dbe7523b74f9..96d7959992a79 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
@@ -18,9 +18,6 @@
 
 class LengthValidatorTest extends ConstraintValidatorTestCase
 {
-    // 🧚‍♀️ "Woman Fairy" emoji ZWJ sequence
-    private const SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES = "\u{1F9DA}\u{200D}\u{2640}\u{FE0F}";
-
     protected function createValidator(): LengthValidator
     {
         return new LengthValidator();
@@ -162,23 +159,23 @@ public function testValidNormalizedValues($value)
     public function testValidGraphemesValues()
     {
         $constraint = new Length(min: 1, max: 1, countUnit: Length::COUNT_GRAPHEMES);
-        $this->validator->validate(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES, $constraint);
+        $this->validator->validate("A\u{0300}", $constraint);
 
         $this->assertNoViolation();
     }
 
     public function testValidCodepointsValues()
     {
-        $constraint = new Length(min: 4, max: 4, countUnit: Length::COUNT_CODEPOINTS);
-        $this->validator->validate(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES, $constraint);
+        $constraint = new Length(min: 2, max: 2, countUnit: Length::COUNT_CODEPOINTS);
+        $this->validator->validate("A\u{0300}", $constraint);
 
         $this->assertNoViolation();
     }
 
     public function testValidBytesValues()
     {
-        $constraint = new Length(min: 13, max: 13, countUnit: Length::COUNT_BYTES);
-        $this->validator->validate(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES, $constraint);
+        $constraint = new Length(min: 3, max: 3, countUnit: Length::COUNT_BYTES);
+        $this->validator->validate("A\u{0300}", $constraint);
 
         $this->assertNoViolation();
     }
@@ -353,12 +350,12 @@ public function testInvalidValuesExactDefaultCountUnitWithGraphemeInput()
     {
         $constraint = new Length(min: 1, max: 1, exactMessage: 'myMessage');
 
-        $this->validator->validate(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES, $constraint);
+        $this->validator->validate("A\u{0300}", $constraint);
 
         $this->buildViolation('myMessage')
-            ->setParameter('{{ value }}', '"'.self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES.'"')
+            ->setParameter('{{ value }}', '"'."A\u{0300}".'"')
             ->setParameter('{{ limit }}', 1)
-            ->setInvalidValue(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES)
+            ->setInvalidValue("A\u{0300}")
             ->setPlural(1)
             ->setCode(Length::NOT_EQUAL_LENGTH_ERROR)
             ->assertRaised();
@@ -368,12 +365,12 @@ public function testInvalidValuesExactBytesCountUnitWithGraphemeInput()
     {
         $constraint = new Length(min: 1, max: 1, countUnit: Length::COUNT_BYTES, exactMessage: 'myMessage');
 
-        $this->validator->validate(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES, $constraint);
+        $this->validator->validate("A\u{0300}", $constraint);
 
         $this->buildViolation('myMessage')
-            ->setParameter('{{ value }}', '"'.self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES.'"')
+            ->setParameter('{{ value }}', '"'."A\u{0300}".'"')
             ->setParameter('{{ limit }}', 1)
-            ->setInvalidValue(self::SINGLE_GRAPHEME_WITH_FOUR_CODEPOINTS_AND_THIRTEEN_BYTES)
+            ->setInvalidValue("A\u{0300}")
             ->setPlural(1)
             ->setCode(Length::NOT_EQUAL_LENGTH_ERROR)
             ->assertRaised();

From 11e2164ee5e67c37d28db52c07efb9a9f2a09a56 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Thu, 23 Feb 2023 18:02:29 +0100
Subject: [PATCH 255/475] [FrameworkBundle][HttpClient] Refactor http_client
 decoration strategy

---
 .../FrameworkExtension.php                    | 27 +++++++------------
 .../Resources/config/http_client.php          |  6 ++++-
 .../FrameworkExtensionTestCase.php            | 17 ++++++------
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index eb8a4b9c9b519..618cefb128d62 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2342,7 +2342,7 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
         unset($options['retry_failed']);
         $defaultUriTemplateVars = $options['vars'] ?? [];
         unset($options['vars']);
-        $container->getDefinition('http_client')->setArguments([$options, $config['max_host_connections'] ?? 6]);
+        $container->getDefinition('http_client.transport')->setArguments([$options, $config['max_host_connections'] ?? 6]);
 
         if (!$hasPsr18 = ContainerBuilder::willBeAvailable('psr/http-client', ClientInterface::class, ['symfony/framework-bundle', 'symfony/http-client'])) {
             $container->removeDefinition('psr18.http_client');
@@ -2353,7 +2353,7 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
             $container->removeDefinition(HttpClient::class);
         }
 
-        if ($hasRetryFailed = $this->readConfigEnabled('http_client.retry_failed', $container, $retryOptions)) {
+        if ($this->readConfigEnabled('http_client.retry_failed', $container, $retryOptions)) {
             $this->registerRetryableHttpClient($retryOptions, 'http_client', $container);
         }
 
@@ -2371,15 +2371,8 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
             throw new LogicException('Support for URI template requires symfony/http-client 6.3 or higher, try upgrading.');
         }
 
-        $httpClientId = match (true) {
-            $hasUriTemplate => 'http_client.uri_template.inner',
-            $hasRetryFailed => 'http_client.retryable.inner',
-            $this->isInitializedConfigEnabled('profiler') => '.debug.http_client.inner',
-            default => 'http_client',
-        };
-
         foreach ($config['scoped_clients'] as $name => $scopeConfig) {
-            if ('http_client' === $name) {
+            if ($container->has($name)) {
                 throw new InvalidArgumentException(sprintf('Invalid scope name: "%s" is reserved.', $name));
             }
 
@@ -2394,17 +2387,17 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
 
                 $container->register($name, ScopingHttpClient::class)
                     ->setFactory([ScopingHttpClient::class, 'forBaseUri'])
-                    ->setArguments([new Reference($httpClientId), $baseUri, $scopeConfig])
+                    ->setArguments([new Reference('http_client.transport'), $baseUri, $scopeConfig])
                     ->addTag('http_client.client')
                 ;
             } else {
                 $container->register($name, ScopingHttpClient::class)
-                    ->setArguments([new Reference($httpClientId), [$scope => $scopeConfig], $scope])
+                    ->setArguments([new Reference('http_client.transport'), [$scope => $scopeConfig], $scope])
                     ->addTag('http_client.client')
                 ;
             }
 
-            if ($this->readConfigEnabled('http_client.scoped_clients.'.$name.'retry_failed', $container, $retryOptions)) {
+            if ($this->readConfigEnabled('http_client.scoped_clients.'.$name.'.retry_failed', $container, $retryOptions)) {
                 $this->registerRetryableHttpClient($retryOptions, $name, $container);
             }
 
@@ -2413,7 +2406,7 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
                     ->register($name.'.uri_template', UriTemplateHttpClient::class)
                     ->setDecoratedService($name, null, 7) // Between TraceableHttpClient (5) and RetryableHttpClient (10)
                     ->setArguments([
-                        new Reference('.inner'),
+                        new Reference($name.'.uri_template.inner'),
                         new Reference('http_client.uri_template_expander', ContainerInterface::NULL_ON_INVALID_REFERENCE),
                         $defaultUriTemplateVars,
                     ]);
@@ -2430,8 +2423,8 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
         }
 
         if ($responseFactoryId = $config['mock_response_factory'] ?? null) {
-            $container->register($httpClientId.'.mock_client', MockHttpClient::class)
-                ->setDecoratedService($httpClientId, null, -10) // lower priority than TraceableHttpClient
+            $container->register('http_client.mock_client', MockHttpClient::class)
+                ->setDecoratedService('http_client.transport', null, -10)  // lower priority than TraceableHttpClient (5)
                 ->setArguments([new Reference($responseFactoryId)]);
         }
     }
@@ -2464,7 +2457,7 @@ private function regist
10000
erRetryableHttpClient(array $options, string $name, Conta
 
         $container
             ->register($name.'.retryable', RetryableHttpClient::class)
-            ->setDecoratedService($name, null, 10) // higher priority than TraceableHttpClient
+            ->setDecoratedService($name, null, 10) // higher priority than TraceableHttpClient (5)
             ->setArguments([new Reference($name.'.retryable.inner'), $retryStrategy, $options['max_retries'], new Reference('logger')])
             ->addTag('monolog.logger', ['channel' => 'http_client']);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php
index 7a9f2e3b14c92..93d4665750ac1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php
@@ -23,7 +23,7 @@
 
 return static function (ContainerConfigurator $container) {
     $container->services()
-        ->set('http_client', HttpClientInterface::class)
+        ->set('http_client.transport', HttpClientInterface::class)
             ->factory([HttpClient::class, 'create'])
             ->args([
                 [], // default options
@@ -32,6 +32,10 @@
             ->call('setLogger', [service('logger')->ignoreOnInvalid()])
             ->tag('monolog.logger', ['channel' => 'http_client'])
             ->tag('kernel.reset', ['method' => 'reset', 'on_invalid' => 'ignore'])
+
+        ->set('http_client', HttpClientInterface::class)
+            ->factory('current')
+            ->args([[service('http_client.transport')]])
             ->tag('http_client.client')
 
         ->alias(HttpClientInterface::class, 'http_client')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
index e53bedf6ee497..4af61f85cf07a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -55,7 +55,6 @@
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\RetryableHttpClient;
 use Symfony\Component\HttpClient\ScopingHttpClient;
-use Symfony\Component\HttpClient\UriTemplateHttpClient;
 use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
 use Symfony\Component\HttpKernel\Fragment\FragmentUriGeneratorInterface;
 use Symfony\Component\Messenger\Transport\TransportFactory;
@@ -1846,14 +1845,14 @@ public function testRobotsTagListenerIsRegisteredInDebugMode()
     public function testHttpClientDefaultOptions()
     {
         $container = $this->createContainerFromFile('http_client_default_options');
-        $this->assertTrue($container->hasDefinition('http_client'), '->registerHttpClientConfiguration() loads http_client.xml');
+        $this->assertTrue($container->hasDefinition('http_client.transport'), '->registerHttpClientConfiguration() loads http_client.xml');
 
         $defaultOptions = [
             'headers' => [],
             'resolve' => [],
             'extra' => [],
         ];
-        $this->assertSame([$defaultOptions, 4], $container->getDefinition('http_client')->getArguments());
+        $this->assertSame([$defaultOptions, 4], $container->getDefinition('http_client.transport')->getArguments());
 
         $this->assertTrue($container->hasDefinition('foo'), 'should have the "foo" service.');
         $this->assertSame(ScopingHttpClient::class, $container->getDefinition('foo')->getClass());
@@ -1871,9 +1870,9 @@ public function testHttpClientOverrideDefaultOptions()
     {
         $container = $this->createContainerFromFile('http_client_override_default_options');
 
-        $this->assertSame(['foo' => 'bar'], $container->getDefinition('http_client')->getArgument(0)['headers']);
-        $this->assertSame(['foo' => 'bar'], $container->getDefinition('http_client')->getArgument(0)['extra']);
-        $this->assertSame(4, $container->getDefinition('http_client')->getArgument(1));
+        $this->assertSame(['foo' => 'bar'], $container->getDefinition('http_client.transport')->getArgument(0)['headers']);
+        $this->assertSame(['foo' => 'bar'], $container->getDefinition('http_client.transport')->getArgument(0)['extra']);
+        $this->assertSame(4, $container->getDefinition('http_client.transport')->getArgument(1));
         $this->assertSame('http://example.com', $container->getDefinition('foo')->getArgument(1));
 
         $expected = [
@@ -1926,7 +1925,7 @@ public function testHttpClientFullDefaultOptions()
     {
         $container = $this->createContainerFromFile('http_client_full_default_options');
 
-        $defaultOptions = $container->getDefinition('http_client')->getArgument(0);
+        $defaultOptions = $container->getDefinition('http_client.transport')->getArgument(0);
 
         $this->assertSame(['X-powered' => 'PHP'], $defaultOptions['headers']);
         $this->assertSame(2, $defaultOptions['max_redirects']);
@@ -2004,7 +2003,7 @@ public function testHttpClientMockResponseFactory()
     {
         $container = $this->createContainerFromFile('http_client_mock_response_factory');
 
-        $definition = $container->getDefinition(($uriTemplateHttpClientExists = class_exists(UriTemplateHttpClient::class)) ? 'http_client.uri_template.inner.mock_client' : 'http_client.mock_client');
+        $definition = $container->getDefinition('http_client.mock_client');
 
         $this->assertSame(MockHttpClient::class, $definition->getClass());
         $this->assertCount(1, $definition->getArguments());
@@ -2012,7 +2011,7 @@ public function testHttpClientMockResponseFactory()
         $argument = $definition->getArgument(0);
 
         $this->assertInstanceOf(Reference::class, $argument);
-        $this->assertSame($uriTemplateHttpClientExists ? 'http_client.uri_template.inner' : 'http_client', current($definition->getDecoratedService()));
+        $this->assertSame('http_client.transport', current($definition->getDecoratedService()));
         $this->assertSame('my_response_factory', (string) $argument);
     }
 

From 834a550b36cc24b74c5563bb87da70278f5ae055 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 24 Feb 2023 15:34:07 +0100
Subject: [PATCH 256/475] [DependencyInjection] Optimize out "current()" when
 it's used as service factory

---
 .../DependencyInjection/Dumper/PhpDumper.php  |  3 +
 .../Tests/Dumper/PhpDumperTest.php            | 31 +++++++++
 .../php/services_current_factory_inlining.php | 68 +++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_current_factory_inlining.php

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 75409395cfaa5..5eab1b56d0e9c 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1154,6 +1154,9 @@ private function addNewInstance(Definition $definition, string $return = '', str
         if (null !== $definition->getFactory()) {
             $callable = $definition->getFactory();
 
+            if ('current' === $callable && [0] === array_keys($definition->getArguments()) && \is_array($value) && [0] === array_keys($value)) {
+                return $return.$this->dumpValue($value[0]).$tail;
+            }
             if (['Closure', 'fromCallable'] === $callable && [0] === array_keys($definition->getArguments())) {
                 $callable = $definition->getArgument(0);
                 if ($callable instanceof ServiceClosureArgument) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 2c5c61b5bea59..57f7325e8615e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -1503,6 +1503,37 @@ public function testWitherWithStaticReturnType()
         $this->assertInstanceOf(Foo::class, $wither->foo);
     }
 
+    public function testCurrentFactoryInlining()
+    {
+        $container = new ContainerBuilder();
+        $container->register(Foo::class);
+
+        $container
+            ->register('inlined_current', Foo::class)
+            ->setFactory('current')
+            ->setPublic(true)
+            ->setArguments([[new Reference(Foo::class)]]);
+
+        $container
+            ->register('not_inlined_current', Foo::class)
+            ->setFactory('current')
+            ->setPublic(true)
+            ->setArguments([[new Reference(Foo::class), 123]]);
+
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        $dump = $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Service_CurrentFactoryInlining']);
+        file_put_contents(self::$fixturesPath.'/php/services_current_factory_inlining.php', $dump);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_current_factory_inlining.php', $dump);
+        eval('?>'.$dump);
+
+        $container = new \Symfony_DI_PhpDumper_Service_CurrentFactoryInlining();
+
+        $foo = $container->get('inlined_current');
+        $this->assertInstanceOf(Foo::class, $foo);
+        $this->assertSame($foo, $container->get('not_inlined_current'));
+    }
+
     public function testDumpServiceWithAbstractArgument()
     {
         $this->expectException(RuntimeException::class);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_current_factory_inlining.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_current_factory_inlining.php
new file mode 100644
index 0000000000000..4c641bc877871
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_current_factory_inlining.php
@@ -0,0 +1,68 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class Symfony_DI_PhpDumper_Service_CurrentFactoryInlining extends Container
+{
+    protected $parameters = [];
+    protected readonly \WeakReference $ref;
+
+    public function __construct()
+    {
+        $this->ref = \WeakReference::create($this);
+        $this->services = $this->privates = [];
+        $this->methodMap = [
+            'inlined_current' => 'getInlinedCurrentService',
+            'not_inlined_current' => 'getNotInlinedCurrentService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function compile(): void
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled(): bool
+    {
+        return true;
+    }
+
+    public function getRemovedIds(): array
+    {
+        return [
+            'Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo' => true,
+        ];
+    }
+
+    /**
+     * Gets the public 'inlined_current' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Compiler\Foo
+     */
+    protected static function getInlinedCurrentService($container)
+    {
+        return $container->services['inlined_current'] = ($container->privates['Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo());
+    }
+
+    /**
+     * Gets the public 'not_inlined_current' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Compiler\Foo
+     */
+    protected static function getNotInlinedCurrentService($container)
+    {
+        return $container->services['not_inlined_current'] = \current([($container->privates['Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo()), 123]);
+    }
+}

From 29054b1cc6b61a6625a0e17caa014d3f55d30a89 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sat, 25 Feb 2023 00:38:28 +0100
Subject: [PATCH 257/475] Fix merge

---
 .../Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 57f7325e8615e..0f1e0f3cced4e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -1523,7 +1523,6 @@ public function testCurrentFactoryInlining()
         $container->compile();
         $dumper = new PhpDumper($container);
         $dump = $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Service_CurrentFactoryInlining']);
-        file_put_contents(self::$fixturesPath.'/php/services_current_factory_inlining.php', $dump);
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_current_factory_inlining.php', $dump);
         eval('?>'.$dump);
 

From 29e2e13f6bb1ea299b5ffba9c322fbac041831be Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Mon, 27 Feb 2023 17:42:38 +0100
Subject: [PATCH 258/475] [TwigBridge] Fix TwigDataCollector::getTime() return
 type

---
 src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
index cfdba17b4576e..e261a0505b048 100644
--- a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
+++ b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
@@ -78,7 +78,7 @@ public function lateCollect(): void
         $templateFinder($this->profile);
     }
 
-    public function getTime(): int
+    public function getTime(): float
     {
         return $this->getProfile()->getDuration() * 1000;
     }

From 474c1e0d267f4980b2359203f04e0a15ed5d0171 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Wed, 1 Mar 2023 11:25:45 +0100
Subject: [PATCH 259/475] Fix typo

---
 src/Symfony/Contracts/Deprecation/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Contracts/Deprecation/README.md b/src/Symfony/Contracts/Deprecation/README.md
index 4957933a6cc50..9814864c03f58 100644
--- a/src/Symfony/Contracts/Deprecation/README.md
+++ b/src/Symfony/Contracts/Deprecation/README.md
@@ -22,5 +22,5 @@ trigger_deprecation('symfony/blockchain', '8.9', 'Using "%s" is deprecated, use
 This will generate the following message:
 `Since symfony/blockchain 8.9: Using "bitcoin" is deprecated, use "fabcoin" instead.`
 
-While not necessarily recommended, the deprecation notices can be completely ignored by declaring an empty
+While not recommended, the deprecation notices can be completely ignored by declaring an empty
 `function trigger_deprecation() {}` in your application.

From b81de32cb5e0a2902ad610f5455764eb10a650a3 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Wed, 1 Mar 2023 11:32:47 +0100
Subject: [PATCH 260/475] Fix typo

---
 src/Symfony/Contracts/Cache/README.md           | 2 +-
 src/Symfony/Contracts/EventDispatcher/README.md | 2 +-
 src/Symfony/Contracts/HttpClient/README.md      | 2 +-
 src/Symfony/Contracts/Service/README.md         | 2 +-
 src/Symfony/Contracts/Translation/README.md     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Contracts/Cache/README.md b/src/Symfony/Contracts/Cache/README.md
index 7085a6996e4d7..ffe0833afa360 100644
--- a/src/Symfony/Contracts/Cache/README.md
+++ b/src/Symfony/Contracts/Cache/README.md
@@ -3,7 +3,7 @@ Symfony Cache Contracts
 
 A set of abstractions extracted out of the Symfony components.
 
-Can be used to build on semantics that the Symfony components proved useful - and
+Can be used to build on semantics that the Symfony components proved useful and
 that already have battle tested implementations.
 
 See https://github.com/symfony/contracts/blob/main/README.md for more information.
diff --git a/src/Symfony/Contracts/EventDispatcher/README.md b/src/Symfony/Contracts/EventDispatcher/README.md
index b1ab4c00ceae2..332b961cb8810 100644
--- a/src/Symfony/Contracts/EventDispatcher/README.md
+++ b/src/Symfony/Contracts/EventDispatcher/README.md
@@ -3,7 +3,7 @@ Symfony EventDispatcher Contracts
 
 A set of abstractions extracted out of the Symfony components.
 
-Can be used to build on semantics that the Symfony components proved useful - and
+Can be used to build on semantics that the Symfony components proved useful and
 that already have battle tested implementations.
 
 See https://github.com/symfony/contracts/blob/main/README.md for more information.
diff --git a/src/Symfony/Contracts/HttpClient/README.md b/src/Symfony/Contracts/HttpClient/README.md
index 03b3a69b70208..24d72f566a879 100644
--- a/src/Symfony/Contracts/HttpClient/README.md
+++ b/src/Symfony/Contracts/HttpClient/README.md
@@ -3,7 +3,7 @@ Symfony HttpClient Contracts
 
 A set of abstractions extracted out of the Symfony components.
 
-Can be used to build on semantics that the Symfony components proved useful - and
+Can be used to build on semantics that the Symfony components proved useful and
 that already have battle tested implementations.
 
 See https://github.com/symfony/contracts/blob/main/README.md for more information.
diff --git a/src/Symfony/Contracts/Service/README.md b/src/Symfony/Contracts/Service/README.md
index 41e054a101cf4..42841a57d0908 100644
--- a/src/Symfony/Contracts/Service/README.md
+++ b/src/Symfony/Contracts/Service/README.md
@@ -3,7 +3,7 @@ Symfony Service Contracts
 
 A set of abstractions extracted out of the Symfony components.
 
-Can be used to build on semantics that the Symfony components proved useful - and
+Can be used to build on semantics that the Symfony components proved useful and
 that already have battle tested implementations.
 
 See https://github.com/symfony/contracts/blob/main/README.md for more information.
diff --git a/src/Symfony/Contracts/Translation/README.md b/src/Symfony/Contracts/Translation/README.md
index 42e5c51754ed6..b211d5849c818 100644
--- a/src/Symfony/Contracts/Translation/README.md
+++ b/src/Symfony/Contracts/Translation/README.md
@@ -3,7 +3,7 @@ Symfony Translation Contracts
 
 A set of abstractions extracted out of the Symfony components.
 
-Can be used to build on semantics that the Symfony components proved useful - and
+Can be used to build on semantics that the Symfony components proved useful and
 that already have battle tested implementations.
 
 See https://github.com/symfony/contracts/blob/main/README.md for more information.

From 1650e3861b5fcd931e5d3eb1dd84bad764020d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Fri, 24 Feb 2023 13:02:50 -0500
Subject: [PATCH 261/475] [Console] Add support for managing exit code while
 handling signals

---
 .github/expected-missing-return-types.diff    | 158 ++++++++++--------
 UPGRADE-6.3.md                                |   6 +
 src/Symfony/Component/Console/Application.php |  59 +++++--
 src/Symfony/Component/Console/CHANGELOG.md    |   2 +-
 .../Command/SignalableCommandInterface.php    |   6 +-
 .../Console/Event/ConsoleSignalEvent.php      |  23 ++-
 .../Console/Tests/ApplicationTest.php         | 118 ++++++++++++-
 .../Console/Tests/ConsoleEventsTest.php       |  14 ++
 .../Tests/Fixtures/application_signalable.php |   6 +-
 .../SignalRegistry/SignalRegistryTest.php     |   9 +-
 .../Tests/phpt/signal/command_exit.phpt       |  56 +++++++
 11 files changed, 354 insertions(+), 103 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Tests/phpt/signal/command_exit.phpt

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index 560812c159b46..fc406bbc5a39f 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -278,7 +278,7 @@ index 9975c46cba..c7bbad69b2 100644
      {
          if (!class_exists(ConsoleFormatter::class)) {
 diff --git a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
-index 7ee64c62f1..644f68790c 100644
+index 718be59c13..091f24a8f8 100644
 --- a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
 +++ b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
 @@ -81,5 +81,5 @@ class MailerHandler extends AbstractProcessingHandler
@@ -325,7 +325,7 @@ index df2a718720..2ccab3649f 100644
      {
          $this->commandData = [
 diff --git a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
-index 08427180f2..96e65ec833 100644
+index c1ce2898da..7a9bf04e18 100644
 --- a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
 +++ b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php
 @@ -94,5 +94,5 @@ class DebugProcessor implements DebugLoggerInterface, ResetInterface
@@ -560,7 +560,7 @@ index e8c2ad3a0e..d8b3b64f5d 100644
      {
          if (!$container->hasDefinition('assets.context')) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
-index af20aaa951..c2c0285d11 100644
+index 1e08ef3149..530bbdc4cd 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
 @@ -29,5 +29,5 @@ class ContainerBuilderDebugDumpPass implements CompilerPassInterface
@@ -569,7 +569,7 @@ index af20aaa951..c2c0285d11 100644
 -    public function process(ContainerBuilder $container)
 +    public function process(ContainerBuilder $container): void
      {
-         $cache = new ConfigCache($container->getParameter('debug.container.dump'), true);
+         if (!$container->getParameter('debug.container.dump')) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/DataCollectorTranslatorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/DataCollectorTranslatorPass.php
 index e66e98b451..7714d62f3e 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/DataCollectorTranslatorPass.php
@@ -659,17 +659,17 @@ index bda9ca9515..c0d1f91339 100644
      {
          if (!$container->hasParameter('workflow.has_guard_listeners')) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-index 7292ed0f79..6b3403f2b8 100644
+index 618cefb128..a8bedab1ef 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-@@ -270,5 +270,5 @@ class FrameworkExtension extends Extension
+@@ -273,5 +273,5 @@ class FrameworkExtension extends Extension
       * @throws LogicException
       */
 -    public function load(array $configs, ContainerBuilder $container)
 +    public function load(array $configs, ContainerBuilder $container): void
      {
          $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
-@@ -2706,5 +2706,5 @@ class FrameworkExtension extends Extension
+@@ -2741,5 +2741,5 @@ class FrameworkExtension extends Extension
       * @return void
       */
 -    public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)
@@ -677,7 +677,7 @@ index 7292ed0f79..6b3403f2b8 100644
      {
          trigger_deprecation('symfony/framework-bundle', '6.2', 'The "%s()" method is deprecated.', __METHOD__);
 diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
-index c5af22c913..667c3cfd8b 100644
+index 7f48810e50..f85b13d818 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
 @@ -93,5 +93,5 @@ class FrameworkBundle extends Bundle
@@ -686,8 +686,8 @@ index c5af22c913..667c3cfd8b 100644
 -    public function boot()
 +    public function boot(): void
      {
-         ErrorHandler::register(null, false)->throwAt($this->container->getParameter('debug.error_handler.throw_at'), true);
-@@ -109,5 +109,5 @@ class FrameworkBundle extends Bundle
+         $handler = ErrorHandler::register(null, false);
+@@ -110,5 +110,5 @@ class FrameworkBundle extends Bundle
       * @return void
       */
 -    public function build(ContainerBuilder $container)
@@ -2092,7 +2092,7 @@ index cc024da461..00b79e915f 100644
      {
          $errors = [];
 diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
-index 8e24667bc6..b48ab19e04 100644
+index dd8d29d1d1..07262bf107 100644
 --- a/src/Symfony/Component/Console/Application.php
 +++ b/src/Symfony/Component/Console/Application.php
 @@ -114,5 +114,5 @@ class Application implements ResetInterface
@@ -2317,6 +2317,16 @@ index 5850c3d7b8..e2371f88fd 100644
 +    protected function configure(): void
      {
          $this
+diff --git a/src/Symfony/Component/Console/Command/SignalableCommandInterface.php b/src/Symfony/Component/Console/Command/SignalableCommandInterface.php
+index 4d0876003d..d33732acb6 100644
+--- a/src/Symfony/Component/Console/Command/SignalableCommandInterface.php
++++ b/src/Symfony/Component/Console/Command/SignalableCommandInterface.php
+@@ -31,4 +31,4 @@ interface SignalableCommandInterface
+      * @return int|false The exit code to return or false to continue the normal execution
+      */
+-    public function handleSignal(int $signal, /* int|false $previousExitCode = 0 */);
++    public function handleSignal(int $signal, /* int|false $previousExitCode = 0 */): int|false;
+ }
 diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
 index 27705ddb63..1b25473f75 100644
 --- a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -2620,7 +2630,7 @@ index 84dbef950c..5a38c8c28a 100644
      {
          self::$formatters ??= self::initPlaceholderFormatters();
 diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
-index c595ca1968..4222beac6b 100644
+index 40c6a65663..8a65738606 100644
 --- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
 +++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
 @@ -93,5 +93,5 @@ class QuestionHelper extends Helper
@@ -2958,7 +2968,7 @@ index 9c0049c8f9..6ab9a753d5 100644
  
      public function section(): ConsoleSectionOutput;
 diff --git a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
-index 689f39d2f0..d04287e801 100644
+index 3f3f1434be..594880b9e3 100644
 --- a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
 +++ b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
 @@ -64,5 +64,5 @@ class ConsoleSectionOutput extends StreamOutput
@@ -2975,7 +2985,7 @@ index 689f39d2f0..d04287e801 100644
 +    public function overwrite(string|iterable $message): void
      {
          $this->clear();
-@@ -157,5 +157,5 @@ class ConsoleSectionOutput extends StreamOutput
+@@ -167,5 +167,5 @@ class ConsoleSectionOutput extends StreamOutput
       * @return void
       */
 -    protected function doWrite(string $message, bool $newline)
@@ -3280,150 +3290,150 @@ index e25a65bd24..1d4bb7fe71 100644
 +    public function progressFinish(): void;
  }
 diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
-index 52d9b5edc9..3026cfccf4 100644
+index cecce6c01b..f2e0c7fdf5 100644
 --- a/src/Symfony/Component/Console/Style/SymfonyStyle.php
 +++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php
-@@ -63,5 +63,5 @@ class SymfonyStyle extends OutputStyle
+@@ -64,5 +64,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function block(string|array $messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = true)
 +    public function block(string|array $messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = true): void
      {
          $messages = \is_array($messages) ? array_values($messages) : [$messages];
-@@ -75,5 +75,5 @@ class SymfonyStyle extends OutputStyle
+@@ -76,5 +76,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function title(string $message)
 +    public function title(string $message): void
      {
          $this->autoPrependBlock();
-@@ -88,5 +88,5 @@ class SymfonyStyle extends OutputStyle
+@@ -89,5 +89,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function section(string $message)
 +    public function section(string $message): void
      {
          $this->autoPrependBlock();
-@@ -101,5 +101,5 @@ class SymfonyStyle extends OutputStyle
+@@ -102,5 +102,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function listing(array $elements)
 +    public function listing(array $elements): void
      {
          $this->autoPrependText();
-@@ -113,5 +113,5 @@ class SymfonyStyle extends OutputStyle
+@@ -114,5 +114,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function text(string|array $message)
 +    public function text(string|array $message): void
      {
          $this->autoPrependText();
-@@ -128,5 +128,5 @@ class SymfonyStyle extends OutputStyle
+@@ -129,5 +129,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function comment(string|array $message)
 +    public function comment(string|array $message): void
      {
          $this->block($message, null, null, '<fg=default;bg=default> // </>', false, false);
-@@ -136,5 +136,5 @@ class SymfonyStyle extends OutputStyle
+@@ -137,5 +137,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function success(string|array $message)
 +    public function success(string|array $message): void
      {
          $this->block($message, 'OK', 'fg=black;bg=green', ' ', true);
-@@ -144,5 +144,5 @@ class SymfonyStyle extends OutputStyle
+@@ -145,5 +145,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function error(string|array $message)
 +    public function error(string|array $message): void
      {
          $this->block($message, 'ERROR', 'fg=white;bg=red', ' ', true);
-@@ -152,5 +152,5 @@ class SymfonyStyle extends OutputStyle
+@@ -153,5 +153,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function warning(string|array $message)
 +    public function warning(string|array $message): void
      {
          $this->block($message, 'WARNING', 'fg=black;bg=yellow', ' ', true);
-@@ -160,5 +160,5 @@ class SymfonyStyle extends OutputStyle
+@@ -161,5 +161,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function note(string|array $message)
 +    public function note(string|array $message): void
      {
          $this->block($message, 'NOTE', 'fg=yellow', ' ! ');
-@@ -170,5 +170,5 @@ class SymfonyStyle extends OutputStyle
+@@ -171,5 +171,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function info(string|array $message)
 +    public function info(string|array $message): void
      {
          $this->block($message, 'INFO', 'fg=green', ' ', true);
-@@ -178,5 +178,5 @@ class SymfonyStyle extends OutputStyle
+@@ -179,5 +179,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function caution(string|array $message)
 +    public function caution(string|array $message): void
      {
          $this->block($message, 'CAUTION', 'fg=white;bg=red', ' ! ', true);
-@@ -186,5 +186,5 @@ class SymfonyStyle extends OutputStyle
+@@ -187,5 +187,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function table(array $headers, array $rows)
 +    public function table(array $headers, array $rows): void
      {
          $this->createTable()
-@@ -202,5 +202,5 @@ class SymfonyStyle extends OutputStyle
+@@ -203,5 +203,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function horizontalTable(array $headers, array $rows)
 +    public function horizontalTable(array $headers, array $rows): void
      {
          $this->createTable()
-@@ -224,5 +224,5 @@ class SymfonyStyle extends OutputStyle
+@@ -225,5 +225,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function definitionList(string|array|TableSeparator ...$list)
 +    public function definitionList(string|array|TableSeparator ...$list): void
      {
          $headers = [];
-@@ -288,5 +288,5 @@ class SymfonyStyle extends OutputStyle
+@@ -289,5 +289,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function progressStart(int $max = 0)
 +    public function progressStart(int $max = 0): void
      {
          $this->progressBar = $this->createProgressBar($max);
-@@ -297,5 +297,5 @@ class SymfonyStyle extends OutputStyle
+@@ -298,5 +298,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function progressAdvance(int $step = 1)
 +    public function progressAdvance(int $step = 1): void
      {
          $this->getProgressBar()->advance($step);
-@@ -305,5 +305,5 @@ class SymfonyStyle extends OutputStyle
+@@ -306,5 +306,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function progressFinish()
 +    public function progressFinish(): void
      {
          $this->getProgressBar()->finish();
-@@ -356,5 +356,5 @@ class SymfonyStyle extends OutputStyle
+@@ -362,5 +362,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function writeln(string|iterable $messages, int $type = self::OUTPUT_NORMAL)
 +    public function writeln(string|iterable $messages, int $type = self::OUTPUT_NORMAL): void
      {
          if (!is_iterable($messages)) {
-@@ -371,5 +371,5 @@ class SymfonyStyle extends OutputStyle
+@@ -377,5 +377,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function write(string|iterable $messages, bool $newline = false, int $type = self::OUTPUT_NORMAL)
 +    public function write(string|iterable $messages, bool $newline = false, int $type = self::OUTPUT_NORMAL): void
      {
          if (!is_iterable($messages)) {
-@@ -386,5 +386,5 @@ class SymfonyStyle extends OutputStyle
+@@ -392,5 +392,5 @@ class SymfonyStyle extends OutputStyle
       * @return void
       */
 -    public function newLine(int $count = 1)
@@ -3543,7 +3553,7 @@ index 3f070dcc0c..aa0e5186bf 100644
      {
          foreach ($container->findTaggedServiceIds('auto_alias') as $serviceId => $tags) {
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
-index 4d419a273b..dfbe815bde 100644
+index 3bcaa812cf..e1ca4cd038 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
 +++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
 @@ -64,5 +64,5 @@ class AutowirePass extends AbstractRecursivePass
@@ -3576,7 +3586,7 @@ index c62345f26e..098772e2ef 100644
      {
          foreach ($container->getDefinitions() as $id => $definition) {
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
-index 6e86da0d57..a835cb345b 100644
+index 8f828d3221..fb41bd49a3 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
 +++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
 @@ -29,5 +29,5 @@ class CheckExceptionOnInvalidReferenceBehaviorPass extends AbstractRecursivePass
@@ -4326,24 +4336,24 @@ index f4c6b29258..1402331f9e 100644
 +    public function instantiateProxy(ContainerInterface $container, Definition $definition, string $id, callable $realInstantiator): object;
  }
 diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
-index d6b046c9f6..7a4eaa5abc 100644
+index 62ac252dd7..466206277a 100644
 --- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
 +++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
-@@ -93,5 +93,5 @@ abstract class FileLoader extends BaseFileLoader
+@@ -99,5 +99,5 @@ abstract class FileLoader extends BaseFileLoader
       * @return void
       */
 -    public function registerClasses(Definition $prototype, string $namespace, string $resource, string|array $exclude = null/* , string $source = null */)
 +    public function registerClasses(Definition $prototype, string $namespace, string $resource, string|array $exclude = null/* , string $source = null */): void
      {
          if (!str_ends_with($namespace, '\\')) {
-@@ -155,5 +155,5 @@ abstract class FileLoader extends BaseFileLoader
+@@ -191,5 +191,5 @@ abstract class FileLoader extends BaseFileLoader
       * @return void
       */
 -    public function registerAliasesForSinglyImplementedInterfaces()
 +    public function registerAliasesForSinglyImplementedInterfaces(): void
      {
          foreach ($this->interfaces as $interface) {
-@@ -171,5 +171,5 @@ abstract class FileLoader extends BaseFileLoader
+@@ -207,5 +207,5 @@ abstract class FileLoader extends BaseFileLoader
       * @return void
       */
 -    protected function setDefinition(string $id, Definition $definition)
@@ -5421,7 +5431,7 @@ index 9b6b830341..9c656316e4 100644
      {
          $this
 diff --git a/src/Symfony/Component/Form/DataMapperInterface.php b/src/Symfony/Component/Form/DataMapperInterface.php
-index 7979db836d..ac37f715f1 100644
+index f04137aec6..4e874c8730 100644
 --- a/src/Symfony/Component/Form/DataMapperInterface.php
 +++ b/src/Symfony/Component/Form/DataMapperInterface.php
 @@ -30,5 +30,5 @@ interface DataMapperInterface
@@ -5979,7 +5989,7 @@ index aea35410c1..03a13b5a52 100644
      {
          $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
-index c1b5f3e627..c393619784 100644
+index 3ddfbfeb1c..309f8dd641 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
 @@ -27,5 +27,5 @@ class NumberType extends AbstractType
@@ -5996,7 +6006,7 @@ index c1b5f3e627..c393619784 100644
 +    public function buildView(FormView $view, FormInterface $form, array $options): void
      {
          if ($options['html5']) {
-@@ -56,5 +56,5 @@ class NumberType extends AbstractType
+@@ -60,5 +60,5 @@ class NumberType extends AbstractType
       * @return void
       */
 -    public function configureOptions(OptionsResolver $resolver)
@@ -6479,7 +6489,7 @@ index cc3e5e1207..f9c85b9a0a 100644
      {
          $builder->setRequestHandler($this->requestHandler);
 diff --git a/src/Symfony/Component/Form/Extension/PasswordHasher/EventListener/PasswordHasherListener.php b/src/Symfony/Component/Form/Extension/PasswordHasher/EventListener/PasswordHasherListener.php
-index f905a7e034..16245f0b6e 100644
+index 4854dd3e73..b61c5664f6 100644
 --- a/src/Symfony/Component/Form/Extension/PasswordHasher/EventListener/PasswordHasherListener.php
 +++ b/src/Symfony/Component/Form/Extension/PasswordHasher/EventListener/PasswordHasherListener.php
 @@ -39,5 +39,5 @@ class PasswordHasherListener
@@ -6488,8 +6498,8 @@ index f905a7e034..16245f0b6e 100644
 -    public function registerPassword(FormEvent $event)
 +    public function registerPassword(FormEvent $event): void
      {
-         $this->assertNotMapped($event->getForm());
-@@ -53,5 +53,5 @@ class PasswordHasherListener
+         if (null === $event->getData() || '' === $event->getData()) {
+@@ -57,5 +57,5 @@ class PasswordHasherListener
       * @return void
       */
 -    public function hashPasswords(FormEvent $event)
@@ -6883,10 +6893,10 @@ index e0b96a5ac3..7982e0cab3 100644
  
      /**
 diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php
-index 05a8e6b4c6..232bed6fac 100644
+index 0b6e495806..8cef2cad7c 100644
 --- a/src/Symfony/Component/HttpClient/CachingHttpClient.php
 +++ b/src/Symfony/Component/HttpClient/CachingHttpClient.php
-@@ -139,5 +139,5 @@ class CachingHttpClient implements HttpClientInterface, ResetInterface
+@@ -140,5 +140,5 @@ class CachingHttpClient implements HttpClientInterface, ResetInterface
       * @return void
       */
 -    public function reset()
@@ -6905,10 +6915,10 @@ index 472437e465..1dfe39146b 100644
      {
          if ($this->client instanceof ResetInterface) {
 diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
-index 38c544b4b1..9945f480d2 100644
+index 767893bf4b..512ff2daf6 100644
 --- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
 +++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
-@@ -558,5 +558,5 @@ trait HttpClientTrait
+@@ -562,5 +562,5 @@ trait HttpClientTrait
       * @return string
       */
 -    private static function removeDotSegments(string $path)
@@ -7070,7 +7080,7 @@ index 44d8d96d28..43124c0ea0 100644
      {
          unset($this->parameters[$key]);
 diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
-index b5bd672f34..68f91c99ea 100644
+index ec2402f221..09703104ea 100644
 --- a/src/Symfony/Component/HttpFoundation/Request.php
 +++ b/src/Symfony/Component/HttpFoundation/Request.php
 @@ -267,5 +267,5 @@ class Request
@@ -7470,7 +7480,7 @@ index 65452a5207..ce0357e36b 100644
      {
          // connect if we are not yet
 diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
-index 79c03a8e09..69214b00d1 100644
+index ebe4b748ad..059a6b5ac8 100644
 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
 +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MetadataBag.php
 @@ -55,5 +55,5 @@ class MetadataBag implements SessionBagInterface
@@ -8007,7 +8017,7 @@ index cec23e1970..946d9f6802 100644
      {
          foreach ($this->extensions as $extension) {
 diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
-index b294036d4e..517e958f6b 100644
+index d0e05340d8..18b5beb201 100644
 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
 +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
 @@ -37,5 +37,5 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
@@ -8189,31 +8199,31 @@ index 4730b33c13..da8fdccfaa 100644
      {
          if (str_contains($response->getContent(), '<esi:include')) {
 diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
-index 78531624fb..2b568e62de 100644
+index f17c07c071..a6fe17c50b 100644
 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
 +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
-@@ -240,5 +240,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
+@@ -244,5 +244,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
       * @return void
       */
 -    public function terminate(Request $request, Response $response)
 +    public function terminate(Request $request, Response $response): void
      {
          // Do not call any listeners in case of a cache hit.
-@@ -460,5 +460,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
+@@ -464,5 +464,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
       * @return Response
       */
 -    protected function forward(Request $request, bool $catch = false, Response $entry = null)
 +    protected function forward(Request $request, bool $catch = false, Response $entry = null): Response
      {
          $this->surrogate?->addSurrogateCapability($request);
-@@ -594,5 +594,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
+@@ -598,5 +598,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
       * @throws \Exception
       */
 -    protected function store(Request $request, Response $response)
 +    protected function store(Request $request, Response $response): void
      {
          try {
-@@ -649,5 +649,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
+@@ -666,5 +666,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
       * @return void
       */
 -    protected function processResponseBody(Request $request, Response $response)
@@ -8981,7 +8991,7 @@ index 88233655f9..abfb1fe7a6 100644
      {
          $token = $this->getUniqueToken($key);
 diff --git a/src/Symfony/Component/Lock/Store/MongoDbStore.php b/src/Symfony/Component/Lock/Store/MongoDbStore.php
-index 53df93cda9..31bc038130 100644
+index ada843883c..afebb3f3d8 100644
 --- a/src/Symfony/Component/Lock/Store/MongoDbStore.php
 +++ b/src/Symfony/Component/Lock/Store/MongoDbStore.php
 @@ -194,5 +194,5 @@ class MongoDbStore implements PersistingStoreInterface
@@ -10557,10 +10567,10 @@ index 46a25eed07..b3e25f1af3 100644
      {
          $this->stopPropagation();
 diff --git a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
-index 1d2a4b2be1..ecc6b58a8f 100644
+index 3b7c5086f2..97fb99f0b5 100644
 --- a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
 +++ b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
-@@ -69,5 +69,5 @@ class LoginFailureEvent extends Event
+@@ -70,5 +70,5 @@ class LoginFailureEvent extends Event
       * @return void
       */
 -    public function setResponse(?Response $response)
@@ -10800,7 +10810,7 @@ index fc6336ebdb..e13a834930 100644
      {
          if (1 > \func_num_args()) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
-index 829e178407..1ac8101771 100644
+index 52e985815b..e7d0493152 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 @@ -210,5 +210,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
@@ -10825,7 +10835,7 @@ index 829e178407..1ac8101771 100644
      {
          if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
-index e64cfc8802..112b74b07a 100644
+index a02a46b941..aedfd67c2e 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 @@ -139,10 +139,10 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
@@ -10886,7 +10896,7 @@ index c5cc86ecf6..c65534fafb 100644
      {
          $this->denormalizer = $denormalizer;
 diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
-index ae3adbfe33..3a38429cf1 100644
+index 1786d6fff1..04a2e62ed2 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
 @@ -45,5 +45,5 @@ interface DenormalizerInterface
@@ -10925,7 +10935,7 @@ index 40a4fa0e8c..a1e2749aae 100644
      {
          $this->normalizer = $normalizer;
 diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
-index 691e9c70f0..fc87f672e1 100644
+index cb43d78cc7..d215ffe997 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
 @@ -37,5 +37,5 @@ interface NormalizerInterface
@@ -11641,7 +11651,7 @@ index 15896f29da..22e24e34f9 100644
      {
          if (!$constraint instanceof All) {
 diff --git a/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php b/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php
-index 5ce9e545ec..465ff8b13f 100644
+index 94ad5eacab..7873a33c2b 100644
 --- a/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php
 +++ b/src/Symfony/Component/Validator/Constraints/AtLeastOneOfValidator.php
 @@ -24,5 +24,5 @@ class AtLeastOneOfValidator extends ConstraintValidator
@@ -11813,7 +11823,7 @@ index 0e3d848430..b4a6755388 100644
      {
          if (!$constraint instanceof Date) {
 diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
-index 43279c08be..291237f4f9 100644
+index 90f7727c22..9b99e56460 100644
 --- a/src/Symfony/Component/Validator/Constraints/EmailValidator.php
 +++ b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
 @@ -55,5 +55,5 @@ class EmailValidator extends ConstraintValidator
@@ -11835,7 +11845,7 @@ index d1fe60a791..3d602f5e7b 100644
      {
          if (!$constraint instanceof Expression) {
 diff --git a/src/Symfony/Component/Validator/Constraints/FileValidator.php b/src/Symfony/Component/Validator/Constraints/FileValidator.php
-index a632a54f48..9090968e1d 100644
+index 6346ad098f..ae4d95ed62 100644
 --- a/src/Symfony/Component/Validator/Constraints/FileValidator.php
 +++ b/src/Symfony/Component/Validator/Constraints/FileValidator.php
 @@ -42,5 +42,5 @@ class FileValidator extends ConstraintValidator
@@ -11857,10 +11867,10 @@ index 8b0fa60e20..25e2837f5c 100644
      {
          if (!$constraint instanceof Hostname) {
 diff --git a/src/Symfony/Component/Validator/Constraints/IbanValidator.php b/src/Symfony/Component/Validator/Constraints/IbanValidator.php
-index b1b17aac35..7537c0f15e 100644
+index b4744b4b57..d289374f56 100644
 --- a/src/Symfony/Component/Validator/Constraints/IbanValidator.php
 +++ b/src/Symfony/Component/Validator/Constraints/IbanValidator.php
-@@ -141,5 +141,5 @@ class IbanValidator extends ConstraintValidator
+@@ -167,5 +167,5 @@ class IbanValidator extends ConstraintValidator
       * @return void
       */
 -    public function validate(mixed $value, Constraint $constraint)
@@ -11992,7 +12002,7 @@ index 4706c33569..909308a8b8 100644
      {
          if (!$constraint instanceof Language) {
 diff --git a/src/Symfony/Component/Validator/Constraints/LengthValidator.php b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
-index 98044c7c53..8c06e0ee64 100644
+index f70adf1cba..acc026ae38 100644
 --- a/src/Symfony/Component/Validator/Constraints/LengthValidator.php
 +++ b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
 @@ -25,5 +25,5 @@ class LengthValidator extends ConstraintValidator
@@ -12804,7 +12814,7 @@ index 6ff046754d..2b9382f1a7 100644
      {
          $prefix = Caster::PREFIX_VIRTUAL;
 diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
-index 591751fce2..a2dfb9ae7f 100644
+index 4adb9bc9fe..bc151bb2a2 100644
 --- a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
 +++ b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
 @@ -39,5 +39,5 @@ class ReflectionCaster
diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 85db3e4b6cb3c..43e3abbe9f5f9 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -1,6 +1,12 @@
 UPGRADE FROM 6.2 to 6.3
 =======================
 
+Console
+-------
+
+ * Return int or false from `SignalableCommandInterface::handleSignal()` instead
+   of void and add a second argument `$previousExitCode`
+
 DependencyInjection
 -------------------
 
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 1d91d51ca9fd5..28fec5fdec9e0 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -1000,37 +1000,62 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
             }
         }
 
-        if ($this->signalsToDispatchEvent) {
-            $commandSignals = $command instanceof SignalableCommandInterface ? $command->getSubscribedSignals() : [];
-
-            if ($commandSignals || null !== $this->dispatcher) {
-                if (!$this->signalRegistry) {
-                    throw new RuntimeException('Unable to subscribe to signal events. Make sure that the `pcntl` extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
-                }
+        $commandSignals = $command instanceof SignalableCommandInterface ? $command->getSubscribedSignals() : [];
+        if ($commandSignals || $this->dispatcher && $this->signalsToDispatchEvent) {
+            if (!$this->signalRegistry) {
+                throw new RuntimeException('Unable to subscribe to signal events. Make sure that the `pcntl` extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
+            }
 
-                if (Terminal::hasSttyAvailable()) {
-                    $sttyMode = shell_exec('stty -g');
+            if (Terminal::hasSttyAvailable()) {
+                $sttyMode = shell_exec('stty -g');
 
-                    foreach ([\SIGINT, \SIGTERM] as $signal) {
-                        $this->signalRegistry->register($signal, static function () use ($sttyMode) {
-                            shell_exec('stty '.$sttyMode);
-                        });
-                    }
+                foreach ([\SIGINT, \SIGTERM] as $signal) {
+                    $this->signalRegistry->register($signal, static fn () => shell_exec('stty '.$sttyMode));
                 }
             }
 
-            if (null !== $this->dispatcher) {
+            if ($this->dispatcher) {
+                // We register application signals, so that we can dispatch the event
                 foreach ($this->signalsToDispatchEvent as $signal) {
                     $event = new ConsoleSignalEvent($command, $input, $output, $signal);
 
-                    $this->signalRegistry->register($signal, function () use ($event) {
+                    $this->signalRegistry->register($signal, function ($signal) use ($event, $command, $commandSignals) {
                         $this->dispatcher->dispatch($event, ConsoleEvents::SIGNAL);
+                        $exitCode = $event->getExitCode();
+
+                        // If the command is signalable, we call the handleSignal() method
+                        if (\in_array($signal, $commandSignals, true)) {
+                            $exitCode = $command->handleSignal($signal, $exitCode);
+                            // BC layer for Symfony <= 5
+                            if (null === $exitCode) {
+                                trigger_deprecation('symfony/console', '6.3', 'Not returning an exit code from "%s::handleSignal()" is deprecated, return "false" to keep the command running or "0" to exit successfully.', get_debug_type($command));
+                                $exitCode = 0;
+                            }
+                        }
+
+                        if (false !== $exitCode) {
+                            exit($exitCode);
+                        }
                     });
                 }
+
+                // then we register command signals, but not if already handled after the dispatcher
+                $commandSignals = array_diff($commandSignals, $this->signalsToDispatchEvent);
             }
 
             foreach ($commandSignals as $signal) {
-                $this->signalRegistry->register($signal, [$command, 'handleSignal']);
+                $this->signalRegistry->register($signal, function (int $signal) use ($command): void {
+                    $exitCode = $command->handleSignal($signal);
+                    // BC layer for Symfony <= 5
+                    if (null === $exitCode) {
+                        trigger_deprecation('symfony/console', '6.3', 'Not returning an exit code from "%s::handleSignal()" is deprecated, return "false" to keep the command running or "0" to exit successfully.', get_debug_type($command));
+                        $exitCode = 0;
+                    }
+
+                    if (false !== $exitCode) {
+                        exit($exitCode);
+                    }
+                });
             }
         }
 
diff --git a/src/Symfony/Component/Console/CHANGELOG.md b/src/Symfony/Component/Console/CHANGELOG.md
index ac55afccd0701..3428a57de3596 100644
--- a/src/Symfony/Component/Console/CHANGELOG.md
+++ b/src/Symfony/Component/Console/CHANGELOG.md
@@ -4,7 +4,7 @@ CHANGELOG
 6.3
 ---
 
- * Remove `exit` call in `Application` signal handlers. Commands will no longer be automatically interrupted after receiving signal other than `SIGUSR1` or `SIGUSR2`
+ * Add support for choosing exit code while handling signal, or to not exit at all
  * Add `ProgressBar::setPlaceholderFormatter` to set a placeholder attached to a instance, instead of being global.
  * Add `ReStructuredTextDescriptor`
 
diff --git a/src/Symfony/Component/Console/Command/SignalableCommandInterface.php b/src/Symfony/Component/Console/Command/SignalableCommandInterface.php
index d439728b65225..4d0876003d5fd 100644
--- a/src/Symfony/Component/Console/Command/SignalableCommandInterface.php
+++ b/src/Symfony/Component/Console/Command/SignalableCommandInterface.php
@@ -25,6 +25,10 @@ public function getSubscribedSignals(): array;
 
     /**
      * The method will be called when the application is signaled.
+     *
+     * @param int|false $previousExitCode
+
+     * @return int|false The exit code to return or false to continue the normal execution
      */
-    public function handleSignal(int $signal): void;
+    public function handleSignal(int $signal, /* int|false $previousExitCode = 0 */);
 }
diff --git a/src/Symfony/Component/Console/Event/ConsoleSignalEvent.php b/src/Symfony/Component/Console/Event/ConsoleSignalEvent.php
index 766af691aaa2c..95af1f915d718 100644
--- a/src/Symfony/Component/Console/Event/ConsoleSignalEvent.php
+++ b/src/Symfony/Component/Console/Event/ConsoleSignalEvent.php
@@ -21,15 +21,36 @@
 final class ConsoleSignalEvent extends ConsoleEvent
 {
     private int $handlingSignal;
+    private int|false $exitCode;
 
-    public function __construct(Command $command, InputInterface $input, OutputInterface $output, int $handlingSignal)
+    public function __construct(Command $command, InputInterface $input, OutputInterface $output, int $handlingSignal, int|false $exitCode = 0)
     {
         parent::__construct($command, $input, $output);
         $this->handlingSignal = $handlingSignal;
+        $this->exitCode = $exitCode;
     }
 
     public function getHandlingSignal(): int
     {
         return $this->handlingSignal;
     }
+
+    public function setExitCode(int $exitCode): void
+    {
+        if ($exitCode < 0 || $exitCode > 255) {
+            throw new \InvalidArgumentException('Exit code must be between 0 and 255.');
+        }
+
+        $this->exitCode = $exitCode;
+    }
+
+    public function abortExit(): void
+    {
+        $this->exitCode = false;
+    }
+
+    public function getExitCode(): int|false
+    {
+        return $this->exitCode;
+    }
 }
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index 9ada8d6fd8053..1a3e12f74cec1 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Console\Command\SignalableCommandInterface;
 use Symfony\Component\Console\CommandLoader\CommandLoaderInterface;
 use Symfony\Component\Console\CommandLoader\FactoryCommandLoader;
+use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
 use Symfony\Component\Console\Event\ConsoleErrorEvent;
@@ -1929,7 +1930,8 @@ public function testSignalListener()
 
         $dispatcherCalled = false;
         $dispatcher = new EventDispatcher();
-        $dispatcher->addListener('console.signal', function () use (&$dispatcherCalled) {
+        $dispatcher->addListener('console.signal', function (ConsoleSignalEvent $e) use (&$dispatcherCalled) {
+            $e->abortExit();
             $dispatcherCalled = true;
         });
 
@@ -1978,6 +1980,34 @@ public function testSignalSubscriber()
         $this->assertTrue($subscriber2->signaled);
     }
 
+    /**
+     * @requires extension pcntl
+     */
+    public function testSignalDispatchWithoutEventToDispatch()
+    {
+        $command = new SignableCommand();
+
+        $application = $this->createSignalableApplication($command, null);
+        $application->setSignalsToDispatchEvent();
+
+        $this->assertSame(1, $application->run(new ArrayInput(['signal'])));
+        $this->assertTrue($command->signaled);
+    }
+
+    /**
+     * @requires extension pcntl
+     */
+    public function testSignalDispatchWithoutEventDispatcher()
+    {
+        $command = new SignableCommand();
+
+        $application = $this->createSignalableApplication($command, null);
+        $application->setSignalsToDispatchEvent(\SIGUSR1);
+
+        $this->assertSame(1, $application->run(new ArrayInput(['signal'])));
+        $this->assertTrue($command->signaled);
+    }
+
     /**
      * @requires extension pcntl
      */
@@ -2077,9 +2107,36 @@ public function testSignalableCommandDoesNotInterruptedOnTermSignals()
         $application->setAutoExit(false);
         $application->setDispatcher($dispatcher);
         $application->add($command);
+
         $this->assertSame(129, $application->run(new ArrayInput(['signal'])));
     }
 
+    public function testSignalableWithEventCommandDoesNotInterruptedOnTermSignals()
+    {
+        if (!\defined('SIGINT')) {
+            $this->markTestSkipped('SIGINT not available');
+        }
+
+        $command = new TerminatableWithEventCommand();
+
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addSubscriber($command);
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setDispatcher($dispatcher);
+        $application->add($command);
+        $tester = new ApplicationTester($application);
+        $this->assertSame(51, $tester->run(['signal']));
+        $expected = <<<EOTXT
+            Still processing...
+            ["handling event",2,0]
+            ["exit code",2,125]
+            Wrapping up, wait a sec...
+
+            EOTXT;
+        $this->assertSame($expected, $tester->getDisplay(true));
+    }
+
     /**
      * @group tty
      */
@@ -2217,10 +2274,12 @@ public function getSubscribedSignals(): array
         return SignalRegistry::isSupported() ? [\SIGUSR1] : [];
     }
 
-    public function handleSignal(int $signal): void
+    public function handleSignal(int $signal, int|fa
10000
lse $previousExitCode = 0): int|false
     {
         $this->signaled = true;
         $this->signalHandlers[] = __CLASS__;
+
+        return false;
     }
 }
 
@@ -2232,10 +2291,61 @@ public function getSubscribedSignals(): array
         return SignalRegistry::isSupported() ? [\SIGINT] : [];
     }
 
-    public function handleSignal(int $signal): void
+    public function handleSignal(int $signal, int|false $previousExitCode = 0): int|false
     {
         $this->signaled = true;
         $this->signalHandlers[] = __CLASS__;
+
+        return false;
+    }
+}
+
+#[AsCommand(name: 'signal')]
+class TerminatableWithEventCommand extends Command implements SignalableCommandInterface, EventSubscriberInterface
+{
+    private bool $shouldContinue = true;
+    private OutputInterface $output;
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $this->output = $output;
+
+        for ($i = 0; $i <= 10 && $this->shouldContinue; ++$i) {
+            $output->writeln('Still processing...');
+            posix_kill(posix_getpid(), SIGINT);
+        }
+
+        $output->writeln('Wrapping up, wait a sec...');
+
+        return 51;
+    }
+
+    public function getSubscribedSignals(): array
+    {
+        return [\SIGINT];
+    }
+
+    public function handleSignal(int $signal, int|false $previousExitCode = 0): int|false
+    {
+        $this->shouldContinue = false;
+
+        $this->output->writeln(json_encode(['exit code', $signal, $previousExitCode]));
+
+        return false;
+    }
+
+    public function handleSignalEvent(ConsoleSignalEvent $event): void
+    {
+        $this->output->writeln(json_encode(['handling event', $event->getHandlingSignal(), $event->getExitCode()]));
+
+        $event->setExitCode(125);
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            ConsoleEvents::SIGNAL => 'handleSignalEvent',
+        ];
     }
 }
 
@@ -2248,6 +2358,8 @@ public function onSignal(ConsoleSignalEvent $event): void
         $this->signaled = true;
         $event->getCommand()->signaled = true;
         $event->getCommand()->signalHandlers[] = __CLASS__;
+
+        $event->abortExit();
     }
 
     public static function getSubscribedEvents(): array
diff --git a/src/Symfony/Component/Console/Tests/ConsoleEventsTest.php b/src/Symfony/Component/Console/Tests/ConsoleEventsTest.php
index 6f50e7401732a..78672a58676a4 100644
--- a/src/Symfony/Component/Console/Tests/ConsoleEventsTest.php
+++ b/src/Symfony/Component/Console/Tests/ConsoleEventsTest.php
@@ -30,6 +30,20 @@
 
 class ConsoleEventsTest extends TestCase
 {
+    protected function tearDown(): void
+    {
+        if (\function_exists('pcntl_signal')) {
+            pcntl_async_signals(false);
+            // We reset all signals to their default value to avoid side effects
+            for ($i = 1; $i <= 15; ++$i) {
+                if (9 === $i) {
+                    continue;
+                }
+                pcntl_signal($i, SIG_DFL);
+            }
+        }
+    }
+
     public function testEventAliases()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_signalable.php b/src/Symfony/Component/Console/Tests/Fixtures/application_signalable.php
index 0194703b2fe01..12cf744eaffd9 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_signalable.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_signalable.php
@@ -1,8 +1,6 @@
 <?php
 
-use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\SignalableCommandInterface;
-use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ChoiceQuestion;
@@ -20,9 +18,9 @@ public function getSubscribedSignals(): array
         return [SIGINT];
     }
 
-    public function handleSignal(int $signal): void
+    public function handleSignal(int $signal, int|false $previousExitCode = 0): int|false
     {
-        exit;
+        exit(0);
     }
 })
     ->setCode(function(InputInterface $input, OutputInterface $output) {
diff --git a/src/Symfony/Component/Console/Tests/SignalRegistry/SignalRegistryTest.php b/src/Symfony/Component/Console/Tests/SignalRegistry/SignalRegistryTest.php
index f1ac7c69000d7..f8bf038410b7f 100644
--- a/src/Symfony/Component/Console/Tests/SignalRegistry/SignalRegistryTest.php
+++ b/src/Symfony/Component/Console/Tests/SignalRegistry/SignalRegistryTest.php
@@ -22,8 +22,13 @@ class SignalRegistryTest extends TestCase
     protected function tearDown(): void
     {
         pcntl_async_signals(false);
-        pcntl_signal(\SIGUSR1, \SIG_DFL);
-        pcntl_signal(\SIGUSR2, \SIG_DFL);
+        // We reset all signals to their default value to avoid side effects
+        for ($i = 1; $i <= 15; ++$i) {
+            if (9 === $i) {
+                continue;
+            }
+            pcntl_signal($i, SIG_DFL);
+        }
     }
 
     public function testOneCallbackForASignalSignalIsHandled()
diff --git a/src/Symfony/Component/Console/Tests/phpt/signal/command_exit.phpt b/src/Symfony/Component/Console/Tests/phpt/signal/command_exit.phpt
new file mode 100644
index 0000000000000..fde3793a854f2
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/phpt/signal/command_exit.phpt
@@ -0,0 +1,56 @@
+--TEST--
+Test command that exist
+--SKIPIF--
+<?php if (!extension_loaded("pcntl")) die("Skipped: pcntl extension required."); ?>
+--FILE--
+<?php
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Command\SignalableCommandInterface;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\Question;
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+class MyCommand extends Command implements SignalableCommandInterface
+{
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        posix_kill(posix_getpid(), \SIGINT);
+
+        $output->writeln('should not be displayed');
+
+        return 0;
+    }
+
+
+    public function getSubscribedSignals(): array
+    {
+        return [\SIGINT];
+    }
+
+    public function handleSignal(int $signal, int|false $previousExitCode = 0): int|false
+    {
+        echo "Received signal!";
+
+        return 0;
+    }
+}
+
+$app = new Application();
+$app->setDispatcher(new \Symfony\Component\EventDispatcher\EventDispatcher());
+$app->add(new MyCommand('foo'));
+
+$app
+    ->setDefaultCommand('foo', true)
+    ->run()
+;
+--EXPECT--
+Received signal!

From 526e0b210a072f083326b805be731f7843ebc010 Mon Sep 17 00:00:00 2001
From: Nicolas PHILIPPE <nikophil@gmail.com>
Date: Thu, 29 Dec 2022 16:57:55 +0100
Subject: [PATCH 262/475] [Serializer] add a context to allow invalid values in
 BackedEnumNormalizer

---
 src/Symfony/Component/Serializer/CHANGELOG.md |  1 +
 .../BackedEnumNormalizerContextBuilder.php    | 35 +++++++++++++++++++
 .../Normalizer/BackedEnumNormalizer.php       | 17 +++++++++
 ...BackedEnumNormalizerContextBuilderTest.php | 35 +++++++++++++++++++
 .../Normalizer/BackedEnumNormalizerTest.php   | 15 ++++++++
 5 files changed, 103 insertions(+)
 create mode 100644 src/Symfony/Component/Serializer/Context/Normalizer/BackedEnumNormalizerContextBuilder.php
 create mode 100644 src/Symfony/Component/Serializer/Tests/Context/Normalizer/BackedEnumNormalizerContextBuilderTest.php

diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
index 19eaa6a9cb8a4..12269eda7ff4f 100644
--- a/src/Symfony/Component/Serializer/CHANGELOG.md
+++ b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add `XmlEncoder::SAVE_OPTIONS` context option
+ * Add `BackedEnumNormalizer::ALLOW_INVALID_VALUES` context option
  * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
 
 6.2
diff --git a/src/Symfony/Component/Serializer/Context/Normalizer/BackedEnumNormalizerContextBuilder.php b/src/Symfony/Component/Serializer/Context/Normalizer/BackedEnumNormalizerContextBuilder.php
new file mode 100644
index 0000000000000..ca1a4f50a4a5f
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Context/Normalizer/BackedEnumNormalizerContextBuilder.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Context\Normalizer;
+
+use Symfony\Component\Serializer\Context\ContextBuilderInterface;
+use Symfony\Component\Serializer\Context\ContextBuilderTrait;
+use Symfony\Component\Serializer\Normalizer\BackedEnumNormalizer;
+
+/**
+ * A helper providing autocompletion for available BackedEnumNormalizer options.
+ *
+ * @author Nicolas PHILIPPE <nikophil@gmail.com>
+ */
+final class BackedEnumNormalizerContextBuilder implements ContextBuilderInterface
+{
+    use ContextBuilderTrait;
+
+    /**
+     * Configures if invalid values are allowed in denormalization.
+     * They will be denormalized into `null` values.
+     */
+    public function withAllowInvalidValues(bool $allowInvalidValues): static
+    {
+        return $this->with(BackedEnumNormalizer::ALLOW_INVALID_VALUES, $allowInvalidValues);
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php
index 26943377b654a..2281849ad20a4 100644
--- a/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php
@@ -22,6 +22,11 @@
  */
 final class BackedEnumNormalizer implements NormalizerInterface, DenormalizerInterface, CacheableSupportsMethodInterface
 {
+    /**
+     * If true, will denormalize any invalid value into null.
+     */
+    public const ALLOW_INVALID_VALUES = 'allow_invalid_values';
+
     public function normalize(mixed $object, string $format = null, array $context = []): int|string
     {
         if (!$object instanceof \BackedEnum) {
@@ -45,6 +50,18 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
             throw new InvalidArgumentException('The data must belong to a backed enumeration.');
         }
 
+        if ($context[self::ALLOW_INVALID_VALUES] ?? false) {
+            if (null === $data || (!\is_int($data) && !\is_string($data))) {
+                return null;
+            }
+
+            try {
+                return $type::tryFrom($data);
+            } catch (\TypeError) {
+                return null;
+            }
+        }
+
         if (!\is_int($data) && !\is_string($data)) {
             throw NotNormalizableValueException::createForUnexpectedDataType('The data is neither an integer nor a string, you should pass an integer or a string that can be parsed as an enumeration case of type '.$type.'.', $data, [Type::BUILTIN_TYPE_INT, Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, true);
         }
diff --git a/src/Symfony/Component/Serializer/Tests/Context/Normalizer/BackedEnumNormalizerContextBuilderTest.php b/src/Symfony/Component/Serializer/Tests/Context/Normalizer/BackedEnumNormalizerContextBuilderTest.php
new file mode 100644
index 0000000000000..94d98776f0ab8
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Context/Normalizer/BackedEnumNormalizerContextBuilderTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Context\Normalizer;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Serializer\Context\Normalizer\BackedEnumNormalizerContextBuilder;
+use Symfony\Component\Serializer\Normalizer\BackedEnumNormalizer;
+
+class BackedEnumNormalizerContextBuilderTest extends TestCase
+{
+    private BackedEnumNormalizerContextBuilder $contextBuilder;
+
+    protected function setUp(): void
+    {
+        $this->contextBuilder = new BackedEnumNormalizerContextBuilder();
+    }
+
+    public function testWithers()
+    {
+        $context = $this->contextBuilder->withAllowInvalidValues(true)->toArray();
+        self::assertSame([BackedEnumNormalizer::ALLOW_INVALID_VALUES => true], $context);
+
+        $context = $this->contextBuilder->withAllowInvalidValues(false)->toArray();
+        self::assertSame([BackedEnumNormalizer::ALLOW_INVALID_VALUES => false], $context);
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/BackedEnumNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/BackedEnumNormalizerTest.php
index b0063da5fe4e7..aa0cefe0b431c 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/BackedEnumNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/BackedEnumNormalizerTest.php
@@ -114,4 +114,19 @@ public function testSupportsNormalizationShouldFailOnAnyPHPVersionForNonEnumObje
     {
         $this->assertFalse($this->normalizer->supportsNormalization(new \stdClass()));
     }
+
+    public function testItUsesTryFromIfContextIsPassed()
+    {
+        $this->assertNull($this->normalizer->denormalize(1, IntegerBackedEnumDummy::class, null, [BackedEnumNormalizer::ALLOW_INVALID_VALUES => true]));
+        $this->assertNull($this->normalizer->denormalize('', IntegerBackedEnumDummy::class, null, [BackedEnumNormalizer::ALLOW_INVALID_VALUES => true]));
+        $this->assertNull($this->normalizer->denormalize(null, IntegerBackedEnumDummy::class, null, [BackedEnumNormalizer::ALLOW_INVALID_VALUES => true]));
+
+        $this->assertSame(IntegerBackedEnumDummy::SUCCESS, $this->normalizer->denormalize(200, IntegerBackedEnumDummy::class, null, [BackedEnumNormalizer::ALLOW_INVALID_VALUES => true]));
+
+        $this->assertNull($this->normalizer->denormalize(1, StringBackedEnumDummy::class, null, [BackedEnumNormalizer::ALLOW_INVALID_VALUES => true]));
+        $this->assertNull($this->normalizer->denormalize('foo', StringBackedEnumDummy::class, null, [BackedEnumNormalizer::ALLOW_INVALID_VALUES => true]));
+        $this->assertNull($this->normalizer->denormalize(null, StringBackedEnumDummy::class, null, [BackedEnumNormalizer::ALLOW_INVALID_VALUES => true]));
+
+        $this->assertSame(StringBackedEnumDummy::GET, $this->normalizer->denormalize('GET', StringBackedEnumDummy::class, null, [BackedEnumNormalizer::ALLOW_INVALID_VALUES => true]));
+    }
 }

From 245485c2a778330578f6c90aaea573336831620a Mon Sep 17 00:00:00 2001
From: Mathieu <math.lechat@gmail.com>
Date: Fri, 17 Feb 2023 10:25:23 +0100
Subject: [PATCH 263/475] [HttpKernel] Introduce pinnable value resolvers with
 `#[ValueResolver]` and `#[AsPinnedValueResolver]`

---
 .../Bridge/Doctrine/Attribute/MapEntity.php   |   9 +-
 src/Symfony/Bridge/Doctrine/composer.json     |   2 +-
 .../FrameworkExtension.php                    |   5 +
 .../FrameworkBundle/Resources/config/web.php  |  19 +--
 .../Resources/config/security.php             |   2 +-
 .../Attribute/AsPinnedValueResolver.php       |  24 ++++
 .../HttpKernel/Attribute/MapDateTime.php      |   9 +-
 .../HttpKernel/Attribute/ValueResolver.php    |  27 ++++
 src/Symfony/Component/HttpKernel/CHANGELOG.md |   1 +
 .../Controller/ArgumentResolver.php           |  60 ++++++--
 .../ControllerArgumentValueResolverPass.php   |  21 ++-
 .../Exception/ResolverNotFoundException.php   |  33 +++++
 .../Tests/Controller/ArgumentResolverTest.php | 133 +++++++++++++-----
 .../Security/Http/Attribute/CurrentUser.php   |   9 +-
 .../Component/Security/Http/composer.json     |   2 +-
 15 files changed, 293 insertions(+), 63 deletions(-)
 create mode 100644 src/Symfony/Component/HttpKernel/Attribute/AsPinnedValueResolver.php
 create mode 100644 src/Symfony/Component/HttpKernel/Attribute/ValueResolver.php
 create mode 100644 src/Symfony/Component/HttpKernel/Exception/ResolverNotFoundException.php

diff --git a/src/Symfony/Bridge/Doctrine/Attribute/MapEntity.php b/src/Symfony/Bridge/Doctrine/Attribute/MapEntity.php
index 74caf14c9af55..529bf05dc7767 100644
--- a/src/Symfony/Bridge/Doctrine/Attribute/MapEntity.php
+++ b/src/Symfony/Bridge/Doctrine/Attribute/MapEntity.php
@@ -11,11 +11,14 @@
 
 namespace Symfony\Bridge\Doctrine\Attribute;
 
+use Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolver;
+use Symfony\Component\HttpKernel\Attribute\ValueResolver;
+
 /**
  * Indicates that a controller argument should receive an Entity.
  */
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
-class MapEntity
+class MapEntity extends ValueResolver
 {
     public function __construct(
         public ?string $class = null,
@@ -26,8 +29,10 @@ public function __construct(
         public ?bool $stripNull = null,
         public array|string|null $id = null,
         public ?bool $evictCache = null,
-        public bool $disabled = false,
+        bool $disabled = false,
+        string $resolver = EntityValueResolver::class,
     ) {
+        parent::__construct($resolver, $disabled);
     }
 
     public function withDefaults(self $defaults, ?string $class): static
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index e0730a10101a9..b3462366da194 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -30,7 +30,7 @@
         "symfony/config": "^5.4|^6.0",
         "symfony/dependency-injection": "^6.2",
         "symfony/form": "^5.4.21|^6.2.7",
-        "symfony/http-kernel": "^6.2",
+        "symfony/http-kernel": "^6.3",
         "symfony/messenger": "^5.4|^6.0",
         "symfony/doctrine-messenger": "^5.4|^6.0",
         "symfony/property-access": "^5.4|^6.0",
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 618cefb128d62..886e8a3b514ff 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -83,6 +83,7 @@
 use Symfony\Component\HttpClient\UriTemplateHttpClient;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\AsController;
+use Symfony\Component\HttpKernel\Attribute\AsPinnedValueResolver;
 use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\BackedEnumValueResolver;
@@ -691,6 +692,10 @@ public function load(array $configs, ContainerBuilder $container)
             $definition->addTag('messenger.message_handler', $tagAttributes);
         });
 
+        $container->registerAttributeForAutoconfiguration(AsPinnedValueResolver::class, static function (ChildDefinition $definition, AsPinnedValueResolver $attribute): void {
+            $definition->addTag('controller.pinned_value_resolver', $attribute->name ? ['name' => $attribute->name] : []);
+        });
+
         if (!$container->getParameter('kernel.debug')) {
             // remove tagged iterator argument for resource checkers
             $container->getDefinition('config_cache_factory')->setArguments([]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
index cd4cdffa10ade..ca9128b3d0c0a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
@@ -46,40 +46,41 @@
             ->args([
                 service('argument_metadata_factory'),
                 abstract_arg('argument value resolvers'),
+                abstract_arg('pinned value resolvers'),
             ])
 
         ->set('argument_resolver.backed_enum_resolver', BackedEnumValueResolver::class)
-            ->tag('controller.argument_value_resolver', ['priority' => 100])
+            ->tag('controller.argument_value_resolver', ['priority' => 100, 'name' => BackedEnumValueResolver::class])
 
         ->set('argument_resolver.uid', UidValueResolver::class)
-            ->tag('controller.argument_value_resolver', ['priority' => 100])
+            ->tag('controller.argument_value_resolver', ['priority' => 100, 'name' => UidValueResolver::class])
 
         ->set('argument_resolver.datetime', DateTimeValueResolver::class)
             ->args([
                 service('clock')->nullOnInvalid(),
             ])
-            ->tag('controller.argument_value_resolver', ['priority' => 100])
+            ->tag('controller.argument_value_resolver', ['priority' => 100, 'name' => DateTimeValueResolver::class])
 
         ->set('argument_resolver.request_attribute', RequestAttributeValueResolver::class)
-            ->tag('controller.argument_value_resolver', ['priority' => 100])
+            ->tag('controller.argument_value_resolver', ['priority' => 100, 'name' => RequestAttributeValueResolver::class])
 
         ->set('argument_resolver.request', RequestValueResolver::class)
-            ->tag('controller.argument_value_resolver', ['priority' => 50])
+            ->tag('controller.argument_value_resolver', ['priority' => 50, 'name' => RequestValueResolver::class])
 
         ->set('argument_resolver.session', SessionValueResolver::class)
-            ->tag('controller.argument_value_resolver', ['priority' => 50])
+            ->tag('controller.argument_value_resolver', ['priority' => 50, 'name' => SessionValueResolver::class])
 
         ->set('argument_resolver.service', ServiceValueResolver::class)
             ->args([
                 abstract_arg('service locator, set in RegisterControllerArgumentLocatorsPass'),
             ])
-            ->tag('controller.argument_value_resolver', ['priority' => -50])
+            ->tag('controller.argument_value_resolver', ['priority' => -50, 'name' => ServiceValueResolver::class])
 
         ->set('argument_resolver.default', DefaultValueResolver::class)
-            ->tag('controller.argument_value_resolver', ['priority' => -100])
+            ->tag('controller.argument_value_resolver', ['priority' => -100, 'name' => DefaultValueResolver::class])
 
         ->set('argument_resolver.variadic', VariadicValueResolver::class)
-            ->tag('controller.argument_value_resolver', ['priority' => -150])
+            ->tag('controller.argument_value_resolver', ['priority' => -150, 'name' => VariadicValueResolver::class])
 
         ->set('response_listener', ResponseListener::class)
             ->args([
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.php
index 5f4e693b85cbb..fa7c0fe37e8eb 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.php
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.php
@@ -100,7 +100,7 @@
             ->args([
                 service('security.token_storage'),
             ])
-            ->tag('controller.argument_value_resolver', ['priority' => 120])
+            ->tag('controller.argument_value_resolver', ['priority' => 120, 'name' => UserValueResolver::class])
 
         // Authentication related services
         ->set('security.authentication.trust_resolver', AuthenticationTrustResolver::class)
diff --git a/src/Symfony/Component/HttpKernel/Attribute/AsPinnedValueResolver.php b/src/Symfony/Component/HttpKernel/Attribute/AsPinnedValueResolver.php
new file mode 100644
index 0000000000000..e529294123e14
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Attribute/AsPinnedValueResolver.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Attribute;
+
+/**
+ * Service tag to autoconfigure pinned value resolvers.
+ */
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class AsPinnedValueResolver
+{
+    public function __construct(
+        public readonly ?string $name = null,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Attribute/MapDateTime.php b/src/Symfony/Component/HttpKernel/Attribute/MapDateTime.php
index ce9f8568553dc..bfe48a809095d 100644
--- a/src/Symfony/Component/HttpKernel/Attribute/MapDateTime.php
+++ b/src/Symfony/Component/HttpKernel/Attribute/MapDateTime.php
@@ -11,14 +11,19 @@
 
 namespace Symfony\Component\HttpKernel\Attribute;
 
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DateTimeValueResolver;
+
 /**
  * Controller parameter tag to configure DateTime arguments.
  */
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
-class MapDateTime
+class MapDateTime extends ValueResolver
 {
     public function __construct(
-        public readonly ?string $format = null
+        public readonly ?string $format = null,
+        bool $disabled = false,
+        string $resolver = DateTimeValueResolver::class,
     ) {
+        parent::__construct($resolver, $disabled);
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Attribute/ValueResolver.php b/src/Symfony/Component/HttpKernel/Attribute/ValueResolver.php
new file mode 100644
index 0000000000000..df4aaff5d746d
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Attribute/ValueResolver.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Attribute;
+
+use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
+
+#[\Attribute(\Attribute::TARGET_PARAMETER | \Attribute::IS_REPEATABLE)]
+class ValueResolver
+{
+    /**
+     * @param class-string<ValueResolverInterface>|string $name
+     */
+    public function __construct(
+        public string $name,
+        public bool $disabled = false,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index d5bf22a1d967c..46a5463e024c3 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
  * Use an instance of `Psr\Clock\ClockInterface` to generate the current date time in `DateTimeValueResolver`
  * Add `#[WithLogLevel]` for defining log levels for exceptions
  * Add `skip_response_headers` to the `HttpCache` options
+ * Introduce pinnable value resolvers with `#[ValueResolver]` and `#[AsPinnedValueResolver]`
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
index 9930cc08bfb77..2cd9ec1c324be 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\Controller;
 
+use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Attribute\ValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestValueResolver;
@@ -20,6 +22,8 @@
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\VariadicValueResolver;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactoryInterface;
+use Symfony\Component\HttpKernel\Exception\ResolverNotFoundException;
+use Symfony\Contracts\Service\ServiceProviderInterface;
 
 /**
  * Responsible for resolving the arguments passed to an action.
@@ -30,14 +34,16 @@ final class ArgumentResolver implements ArgumentResolverInterface
 {
     private ArgumentMetadataFactoryInterface $argumentMetadataFactory;
     private iterable $argumentValueResolvers;
+    private ?ContainerInterface $namedResolvers;
 
     /**
      * @param iterable<mixed, ArgumentValueResolverInterface|ValueResolverInterface> $argumentValueResolvers
      */
-    public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, iterable $argumentValueResolvers = [])
+    public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, iterable $argumentValueResolvers = [], ContainerInterface $namedResolvers = null)
     {
         $this->argumentMetadataFactory = $argumentMetadataFactory ?? new ArgumentMetadataFactory();
         $this->argumentValueResolvers = $argumentValueResolvers ?: self::getDefaultArgumentValueResolvers();
+        $this->namedResolvers = $namedResolvers;
     }
 
     public function getArguments(Request $request, callable $controller, \ReflectionFunctionAbstract $reflector = null): array
@@ -45,10 +51,37 @@ public function getArguments(Request $request, callable $controller, \Reflection
         $arguments = [];
 
         foreach ($this->argumentMetadataFactory->createArgumentMetadata($controller, $reflector) as $metadata) {
-            foreach ($this->argumentValueResolvers as $resolver) {
+            $argumentValueResolvers = $this->argumentValueResolvers;
+            $disabledResolvers = [];
+
+            if ($this->namedResolvers && $attributes = $metadata->getAttributesOfType(ValueResolver::class, $metadata::IS_INSTANCEOF)) {
+                $resolverName = null;
+                foreach ($attributes as $attribute) {
+                    if ($attribute->disabled) {
+                        $disabledResolvers[$attribute->name] = true;
+                    } elseif ($resolverName) {
+                        throw new \LogicException(sprintf('You can only pin one resolver per argument, but argument "$%s" of "%s()" has more.', $metadata->getName(), $this->getPrettyName($controller)));
+                    } else {
+                        $resolverName = $attribute->name;
+                    }
+                }
+
+                if ($resolverName) {
+                    if (!$this->namedResolvers->has($resolverName)) {
+                        throw new ResolverNotFoundException($resolverName, $this->namedResolvers instanceof ServiceProviderInterface ? array_keys($this->namedResolvers->getProvidedServices()) : []);
+                    }
+
+                    $argumentValueResolvers = [$this->namedResolvers->get($resolverName)];
+                }
+            }
+
+            foreach ($argumentValueResolvers as $name => $resolver) {
                 if ((!$resolver instanceof ValueResolverInterface || $resolver instanceof TraceableValueResolver) && !$resolver->supports($request, $metadata)) {
                     continue;
                 }
+                if (isset($disabledResolvers[\is_int($name) ? $resolver::class : $name])) {
+                    continue;
+                }
 
                 $count = 0;
                 foreach ($resolver->resolve($request, $metadata) as $argument) {
@@ -70,15 +103,7 @@ public function getArguments(Request $request, callable $controller, \Reflection
                 }
             }
 
-            $representative = $controller;
-
-            if (\is_array($representative)) {
-                $representative = sprintf('%s::%s()', $representative[0]::class, $representative[1]);
-            } elseif (\is_object($representative)) {
-                $representative = get_debug_type($representative);
-            }
-
-            throw new \RuntimeException(sprintf('Controller "%s" requires that you provide a value for the "$%s" argument. Either the argument is nullable and no null value has been provided, no default value has been provided or because there is a non optional argument after this one.', $representative, $metadata->getName()));
+            throw new \RuntimeException(sprintf('Controller "%s" requires that you provide a value for the "$%s" argument. Either the argument is nullable and no null value has been provided, no default value has been provided or because there is a non optional argument after this one.', $this->getPrettyName($controller), $metadata->getName()));
         }
 
         return $arguments;
@@ -97,4 +122,17 @@ public static function getDefaultArgumentValueResolvers(): iterable
             new VariadicValueResolver(),
         ];
     }
+
+    private function getPrettyName($controller): string
+    {
+        if (\is_array($controller)) {
+            return $controller[0]::class.'::'.$controller[1];
+        }
+
+        if (\is_object($controller)) {
+            return get_debug_type($controller);
+        }
+
+        return $controller;
+    }
 }
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
index 5bb801c8cde30..6e00840c7e08a 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\HttpKernel\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -37,10 +39,24 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        $resolvers = $this->findAndSortTaggedServices('controller.argument_value_resolver', $container);
+        $definitions = $container->getDefinitions();
+        $namedResolvers = $this->findAndSortTaggedServices(new TaggedIteratorArgument('controller.pinned_value_resolver', 'name', needsIndexes: true), $container);
+        $resolvers = $this->findAndSortTaggedServices(new TaggedIteratorArgument('controller.argument_value_resolver', 'name', needsIndexes: true), $container);
+
+        foreach ($resolvers as $name => $resolverReference) {
+            $id = (string) $resolverReference;
+
+            if ($definitions[$id]->hasTag('controller.pinned_value_resolver')) {
+                unset($resolvers[$name]);
+            } else {
+                $namedResolvers[$name] ??= clone $resolverReference;
+            }
+        }
+
+        $resolvers = array_values($resolvers);
 
         if ($container->getParameter('kernel.debug') && class_exists(Stopwatch::class) && $container->has('debug.stopwatch')) {
-            foreach ($resolvers as $resolverReference) {
+            foreach ($resolvers + $namedResolvers as $resolverReference) {
                 $id = (string) $resolverReference;
                 $container->register("debug.$id", TraceableValueResolver::class)
                     ->setDecoratedService($id)
@@ -51,6 +67,7 @@ public function process(ContainerBuilder $container)
         $container
             ->getDefinition('argument_resolver')
             ->replaceArgument(1, new IteratorArgument($resolvers))
+            ->setArgument(2, new ServiceLocatorArgument($namedResolvers))
         ;
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Exception/ResolverNotFoundException.php b/src/Symfony/Component/HttpKernel/Exception/ResolverNotFoundException.php
new file mode 100644
index 0000000000000..6d9fb8a01f46c
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Exception/ResolverNotFoundException.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Exception;
+
+class ResolverNotFoundException extends \RuntimeException
+{
+    /**
+     * @param string[] $alternatives
+     */
+    public function __construct(string $name, array $alternatives = [])
+    {
+        $msg = sprintf('You have requested a non-existent resolver "%s".', $name);
+        if ($alternatives) {
+            if (1 === \count($alternatives)) {
+                $msg .= ' Did you mean this: "';
+            } else {
+                $msg .= ' Did you mean one of these: "';
+            }
+            $msg .= implode('", "', $alternatives).'"?';
+        }
+
+        parent::__construct($msg);
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
index 65ff564f1a90b..22d2d9cbb5480 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
@@ -12,14 +12,18 @@
 namespace Symfony\Component\HttpKernel\Tests\Controller;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+use Symfony\Component\HttpKernel\Attribute\ValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory;
+use Symfony\Component\HttpKernel\Exception\ResolverNotFoundException;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\ExtendingRequest;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\ExtendingSession;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\NullableController;
@@ -27,20 +31,19 @@
 
 class ArgumentResolverTest extends TestCase
 {
-    /** @var ArgumentResolver */
-    private static $resolver;
-
-    public static function setUpBeforeClass(): void
+    public static function getResolver(array $chainableResolvers = [], array $namedResolvers = null): ArgumentResolver
     {
-        $factory = new ArgumentMetadataFactory();
+        if (null !== $namedResolvers) {
+            $namedResolvers = new ServiceLocator(array_map(fn ($resolver) => fn () => $resolver, $namedResolvers));
+        }
 
-        self::$resolver = new ArgumentResolver($factory);
+        return new ArgumentResolver(new ArgumentMetadataFactory(), $chainableResolvers, $namedResolvers);
     }
 
     public function testDefaultState()
     {
-        $this->assertEquals(self::$resolver, new ArgumentResolver());
-        $this->assertNotEquals(self::$resolver, new ArgumentResolver(null, [new RequestAttributeValueResolver()]));
+        $this->assertEquals(self::getResolver(), new ArgumentResolver());
+        $this->assertNotEquals(self::getResolver(), new ArgumentResolver(null, [new RequestAttributeValueResolver()]));
     }
 
     public function testGetArguments()
@@ -49,7 +52,7 @@ public function testGetArguments()
         $request->attributes->set('foo', 'foo');
         $controller = [new self(), 'controllerWithFoo'];
 
-        $this->assertEquals(['foo'], self::$resolver->getArguments($request, $controller), '->getArguments() returns an array of arguments for the controller method');
+        $this->assertEquals(['foo'], self::getResolver()->getArguments($request, $controller), '->getArguments() returns an array of arguments for the controller method');
     }
 
     public function testGetArgumentsReturnsEmptyArrayWhenNoArguments()
@@ -57,7 +60,7 @@ public function testGetArgumentsReturnsEmptyArrayWhenNoArguments()
         $request = Request::create('/');
         $controller = [new self(), 'controllerWithoutArguments'];
 
-        $this->assertEquals([], self::$resolver->getArguments($request, $controller), '->getArguments() returns an empty array if the method takes no arguments');
+        $this->assertEquals([], self::getResolver()->getArguments($request, $controller), '->getArguments() returns an empty array if the method takes no arguments');
     }
 
     public function testGetArgumentsUsesDefaultValue()
@@ -66,7 +69,7 @@ public function testGetArgumentsUsesDefaultValue()
         $request->attributes->set('foo', 'foo');
         $controller = [new self(), 'controllerWithFooAndDefaultBar'];
 
-        $this->assertEquals(['foo', null], self::$resolver->getArguments($request, $controller), '->getArguments() uses default values if present');
+        $this->assertEquals(['foo', null], self::getResolver()->getArguments($request, $controller), '->getArguments() uses default values if present');
     }
 
     public function testGetArgumentsOverrideDefaultValueByRequestAttribute()
@@ -76,7 +79,7 @@ public function testGetArgumentsOverrideDefaultValueByRequestAttribute()
         $request->attributes->set('bar', 'bar');
         $controller = [new self(), 'controllerWithFooAndDefaultBar'];
 
-        $this->assertEquals(['foo', 'bar'], self::$resolver->getArguments($request, $controller), '->getArguments() overrides default values if provided in the request attributes');
+        $this->assertEquals(['foo', 'bar'], self::getResolver()->getArguments($request, $controller), '->getArguments() overrides default values if provided in the request attributes');
     }
 
     public function testGetArgumentsFromClosure()
@@ -85,7 +88,7 @@ public function testGetArgumentsFromClosure()
         $request->attributes->set('foo', 'foo');
         $controller = function ($foo) {};
 
-        $this->assertEquals(['foo'], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo'], self::getResolver()->getArguments($request, $controller));
     }
 
     public function testGetArgumentsUsesDefaultValueFromClosure()
@@ -94,7 +97,7 @@ public function testGetArgumentsUsesDefaultValueFromClosure()
         $request->attributes->set('foo', 'foo');
         $controller = function ($foo, $bar = 'bar') {};
 
-        $this->assertEquals(['foo', 'bar'], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', 'bar'], self::getResolver()->getArguments($request, $controller));
     }
 
     public function testGetArgumentsFromInvokableObject()
@@ -103,12 +106,12 @@ public function testGetArgumentsFromInvokableObject()
         $request->attributes->set('foo', 'foo');
         $controller = new self();
 
-        $this->assertEquals(['foo', null], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', null], self::getResolver()->getArguments($request, $controller));
 
         // Test default bar overridden by request attribute
         $request->attributes->set('bar', 'bar');
 
-        $this->assertEquals(['foo', 'bar'], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', 'bar'], self::getResolver()->getArguments($request, $controller));
     }
 
     public function testGetArgumentsFromFunctionName()
@@ -118,7 +121,7 @@ public function testGetArgumentsFromFunctionName()
         $request->attributes->set('foobar', 'foobar');
         $controller = __NAMESPACE__.'\controller_function';
 
-        $this->assertEquals(['foo', 'foobar'], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', 'foobar'], self::getResolver()->getArguments($request, $controller));
     }
 
     public function testGetArgumentsFailsOnUnresolvedValue()
@@ -129,7 +132,7 @@ public function testGetArgumentsFailsOnUnresolvedValue()
         $controller = [new self(), 'controllerWithFooBarFoobar'];
 
         try {
-            self::$resolver->getArguments($request, $controller);
+            self::getResolver()->getArguments($request, $controller);
             $this->fail('->getArguments() throws a \RuntimeException exception if it cannot determine the argument value');
         } catch (\Exception $e) {
             $this->assertInstanceOf(\RuntimeException::class, $e, '->getArguments() throws a \RuntimeException exception if it cannot determine the argument value');
@@ -141,7 +144,7 @@ public function testGetArgumentsInjectsRequest()
         $request = Request::create('/');
         $controller = [new self(), 'controllerWithRequest'];
 
-        $this->assertEquals([$request], self::$resolver->getArguments($request, $controller), '->getArguments() injects the request');
+        $this->assertEquals([$request], self::getResolver()->getArguments($request, $controller), '->getArguments() injects the request');
     }
 
     public function testGetArgumentsInjectsExtendingRequest()
@@ -149,7 +152,7 @@ public function testGetArgumentsInjectsExtendingRequest()
         $request = ExtendingRequest::create('/');
         $controller = [new self(), 'controllerWithExtendingRequest'];
 
-        $this->assertEquals([$request], self::$resolver->getArguments($request, $controller), '->getArguments() injects the request when extended');
+        $this->assertEquals([$request], self::getResolver()->getArguments($request, $controller), '->getArguments() injects the request when extended');
     }
 
     public function testGetVariadicArguments()
@@ -159,7 +162,7 @@ public function testGetVariadicArguments()
         $request->attributes->set('bar', ['foo', 'bar']);
         $controller = [new VariadicController(), 'action'];
 
-        $this->assertEquals(['foo', 'foo', 'bar'], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', 'foo', 'bar'], self::getResolver()->getArguments($request, $controller));
     }
 
     public function testGetVariadicArgumentsWithoutArrayInRequest()
@@ -170,7 +173,7 @@ public function testGetVariadicArgumentsWithoutArrayInRequest()
         $request->attributes->set('bar', 'foo');
         $controller = [new VariadicController(), 'action'];
 
-        self::$resolver->getArguments($request, $controller);
+        self::getResolver()->getArguments($request, $controller);
     }
 
     /**
@@ -179,9 +182,8 @@ public function testGetVariadicArgumentsWithoutArrayInRequest()
     public function testGetArgumentWithoutArray()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $factory = new ArgumentMetadataFactory();
         $valueResolver = $this->createMock(ArgumentValueResolverInterface::class);
-        $resolver = new ArgumentResolver($factory, [$valueResolver]);
+        $resolver = self::getResolver([$valueResolver]);
 
         $valueResolver->expects($this->any())->method('supports')->willReturn(true);
         $valueResolver->expects($this->any())->method('resolve')->willReturn([]);
@@ -199,7 +201,7 @@ public function testIfExceptionIsThrownWhenMissingAnArgument()
         $request = Request::create('/');
         $controller = $this->controllerWithFoo(...);
 
-        self::$resolver->getArguments($request, $controller);
+        self::getResolver()->getArguments($request, $controller);
     }
 
     public function testGetNullableArguments()
@@ -210,7 +212,7 @@ public function testGetNullableArguments()
         $request->attributes->set('last', 'last');
         $controller = [new NullableController(), 'action'];
 
-        $this->assertEquals(['foo', new \stdClass(), 'value', 'last'], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals(['foo', new \stdClass(), 'value', 'last'], self::getResolver()->getArguments($request, $controller));
     }
 
     public function testGetNullableArgumentsWithDefaults()
@@ -219,7 +221,7 @@ public function testGetNullableArgumentsWithDefaults()
         $request->attributes->set('last', 'last');
         $controller = [new NullableController(), 'action'];
 
-        $this->assertEquals([null, null, 'value', 'last'], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals([null, null, 'value', 'last'], self::getResolver()->getArguments($request, $controller));
     }
 
     public function testGetSessionArguments()
@@ -229,7 +231,7 @@ public function testGetSessionArguments()
         $request->setSession($session);
         $controller = $this->controllerWithSession(...);
 
-        $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals([$session], self::getResolver()->getArguments($request, $controller));
     }
 
     public function testGetSessionArgumentsWithExtendedSession()
@@ -239,7 +241,7 @@ public function testGetSessionArgumentsWithExtendedSession()
         $request->setSession($session);
         $controller = $this->controllerWithExtendingSession(...);
 
-        $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals([$session], self::getResolver()->getArguments($request, $controller));
     }
 
     public function testGetSessionArgumentsWithInterface()
@@ -249,7 +251,7 @@ public function testGetSessionArgumentsWithInterface()
         $request->setSession($session);
         $controller = $this->controllerWithSessionInterface(...);
 
-        $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
+        $this->assertEquals([$session], self::getResolver()->getArguments($request, $controller));
     }
 
     public function testGetSessionMissMatchWithInterface()
@@ -260,7 +262,7 @@ public function testGetSessionMissMatchWithInterface()
         $request->setSession($session);
         $controller = $this->controllerWithExtendingSession(...);
 
-        self::$resolver->getArguments($request, $controller);
+        self::getResolver()->getArguments($request, $controller);
     }
 
     public function testGetSessionMissMatchWithImplementation()
@@ -271,7 +273,7 @@ public function testGetSessionMissMatchWithImplementation()
         $request->setSession($session);
         $controller = $this->controllerWithExtendingSession(...);
 
-        self::$resolver->getArguments($request, $controller);
+        self::getResolver()->getArguments($request, $controller);
     }
 
     public function testGetSessionMissMatchOnNull()
@@ -280,7 +282,51 @@ public function testGetSessionMissMatchOnNull()
         $request = Request::create('/');
         $controller = $this->controllerWithExtendingSession(...);
 
-        self::$resolver->getArguments($request, $controller);
+        self::getResolver()->getArguments($request, $controller);
+    }
+
+    public function testPinnedResolver()
+    {
+        $resolver = self::getResolver([], [DefaultValueResolver::class => new DefaultValueResolver()]);
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'bar');
+        $controller = $this->controllerPinningResolver(...);
+
+        $this->assertSame([1], $resolver->getArguments($request, $controller));
+    }
+
+    public function testDisabledResolver()
+    {
+        $resolver = self::getResolver(namedResolvers: []);
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', 'bar');
+        $controller = $this->controllerDisablingResolver(...);
+
+        $this->assertSame([1], $resolver->getArguments($request, $controller));
+    }
+
+    public function testManyPinnedResolvers()
+    {
+        $resolver = self::getResolver(namedResolvers: []);
+
+        $request = Request::create('/');
+        $controller = $this->controllerPinningManyResolvers(...);
+
+        $this->expectException(\LogicException::class);
+        $resolver->getArguments($request, $controller);
+    }
+
+    public function testUnknownPinnedResolver()
+    {
+        $resolver = self::getResolver(namedResolvers: []);
+
+        $request = Request::create('/');
+        $controller = $this->controllerPinningUnknownResolver(...);
+
+        $this->expectException(ResolverNotFoundException::class);
+        $resolver->getArguments($request, $controller);
     }
 
     public function __invoke($foo, $bar = null)
@@ -322,6 +368,27 @@ public function controllerWithSessionInterface(SessionInterface $session)
     public function controllerWithExtendingSession(ExtendingSession $session)
     {
     }
+
+    public function controllerPinningResolver(#[ValueResolver(DefaultValueResolver::class)] int $foo = 1)
+    {
+    }
+
+    public function controllerDisablingResolver(#[ValueResolver(RequestAttributeValueResolver::class, disabled: true)] int $foo = 1)
+    {
+    }
+
+    public function controllerPinningManyResolvers(
+        #[ValueResolver(RequestAttributeValueResolver::class)]
+        #[ValueResolver(DefaultValueResolver::class)]
+        int $foo
+    ) {
+    }
+
+    public function controllerPinningUnknownResolver(
+        #[ValueResolver('foo')]
+        int $bar
+    ) {
+    }
 }
 
 function controller_function($foo, $foobar)
diff --git a/src/Symfony/Component/Security/Http/Attribute/CurrentUser.php b/src/Symfony/Component/Security/Http/Attribute/CurrentUser.php
index 413f982ecc5ac..bcf996072e3bf 100644
--- a/src/Symfony/Component/Security/Http/Attribute/CurrentUser.php
+++ b/src/Symfony/Component/Security/Http/Attribute/CurrentUser.php
@@ -11,10 +11,17 @@
 
 namespace Symfony\Component\Security\Http\Attribute;
 
+use Symfony\Component\HttpKernel\Attribute\ValueResolver;
+use Symfony\Component\Security\Http\Controller\UserValueResolver;
+
 /**
  * Indicates that a controller argument should receive the current logged user.
  */
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
-class CurrentUser
+class CurrentUser extends ValueResolver
 {
+    public function __construct(bool $disabled = false, string $resolver = UserValueResolver::class)
+    {
+        parent::__construct($resolver, $disabled);
+    }
 }
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
index 53b5c26f40398..e93e81bee6f1d 100644
--- a/src/Symfony/Component/Security/Http/composer.json
+++ b/src/Symfony/Component/Security/Http/composer.json
@@ -20,7 +20,7 @@
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/security-core": "~6.0.19|~6.1.11|^6.2.5",
         "symfony/http-foundation": "^5.4|^6.0",
-        "symfony/http-kernel": "^6.2",
+        "symfony/http-kernel": "^6.3",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/property-access": "^5.4|^6.0"
     },

From 787d5695e4b79e030e398b7b83357a0538c77666 Mon Sep 17 00:00:00 2001
From: Allison Guilhem <allison.guilhem@gmail.com>
Date: Sun, 5 Mar 2023 20:59:28 +0100
Subject: [PATCH 264/475] [DoctrineBridge] deprecate doctrine schema
 subscribers in favor of listeners

---
 UPGRADE-6.3.md                                |  7 ++
 src/Symfony/Bridge/Doctrine/CHANGELOG.md      |  8 ++
 ...scriber.php => AbstractSchemaListener.php} | 15 +---
 ...DoctrineDbalCacheAdapterSchemaListener.php | 38 +++++++++
 ...ctrineDbalCacheAdapterSchemaSubscriber.php | 31 ++++---
 ...criber.php => LockStoreSchemaListener.php} |  2 +-
 ...ssengerTransportDoctrineSchemaListener.php | 82 +++++++++++++++++++
 ...engerTransportDoctrineSchemaSubscriber.php | 78 +++---------------
 ...hp => PdoSessionHandlerSchemaListener.php} | 11 ++-
 ...rMeTokenProviderDoctrineSchemaListener.php | 44 ++++++++++
 ...eTokenProviderDoctrineSchemaSubscriber.php | 38 ++++-----
 ...neDbalCacheAdapterSchemaSubscriberTest.php |  4 +-
 ...rTransportDoctrineSchemaSubscriberTest.php | 10 ++-
 ...> PdoSessionHandlerSchemaListenerTest.php} |  6 +-
 14 files changed, 236 insertions(+), 138 deletions(-)
 rename src/Symfony/Bridge/Doctrine/SchemaListener/{AbstractSchemaSubscriber.php => AbstractSchemaListener.php} (78%)
 create mode 100644 src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaListener.php
 rename src/Symfony/Bridge/Doctrine/SchemaListener/{LockStoreSchemaSubscriber.php => LockStoreSchemaListener.php} (93%)
 create mode 100644 src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaListener.php
 rename src/Symfony/Bridge/Doctrine/SchemaListener/{PdoSessionHandlerSchemaSubscriber.php => PdoSessionHandlerSchemaListener.php} (81%)
 create mode 100644 src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaListener.php
 rename src/Symfony/Bridge/Doctrine/Tests/SchemaListener/{PdoSessionHandlerSchemaSubscriberTest.php => PdoSessionHandlerSchemaListenerTest.php} (89%)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 43e3abbe9f5f9..2be9f5342b885 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -13,6 +13,13 @@ DependencyInjection
  * Deprecate `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`, use `inline_factories` and `inline_class_loader` instead
  * Deprecate undefined and numeric keys with `service_locator` config, use string aliases instead
 
+DoctrineBridge
+--------------
+
+ * Deprecate `DoctrineDbalCacheAdapterSchemaSubscriber` in favor of `DoctrineDbalCacheAdapterSchemaListener`
+ * Deprecate `MessengerTransportDoctrineSchemaSubscriber` in favor of `MessengerTransportDoctrineSchemaListener`
+ * Deprecate `RememberMeTokenProviderDoctrineSchemaSubscriber` in favor of `RememberMeTokenProviderDoctrineSchemaListener`
+
 FrameworkBundle
 ---------------
 
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
index b313594e4ec6a..4c55f6e45ebae 100644
--- a/src/Symfony/Bridge/Doctrine/CHANGELOG.md
+++ b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -1,6 +1,14 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `AbstractSchemaListener`, `LockStoreSchemaListener` and `PdoSessionHandlerSchemaListener`
+ * Deprecate `DoctrineDbalCacheAdapterSchemaSubscriber` in favor of `DoctrineDbalCacheAdapterSchemaListener`
+ * Deprecate `MessengerTransportDoctrineSchemaSubscriber` in favor of `MessengerTransportDoctrineSchemaListener`
+ * Deprecate `RememberMeTokenProviderDoctrineSchemaSubscriber` in favor of `RememberMeTokenProviderDoctrineSchemaListener`
+
 6.2
 ---
 
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaListener.php
similarity index 78%
rename from src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaSubscriber.php
rename to src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaListener.php
index 52b81d6b98c58..04907ee9a78bd 100644
--- a/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaSubscriber.php
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaListener.php
@@ -11,27 +11,14 @@
 
 namespace Symfony\Bridge\Doctrine\SchemaListener;
 
-use Doctrine\Common\EventSubscriber;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Exception\TableNotFoundException;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
-use Doctrine\ORM\Tools\ToolEvents;
 
-abstract class AbstractSchemaSubscriber implements EventSubscriber
+abstract class AbstractSchemaListener
 {
     abstract public function postGenerateSchema(GenerateSchemaEventArgs $event): void;
 
-    public function getSubscribedEvents(): array
-    {
-        if (!class_exists(ToolEvents::class)) {
-            return [];
-        }
-
-        return [
-            ToolEvents::postGenerateSchema,
-        ];
-    }
-
     protected function getIsSameDatabaseChecker(Connection $connection): \Closure
     {
         return static function (\Closure $exec) use ($connection): bool {
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaListener.php b/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaListener.php
new file mode 100644
index 0000000000000..7be883db807a8
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaListener.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\SchemaListener;
+
+use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter;
+
+/**
+ * Automatically adds the cache table needed for the DoctrineDbalAdapter of
+ * the Cache component.
+ */
+class DoctrineDbalCacheAdapterSchemaListener extends AbstractSchemaListener
+{
+    /**
+     * @param iterable<mixed, DoctrineDbalAdapter> $dbalAdapters
+     */
+    public function __construct(private iterable $dbalAdapters)
+    {
+    }
+
+    public function postGenerateSchema(GenerateSchemaEventArgs $event): void
+    {
+        $connection = $event->getEntityManager()->getConnection();
+
+        foreach ($this->dbalAdapters as $dbalAdapter) {
+            $dbalAdapter->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection));
+        }
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php
index 5df11249f92df..ce05ce5c38aee 100644
--- a/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php
@@ -11,33 +11,30 @@
 
 namespace Symfony\Bridge\Doctrine\SchemaListener;
 
-use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+use Doctrine\Common\EventSubscriber;
+use Doctrine\ORM\Tools\ToolEvents;
 use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter;
 
+trigger_deprecation('symfony/doctrine-bridge', '6.3', 'The "%s" class is deprecated. Use "%s" instead.', DoctrineDbalCacheAdapterSchemaSubscriber::class, DoctrineDbalCacheAdapterSchemaListener::class);
+
 /**
  * Automatically adds the cache table needed for the DoctrineDbalAdapter of
  * the Cache component.
  *
  * @author Ryan Weaver <ryan@symfonycasts.com>
+ *
+ * @deprecated since Symfony 6.3, use {@link DoctrineDbalCacheAdapterSchemaListener} instead
  */
-final class DoctrineDbalCacheAdapterSchemaSubscriber extends AbstractSchemaSubscriber
+final class DoctrineDbalCacheAdapterSchemaSubscriber extends DoctrineDbalCacheAdapterSchemaListener implements EventSubscriber
 {
-    private $dbalAdapters;
-
-    /**
-     * @param iterable<mixed, DoctrineDbalAdapter> $dbalAdapters
-     */
-    public function __construct(iterable $dbalAdapters)
-    {
-        $this->dbalAdapters = $dbalAdapters;
-    }
-
-    public function postGenerateSchema(GenerateSchemaEventArgs $event): void
+    public function getSubscribedEvents(): array
     {
-        $connection = $event->getEntityManager()->getConnection();
-
-        foreach ($this->dbalAdapters as $dbalAdapter) {
-            $dbalAdapter->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection));
+        if (!class_exists(ToolEvents::class)) {
+            return [];
         }
+
+        return [
+            ToolEvents::postGenerateSchema,
+        ];
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php
similarity index 93%
rename from src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaSubscriber.php
rename to src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php
index cbd76fe1d10e2..0902b376d8968 100644
--- a/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaSubscriber.php
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Lock\PersistingStoreInterface;
 use Symfony\Component\Lock\Store\DoctrineDbalStore;
 
-final class LockStoreSchemaSubscriber extends AbstractSchemaSubscriber
+final class LockStoreSchemaListener extends AbstractSchemaListener
 {
     /**
      * @param iterable<mixed, PersistingStoreInterface> $stores
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaListener.php b/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaListener.php
new file mode 100644
index 0000000000000..f5416115cba8f
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Sch
10000
emaListener/MessengerTransportDoctrineSchemaListener.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\SchemaListener;
+
+use Doctrine\DBAL\Event\SchemaCreateTableEventArgs;
+use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransport;
+use Symfony\Component\Messenger\Transport\TransportInterface;
+
+/**
+ * Automatically adds any required database tables to the Doctrine Schema.
+ */
+class MessengerTransportDoctrineSchemaListener extends AbstractSchemaListener
+{
+    private const PROCESSING_TABLE_FLAG = self::class.':processing';
+
+    /**
+     * @param iterable<mixed, TransportInterface> $transports
+     */
+    public function __construct(private iterable $transports)
+    {
+    }
+
+    public function postGenerateSchema(GenerateSchemaEventArgs $event): void
+    {
+        $connection = $event->getEntityManager()->getConnection();
+
+        foreach ($this->transports as $transport) {
+            if (!$transport instanceof DoctrineTransport) {
+                continue;
+            }
+
+            $transport->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection));
+        }
+    }
+
+    public function onSchemaCreateTable(SchemaCreateTableEventArgs $event): void
+    {
+        $table = $event->getTable();
+
+        // if this method triggers a nested create table below, allow Doctrine to work like normal
+        if ($table->hasOption(self::PROCESSING_TABLE_FLAG)) {
+            return;
+        }
+
+        foreach ($this->transports as $transport) {
+            if (!$transport instanceof DoctrineTransport) {
+                continue;
+            }
+
+            if (!$extraSql = $transport->getExtraSetupSqlForTable($table)) {
+                continue;
+            }
+
+            // avoid this same listener from creating a loop on this table
+            $table->addOption(self::PROCESSING_TABLE_FLAG, true);
+            $createTableSql = $event->getPlatform()->getCreateTableSQL($table);
+
+            /*
+             * Add all the SQL needed to create the table and tell Doctrine
+             * to "preventDefault" so that only our SQL is used. This is
+             * the only way to inject some extra SQL.
+             */
+            $event->addSql($createTableSql);
+            foreach ($extraSql as $sql) {
+                $event->addSql($sql);
+            }
+            $event->preventDefault();
+
+            return;
+        }
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php
index 155c5e9602515..10b2372ab161e 100644
--- a/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php
@@ -11,84 +11,28 @@
 
 namespace Symfony\Bridge\Doctrine\SchemaListener;
 
-use Doctrine\DBAL\Event\SchemaCreateTableEventArgs;
+use Doctrine\Common\EventSubscriber;
 use Doctrine\DBAL\Events;
-use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
-use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransport;
-use Symfony\Component\Messenger\Transport\TransportInterface;
+use Doctrine\ORM\Tools\ToolEvents;
+
+trigger_deprecation('symfony/doctrine-bridge', '6.3', 'The "%s" class is deprecated. Use "%s" instead.', MessengerTransportDoctrineSchemaSubscriber::class, MessengerTransportDoctrineSchemaListener::class);
 
 /**
  * Automatically adds any required database tables to the Doctrine Schema.
  *
  * @author Ryan Weaver <ryan@symfonycasts.com>
+ *
+ * @deprecated since Symfony 6.3, use {@link MessengerTransportDoctrineSchemaListener} instead
  */
-final class MessengerTransportDoctrineSchemaSubscriber extends AbstractSchemaSubscriber
+final class MessengerTransportDoctrineSchemaSubscriber extends MessengerTransportDoctrineSchemaListener implements EventSubscriber
 {
-    private const PROCESSING_TABLE_FLAG = self::class.':processing';
-
-    private iterable $transports;
-
-    /**
-     * @param iterable<mixed, TransportInterface> $transports
-     */
-    public function __construct(iterable $transports)
-    {
-        $this->transports = $transports;
-    }
-
-    public function postGenerateSchema(GenerateSchemaEventArgs $event): void
-    {
-        $connection = $event->getEntityManager()->getConnection();
-
-        foreach ($this->transports as $transport) {
-            if (!$transport instanceof DoctrineTransport) {
-                continue;
-            }
-
-            $transport->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection));
-        }
-    }
-
-    public function onSchemaCreateTable(SchemaCreateTableEventArgs $event): void
+    public function getSubscribedEvents(): array
     {
-        $table = $event->getTable();
-
-        // if this method triggers a nested create table below, allow Doctrine to work like normal
-        if ($table->hasOption(self::PROCESSING_TABLE_FLAG)) {
-            return;
-        }
-
-        foreach ($this->transports as $transport) {
-            if (!$transport instanceof DoctrineTransport) {
-                continue;
-            }
-
-            if (!$extraSql = $transport->getExtraSetupSqlForTable($table)) {
-                continue;
-            }
+        $subscribedEvents = [];
 
-            // avoid this same listener from creating a loop on this table
-            $table->addOption(self::PROCESSING_TABLE_FLAG, true);
-            $createTableSql = $event->getPlatform()->getCreateTableSQL($table);
-
-            /*
-             * Add all the SQL needed to create the table and tell Doctrine
-             * to "preventDefault" so that only our SQL is used. This is
-             * the only way to inject some extra SQL.
-             */
-            $event->addSql($createTableSql);
-            foreach ($extraSql as $sql) {
-                $event->addSql($sql);
-            }
-            $event->preventDefault();
-
-            return;
+        if (class_exists(ToolEvents::class)) {
+            $subscribedEvents[] = ToolEvents::postGenerateSchema;
         }
-    }
-
-    public function getSubscribedEvents(): array
-    {
-        $subscribedEvents = parent::getSubscribedEvents();
 
         if (class_exists(Events::class)) {
             $subscribedEvents[] = Events::onSchemaCreateTable;
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaListener.php
similarity index 81%
rename from src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php
rename to src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaListener.php
index a2be4582bf421..5035743080e9d 100644
--- a/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaListener.php
@@ -14,7 +14,7 @@
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
 
-final class PdoSessionHandlerSchemaSubscriber extends AbstractSchemaSubscriber
+final class PdoSessionHandlerSchemaListener extends AbstractSchemaListener
 {
     private PdoSessionHandler $sessionHandler;
 
@@ -25,13 +25,12 @@ public function __construct(\SessionHandlerInterface $sessionHandler)
         }
     }
 
-    public function getSubscribedEvents(): array
-    {
-        return isset($this->sessionHandler) ? parent::getSubscribedEvents() : [];
-    }
-
     public function postGenerateSchema(GenerateSchemaEventArgs $event): void
     {
+        if (!isset($this->sessionHandler)) {
+            return;
+        }
+
         $connection = $event->getEntityManager()->getConnection();
 
         $this->sessionHandler->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaListener.php b/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaListener.php
new file mode 100644
index 0000000000000..a7f4c49d58784
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaListener.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\SchemaListener;
+
+use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+use Symfony\Bridge\Doctrine\Security\RememberMe\DoctrineTokenProvider;
+use Symfony\Component\Security\Http\RememberMe\PersistentRememberMeHandler;
+use Symfony\Component\Security\Http\RememberMe\RememberMeHandlerInterface;
+
+/**
+ * Automatically adds the rememberme table needed for the {@see DoctrineTokenProvider}.
+ */
+class RememberMeTokenProviderDoctrineSchemaListener extends AbstractSchemaListener
+{
+    /**
+     * @param iterable<mixed, RememberMeHandlerInterface> $rememberMeHandlers
+     */
+    public function __construct(private iterable $rememberMeHandlers)
+    {
+    }
+
+    public function postGenerateSchema(GenerateSchemaEventArgs $event): void
+    {
+        $connection = $event->getEntityManager()->getConnection();
+
+        foreach ($this->rememberMeHandlers as $rememberMeHandler) {
+            if (
+                $rememberMeHandler instanceof PersistentRememberMeHandler
+                && ($tokenProvider = $rememberMeHandler->getTokenProvider()) instanceof DoctrineTokenProvider
+            ) {
+                $tokenProvider->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection));
+            }
+        }
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php
index bd7540f1bbe44..82a5a7817b7b5 100644
--- a/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php
@@ -11,39 +11,29 @@
 
 namespace Symfony\Bridge\Doctrine\SchemaListener;
 
-use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+use Doctrine\Common\EventSubscriber;
+use Doctrine\ORM\Tools\ToolEvents;
 use Symfony\Bridge\Doctrine\Security\RememberMe\DoctrineTokenProvider;
-use Symfony\Component\Security\Http\RememberMe\PersistentRememberMeHandler;
-use Symfony\Component\Security\Http\RememberMe\RememberMeHandlerInterface;
+
+trigger_deprecation('symfony/doctrine-bridge', '6.3', 'The "%s" class is deprecated. Use "%s" instead.', RememberMeTokenProviderDoctrineSchemaSubscriber::class, RememberMeTokenProviderDoctrineSchemaListener::class);
 
 /**
  * Automatically adds the rememberme table needed for the {@see DoctrineTokenProvider}.
  *
  * @author Wouter de Jong <wouter@wouterj.nl>
+ *
+ * @deprecated since Symfony 6.3, use {@link RememberMeTokenProviderDoctrineSchemaListener} instead
  */
-final class RememberMeTokenProviderDoctrineSchemaSubscriber extends AbstractSchemaSubscriber
+final class RememberMeTokenProviderDoctrineSchemaSubscriber extends RememberMeTokenProviderDoctrineSchemaListener implements EventSubscriber
 {
-    private iterable $rememberMeHandlers;
-
-    /**
-     * @param iterable<mixed, RememberMeHandlerInterface> $rememberMeHandlers
-     */
-    public function __construct(iterable $rememberMeHandlers)
-    {
-        $this->rememberMeHandlers = $rememberMeHandlers;
-    }
-
-    public function postGenerateSchema(GenerateSchemaEventArgs $event): void
+    public function getSubscribedEvents(): array
     {
-        $connection = $event->getEntityManager()->getConnection();
-
-        foreach ($this->rememberMeHandlers as $rememberMeHandler) {
-            if (
-                $rememberMeHandler instanceof PersistentRememberMeHandler
-                && ($tokenProvider = $rememberMeHandler->getTokenProvider()) instanceof DoctrineTokenProvider
-            ) {
-                $tokenProvider->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection));
-            }
+        if (!class_exists(ToolEvents::class)) {
+            return [];
         }
+
+        return [
+            ToolEvents::postGenerateSchema,
+        ];
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php
index 0a65b6e6bc720..4386ff6c51d3e 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php
@@ -16,7 +16,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\Doctrine\SchemaListener\DoctrineDbalCacheAdapterSchemaSubscriber;
+use Symfony\Bridge\Doctrine\SchemaListener\DoctrineDbalCacheAdapterSchemaListener;
 use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter;
 
 class DoctrineDbalCacheAdapterSchemaSubscriberTest extends TestCase
@@ -37,7 +37,7 @@ public function testPostGenerateSchema()
             ->method('configureSchema')
             ->with($schema, $dbalConnection);
 
-        $subscriber = new DoctrineDbalCacheAdapterSchemaSubscriber([$dbalAdapter]);
+        $subscriber = new DoctrineDbalCacheAdapterSchemaListener([$dbalAdapter]);
         $subscriber->postGenerateSchema($event);
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaSubscriberTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaSubscriberTest.php
index ff4ab2c27a19c..31d4004d923a5 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaSubscriberTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaSubscriberTest.php
@@ -19,7 +19,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\Doctrine\SchemaListener\MessengerTransportDoctrineSchemaSubscriber;
+use Symfony\Bridge\Doctrine\SchemaListener\MessengerTransportDoctrineSchemaListener;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransport;
 use Symfony\Component\Messenger\Transport\TransportInterface;
 
@@ -43,7 +43,7 @@ public function testPostGenerateSchema()
         $otherTransport->expects($this->never())
             ->method($this->anything());
 
-        $subscriber = new MessengerTransportDoctrineSchemaSubscriber([$doctrineTransport, $otherTransport]);
+        $subscriber = new MessengerTransportDoctrineSchemaListener([$doctrineTransport, $otherTransport]);
         $subscriber->postGenerateSchema($event);
     }
 
@@ -69,7 +69,8 @@ public function testOnSchemaCreateTable()
             ->with($table)
             ->willReturn('CREATE TABLE pizza (id integer NOT NULL)');
 
-        $subscriber = new MessengerTransportDoctrineSchemaSubscriber([$otherTransport, $doctrineTransport]);
+        $subscriber = new MessengerTransportDoctrineSchemaListener([$otherTransport, $doctrineTransport]);
+
         $subscriber->onSchemaCreateTable($event);
         $this->assertTrue($event->isDefaultPrevented());
         $this->assertSame([
@@ -92,7 +93,8 @@ public function testOnSchemaCreateTableNoExtraSql()
         $platform->expects($this->never())
             ->method('getCreateTableSQL');
 
-        $subscriber = new MessengerTransportDoctrineSchemaSubscriber([$doctrineTransport]);
+        $subscriber = new MessengerTransportDoctrineSchemaListener([$doctrineTransport]);
+
         $subscriber->onSchemaCreateTable($event);
         $this->assertFalse($event->isDefaultPrevented());
     }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaListenerTest.php
similarity index 89%
rename from src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php
rename to src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaListenerTest.php
index 627848c0bcc0a..fce89261082c7 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaListenerTest.php
@@ -16,10 +16,10 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\Doctrine\SchemaListener\PdoSessionHandlerSchemaSubscriber;
+use Symfony\Bridge\Doctrine\SchemaListener\PdoSessionHandlerSchemaListener;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
 
-class PdoSessionHandlerSchemaSubscriberTest extends TestCase
+class PdoSessionHandlerSchemaListenerTest extends TestCase
 {
     public function testPostGenerateSchemaPdo()
     {
@@ -36,7 +36,7 @@ public function testPostGenerateSchemaPdo()
             ->method('configureSchema')
             ->with($schema, fn () => true);
 
-        $subscriber = new PdoSessionHandlerSchemaSubscriber($pdoSessionHandler);
+        $subscriber = new PdoSessionHandlerSchemaListener($pdoSessionHandler);
         $subscriber->postGenerateSchema($event);
     }
 }

From 9bb72d704446b1e75e75969aec673c157ff5066f Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Sat, 4 Mar 2023 15:47:35 +0100
Subject: [PATCH 265/475] [HttpFoundation][HttpKernel] Add missing void PHPdoc
 return types

---
 .github/expected-missing-return-types.diff    | 284 +++++++++++++++++-
 .../Kernel/MicroKernelTrait.php               |   3 +
 .../Tests/Functional/app/AppKernel.php        |   2 +-
 .../Tests/Functional/EmptyAppTest.php         |   2 +-
 .../Functional/NoTemplatingEntryTest.php      |   2 +-
 .../Attribute/AttributeBagInterface.php       |   5 +
 .../Session/Flash/FlashBagInterface.php       |   6 +
 .../Session/SessionBagInterface.php           |   2 +
 .../Session/SessionInterface.php              |  14 +
 .../Storage/SessionStorageInterface.php       |  10 +
 .../CacheClearer/CacheClearerInterface.php    |   2 +
 .../ResponseCacheStrategyInterface.php        |   4 +
 .../HttpKernel/HttpCache/StoreInterface.php   |   4 +
 .../HttpCache/SurrogateInterface.php          |   4 +
 .../Component/HttpKernel/KernelInterface.php  |   6 +
 .../HttpKernel/Log/DebugLoggerInterface.php   |   2 +
 .../Profiler/ProfilerStorageInterface.php     |   2 +
 .../HttpKernel/RebootableInterface.php        |   2 +
 .../HttpKernel/TerminableInterface.php        |   2 +
 .../DataCollector/ConfigDataCollectorTest.php |   2 +-
 .../Component/HttpKernel/Tests/Logger.php     |   2 +-
 21 files changed, 355 insertions(+), 7 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index fc406bbc5a39f..95b866bf58ee4 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -694,6 +694,17 @@ index 7f48810e50..f85b13d818 100644
 +    public function build(ContainerBuilder $container): void
      {
          parent::build($container);
+diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
+index 3ab28a1f81..2ace764149 100644
+--- a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
+@@ -132,5 +132,5 @@ trait MicroKernelTrait
+      * @return void
+      */
+-    public function registerContainerConfiguration(LoaderInterface $loader)
++    public function registerContainerConfiguration(LoaderInterface $loader): void
+     {
+         $loader->load(function (ContainerBuilder $container) use ($loader) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
 index 1f484c1b84..67dba6fc40 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
@@ -2092,7 +2103,7 @@ index cc024da461..00b79e915f 100644
      {
          $errors = [];
 diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
-index dd8d29d1d1..07262bf107 100644
+index 28fec5fdec..e8994f2a90 100644
 --- a/src/Symfony/Component/Console/Application.php
 +++ b/src/Symfony/Component/Console/Application.php
 @@ -114,5 +114,5 @@ class Application implements ResetInterface
@@ -7337,6 +7348,24 @@ index ad5a6590a5..cf296c1d6d 100644
 +    public function replace(array $attributes): void
      {
          $this->attributes = [];
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php
+index e8cd0b5a4d..27eca96974 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php
+@@ -36,5 +36,5 @@ interface AttributeBagInterface extends SessionBagInterface
+      * @return void
+      */
+-    public function set(string $name, mixed $value);
++    public function set(string $name, mixed $value): void;
+ 
+     /**
+@@ -48,5 +48,5 @@ interface AttributeBagInterface extends SessionBagInterface
+      * @return void
+      */
+-    public function replace(array $attributes);
++    public function replace(array $attributes): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php b/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
 index 80bbeda0f8..c4d461cd3a 100644
 --- a/src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
@@ -7415,6 +7444,31 @@ index 659d59d186..3da6888cec 100644
 +    public function setAll(array $messages): void
      {
          $this->flashes = $messages;
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
+index bbcf7f8b7d..6ef5b35e7d 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
+@@ -26,5 +26,5 @@ interface FlashBagInterface extends SessionBagInterface
+      * @return void
+      */
+-    public function add(string $type, mixed $message);
++    public function add(string $type, mixed $message): void;
+ 
+     /**
+@@ -33,5 +33,5 @@ interface FlashBagInterface extends SessionBagInterface
+      * @return void
+      */
+-    public function set(string $type, string|array $messages);
++    public function set(string $type, string|array $messages): void;
+ 
+     /**
+@@ -65,5 +65,5 @@ interface FlashBagInterface extends SessionBagInterface
+      * @return void
+      */
+-    public function setAll(array $messages);
++    public function setAll(array $messages): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
 index b45be2f8c3..ce73fdb85f 100644
 --- a/src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -7468,6 +7522,70 @@ index b45be2f8c3..ce73fdb85f 100644
 +    public function registerBag(SessionBagInterface $bag): void
      {
          $this->storage->registerBag(new SessionBagProxy($bag, $this->data, $this->usageIndex, $this->usageReporter));
+diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php
+index e1c2505549..d88b64acdd 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php
++++ b/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php
+@@ -29,5 +29,5 @@ interface SessionBagInterface
+      * @return void
+      */
+-    public function initialize(array &$array);
++    public function initialize(array &$array): void;
+ 
+     /**
+diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
+index 534883d2d2..1240e36f74 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
++++ b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
+@@ -38,5 +38,5 @@ interface SessionInterface
+      * @return void
+      */
+-    public function setId(string $id);
++    public function setId(string $id): void;
+ 
+     /**
+@@ -50,5 +50,5 @@ interface SessionInterface
+      * @return void
+      */
+-    public function setName(string $name);
++    public function setName(string $name): void;
+ 
+     /**
+@@ -86,5 +86,5 @@ interface SessionInterface
+      * @return void
+      */
+-    public function save();
++    public function save(): void;
+ 
+     /**
+@@ -103,5 +103,5 @@ interface SessionInterface
+      * @return void
+      */
+-    public function set(string $name, mixed $value);
++    public function set(string $name, mixed $value): void;
+ 
+     /**
+@@ -115,5 +115,5 @@ interface SessionInterface
+      * @return void
+      */
+-    public function replace(array $attributes);
++    public function replace(array $attributes): void;
+ 
+     /**
+@@ -129,5 +129,5 @@ interface SessionInterface
+      * @return void
+      */
+-    public function clear();
++    public function clear(): void;
+ 
+     /**
+@@ -141,5 +141,5 @@ interface SessionInterface
+      * @return void
+      */
+-    public function registerBag(SessionBagInterface $bag);
++    public function registerBag(SessionBagInterface $bag): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
 index 65452a5207..ce0357e36b 100644
 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -7671,6 +7789,45 @@ index 2fcd06b10b..4981f75360 100644
 +    public function setName(string $name): void
      {
          if ($this->isActive()) {
+diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
+index ed2189e4e7..28e90cdcf9 100644
+--- a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
++++ b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
+@@ -44,5 +44,5 @@ interface SessionStorageInterface
+      * @return void
+      */
+-    public function setId(string $id);
++    public function setId(string $id): void;
+ 
+     /**
+@@ -56,5 +56,5 @@ interface SessionStorageInterface
+      * @return void
+      */
+-    public function setName(string $name);
++    public function setName(string $name): void;
+ 
+     /**
+@@ -100,5 +100,5 @@ interface SessionStorageInterface
+      *                           is already closed
+      */
+-    public function save();
++    public function save(): void;
+ 
+     /**
+@@ -107,5 +107,5 @@ interface SessionStorageInterface
+      * @return void
+      */
+-    public function clear();
++    public function clear(): void;
+ 
+     /**
+@@ -121,5 +121,5 @@ interface SessionStorageInterface
+      * @return void
+      */
+-    public function registerBag(SessionBagInterface $bag);
++    public function registerBag(SessionBagInterface $bag): void;
+ 
+     public function getMetadataBag(): MetadataBag;
 diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
 index 2ddf55f2cb..52049a92b4 100644
 --- a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -7728,6 +7885,16 @@ index 02cb9641db..abe408eb24 100644
 +    public function build(ContainerBuilder $container): void;
  
      /**
+diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php b/src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php
+index 5ca4265624..1cb3611f8d 100644
+--- a/src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php
++++ b/src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php
+@@ -24,4 +24,4 @@ interface CacheClearerInterface
+      * @return void
+      */
+-    public function clear(string $cacheDir);
++    public function clear(string $cacheDir): void;
+ }
 diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php b/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
 index 3c99b74af3..fdb68feb2c 100644
 --- a/src/Symfony/Component/HttpKernel/CacheClearer/Psr6CacheClearer.php
@@ -8248,6 +8415,23 @@ index 1bdaab148a..7976d00605 100644
 +    public function update(Response $response): void
      {
          // if we have no embedded Response, do nothing
+diff --git a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php
+index 33c8bd9412..8fe6df2512 100644
+--- a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php
++++ b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php
+@@ -31,5 +31,5 @@ interface ResponseCacheStrategyInterface
+      * @return void
+      */
+-    public function add(Response $response);
++    public function add(Response $response): void;
+ 
+     /**
+@@ -38,4 +38,4 @@ interface ResponseCacheStrategyInterface
+      * @return void
+      */
+-    public function update(Response $response);
++    public function update(Response $response): void;
+ }
 diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
 index bde72914a7..c1656f2ac0 100644
 --- a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
@@ -8284,6 +8468,41 @@ index f838f1bfb4..4250fd8c49 100644
 +    public function getPath(string $key): string
      {
          return $this->root.\DIRECTORY_SEPARATOR.substr($key, 0, 2).\DIRECTORY_SEPARATOR.substr($key, 2, 2).\DIRECTORY_SEPARATOR.substr($key, 4, 2).\DIRECTORY_SEPARATOR.substr($key, 6);
+diff --git a/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php
+index b73cb7a9e6..daecd76c19 100644
+--- a/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php
++++ b/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php
+@@ -45,5 +45,5 @@ interface StoreInterface
+      * @return void
+      */
+-    public function invalidate(Request $request);
++    public function invalidate(Request $request): void;
+ 
+     /**
+@@ -80,4 +80,4 @@ interface StoreInterface
+      * @return void
+      */
+-    public function cleanup();
++    public function cleanup(): void;
+ }
+diff --git a/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php
+index e444458f73..058a4023f8 100644
+--- a/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php
++++ b/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php
+@@ -37,5 +37,5 @@ interface SurrogateInterface
+      * @return void
+      */
+-    public function addSurrogateCapability(Request $request);
++    public function addSurrogateCapability(Request $request): void;
+ 
+     /**
+@@ -46,5 +46,5 @@ interface SurrogateInterface
+      * @return void
+      */
+-    public function addSurrogateControl(Response $response);
++    public function addSurrogateControl(Response $response): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
 index 794a55dc18..1fb8cbaa5d 100644
 --- a/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -8394,8 +8613,33 @@ index f9a969b659..e8d115c435 100644
 +    protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container, string $class, string $baseClass): void
      {
          // cache the container
+diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/Component/HttpKernel/KernelInterface.php
+index 14a053ab30..737af1b649 100644
+--- a/src/Symfony/Component/HttpKernel/KernelInterface.php
++++ b/src/Symfony/Component/HttpKernel/KernelInterface.php
+@@ -37,5 +37,5 @@ interface KernelInterface extends HttpKernelInterface
+      * @return void
+      */
+-    public function registerContainerConfiguration(LoaderInterface $loader);
++    public function registerContainerConfiguration(LoaderInterface $loader): void;
+ 
+     /**
+@@ -44,5 +44,5 @@ interface KernelInterface extends HttpKernelInterface
+      * @return void
+      */
+-    public function boot();
++    public function boot(): void;
+ 
+     /**
+@@ -53,5 +53,5 @@ interface KernelInterface extends HttpKernelInterface
+      * @return void
+      */
+-    public function shutdown();
++    public function shutdown(): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
-index 84452ae71f..f70165d25f 100644
+index 1940c80a90..5f28605ada 100644
 --- a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
 +++ b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
 @@ -34,5 +34,5 @@ interface DebugLoggerInterface
@@ -8412,6 +8656,12 @@ index 84452ae71f..f70165d25f 100644
 +    public function countErrors(Request $request = null): int;
  
      /**
+@@ -48,4 +48,4 @@ interface DebugLoggerInterface
+      * @return void
+      */
+-    public function clear();
++    public function clear(): void;
+ }
 diff --git a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
 index 0fdbfc44ba..67ad8c64c1 100644
 --- a/src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
@@ -8557,6 +8807,36 @@ index 5d6fad8fe3..e723e1e445 100644
 +    public function add(DataCollectorInterface $collector): void
      {
          $this->collectors[$collector->getName()] = $collector;
+diff --git a/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php b/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php
+index 247e51fce9..73d8d4bf43 100644
+--- a/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php
++++ b/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php
+@@ -53,4 +53,4 @@ interface ProfilerStorageInterface
+      * @return void
+      */
+-    public function purge();
++    public function purge(): void;
+ }
+diff --git a/src/Symfony/Component/HttpKernel/RebootableInterface.php b/src/Symfony/Component/HttpKernel/RebootableInterface.php
+index e973f55400..3d39172b25 100644
+--- a/src/Symfony/Component/HttpKernel/RebootableInterface.php
++++ b/src/Symfony/Component/HttpKernel/RebootableInterface.php
+@@ -29,4 +29,4 @@ interface RebootableInterface
+      * @return void
+      */
+-    public function reboot(?string $warmupDir);
++    public function reboot(?string $warmupDir): void;
+ }
+diff --git a/src/Symfony/Component/HttpKernel/TerminableInterface.php b/src/Symfony/Component/HttpKernel/TerminableInterface.php
+index 341ef73c4d..805391d171 100644
+--- a/src/Symfony/Component/HttpKernel/TerminableInterface.php
++++ b/src/Symfony/Component/HttpKernel/TerminableInterface.php
+@@ -31,4 +31,4 @@ interface TerminableInterface
+      * @return void
+      */
+-    public function terminate(Request $request, Response $response);
++    public function terminate(Request $request, Response $response): void;
+ }
 diff --git a/src/Symfony/Component/Intl/Util/IntlTestHelper.php b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
 index d22f2e6953..1dcdcdf4ea 100644
 --- a/src/Symfony/Component/Intl/Util/IntlTestHelper.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
index 8069822767a47..3ab28a1f81db9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -128,6 +128,9 @@ public function registerBundles(): iterable
         }
     }
 
+    /**
+     * @return void
+     */
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(function (ContainerBuilder $container) use ($loader) {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
index d10326e676a38..4969b13419fb8 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
@@ -75,7 +75,7 @@ public function getLogDir(): string
         return sys_get_temp_dir().'/'.$this->varDir.'/'.$this->testCase.'/logs';
     }
 
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         foreach ($this->rootConfig as $config) {
             $loader->load($config);
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/EmptyAppTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/EmptyAppTest.php
index bfdf9418a765a..6451f6185150c 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/Functional/EmptyAppTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/Functional/EmptyAppTest.php
@@ -58,7 +58,7 @@ public function registerBundles(): iterable
         return [new TwigBundle()];
     }
 
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(static function (ContainerBuilder $container) {
             $container->register('error_renderer.html', HtmlErrorRenderer::class);
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php
index 691430ead578b..a12a48ef51831 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php
@@ -59,7 +59,7 @@ public function registerBundles(): iterable
         return [new FrameworkBundle(), new TwigBundle()];
     }
 
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(function (ContainerBuilder $container) {
             $container
diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php
index 31a946444b93f..e8cd0b5a4d6e3 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php
@@ -32,6 +32,8 @@ public function get(string $name, mixed $default = null): mixed;
 
     /**
      * Sets an attribute.
+     *
+     * @return void
      */
     public function set(string $name, mixed $value);
 
@@ -42,6 +44,9 @@ public function set(string $name, mixed $value);
      */
     public function all(): array;
 
+    /**
+     * @return void
+     */
     public function replace(array $attributes);
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
index cd10a23f3c08e..bbcf7f8b7d877 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
@@ -22,11 +22,15 @@ interface FlashBagInterface extends SessionBagInterface
 {
     /**
      * Adds a flash message for the given type.
+     *
+     * @return void
      */
     public function add(string $type, mixed $message);
 
     /**
      * Registers one or more messages for a given type.
+     *
+     * @return void
      */
     public function set(string $type, string|array $messages);
 
@@ -57,6 +61,8 @@ public function all(): array;
 
     /**
      * Sets all flash messages.
+     *
+     * @return void
      */
     public function setAll(array $messages);
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php
index 821645d9b87c6..e1c2505549578 100644
--- a/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php
+++ b/src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php
@@ -25,6 +25,8 @@ public function getName(): string;
 
     /**
      * Initializes the Bag.
+     *
+     * @return void
      */
     public function initialize(array &$array);
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
index da2b3a37d6803..534883d2d227f 100644
--- a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
+++ b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
@@ -34,6 +34,8 @@ public function getId(): string;
 
     /**
      * Sets the session ID.
+     *
+     * @return void
      */
     public function setId(string $id);
 
@@ -44,6 +46,8 @@ public function getName(): string;
 
     /**
      * Sets the session name.
+     *
+     * @return void
      */
     public function setName(string $name);
 
@@ -78,6 +82,8 @@ public function migrate(bool $destroy = false, int $lifetime = null): bool;
      * This method is generally not required for real sessions as
      * the session will be automatically saved at the end of
      * code execution.
+     *
+     * @return void
      */
     public function save();
 
@@ -93,6 +99,8 @@ public function get(string $name, mixed $default = null): mixed;
 
     /**
      * Sets an attribute.
+     *
+     * @return void
      */
     public function set(string $name, mixed $value);
 
@@ -103,6 +111,8 @@ public function all(): array;
 
     /**
      * Sets attributes.
+     *
+     * @return void
      */
     public function replace(array $attributes);
 
@@ -115,6 +125,8 @@ public function remove(string $name): mixed;
 
     /**
      * Clears all attributes.
+     *
+     * @return void
      */
     public function clear();
 
@@ -125,6 +137,8 @@ public function isStarted(): bool;
 
     /**
      * Registers a SessionBagInterface with the session.
+     *
+     * @return void
      */
     public function registerBag(SessionBagInterface $bag);
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
index 8bd62a43ae894..ed2189e4e777c 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
@@ -40,6 +40,8 @@ public function getId(): string;
 
     /**
      * Sets the session ID.
+     *
+     * @return void
      */
     public function setId(string $id);
 
@@ -50,6 +52,8 @@ public function getName(): string;
 
     /**
      * Sets the session name.
+     *
+     * @return void
      */
     public function setName(string $name);
 
@@ -90,6 +94,8 @@ public function regenerate(bool $destroy = false, int $lifetime = null): bool;
      * a real PHP session would interfere with testing, in which case
      * it should actually persist the session data if required.
      *
+     * @return void
+     *
      * @throws \RuntimeException if the session is saved without being started, or if the session
      *                           is already closed
      */
@@ -97,6 +103,8 @@ public function save();
 
     /**
      * Clear all session data in memory.
+     *
+     * @return void
      */
     public function clear();
 
@@ -109,6 +117,8 @@ public function getBag(string $name): SessionBagInterface;
 
     /**
      * Registers a SessionBagInterface for use.
+     *
+     * @return void
      */
     public function registerBag(SessionBagInterface $bag);
 
diff --git a/src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php b/src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php
index 270f690e5b839..5ca426562402e 100644
--- a/src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php
+++ b/src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php
@@ -20,6 +20,8 @@ interface CacheClearerInterface
 {
     /**
      * Clears any caches necessary.
+     *
+     * @return void
      */
     public function clear(string $cacheDir);
 }
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php
index e282299aee8a3..33c8bd9412a8c 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategyInterface.php
@@ -27,11 +27,15 @@ interface ResponseCacheStrategyInterface
 {
     /**
      * Adds a Response.
+     *
+     * @return void
      */
     public function add(Response $response);
 
     /**
      * Updates the Response HTTP headers based on the embedded Responses.
+     *
+     * @return void
      */
     public function update(Response $response);
 }
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php
index 0cf8921cd19bb..b73cb7a9e688a 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php
@@ -41,6 +41,8 @@ public function write(Request $request, Response $response): string;
 
     /**
      * Invalidates all cache entries that match the request.
+     *
+     * @return void
      */
     public function invalidate(Request $request);
 
@@ -74,6 +76,8 @@ public function purge(string $url): bool;
 
     /**
      * Cleanups storage.
+     *
+     * @return void
      */
     public function cleanup();
 }
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php
index 6e9b17b316c10..e444458f73558 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/SurrogateInterface.php
@@ -33,6 +33,8 @@ public function hasSurrogateCapability(Request $request): bool;
 
     /**
      * Adds Surrogate-capability to the given Request.
+     *
+     * @return void
      */
     public function addSurrogateCapability(Request $request);
 
@@ -40,6 +42,8 @@ public function addSurrogateCapability(Request $request);
      * Adds HTTP headers to specify that the Response needs to be parsed for Surrogate.
      *
      * This method only adds an Surrogate HTTP header if the Response has some Surrogate tags.
+     *
+     * @return void
      */
     public function addSurrogateControl(Response $response);
 
diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/Component/HttpKernel/KernelInterface.php
index 0959febf14e7b..14a053ab3004b 100644
--- a/src/Symfony/Component/HttpKernel/KernelInterface.php
+++ b/src/Symfony/Component/HttpKernel/KernelInterface.php
@@ -33,11 +33,15 @@ public function registerBundles(): iterable;
 
     /**
      * Loads the container configuration.
+     *
+     * @return void
      */
     public function registerContainerConfiguration(LoaderInterface $loader);
 
     /**
      * Boots the current kernel.
+     *
+     * @return void
      */
     public function boot();
 
@@ -45,6 +49,8 @@ public function boot();
      * Shutdowns the kernel.
      *
      * This method is mainly useful when doing functional testing.
+     *
+     * @return void
      */
     public function shutdown();
 
diff --git a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
index 84452ae71fd7a..1940c80a902a0 100644
--- a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
+++ b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
@@ -44,6 +44,8 @@ public function countErrors(Request $request = null);
 
     /**
      * Removes all log records.
+     *
+     * @return void
      */
     public function clear();
 }
diff --git a/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php b/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php
index 95d72f46b3872..247e51fce948c 100644
--- a/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php
+++ b/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php
@@ -49,6 +49,8 @@ public function write(Profile $profile): bool;
 
     /**
      * Purges all data from the database.
+     *
+     * @return void
      */
     public function purge();
 }
diff --git a/src/Symfony/Component/HttpKernel/RebootableInterface.php b/src/Symfony/Component/HttpKernel/RebootableInterface.php
index e257237da90a1..e973f55400b8c 100644
--- a/src/Symfony/Component/HttpKernel/RebootableInterface.php
+++ b/src/Symfony/Component/HttpKernel/RebootableInterface.php
@@ -25,6 +25,8 @@ interface RebootableInterface
      * while building the container. Use the %kernel.build_dir% parameter instead.
      *
      * @param string|null $warmupDir pass null to reboot in the regular build directory
+     *
+     * @return void
      */
     public function reboot(?string $warmupDir);
 }
diff --git a/src/Symfony/Component/HttpKernel/TerminableInterface.php b/src/Symfony/Component/HttpKernel/TerminableInterface.php
index 8aa331979340c..341ef73c4d418 100644
--- a/src/Symfony/Component/HttpKernel/TerminableInterface.php
+++ b/src/Symfony/Component/HttpKernel/TerminableInterface.php
@@ -27,6 +27,8 @@ interface TerminableInterface
      * Terminates a request/response cycle.
      *
      * Should be called after sending the response and before shutting down the kernel.
+     *
+     * @return void
      */
     public function terminate(Request $request, Response $response);
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
index 8ed145d075e88..efee6742eadc2 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
@@ -90,7 +90,7 @@ public function getBundles(): array
         return [];
     }
 
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Logger.php b/src/Symfony/Component/HttpKernel/Tests/Logger.php
index b6875793bc3e5..c553116b57fad 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Logger.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Logger.php
@@ -27,7 +27,7 @@ public function getLogs($level = false): array
         return false === $level ? $this->logs : $this->logs[$level];
     }
 
-    public function clear()
+    public function clear(): void
     {
         $this->logs = [
             'emergency' => [],

From 45f03b80f2d4fb4d5b5c6d9c3da3d30449ffb401 Mon Sep 17 00:00:00 2001
From: victor-prdh <victor.prudhomme60600@gmail.com>
Date: Thu, 26 Jan 2023 18:20:41 +0100
Subject: [PATCH 266/475] [DomCrawler] Give choice of used parser

---
 .../Component/BrowserKit/AbstractBrowser.php      | 15 ++++++++++++++-
 src/Symfony/Component/BrowserKit/CHANGELOG.md     |  5 +++++
 src/Symfony/Component/DomCrawler/CHANGELOG.md     |  1 +
 src/Symfony/Component/DomCrawler/Crawler.php      | 15 ++++++++++-----
 .../DomCrawler/Tests/AbstractCrawlerTestCase.php  |  4 ++--
 .../DomCrawler/Tests/Html5ParserCrawlerTest.php   | 14 ++++++++++++++
 6 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
index f69beb5da91aa..bf5ff90e5dd60 100644
--- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
+++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
@@ -37,6 +37,7 @@ abstract class AbstractBrowser
     protected $internalResponse;
     protected $response;
     protected $crawler;
+    protected bool $useHtml5Parser = true;
     protected $insulated = false;
     protected $redirect;
     protected $followRedirects = true;
@@ -207,6 +208,18 @@ public function getCrawler(): Crawler
         return $this->crawler;
     }
 
+    /**
+     * Sets whether parsing should be done using "masterminds/html5".
+     *
+     * @return $this
+     */
+    public function useHtml5Parser(bool $useHtml5Parser): static
+    {
+        $this->useHtml5Parser = $useHtml5Parser;
+
+        return $this;
+    }
+
     /**
      * Returns the current BrowserKit Response instance.
      */
@@ -497,7 +510,7 @@ protected function createCrawlerFromContent(string $uri, string $content, string
             return null;
         }
 
-        $crawler = new Crawler(null, $uri);
+        $crawler = new Crawler(null, $uri, null, $this->useHtml5Parser);
         $crawler->addContent($content, $type);
 
         return $crawler;
diff --git a/src/Symfony/Component/BrowserKit/CHANGELOG.md b/src/Symfony/Component/BrowserKit/CHANGELOG.md
index a730a86bf4e70..2d2ea9a75c2c8 100644
--- a/src/Symfony/Component/BrowserKit/CHANGELOG.md
+++ b/src/Symfony/Component/BrowserKit/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `AbstractBrowser::useHtml5Parser()`
+
 6.1
 ---
 
diff --git a/src/Symfony/Component/DomCrawler/CHANGELOG.md b/src/Symfony/Component/DomCrawler/CHANGELOG.md
index 1cd98759a3270..be1c0ba143f92 100644
--- a/src/Symfony/Component/DomCrawler/CHANGELOG.md
+++ b/src/Symfony/Component/DomCrawler/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 6.3
 ---
 
+ * Add `$useHtml5Parser` argument to `Crawler`
  * Add `CrawlerSelectorCount` test constraint
  * Add argument `$normalizeWhitespace` to `Crawler::innerText()`
  * Make `Crawler::innerText()` return the first non-empty text
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index 8176fee4e6d4d..59eec3068c9e7 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -58,16 +58,17 @@ class Crawler implements \Countable, \IteratorAggregate
      */
     private bool $isHtml = true;
 
-    private HTML5 $html5Parser;
+
+    private ?HTML5 $html5Parser = null;
 
     /**
      * @param \DOMNodeList|\DOMNode|\DOMNode[]|string|null $node A Node to use as the base for the crawling
      */
-    public function __construct(\DOMNodeList|\DOMNode|array|string $node = null, string $uri = null, string $baseHref = null)
+    public function __construct(\DOMNodeList|\DOMNode|array|string $node = null, string $uri = null, string $baseHref = null, bool $useHtml5Parser = true)
     {
         $this->uri = $uri;
         $this->baseHref = $baseHref ?: $uri;
-        $this->html5Parser = new HTML5(['disable_html_ns' => true]);
+        $this->html5Parser = $useHtml5Parser ? new HTML5(['disable_html_ns' => true]) : null;
         $this->cachedNamespaces = new \ArrayObject();
 
         $this->add($node);
@@ -621,7 +622,7 @@ public function html(string $default = null): string
         $node = $this->getNode(0);
         $owner = $node->ownerDocument;
 
-        if ('<!DOCTYPE html>' === $owner->saveXML($owner->childNodes[0])) {
+        if ($this->html5Parser && '<!DOCTYPE html>' === $owner->saveXML($owner->childNodes[0])) {
             $owner = $this->html5Parser;
         }
 
@@ -642,7 +643,7 @@ public function outerHtml(): string
         $node = $this->getNode(0);
         $owner = $node->ownerDocument;
 
-        if ('<!DOCTYPE html>' === $owner->saveXML($owner->childNodes[0])) {
+        if ($this->html5Parser && '<!DOCTYPE html>' === $owner->saveXML($owner->childNodes[0])) {
             $owner = $this->html5Parser;
         }
 
@@ -1215,6 +1216,10 @@ private function parseHtmlString(string $content, string $charset): \DOMDocument
 
     private function canParseHtml5String(string $content): bool
     {
+        if (!$this->html5Parser) {
+            return false;
+        }
+
         if (false === ($pos = stripos($content, '<!doctype html>'))) {
             return false;
         }
diff --git a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php
index 840a1c8263dad..e682ff405a349 100644
--- a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php
+++ b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTestCase.php
@@ -21,9 +21,9 @@ abstract class AbstractCrawlerTestCase extends TestCase
 {
     abstract public static function getDoctype(): string;
 
-    protected function createCrawler($node = null, string $uri = null, string $baseHref = null)
+    protected function createCrawler($node = null, string $uri = null, string $baseHref = null, bool $useHtml5Parser = true)
     {
-        return new Crawler($node, $uri, $baseHref);
+        return new Crawler($node, $uri, $baseHref, $useHtml5Parser);
     }
 
     public function testConstructor()
diff --git a/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php
index 82558a7dd1d80..ceba8e7c06e90 100644
--- a/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php
@@ -46,6 +46,20 @@ public function testHtml5ParserWithInvalidHeadedContent(string $content)
         self::assertEmpty($crawler->filterXPath('//h1')->text(), '->addHtmlContent failed as expected');
     }
 
+    public function testHtml5ParserNotSameAsNativeParserForSpecificHtml()
+    {
+        // Html who create a bug specific to the DOM extension (see https://github.com/symfony/symfony/issues/28596)
+        $html = $this->getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';
+
+        $html5Crawler = $this->createCrawler(null, null, null, true);
+        $html5Crawler->add($html);
+
+        $nativeCrawler = $this->createCrawler(null, null, null, false);
+        $nativeCrawler->add($html);
+
+        $this->assertNotEquals($nativeCrawler->filterXPath('//h1')->text(), $html5Crawler->filterXPath('//h1')->text(), 'Native parser and Html5 parser must be different');
+    }
+
     public static function validHtml5Provider(): iterable
     {
         $html = self::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';

From 651a7070562c5bfbb4f201259b077292b5dfaf28 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Sat, 4 Mar 2023 08:26:39 +0100
Subject: [PATCH 267/475] [Validator] Add the `excluded` option to the
 `Cascade` constraint

---
 src/Symfony/Component/Validator/CHANGELOG.md       |  1 +
 .../Component/Validator/Constraints/Cascade.php    | 10 +++++++++-
 .../Component/Validator/Mapping/ClassMetadata.php  |  4 ++++
 .../Validator/Tests/Mapping/ClassMetadataTest.php  | 14 ++++++++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
index d3cf3dd76dd4c..93407796bd055 100644
--- a/src/Symfony/Component/Validator/CHANGELOG.md
+++ b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
  * Add a `NoSuspiciousCharacters` constraint to validate a string is not a spoofing attempt
  * Add the `countUnit` option to the `Length` constraint to allow counting the string length either by code points (like before, now the default setting `Length::COUNT_CODEPOINTS`), bytes (`Length::COUNT_BYTES`) or graphemes (`Length::COUNT_GRAPHEMES`)
  * Add the `filenameMaxLength` option to the `File` constraint
+ * Add the `exclude` option to the `Cascade` constraint
 
 6.2
 ---
diff --git a/src/Symfony/Component/Validator/Constraints/Cascade.php b/src/Symfony/Component/Validator/Constraints/Cascade.php
index f3bb3cf929fad..a1e03af411adc 100644
--- a/src/Symfony/Component/Validator/Constraints/Cascade.php
+++ b/src/Symfony/Component/Validator/Constraints/Cascade.php
@@ -23,8 +23,16 @@
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class Cascade extends Constraint
 {
-    public function __construct(array $options = null)
+    public array $exclude = [];
+
+    public function __construct(array|string|null $exclude = null, array $options = null)
     {
+        if (\is_array($exclude) && !array_is_list($exclude)) {
+            $options = array_merge($exclude, $options);
+        } else {
+            $this->exclude = array_flip((array) $exclude);
+        }
+
         if (\is_array($options) && \array_key_exists('groups', $options)) {
             throw new ConstraintDefinitionException(sprintf('The option "groups" is not supported by the constraint "%s".', __CLASS__));
         }
diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
index 7909020b4d580..f5f084f2ed21c 100644
--- a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
+++ b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
@@ -194,6 +194,10 @@ public function addConstraint(Constraint $constraint): static
             $this->cascadingStrategy = CascadingStrategy::CASCADE;
 
             foreach ($this->getReflectionClass()->getProperties() as $property) {
+                if (isset($constraint->exclude[$property->getName()])) {
+                    continue;
+                }
+
                 if ($property->hasType() && (('array' === $type = $property->getType()->getName()) || class_exists($type))) {
                     $this->addPropertyConstraint($property->getName(), new Valid());
                 }
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
index ba3683cc19613..8e8d92160f10c 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
@@ -351,6 +351,20 @@ public function testCascadeConstraint()
             'children',
         ], $metadata->getConstrainedProperties());
     }
+
+    public function testCascadeConstraintWithExcludedProperties()
+    {
+        $metadata = new ClassMetadata(CascadingEntity::class);
+
+        $metadata->addConstraint(new Cascade(exclude: ['requiredChild', 'optionalChild']));
+
+        $this->assertSame(CascadingStrategy::CASCADE, $metadata->getCascadingStrategy());
+        $this->assertCount(2, $metadata->properties);
+        $this->assertSame([
+            'staticChild',
+            'children',
+        ], $metadata->getConstrainedProperties());
+    }
 }
 
 class ClassCompositeConstraint extends Composite

From 1ac07d3d381740c3fd779a83d4ac040976798019 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 7 Mar 2023 09:03:10 +0100
Subject: [PATCH 268/475] [DependencyInjection] Keep track of decorated ids

---
 .../FrameworkBundle/Command/DebugAutowiringCommand.php |  9 ++++++++-
 .../Compiler/DecoratorServicePass.php                  |  4 ++++
 .../Tests/Compiler/DecoratorServicePassTest.php        | 10 +++++-----
 .../Tests/Fixtures/config/anonymous.expected.yml       |  2 ++
 .../Tests/Fixtures/config/child.expected.yml           |  2 ++
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
index 92b02c9b14ed9..fa6d559c233d6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
@@ -119,7 +119,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             if ($builder->hasAlias($serviceId)) {
                 $hasAlias[$serviceId] = true
10000
;
                 $serviceAlias = $builder->getAlias($serviceId);
-                $serviceLine .= ' <fg=cyan>('.$serviceAlias.')</>';
+
+                if ($builder->hasDefinition($serviceAlias) && $decorated = $builder->getDefinition($serviceAlias)->getTag('container.decorator')) {
+                    $serviceLine .= ' <fg=cyan>('.$decorated[0]['id'].')</>';
+                } else {
+                    $serviceLine .= ' <fg=cyan>('.$serviceAlias.')</>';
+                }
 
                 if ($serviceAlias->isDeprecated()) {
                     $serviceLine .= ' - <fg=magenta>deprecated</>';
@@ -127,6 +132,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             } elseif (!$all) {
                 ++$serviceIdsNb;
                 continue;
+            } elseif ($builder->getDefinition($serviceId)->isDeprecated()) {
+                $serviceLine .= ' - <fg=magenta>deprecated</>';
             }
             $text[] = $serviceLine;
             $io->text($text);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
index 9c1d7e218e2fc..c38bfa7744502 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -112,6 +112,10 @@ public function process(ContainerBuilder $container)
 
             $container->setAlias($inner, $id)->setPublic($public);
         }
+
+        foreach ($decoratingDefinitions as $inner => $definition) {
+            $definition->addTag('container.decorator', ['id' => $inner]);
+        }
     }
 
     protected function processValue(mixed $value, bool $isRoot = false): mixed
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
index cac0460841105..8c8a158a76327 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
@@ -198,7 +198,7 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio
         $this->process($container);
 
         $this->assertEmpty($container->getDefinition('baz.inner')->getTags());
-        $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
+        $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar'], 'container.decorator' => [['id' => 'foo']]], $container->getDefinition('baz')->getTags());
     }
 
     public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitionMultipleTimes()
@@ -221,7 +221,7 @@ public function testProcessMovesTagsFromDecoratedDefinitionToDecoratingDefinitio
         $this->process($container);
 
         $this->assertEmpty($container->getDefinition('deco1')->getTags());
-        $this->assertEquals(['bar' => ['attr' => 'baz']], $container->getDefinition('deco2')->getTags());
+        $this->assertEquals(['bar' => ['attr' => 'baz'], 'container.decorator' => [['id' => 'foo']]], $container->getDefinition('deco2')->getTags());
     }
 
     public function testProcessLeavesServiceLocatorTagOnOriginalDefinition()
@@ -240,7 +240,7 @@ public function testProcessLeavesServiceLocatorTagOnOriginalDefinition()
         $this->process($container);
 
         $this->assertEquals(['container.service_locator' => [0 => []]], $container->getDefinition('baz.inner')->getTags());
-        $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
+        $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar'], 'container.decorator' => [['id' => 'foo']]], $container->getDefinition('baz')->getTags());
     }
 
     public function testProcessLeavesServiceSubscriberTagOnOriginalDefinition()
@@ -259,7 +259,7 @@ public function testProcessLeavesServiceSubscriberTagOnOriginalDefinition()
         $this->process($container);
 
         $this->assertEquals(['container.service_subscriber' => [], 'container.service_subscriber.locator' => []], $container->getDefinition('baz.inner')->getTags());
-        $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
+        $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar'], 'container.decorator' => [['id' => 'foo']]], $container->getDefinition('baz')->getTags());
     }
 
     public function testProcessLeavesProxyTagOnOriginalDefinition()
@@ -278,7 +278,7 @@ public function testProcessLeavesProxyTagOnOriginalDefinition()
         $this->process($container);
 
         $this->assertEquals(['proxy' => 'foo'], $container->getDefinition('baz.inner')->getTags());
-        $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
+        $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar'], 'container.decorator' => [['id' => 'foo']]], $container->getDefinition('baz')->getTags());
     }
 
     public function testCannotDecorateSyntheticService()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/anonymous.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/anonymous.expected.yml
index 3dd00ab6f8fe8..9b1213fbcab8e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/anonymous.expected.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/anonymous.expected.yml
@@ -15,4 +15,6 @@ services:
     decorated:
         class: Symfony\Component\DependencyInjection\Tests\Fixtures\StdClassDecorator
         public: true
+        tags:
+            - container.decorator: { id: decorated }
         arguments: [!service { class: stdClass }]
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.expected.yml
index d9537a05e4c34..a4e4eb995c4be 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.expected.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.expected.yml
@@ -7,6 +7,8 @@ services:
     foo:
         class: Class2
         public: true
+        tags:
+            - container.decorator: { id: bar }
         file: file.php
         lazy: true
         arguments: [!service { class: Class1 }]

From edf8d1dd4b9868ab3f14bb51ac6db3714f89c42a Mon Sep 17 00:00:00 2001
From: Max Beckers <beckers.maximilian@gmail.com>
Date: Wed, 8 Mar 2023 16:46:54 +0100
Subject: [PATCH 269/475] [Seurity] Minor code cleanup in SecurityExtension

---
 .../SecurityBundle/DependencyInjection/SecurityExtension.php   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 8fb375255c771..41d807d8c0109 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -457,8 +457,7 @@ private function createFirewall(ContainerBuilder $container, string $id, array $
                 'logout_path' => $firewall['logout']['path'],
             ]);
 
-            $logoutSuccessListenerId = 'security.logout.listener.default.'.$id;
-            $container->setDefinition($logoutSuccessListenerId, new ChildDefinition('security.logout.listener.default'))
+            $container->setDefinition('security.logout.listener.default.'.$id, new ChildDefinition('security.logout.listener.default'))
                 ->replaceArgument(1, $firewall['logout']['target'])
                 ->addTag('kernel.event_subscriber', ['dispatcher' => $firewallEventDispatcherId]);
 

From 9869327ab20451ec430420497caae5f5697c6482 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 7 Mar 2023 11:36:11 +0100
Subject: [PATCH 270/475] [DependencyInjection] Add support for autowiring
 services as closures using attributes

---
 .../Attribute/Autowire.php                    | 15 ++--
 .../Attribute/AutowireCallable.php            | 38 +++++++++
 .../Attribute/AutowireServiceClosure.php      | 27 +++++++
 .../Attribute/TaggedIterator.php              |  5 +-
 .../Attribute/TaggedLocator.php               |  6 +-
 .../DependencyInjection/CHANGELOG.md          |  1 +
 .../Compiler/AutowirePass.php                 | 42 +++++-----
 .../RegisterServiceSubscribersPassTest.php    |  2 +-
 .../Tests/Dumper/PhpDumperTest.php            | 48 ++++++++++++
 .../Tests/Fixtures/php/autowire_closure.php   | 78 +++++++++++++++++++
 10 files changed, 232 insertions(+), 30 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Attribute/AutowireServiceClosure.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/autowire_closure.php

diff --git a/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php b/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
index 73e6f455d8a1b..44f76f04742cb 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Attribute;
 
+use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\ExpressionLanguage\Expression;
@@ -23,19 +24,19 @@
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
 class Autowire
 {
-    public readonly string|array|Expression|Reference $value;
+    public readonly string|array|Expression|Reference|ArgumentInterface $value;
 
     /**
      * Use only ONE of the following.
      *
-     * @param string|array|null $value      Parameter value (ie "%kernel.project_dir%/some/path")
-     * @param string|null       $service    Service ID (ie "some.service")
-     * @param string|null       $expression Expression (ie 'service("some.service").someMethod()')
-     * @param string|null       $env        Environment variable name (ie 'SOME_ENV_VARIABLE')
-     * @param string|null       $param      Parameter name (ie 'some.parameter.name')
+     * @param string|array|ArgumentInterface|null $value      Value to inject (ie "%kernel.project_dir%/some/path")
+     * @param string|null                         $service    Service ID (ie "some.service")
+     * @param string|null                         $expression Expression (ie 'service("some.service").someMethod()')
+     * @param string|null                         $env        Environment variable name (ie 'SOME_ENV_VARIABLE')
+     * @param string|null                         $param      Parameter name (ie 'some.parameter.name')
      */
     public function __construct(
-        string|array $value = null,
+        string|array|ArgumentInterface $value = null,
         string $service = null,
         string $expression = null,
         string $env = null,
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php b/src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php
new file mode 100644
index 0000000000000..a48040935a7f8
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Attribute;
+
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Attribute to tell which callable to give to an argument of type Closure.
+ */
+#[\Attribute(\Attribute::TARGET_PARAMETER)]
+class AutowireCallable extends Autowire
+{
+    public function __construct(
+        string|array $callable = null,
+        string $service = null,
+        string $method = null,
+        public bool $lazy = false,
+    ) {
+        if (!(null !== $callable xor null !== $service)) {
+            throw new LogicException('#[AutowireCallable] attribute must declare exactly one of $callable or $service.');
+        }
+        if (!(null !== $callable xor null !== $method)) {
+            throw new LogicException('#[AutowireCallable] attribute must declare one of $callable or $method.');
+        }
+
+        parent::__construct($callable ?? [new Reference($service), $method ?? '__invoke']);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/AutowireServiceClosure.php b/src/Symfony/Component/DependencyInjection/Attribute/AutowireServiceClosure.php
new file mode 100644
index 0000000000000..a468414a4e8c6
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Attribute/AutowireServiceClosure.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Attribute;
+
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Attribute to wrap a service in a closure that returns it.
+ */
+#[\Attribute(\Attribute::TARGET_PARAMETER)]
+class AutowireServiceClosure extends Autowire
+{
+    public function __construct(string $service)
+    {
+        parent::__construct(new ServiceClosureArgument(new Reference($service)));
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/TaggedIterator.php b/src/Symfony/Component/DependencyInjection/Attribute/TaggedIterator.php
index fb33fb572942b..77c9af17fa5bd 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/TaggedIterator.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/TaggedIterator.php
@@ -11,8 +11,10 @@
 
 namespace Symfony\Component\DependencyInjection\Attribute;
 
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
-class TaggedIterator
+class TaggedIterator extends Autowire
 {
     public function __construct(
         public string $tag,
@@ -22,5 +24,6 @@ public function __construct(
         public string|array $exclude = [],
         public bool $excludeSelf = true,
     ) {
+        parent::__construct(new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod, false, $defaultPriorityMethod, (array) $exclude, $excludeSelf));
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/TaggedLocator.php b/src/Symfony/Component/DependencyInjection/Attribute/TaggedLocator.php
index f05ae53bc4284..98426a01f3668 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/TaggedLocator.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/TaggedLocator.php
@@ -11,8 +11,11 @@
 
 namespace Symfony\Component\DependencyInjection\Attribute;
 
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
-class TaggedLocator
+class TaggedLocator extends Autowire
 {
     public function __construct(
         public string $tag,
@@ -22,5 +25,6 @@ public function __construct(
         public string|array $exclude = [],
         public bool $excludeSelf = true,
     ) {
+        parent::__construct(new ServiceLocatorArgument(new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod, true, $defaultPriorityMethod, (array) $exclude, $excludeSelf)));
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 1d2caa272249c..ccd4a45e7edfa 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -15,6 +15,7 @@ CHANGELOG
  * Allow to trim XML service parameters value by using `trim="true"` attribute
  * Allow extending the `Autowire` attribute
  * Add `#[Exclude]` to skip autoregistering a class
+ * Add support for autowiring services as closures using `#[AutowireCallable]` or `#[AutowireServiceClosure]`
 
 6.2
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 3bcaa812cf485..48cacd7877f20 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -12,12 +12,9 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\Config\Resource\ClassExistenceResource;
-use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
-use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\DependencyInjection\Attribute\AutowireCallable;
 use Symfony\Component\DependencyInjection\Attribute\MapDecorated;
-use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
-use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
 use Symfony\Component\DependencyInjection\Attribute\Target;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -86,14 +83,6 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
             return $this->processValue($this->container->getParameterBag()->resolveValue($value->value));
         }
 
-        if ($value instanceof TaggedIterator) {
-            return new TaggedIteratorArgument($value->tag, $value->indexAttribute, $value->defaultIndexMethod, false, $value->defaultPriorityMethod, (array) $value->exclude, $value->excludeSelf);
-        }
-
-        if ($value instanceof TaggedLocator) {
-            return new ServiceLocatorArgument(new TaggedIteratorArgument($value->tag, $value->indexAttribute, $value->defaultIndexMethod, true, $value->defaultPriorityMethod, (array) $value->exclude, $value->excludeSelf));
-        }
-
         if ($value instanceof MapDecorated) {
             $definition = $this->container->getDefinition($this->currentId);
 
@@ -191,8 +180,6 @@ private function processAttribute(object $attribute, bool $isOptional = false):
                     return new Reference($attribute->value, ContainerInterface::NULL_ON_INVALID_REFERENCE);
                 }
                 // no break
-            case $attribute instanceof TaggedIterator:
-            case $attribute instanceof TaggedLocator:
             case $attribute instanceof MapDecorated:
                 return $this->processValue($attribute);
         }
@@ -291,17 +278,32 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                 continue;
             }
 
-            if ($checkAttributes) {
-                foreach ([TaggedIterator::class, TaggedLocator::class, Autowire::class, MapDecorated::class] as $attributeClass) {
-                    foreach ($parameter->getAttributes($attributeClass, Autowire::class === $attributeClass ? \ReflectionAttribute::IS_INSTANCEOF : 0) as $attribute) {
-                        $arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());
+            $type = ProxyHelper::exportType($parameter, true);
 
-                        continue 3;
+            if ($checkAttributes) {
+                foreach ($parameter->getAttributes(Autowire::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
+                    $attribute = $attribute->newInstance();
+                    $value = $this->processAttribute($attribute, $parameter->allowsNull());
+
+                    if ($attribute instanceof AutowireCallable || 'Closure' === $type && \is_array($value)) {
+                        $value = (new Definition('Closure'))
+                            ->setFactory(['Closure', 'fromCallable'])
+                            ->setArguments([$value + [1 => '__invoke']])
+                            ->setLazy($attribute instanceof AutowireCallable && $attribute->lazy);
                     }
+                    $arguments[$index] = $value;
+
+                    continue 2;
+                }
+
+                foreach ($parameter->getAttributes(MapDecorated::class) as $attribute) {
+                    $arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());
+
+                    continue 2;
                 }
             }
 
-            if (!$type = ProxyHelper::exportType($parameter, true)) {
+            if (!$type) {
                 if (isset($arguments[$index])) {
                     continue;
                 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
index 4da06e889b715..34c62faf3b0ad 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
@@ -462,7 +462,7 @@ public static function getSubscribedServices(): array
             'autowired' => new ServiceClosureArgument(new Reference('service.id')),
             'autowired.nullable' => new ServiceClosureArgument(new Reference('service.id', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
             'autowired.parameter' => new ServiceClosureArgument('foobar'),
-            'map.decorated' => new ServiceClosureArgument(new Reference('.service_locator.LnJLtj2.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
+            'map.decorated' => new ServiceClosureArgument(new Reference('.service_locator.EeZIdVM.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
             'target' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'someTarget', [new Target('someTarget')])),
         ];
         $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 7d83ccb1a6eba..5e313cad403c9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -21,6 +21,9 @@
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocator as ArgumentServiceLocator;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\DependencyInjection\Attribute\AutowireCallable;
+use Symfony\Component\DependencyInjection\Attribute\AutowireServiceClosure;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\Container;
@@ -1651,6 +1654,38 @@ public function testClosure()
 
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/closure.php', $dumper->dump());
     }
+
+    public function testAutowireClosure()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', Foo::class)
+            ->setPublic('true');
+        $container->register('baz', \Closure::class)
+            ->setFactory(['Closure', 'fromCallable'])
+            ->setArguments(['var_dump'])
+            ->setPublic('true');
+        $container->register('bar', LazyConsumer::class)
+            ->setPublic('true')
+            ->setAutowired(true);
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/autowire_closure.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Autowire_Closure']));
+
+        require self::$fixturesPath.'/php/autowire_closure.php';
+
+        $container = new \Symfony_DI_PhpDumper_Test_Autowire_Closure();
+
+        $this->assertInstanceOf(Foo::class, $container->get('foo'));
+        $this->assertInstanceOf(LazyConsumer::class, $bar = $container->get('bar'));
+        $this->assertInstanceOf(\Closure::class, $bar->foo);
+        $this->assertInstanceOf(\Closure::class, $bar->baz);
+        $this->assertInstanceOf(\Closure::class, $bar->buz);
+        $this->assertSame($container->get('foo'), ($bar->foo)());
+        $this->assertSame($container->get('baz'), $bar->baz);
+        $this->assertInstanceOf(Foo::class, $fooClone = ($bar->buz)());
+        $this->assertNotSame($container->get('foo'), $fooClone);
+    }
 }
 
 class Rot13EnvVarProcessor implements EnvVarProcessorInterface
@@ -1676,3 +1711,16 @@ public function __construct(\stdClass $a, \stdClass $b)
         $this->bClone = clone $b;
     }
 }
+
+class LazyConsumer
+{
+    public function __construct(
+        #[AutowireServiceClosure('foo')]
+        public \Closure $foo,
+        #[Autowire(service: 'baz')]
+        public \Closure $baz,
+        #[AutowireCallable(service: 'foo', method: 'cloneFoo')]
+        public \Closure $buz,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/autowire_closure.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/autowire_closure.php
new file mode 100644
index 0000000000000..e3ec79ab70cfd
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/autowire_closure.php
@@ -0,0 +1,78 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class Symfony_DI_PhpDumper_Test_Autowire_Closure extends Container
+{
+    protected $parameters = [];
+    protected readonly \WeakReference $ref;
+
+    public function __construct()
+    {
+        $this->ref = \WeakReference::create($this);
+        $this->services = $this->privates = [];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'baz' => 'getBazService',
+            'foo' => 'getFooService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function compile(): void
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar' shared autowired service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Dumper\LazyConsumer
+     */
+    protected static function getBarService($container)
+    {
+        $containerRef = $container->ref;
+
+        return $container->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\LazyConsumer(#[\Closure(name: 'foo', class: 'Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo')] function () use ($containerRef) {
+            $container = $containerRef->get();
+
+            return ($container->services['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo());
+        }, ($container->services['baz'] ?? self::getBazService($container)), ($container->services['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo())->cloneFoo(...));
+    }
+
+    /**
+     * Gets the public 'baz' shared service.
+     *
+     * @return \Closure
+     */
+    protected static function getBazService($container)
+    {
+        return $container->services['baz'] = \var_dump(...);
+    }
+
+    /**
+     * Gets the public 'foo' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Compiler\Foo
+     */
+    protected static function getFooService($container)
+    {
+        return $container->services['foo'] = new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo();
+    }
+}

From ad58cc65fdb397f913c89b755e0bdf0641bf9d19 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 8 Mar 2023 12:27:56 +0100
Subject: [PATCH 271/475] [HttpKernel] Renamed "pinned" to "targeted" for value
 resolvers

---
 .../DependencyInjection/FrameworkExtension.php |  6 +++---
 .../FrameworkBundle/Resources/config/web.php   |  2 +-
 ...esolver.php => AsTargetedValueResolver.php} |  4 ++--
 .../HttpKernel/Attribute/ValueResolver.php     |  4 ++--
 src/Symfony/Component/HttpKernel/CHANGELOG.md  |  2 +-
 .../HttpKernel/Controller/ArgumentResolver.php |  4 ++--
 .../ControllerArgumentValueResolverPass.php    |  4 ++--
 .../Tests/Controller/ArgumentResolverTest.php  | 18 +++++++++---------
 8 files changed, 22 insertions(+), 22 deletions(-)
 rename src/Symfony/Component/HttpKernel/Attribute/{AsPinnedValueResolver.php => AsTargetedValueResolver.php} (83%)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 886e8a3b514ff..131e9e8c2c723 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -83,7 +83,7 @@
 use Symfony\Component\HttpClient\UriTemplateHttpClient;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\AsController;
-use Symfony\Component\HttpKernel\Attribute\AsPinnedValueResolver;
+use Symfony\Component\HttpKernel\Attribute\AsTargetedValueResolver;
 use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\BackedEnumValueResolver;
@@ -692,8 +692,8 @@ public function load(array $configs, ContainerBuilder $container)
             $definition->addTag('messenger.message_handler', $tagAttributes);
         });
 
-        $container->registerAttributeForAutoconfiguration(AsPinnedValueResolver::class, static function (ChildDefinition $definition, AsPinnedValueResolver $attribute): void {
-            $definition->addTag('controller.pinned_value_resolver', $attribute->name ? ['name' => $attribute->name] : []);
+        $container->registerAttributeForAutoconfiguration(AsTargetedValueResolver::class, static function (ChildDefinition $definition, AsTargetedValueResolver $attribute): void {
+            $definition->addTag('controller.targeted_value_resolver', $attribute->name ? ['name' => $attribute->name] : []);
         });
 
         if (!$container->getParameter('kernel.debug')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
index ca9128b3d0c0a..8c6b5a9ba966d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
@@ -46,7 +46,7 @@
             ->args([
                 service('argument_metadata_factory'),
                 abstract_arg('argument value resolvers'),
-                abstract_arg('pinned value resolvers'),
+                abstract_arg('targeted value resolvers'),
             ])
 
         ->set('argument_resolver.backed_enum_resolver', BackedEnumValueResolver::class)
diff --git a/src/Symfony/Component/HttpKernel/Attribute/AsPinnedValueResolver.php b/src/Symfony/Component/HttpKernel/Attribute/AsTargetedValueResolver.php
similarity index 83%
rename from src/Symfony/Component/HttpKernel/Attribute/AsPinnedValueResolver.php
rename to src/Symfony/Component/HttpKernel/Attribute/AsTargetedValueResolver.php
index e529294123e14..c58f0e6dd596c 100644
--- a/src/Symfony/Component/HttpKernel/Attribute/AsPinnedValueResolver.php
+++ b/src/Symfony/Component/HttpKernel/Attribute/AsTargetedValueResolver.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\HttpKernel\Attribute;
 
 /**
- * Service tag to autoconfigure pinned value resolvers.
+ * Service tag to autoconfigure targeted value resolvers.
  */
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class AsPinnedValueResolver
+class AsTargetedValueResolver
 {
     public function __construct(
         public readonly ?string $name = null,
diff --git a/src/Symfony/Component/HttpKernel/Attribute/ValueResolver.php b/src/Symfony/Component/HttpKernel/Attribute/ValueResolver.php
index df4aaff5d746d..5875a27484ba7 100644
--- a/src/Symfony/Component/HttpKernel/Attribute/ValueResolver.php
+++ b/src/Symfony/Component/HttpKernel/Attribute/ValueResolver.php
@@ -17,10 +17,10 @@
 class ValueResolver
 {
     /**
-     * @param class-string<ValueResolverInterface>|string $name
+     * @param class-string<ValueResolverInterface>|string $resolver
      */
     public function __construct(
-        public string $name,
+        public string $resolver,
         public bool $disabled = false,
     ) {
     }
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 46a5463e024c3..b3fbb240d4a65 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -10,7 +10,7 @@ CHANGELOG
  * Use an instance of `Psr\Clock\ClockInterface` to generate the current date time in `DateTimeValueResolver`
  * Add `#[WithLogLevel]` for defining log levels for exceptions
  * Add `skip_response_headers` to the `HttpCache` options
- * Introduce pinnable value resolvers with `#[ValueResolver]` and `#[AsPinnedValueResolver]`
+ * Introduce targeted value resolvers with `#[ValueResolver]` and `#[AsTargetedValueResolver]`
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
index 2cd9ec1c324be..670a6966275b5 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
@@ -58,11 +58,11 @@ public function getArguments(Request $request, callable $controller, \Reflection
                 $resolverName = null;
                 foreach ($attributes as $attribute) {
                     if ($attribute->disabled) {
-                        $disabledResolvers[$attribute->name] = true;
+                        $disabledResolvers[$attribute->resolver] = true;
                     } elseif ($resolverName) {
                         throw new \LogicException(sprintf('You can only pin one resolver per argument, but argument "$%s" of "%s()" has more.', $metadata->getName(), $this->getPrettyName($controller)));
                     } else {
-                        $resolverName = $attribute->name;
+                        $resolverName = $attribute->resolver;
                     }
                 }
 
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
index 6e00840c7e08a..dff3e248aee1a 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
@@ -40,13 +40,13 @@ public function process(ContainerBuilder $container)
         }
 
         $definitions = $container->getDefinitions();
-        $namedResolvers = $this->findAndSortTaggedServices(new TaggedIteratorArgument('controller.pinned_value_resolver', 'name', needsIndexes: true), $container);
+        $namedResolvers = $this->findAndSortTaggedServices(new TaggedIteratorArgument('controller.targeted_value_resolver', 'name', needsIndexes: true), $container);
         $resolvers = $this->findAndSortTaggedServices(new TaggedIteratorArgument('controller.argument_value_resolver', 'name', needsIndexes: true), $container);
 
         foreach ($resolvers as $name => $resolverReference) {
             $id = (string) $resolverReference;
 
-            if ($definitions[$id]->hasTag('controller.pinned_value_resolver')) {
+            if ($definitions[$id]->hasTag('controller.targeted_value_resolver')) {
                 unset($resolvers[$name]);
             } else {
                 $namedResolvers[$name] ??= clone $resolverReference;
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
index 22d2d9cbb5480..e62001633ca93 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
@@ -285,13 +285,13 @@ public function testGetSessionMissMatchOnNull()
         self::getResolver()->getArguments($request, $controller);
     }
 
-    public function testPinnedResolver()
+    public function testTargetedResolver()
     {
         $resolver = self::getResolver([], [DefaultValueResolver::class => new DefaultValueResolver()]);
 
         $request = Request::create('/');
         $request->attributes->set('foo', 'bar');
-        $controller = $this->controllerPinningResolver(...);
+        $controller = $this->controllerTargetingResolver(...);
 
         $this->assertSame([1], $resolver->getArguments($request, $controller));
     }
@@ -307,23 +307,23 @@ public function testDisabledResolver()
         $this->assertSame([1], $resolver->getArguments($request, $controller));
     }
 
-    public function testManyPinnedResolvers()
+    public function testManyTargetedResolvers()
     {
         $resolver = self::getResolver(namedResolvers: []);
 
         $request = Request::create('/');
-        $controller = $this->controllerPinningManyResolvers(...);
+        $controller = $this->controllerTargetingManyResolvers(...);
 
         $this->expectException(\LogicException::class);
         $resolver->getArguments($request, $controller);
     }
 
-    public function testUnknownPinnedResolver()
+    public function testUnknownTargetedResolver()
     {
         $resolver = self::getResolver(namedResolvers: []);
 
         $request = Request::create('/');
-        $controller = $this->controllerPinningUnknownResolver(...);
+        $controller = $this->controllerTargetingUnknownResolver(...);
 
         $this->expectException(ResolverNotFoundException::class);
         $resolver->getArguments($request, $controller);
@@ -369,7 +369,7 @@ public function controllerWithExtendingSession(ExtendingSession $session)
     {
     }
 
-    public function controllerPinningResolver(#[ValueResolver(DefaultValueResolver::class)] int $foo = 1)
+    public function controllerTargetingResolver(#[ValueResolver(DefaultValueResolver::class)] int $foo = 1)
     {
     }
 
@@ -377,14 +377,14 @@ public function controllerDisablingResolver(#[ValueResolver(RequestAttributeValu
     {
     }
 
-    public function controllerPinningManyResolvers(
+    public function controllerTargetingManyResolvers(
         #[ValueResolver(RequestAttributeValueResolver::class)]
         #[ValueResolver(DefaultValueResolver::class)]
         int $foo
     ) {
     }
 
-    public function controllerPinningUnknownResolver(
+    public function controllerTargetingUnknownResolver(
         #[ValueResolver('foo')]
         int $bar
     ) {

From b653adf426aedc66d16c5fc1cf71e261f20b9638 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 8 Mar 2023 18:10:47 +0100
Subject: [PATCH 272/475] [DependencyInjection] Deprecate `#[MapDecorated]` in
 favor of `#[AutowireDecorated]`

---
 UPGRADE-6.3.md                                  |  1 +
 .../Attribute/AutowireDecorated.php             | 17 +++++++++++++++++
 .../Attribute/MapDecorated.php                  |  5 +++++
 .../Component/DependencyInjection/CHANGELOG.md  |  1 +
 .../Compiler/AutowirePass.php                   | 10 +++++++++-
 .../RegisterServiceSubscribersPassTest.php      |  8 ++++----
 .../Fixtures/includes/autowiring_classes_80.php | 10 +++++-----
 7 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Attribute/AutowireDecorated.php

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 2be9f5342b885..348a2d1b8ef5b 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -12,6 +12,7 @@ DependencyInjection
 
  * Deprecate `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`, use `inline_factories` and `inline_class_loader` instead
  * Deprecate undefined and numeric keys with `service_locator` config, use string aliases instead
+ * Deprecate `#[MapDecorated]`, use `#[AutowireDecorated]` instead
 
 DoctrineBridge
 --------------
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/AutowireDecorated.php b/src/Symfony/Component/DependencyInjection/Attribute/AutowireDecorated.php
new file mode 100644
index 0000000000000..ed8f33e0080b2
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Attribute/AutowireDecorated.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Attribute;
+
+#[\Attribute(\Attribute::TARGET_PARAMETER)]
+class AutowireDecorated
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/MapDecorated.php b/src/Symfony/Component/DependencyInjection/Attribute/MapDecorated.php
index 4fbbf68c62492..d63f0567cbd5b 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/MapDecorated.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/MapDecorated.php
@@ -11,6 +11,11 @@
 
 namespace Symfony\Component\DependencyInjection\Attribute;
 
+trigger_deprecation('symfony/dependency-injection', '6.3', 'The "%s" class is deprecated, use "%s" instead.', MapDecorated::class, AutowireDecorated::class);
+
+/**
+ * @deprecated since Symfony 6.3, use AutowireDecorated instead
+ */
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
 class MapDecorated
 {
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index ccd4a45e7edfa..61e2c135a1037 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -16,6 +16,7 @@ CHANGELOG
  * Allow extending the `Autowire` attribute
  * Add `#[Exclude]` to skip autoregistering a class
  * Add support for autowiring services as closures using `#[AutowireCallable]` or `#[AutowireServiceClosure]`
+ * Deprecate `#[MapDecorated]`, use `#[AutowireDecorated]` instead
 
 6.2
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 48cacd7877f20..82bb84065247c 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Config\Resource\ClassExistenceResource;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\DependencyInjection\Attribute\AutowireCallable;
+use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
 use Symfony\Component\DependencyInjection\Attribute\MapDecorated;
 use Symfony\Component\DependencyInjection\Attribute\Target;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -83,7 +84,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
             return $this->processValue($this->container->getParameterBag()->resolveValue($value->value));
         }
 
-        if ($value instanceof MapDecorated) {
+        if ($value instanceof AutowireDecorated || $value instanceof MapDecorated) {
             $definition = $this->container->getDefinition($this->currentId);
 
             return new Reference($definition->innerServiceId ?? $this->currentId.'.inner', $definition->decorationOnInvalid ?? ContainerInterface::NULL_ON_INVALID_REFERENCE);
@@ -180,6 +181,7 @@ private function processAttribute(object $attribute, bool $isOptional = false):
                     return new Reference($attribute->value, ContainerInterface::NULL_ON_INVALID_REFERENCE);
                 }
                 // no break
+            case $attribute instanceof AutowireDecorated:
             case $attribute instanceof MapDecorated:
                 return $this->processValue($attribute);
         }
@@ -296,6 +298,12 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                     continue 2;
                 }
 
+                foreach ($parameter->getAttributes(AutowireDecorated::class) as $attribute) {
+                    $arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());
+
+                    continue 2;
+                }
+
                 foreach ($parameter->getAttributes(MapDecorated::class) as $attribute) {
                     $arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
index 34c62faf3b0ad..ffda5af3e2dd8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
@@ -17,7 +17,7 @@
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Component\DependencyInjection\Attribute\MapDecorated;
+use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
 use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
 use Symfony\Component\DependencyInjection\Attribute\Target;
@@ -426,7 +426,7 @@ public static function getSubscribedServices(): array
                     new SubscribedService('autowired', 'stdClass', attributes: new Autowire(service: 'service.id')),
                     new SubscribedService('autowired.nullable', 'stdClass', nullable: true, attributes: new Autowire(service: 'service.id')),
                     new SubscribedService('autowired.parameter', 'string', attributes: new Autowire('%parameter.1%')),
-                    new SubscribedService('map.decorated', \stdClass::class, attributes: new MapDecorated()),
+                    new SubscribedService('autowire.decorated', \stdClass::class, attributes: new AutowireDecorated()),
                     new SubscribedService('target', \stdClass::class, attributes: new Target('someTarget')),
                 ];
             }
@@ -449,7 +449,7 @@ public static function getSubscribedServices(): array
             'autowired' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'autowired', [new Autowire(service: 'service.id')])),
             'autowired.nullable' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::IGNORE_ON_INVALID_REFERENCE, 'autowired.nullable', [new Autowire(service: 'service.id')])),
             'autowired.parameter' => new ServiceClosureArgument(new TypedReference('string', 'string', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'autowired.parameter', [new Autowire(service: '%parameter.1%')])),
-            'map.decorated' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'map.decorated', [new MapDecorated()])),
+            'autowire.decorated' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'autowire.decorated', [new AutowireDecorated()])),
             'target' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'target', [new Target('someTarget')])),
         ];
         $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
@@ -462,7 +462,7 @@ public static function getSubscribedServices(): array
             'autowired' => new ServiceClosureArgument(new Reference('service.id')),
             'autowired.nullable' => new ServiceClosureArgument(new Reference('service.id', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
             'autowired.parameter' => new ServiceClosureArgument('foobar'),
-            'map.decorated' => new ServiceClosureArgument(new Reference('.service_locator.EeZIdVM.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
+            'autowire.decorated' => new ServiceClosureArgument(new Reference('.service_locator.QVDPERh.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
             'target' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'someTarget', [new Target('someTarget')])),
         ];
         $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
index 863b33e7ce4b5..d267f7ed199b6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\DependencyInjection\Attribute\AsDecorator;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Component\DependencyInjection\Attribute\MapDecorated;
+use Symfony\Component\DependencyInjection\Attribute\AutowireDecorated;
 use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -80,7 +80,7 @@ class AsDecoratorFoo implements AsDecoratorInterface
 #[AsDecorator(decorates: AsDecoratorFoo::class, priority: 10)]
 class AsDecoratorBar10 implements AsDecoratorInterface
 {
-    public function __construct(string $arg1, #[MapDecorated] AsDecoratorInterface $inner)
+    public function __construct(string $arg1, #[AutowireDecorated] AsDecoratorInterface $inner)
     {
     }
 }
@@ -88,7 +88,7 @@ public function __construct(string $arg1, #[MapDecorated] AsDecoratorInterface $
 #[AsDecorator(decorates: AsDecoratorFoo::class, priority: 20)]
 class AsDecoratorBar20 implements AsDecoratorInterface
 {
-    public function __construct(string $arg1, #[MapDecorated] AsDecoratorInterface $inner)
+    public function __construct(string $arg1, #[AutowireDecorated] AsDecoratorInterface $inner)
     {
     }
 }
@@ -96,7 +96,7 @@ public function __construct(string $arg1, #[MapDecorated] AsDecoratorInterface $
 #[AsDecorator(decorates: \NonExistent::class, onInvalid: ContainerInterface::NULL_ON_INVALID_REFERENCE)]
 class AsDecoratorBaz implements AsDecoratorInterface
 {
-    public function __construct(#[MapDecorated] AsDecoratorInterface $inner = null)
+    public function __construct(#[AutowireDecorated] AsDecoratorInterface $inner = null)
     {
     }
 }
@@ -106,7 +106,7 @@ class AutowireNestedAttributes implements AsDecoratorInterface
 {
     public function __construct(
         #[Autowire([
-            'decorated' => new MapDecorated(),
+            'decorated' => new AutowireDecorated(),
             'iterator' => new TaggedIterator('foo'),
             'locator' => new TaggedLocator('foo'),
             'service' => new Autowire(service: 'bar')

From 9415b438b75204c72ff66b838307b73646393cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Sun, 26 Feb 2023 12:37:36 -0500
Subject: [PATCH 273/475] [Messenger] make StopWorkerOnSignalsListener listen
 by default on SIGTERM and SIGINT

---
 UPGRADE-6.3.md                                |  1 +
 .../Resources/config/messenger.php            |  5 +-
 src/Symfony/Component/Messenger/CHANGELOG.md  |  3 +
 .../StopWorkerOnSignalsListener.php           | 57 +++++++++++++++++++
 .../StopWorkerOnSigtermSignalListener.php     | 32 ++---------
 5 files changed, 70 insertions(+), 28 deletions(-)
 create mode 100644 src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 2be9f5342b885..d219eb42e5152 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -73,6 +73,7 @@ Messenger
    `Symfony\Component\Messenger\Transport\InMemoryTransportFactory` in favor of
    `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport` and
    `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransportFactory`
+ * Deprecate `StopWorkerOnSigtermSignalListener` in favor of `StopWorkerOnSignalsListener`
 
 Notifier
 --------
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
index 39030ce51132e..db3f79a593725 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
@@ -23,7 +23,7 @@
 use Symfony\Component\Messenger\EventListener\SendFailedMessageToFailureTransportListener;
 use Symfony\Component\Messenger\EventListener\StopWorkerOnCustomStopExceptionListener;
 use Symfony\Component\Messenger\EventListener\StopWorkerOnRestartSignalListener;
-use Symfony\Component\Messenger\EventListener\StopWorkerOnSigtermSignalListener;
+use Symfony\Component\Messenger\EventListener\StopWorkerOnSignalsListener;
 use Symfony\Component\Messenger\Middleware\AddBusNameStampMiddleware;
 use Symfony\Component\Messenger\Middleware\DispatchAfterCurrentBusMiddleware;
 use Symfony\Component\Messenger\Middleware\FailedMessageProcessingMiddleware;
@@ -198,8 +198,9 @@
             ->tag('kernel.event_subscriber')
             ->tag('monolog.logger', ['channel' => 'messenger'])
 
-        ->set('messenger.listener.stop_worker_on_sigterm_signal_listener', StopWorkerOnSigtermSignalListener::class)
+        ->set('messenger.listener.stop_worker_signals_listener', StopWorkerOnSignalsListener::class)
             ->args([
+                null,
                 service('logger')->ignoreOnInvalid(),
             ])
             ->tag('kernel.event_subscriber')
diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
index 49eb0e52e21eb..8a16de384199c 100644
--- a/src/Symfony/Component/Messenger/CHANGELOG.md
+++ b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -11,6 +11,9 @@ CHANGELOG
    `Symfony\Component\Messenger\Transport\InMemory\InMemoryTransportFactory`
  * Allow passing a string instead of an array in `TransportNamesStamp`
  * Allow to define batch size when using `BatchHandlerTrait` with `getBatchSize()`
+ * Deprecate `StopWorkerOnSigtermSignalListener` in favor of
+   `StopWorkerOnSignalsListener` and make it configurable with SIGINT and
+   SIGTERM by default
 
 6.2
 ---
diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php
new file mode 100644
index 0000000000000..e49e80fe295a2
--- /dev/null
+++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSignalsListener.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Messenger\EventListener;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Messenger\Event\WorkerStartedEvent;
+
+/**
+ * @author Tobias Schultze <http://tobion.de>
+ * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ */
+class StopWorkerOnSignalsListener implements EventSubscriberInterface
+{
+    private array $signals;
+    private ?LoggerInterface $logger;
+
+    public function __construct(array $signals = null, LoggerInterface $logger = null)
+    {
+        if (null === $signals && \defined('SIGTERM')) {
+            $signals = [SIGTERM, SIGINT];
+        }
+        $this->signals = $signals;
+        $this->logger = $logger;
+    }
+
+    public function onWorkerStarted(WorkerStartedEvent $event): void
+    {
+        foreach ($this->signals as $signal) {
+            pcntl_signal($signal, function () use ($event, $signal) {
+                $this->logger?->info('Received signal {signal}.', ['signal' => $signal, 'transport_names' => $event->getWorker()->getMetadata()->getTransportNames()]);
+
+                $event->getWorker()->stop();
+            });
+        }
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        if (!\function_exists('pcntl_signal')) {
+            return [];
+        }
+
+        return [
+            WorkerStartedEvent::class => ['onWorkerStarted', 100],
+        ];
+    }
+}
diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php
index 7991c6cfd25ee..eeddf7d5fc675 100644
--- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php
+++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php
@@ -11,39 +11,19 @@
 
 namespace Symfony\Component\Messenger\EventListener;
 
+trigger_deprecation('symfony/messenger', '6.3', '"%s" is deprecated, use "%s" instead.', StopWorkerOnSigtermSignalListener::class, StopWorkerOnSignalsListener::class);
+
 use Psr\Log\LoggerInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\Messenger\Event\WorkerStartedEvent;
 
 /**
  * @author Tobias Schultze <http://tobion.de>
+ *
+ * @deprecated since Symfony 6.3, use the StopWorkerOnSignalsListener instead
  */
-class StopWorkerOnSigtermSignalListener implements EventSubscriberInterface
+class StopWorkerOnSigtermSignalListener extends StopWorkerOnSignalsListener
 {
-    private ?LoggerInterface $logger;
-
     public function __construct(LoggerInterface $logger = null)
     {
-        $this->logger = $logger;
-    }
-
-    public function onWorkerStarted(WorkerStartedEvent $event): void
-    {
-        pcntl_signal(\SIGTERM, function () use ($event) {
-            $this->logger?->info('Received SIGTERM signal.', ['transport_names' => $event->getWorker()->getMetadata()->getTransportNames()]);
-
-            $event->getWorker()->stop();
-        });
-    }
-
-    public static function getSubscribedEvents(): array
-    {
-        if (!\function_exists('pcntl_signal')) {
-            return [];
-        }
-
-        return [
-            WorkerStartedEvent::class => ['onWorkerStarted', 100],
-        ];
+        parent::__construct([SIGTERM], $logger);
     }
 }

From 121e072194fbf52f4622b1cf179993fd65e97541 Mon Sep 17 00:00:00 2001
From: HypeMC <hypemc@gmail.com>
Date: Thu, 9 Mar 2023 23:26:39 +0100
Subject: [PATCH 274/475] [DependencyInjection] Add tests for #[TaggedIterator]
 & #[TaggedLocator] on controller arguments

---
 ...sterControllerArgumentLocatorsPassTest.php | 52 +++++++++++++++++--
 .../Component/HttpKernel/composer.json        |  4 +-
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
index 11343a1b1d911..cc2f37b9711cb 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -12,8 +12,11 @@
 namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
+use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
 use Symfony\Component\DependencyInjection\Attribute\Target;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -460,10 +463,6 @@ public function testResponseArgumentIsIgnored()
 
     public function testAutowireAttribute()
     {
-        if (!class_exists(Autowire::class)) {
-            $this->markTestSkipped('#[Autowire] attribute not available.');
-        }
-
         $container = new ContainerBuilder();
         $resolver = $container->register('argument_resolver.service', 'stdClass')->addArgument([]);
 
@@ -493,6 +492,42 @@ public function testAutowireAttribute()
         $this->assertSame('foo', $locator->get('customAutowire'));
         $this->assertFalse($locator->has('service2'));
     }
+
+    public function testTaggedIteratorAndTaggedLocatorAttributes()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service', \stdClass::class)->addArgument([]);
+
+        $container->register('bar', \stdClass::class)->addTag('foobar');
+        $container->register('baz', \stdClass::class)->addTag('foobar');
+
+        $container->register('foo', WithTaggedIteratorAndTaggedLocator::class)
+            ->addTag('controller.service_arguments');
+
+        (new RegisterControllerArgumentLocatorsPass())->process($container);
+
+        $locatorId = (string) $resolver->getArgument(0);
+        $container->getDefinition($locatorId)->setPublic(true);
+
+        $container->compile();
+
+        /** @var ServiceLocator $locator */
+        $locator = $container->get($locatorId)->get('foo::fooAction');
+
+        $this->assertCount(2, $locator->getProvidedServices());
+
+        $this->assertTrue($locator->has('iterator'));
+        $this->assertInstanceOf(RewindableGenerator::class, $argIterator = $locator->get('iterator'));
+        $this->assertCount(2, $argIterator);
+
+        $this->assertTrue($locator->has('locator'));
+        $this->assertInstanceOf(ServiceLocator::class, $argLocator = $locator->get('locator'));
+        $this->assertCount(2, $argLocator);
+        $this->assertTrue($argLocator->has('bar'));
+        $this->assertTrue($argLocator->has('baz'));
+
+        $this->assertSame(iterator_to_array($argIterator), [$argLocator->get('bar'), $argLocator->get('baz')]);
+    }
 }
 
 class RegisterTestController
@@ -614,3 +649,12 @@ public function fooAction(
     ) {
     }
 }
+
+class WithTaggedIteratorAndTaggedLocator
+{
+    public function fooAction(
+        #[TaggedIterator('foobar')] iterable $iterator,
+        #[TaggedLocator('foobar')] ServiceLocator $locator,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index e6ebe93dfd846..6af8d45f3e6b8 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -30,7 +30,7 @@
         "symfony/config": "^6.1",
         "symfony/console": "^5.4|^6.0",
         "symfony/css-selector": "^5.4|^6.0",
-  
10000
      "symfony/dependency-injection": "^6.2",
+        "symfony/dependency-injection": "^6.3",
         "symfony/dom-crawler": "^5.4|^6.0",
         "symfony/expression-language": "^5.4|^6.0",
         "symfony/finder": "^5.4|^6.0",
@@ -53,7 +53,7 @@
         "symfony/config": "<6.1",
         "symfony/console": "<5.4",
         "symfony/form": "<5.4",
-        "symfony/dependency-injection": "<6.2",
+        "symfony/dependency-injection": "<6.3",
         "symfony/doctrine-bridge": "<5.4",
         "symfony/http-client": "<5.4",
         "symfony/http-client-contracts": "<2.5",

From b2e9511334c61debcf839417fb7c831598bb3370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Buliard?= <mbuliard@live.fr>
Date: Thu, 9 Mar 2023 22:28:49 +0100
Subject: [PATCH 275/475] [Security] Add missing void PHPdoc return types

---
 .github/expected-missing-return-types.diff    | 248 +++++++++++++++---
 .../Bridge/Doctrine/Tests/Fixtures/User.php   |   2 +-
 .../ChoiceList/ORMQueryBuilderLoaderTest.php  |  10 +-
 .../Debug/WrappedLazyListener.php             |   6 +-
 .../SortFirewallListenersPassTest.php         |   6 +-
 .../SecurityExtensionTest.php                 |   4 +-
 .../Security/StaticTokenProvider.php          |   6 +-
 .../RememberMe/TokenProviderInterface.php     |   6 +
 .../Core/Authentication/Token/NullToken.php   |   9 +
 .../Token/Storage/TokenStorageInterface.php   |   2 +
 .../Authentication/Token/TokenInterface.php   |   9 +
 .../AuthenticationTrustResolverTest.php       |   8 +-
 .../Core/User/UserCheckerInterface.php        |   4 +
 .../Security/Core/User/UserInterface.php      |   2 +
 .../ClearableTokenStorageInterface.php        |   2 +
 .../TokenStorage/TokenStorageInterface.php    |   2 +
 .../Security/Http/Firewall/AccessListener.php |   2 +
 .../Firewall/FirewallListenerInterface.php    |   2 +
 ...SessionAuthenticationStrategyInterface.php |   2 +
 .../PasswordMigratingListenerTest.php         |   2 +-
 .../Tests/Firewall/ContextListenerTest.php    |   8 +-
 21 files changed, 270 insertions(+), 72 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index 95b866bf58ee4..a3ee92a47b773 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -659,17 +659,17 @@ index bda9ca9515..c0d1f91339 100644
      {
          if (!$container->hasParameter('workflow.has_guard_listeners')) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-index 618cefb128..a8bedab1ef 100644
+index 131e9e8c2c..5a3ff18f22 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-@@ -273,5 +273,5 @@ class FrameworkExtension extends Extension
+@@ -274,5 +274,5 @@ class FrameworkExtension extends Extension
       * @throws LogicException
       */
 -    public function load(array $configs, ContainerBuilder $container)
 +    public function load(array $configs, ContainerBuilder $container): void
      {
          $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
-@@ -2741,5 +2741,5 @@ class FrameworkExtension extends Extension
+@@ -2746,5 +2746,5 @@ class FrameworkExtension extends Extension
       * @return void
       */
 -    public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)
@@ -988,7 +988,7 @@ index a2c5815e4b..1c9721ccc6 100644
 +    public function addConfiguration(NodeDefinition $builder): void;
  }
 diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
-index 8fb375255c..610be84431 100644
+index 41d807d8c0..1d8d25b59d 100644
 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
 +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
 @@ -82,5 +82,5 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
@@ -1184,80 +1184,80 @@ index cffea43c49..0645fbd756 100644
      {
          $this->packages[$name] = $package;
 diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
-index f69beb5da9..c86558e269 100644
+index bf5ff90e5d..fe656cac5c 100644
 --- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 +++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
-@@ -63,5 +63,5 @@ abstract class AbstractBrowser
+@@ -64,5 +64,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function followRedirects(bool $followRedirects = true)
 +    public function followRedirects(bool $followRedirects = true): void
      {
          $this->followRedirects = $followRedirects;
-@@ -73,5 +73,5 @@ abstract class AbstractBrowser
+@@ -74,5 +74,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function followMetaRefresh(bool $followMetaRefresh = true)
 +    public function followMetaRefresh(bool $followMetaRefresh = true): void
      {
          $this->followMetaRefresh = $followMetaRefresh;
-@@ -91,5 +91,5 @@ abstract class AbstractBrowser
+@@ -92,5 +92,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function setMaxRedirects(int $maxRedirects)
 +    public function setMaxRedirects(int $maxRedirects): void
      {
          $this->maxRedirects = $maxRedirects < 0 ? -1 : $maxRedirects;
-@@ -112,5 +112,5 @@ abstract class AbstractBrowser
+@@ -113,5 +113,5 @@ abstract class AbstractBrowser
       * @throws \RuntimeException When Symfony Process Component is not installed
       */
 -    public function insulate(bool $insulated = true)
 +    public function insulate(bool $insulated = true): void
      {
          if ($insulated && !class_exists(\Symfony\Component\Process\Process::class)) {
-@@ -126,5 +126,5 @@ abstract class AbstractBrowser
+@@ -127,5 +127,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function setServerParameters(array $server)
 +    public function setServerParameters(array $server): void
      {
          $this->server = array_merge([
-@@ -138,5 +138,5 @@ abstract class AbstractBrowser
+@@ -139,5 +139,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function setServerParameter(string $key, string $value)
 +    public function setServerParameter(string $key, string $value): void
      {
          $this->server[$key] = $value;
-@@ -420,5 +420,5 @@ abstract class AbstractBrowser
+@@ -433,5 +433,5 @@ abstract class AbstractBrowser
       * @throws \RuntimeException When processing returns exit code
       */
 -    protected function doRequestInProcess(object $request)
 +    protected function doRequestInProcess(object $request): object
      {
          $deprecationsFile = tempnam(sys_get_temp_dir(), 'deprec');
-@@ -453,5 +453,5 @@ abstract class AbstractBrowser
+@@ -466,5 +466,5 @@ abstract class AbstractBrowser
       * @return object
       */
 -    abstract protected function doRequest(object $request);
 +    abstract protected function doRequest(object $request): object;
  
      /**
-@@ -472,5 +472,5 @@ abstract class AbstractBrowser
+@@ -485,5 +485,5 @@ abstract class AbstractBrowser
       * @return object
       */
 -    protected function filterRequest(Request $request)
 +    protected function filterRequest(Request $request): object
      {
          return $request;
-@@ -482,5 +482,5 @@ abstract class AbstractBrowser
+@@ -495,5 +495,5 @@ abstract class AbstractBrowser
       * @return Response
       */
 -    protected function filterResponse(object $response)
 +    protected function filterResponse(object $response): Response
      {
          return $response;
-@@ -607,5 +607,5 @@ abstract class AbstractBrowser
+@@ -620,5 +620,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function restart()
@@ -3564,10 +3564,10 @@ index 3f070dcc0c..aa0e5186bf 100644
      {
          foreach ($container->findTaggedServiceIds('auto_alias') as $serviceId => $tags) {
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
-index 3bcaa812cf..e1ca4cd038 100644
+index 48cacd7877..651b72c818 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
 +++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
-@@ -64,5 +64,5 @@ class AutowirePass extends AbstractRecursivePass
+@@ -61,5 +61,5 @@ class AutowirePass extends AbstractRecursivePass
       * @return void
       */
 -    public function process(ContainerBuilder $container)
@@ -3643,7 +3643,7 @@ index 2ad4a048ba..719267be1e 100644
 +    public function process(ContainerBuilder $container): void;
  }
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
-index 9c1d7e218e..61415b6ade 100644
+index c38bfa7744..10d999f093 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
 +++ b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
 @@ -31,5 +31,5 @@ class DecoratorServicePass extends AbstractRecursivePass
@@ -4553,80 +4553,80 @@ index 9b431cd65b..5fdb0643cd 100644
      {
          return $this->type;
 diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
-index 8176fee4e6..b33de6c377 100644
+index 59eec3068c..b750e80938 100644
 --- a/src/Symfony/Component/DomCrawler/Crawler.php
 +++ b/src/Symfony/Component/DomCrawler/Crawler.php
-@@ -95,5 +95,5 @@ class Crawler implements \Countable, \IteratorAggregate
+@@ -96,5 +96,5 @@ class Crawler implements \Countable, \IteratorAggregate
       * @return void
       */
 -    public function clear()
 +    public function clear(): void
      {
          $this->nodes = [];
-@@ -114,5 +114,5 @@ class Crawler implements \Countable, \IteratorAggregate
+@@ -115,5 +115,5 @@ class Crawler implements \Countable, \IteratorAggregate
       * @throws \InvalidArgumentException when node is not the expected type
       */
 -    public function add(\DOMNodeList|\DOMNode|array|string|null $node)
 +    public function add(\DOMNodeList|\DOMNode|array|string|null $node): void
      {
          if ($node instanceof \DOMNodeList) {
-@@ -138,5 +138,5 @@ class Crawler implements \Countable, \IteratorAggregate
+@@ -139,5 +139,5 @@ class Crawler implements \Countable, \IteratorAggregate
       * @return void
       */
 -    public function addContent(string $content, string $type = null)
 +    public function addContent(string $content, string $type = null): void
      {
          if (empty($type)) {
-@@ -180,5 +180,5 @@ class Crawler implements \Countable, \IteratorAggregate
+@@ -181,5 +181,5 @@ class Crawler implements \Countable, \IteratorAggregate
       * @return void
       */
 -    public function addHtmlContent(string $content, string $charset = 'UTF-8')
 +    public function addHtmlContent(string $content, string $charset = 'UTF-8'): void
      {
          $dom = $this->parseHtmlString($content, $charset);
-@@ -216,5 +216,5 @@ class Crawler implements \Countable, \IteratorAggregate
+@@ -217,5 +217,5 @@ class Crawler implements \Countable, \IteratorAggregate
       * @return void
       */
 -    public function addXmlContent(string $content, string $charset = 'UTF-8', int $options = \LIBXML_NONET)
 +    public function addXmlContent(string $content, string $charset = 'UTF-8', int $options = \LIBXML_NONET): void
      {
          // remove the default namespace if it's the only namespace to make XPath expressions simpler
-@@ -246,5 +246,5 @@ class Crawler implements \Countable, \IteratorAggregate
+@@ -247,5 +247,5 @@ class Crawler implements \Countable, \IteratorAggregate
       * @return void
       */
 -    public function addDocument(\DOMDocument $dom)
 +    public function addDocument(\DOMDocument $dom): void
      {
          if ($dom->documentElement) {
-@@ -260,5 +260,5 @@ class Crawler implements \Countable, \IteratorAggregate
+@@ -261,5 +261,5 @@ class Crawler implements \Countable, \IteratorAggregate
       * @return void
       */
 -    public function addNodeList(\DOMNodeList $nodes)
 +    public function addNodeList(\DOMNodeList $nodes): void
      {
          foreach ($nodes as $node) {
-@@ -276,5 +276,5 @@ class Crawler implements \Countable, \IteratorAggregate
+@@ -277,5 +277,5 @@ class Crawler implements \Countable, \IteratorAggregate
       * @return void
       */
 -    public function addNodes(array $nodes)
 +    public function addNodes(array $nodes): void
      {
          foreach ($nodes as $node) {
-@@ -290,5 +290,5 @@ class Crawler implements \Countable, \IteratorAggregate
+@@ -291,5 +291,5 @@ class Crawler implements \Countable, \IteratorAggregate
       * @return void
       */
 -    public function addNode(\DOMNode $node)
 +    public function addNode(\DOMNode $node): void
      {
          if ($node instanceof \DOMDocument) {
-@@ -884,5 +884,5 @@ class Crawler implements \Countable, \IteratorAggregate
+@@ -885,5 +885,5 @@ class Crawler implements \Countable, \IteratorAggregate
       * @return void
       */
 -    public function setDefaultNamespacePrefix(string $prefix)
 +    public function setDefaultNamespacePrefix(string $prefix): void
      {
          $this->defaultNamespacePrefix = $prefix;
-@@ -892,5 +892,5 @@ class Crawler implements \Countable, \IteratorAggregate
+@@ -893,5 +893,5 @@ class Crawler implements \Countable, \IteratorAggregate
       * @return void
       */
 -    public function registerNamespace(string $prefix, string $namespace)
@@ -4845,7 +4845,7 @@ index f1b982315c..ed8ad1fab4 100644
      {
      }
 diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
-index cbfe7e416d..bf72a91ce8 100644
+index c86f438d41..3bfb39db57 100644
 --- a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
 +++ b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
 @@ -52,5 +52,5 @@ class RegisterListenersPass implements CompilerPassInterface
@@ -6926,7 +6926,7 @@ index 472437e465..1dfe39146b 100644
      {
          if ($this->client instanceof ResetInterface) {
 diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
-index 767893bf4b..512ff2daf6 100644
+index de24e3b7fd..0aff3bbc60 100644
 --- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
 +++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
 @@ -562,5 +562,5 @@ trait HttpClientTrait
@@ -8129,10 +8129,10 @@ index 1924b1ddb0..62c58c8e8b 100644
      {
          $annotatedClasses = [];
 diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
-index 5bb801c8cd..7426ca9430 100644
+index dff3e248ae..381db9aa8f 100644
 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
 +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
-@@ -32,5 +32,5 @@ class ControllerArgumentValueResolverPass implements CompilerPassInterface
+@@ -34,5 +34,5 @@ class ControllerArgumentValueResolverPass implements CompilerPassInterface
       * @return void
       */
 -    public function process(ContainerBuilder $container)
@@ -10493,7 +10493,7 @@ index 341883f3c5..d508e0ce1e 100644
      {
          $this->tokens[$token->getSeries()] = $token;
 diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
-index 9b32fdce31..fbbd65d8b7 100644
+index cf41e0c507..61f7397734 100644
 --- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
 +++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
 @@ -28,5 +28,5 @@ interface TokenProviderInterface
@@ -10503,6 +10503,26 @@ index 9b32fdce31..fbbd65d8b7 100644
 +    public function loadTokenBySeries(string $series): PersistentTokenInterface;
  
      /**
+@@ -35,5 +35,5 @@ interface TokenProviderInterface
+      * @return void
+      */
+-    public function deleteTokenBySeries(string $series);
++    public function deleteTokenBySeries(string $series): void;
+ 
+     /**
+@@ -44,5 +44,5 @@ interface TokenProviderInterface
+      * @throws TokenNotFoundException if the token is not found
+      */
+-    public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTime $lastUsed);
++    public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTime $lastUsed): void;
+ 
+     /**
+@@ -51,4 +51,4 @@ interface TokenProviderInterface
+      * @return void
+      */
+-    public function createNewToken(PersistentTokenInterface $token);
++    public function createNewToken(PersistentTokenInterface $token): void;
+ }
 diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
 index 4416cda616..0fcf4303e0 100644
 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
@@ -10536,16 +10556,37 @@ index 4416cda616..0fcf4303e0 100644
      {
          $this->attributes[$name] = $value;
 diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
-index 3df95e527d..ec72b91986 100644
+index eabfe17bba..5a41823338 100644
 --- a/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
 +++ b/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
-@@ -47,5 +47,5 @@ class NullToken implements TokenInterface
+@@ -37,5 +37,5 @@ class NullToken implements TokenInterface
+      * @return never
+      */
+-    public function setUser(UserInterface $user)
++    public function setUser(UserInterface $user): never
+     {
+         throw new \BadMethodCallException('Cannot set user on a NullToken.');
+@@ -50,5 +50,5 @@ class NullToken implements TokenInterface
       * @return void
       */
 -    public function eraseCredentials()
 +    public function eraseCredentials(): void
      {
      }
+@@ -62,5 +62,5 @@ class NullToken implements TokenInterface
+      * @return never
+      */
+-    public function setAttributes(array $attributes)
++    public function setAttributes(array $attributes): never
+     {
+         throw new \BadMethodCallException('Cannot set attributes of NullToken.');
+@@ -80,5 +80,5 @@ class NullToken implements TokenInterface
+      * @return never
+      */
+-    public function setAttribute(string $name, mixed $value)
++    public function setAttribute(string $name, mixed $value): never
+     {
+         throw new \BadMethodCallException('Cannot add attribute to NullToken.');
 diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php
 index 0ec6b1cfb9..2e235a6069 100644
 --- a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php
@@ -10564,6 +10605,48 @@ index 0ec6b1cfb9..2e235a6069 100644
 +    public function reset(): void
      {
          $this->setToken(null);
+diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php
+index 5fdfa4e9ff..e9c2081934 100644
+--- a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php
++++ b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php
+@@ -33,4 +33,4 @@ interface TokenStorageInterface
+      * @return void
+      */
+-    public function setToken(?TokenInterface $token);
++    public function setToken(?TokenInterface $token): void;
+ }
+diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php
+index d9b80ae1eb..caf0cfc28c 100644
+--- a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php
++++ b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php
+@@ -55,5 +55,5 @@ interface TokenInterface
+      * @throws \InvalidArgumentException
+      */
+-    public function setUser(UserInterface $user);
++    public function setUser(UserInterface $user): void;
+ 
+     /**
+@@ -62,5 +62,5 @@ interface TokenInterface
+      * @return void
+      */
+-    public function eraseCredentials();
++    public function eraseCredentials(): void;
+ 
+     public function getAttributes(): array;
+@@ -71,5 +71,5 @@ interface TokenInterface
+      * @return void
+      */
+-    public function setAttributes(array $attributes);
++    public function setAttributes(array $attributes): void;
+ 
+     public function hasAttribute(string $name): bool;
+@@ -83,5 +83,5 @@ interface TokenInterface
+      * @return void
+      */
+-    public function setAttribute(string $name, mixed $value);
++    public function setAttribute(string $name, mixed $value): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php
 index c8db1485e0..34bf5a5763 100644
 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php
@@ -10716,6 +10799,34 @@ index ed6c2d8b38..7b61505fd5 100644
 +    private function getUser(string $username): InMemoryUser
      {
          if (!isset($this->users[strtolower($username)])) {
+diff --git a/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php b/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php
+index 91f21c71d0..95e818392e 100644
+--- a/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php
++++ b/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php
+@@ -31,5 +31,5 @@ interface UserCheckerInterface
+      * @throws AccountStatusException
+      */
+-    public function checkPreAuth(UserInterface $user);
++    public function checkPreAuth(UserInterface $user): void;
+ 
+     /**
+@@ -40,4 +40,4 @@ interface UserCheckerInterface
+      * @throws AccountStatusException
+      */
+-    public function checkPostAuth(UserInterface $user);
++    public function checkPostAuth(UserInterface $user): void;
+ }
+diff --git a/src/Symfony/Component/Security/Core/User/UserInterface.php b/src/Symfony/Component/Security/Core/User/UserInterface.php
+index ef22340a63..d0b1589d97 100644
+--- a/src/Symfony/Component/Security/Core/User/UserInterface.php
++++ b/src/Symfony/Component/Security/Core/User/UserInterface.php
+@@ -55,5 +55,5 @@ interface UserInterface
+      * @return void
+      */
+-    public function eraseCredentials();
++    public function eraseCredentials(): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Security/Core/User/UserProviderInterface.php b/src/Symfony/Component/Security/Core/User/UserProviderInterface.php
 index ec90d413fa..9f1401aa91 100644
 --- a/src/Symfony/Component/Security/Core/User/UserProviderInterface.php
@@ -10745,6 +10856,16 @@ index 8fd2205a9d..5d5a72ac41 100644
 +    public function validate(mixed $password, Constraint $constraint): void
      {
          if (!$constraint instanceof UserPassword) {
+diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/ClearableTokenStorageInterface.php b/src/Symfony/Component/Security/Csrf/TokenStorage/ClearableTokenStorageInterface.php
+index 185c4a7e33..4d343f24c5 100644
+--- a/src/Symfony/Component/Security/Csrf/TokenStorage/ClearableTokenStorageInterface.php
++++ b/src/Symfony/Component/Security/Csrf/TokenStorage/ClearableTokenStorageInterface.php
+@@ -22,4 +22,4 @@ interface ClearableTokenStorageInterface extends TokenStorageInterface
+      * @return void
+      */
+-    public function clear();
++    public function clear(): void;
+ }
 diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php b/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php
 index 7de8b52969..97e61d84da 100644
 --- a/src/Symfony/Component/Security/Csrf/TokenStorage/NativeSessionTokenStorage.php
@@ -10781,6 +10902,17 @@ index 4b3c3e56a5..7937512868 100644
 +    public function clear(): void
      {
          $session = $this->getSession();
+diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php b/src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php
+index 32c71921bd..060a2505d8 100644
+--- a/src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php
++++ b/src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php
+@@ -31,5 +31,5 @@ interface TokenStorageInterface
+      * @return void
+      */
+-    public function setToken(string $tokenId, #[\SensitiveParameter] string $token);
++    public function setToken(string $tokenId, #[\SensitiveParameter] string $token): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Security/Http/AccessMap.php b/src/Symfony/Component/Security/Http/AccessMap.php
 index 6c05dffa21..4b60abcb25 100644
 --- a/src/Symfony/Component/Security/Http/AccessMap.php
@@ -10900,6 +11032,28 @@ index fc56733efa..8538f5f821 100644
 +    protected function callListeners(RequestEvent $event, iterable $listeners): void
      {
          foreach ($listeners as $listener) {
+diff --git a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
+index ad343ef085..9a1a2563c4 100644
+--- a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
++++ b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
+@@ -65,5 +65,5 @@ class AccessListener extends AbstractListener
+      * @throws AccessDeniedException
+      */
+-    public function authenticate(RequestEvent $event)
++    public function authenticate(RequestEvent $event): void
+     {
+         $request = $event->getRequest();
+diff --git a/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php b/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php
+index be200c0d12..69483f8f1d 100644
+--- a/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php
++++ b/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php
+@@ -36,5 +36,5 @@ interface FirewallListenerInterface
+      * @return void
+      */
+-    public function authenticate(RequestEvent $event);
++    public function authenticate(RequestEvent $event): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Security/Http/FirewallMap.php b/src/Symfony/Component/Security/Http/FirewallMap.php
 index 36c8c67e38..32a83871e5 100644
 --- a/src/Symfony/Component/Security/Http/FirewallMap.php
@@ -10961,6 +11115,16 @@ index 63ede6193a..a26912201b 100644
 +    public function onAuthentication(Request $request, TokenInterface $token): void
      {
          switch ($this->strategy) {
+diff --git a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php
+index 880a4eaa22..dd3da4ca7b 100644
+--- a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php
++++ b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php
+@@ -33,4 +33,4 @@ interface SessionAuthenticationStrategyInterface
+      * @return void
+      */
+-    public function onAuthentication(Request $request, TokenInterface $token);
++    public function onAuthentication(Request $request, TokenInterface $token): void;
+ }
 diff --git a/src/Symfony/Component/Semaphore/Store/RedisStore.php b/src/Symfony/Component/Semaphore/Store/RedisStore.php
 index 0e0f551876..1ab8bc9577 100644
 --- a/src/Symfony/Component/Semaphore/Store/RedisStore.php
@@ -11536,10 +11700,10 @@ index 9d4418d639..d1959f433d 100644
      {
          if (!$container->hasDefinition('translator.default')) {
 diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php
-index ac83f0e26d..654d076323 100644
+index f7f954eea1..b93248a69a 100644
 --- a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php
 +++ b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php
-@@ -43,5 +43,5 @@ class TranslatorPathsPass extends AbstractRecursivePass
+@@ -44,5 +44,5 @@ class TranslatorPathsPass extends AbstractRecursivePass
       * @return void
       */
 -    public function process(ContainerBuilder $container)
@@ -12586,10 +12750,10 @@ index e7389f7b8e..3c07cdc9f7 100644
      {
          return $this->class;
 diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
-index 1b2457707f..5811aa8106 100644
+index 9712d35ac1..2a0b248897 100644
 --- a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
 +++ b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
-@@ -295,5 +295,5 @@ abstract class ConstraintValidatorTestCase extends TestCase
+@@ -291,5 +291,5 @@ abstract class ConstraintValidatorTestCase extends TestCase
       * @psalm-return T
       */
 -    abstract protected function createValidator();
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/User.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/User.php
index b8b10094dd6bd..02d31078451b8 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/User.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/User.php
@@ -54,7 +54,7 @@ public function getUserIdentifier(): string
         return $this->name;
     }
 
-    public function eraseCredentials()
+    public function eraseCredentials(): void
     {
     }
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
index 3a626bb1e02d4..5ae38eba3824b 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
@@ -280,17 +280,11 @@ public function __construct()
     {
     }
 
-    /**
-     * @return array|string
-     */
-    public function getSQL()
+    public function getSQL(): array|string
     {
     }
 
-    /**
-     * @return Result|int
-     */
-    protected function _doExecute()
+    protected function _doExecute(): Result|int
     {
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/WrappedLazyListener.php b/src/Symfony/Bundle/SecurityBundle/Debug/WrappedLazyListener.php
index a30900a5342e2..55c70ec5780d6 100644
--- a/src/Symfony/Bundle/SecurityBundle/Debug/WrappedLazyListener.php
+++ b/src/Symfony/Bundle/SecurityBundle/Debug/WrappedLazyListener.php
@@ -38,12 +38,12 @@ public function supports(Request $request): ?bool
         return $this->listener->supports($request);
     }
 
-    public function authenticate(RequestEvent $event)
+    public function authenticate(RequestEvent $event): void
     {
         $startTime = microtime(true);
 
         try {
-            $ret = $this->listener->authenticate($event);
+            $this->listener->authenticate($event);
         } catch (LazyResponseException $e) {
             $this->response = $e->getResponse();
 
@@ -53,7 +53,5 @@ public function authenticate(RequestEvent $event)
         }
 
         $this->response = $event->getResponse();
-
-        return $ret;
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/SortFirewallListenersPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/SortFirewallListenersPassTest.php
index 8cbf745e9cc88..dde5127bbd7f9 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/SortFirewallListenersPassTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/SortFirewallListenersPassTest.php
@@ -65,7 +65,7 @@ public function supports(Request $request): ?bool
     {
     }
 
-    public function authenticate(RequestEvent $event)
+    public function authenticate(RequestEvent $event): void
     {
     }
 
@@ -81,7 +81,7 @@ public function supports(Request $request): ?bool
     {
     }
 
-    public function authenticate(RequestEvent $event)
+    public function authenticate(RequestEvent $event): void
     {
     }
 
@@ -97,7 +97,7 @@ public function supports(Request $request): ?bool
     {
     }
 
-    public function authenticate(RequestEvent $event)
+    public function authenticate(RequestEvent $event): void
     {
     }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
index cee0647702654..25bfbdef4d2d8 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -923,11 +923,11 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
 
 class TestUserChecker implements UserCheckerInterface
 {
-    public function checkPreAuth(UserInterface $user)
+    public function checkPreAuth(UserInterface $user): void
     {
     }
 
-    public function checkPostAuth(UserInterface $user)
+    public function checkPostAuth(UserInterface $user): void
     {
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/RememberMeBundle/Security/StaticTokenProvider.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/RememberMeBundle/Security/StaticTokenProvider.php
index 8a669e99bc48d..c79518b6cb9fb 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/RememberMeBundle/Security/StaticTokenProvider.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/RememberMeBundle/Security/StaticTokenProvider.php
@@ -39,12 +39,12 @@ public function loadTokenBySeries(string $series): PersistentTokenInterface
         return $token;
     }
 
-    public function deleteTokenBySeries(string $series)
+    public function deleteTokenBySeries(string $series): void
     {
         unset(self::$db[$series]);
     }
 
-    public function updateToken(string $series, string $tokenValue, \DateTime $lastUsed)
+    public function updateToken(string $series, string $tokenValue, \DateTime $lastUsed): void
     {
         $token = $this->loadTokenBySeries($series);
         $refl = new \ReflectionClass($token);
@@ -57,7 +57,7 @@ public function updateToken(string $series, string $tokenValue, \DateTime $lastU
         self::$db[$series] = $token;
     }
 
-    public function createNewToken(PersistentTokenInterface $token)
+    public function createNewToken(PersistentTokenInterface $token): void
     {
         self::$db[$token->getSeries()] = $token;
     }
diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
index 9b32fdce315d1..cf41e0c5078fc 100644
--- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
+++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
@@ -31,18 +31,24 @@ public function loadTokenBySeries(string $series);
 
     /**
      * Deletes all tokens belonging to series.
+     *
+     * @return void
      */
     public function deleteTokenBySeries(string $series);
 
     /**
      * Updates the token according to this data.
      *
+     * @return void
+     *
      * @throws TokenNotFoundException if the token is not found
      */
     public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTime $lastUsed);
 
     /**
      * Creates a new token.
+     *
+     * @return void
      */
     public function createNewToken(PersistentTokenInterface $token);
 }
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
index 3df95e527dd22..eabfe17bba285 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/NullToken.php
@@ -33,6 +33,9 @@ public function getUser(): ?UserInterface
         return null;
     }
 
+    /**
+     * @return never
+     */
     public function setUser(UserInterface $user)
     {
         throw new \BadMethodCallException('Cannot set user on a NullToken.');
@@ -55,6 +58,9 @@ public function getAttributes(): array
         return [];
     }
 
+    /**
+     * @return never
+     */
     public function setAttributes(array $attributes)
     {
         throw new \BadMethodCallException('Cannot set attributes of NullToken.');
@@ -70,6 +76,9 @@ public function getAttribute(string $name): mixed
         return null;
     }
 
+    /**
+     * @return never
+     */
     public function setAttribute(string $name, mixed $value)
     {
         throw new \BadMethodCallException('Cannot add attribute to NullToken.');
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php
index 7d184d04d68b4..5fdfa4e9ffc6e 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorageInterface.php
@@ -29,6 +29,8 @@ public function getToken(): ?TokenInterface;
      * Sets the authentication token.
      *
      * @param TokenInterface|null $token A TokenInterface token, or null if no further authentication information should be stored
+     *
+     * @return void
      */
     public function setToken(?TokenInterface $token);
 }
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php
index d9e1bb4ca363e..d9b80ae1eb0b5 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php
@@ -50,12 +50,16 @@ public function getUser(): ?UserInterface;
     /**
      * Sets the authenticated user in the token.
      *
+     * @return void
+     *
      * @throws \InvalidArgumentException
      */
     public function setUser(UserInterface $user);
 
     /**
      * Removes sensitive information from the token.
+     *
+     * @return void
      */
     public function eraseCredentials();
 
@@ -63,6 +67,8 @@ public function getAttributes(): array;
 
     /**
      * @param array $attributes The token attributes
+     *
+     * @return void
      */
     public function setAttributes(array $attributes);
 
@@ -73,6 +79,9 @@ public function hasAttribute(string $name): bool;
      */
     public function getAttribute(string $name): mixed;
 
+    /**
+     * @return void
+     */
     public function setAttribute(string $name, mixed $value);
 
     /**
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
index 8c0df2740307b..02149ce3da711 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
@@ -111,7 +111,7 @@ public function getUser(): UserInterface
         return new InMemoryUser('wouter', '', ['ROLE_USER']);
     }
 
-    public function setUser($user)
+    public function setUser($user): void
     {
     }
 
@@ -123,7 +123,7 @@ public function getUserIdentifier(): string
     {
     }
 
-    public function eraseCredentials()
+    public function eraseCredentials(): void
     {
     }
 
@@ -131,7 +131,7 @@ public function getAttributes(): array
     {
     }
 
-    public function setAttributes(array $attributes)
+    public function setAttributes(array $attributes): void
     {
     }
 
@@ -143,7 +143,7 @@ public function getAttribute(string $name): mixed
     {
     }
 
-    public function setAttribute(string $name, $value)
+    public function setAttribute(string $name, $value): void
     {
     }
 }
diff --git a/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php b/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php
index a7c5f179f84c6..91f21c71d0220 100644
--- a/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php
+++ b/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php
@@ -26,6 +26,8 @@ interface UserCheckerInterface
     /**
      * Checks the user account before authentication.
      *
+     * @return void
+     *
      * @throws AccountStatusException
      */
     public function checkPreAuth(UserInterface $user);
@@ -33,6 +35,8 @@ public function checkPreAuth(UserInterface $user);
     /**
      * Checks the user account after authentication.
      *
+     * @return void
+     *
      * @throws AccountStatusException
      */
     public function checkPostAuth(UserInterface $user);
diff --git a/src/Symfony/Component/Security/Core/User/UserInterface.php b/src/Symfony/Component/Security/Core/User/UserInterface.php
index cace8f6aed6cf..ef22340a6313a 100644
--- a/src/Symfony/Component/Security/Core/User/UserInterface.php
+++ b/src/Symfony/Component/Security/Core/User/UserInterface.php
@@ -51,6 +51,8 @@ public function getRoles(): array;
      *
      * This is important if, at any given point, sensitive information like
      * the plain-text password is stored on this object.
+     *
+     * @return void
      */
     public function eraseCredentials();
 
diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/ClearableTokenStorageInterface.php b/src/Symfony/Component/Security/Csrf/TokenStorage/ClearableTokenStorageInterface.php
index 0d6f16b68d0b6..185c4a7e33bd6 100644
--- a/src/Symfony/Component/Security/Csrf/TokenStorage/ClearableTokenStorageInterface.php
+++ b/src/Symfony/Component/Security/Csrf/TokenStorage/ClearableTokenStorageInterface.php
@@ -18,6 +18,8 @@ interface ClearableTokenStorageInterface extends TokenStorageInterface
 {
     /**
      * Removes all CSRF tokens.
+     *
+     * @return void
      */
     public function clear();
 }
diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php b/src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php
index d119d6e977bcb..32c71921bd2fd 100644
--- a/src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php
+++ b/src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageInterface.php
@@ -27,6 +27,8 @@ public function getToken(string $tokenId): string;
 
     /**
      * Stores a CSRF token.
+     *
+     * @return void
      */
     public function setToken(string $tokenId, #[\SensitiveParameter] string $token);
 
diff --git a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
index d0a0dc79ce665..ad343ef085dad 100644
--- a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
@@ -60,6 +60,8 @@ public function supports(Request $request): ?bool
     /**
      * Handles access authorization.
      *
+     * @void
+     *
      * @throws AccessDeniedException
      */
     public function authenticate(RequestEvent $event)
diff --git a/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php b/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php
index 485d767c715f8..be200c0d1282c 100644
--- a/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php
+++ b/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php
@@ -32,6 +32,8 @@ public function supports(Request $request): ?bool;
 
     /**
      * Does whatever is required to authenticate the request, typically calling $event->setResponse() internally.
+     *
+     * @return void
      */
     public function authenticate(RequestEvent $event);
 
diff --git a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php
index a45f852d59b5c..880a4eaa22df3 100644
--- a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php
+++ b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php
@@ -29,6 +29,8 @@ interface SessionAuthenticationStrategyInterface
      *
      * This method should be called before the TokenStorage is populated with a
      * Token. It should be used by authentication listeners when a session is used.
+     *
+     * @return void
      */
     public function onAuthentication(Request $request, TokenInterface $token);
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php
index 2ad7a0fd81b42..bc675dd61ad6f 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/PasswordMigratingListenerTest.php
@@ -170,7 +170,7 @@ public function getRoles(): array
         return [];
     }
 
-    public function eraseCredentials()
+    public function eraseCredentials(): void
     {
     }
 
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
index 4014110dccd50..64052062d00f5 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -548,7 +548,7 @@ public function getUser(): UserInterface
         return $this->user;
     }
 
-    public function setUser($user)
+    public function setUser($user): void
     {
         $this->user = $user;
     }
@@ -572,7 +572,7 @@ public function setAuthenticated(bool $isAuthenticated)
     {
     }
 
-    public function eraseCredentials()
+    public function eraseCredentials(): void
     {
     }
 
@@ -581,7 +581,7 @@ public function getAttributes(): array
         return [];
     }
 
-    public function setAttributes(array $attributes)
+    public function setAttributes(array $attributes): void
     {
     }
 
@@ -595,7 +595,7 @@ public function getAttribute(string $name): mixed
         return null;
     }
 
-    public function setAttribute(string $name, $value)
+    public function setAttribute(string $name, $value): void
     {
     }
 }

From 400685a68b00b0932f8ef41096578872b643099c Mon Sep 17 00:00:00 2001
From: Tugdual Saunier <tugdual.saunier@gmail.com>
Date: Thu, 2 Feb 2023 11:05:14 -0500
Subject: [PATCH 276/475] [Serializer] Add methods `getSupportedTypes` to allow
 better performance

---
 .../Normalizer/FlattenExceptionNormalizer.php |   7 ++
 src/Symfony/Component/Serializer/CHANGELOG.md |   2 +
 .../Serializer/Debug/TraceableNormalizer.php  |  15 +++
 .../Serializer/Debug/TraceableSerializer.php  |  10 ++
 .../Normalizer/AbstractNormalizer.php         |   5 +
 .../Normalizer/AbstractObjectNormalizer.php   |   2 +-
 .../Normalizer/ArrayDenormalizer.php          |  15 +++
 .../Normalizer/BackedEnumNormalizer.php       |  12 +++
 .../CacheableSupportsMethodInterface.php      |   2 +
 .../ConstraintViolationListNormalizer.php     |  12 +++
 .../Normalizer/CustomNormalizer.php           |  12 +++
 .../Normalizer/DataUriNormalizer.php          |  14 +++
 .../Normalizer/DateIntervalNormalizer.php     |  12 +++
 .../Normalizer/DateTimeNormalizer.php         |  14 +++
 .../Normalizer/DateTimeZoneNormalizer.php     |  12 +++
 .../Normalizer/DenormalizerInterface.php      |  28 ++++-
 .../Normalizer/FormErrorNormalizer.php        |  12 +++
 .../Normalizer/GetSetMethodNormalizer.php     |  10 ++
 .../Normalizer/JsonSerializableNormalizer.php |  12 +++
 .../Normalizer/MimeMessageNormalizer.php      |  16 +++
 .../Normalizer/NormalizerInterface.php        |  24 ++++-
 .../Normalizer/ObjectNormalizer.php           |  10 ++
 .../Normalizer/ProblemNormalizer.php          |  12 +++
 .../Normalizer/PropertyNormalizer.php         |  10 ++
 .../Serializer/Normalizer/UidNormalizer.php   |  12 +++
 .../Normalizer/UnwrappingDenormalizer.php     |  10 ++
 .../Component/Serializer/Serializer.php       |  69 ++++++++++--
 .../Tests/Debug/TraceableNormalizerTest.php   |  12 ++-
 .../Tests/Debug/TraceableSerializerTest.php   |   5 +
 .../Tests/Encoder/XmlEncoderTest.php          |   5 +
 .../Fixtures/AbstractNormalizerDummy.php      |   5 +
 .../Tests/Fixtures/EnvelopeNormalizer.php     |   7 ++
 .../Fixtures/EnvelopedMessageNormalizer.php   |   7 ++
 .../UpcomingDenormalizerInterface.php         |  20 ++++
 .../Fixtures/UpcomingNormalizerInterface.php  |  20 ++++
 .../AbstractObjectNormalizerTest.php          |  25 +++++
 .../Normalizer/ArrayDenormalizerTest.php      |  15 +--
 .../Tests/Normalizer/TestDenormalizer.php     |   5 +
 .../Tests/Normalizer/TestNormalizer.php       |   5 +
 .../Serializer/Tests/SerializerTest.php       | 100 +++++++++++++++---
 40 files changed, 559 insertions(+), 43 deletions(-)
 create mode 100644 src/Symfony/Component/Serializer/Tests/Fixtures/UpcomingDenormalizerInterface.php
 create mode 100644 src/Symfony/Component/Serializer/Tests/Fixtures/UpcomingNormalizerInterface.php

diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php b/src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php
index eb673c1211fcc..ac30b09df925a 100644
--- a/src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php
+++ b/src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php
@@ -45,6 +45,13 @@ public function normalize(mixed $object, string $format = null, array $context =
         return $normalized;
     }
 
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            FlattenException::class => false,
+        ];
+    }
+
     public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
     {
         return $data instanceof FlattenException && ($context[Serializer::MESSENGER_SERIALIZATION_CONTEXT] ?? false);
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
index 12269eda7ff4f..99f68f71f931b 100644
--- a/src/Symfony/Component/Serializer/CHANGELOG.md
+++ b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -6,7 +6,9 @@ CHANGELOG
 
  * Add `XmlEncoder::SAVE_OPTIONS` context option
  * Add `BackedEnumNormalizer::ALLOW_INVALID_VALUES` context option
+ * Add method `getSupportedTypes(?string $format)` to `NormalizerInterface` and `DenormalizerInterface`
  * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
+ * Deprecate `CacheableSupportsMethodInterface` in favor of the new `getSupportedTypes(?string $format)` methods
 
 6.2
 ---
diff --git a/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php b/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php
index ca41fc6a83f07..8a00056f1a864 100644
--- a/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php
+++ b/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php
@@ -35,6 +35,16 @@ public function __construct(
     ) {
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        // @deprecated remove condition in 7.0
+        if (!method_exists($this->normalizer, 'getSupportedTypes')) {
+            return null;
+        }
+
+        return $this->normalizer->getSupportedTypes($format);
+    }
+
     public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
     {
         if (!$this->normalizer instanceof NormalizerInterface) {
@@ -114,8 +124,13 @@ public function setDenormalizer(DenormalizerInterface $denormalizer): void
         $this->normalizer->setDenormalizer($denormalizer);
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return $this->normalizer instanceof CacheableSupportsMethodInterface && $this->normalizer->hasCacheableSupportsMethod();
     }
 
diff --git a/src/Symfony/Component/Serializer/Debug/TraceableSerializer.php b/src/Symfony/Component/Serializer/Debug/TraceableSerializer.php
index 01ae795841937..7aa1cb01fa9e1 100644
--- a/src/Symfony/Component/Serializer/Debug/TraceableSerializer.php
+++ b/src/Symfony/Component/Serializer/Debug/TraceableSerializer.php
@@ -128,6 +128,16 @@ public function decode(string $data, string $format, array $context = []): mixed
         return $result;
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        // @deprecated remove condition in 7.0
+        if (!method_exists($this->serializer, 'getSupportedTypes')) {
+            return null;
+        }
+
+        return $this->serializer->getSupportedTypes($format);
+    }
+
     public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
     {
         return $this->serializer->supportsNormalization($data, $format, $context);
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
index 52e985815bf99..7d138b0b263f5 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -150,8 +150,13 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
         }
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return false;
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index a02a46b9415a6..75fe3a5cb180b 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -300,7 +300,7 @@ abstract protected function getAttributeValue(object $object, string $attribute,
      */
     public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */)
     {
-        return class_exists($type) || (interface_exists($type, false) && $this->classDiscriminatorResolver && null !== $this->classDiscriminatorResolver->getMappingForClass($type));
+        return class_exists($type) || (interface_exists($type, false) && null !== $this->classDiscriminatorResolver?->getMappingForClass($type));
     }
 
     public function denormalize(mixed $data, string $type, string $format = null, array $context = [])
diff --git a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
index a88beba7ab6c6..71ee54fdced01 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
@@ -27,6 +27,16 @@ class ArrayDenormalizer implements ContextAwareDenormalizerInterface, Denormaliz
 {
     use DenormalizerAwareTrait;
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        // @deprecated remove condition in 7.0
+        if (!method_exists($this->denormalizer, 'getSupportedTypes')) {
+            return null;
+        }
+
+        return $this->denormalizer->getSupportedTypes($format);
+    }
+
     /**
      * @throws NotNormalizableValueException
      */
@@ -69,8 +79,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
             && $this->denormalizer->supportsDenormalization($data, substr($type, 0, -2), $format, $context);
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return $this->denormalizer instanceof CacheableSupportsMethodInterface && $this->denormalizer->hasCacheableSupportsMethod();
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php
index 2281849ad20a4..32ee831c8c2df 100644
--- a/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php
@@ -27,6 +27,13 @@ final class BackedEnumNormalizer implements NormalizerInterface, DenormalizerInt
      */
     public const ALLOW_INVALID_VALUES = 'allow_invalid_values';
 
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+           \BackedEnum::class => true,
+        ];
+    }
+
     public function normalize(mixed $object, string $format = null, array $context = []): int|string
     {
         if (!$object instanceof \BackedEnum) {
@@ -78,8 +85,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
         return is_subclass_of($type, \BackedEnum::class);
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return true;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/CacheableSupportsMethodInterface.php b/src/Symfony/Component/Serializer/Normalizer/CacheableSupportsMethodInterface.php
index 3a55f653b1786..ea2df15b2c035 100644
--- a/src/Symfony/Component/Serializer/Normalizer/CacheableSupportsMethodInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/CacheableSupportsMethodInterface.php
@@ -19,6 +19,8 @@
  * supports*() methods will be cached by type and format.
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @deprecated since Symfony 6.3, implement "getSupportedTypes(?string $format)" instead
  */
 interface CacheableSupportsMethodInterface
 {
diff --git a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
index 0300bd8478750..7d0804c183314 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
@@ -39,6 +39,13 @@ public function __construct(array $defaultContext = [], NameConverterInterface $
         $this->nameConverter = $nameConverter;
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return [
+            ConstraintViolationListInterface::class => __CLASS__ === static::class,
+        ];
+    }
+
     public function normalize(mixed $object, string $format = null, array $context = []): array
     {
         if (\array_key_exists(self::PAYLOAD_FIELDS, $context)) {
@@ -109,8 +116,13 @@ public function supportsNormalization(mixed $data, string $format = null /* , ar
         return $data instanceof ConstraintViolationListInterface;
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
index c498b19353082..97cc865b9744b 100644
--- a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
@@ -22,6 +22,13 @@ class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, Se
     use ObjectToPopulateTrait;
     use SerializerAwareTrait;
 
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            NormalizableInterface::class => __CLASS__ === static::class,
+        ];
+    }
+
     public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
     {
         return $object->normalize($this->serializer, $format, $context);
@@ -60,8 +67,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
         return is_subclass_of($type, DenormalizableInterface::class);
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
index b0cecd9e87785..ff5ff258a2d96 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -45,6 +45,15 @@ public function __construct(MimeTypeGuesserInterface $mimeTypeGuesser = null)
         $this->mimeTypeGuesser = $mimeTypeGuesser;
     }
 
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            \SplFileInfo::class => __CLASS__ === static::class,
+            \SplFileObject::class => __CLASS__ === static::class,
+            File::class => __CLASS__ === static::class,
+        ];
+    }
+
     public function normalize(mixed $object, string $format = null, array $context = []): string
     {
         if (!$object instanceof \SplFileInfo) {
@@ -118,8 +127,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
         return isset(self::SUPPORTED_TYPES[$type]);
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
index bff7bcabbd2c3..839eeb65d2e56 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
@@ -33,6 +33,13 @@ public function __construct(array $defaultContext = [])
         $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
     }
 
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            \DateInterval::class => __CLASS__ === static::class,
+        ];
+    }
+
     /**
      * @throws InvalidArgumentException
      */
@@ -53,8 +60,13 @@ public function supportsNormalization(mixed $data, string $format = null /* , ar
         return $data instanceof \DateInterval;
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTy
D7AE
pes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
index 715a56d5b3626..841f4512dd002 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
@@ -47,6 +47,15 @@ public function setDefaultContext(array $defaultContext): void
         $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
     }
 
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            \DateTimeInterface::class => __CLASS__ === static::class,
+            \DateTimeImmutable::class => __CLASS__ === static::class,
+            \DateTime::class => __CLASS__ === static::class,
+        ];
+    }
+
     /**
      * @throws InvalidArgumentException
      */
@@ -124,8 +133,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
         return isset(self::SUPPORTED_TYPES[$type]);
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php
index 6309ce335b71a..24de36121fd45 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php
@@ -22,6 +22,13 @@
  */
 class DateTimeZoneNormalizer implements NormalizerInterface, DenormalizerInterface, CacheableSupportsMethodInterface
 {
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            \DateTimeZone::class => __CLASS__ === static::class,
+        ];
+    }
+
     /**
      * @throws InvalidArgumentException
      */
@@ -66,8 +73,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
         return \DateTimeZone::class === $type;
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
index 1786d6fff1faa..97ae86be2edde 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
@@ -21,6 +21,8 @@
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * @method getSupportedTypes(?string $format): ?array
  */
 interface DenormalizerInterface
 {
@@ -49,12 +51,32 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
     /**
      * Checks whether the given class is supported for denormalization by this normalizer.
      *
-     * @param mixed       $data   Data to denormalize from
-     * @param string      $type   The class to which the data should be denormalized
-     * @param string|null $format The format being deserialized from
+     * Since Symfony 6.3, this method will only be called if the type is
+     * included in the supported types returned by getSupportedTypes().
+     *
+     * @see getSupportedTypes()
+     *
+     * @param mixed       $data    Data to denormalize from
+     * @param string      $type    The class to which the data should be denormalized
+     * @param string|null $format  The format being deserialized from
      * @param array       $context Options available to the denormalizer
      *
      * @return bool
      */
     public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */);
+
+    /*
+     * Return the types supported for normalization by this denormalizer for
+     * this format associated to a boolean value indicating if the result of
+     * supports*() methods can be cached or if the result can not be cached
+     * because it depends on the context.
+     * Returning null means this denormalizer will be considered for
+     * every format/class.
+     * Return an empty array if no type is supported for this format.
+     *
+     * @param string $format The format being (de-)serialized from or into
+     *
+     * @return array<class-string|string, bool>|null
+     */
+    /* public function getSupportedTypes(?string $format): ?array; */
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/FormErrorNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/FormErrorNormalizer.php
index a770e254c821a..77f17639ae15a 100644
--- a/src/Symfony/Component/Serializer/Normalizer/FormErrorNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/FormErrorNormalizer.php
@@ -38,6 +38,13 @@ public function normalize(mixed $object, string $format = null, array $context =
         return $data;
     }
 
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            FormInterface::class => false,
+        ];
+    }
+
     public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
     {
         return $data instanceof FormInterface && $data->isSubmitted() && !$data->isValid();
@@ -76,8 +83,13 @@ private function convertFormChildrenToArray(FormInterface $data): array
         return $children;
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
index e08dd5d9ecdaa..4395b43d2e0fd 100644
--- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -36,6 +36,11 @@ class GetSetMethodNormalizer extends AbstractObjectNormalizer
 {
     private static $setterAccessibleCache = [];
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
     /**
      * @param array $context
      */
@@ -52,8 +57,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
         return parent::supportsDenormalization($data, $type, $format) && $this->supports($type);
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
index b81385bc8eb75..8b3985f2bcdcc 100644
--- a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
@@ -38,6 +38,13 @@ public function normalize(mixed $object, string $format = null, array $context =
         return $this->serializer->normalize($object->jsonSerialize(), $format, $context);
     }
 
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            \JsonSerializable::class => __CLASS__ === static::class,
+        ];
+    }
+
     /**
      * @param array $context
      */
@@ -59,8 +66,13 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         throw new LogicException(sprintf('Cannot denormalize with "%s".', \JsonSerializable::class));
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
index a442fc54d5aaf..371e3bb36a618 100644
--- a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
@@ -42,6 +42,17 @@ public function __construct(PropertyNormalizer $normalizer)
         $this->headersProperty = new \ReflectionProperty(Headers::class, 'headers');
     }
 
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            Message::class => true,
+            Headers::class => true,
+            HeaderInterface::class => true,
+            Address::class => true,
+            AbstractPart::class => true,
+        ];
+    }
+
     public function setSerializer(SerializerInterface $serializer): void
     {
         $this->serializer = $serializer;
@@ -101,8 +112,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
         return is_a($type, Message::class, true) || Headers::class === $type || AbstractPart::class === $type;
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
index cb43d78cc7650..eeffe89dd375e 100644
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
@@ -18,6 +18,8 @@
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * @method getSupportedTypes(?string $format): ?array
  */
 interface NormalizerInterface
 {
@@ -41,11 +43,31 @@ public function normalize(mixed $object, string $format = null, array $context =
     /**
      * Checks whether the given class is supported for normalization by this normalizer.
      *
+     * Since Symfony 6.3, this method will only be called if the $data type is
+     * included in the supported types returned by getSupportedTypes().
+     *
+     * @see getSupportedTypes()
+     *
      * @param mixed       $data    Data to normalize
-     * @param string|null $format The format being (de-)serialized from or into
+     * @param string|null $format  The format being (de-)serialized from or into
      * @param array       $context Context options for the normalizer
      *
      * @return bool
      */
     public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */);
+
+    /*
+     * Return the types supported for normalization by this normalizer for this
+     * format associated to a boolean value indicating if the result of
+     * supports*() methods can be cached or if the result can not be cached
+     * because it depends on the context.
+     * Returning null means this normalizer will be considered for
+     * every format/class.
+     * Return an empty array if no type is supported for this format.
+     *
+     * @param string $format The format being (de-)serialized from or into
+     *
+     * @return array<class-string|string, bool>|null
+     */
+    /* public function getSupportedTypes(?string $format): ?array; */
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index 8018cb7a49bb6..780f5fbc80d85 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -47,8 +47,18 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
         $this->objectClassResolver = $objectClassResolver ?? fn ($class) => \is_object($class) ? $class::class : $class;
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php
index 59b8427ab781f..941372489752c 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php
@@ -40,6 +40,13 @@ public function __construct(bool $debug = false, array $defaultContext = [])
         $this->defaultContext = $defaultContext + $this->defaultContext;
     }
 
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            FlattenException::class => __CLASS__ === self::class,
+        ];
+    }
+
     public function normalize(mixed $object, string $format = null, array $context = []): array
     {
         if (!$object instanceof FlattenException) {
@@ -71,8 +78,13 @@ public function supportsNormalization(mixed $data, string $format = null /* , ar
         return $data instanceof FlattenException;
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return true;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
index 3dd734055d92d..76f068c9ed29e 100644
--- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -54,6 +54,11 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
         }
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
     /**
      * @param array $context
      */
@@ -70,8 +75,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
         return parent::supportsDenormalization($data, $type, $format) && $this->supports($type);
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php
index ea86f37542383..e723ec3f2dadb 100644
--- a/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php
@@ -41,6 +41,13 @@ public function __construct(array $defaultContext = [])
         $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
     }
 
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            AbstractUid::class => true,
+        ];
+    }
+
     /**
      * @param AbstractUid $object
      */
@@ -92,8 +99,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
         return is_subclass_of($type, AbstractUid::class, true);
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return __CLASS__ === static::class;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
index 2eff8b77594d4..fb3baa4e37721 100644
--- a/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
@@ -32,6 +32,11 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null)
         $this->propertyAccessor = $propertyAccessor ?? PropertyAccess::createPropertyAccessor();
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
     public function denormalize(mixed $data, string $class, string $format = null, array $context = []): mixed
     {
         $propertyPath = $context[self::UNWRAP_PATH];
@@ -53,8 +58,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
         return \array_key_exists(self::UNWRAP_PATH, $context) && !isset($context['unwrapped']);
     }
 
+    /**
+     * @deprecated since Symfony 6.3, use "getSupportedTypes()" instead
+     */
     public function hasCacheableSupportsMethod(): bool
     {
+        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
+
         return $this->serializer instanceof CacheableSupportsMethodInterface && $this->serializer->hasCacheableSupportsMethod();
     }
 }
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
index ab888592ec7f4..ab0da7b96e281 100644
--- a/src/Symfony/Component/Serializer/Serializer.php
+++ b/src/Symfony/Component/Serializer/Serializer.php
@@ -227,6 +227,11 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         return $normalizer->denormalize($data, $type, $format, $context);
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
     public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
     {
         return null !== $this->getNormalizer($data, $format, $context);
@@ -256,11 +261,35 @@ private function getNormalizer(mixed $data, ?string $format, array $context): ?N
                     continue;
                 }
 
-                if (!$normalizer instanceof CacheableSupportsMethodInterface || !$normalizer->hasCacheableSupportsMethod()) {
+                if (!method_exists($normalizer, 'getSupportedTypes')) {
+                    trigger_deprecation('symfony/serializer', '6.3', '"%s" should implement "NormalizerInterface::getSupportedTypes(?string $format): array".', $normalizer::class);
+
+                    if (!$normalizer instanceof CacheableSupportsMethodInterface || !$normalizer->hasCacheableSupportsMethod()) {
+                        $this->normalizerCache[$format][$type][$k] = false;
+                    } elseif ($normalizer->supportsNormalization($data, $format, $context)) {
+                        $this->normalizerCache[$format][$type][$k] = true;
+                        break;
+                    }
+
+                    continue;
+                }
+
+                if (null === $supportedTypes = $normalizer->getSupportedTypes($format)) {
+                    $this->normalizerCache[$format][$type][$k] = false;
+                    continue;
+                }
+
+                foreach ($supportedTypes as $supportedType => $isCacheable) {
+                    if ($type !== $supportedType && !is_subclass_of($type, $supportedType, true)) {
+                        continue;
+                    }
+
+                    if ($isCacheable && $normalizer->supportsNormalization($data, $format, $context)) {
+                        $this->normalizerCache[$format][$type][$k] = true;
+                        break 2;
+                    }
+
                     $this->normalizerCache[$format][$type][$k] = false;
-                } elseif ($normalizer->supportsNormalization($data, $format, $context)) {
-                    $this->normalizerCache[$format][$type][$k] = true;
-                    break;
                 }
             }
         }
@@ -293,11 +322,35 @@ private function getDenormalizer(mixed $data, string $class, ?string $format, ar
                     continue;
                 }
 
-                if (!$normalizer instanceof CacheableSupportsMethodInterface || !$normalizer->hasCacheableSupportsMethod()) {
+                if (!method_exists($normalizer, 'getSupportedTypes')) {
+                    trigger_deprecation('symfony/serializer', '6.3', '"%s" should implement "DenormalizerInterface::getSupportedTypes(?string $format): array".', $normalizer::class);
+
+                    if (!$normalizer instanceof CacheableSupportsMethodInterface || !$normalizer->hasCacheableSupportsMethod()) {
+                        $this->denormalizerCache[$format][$class][$k] = false;
+                    } elseif ($normalizer->supportsDenormalization(null, $class, $format, $context)) {
+                        $this->denormalizerCache[$format][$class][$k] = true;
+                        break;
+                    }
+
+                    continue;
+                }
+
+                if (null === $supportedTypes = $normalizer->getSupportedTypes($format)) {
+                    $this->denormalizerCache[$format][$class][$k] = false;
+                    continue;
+                }
+
+                foreach ($supportedTypes as $supportedType => $isCacheable) {
+                    if ($class !== $supportedType && !is_subclass_of($class, $supportedType, true)) {
+                        continue;
+                    }
+
+                    if ($isCacheable && $normalizer->supportsDenormalization(null, $class, $format, $context)) {
+                        $this->denormalizerCache[$format][$class][$k] = true;
+                        break;
+                    }
+
                     $this->denormalizerCache[$format][$class][$k] = false;
-                } elseif ($normalizer->supportsDenormalization(null, $class, $format, $context)) {
-                    $this->denormalizerCache[$format][$class][$k] = true;
-                    break;
                 }
             }
         }
diff --git a/src/Symfony/Component/Serializer/Tests/Debug/TraceableNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Debug/TraceableNormalizerTest.php
index 5f78ef81f9def..41e3441ed9be9 100644
--- a/src/Symfony/Component/Serializer/Tests/Debug/TraceableNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Debug/TraceableNormalizerTest.php
@@ -15,14 +15,15 @@
 use Symfony\Component\Serializer\DataCollector\SerializerDataCollector;
 use Symfony\Component\Serializer\Debug\TraceableNormalizer;
 use Symfony\Component\Serializer\Debug\TraceableSerializer;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\Tests\Fixtures\UpcomingDenormalizerInterface as DenormalizerInterface;
+use Symfony\Component\Serializer\Tests\Fixtures\UpcomingNormalizerInterface as NormalizerInterface;
 
 class TraceableNormalizerTest extends TestCase
 {
     public function testForwardsToNormalizer()
     {
         $normalizer = $this->createMock(NormalizerInterface::class);
+        $normalizer->method('getSupportedTypes')->willReturn(['*' => false]);
         $normalizer
             ->expects($this->once())
             ->method('normalize')
@@ -30,6 +31,7 @@ public function testForwardsToNormalizer()
             ->willReturn('normalized');
 
         $denormalizer = $this->createMock(DenormalizerInterface::class);
+        $denormalizer->method('getSupportedTypes')->willReturn(['*' => false]);
         $denormalizer
             ->expects($this->once())
             ->method('denormalize')
@@ -43,7 +45,9 @@ public function testForwardsToNormalizer()
     public function testCollectNormalizationData()
     {
         $normalizer = $this->createMock(NormalizerInterface::class);
+        $normalizer->method('getSupportedTypes')->willReturn(['*' => false]);
         $denormalizer = $this->createMock(DenormalizerInterface::class);
+        $denormalizer->method('getSupportedTypes')->willReturn(['*' => false]);
 
         $dataCollector = $this->createMock(SerializerDataCollector::class);
         $dataCollector
@@ -62,7 +66,9 @@ public function testCollectNormalizationData()
     public function testNotCollectNormalizationDataIfNoDebugTraceId()
     {
         $normalizer = $this->createMock(NormalizerInterface::class);
+        $normalizer->method('getSupportedTypes')->willReturn(['*' => false]);
         $denormalizer = $this->createMock(DenormalizerInterface::class);
+        $denormalizer->method('getSupportedTypes')->willReturn(['*' => false]);
 
         $dataCollector = $this->createMock(SerializerDataCollector::class);
         $dataCollector->expects($this->never())->method('collectNormalization');
@@ -89,9 +95,11 @@ public function testCannotDenormalizeIfNotDenormalizer()
     public function testSupports()
     {
         $normalizer = $this->createMock(NormalizerInterface::class);
+        $normalizer->method('getSupportedTypes')->willReturn(['*' => false]);
         $normalizer->method('supportsNormalization')->willReturn(true);
 
         $denormalizer = $this->createMock(DenormalizerInterface::class);
+        $denormalizer->method('getSupportedTypes')->willReturn(['*' => false]);
         $denormalizer->method('supportsDenormalization')->willReturn(true);
 
         $traceableNormalizer = new TraceableNormalizer($normalizer, new SerializerDataCollector());
diff --git a/src/Symfony/Component/Serializer/Tests/Debug/TraceableSerializerTest.php b/src/Symfony/Component/Serializer/Tests/Debug/TraceableSerializerTest.php
index 00a1ef58a693f..6083624ddeb21 100644
--- a/src/Symfony/Component/Serializer/Tests/Debug/TraceableSerializerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Debug/TraceableSerializerTest.php
@@ -145,6 +145,11 @@ public function normalize(mixed $object, string $format = null, array $context =
         return 'normalized';
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
     public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
     {
         return true;
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
index 11e7bef3e5f17..b98447b54b484 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -942,6 +942,11 @@ private function createMockDateTimeNormalizer(): MockObject&NormalizerInterface
             ->with(new \DateTime($this->exampleDateTimeString), 'xml', [])
             ->willReturn($this->exampleDateTimeString);
 
+        $mock
+            ->expects($this->once())
+            ->method('getSupportedTypes')
+            ->willReturn([\DateTime::class => true]);
+
         $mock
             ->expects($this->once())
             ->method('supportsNormalization')
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php
index 82586062bf94f..20ce0ffcb3d49 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php
@@ -20,6 +20,11 @@
  */
 class AbstractNormalizerDummy extends AbstractNormalizer
 {
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
     public function getAllowedAttributes(string|object $classOrObject, array $context, bool $attributesAsString = false): array|bool
     {
         return parent::getAllowedAttributes($classOrObject, $context, $attributesAsString);
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeNormalizer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeNormalizer.php
index 1492d5d0298ec..367afa8c8650c 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeNormalizer.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeNormalizer.php
@@ -31,6 +31,13 @@ public function normalize($envelope, string $format = null, array $context = [])
         ];
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return [
+            EnvelopeObject::class => true,
+        ];
+    }
+
     public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         return $data instanceof EnvelopeObject;
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessageNormalizer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessageNormalizer.php
index dfdec91b1b613..7dc87de51001c 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessageNormalizer.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessageNormalizer.php
@@ -25,6 +25,13 @@ public function normalize($message, string $format = null, array $context = []):
         ];
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return [
+            EnvelopedMessage::class => true,
+        ];
+    }
+
     public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         return $data instanceof EnvelopedMessage;
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/UpcomingDenormalizerInterface.php b/src/Symfony/Component/Serializer/Tests/Fixtures/UpcomingDenormalizerInterface.php
new file mode 100644
index 0000000000000..2efc12bb6a20a
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/UpcomingDenormalizerInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+
+// @deprecated remove in 7.0 in favor of direct use of the DenormalizerInterface
+interface UpcomingDenormalizerInterface extends DenormalizerInterface
+{
+    public function getSupportedTypes(?string $format): array;
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/UpcomingNormalizerInterface.php b/src/Symfony/Component/Serializer/Tests/Fixtures/UpcomingNormalizerInterface.php
new file mode 100644
index 0000000000000..59972bb5e2b8d
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/UpcomingNormalizerInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+// @deprecated remove in 7.0 in favor of direct use of the NormalizerInterface
+interface UpcomingNormalizerInterface extends NormalizerInterface
+{
+    public function getSupportedTypes(?string $format): array;
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
index 4cc6686586e89..ece903d31949b 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -546,6 +546,11 @@ public function testDenormalizeUsesContextAttributeForPropertiesInConstructorWit
 
 class AbstractObjectNormalizerDummy extends AbstractObjectNormalizer
 {
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
     protected function extractAttributes(object $object, string $format = null, array $context = []): array
     {
         return [];
@@ -651,6 +656,11 @@ public function __construct()
         parent::__construct($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
     protected function extractAttributes(object $object, string $format = null, array $context = []): array
     {
     }
@@ -752,6 +762,11 @@ public function denormalize($data, string $type, string $format = null, array $c
         return null;
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
     public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool
     {
         return true;
@@ -760,6 +775,11 @@ public function supportsDenormalization($data, string $type, string $format = nu
 
 class AbstractObjectNormalizerCollectionDummy extends AbstractObjectNormalizer
 {
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
     protected function extractAttributes(object $object, string $format = null, array $context = []): array
     {
     }
@@ -814,6 +834,11 @@ public function denormalize($data, string $type, string $format = null, array $c
         return $data;
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return $this->serializer->getSupportedTypes($format);
+    }
+
     public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool
     {
         return str_ends_with($type, '[]')
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php
index 391d3374f6305..8f7a75b116135 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php
@@ -14,23 +14,16 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
-use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
+use Symfony\Component\Serializer\Tests\Fixtures\UpcomingDenormalizerInterface as DenormalizerInterface;
 
 class ArrayDenormalizerTest extends TestCase
 {
-    /**
-     * @var ArrayDenormalizer
-     */
-    private $denormalizer;
-
-    /**
-     * @var MockObject&ContextAwareDenormalizerInterface
-     */
-    private $serializer;
+    private ArrayDenormalizer $denormalizer;
+    private MockObject&DenormalizerInterface $serializer;
 
     protected function setUp(): void
     {
-        $this->serializer = $this->createMock(ContextAwareDenormalizerInterface::class);
+        $this->serializer = $this->createMock(DenormalizerInterface::class);
         $this->denormalizer = new ArrayDenormalizer();
         $this->denormalizer->setDenormalizer($this->serializer);
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php b/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php
index ee9f2da0ecc09..547acbca981d9 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php
@@ -24,6 +24,11 @@ public function denormalize($data, string $type, string $format = null, array $c
     {
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
     public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool
     {
         return true;
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php b/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php
index 5d941e7a52915..005bf6c1d9bca 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php
@@ -25,6 +25,11 @@ public function normalize($object, string $format = null, array $context = []):
         return null;
     }
 
+    public function getSupportedTypes(?string $format): ?array
+    {
+        return null;
+    }
+
     public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         return true;
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
index fa06773fbf3e1..331eaa25ea44d 100644
--- a/src/Symfony/Component/Serializer/Tests/SerializerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -42,10 +42,8 @@
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 use Symfony\Component\Serializer\Normalizer\DateTimeZoneNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Component\Serializer\Normalizer\PropertyNormalizer;
 use Symfony\Component\Serializer\Normalizer\UidNormalizer;
@@ -66,22 +64,13 @@
 use Symfony\Component\Serializer\Tests\Fixtures\Php80WithPromotedTypedConstructor;
 use Symfony\Component\Serializer\Tests\Fixtures\TraversableDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\TrueBuiltInDummy;
+use Symfony\Component\Serializer\Tests\Fixtures\UpcomingDenormalizerInterface as DenormalizerInterface;
+use Symfony\Component\Serializer\Tests\Fixtures\UpcomingNormalizerInterface as NormalizerInterface;
 use Symfony\Component\Serializer\Tests\Normalizer\TestDenormalizer;
 use Symfony\Component\Serializer\Tests\Normalizer\TestNormalizer;
 
 class SerializerTest extends TestCase
 {
-    public function testInterface()
-    {
-        $serializer = new Serializer();
-
-        $this->assertInstanceOf(SerializerInterface::class, $serializer);
-        $this->assertInstanceOf(NormalizerInterface::class, $serializer);
-        $this->assertInstanceOf(DenormalizerInterface::class, $serializer);
-        $this->assertInstanceOf(EncoderInterface::class, $serializer);
-        $this->assertInstanceOf(DecoderInterface::class, $serializer);
-    }
-
     public function testItThrowsExceptionOnInvalidNormalizer()
     {
         $this->expectException(InvalidArgumentException::class);
@@ -153,11 +142,13 @@ public function testCustomNormalizerCanNormalizeCollectionsAndScalar()
     public function testNormalizeWithSupportOnData()
     {
         $normalizer1 = $this->createMock(NormalizerInterface::class);
+        $normalizer1->method('getSupportedTypes')->willReturn(['*' => false]);
         $normalizer1->method('supportsNormalization')
             ->willReturnCallback(fn ($data, $format) => isset($data->test));
         $normalizer1->method('normalize')->willReturn('test1');
 
         $normalizer2 = $this->createMock(NormalizerInterface::class);
+        $normalizer2->method('getSupportedTypes')->willReturn(['*' => false]);
         $normalizer2->method('supportsNormalization')
             ->willReturn(true);
         $normalizer2->method('normalize')->willReturn('test2');
@@ -174,11 +165,13 @@ public function testNormalizeWithSupportOnData()
     public function testDenormalizeWithSupportOnData()
     {
         $denormalizer1 = $this->createMock(DenormalizerInterface::class);
+        $denormalizer1->method('getSupportedTypes')->willReturn(['*' => false]);
         $denormalizer1->method('supportsDenormalization')
             ->willReturnCallback(fn ($data, $type, $format) => isset($data['test1']));
         $denormalizer1->method('denormalize')->willReturn('test1');
 
         $denormalizer2 = $this->createMock(DenormalizerInterface::class);
+        $denormalizer2->method('getSupportedTypes')->willReturn(['*' => false]);
         $denormalizer2->method('supportsDenormalization')
             ->willReturn(true);
         $denormalizer2->method('denormalize')->willReturn('test2');
@@ -370,8 +363,7 @@ public function testNormalizerAware()
     {
         $normalizerAware = $this->createMock(NormalizerAwareNormalizer::class);
         $normalizerAware->expects($this->once())
-            ->method('setNormalizer')
-            ->with($this->isInstanceOf(NormalizerInterface::class));
+            ->method('setNormalizer');
 
         new Serializer([$normalizerAware]);
     }
@@ -380,8 +372,7 @@ public function testDenormalizerAware()
     {
         $denormalizerAware = $this->createMock(DenormalizerAwareDenormalizer::class);
         $denormalizerAware->expects($this->once())
-            ->method('setDenormalizer')
-            ->with($this->isInstanceOf(DenormalizerInterface::class));
+            ->method('setDenormalizer');
 
         new Serializer([$denormalizerAware]);
     }
@@ -1235,6 +1226,76 @@ public static function provideCollectDenormalizationErrors()
             [new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()))],
         ];
     }
+
+    public function testSerializerUsesSupportedTypesMethod()
+    {
+        $neverCalledNormalizer = $this->createMock(DummyNormalizer::class);
+        $neverCalledNormalizer
+            // once for normalization, once for denormalization
+            ->expects($this->exactly(2))
+            ->method('getSupportedTypes')
+            ->willReturn([
+                Foo::class => true,
+                Bar::class => false,
+            ]);
+
+        $supportedAndCachedNormalizer = $this->createMock(DummyNormalizer::class);
+        $supportedAndCachedNormalizer
+            // once for normalization, once for denormalization
+            ->expects($this->exactly(2))
+            ->method('getSupportedTypes')
+            ->willReturn([
+                Model::class => true,
+            ]);
+
+        $serializer = new Serializer(
+            [
+                $neverCalledNormalizer,
+                $supportedAndCachedNormalizer,
+                new ObjectNormalizer(),
+            ],
+            ['json' => new JsonEncoder()]
+        );
+
+        // Normalization process
+        $neverCalledNormalizer
+            ->expects($this->never())
+            ->method('supportsNormalization');
+        $neverCalledNormalizer
+            ->expects($this->never())
+            ->method('normalize');
+
+        $supportedAndCachedNormalizer
+            ->expects($this->once())
+            ->method('supportsNormalization')
+            ->willReturn(true);
+        $supportedAndCachedNormalizer
+            ->expects($this->exactly(2))
+            ->method('normalize')
+            ->willReturn(['foo' => 'bar']);
+
+        $serializer->normalize(new Model(), 'json');
+        $serializer->normalize(new Model(), 'json');
+
+        // Denormalization pass
+        $neverCalledNormalizer
+            ->expects($this->never())
+            ->method('supportsDenormalization');
+        $neverCalledNormalizer
+            ->expects($this->never())
+            ->method('denormalize');
+        $supportedAndCachedNormalizer
+            ->expects($this->once())
+            ->method('supportsDenormalization')
+            ->willReturn(true);
+        $supportedAndCachedNormalizer
+            ->expects($this->exactly(2))
+            ->method('denormalize')
+            ->willReturn(new Model());
+
+        $serializer->denormalize('foo', Model::class, 'json');
+        $serializer->denormalize('foo', Model::class, 'json');
+    }
 }
 
 class Model
@@ -1389,6 +1450,11 @@ public function getIterator(): \ArrayIterator
     }
 }
 
+abstract class DummyNormalizer implements NormalizerInterface, DenormalizerInterface
+{
+    abstract public function getSupportedTypes(?string $format): array;
+}
+
 interface NormalizerAwareNormalizer extends NormalizerInterface, NormalizerAwareInterface
 {
 }

From e5af24a0ee4fdb4dea9f1ac5ba34f25df0ac5c3c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 9 Mar 2023 11:03:40 +0100
Subject: [PATCH 277/475] [Serializer] Add wildcard support to
 getSupportedTypes()

---
 .github/expected-missing-return-types.diff    | 54 ++++++++-----------
 .../Serializer/Debug/TraceableNormalizer.php  |  7 ++-
 .../Serializer/Debug/TraceableSerializer.php  | 13 ++---
 .../Normalizer/ArrayDenormalizer.php          | 13 ++++-
 .../ConstraintViolationListNormalizer.php     |  4 +-
 .../Normalizer/CustomNormalizer.php           |  2 +-
 .../Normalizer/DataUriNormalizer.php          |  8 +--
 .../Normalizer/DateIntervalNormalizer.php     |  2 +-
 .../Normalizer/DateTimeNormalizer.php         |  8 +--
 .../Normalizer/DateTimeZoneNormalizer.php     |  2 +-
 .../Normalizer/DenormalizerInterface.php      | 25 ++++-----
 .../Normalizer/GetSetMethodNormalizer.php     |  4 +-
 .../Normalizer/JsonSerializableNormalizer.php |  2 +-
 .../Normalizer/MimeMessageNormalizer.php      | 12 +++--
 .../Normalizer/NormalizerInterface.php        | 25 ++++-----
 .../Normalizer/ObjectNormalizer.php           |  4 +-
 .../Normalizer/ProblemNormalizer.php          |  2 +-
 .../Normalizer/PropertyNormalizer.php         |  4 +-
 .../Normalizer/UnwrappingDenormalizer.php     |  4 +-
 .../Component/Serializer/Serializer.php       | 50 ++++++++++-------
 .../Tests/Debug/TraceableSerializerTest.php   |  4 +-
 .../Fixtures/AbstractNormalizerDummy.php      |  4 +-
 .../Tests/Fixtures/EnvelopeNormalizer.php     |  2 +-
 .../Fixtures/EnvelopedMessageNormalizer.php   |  2 +-
 .../AbstractObjectNormalizerTest.php          | 18 +++----
 .../Tests/Normalizer/TestDenormalizer.php     |  4 +-
 .../Tests/Normalizer/TestNormalizer.php       |  4 +-
 27 files changed, 154 insertions(+), 129 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index a3ee92a47b773..2a605edc61415 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -8130,6 +8130,7 @@ index 1924b1ddb0..62c58c8e8b 100644
          $annotatedClasses = [];
 diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
 index dff3e248ae..381db9aa8f 100644
+index 6e00840c7e..8e69c81c23 100644
 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
 +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
 @@ -34,5 +34,5 @@ class ControllerArgumentValueResolverPass implements CompilerPassInterface
@@ -11254,24 +11255,24 @@ index fc6336ebdb..e13a834930 100644
      {
          if (1 > \func_num_args()) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
-index 52e985815b..e7d0493152 100644
+index 7d138b0b26..03e28f9d20 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
-@@ -210,5 +210,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
+@@ -215,5 +215,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
       * @throws LogicException if the 'allow_extra_attributes' context variable is false and no class metadata factory is provided
       */
 -    protected function getAllowedAttributes(string|object $classOrObject, array $context, bool $attributesAsString = false)
 +    protected function getAllowedAttributes(string|object $classOrObject, array $context, bool $attributesAsString = false): array|bool
      {
          $allowExtraAttributes = $context[self::ALLOW_EXTRA_ATTRIBUTES] ?? $this->defaultContext[self::ALLOW_EXTRA_ATTRIBUTES];
-@@ -260,5 +260,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
+@@ -265,5 +265,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
       * @return bool
       */
 -    protected function isAllowedAttribute(object|string $classOrObject, string $attribute, string $format = null, array $context = [])
 +    protected function isAllowedAttribute(object|string $classOrObject, string $attribute, string $format = null, array $context = []): bool
      {
          $ignoredAttributes = $context[self::IGNORED_ATTRIBUTES] ?? $this->defaultContext[self::IGNORED_ATTRIBUTES];
-@@ -311,5 +311,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
+@@ -316,5 +316,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
       * @throws MissingConstructorArgumentException
       */
 -    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null)
@@ -11279,7 +11280,7 @@ index 52e985815b..e7d0493152 100644
      {
          if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
-index a02a46b941..aedfd67c2e 100644
+index 75fe3a5cb1..a28dd40568 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 @@ -139,10 +139,10 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
@@ -11321,46 +11322,36 @@ index a02a46b941..aedfd67c2e 100644
 -    public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */)
 +    public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */): bool
      {
-         return class_exists($type) || (interface_exists($type, false) && $this->classDiscriminatorResolver && null !== $this->classDiscriminatorResolver->getMappingForClass($type));
+         return class_exists($type) || (interface_exists($type, false) && null !== $this->classDiscriminatorResolver?->getMappingForClass($type));
      }
  
 -    public function denormalize(mixed $data, string $type, string $format = null, array $context = [])
 +    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
      {
          if (!isset($context['cache_key'])) {
-diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareTrait.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareTrait.php
-index c5cc86ecf6..c65534fafb 100644
---- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareTrait.php
-+++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareTrait.php
-@@ -25,5 +25,5 @@ trait DenormalizerAwareTrait
-      * @return void
-      */
--    public function setDenormalizer(DenormalizerInterface $denormalizer)
-+    public function setDenormalizer(DenormalizerInterface $denormalizer): void
-     {
-         $this->denormalizer = $denormalizer;
 diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
-index 1786d6fff1..04a2e62ed2 100644
+index 1d83b2da11..1c632f42bf 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
-@@ -45,5 +45,5 @@ interface DenormalizerInterface
+@@ -47,5 +47,5 @@ interface DenormalizerInterface
       * @throws ExceptionInterface       Occurs for all the other cases of errors
       */
 -    public function denormalize(mixed $data, string $type, string $format = null, array $context = []);
 +    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed;
  
      /**
-@@ -57,4 +57,4 @@ interface DenormalizerInterface
+@@ -64,5 +64,5 @@ interface DenormalizerInterface
       * @return bool
       */
 -    public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */);
 +    public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */): bool;
- }
+ 
+     /**
 diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
-index e08dd5d9ec..cc282ae4bb 100644
+index 2719c8b52c..1112f7f3cc 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
-@@ -138,5 +138,5 @@ class GetSetMethodNormalizer extends AbstractObjectNormalizer
+@@ -148,5 +148,5 @@ class GetSetMethodNormalizer extends AbstractObjectNormalizer
       * @return void
       */
 -    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
@@ -
341A
11379,27 +11370,28 @@ index 40a4fa0e8c..a1e2749aae 100644
      {
          $this->normalizer = $normalizer;
 diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
-index cb43d78cc7..d215ffe997 100644
+index d6d0707ff5..9953ad3005 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
-@@ -37,5 +37,5 @@ interface NormalizerInterface
+@@ -39,5 +39,5 @@ interface NormalizerInterface
       * @throws ExceptionInterface         Occurs for all the other cases of errors
       */
 -    public function normalize(mixed $object, string $format = null, array $context = []);
 +    public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null;
  
      /**
-@@ -48,4 +48,4 @@ interface NormalizerInterface
+@@ -55,5 +55,5 @@ interface NormalizerInterface
       * @return bool
       */
 -    public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */);
 +    public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */): bool;
- }
+ 
+     /**
 diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
-index 8018cb7a49..aa06b9c50b 100644
+index 140e89c6a1..f77348252b 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
-@@ -133,5 +133,5 @@ class ObjectNormalizer extends AbstractObjectNormalizer
+@@ -143,5 +143,5 @@ class ObjectNormalizer extends AbstractObjectNormalizer
       * @return void
       */
 -    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
@@ -11407,10 +11399,10 @@ index 8018cb7a49..aa06b9c50b 100644
      {
          try {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
-index 3dd734055d..cbc0e86d27 100644
+index 645ba74290..d960bf4b20 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
-@@ -175,5 +175,5 @@ class PropertyNormalizer extends AbstractObjectNormalizer
+@@ -185,5 +185,5 @@ class PropertyNormalizer extends AbstractObjectNormalizer
       * @return void
       */
 -    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
diff --git a/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php b/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php
index 8a00056f1a864..d4cf6fcbd2496 100644
--- a/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php
+++ b/src/Symfony/Component/Serializer/Debug/TraceableNormalizer.php
@@ -33,13 +33,16 @@ public function __construct(
         private NormalizerInterface|DenormalizerInterface $normalizer,
         private SerializerDataCollector $dataCollector,
     ) {
+        if (!method_exists($normalizer, 'getSupportedTypes')) {
+            trigger_deprecation('symfony/serializer', '6.3', 'Not implementing the "NormalizerInterface::getSupportedTypes()" in "%s" is deprecated.', get_debug_type($normalizer));
+        }
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
         // @deprecated remove condition in 7.0
         if (!method_exists($this->normalizer, 'getSupportedTypes')) {
-            return null;
+            return ['*' => $this->normalizer instanceof CacheableSupportsMethodInterface && $this->normalizer->hasCacheableSupportsMethod()];
         }
 
         return $this->normalizer->getSupportedTypes($format);
diff --git a/src/Symfony/Component/Serializer/Debug/TraceableSerializer.php b/src/Symfony/Component/Serializer/Debug/TraceableSerializer.php
index 7aa1cb01fa9e1..2a8e96c7af833 100644
--- a/src/Symfony/Component/Serializer/Debug/TraceableSerializer.php
+++ b/src/Symfony/Component/Serializer/Debug/TraceableSerializer.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Serializer\DataCollector\SerializerDataCollector;
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
+use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
@@ -29,13 +30,13 @@ class TraceableSerializer implements SerializerInterface, NormalizerInterface, D
 {
     public const DEBUG_TRACE_ID = 'debug_trace_id';
 
-    /**
-     * @param SerializerInterface&NormalizerInterface&DenormalizerInterface&EncoderInterface&DecoderInterface $serializer
-     */
     public function __construct(
-        private SerializerInterface $serializer,
+        private SerializerInterface&NormalizerInterface&DenormalizerInterface&EncoderInterface&DecoderInterface $serializer,
         private SerializerDataCollector $dataCollector,
     ) {
+        if (!method_exists($serializer, 'getSupportedTypes')) {
+            trigger_deprecation('symfony/serializer', '6.3', 'Not implementing the "NormalizerInterface::getSupportedTypes()" in "%s" is deprecated.', get_debug_type($serializer));
+        }
     }
 
     public function serialize(mixed $data, string $format, array $context = []): string
@@ -128,11 +129,11 @@ public function decode(string $data, string $format, array $context = []): mixed
         return $result;
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
         // @deprecated remove condition in 7.0
         if (!method_exists($this->serializer, 'getSupportedTypes')) {
-            return null;
+            return ['*' => $this->serializer instanceof CacheableSupportsMethodInterface && $this->serializer->hasCacheableSupportsMethod()];
         }
 
         return $this->serializer->getSupportedTypes($format);
diff --git a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
index 71ee54fdced01..8b36935081f30 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
@@ -27,11 +27,20 @@ class ArrayDenormalizer implements ContextAwareDenormalizerInterface, Denormaliz
 {
     use DenormalizerAwareTrait;
 
-    public function getSupportedTypes(?string $format): ?array
+    public function setDenormalizer(DenormalizerInterface $denormalizer): void
+    {
+        if (!method_exists($denormalizer, 'getSupportedTypes')) {
+            trigger_deprecation('symfony/serializer', '6.3', 'Not implementing the "DenormalizerInterface::getSupportedTypes()" in "%s" is deprecated.', get_debug_type($denormalizer));
+        }
+
+        $this->denormalizer = $denormalizer;
+    }
+
+    public function getSupportedTypes(?string $format): array
     {
         // @deprecated remove condition in 7.0
         if (!method_exists($this->denormalizer, 'getSupportedTypes')) {
-            return null;
+            return ['*' => $this->denormalizer instanceof CacheableSupportsMethodInterface && $this->denormalizer->hasCacheableSupportsMethod()];
         }
 
         return $this->denormalizer->getSupportedTypes($format);
diff --git a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
index 7d0804c183314..0e23d90b304d4 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
@@ -39,10 +39,10 @@ public function __construct(array $defaultContext = [], NameConverterInterface $
         $this->nameConverter = $nameConverter;
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
         return [
-            ConstraintViolationListInterface::class => __CLASS__ === static::class,
+            ConstraintViolationListInterface::class => __CLASS__ === static::class || $this->hasCacheableSupportsMethod(),
         ];
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
index 97cc865b9744b..4c17c2552a069 100644
--- a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
@@ -25,7 +25,7 @@ class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, Se
     public function getSupportedTypes(?string $format): array
     {
         return [
-            NormalizableInterface::class => __CLASS__ === static::class,
+            NormalizableInterface::class => __CLASS__ === static::class || $this->hasCacheableSupportsMethod(),
         ];
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
index ff5ff258a2d96..9012f6f3aade2 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -47,10 +47,12 @@ public function __construct(MimeTypeGuesserInterface $mimeTypeGuesser = null)
 
     public function getSupportedTypes(?string $format): array
     {
+        $isCacheable = __CLASS__ === static::class || $this->hasCacheableSupportsMethod();
+
         return [
-            \SplFileInfo::class => __CLASS__ === static::class,
-            \SplFileObject::class => __CLASS__ === static::class,
-            File::class => __CLASS__ === static::class,
+            \SplFileInfo::class => $isCacheable,
+            \SplFileObject::class => $isCacheable,
+            File::class => $isCacheable,
         ];
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
index 839eeb65d2e56..616d500e76386 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
@@ -36,7 +36,7 @@ public function __construct(array $defaultContext = [])
     public function getSupportedTypes(?string $format): array
     {
         return [
-            \DateInterval::class => __CLASS__ === static::class,
+            \DateInterval::class => __CLASS__ === static::class || $this->hasCacheableSupportsMethod(),
         ];
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
index 841f4512dd002..2235b1ea504b6 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
@@ -49,10 +49,12 @@ public function setDefaultContext(array $defaultContext): void
 
     public function getSupportedTypes(?string $format): array
     {
+        $isCacheable = __CLASS__ === static::class || $this->hasCacheableSupportsMethod();
+
         return [
-            \DateTimeInterface::class => __CLASS__ === static::class,
-            \DateTimeImmutable::class => __CLASS__ === static::class,
-            \DateTime::class => __CLASS__ === static::class,
+            \DateTimeInterface::class => $isCacheable,
+            \DateTimeImmutable::class => $isCacheable,
+            \DateTime::class => $isCacheable,
         ];
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php
index 24de36121fd45..a7c26f1d490f6 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php
@@ -25,7 +25,7 @@ class DateTimeZoneNormalizer implements NormalizerInterface, DenormalizerInterfa
     public function getSupportedTypes(?string $format): array
     {
         return [
-            \DateTimeZone::class => __CLASS__ === static::class,
+            \DateTimeZone::class => __CLASS__ === static::class || $this->hasCacheableSupportsMethod(),
         ];
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
index 97ae86be2edde..1d83b2da1166d 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
@@ -22,7 +22,7 @@
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
  *
- * @method getSupportedTypes(?string $format): ?array
+ * @method g
F438
etSupportedTypes(?string $format): array
  */
 interface DenormalizerInterface
 {
@@ -65,18 +65,19 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
      */
     public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */);
 
-    /*
-     * Return the types supported for normalization by this denormalizer for
-     * this format associated to a boolean value indicating if the result of
-     * supports*() methods can be cached or if the result can not be cached
-     * because it depends on the context.
-     * Returning null means this denormalizer will be considered for
-     * every format/class.
-     * Return an empty array if no type is supported for this format.
+    /**
+     * Returns the types potentially supported by this denormalizer.
+     *
+     * For each supported formats (if applicable), the supported types should be
+     * returned as keys, and each type should be mapped to a boolean indicating
+     * if the result of supportsDenormalization() can be cached or not
+     * (a result cannot be cached when it depends on the context or on the data.)
      *
-     * @param string $format The format being (de-)serialized from or into
+     * The special type '*' can be used to indicate that the denormalizer might
+     * support any types. A null value means that the denormalizer does not support
+     * the corresponding type.
      *
-     * @return array<class-string|string, bool>|null
+     * @return array<class-string|'*'|string, bool|null>
      */
-    /* public function getSupportedTypes(?string $format): ?array; */
+    /* public function getSupportedTypes(?string $format): array; */
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
index 4395b43d2e0fd..2719c8b52c16e 100644
--- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -36,9 +36,9 @@ class GetSetMethodNormalizer extends AbstractObjectNormalizer
 {
     private static $setterAccessibleCache = [];
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => __CLASS__ === static::class || $this->hasCacheableSupportsMethod()];
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
index 8b3985f2bcdcc..841fca3196537 100644
--- a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
@@ -41,7 +41,7 @@ public function normalize(mixed $object, string $format = null, array $context =
     public function getSupportedTypes(?string $format): array
     {
         return [
-            \JsonSerializable::class => __CLASS__ === static::class,
+            \JsonSerializable::class => __CLASS__ === static::class || $this->hasCacheableSupportsMethod(),
         ];
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
index 371e3bb36a618..74a8b66b10100 100644
--- a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
@@ -44,12 +44,14 @@ public function __construct(PropertyNormalizer $normalizer)
 
     public function getSupportedTypes(?string $format): array
     {
+        $isCacheable = __CLASS__ === static::class || $this->hasCacheableSupportsMethod();
+
         return [
-            Message::class => true,
-            Headers::class => true,
-            HeaderInterface::class => true,
-            Address::class => true,
-            AbstractPart::class => true,
+            Message::class => $isCacheable,
+            Headers::class => $isCacheable,
+            HeaderInterface::class => $isCacheable,
+            Address::class => $isCacheable,
+            AbstractPart::class => $isCacheable,
         ];
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
index eeffe89dd375e..d6d0707ff5ec8 100644
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
@@ -19,7 +19,7 @@
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
  *
- * @method getSupportedTypes(?string $format): ?array
+ * @method getSupportedTypes(?string $format): array
  */
 interface NormalizerInterface
 {
@@ -56,18 +56,19 @@ public function normalize(mixed $object, string $format = null, array $context =
      */
     public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */);
 
-    /*
-     * Return the types supported for normalization by this normalizer for this
-     * format associated to a boolean value indicating if the result of
-     * supports*() methods can be cached or if the result can not be cached
-     * because it depends on the context.
-     * Returning null means this normalizer will be considered for
-     * every format/class.
-     * Return an empty array if no type is supported for this format.
+    /**
+     * Returns the types potentially supported by this normalizer.
+     *
+     * For each supported formats (if applicable), the supported types should be
+     * returned as keys, and each type should be mapped to a boolean indicating
+     * if the result of supportsNormalization() can be cached or not
+     * (a result cannot be cached when it depends on the context or on the data.)
      *
-     * @param string $format The format being (de-)serialized from or into
+     * The special type '*' can be used to indicate that the normalizer might
+     * support any types. A null value means that the normalizer does not support
+     * the corresponding type.
      *
-     * @return array<class-string|string, bool>|null
+     * @return array<class-string|'*'|string, bool|null>
      */
-    /* public function getSupportedTypes(?string $format): ?array; */
+    /* public function getSupportedTypes(?string $format): array; */
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index 780f5fbc80d85..140e89c6a13b1 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -47,9 +47,9 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
         $this->objectClassResolver = $objectClassResolver ?? fn ($class) => \is_object($class) ? $class::class : $class;
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => __CLASS__ === static::class || $this->hasCacheableSupportsMethod()];
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php
index 941372489752c..dc4dadd88baa3 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php
@@ -43,7 +43,7 @@ public function __construct(bool $debug = false, array $defaultContext = [])
     public function getSupportedTypes(?string $format): array
     {
         return [
-            FlattenException::class => __CLASS__ === self::class,
+            FlattenException::class => __CLASS__ === self::class || $this->hasCacheableSupportsMethod(),
         ];
     }
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
index 76f068c9ed29e..645ba74290249 100644
--- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -54,9 +54,9 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
         }
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => __CLASS__ === static::class || $this->hasCacheableSupportsMethod()];
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
index fb3baa4e37721..738ece32e20f9 100644
--- a/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
@@ -32,9 +32,9 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null)
         $this->propertyAccessor = $propertyAccessor ?? PropertyAccess::createPropertyAccessor();
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => false];
     }
 
     public function denormalize(mixed $data, string $class, string $format = null, array $context = []): mixed
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
index ab0da7b96e281..5eb0c5b6b2e2e 100644
--- a/src/Symfony/Component/Serializer/Serializer.php
+++ b/src/Symfony/Component/Serializer/Serializer.php
@@ -227,9 +227,9 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         return $normalizer->denormalize($data, $type, $format, $context);
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => false];
     }
 
     public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
@@ -274,22 +274,28 @@ private function getNormalizer(mixed $data, ?string $format, array $context): ?N
                     continue;
                 }
 
-                if (null === $supportedTypes = $normalizer->getSupportedTypes($format)) {
-                    $this->normalizerCache[$format][$type][$k] = false;
-                    continue;
-                }
+                $supportedTypes = $normalizer->getSupportedTypes($format);
 
                 foreach ($supportedTypes as $supportedType => $isCacheable) {
-                    if ($type !== $supportedType && !is_subclass_of($type, $supportedType, true)) {
+                    if ('*' === $supportedType || $type !== $supportedType && !is_subclass_of($type, $supportedType, true)) {
                         continue;
                     }
 
-                    if ($isCacheable && $normalizer->supportsNormalization($data, $format, $context)) {
-                        $this->normalizerCache[$format][$type][$k] = true;
+                    if (null === $isCacheable) {
+                        unset($supportedTypes['*']);
+                    } elseif ($this->normalizerCache[$format][$type][$k] = $isCacheable && $normalizer->supportsNormalization($data, $format, $context)) {
                         break 2;
                     }
 
-                    $this->normalizerCache[$format][$type][$k] = false;
+                    break;
+                }
+
+                if (null === $isCacheable = $supportedTypes['*'] ?? null) {
+                    continue;
+                }
+
+                if ($this->normalizerCache[$format][$type][$k] ??= $isCacheable && $normalizer->supportsNormalization($data, $format, $context)) {
+                    break;
                 }
             }
         }
@@ -335,22 +341,28 @@ private function getDenormalizer(mixed $data, string $class, ?string $format, ar
                     continue;
                 }
 
-                if (null === $supportedTypes = $normalizer->getSupportedTypes($format)) {
-                    $this->denormalizerCache[$format][$class][$k] = false;
-                    continue;
-                }
+                $supportedTypes = $normalizer->getSupportedTypes($format);
 
                 foreach ($supportedTypes as $supportedType => $isCacheable) {
-                    if ($class !== $supportedType && !is_subclass_of($class, $supportedType, true)) {
+                    if ('*' === $supportedType || $class !== $supportedType && !is_subclass_of($class, $supportedType, true)) {
                         continue;
                     }
 
-                    if ($isCacheable && $normalizer->supportsDenormalization(null, $class, $format, $context)) {
-                        $this->denormalizerCache[$format][$class][$k] = true;
-                        break;
+                    if (null === $isCacheable) {
+                        unset($supportedTypes['*']);
+                    } elseif ($this->denormalizerCache[$format][$class][$k] = $isCacheable && $normalizer->supportsDenormalization(null, $class, $format, $context)) {
+                        break 2;
                     }
 
-                    $this->denormalizerCache[$format][$class][$k] = false;
+                    break;
+                }
+
+                if (null === $isCacheable = $supportedTypes['*'] ?? null) {
+                    continue;
+                }
+
+                if ($this->denormalizerCache[$format][$class][$k] ??= $isCacheable && $normalizer->supportsDenormalization(null, $class, $format, $context)) {
+                    break;
                 }
             }
         }
diff --git a/src/Symfony/Component/Serializer/Tests/Debug/TraceableSerializerTest.php b/src/Symfony/Component/Serializer/Tests/Debug/TraceableSerializerTest.php
index 6083624ddeb21..9cc43d40a9a0b 100644
--- a/src/Symfony/Component/Serializer/Tests/Debug/TraceableSerializerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Debug/TraceableSerializerTest.php
@@ -145,9 +145,9 @@ public function normalize(mixed $object, string $format = null, array $context =
         return 'normalized';
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => false];
     }
 
     public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php
index 20ce0ffcb3d49..9da1fc5f51e11 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/AbstractNormalizerDummy.php
@@ -20,9 +20,9 @@
  */
 class AbstractNormalizerDummy extends AbstractNormalizer
 {
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => false];
     }
 
     public function getAllowedAttributes(string|object $classOrObject, array $context, bool $attributesAsString = false): array|bool
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeNormalizer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeNormalizer.php
index 367afa8c8650c..021c22a04c0ef 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeNormalizer.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopeNormalizer.php
@@ -31,7 +31,7 @@ public function normalize($envelope, string $format = null, array $context = [])
         ];
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
         return [
             EnvelopeObject::class => true,
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessageNormalizer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessageNormalizer.php
index 7dc87de51001c..5d48f4569cb0a 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessageNormalizer.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/EnvelopedMessageNormalizer.php
@@ -25,7 +25,7 @@ public function normalize($message, string $format = null, array $context = []):
         ];
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
         return [
             EnvelopedMessage::class => true,
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
index ece903d31949b..e1f466b2237e7 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -546,9 +546,9 @@ public function testDenormalizeUsesContextAttributeForPropertiesInConstructorWit
 
 class AbstractObjectNormalizerDummy extends AbstractObjectNormalizer
 {
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => false];
     }
 
     protected function extractAttributes(object $object, string $format = null, array $context = []): array
@@ -656,9 +656,9 @@ public function __construct()
         parent::__construct($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => false];
     }
 
     protected function extractAttributes(object $object, string $format = null, array $context = []): array
@@ -762,9 +762,9 @@ public function denormalize($data, string $type, string $format = null, array $c
         return null;
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => false];
     }
 
     public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool
@@ -775,9 +775,9 @@ public function supportsDenormalization($data, string $type, string $format = nu
 
 class AbstractObjectNormalizerCollectionDummy extends AbstractObjectNormalizer
 {
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => false];
     }
 
     protected function extractAttributes(object $object, string $format = null, array $context = []): array
@@ -834,7 +834,7 @@ public function denormalize($data, string $type, string $format = null, array $c
         return $data;
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
         return $this->serializer->getSupportedTypes($format);
     }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php b/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php
index 547acbca981d9..70518c797951d 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php
@@ -24,9 +24,9 @@ public function denormalize($data, string $type, string $format = null, array $c
     {
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => false];
     }
 
     public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php b/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php
index 005bf6c1d9bca..26e5917e72ed5 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php
@@ -25,9 +25,9 @@ public function normalize($object, string $format = null, array $context = []):
         return null;
     }
 
-    public function getSupportedTypes(?string $format): ?array
+    public function getSupportedTypes(?string $format): array
     {
-        return null;
+        return ['*' => false];
     }
 
     public function supportsNormalization($data, string $format = null, array $context = []): bool

From 9d69e4ba2986f94f118e35d7fda34325b1ca3830 Mon Sep 17 00:00:00 2001
From: Alexis Lefebvre <alexislefebvre+github@gmail.com>
Date: Mon, 16 Jan 2023 01:11:25 +0100
Subject: [PATCH 278/475] [DependencyInjection] deprecate the `@required`
 annotation

---
 .../DependencyInjection/CHANGELOG.md          |   1 +
 .../Compiler/AutowireRequiredMethodsPass.php  |   4 +-
 .../AutowireRequiredPropertiesPass.php        |   6 +-
 .../Tests/Compiler/AutowirePassTest.php       |  76 +++++++++-
 .../AutowireRequiredMethodsPassTest.php       |  92 ++++++++++++-
 .../AutowireRequiredPropertiesPassTest.php    |   8 ++
 .../Compiler/ResolveBindingsPassTest.php      |  23 +++-
 .../Tests/ContainerBuilderTest.php            |  24 ++++
 .../Tests/Dumper/PhpDumperTest.php            |  35 ++++-
 .../WitherAnnotationStaticReturnType.php      |  34 +++++
 .../Tests/Fixtures/WitherStaticReturnType.php |   7 +-
 .../Fixtures/includes/autowiring_classes.php  | 130 ++++++++++++++++--
 .../includes/autowiring_classes_74.php        |   1 +
 .../php/services_wither_annotation.php        |  66 +++++++++
 14 files changed, 472 insertions(+), 35 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/WitherAnnotationStaticReturnType.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_annotation.php

diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 61e2c135a1037..59be45c99780d 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -17,6 +17,7 @@ CHANGELOG
  * Add `#[Exclude]` to skip autoregistering a class
  * Add support for autowiring services as closures using `#[AutowireCallable]` or `#[AutowireServiceClosure]`
  * Deprecate `#[MapDecorated]`, use `#[AutowireDecorated]` instead
+ * Deprecate the `@required` annotation, use the `Symfony\Contracts\Service\Attribute\Required` attribute instead
 
 6.2
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
index da2fc5947d938..a3f5199ef20c8 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
@@ -15,7 +15,7 @@
 use Symfony\Contracts\Service\Attribute\Required;
 
 /**
- * Looks for definitions with autowiring enabled and registers their corresponding "@required" methods as setters.
+ * Looks for definitions with autowiring enabled and registers their corresponding "#[Required]" methods as setters.
  *
  * @author Nicolas Grekas <p@tchwork.com>
  */
@@ -57,6 +57,8 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
                 }
                 if (false !== $doc = $r->getDocComment()) {
                     if (false !== stripos($doc, '@required') && preg_match('#(?:^/\*\*|\n\s*+\*)\s*+@required(?:\s|\*/$)#i', $doc)) {
+                        trigger_deprecation('symfony/dependency-injection', '6.3', 'Relying on the "@required" annotation on method "%s::%s()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.', $reflectionMethod->class, $reflectionMethod->name);
+
                         if ($this->isWither($reflectionMethod, $doc)) {
                             $withers[] = [$reflectionMethod->name, [], true];
                         } else {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredPropertiesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredPropertiesPass.php
index d77e9955b004d..0f093bb7fc702 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredPropertiesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredPropertiesPass.php
@@ -17,7 +17,7 @@
 use Symfony\Contracts\Service\Attribute\Required;
 
 /**
- * Looks for definitions with autowiring enabled and registers their corresponding "@required" properties.
+ * Looks for definitions with autowiring enabled and registers their corresponding "#[Required]" properties.
  *
  * @author Sebastien Morel (Plopix) <morel.seb@gmail.com>
  * @author Nicolas Grekas <p@tchwork.com>
@@ -40,11 +40,15 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
             if (!($type = $reflectionProperty->getType()) instanceof \ReflectionNamedType) {
                 continue;
             }
+            $doc = false;
             if (!$reflectionProperty->getAttributes(Required::class)
                 && ((false === $doc = $reflectionProperty->getDocComment()) || false === stripos($doc, '@required') || !preg_match('#(?:^/\*\*|\n\s*+\*)\s*+@required(?:\s|\*/$)#i', $doc))
             ) {
                 continue;
             }
+            if ($doc) {
+                trigger_deprecation('symfony/dependency-injection', '6.3', 'Using the "@required" annotation on property "%s::$%s" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.', $reflectionProperty->class, $reflectionProperty->name);
+            }
             if (\array_key_exists($name = $reflectionProperty->getName(), $properties)) {
                 continue;
             }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index bdf07b10ff077..bd51657278526 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -15,6 +15,7 @@
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Symfony\Bridge\PhpUnit\ClassExistsMock;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\ClassExistenceResource;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
@@ -41,6 +42,8 @@
 
 class AutowirePassTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     public static function setUpBeforeClass(): void
     {
         ClassExistsMock::register(AutowirePass::class);
@@ -695,8 +698,15 @@ public function testOptionalArgsNoRequiredForCoreClasses()
         );
     }
 
-    public function testSetterInjection()
+    /**
+     * @group legacy
+     */
+    public function testSetterInjectionAnnotation()
     {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionAnnotation::setFoo()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionAnnotation::setChildMethodWithoutDocBlock()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionParentAnnotation::setDependencies()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+
         $container = new ContainerBuilder();
         $container->register(Foo::class);
         $container->register(A::class);
@@ -705,7 +715,7 @@ public function testSetterInjection()
 
         // manually configure *one* call, to override autowiring
         $container
-            ->register('setter_injection', SetterInjection::class)
+            ->register('setter_injection', SetterInjectionAnnotation::class)
             ->setAutowired(true)
             ->addMethodCall('setWithCallsConfigured', ['manual_arg1', 'manual_arg2'])
         ;
@@ -717,7 +727,7 @@ public function testSetterInjection()
         $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
 
         $this->assertEquals(
-            ['setWithCallsConfigured', 'setFoo', 'setDependencies', 'setChildMethodWithoutDocBlock'],
+            ['setWithCallsConfigured', 'setFoo', 'setChildMethodWithoutDocBlock', 'setDependencies'],
             array_column($methodCalls, 0)
         );
 
@@ -766,7 +776,7 @@ public function testWithNonExistingSetterAndAutowiring()
         (new AutowirePass())->process($container);
     }
 
-    public function testExplicitMethodInjection()
+    public function testExplicitMethodInjectionAttribute()
     {
         $container = new ContainerBuilder();
         $container->register(Foo::class);
@@ -821,7 +831,33 @@ public function testIgnoreServiceWithClassNotExisting()
         $this->assertTrue($container->hasDefinition('bar'));
     }
 
-    public function testSetterInjectionCollisionThrowsException()
+    /**
+     * @group legacy
+     */
+    public function testSetterInjectionFromAnnotationCollisionThrowsException()
+    {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionCollisionAnnotation::setMultipleInstancesForOneArg()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+
+        $container = new ContainerBuilder();
+
+        $container->register('c1', CollisionA::class);
+        $container->register('c2', CollisionB::class);
+        $aDefinition = $container->register('setter_injection_collision', SetterInjectionCollisionAnnotation::class);
+        $aDefinition->setAutowired(true);
+
+        (new AutowireRequiredMethodsPass())->process($container);
+
+        $pass = new AutowirePass();
+
+        try {
+            $pass->process($container);
+            $this->fail('AutowirePass should have thrown an exception');
+        } catch (AutowiringFailedException $e) {
+            $this->assertSame('Cannot autowire service "setter_injection_collision": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionCollisionAnnotation::setMultipleInstancesForOneArg()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2".', (string) $e->getMessage());
+        }
+    }
+
+    public function testSetterInjectionFromAttributeCollisionThrowsException()
     {
         $container = new ContainerBuilder();
 
@@ -1129,6 +1165,36 @@ public function testErroredServiceLocator()
         $this->assertSame(['Cannot autowire service "some_locator": it has type "Symfony\Component\DependencyInjection\Tests\Compiler\MissingClass" but this class was not found.'], $container->getDefinition('.errored.some_locator.'.MissingClass::class)->getErrors());
     }
 
+    /**
+     * @group legacy
+     */
+    public function testNamedArgumentAliasResolveCollisionsAnnotation()
+    {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionCollisionAnnotation::setMultipleInstancesForOneArg()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+
+        $container = new ContainerBuilder();
+
+        $container->register('c1', CollisionA::class);
+        $container->register('c2', CollisionB::class);
+        $container->setAlias(CollisionInterface::class.' $collision', 'c2');
+        $aDefinition = $container->register('setter_injection_collision', SetterInjectionCollisionAnnotation::class);
+        $aDefinition->setAutowired(true);
+
+        (new AutowireRequiredMethodsPass())->process($container);
+
+        $pass = new AutowirePass();
+
+        $pass->process($container);
+
+        $expected = [
+            [
+                'setMultipleInstancesForOneArg',
+                [new TypedReference(CollisionInterface::class.' $collision', CollisionInterface::class)],
+            ],
+        ];
+        $this->assertEquals($expected, $container->getDefinition('setter_injection_collision')->getMethodCalls());
+    }
+
     public function testNamedArgumentAliasResolveCollisions()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
index 9cedd5e02f249..73f9f62bbad75 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredMethodsPassTest.php
@@ -12,26 +12,37 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\WitherAnnotationStaticReturnType;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\WitherStaticReturnType;
 
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
 
 class AutowireRequiredMethodsPassTest extends TestCase
 {
-    public function testSetterInjection()
+    use ExpectDeprecationTrait;
+
+    /**
+     * @group legacy
+     */
+    public function testSetterInjectionAnnotation()
     {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionAnnotation::setFoo()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionAnnotation::setChildMethodWithoutDocBlock()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionParentAnnotation::setDependencies()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+
         $container = new ContainerBuilder();
-        $container->register(Foo::class);
+        $container->register(FooAnnotation::class);
         $container->register(A::class);
         $container->register(CollisionA::class);
         $container->register(CollisionB::class);
 
         // manually configure *one* call, to override autowiring
         $container
-            ->register('setter_injection', SetterInjection::class)
+            ->register('setter_injection', SetterInjectionAnnotation::class)
             ->setAutowired(true)
             ->addMethodCall('setWithCallsConfigured', ['manual_arg1', 'manual_arg2']);
 
@@ -41,7 +52,7 @@ public function testSetterInjection()
         $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
 
         $this->assertEquals(
-            ['setWithCallsConfigured', 'setFoo', 'setDependencies', 'setChildMethodWithoutDocBlock'],
+            ['setWithCallsConfigured', 'setFoo', 'setChildMethodWithoutDocBlock', 'setDependencies'],
             array_column($methodCalls, 0)
         );
 
@@ -70,7 +81,41 @@ public function testSetterInjectionWithAttribute()
         $this->assertSame([['setFoo', []]], $methodCalls);
     }
 
-    public function testExplicitMethodInjection()
+    /**
+     * @group legacy
+     */
+    // @deprecated since Symfony 6.3, to be removed in 7.0
+    public function testExplicitMethodInjectionAnnotation()
+    {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionAnnotation::setFoo()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionAnnotation::setChildMethodWithoutDocBlock()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionParentAnnotation::setDependencies()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\SetterInjectionParentAnnotation::setWithCallsConfigured()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+
+        $container = new ContainerBuilder();
+        $container->register(FooAnnotation::class);
+        $container->register(A::class);
+        $container->register(CollisionA::class);
+        $container->register(CollisionB::class);
+
+        $container
+            ->register('setter_injection', SetterInjectionAnnotation::class)
+            ->setAutowired(true)
+            ->addMethodCall('notASetter', []);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+
+        $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
+
+        $this->assertEquals(
+            ['notASetter', 'setFoo', 'setChildMethodWithoutDocBlock', 'setDependencies', 'setWithCallsConfigured'],
+            array_column($methodCalls, 0)
+        );
+        $this->assertEquals([], $methodCalls[0][1]);
+    }
+
+    public function testExplicitMethodInjectionAttribute()
     {
         $container = new ContainerBuilder();
         $container->register(Foo::class);
@@ -95,13 +140,19 @@ public function testExplicitMethodInjection()
         $this->assertEquals([], $methodCalls[0][1]);
     }
 
+    /**
+     * @group legacy
+     */
     public function testWitherInjection()
     {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\WitherAnnotation::withFoo1()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\WitherAnnotation::withFoo2()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+
         $container = new ContainerBuilder();
-        $container->register(Foo::class);
+        $container->register(FooAnnotation::class);
 
         $container
-            ->register('wither', Wither::class)
+            ->register('wither', WitherAnnotation::class)
             ->setAutowired(true);
 
         (new ResolveClassPass())->process($container);
@@ -117,6 +168,33 @@ public function testWitherInjection()
         $this->assertSame($expected, $methodCalls);
     }
 
+    /**
+     * @group legacy
+     */
+    public function testWitherAnnotationWithStaticReturnTypeInjection()
+    {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Fixtures\WitherAnnotationStaticReturnType::withFoo()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Fixtures\WitherAnnotationStaticReturnType::setFoo()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+
+        $container = new ContainerBuilder();
+        $container->register(FooAnnotation::class);
+
+        $container
+            ->register('wither', WitherAnnotationStaticReturnType::class)
+            ->setAutowired(true);
+
+        (new ResolveClassPass())->process($container);
+        (new AutowireRequiredMethodsPass())->process($container);
+
+        $methodCalls = $container->getDefinition('wither')->getMethodCalls();
+
+        $expected = [
+            ['withFoo', [], true],
+            ['setFoo', []],
+        ];
+        $this->assertSame($expected, $methodCalls);
+    }
+
     public function testWitherWithStaticReturnTypeInjection()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredPropertiesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredPropertiesPassTest.php
index 2cee2e7ed5c35..62e12f9e84cd8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredPropertiesPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredPropertiesPassTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredPropertiesPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -21,8 +22,15 @@
 
 class AutowireRequiredPropertiesPassTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
+    /**
+     * @group legacy
+     */
     public function testInjection()
     {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Using the "@required" annotation on property "Symfony\Component\DependencyInjection\Tests\Compiler\PropertiesInjection::$plop" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+
         $container = new ContainerBuilder();
         $container->register(Bar::class);
         $container->register(A::class);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
index 497acee2f779c..449b60e5bccab 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
@@ -37,6 +38,8 @@
 
 class ResolveBindingsPassTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     public function testProcess()
     {
         $container = new ContainerBuilder();
@@ -143,7 +146,25 @@ public function testTypedReferenceSupport()
         $this->assertEquals([new Reference('bar')], $container->getDefinition('def3')->getArguments());
     }
 
-    public function testScalarSetter()
+    /**
+     * @group legacy
+     */
+    public function testScalarSetterAnnotation()
+    {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\ScalarSetterAnnotation::setDefaultLocale()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+
+        $container = new ContainerBuilder();
+
+        $definition = $container->autowire('foo', ScalarSetterAnnotation::class);
+        $definition->setBindings(['$defaultLocale' => 'fr']);
+
+        (new AutowireRequiredMethodsPass())->process($container);
+        (new ResolveBindingsPass())->process($container);
+
+        $this->assertEquals([['setDefaultLocale', ['fr']]], $definition->getMethodCalls());
+    }
+
+    public function testScalarSetterAttribute()
     {
         $container = new ContainerBuilder();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index f3d0bb270cb19..4ec0624b86288 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -48,6 +48,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
+use Symfony\Component\DependencyInjection\Tests\Compiler\FooAnnotation;
 use Symfony\Component\DependencyInjection\Tests\Compiler\Wither;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
@@ -55,6 +56,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\ScalarFactory;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\SimilarArgumentsDummy;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\StringBackedEnum;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\WitherAnnotationStaticReturnType;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\WitherStaticReturnType;
 use Symfony\Component\DependencyInjection\TypedReference;
 use Symfony\Component\ExpressionLanguage\Expression;
@@ -1832,6 +1834,28 @@ public function testLazyWither()
         $this->assertInstanceOf(Wither::class, $wither->withFoo1($wither->foo));
     }
 
+    /**
+     * @group legacy
+     */
+    public function testWitherAnnotationWithStaticReturnType()
+    {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Fixtures\WitherAnnotationStaticReturnType::withFoo()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Fixtures\WitherAnnotationStaticReturnType::setFoo()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+
+        $container = new ContainerBuilder();
+        $container->register(FooAnnotation::class);
+
+        $container
+            ->register('wither', WitherAnnotationStaticReturnType::class)
+            ->setPublic(true)
+            ->setAutowired(true);
+
+        $container->compile();
+
+        $wither = $container->get('wither');
+        $this->assertInstanceOf(FooAnnotation::class, $wither->foo);
+    }
+
     public function testWitherWithStaticReturnType()
     {
         $container = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 5e313cad403c9..1cc9d514fc37a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -44,7 +44,9 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
+use Symfony\Component\DependencyInjection\Tests\Compiler\FooAnnotation;
 use Symfony\Component\DependencyInjection\Tests\Compiler\Wither;
+use Symfony\Component\DependencyInjection\Tests\Compiler\WitherAnnotation;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum;
@@ -1447,7 +1449,38 @@ public function testAliasCanBeFoundInTheDumpedContainerWhenBothTheAliasAndTheSer
         $this->assertContains('bar', $service_ids);
     }
 
-    public function testWither()
+    /**
+     * @group legacy
+     */
+    public function testWitherAnnotation()
+    {
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\FooAnnotation::cloneFoo()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\WitherAnnotation::setFoo()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\WitherAnnotation::withFoo1()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+        $this->expectDeprecation('Since symfony/dependency-injection 6.3: Relying on the "@required" annotation on method "Symfony\Component\DependencyInjection\Tests\Compiler\WitherAnnotation::withFoo2()" is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
+
+        $container = new ContainerBuilder();
+        $container->register(FooAnnotation::class)
+            ->setAutowired(true);
+
+        $container
+            ->register('wither', WitherAnnotation::class)
+            ->setPublic(true)
+            ->setAutowired(true);
+
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        $dump = $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Service_Wither_Annotation']);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_wither_annotation.php', $dump);
+        eval('?>'.$dump);
+
+        $container = new \Symfony_DI_PhpDumper_Service_Wither_Annotation();
+
+        $wither = $container->get('wither');
+        $this->assertInstanceOf(FooAnnotation::class, $wither->foo);
+    }
+
+    public function testWitherAttribute()
     {
         $container = new ContainerBuilder();
         $container->register(Foo::class)
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/WitherAnnotationStaticReturnType.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/WitherAnnotationStaticReturnType.php
new file mode 100644
index 0000000000000..14b76d3b202f2
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/WitherAnnotationStaticReturnType.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\Tests\Compiler\FooAnnotation;
+
+// @deprecated since Symfony 6.3, to be removed in 7.0
+class WitherAnnotationStaticReturnType
+{
+    public $foo;
+
+    /**
+     * @required
+     */
+    public function withFoo(FooAnnotation $foo): static
+    {
+        $new = clone $this;
+        $new->foo = $foo;
+
+        return $new;
+    }
+
+    /**
+     * @required
+     *
+     * @return $this
+     */
+    public function setFoo(FooAnnotation $foo): static
+    {
+        $this->foo = $foo;
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/WitherStaticReturnType.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/WitherStaticReturnType.php
index 1236b75dfad24..60063cceb152a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/WitherStaticReturnType.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/WitherStaticReturnType.php
@@ -3,14 +3,13 @@
 namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
 
 use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
+use Symfony\Contracts\Service\Attribute\Required;
 
 class WitherStaticReturnType
 {
     public $foo;
 
-    /**
-     * @required
-     */
+    #[Required]
     public function withFoo(Foo $foo): static
     {
         $new = clone $this;
@@ -20,9 +19,9 @@ public function withFoo(Foo $foo): static
     }
 
     /**
-     * @required
      * @return $this
      */
+    #[Required]
     public function setFoo(Foo $foo): static
     {
         $this->foo = $foo;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
index 87f5ab65a1277..70c46ecb4fe64 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -3,6 +3,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Contracts\Service\Attribute\Required;
 
 require __DIR__.'/uniontype_classes.php';
 require __DIR__.'/autowiring_classes_80.php';
@@ -11,7 +12,8 @@
     require __DIR__.'/compositetype_classes.php';
 }
 
-class Foo
+// @deprecated since Symfony 6.3, to be removed in 7.0
+class FooAnnotation
 {
     /**
      * @required
@@ -22,6 +24,15 @@ public function cloneFoo(): static
     }
 }
 
+class Foo
+{
+    #[Required]
+    public function cloneFoo(): static
+    {
+        return clone $this;
+    }
+}
+
 class Bar
 {
     public function __construct(Foo $foo)
@@ -225,7 +236,8 @@ public function __construct($foo, Bar $bar, $baz)
     }
 }
 
-class SetterInjectionCollision
+// @deprecated since Symfony 6.3, to be removed in 7.0
+class SetterInjectionCollisionAnnotation
 {
     /**
      * @required
@@ -238,8 +250,21 @@ public function setMultipleInstancesForOneArg(CollisionInterface $collision)
     }
 }
 
-class SetterInjection extends SetterInjectionParent
+class SetterInjectionCollision
+{
+    #[Required]
+    public function setMultipleInstancesForOneArg(CollisionInterface $collision)
+    {
+        // The CollisionInterface cannot be autowired - there are multiple
+
+        // should throw an exception
+    }
+}
+
+// @deprecated since Symfony 6.3, to be removed in 7.0
+class SetterInjectionAnnotation extends SetterInjectionParentAnnotation
 {
+
     /**
      * @required
      */
@@ -248,6 +273,27 @@ public function setFoo(Foo $foo)
         // should be called
     }
 
+    public function notASetter(A $a)
+    {
+        // should be called only when explicitly specified
+    }
+
+    /**
+     * @required*/
+    public function setChildMethodWithoutDocBlock(A $a)
+    {
+    }
+}
+
+// @deprecated since Symfony 6.3, to be removed in 7.0
+class SetterInjection extends SetterInjectionParent
+{
+    #[Required]
+    public function setFoo(Foo $foo)
+    {
+        // should be called
+    }
+
     /** @inheritdoc*/ // <- brackets are missing on purpose
     public function setDependencies(Foo $foo, A $a)
     {
@@ -264,29 +310,24 @@ public function notASetter(A $a)
     {
         // should be called only when explicitly specified
     }
-
-    /**
-     * @required*/
-    public function setChildMethodWithoutDocBlock(A $a)
-    {
-    }
 }
 
-class Wither
+// @deprecated since Symfony 6.3, to be removed in 7.0
+class WitherAnnotation
 {
     public $foo;
 
     /**
      * @required
      */
-    public function setFoo(Foo $foo)
+    public function setFoo(FooAnnotation $foo)
     {
     }
 
     /**
      * @required
      */
-    public function withFoo1(Foo $foo): static
+    public function withFoo1(FooAnnotation $foo): static
     {
         return $this->withFoo2($foo);
     }
@@ -294,6 +335,31 @@ public function withFoo1(Foo $foo): static
     /**
      * @required
      */
+    public function withFoo2(FooAnnotation $foo): static
+    {
+        $new = clone $this;
+        $new->foo = $foo;
+
+        return $new;
+    }
+}
+
+class Wither
+{
+    public $foo;
+
+    #[Required]
+    public function setFoo(Foo $foo)
+    {
+    }
+
+    #[Required]
+    public function withFoo1(Foo $foo): static
+    {
+        return $this->withFoo2($foo);
+    }
+
+    #[Required]
     public function withFoo2(Foo $foo): static
     {
         $new = clone $this;
@@ -303,7 +369,8 @@ public function withFoo2(Foo $foo): static
     }
 }
 
-class SetterInjectionParent
+// @deprecated since Symfony 6.3, to be removed in 7.0
+class SetterInjectionParentAnnotation
 {
     /** @required*/
     public function setDependencies(Foo $foo, A $a)
@@ -327,6 +394,30 @@ public function setChildMethodWithoutDocBlock(A $a)
     }
 }
 
+class SetterInjectionParent
+{
+    #[Required]
+    public function setDependencies(Foo $foo, A $a)
+    {
+        // should be called
+    }
+
+    public function notASetter(A $a)
+    {
+        // #[Required] should be ignored when the child does not add @inheritdoc
+    }
+
+    #[Required]
+    public function setWithCallsConfigured(A $a)
+    {
+    }
+
+    #[Required]
+    public function setChildMethodWithoutDocBlock(A $a)
+    {
+    }
+}
+
 class NotWireable
 {
     public function setNotAutowireable(NotARealClass $n)
@@ -357,7 +448,7 @@ public function setOptionalArgNoAutowireable($other = 'default_val')
     {
     }
 
-    /** @required */
+    #[Required]
     protected function setProtectedMethod(A $a)
     {
     }
@@ -370,7 +461,8 @@ private function __construct()
     }
 }
 
-class ScalarSetter
+// @deprecated since Symfony 6.3, to be removed in 7.0
+class ScalarSetterAnnotation
 {
     /**
      * @required
@@ -380,6 +472,14 @@ public function setDefaultLocale($defaultLocale)
     }
 }
 
+class ScalarSetter
+{
+    #[Required]
+    public function setDefaultLocale($defaultLocale)
+    {
+    }
+}
+
 interface DecoratorInterface
 {
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_74.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_74.php
index 60b7fa7ca0c89..8e354b28219a1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_74.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_74.php
@@ -2,6 +2,7 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
+// @deprecated since Symfony 6.3, to be removed in 7.0
 class PropertiesInjection
 {
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_annotation.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_annotation.php
new file mode 100644
index 0000000000000..a958df8ebdc0d
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_annotation.php
@@ -0,0 +1,66 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class Symfony_DI_PhpDumper_Service_Wither_Annotation extends Container
+{
+    protected $parameters = [];
+    protected readonly \WeakReference $ref;
+
+    public function __construct()
+    {
+        $this->ref = \WeakReference::create($this);
+        $this->services = $this->privates = [];
+        $this->methodMap = [
+            'wither' => 'getWitherService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function compile(): void
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled(): bool
+    {
+        return true;
+    }
+
+    public function getRemovedIds(): array
+    {
+        return [
+            'Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\FooAnnotation' => true,
+        ];
+    }
+
+    /**
+     
10000
* Gets the public 'wither' shared autowired service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Compiler\WitherAnnotation
+     */
+    protected static function getWitherService($container)
+    {
+        $instance = new \Symfony\Component\DependencyInjection\Tests\Compiler\WitherAnnotation();
+
+        $a = new \Symfony\Component\DependencyInjection\Tests\Compiler\FooAnnotation();
+        $a = $a->cloneFoo();
+
+        $instance = $instance->withFoo1($a);
+        $container->services['wither'] = $instance = $instance->withFoo2($a);
+        $instance->setFoo($a);
+
+        return $instance;
+    }
+}

From 63445a56577a59e36bd579bad71f901494def3c0 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 10 Mar 2023 17:25:38 +0100
Subject: [PATCH 279/475] Add missing deprecation comment

---
 .../Bundle/FrameworkBundle/Resources/config/annotations.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php
index 0f561d9d3a571..f043c87ec7d73 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.php
@@ -22,7 +22,7 @@
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set('annotations.reader', AnnotationReader::class)
-            ->call('addGlobalIgnoredName', ['required'])
+            ->call('addGlobalIgnoredName', ['required']) // @deprecated since Symfony 6.3
 
         ->set('annotations.cached_reader', PsrCachedReader::class)
             ->args([

From a785ca500c0b2aa3b0470774e4c4189c06c5d824 Mon Sep 17 00:00:00 2001
From: Allison Guilhem <allison.guilhem@gmail.com>
Date: Fri, 10 Mar 2023 14:36:50 +0100
Subject: [PATCH 280/475] [Lock] fix: add lock schema listener test + fix typo

---
 ...ctrineDbalCacheAdapterSchemaSubscriber.php |  1 -
 ...ineDbalCacheAdapterSchemaListenerTest.php} |  2 +-
 .../LockStoreSchemaListenerTest.php           | 42 +++++++++++++++++++
 ...erTransportDoctrineSchemaListenerTest.php} |  2 +-
 src/Symfony/Bridge/Doctrine/composer.json     | 10 +++--
 5 files changed, 50 insertions(+), 7 deletions(-)
 rename src/Symfony/Bridge/Doctrine/Tests/SchemaListener/{DoctrineDbalCacheAdapterSchemaSubscriberTest.php => DoctrineDbalCacheAdapterSchemaListenerTest.php} (95%)
 create mode 100644 src/Symfony/Bridge/Doctrine/Tests/SchemaListener/LockStoreSchemaListenerTest.php
 rename src/Symfony/Bridge/Doctrine/Tests/SchemaListener/{MessengerTransportDoctrineSchemaSubscriberTest.php => MessengerTransportDoctrineSchemaListenerTest.php} (98%)

diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php
index ce05ce5c38aee..9aa98ebb5b9ba 100644
--- a/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php
+++ b/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php
@@ -13,7 +13,6 @@
 
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Tools\ToolEvents;
-use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter;
 
 trigger_deprecation('symfony/doctrine-bridge', '6.3', 'The "%s" class is deprecated. Use "%s" instead.', DoctrineDbalCacheAdapterSchemaSubscriber::class, DoctrineDbalCacheAdapterSchemaListener::class);
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaListenerTest.php
similarity index 95%
rename from src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php
rename to src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaListenerTest.php
index 4386ff6c51d3e..6cec07f820f42 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaListenerTest.php
@@ -19,7 +19,7 @@
 use Symfony\Bridge\Doctrine\SchemaListener\DoctrineDbalCacheAdapterSchemaListener;
 use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter;
 
-class DoctrineDbalCacheAdapterSchemaSubscriberTest extends TestCase
+class DoctrineDbalCacheAdapterSchemaListenerTest extends TestCase
 {
     public function testPostGenerateSchema()
     {
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/LockStoreSchemaListenerTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/LockStoreSchemaListenerTest.php
new file mode 100644
index 0000000000000..d8d06a5fe0524
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/LockStoreSchemaListenerTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\SchemaListener;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Doctrine\SchemaListener\LockStoreSchemaListener;
+use Symfony\Component\Lock\Store\DoctrineDbalStore;
+
+class LockStoreSchemaListenerTest extends TestCase
+{
+    public function testPostGenerateSchemaLockPdo()
+    {
+        $schema = new Schema();
+        $dbalConnection = $this->createMock(Connection::class);
+        $entityManager = $this->createMock(EntityManagerInterface::class);
+        $entityManager->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($dbalConnection);
+        $event = new GenerateSchemaEventArgs($entityManager, $schema);
+
+        $lockStore = $this->createMock(DoctrineDbalStore::class);
+        $lockStore->expects($this->once())
+            ->method('configureSchema')
+            ->with($schema, fn () => true);
+
+        $subscriber = new LockStoreSchemaListener([$lockStore]);
+        $subscriber->postGenerateSchema($event);
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaSubscriberTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaListenerTest.php
similarity index 98%
rename from src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaSubscriberTest.php
rename to src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaListenerTest.php
index 31d4004d923a5..6c58fec7ce939 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaSubscriberTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaListenerTest.php
@@ -23,7 +23,7 @@
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransport;
 use Symfony\Component\Messenger\Transport\TransportInterface;
 
-class MessengerTransportDoctrineSchemaSubscriberTest extends TestCase
+class MessengerTransportDoctrineSchemaListenerTest extends TestCase
 {
     public function testPostGenerateSchema()
     {
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index b3462366da194..59ee51bcb8b1a 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -25,22 +25,23 @@
         "symfony/service-contracts": "^2.5|^3"
     },
     "require-dev": {
-        "symfony/stopwatch": "^5.4|^6.0",
         "symfony/cache": "^5.4|^6.0",
         "symfony/config": "^5.4|^6.0",
         "symfony/dependency-injection": "^6.2",
+        "symfony/doctrine-messenger": "^5.4|^6.0",
+        "symfony/expression-language": "^5.4|^6.0",
         "symfony/form": "^5.4.21|^6.2.7",
         "symfony/http-kernel": "^6.3",
+        "symfony/lock": "^6.3",
         "symfony/messenger": "^5.4|^6.0",
-        "symfony/doctrine-messenger": "^5.4|^6.0",
         "symfony/property-access": "^5.4|^6.0",
         "symfony/property-info": "^5.4|^6.0",
         "symfony/proxy-manager-bridge": "^5.4|^6.0",
         "symfony/security-core": "^6.0",
-        "symfony/expression-language": "^5.4|^6.0",
+        "symfony/stopwatch": "^5.4|^6.0",
+        "symfony/translation": "^5.4|^6.0",
         "symfony/uid": "^5.4|^6.0",
         "symfony/validator": "^5.4|^6.0",
-        "symfony/translation": "^5.4|^6.0",
         "symfony/var-dumper": "^5.4|^6.0",
         "doctrine/annotations": "^1.13.1|^2",
         "doctrine/collections": "^1.0|^2.0",
@@ -60,6 +61,7 @@
         "symfony/form": "<5.4.21|>=6,<6.2.7",
         "symfony/http-foundation": "<6.3",
         "symfony/http-kernel": "<6.2",
+        "symfony/lock": "<6.3",
         "symfony/messenger": "<5.4",
         "symfony/property-info": "<5.4",
         "symfony/security-bundle": "<5.4",

From 65fc32edaf869a084ccae94fe556ebcee2dfec17 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Fri, 10 Mar 2023 17:37:10 +0100
Subject: [PATCH 281/475] [Tests] Remove `withConsecutive()` calls from tests

---
 .../Tests/Debug/ErrorHandlerConfiguratorTest.php         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Tests/Debug/ErrorHandlerConfiguratorTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/ErrorHandlerConfiguratorTest.php
index a89cee0772d09..2dba9be0ee216 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Debug/ErrorHandlerConfiguratorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Debug/ErrorHandlerConfiguratorTest.php
@@ -47,21 +47,24 @@ public function testLevelsAssignedToLoggers(bool $hasLogger, bool $hasDeprecatio
         if ($hasDeprecationLogger) {
             $deprecationLogger = $this->createMock(LoggerInterface::class);
             if (null !== $expectedDeprecationLoggerLevels) {
-                $expectedCalls[] = [$deprecationLogger, $expectedDeprecationLoggerLevels];
+                $expectedCalls[] = [$deprecationLogger, $expectedDeprecationLoggerLevels, false];
             }
         }
 
         if ($hasLogger) {
             $logger = $this->createMock(LoggerInterface::class);
             if (null !== $expectedLoggerLevels) {
-                $expectedCalls[] = [$logger, $expectedLoggerLevels];
+                $expectedCalls[] = [$logger, $expectedLoggerLevels, false];
             }
         }
 
         $handler
             ->expects($this->exactly(\count($expectedCalls)))
             ->method('setDefaultLogger')
-            ->withConsecutive(...$expectedCalls);
+            ->willReturnCallback(function (...$args) use (&$expectedCalls) {
+                $this->assertSame(array_shift($expectedCalls), $args);
+            })
+        ;
 
         $configurator = new ErrorHandlerConfigurator($logger, $levels, null, true, true, $deprecationLogger);
 

From dc016816f58d913969e60e1c0960ba1af145df4f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 10 Mar 2023 17:51:06 +0100
Subject: [PATCH 282/475] Fix test

---
 .../Lock/Tests/Store/DoctrineDbalStoreTest.php     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php
index 4319e67b397a5..edc483ed32c94 100644
--- a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php
@@ -154,14 +154,15 @@ public function testTableCreationInTransactionNotSupported()
         $conn->expects($this->atLeast(2))
             ->method('executeStatement')
             ->willReturnCallback(function ($sql) use (&$series) {
-                [$constraint, $return] = array_shift($series);
-                $constraint->evaluate($sql);
+                if ([$constraint, $return] = array_shift($series)) {
+                    $constraint->evaluate($sql);
+                }
 
                 if ($return instanceof \Exception) {
                     throw $return;
                 }
 
-                return $return;
+                return $return ?? 1;
             })
         ;
 
@@ -195,14 +196,15 @@ public function testCreatesTableOutsideTransaction()
         $conn->expects($this->atLeast(3))
             ->method('executeStatement')
             ->willReturnCallback(function ($sql) use (&$series) {
-                [$constraint, $return] = array_shift($series);
-                $constraint->evaluate($sql);
+                if ([$constraint, $return] = array_shift($series)) {
+                    $constraint->evaluate($sql);
+                }
 
                 if ($return instanceof \Exception) {
                     throw $return;
                 }
 
-                return $return;
+                return $return ?? 1;
             })
         ;
 

From 1231d75e8a34fd01ae2d688a2c1533f33ff7ff1e Mon Sep 17 00:00:00 2001
From: Victor Prudhomme <contact@victor-prdh.com>
Date: Fri, 10 Mar 2023 23:06:16 +0100
Subject: [PATCH 283/475] [DomCrawler] Improve html5Parser tests

---
 .../Tests/Html5ParserCrawlerTest.php           | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php
index ceba8e7c06e90..58c1db8d6c17d 100644
--- a/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/Html5ParserCrawlerTest.php
@@ -60,6 +60,24 @@ public function testHtml5ParserNotSameAsNativeParserForSpecificHtml()
         $this->assertNotEquals($nativeCrawler->filterXPath('//h1')->text(), $html5Crawler->filterXPath('//h1')->text(), 'Native parser and Html5 parser must be different');
     }
 
+    /**
+     * @testWith [true]
+     *           [false]
+     */
+    public function testHasHtml5Parser(bool $useHtml5Parser)
+    {
+        $crawler = $this->createCrawler(null, null, null, $useHtml5Parser);
+
+        $r = new \ReflectionProperty($crawler::class, 'html5Parser');
+        $html5Parser = $r->getValue($crawler);
+
+        if ($useHtml5Parser) {
+            $this->assertInstanceOf(\Masterminds\HTML5::class, $html5Parser, 'Html5Parser must be a Masterminds\HTML5 instance');
+        } else {
+            $this->assertNull($html5Parser, 'Html5Parser must be null');
+        }
+    }
+
     public static function validHtml5Provider(): iterable
     {
         $html = self::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';

From 5be52b2b771a53aeb563a7c2e63141d31a8fc8ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <kevin@dunglas.fr>
Date: Sun, 6 Nov 2022 21:23:24 +0100
Subject: [PATCH 284/475] [HttpFoundation] Add support for the 103 status code
 (Early Hints) and other 1XX statuses

---
 UPGRADE-6.3.md                                |  5 ++
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  1 +
 .../Controller/AbstractController.php         | 29 ++++++++++
 .../Resources/config/web_link.php             |  8 +++
 .../Controller/AbstractControllerTest.php     | 18 +++++++
 .../Bundle/FrameworkBundle/composer.json      |  2 +-
 .../Component/HttpFoundation/CHANGELOG.md     |  1 +
 .../Component/HttpFoundation/Response.php     | 54 +++++++++++++++++--
 .../HttpFoundation/StreamedResponse.php       | 11 ++--
 .../HttpFoundation/Tests/ResponseTest.php     | 11 ++++
 .../Tests/StreamedResponseTest.php            | 11 ++++
 .../EventListener/AddLinkHeaderListener.php   |  8 ++-
 12 files changed, 146 insertions(+), 13 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 703db80cccdb3..914f9b677eda6 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -57,6 +57,11 @@ FrameworkBundle
 
  * Deprecate the `notifier.logger_notification_listener` service, use the `notifier.notification_logger_listener` service instead
 
+HttpFoundation
+--------------
+
+ * `Response::sendHeaders()` now takes an optional `$statusCode` parameter
+
 HttpKernel
 ----------
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 15f0060b1ca6c..f11f5fe12e25e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -17,6 +17,7 @@ CHANGELOG
  * Allow setting `debug.container.dump` to `false` to disable dumping the container to XML
  * Add `framework.http_cache.skip_response_headers` option
  * Display warmers duration on debug verbosity for `cache:clear` command
+ * Add `AbstractController::sendEarlyHints()` to send HTTP Early Hints
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
index 78351af162d9d..2a2c1983166b0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Controller;
 
 use Psr\Container\ContainerInterface;
+use Psr\Link\EvolvableLinkInterface;
 use Psr\Link\LinkInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface;
@@ -42,6 +43,7 @@
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\WebLink\EventListener\AddLinkHeaderListener;
 use Symfony\Component\WebLink\GenericLinkProvider;
+use Symfony\Component\WebLink\HttpHeaderSerializer;
 use Symfony\Contracts\Service\Attribute\Required;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
 use Twig\Environment;
@@ -92,6 +94,7 @@ public static function getSubscribedServices(): array
             'security.token_storage' => '?'.TokenStorageInterface::class,
             'security.csrf.token_manager' => '?'.CsrfTokenManagerInterface::class,
             'parameter_bag' => '?'.ContainerBagInterface::class,
+            'web_link.http_header_serializer' => '?'.HttpHeaderSerializer::class,
         ];
     }
 
@@ -402,4 +405,30 @@ protected function addLink(Request $request, LinkInterface $link): void
 
         $request->attributes->set('_links', $linkProvider->withLink($link));
     }
+
+    /**
+     * @param LinkInterface[] $links
+     */
+    protected function sendEarlyHints(iterable $links, Response $response = null): Response
+    {
+        if (!$this->container->has('web_link.http_header_serializer')) {
+            throw new \LogicException('You cannot use the "sendEarlyHints" method if the WebLink component is not available. Try running "composer require symfony/web-link".');
+        }
+
+        $response ??= new Response();
+
+        $populatedLinks = [];
+        foreach ($links as $link) {
+            if ($link instanceof EvolvableLinkInterface && !$link->getRels()) {
+                $link = $link->withRel('preload');
+            }
+
+            $populatedLinks[] = $link;
+        }
+
+        $response->headers->set('Link', $this->container->get('web_link.http_header_serializer')->serialize($populatedLinks), false);
+        $response->sendHeaders(103);
+
+        return $response;
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web_link.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web_link.php
index 0b0e79db8c1bf..64345cc997717 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web_link.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web_link.php
@@ -12,10 +12,18 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Component\WebLink\EventListener\AddLinkHeaderListener;
+use Symfony\Component\WebLink\HttpHeaderSerializer;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
+
+        ->set('web_link.http_header_serializer', HttpHeaderSerializer::class)
+        ->alias(HttpHeaderSerializer::class, 'web_link.http_header_serializer')
+
         ->set('web_link.add_link_header_listener', AddLinkHeaderListener::class)
+            ->args([
+                service('web_link.http_header_serializer'),
+            ])
             ->tag('kernel.event_subscriber')
     ;
 };
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
index 66fc713fb8a57..efa9c7becab59 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
@@ -45,6 +45,7 @@
 use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\WebLink\HttpHeaderSerializer;
 use Symfony\Component\WebLink\Link;
 use Twig\Environment;
 
@@ -72,6 +73,7 @@ public function testSubscribedServices()
             'parameter_bag' => '?Symfony\\Component\\DependencyInjection\\ParameterBag\\ContainerBagInterface',
             'security.token_storage' => '?Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorageInterface',
             'security.csrf.token_manager' => '?Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface',
+            'web_link.http_header_serializer' => '?Symfony\\Component\\WebLink\\HttpHeaderSerializer',
         ];
 
         $this->assertEquals($expectedServices, $subscribed, 'Subscribed core services in AbstractController have changed');
@@ -677,4 +679,20 @@ public function testAddLink()
         $this->assertContains($link1, $links);
         $this->assertContains($link2, $links);
     }
+
+    public function testSendEarlyHints()
+    {
+        $container = new Container();
+        $container->set('web_link.http_header_serializer', new HttpHeaderSerializer());
+
+        $controller = $this->createController();
+        $controller->setContainer($container);
+
+        $response = $controller->sendEarlyHints([
+            (new Link(href: '/style.css'))->withAttribute('as', 'stylesheet'),
+            (new Link(href: '/script.js'))->withAttribute('as', 'script'),
+        ]);
+
+        $this->assertSame('</style.css>; rel="preload"; as="stylesheet",</script.js>; rel="preload"; as="script"', $response->headers->get('Link'));
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index d1afd4e9c04cd..cf9aa6345893e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -25,7 +25,7 @@
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/error-handler": "^6.1",
         "symfony/event-dispatcher": "^5.4|^6.0",
-        "symfony/http-foundation": "^6.2",
+        "symfony/http-foundation": "^6.3",
         "symfony/http-kernel": "^6.3",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "^5.4|^6.0",
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index 8e70070fc8723..9b2c0bcf4e4cf 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * Add `ParameterBag::getEnum()`
  * Create migration for session table when pdo handler is used
  * Add support for Relay PHP extension for Redis
+ * The `Response::sendHeaders()` method now takes an optional HTTP status code as parameter, allowing to send informational responses such as Early Hints responses (103 status code)
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
index c141cbc0bb280..888c6ad858aaa 100644
--- a/src/Symfony/Component/HttpFoundation/Response.php
+++ b/src/Symfony/Component/HttpFoundation/Response.php
@@ -211,6 +211,11 @@ class Response
         511 => 'Network Authentication Required',                             // RFC6585
     ];
 
+    /**
+     * Tracks headers already sent in informational responses.
+     */
+    private array $sentHeaders;
+
     /**
      * @param int $status The HTTP status code (200 "OK" by default)
      *
@@ -326,21 +331,54 @@ public function prepare(Request $request): static
     /**
      * Sends HTTP headers.
      *
+     * @param null|positive-int $statusCode The status code to use, override the statusCode property if set and not null
+     *
      * @return $this
      */
-    public function sendHeaders(): static
+    public function sendHeaders(/* int $statusCode = null */): static
     {
         // headers have already been sent by the developer
         if (headers_sent()) {
             return $this;
         }
 
+        $statusCode = \func_num_args() > 0 ? func_get_arg(0) : null;
+        $informationalResponse = $statusCode >= 100 && $statusCode < 200;
+        if ($informationalResponse && !\function_exists('headers_send')) {
+            // skip informational responses if not supported by the SAPI
+            return $this;
+        }
+
         // headers
         foreach ($this->headers->allPreserveCaseWithoutCookies() as $name => $values) {
-            $replace = 0 === strcasecmp($name, 'Content-Type');
-            foreach ($values as $value) {
+            $newValues = $values;
+            $replace = false;
+
+            // As recommended by RFC 8297, PHP automatically copies headers from previous 103 responses, we need to deal with that if headers changed
+            if (103 === $statusCode) {
+                $previousValues = $this->sentHeaders[$name] ?? null;
+                if ($previousValues === $values) {
+                    // Header already sent in a previous response, it will be automatically copied in this response by PHP
+                    continue;
+                }
+
+                $replace = 0 === strcasecmp($name, 'Content-Type');
+
+                if (null !== $previousValues && array_diff($previousValues, $values)) {
+                    header_remove($name);
+                    $previousValues = null;
+                }
+
+                $newValues = null === $previousValues ? $values : array_diff($values, $previousValues);
+            }
+
+            foreach ($newValues  as $value) {
                 header($name.': '.$value, $replace, $this->statusCode);
             }
+
+            if ($informationalResponse) {
+                $this->sentHeaders[$name] = $values;
+            }
         }
 
         // cookies
@@ -348,8 +386,16 @@ public function sendHeaders(): static
             header('Set-Cookie: '.$cookie, false, $this->statusCode);
         }
 
+        if ($informationalResponse) {
+            headers_send($statusCode);
+
+            return $this;
+        }
+
+        $statusCode ??= $this->statusCode;
+
         // status
-        header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);
+        header(sprintf('HTTP/%s %s %s', $this->version, $statusCode, $this->statusText), true, $statusCode);
 
         return $this;
     }
diff --git a/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
index 0bddcdc9bb731..2c8ff15f3650e 100644
--- a/src/Symfony/Component/HttpFoundation/StreamedResponse.php
+++ b/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -59,17 +59,22 @@ public function setCallback(callable $callback): static
     /**
      * This method only sends the headers once.
      *
+     * @param null|positive-int $statusCode The status code to use, override the statusCode property if set and not null
+     *
      * @return $this
      */
-    public function sendHeaders(): static
+    public function sendHeaders(/* int $statusCode = null */): static
     {
         if ($this->headersSent) {
             return $this;
         }
 
-        $this->headersSent = true;
+        $statusCode = \func_num_args() > 0 ? func_get_arg(0) : null;
+        if ($statusCode < 100 || $statusCode >= 200) {
+            $this->headersSent = true;
+        }
 
-        return parent::sendHeaders();
+        return parent::sendHeaders($statusCode);
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
index 7ab060ec19142..bf126489d45aa 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -42,6 +42,17 @@ public function testSendHeaders()
         $this->assertSame($response, $headers);
     }
 
+    public function testSendInformationalResponse()
+    {
+        $response = new Response();
+        $response->sendHeaders(103);
+
+        // Informational responses must not override the main status code
+        $this->assertSame(200, $response->getStatusCode());
+
+        $response->sendHeaders();
+    }
+
     public function testSend()
     {
         $response = new Response();
diff --git a/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
index 1ca1bb92ae377..2a2b7e7318b2e 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
@@ -124,4 +124,15 @@ public function testSetNotModified()
         $string = ob_get_clean();
         $this->assertEmpty($string);
     }
+
+    public function testSendInformationalResponse()
+    {
+        $response = new StreamedResponse();
+        $response->sendHeaders(103);
+
+        // Informational responses must not override the main status code
+        $this->assertSame(200, $response->getStatusCode());
+
+        $response->sendHeaders();
+    }
 }
diff --git a/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php b/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php
index e769591ead767..4e344cd2427cc 100644
--- a/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php
+++ b/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php
@@ -29,11 +29,9 @@ class_exists(HttpHeaderSerializer::class);
  */
 class AddLinkHeaderListener implements EventSubscriberInterface
 {
-    private HttpHeaderSerializer $serializer;
-
-    public function __construct()
-    {
-        $this->serializer = new HttpHeaderSerializer();
+    public function __construct(
+        private readonly HttpHeaderSerializer $serializer = new HttpHeaderSerializer(),
+    ) {
     }
 
     public function onKernelResponse(ResponseEvent $event): void

From 1771262ac931edd80246920aca16ea338fb15f47 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 13 Mar 2023 17:49:27 +0100
Subject: [PATCH 285/475] [Config] Improve performance of GlobResource

---
 .../Config/Resource/GlobResource.php          | 66 +++++++++++--------
 .../Tests/Resource/GlobResourceTest.php       |  2 +-
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
index 78e09d9284992..fc4f5ec3b6e1a 100644
--- a/src/Symfony/Component/Config/Resource/GlobResource.php
+++ b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -100,25 +100,45 @@ public function getIterator(): \Traversable
         if (!file_exists($this->prefix) || (!$this->recursive && '' === $this->pattern)) {
             return;
         }
-        $prefix = str_replace('\\', '/', $this->prefix);
+
+        if (is_file($prefix = str_replace('\\', '/', $this->prefix))) {
+            $prefix = \dirname($prefix);
+            $pattern = basename($prefix).$this->pattern;
+        } else {
+            $pattern = $this->pattern;
+        }
+
+        if (class_exists(Finder::class)) {
+            $regex = Glob::toRegex($pattern);
+            if ($this->recursive) {
+                $regex = substr_replace($regex, '(/|$)', -2, 1);
+            }
+        } else {
+            $regex = null;
+        }
+
+        $prefixLen = \strlen($prefix);
         $paths = null;
 
-        if ('' === $this->pattern && is_file($prefix)) {
-            $paths = [$this->prefix];
-        } elseif (!str_starts_with($this->prefix, 'phar://') && !str_contains($this->pattern, '/**/')) {
-            if ($this->globBrace || !str_contains($this->pattern, '{')) {
-                $paths = glob($this->prefix.$this->pattern, \GLOB_NOSORT | $this->globBrace);
+        if ('' === $this->pattern && is_file($this->prefix)) {
+            $paths = [$this->prefix => null];
+        } elseif (!str_starts_with($this->prefix, 'phar://') && (null !== $regex || !str_contains($this->pattern, '/**/'))) {
+            if (!str_contains($this->pattern, '/**/') && ($this->globBrace || !str_contains($this->pattern, '{'))) {
+                $paths = array_fill_keys(glob($this->prefix.$this->pattern, \GLOB_NOSORT | $this->globBrace), null);
             } elseif (!str_contains($this->pattern, '\\') || !preg_match('/\\\\[,{}]/', $this->pattern)) {
+                $paths = [];
                 foreach ($this->expandGlob($this->pattern) as $p) {
-                    $paths[] = glob($this->prefix.$p, \GLOB_NOSORT);
+                    if (false !== $i = strpos($p, '/**/')) {
+                        $p = substr_replace($p, '/*', $i);
+                    }
+                    $paths += array_fill_keys(glob($this->prefix.$p, \GLOB_NOSORT), false !== $i ? $regex : null);
                 }
-                $paths = array_merge(...$paths);
             }
         }
 
         if (null !== $paths) {
-            natsort($paths);
-            foreach ($paths as $path) {
+            uksort($paths, 'strnatcmp');
+            foreach ($paths as $path => $regex) {
                 if ($this->excludedPrefixes) {
                     $normalizedPath = str_replace('\\', '/', $path);
                     do {
@@ -128,23 +148,25 @@ public function getIterator(): \Traversable
                     } while ($prefix !== $dirPath && $dirPath !== $normalizedPath = \dirname($dirPath));
                 }
 
-                if (is_file($path)) {
+                if (is_file($path) && (null === $regex || preg_match($regex, substr(str_replace('\\', '/', $path), $prefixLen)))) {
                     yield $path => new \SplFileInfo($path);
                 }
                 if (!is_dir($path)) {
                     continue;
                 }
-                if ($this->forExclusion) {
+                if ($this->forExclusion && (null === $regex || preg_match($regex, substr(str_replace('\\', '/', $path), $prefixLen)))) {
                     yield $path => new \SplFileInfo($path);
                     continue;
                 }
-                if (!$this->recursive || isset($this->excludedPrefixes[str_replace('\\', '/', $path)])) {
+                if (!($this->recursive || null !== $regex) || isset($this->excludedPrefixes[str_replace('\\', '/', $path)])) {
                     continue;
                 }
                 $files = iterator_to_array(new \RecursiveIteratorIterator(
                     new \RecursiveCallbackFilterIterator(
                         new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
-                        fn (\SplFileInfo $file, $path) => !isset($this->excludedPrefixes[str_replace('\\', '/', $path)]) && '.' !== $file->getBasename()[0]
+                        fn (\SplFileInfo $file, $path) => !isset($this->excludedPrefixes[$path = str_replace('\\', '/', $path)])
+                            && (null === $regex || $file->isDir() || preg_match($regex, substr($path, $prefixLen)))
+                            && '.' !== $file->getBasename()[0]
                     ),
                     \RecursiveIteratorIterator::LEAVES_ONLY
                 ));
@@ -161,23 +183,9 @@ public function getIterator(): \Traversable
         }
 
         if (!class_exists(Finder::class)) {
-            throw new \LogicException(sprintf('Extended glob pattern "%s" cannot be used as the Finder component is not installed.', $this->pattern));
+            throw new \LogicException('Extended glob patterns cannot be used as the Finder component is not installed, try running "composer require symfony/finder".');
         }
 
-        if (is_file($prefix = $this->prefix)) {
-            $prefix = \dirname($prefix);
-            $pattern = basename($prefix).$this->pattern;
-        } else {
-            $pattern = $this->pattern;
-        }
-
-        $regex = Glob::toRegex($pattern);
-        if ($this->recursive) {
-            $regex = substr_replace($regex, '(/|$)', -2, 1);
-        }
-
-        $prefixLen = \strlen($prefix);
-
         yield from (new Finder())
             ->followLinks()
             ->filter(function (\SplFileInfo $info) use ($regex, $prefixLen, $prefix) {
diff --git a/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php
index 06fefcd6113dd..4d1eb4f1f03ff 100644
--- a/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php
+++ b/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php
@@ -41,7 +41,7 @@ public function testIterator()
 
         $paths = iterator_to_array($resource);
 
-        $file = $dir.\DIRECTORY_SEPARATOR.'Resource'.\DIRECTORY_SEPARATOR.'ConditionalClass.php';
+        $file = $dir.'/Resource'.\DIRECTORY_SEPARATOR.'ConditionalClass.php';
         $this->assertEquals([$file => $file], $paths);
         $this->assertInstanceOf(\SplFileInfo::class, current($paths));
         $this->assertSame($dir, $resource->getPrefix());

From 51d3038d099d68466b45f5444aadde6f2b7262fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kenjy=20Thi=C3=A9bault?= <kenjy.thiebault@gmail.com>
Date: Fri, 10 Mar 2023 22:15:26 +0100
Subject: [PATCH 286/475] [Form] Improve exception for unsubmitted form

---
 src/Symfony/Component/Form/Form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
index 9d6344c8695e6..851d56a46d647 100644
--- a/src/Symfony/Component/Form/Form.php
+++ b/src/Symfony/Component/Form/Form.php
@@ -646,7 +646,7 @@ public function isEmpty(): bool
     public function isValid(): bool
     {
         if (!$this->submitted) {
-            throw new LogicException('Cannot check if an unsubmitted form is valid. Call Form::isSubmitted() before Form::isValid().');
+            throw new LogicException('Cannot check if an unsubmitted form is valid. Call Form::isSubmitted() and ensure that it\'s true before calling Form::isValid().');
         }
 
         if ($this->isDisabled()) {

From b041d064920a479ecbd950f619a32718b4c59ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Mon, 6 Mar 2023 18:35:02 +0100
Subject: [PATCH 287/475] [ErrorHander] Display exception properties in the
 HTML error page

---
 .../Component/ErrorHandler/CHANGELOG.md       |  5 +++++
 .../ErrorRenderer/HtmlErrorRenderer.php       | 19 +++++++++++++++++++
 .../Exception/FlattenException.php            | 14 ++++++++++++++
 .../Resources/assets/css/exception.css        |  6 +++++-
 .../Resources/views/exception.html.php        |  1 -
 .../Resources/views/traces.html.php           |  8 ++++++++
 6 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/ErrorHandler/CHANGELOG.md b/src/Symfony/Component/ErrorHandler/CHANGELOG.md
index 9d2ee803f9bf6..d753991b3a2f9 100644
--- a/src/Symfony/Component/ErrorHandler/CHANGELOG.md
+++ b/src/Symfony/Component/ErrorHandler/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Display exception properties in the HTML error page
+
 6.1
 ---
 
diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
index 8472f0cc20377..95ed8504efcd9 100644
--- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
+++ b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
@@ -17,6 +17,8 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
 
 /**
  * @author Yonel Ceruto <yonelceruto@gmail.com>
@@ -147,6 +149,23 @@ private function renderException(FlattenException $exception, string $debugTempl
         ]);
     }
 
+    private function dumpValue(mixed $value): string
+    {
+        $cloner = new VarCloner();
+        $data = $cloner->cloneVar($value);
+
+        $dumper = new HtmlDumper();
+        $dumper->setTheme('light');
+        $dumper->setOutput($output = fopen('php://memory', 'r+'));
+        $dumper->dump($data);
+
+        $dump = stream_get_contents($output, -1, 0);
+        rewind($output);
+        ftruncate($output, 0);
+
+        return $dump;
+    }
+
     private function formatArgs(array $args): string
     {
         $result = [];
diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
index 461c26812c047..8d1c6575b7d04 100644
--- a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
+++ b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
@@ -36,6 +36,7 @@ class FlattenException
     private string $file;
     private int $line;
     private ?string $asString = null;
+    private array $properties = [];
 
     public static function create(\Exception $exception, int $statusCode = null, array $headers = []): static
     {
@@ -77,6 +78,13 @@ public static function createFromThrowable(\Throwable $exception, int $statusCod
             $e->setPrevious(static::createFromThrowable($previous));
         }
 
+        if ((new \ReflectionClass($exception::class))->isUserDefined()) {
+            $getProperties = \Closure::bind(fn (\Throwable $e) => get_object_vars($e), null, $exception::class);
+            $properties = $getProperties($exception);
+            unset($properties['message'], $properties['code'], $properties['file'], $properties['line']);
+            $e->properties = $properties;
+        }
+
         return $e;
     }
 
@@ -88,6 +96,7 @@ public function toArray(): array
                 'message' => $exception->getMessage(),
                 'class' => $exception->getClass(),
                 'trace' => $exception->getTrace(),
+                'properties' => $exception->getProperties(),
             ];
         }
 
@@ -221,6 +230,11 @@ public function setCode(int|string $code): static
         return $this;
     }
 
+    public function getProperties(): array
+    {
+        return $this->properties;
+    }
+
     public function getPrevious(): ?self
     {
         return $this->previous;
diff --git a/src/Symfony/Component/ErrorHandler/Resources/assets/css/exception.css b/src/Symfony/Component/ErrorHandler/Resources/assets/css/exception.css
index 7cb3206da2055..bcdb8e1482553 100644
--- a/src/Symfony/Component/ErrorHandler/Resources/assets/css/exception.css
+++ b/src/Symfony/Component/ErrorHandler/Resources/assets/css/exception.css
@@ -83,7 +83,7 @@
     --card-label-color: var(--tab-active-color);
 }
 
-html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}
+html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}summary{cursor: pointer}
 
 html {
     /* always display the vertical scrollbar to avoid jumps when toggling contents */
@@ -208,6 +208,10 @@ header .container { display: flex; justify-content: space-between; }
 .exception-message a { border-bottom: 1px solid rgba(255, 255, 255, 0.5); font-size: inherit; text-decoration: none; }
 .exception-message a:hover { border-bottom-color: #ffffff; }
 
+.exception-properties-wrapper { margin: .8em 0; }
+.exception-properties { background: var(--base-0); border: var(--border); box-shadow: 0px 0px 1px rgba(128, 128, 128, .2); }
+.exception-properties pre { margin: 0; padding: 0.2em 0; }
+
 .exception-illustration { flex-basis: 111px; flex-shrink: 0; height: 66px; margin-left: 15px; opacity: .7; }
 
 .trace + .trace { margin-top: 30px; }
diff --git a/src/Symfony/Component/ErrorHandler/Resources/views/exception.html.php b/src/Symfony/Component/ErrorHandler/Resources/views/exception.html.php
index 8468fa76f4b32..31554a468d163 100644
--- a/src/Symfony/Component/ErrorHandler/Resources/views/exception.html.php
+++ b/src/Symfony/Component/ErrorHandler/Resources/views/exception.html.php
@@ -13,7 +13,6 @@
             </h2>
         </div>
     </div>
-
     <div class="exception-message-wrapper">
         <div class="container">
             <h1 class="break-long-words exception-message<?= mb_strlen($exceptionMessage) > 180 ? ' long' : ''; ?>"><?= $this->formatFileFromText(nl2br($exceptionMessage)); ?></h1>
diff --git a/src/Symfony/Component/ErrorHandler/Resources/views/traces.html.php b/src/Symfony/Component/ErrorHandler/Resources/views/traces.html.php
index 38752bc1a892f..fdca8a70e72e2 100644
--- a/src/Symfony/Component/ErrorHandler/Resources/views/traces.html.php
+++ b/src/Symfony/Component/ErrorHandler/Resources/views/traces.html.php
@@ -25,6 +25,14 @@
                     <p class="break-long-words trace-message"><?= $this->escape($exception['message']); ?></p>
                 <?php } ?>
             </div>
+            <?php if ($exception['properties']) { ?>
+                <details class="exception-properties-wrapper">
+                    <summary>Show exception properties</summary>
+                    <div class="exception-properties">
+                        <?= $this->dumpValue($exception['properties']) ?>
+                    </div>
+                </details>
+            <?php } ?>
         </div>
 
         <div id="trace-html-<?= $index; ?>" class="sf-toggle-content">

From e1546590f82dfcdd08f3fb0b7f35ac21bbd3b91f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 14 Mar 2023 16:56:43 +0100
Subject: [PATCH 288/475] [DependencyInjection] Generalize and simplify parsing
 of autowiring attributes

---
 .../Compiler/AutowirePass.php                 | 57 ++++++++-----------
 .../Tests/Compiler/AutowirePassTest.php       |  7 ++-
 .../RegisterServiceSubscribersPassTest.php    |  6 +-
 3 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 82bb84065247c..6cb09ccdfe92f 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -25,7 +25,6 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\TypedReference;
 use Symfony\Component\VarExporter\ProxyHelper;
-use Symfony\Contracts\Service\Attribute\SubscribedService;
 
 /**
  * Inspects existing service definitions and wires the autowired ones using the type hints of their classes.
@@ -106,18 +105,19 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
     private function doProcessValue(mixed $value, bool $isRoot = false): mixed
     {
         if ($value instanceof TypedReference) {
-            if ($attributes = $value->getAttributes()) {
-                $attribute = array_pop($attributes);
-
-                if ($attributes) {
-                    throw new AutowiringFailedException($this->currentId, sprintf('Using multiple attributes with "%s" is not supported.', SubscribedService::class));
+            foreach ($value->getAttributes() as $attribute) {
+                if ($attribute === $v = $this->processValue($attribute)) {
+                    continue;
                 }
-
-                if (!$attribute instanceof Target) {
-                    return $this->processAttribute($attribute, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $value->getInvalidBehavior());
+                if (!$attribute instanceof Autowire || !$v instanceof Reference) {
+                    return $v;
                 }
 
-                $value = new TypedReference($value->getType(), $value->getType(), $value->getInvalidBehavior(), $attribute->name, [$attribute]);
+                $invalidBehavior = ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE !== $v->getInvalidBehavior() ? $v->getInvalidBehavior() : $value->getInvalidBehavior();
+                $value = $v instanceof TypedReference
+                    ? new TypedReference($v, $v->getType(), $invalidBehavior, $v->getName() ?? $value->getName(), array_merge($v->getAttributes(), $value->getAttributes()))
+                    : new TypedReference($v, $value->getType(), $invalidBehavior, $value->getName(), $value->getAttributes());
+                break;
             }
             if ($ref = $this->getAutowiredReference($value, true)) {
                 return $ref;
@@ -173,22 +173,6 @@ private function doProcessValue(mixed $value, bool $isRoot = false): mixed
         return $value;
     }
 
-    private function processAttribute(object $attribute, bool $isOptional = false): mixed
-    {
-        switch (true) {
-            case $attribute instanceof Autowire:
-                if ($isOptional && $attribute->value instanceof Reference) {
-                    return new Reference($attribute->value, ContainerInterface::NULL_ON_INVALID_REFERENCE);
-                }
-                // no break
-            case $attribute instanceof AutowireDecorated:
-            case $attribute instanceof MapDecorated:
-                return $this->processValue($attribute);
-        }
-
-        throw new AutowiringFailedException($this->currentId, sprintf('"%s" is an unsupported attribute.', $attribute::class));
-    }
-
     private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot, bool $checkAttributes): array
     {
         $this->decoratedId = null;
@@ -281,11 +265,15 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
             }
 
             $type = ProxyHelper::exportType($parameter, true);
+            $target = null;
+            $name = Target::parseName($parameter, $target);
+            $target = $target ? [$target] : [];
 
             if ($checkAttributes) {
                 foreach ($parameter->getAttributes(Autowire::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
                     $attribute = $attribute->newInstance();
-                    $value = $this->processAttribute($attribute, $parameter->allowsNull());
+                    $invalidBehavior = $parameter->allowsNull() ? ContainerInterface::NULL_ON_INVALID_REFERENCE : ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE;
+                    $value = $this->processValue(new TypedReference($type ?: '?', $type ?: 'mixed', $invalidBehavior, $name, [$attribute, ...$target]));
 
                     if ($attribute instanceof AutowireCallable || 'Closure' === $type && \is_array($value)) {
                         $value = (new Definition('Closure'))
@@ -299,13 +287,13 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                 }
 
                 foreach ($parameter->getAttributes(AutowireDecorated::class) as $attribute) {
-                    $arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());
+                    $arguments[$index] = $this->processValue($attribute->newInstance());
 
                     continue 2;
                 }
 
                 foreach ($parameter->getAttributes(MapDecorated::class) as $attribute) {
-                    $arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());
+                    $arguments[$index] = $this->processValue($attribute->newInstance());
 
                     continue 2;
                 }
@@ -338,9 +326,8 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                 continue;
             }
 
-            $getValue = function () use ($type, $parameter, $class, $method) {
-                $name = Target::parseName($parameter, $target);
-                if (!$value = $this->getAutowiredReference($ref = new TypedReference($type, $type, ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE, $name, $target ? [$target] : []), false)) {
+            $getValue = function () use ($type, $parameter, $class, $method, $name, $target) {
+                if (!$value = $this->getAutowiredReference($ref = new TypedReference($type, $type, ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE, $name, $target), false)) {
                     $failureMessage = $this->createTypeNotFoundMessageCallback($ref, sprintf('argument "$%s" of method "%s()"', $parameter->name, $class !== $this->currentId ? $class.'::'.$method : $method));
 
                     if ($parameter->isDefaultValueAvailable()) {
@@ -354,7 +341,7 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                 return $value;
             };
 
-            if ($this->decoratedClass && $isDecorated = is_a($this->decoratedClass, $type, true)) {
+            if ($this->decoratedClass && is_a($this->decoratedClass, $type, true)) {
                 if ($this->getPreviousValue) {
                     // The inner service is injected only if there is only 1 argument matching the type of the decorated class
                     // across all arguments of all autowired methods.
@@ -412,7 +399,9 @@ private function getAutowiredReference(TypedReference $reference, bool $filterTy
             $type = implode($m[0], $types);
         }
 
-        if (null !== $name = $reference->getName()) {
+        $name = (array_filter($reference->getAttributes(), static fn ($a) => $a instanceof Target)[0] ?? null)?->name;
+
+        if (null !== $name ??= $reference->getName()) {
             if ($this->container->has($alias = $type.' $'.$name) && !$this->container->findDefinition($alias)->isAbstract()) {
                 return new TypedReference($alias, $type, $reference->getInvalidBehavior());
             }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index bd51657278526..50ffdf7ae2d9a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Config\Resource\ClassExistenceResource;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\DependencyInjection\Compiler\AutowireAsDecoratorPass;
 use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
 use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
@@ -1302,16 +1303,16 @@ public function testAutowireAttribute()
         $definition = $container->getDefinition(AutowireAttribute::class);
 
         $this->assertCount(10, $definition->getArguments());
-        $this->assertEquals(new Reference('some.id'), $definition->getArgument(0));
+        $this->assertEquals(new TypedReference('some.id', 'stdClass', attributes: [new Autowire(service: 'some.id')]), $definition->getArgument(0));
         $this->assertEquals(new Expression("parameter('some.parameter')"), $definition->getArgument(1));
         $this->assertSame('foo/bar', $definition->getArgument(2));
         $this->assertNull($definition->getArgument(3));
-        $this->assertEquals(new Reference('some.id'), $definition->getArgument(4));
+        $this->assertEquals(new TypedReference('some.id', 'stdClass', attributes: [new Autowire(service: 'some.id')]), $definition->getArgument(4));
         $this->assertEquals(new Expression("parameter('some.parameter')"), $definition->getArgument(5));
         $this->assertSame('bar', $definition->getArgument(6));
         $this->assertSame('@bar', $definition->getArgument(7));
         $this->assertSame('foo', $definition->getArgument(8));
-        $this->assertEquals(new Reference('invalid.id', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(9));
+        $this->assertEquals(new TypedReference('invalid.id', 'stdClass', ContainerInterface::NULL_ON_INVALID_REFERENCE, attributes: [new Autowire(service: 'invalid.id')]), $definition->getArgument(9));
 
         $container->compile();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
index ffda5af3e2dd8..e671bef672dd6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
@@ -459,11 +459,11 @@ public static function getSubscribedServices(): array
         $expected = [
             'tagged.iterator' => new ServiceClosureArgument(new TaggedIteratorArgument('tag')),
             'tagged.locator' => new ServiceClosureArgument(new ServiceLocatorArgument(new TaggedIteratorArgument('tag', 'tag', needsIndexes: true))),
-            'autowired' => new ServiceClosureArgument(new Reference('service.id')),
-            'autowired.nullable' => new ServiceClosureArgument(new Reference('service.id', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
+            'autowired' => new ServiceClosureArgument(new TypedReference('service.id', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'autowired', [new Autowire(service: 'service.id')])),
+            'autowired.nullable' => new ServiceClosureArgument(new TypedReference('service.id', 'stdClass', ContainerInterface::IGNORE_ON_INVALID_REFERENCE, 'autowired.nullable', [new Autowire(service: 'service.id')])),
             'autowired.parameter' => new ServiceClosureArgument('foobar'),
             'autowire.decorated' => new ServiceClosureArgument(new Reference('.service_locator.QVDPERh.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
-            'target' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'someTarget', [new Target('someTarget')])),
+            'target' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'target', [new Target('someTarget')])),
         ];
         $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
     }

From 749d4b9f65dd7ec5897c74a3ea9c8e48f2109cd9 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 14 Mar 2023 19:02:40 +0100
Subject: [PATCH 289/475] [DependencyInjection] Use weak references in
 ContainerBuilder

---
 .../DependencyInjection/ContainerBuilder.php  | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index adeba8cfe3267..e920980b286e7 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -140,6 +140,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      */
     private array $removedBindingIds = [];
 
+    private \WeakReference $containerRef;
+
     private const INTERNAL_TYPES = [
         'int' => true,
         'float' => true,
@@ -1050,13 +1052,14 @@ private function createService(Definition $definition, array &$inlineServices, b
         $parameterBag = $this->getParameterBag();
 
         if (true === $tryProxy && $definition->isLazy() && !$tryProxy = !($proxy = $this->proxyInstantiator ??= new LazyServiceInstantiator()) || $proxy instanceof RealServiceInstantiator) {
+            $containerRef = $this->containerRef ??= \WeakReference::create($this);
             $proxy = $proxy->instantiateProxy(
                 $this,
                 (clone $definition)
                     ->setClass($parameterBag->resolveValue($definition->getClass()))
                     ->setTags(($definition->hasTag('proxy') ? ['proxy' => $parameterBag->resolveValue($definition->getTag('proxy'))] : []) + $definition->getTags()),
-                $id, function ($proxy = false) use ($definition, &$inlineServices, $id) {
-                    return $this->createService($definition, $inlineServices, true
10000
, $id, $proxy);
+                $id, static function ($proxy = false) use ($containerRef, $definition, &$inlineServices, $id) {
+                    return $containerRef->get()->createService($definition, $inlineServices, true, $id, $proxy);
                 }
             );
             $this->shareService($definition, $proxy, $id, $inlineServices);
@@ -1184,34 +1187,38 @@ private function doResolveServices(mixed $value, array &$inlineServices = [], bo
                 $value[$k] = $this->doResolveServices($v, $inlineServices, $isConstructorArgument);
             }
         } elseif ($value instanceof ServiceClosureArgument) {
+            $containerRef = $this->containerRef ??= \WeakReference::create($this);
             $reference = $value->getValues()[0];
-            $value = fn () => $this->resolveServices($reference);
+            $value = static fn () => $containerRef->get()->resolveServices($reference);
         } elseif ($value instanceof IteratorArgument) {
-            $value = new RewindableGenerator(function () use ($value, &$inlineServices) {
+            $containerRef = $this->containerRef ??= \WeakReference::create($this);
+            $value = new RewindableGenerator(static function () use ($containerRef, $value, &$inlineServices) {
+                $container = $containerRef->get();
                 foreach ($value->getValues() as $k => $v) {
                     foreach (self::getServiceConditionals($v) as $s) {
-                        if (!$this->has($s)) {
+                        if (!$container->has($s)) {
                             continue 2;
                         }
                     }
                     foreach (self::getInitializedConditionals($v) as $s) {
-                        if (!$this->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE, $inlineServices)) {
+                        if (!$container->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE, $inlineServices)) {
                             continue 2;
                         }
                     }
 
-                    yield $k => $this->doResolveServices($v, $inlineServices);
+                    yield $k => $container->doResolveServices($v, $inlineServices);
                 }
-            }, function () use ($value): int {
+            }, static function () use ($containerRef, $value): int {
+                $container = $containerRef->get();
                 $count = 0;
                 foreach ($value->getValues() as $v) {
                     foreach (self::getServiceConditionals($v) as $s) {
-                        if (!$this->has($s)) {
+                        if (!$container->has($s)) {
                             continue 2;
                         }
                     }
                     foreach (self::getInitializedConditionals($v) as $s) {
-                        if (!$this->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
+                        if (!$container->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
                             continue 2;
                         }
                     }

From e51a2b1bdbbbc3bdc17f3f79fbe02f9de29f56bc Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 27 Aug 2022 07:42:06 +0200
Subject: [PATCH 290/475] [Webhook][RemoteEvent] Add the components

---
 composer.json                                 |  2 +
 .../Compiler/UnusedTagsPass.php               |  1 +
 .../DependencyInjection/Configuration.php     | 45 +++++++++++
 .../FrameworkExtension.php                    | 76 ++++++++++++++++--
 .../Resources/config/mailer_webhook.php       | 31 ++++++++
 .../Resources/config/notifier_webhook.php     | 21 +++++
 .../Resources/config/remote_event.php         | 24 ++++++
 .../Resources/config/routing/webhook.xml      | 10 +++
 .../Resources/config/schema/symfony-1.0.xsd   | 21 +++++
 .../Resources/config/webhook.php              | 57 ++++++++++++++
 .../DependencyInjection/ConfigurationTest.php |  8 ++
 .../RemoteEvent/MailgunPayloadConverter.php   | 56 +++++++++++++
 .../Tests/Webhook/Fixtures/clicks.json        | 42 ++++++++++
 .../Mailgun/Tests/Webhook/Fixtures/clicks.php | 11 +++
 .../Webhook/Fixtures/delivered_messages.json  | 61 +++++++++++++++
 .../Webhook/Fixtures/delivered_messages.php   | 11 +++
 .../Mailgun/Tests/Webhook/Fixtures/opens.json | 42 ++++++++++
 .../Mailgun/Tests/Webhook/Fixtures/opens.php  | 11 +++
 .../Webhook/Fixtures/permanent_failure.json   | 59 ++++++++++++++
 .../Webhook/Fixtures/permanent_failure.php    | 12 +++
 .../Webhook/Fixtures/spam_complaints.json     | 39 ++++++++++
 .../Webhook/Fixtures/spam_complaints.php      | 11 +++
 .../Webhook/Fixtures/temporary_failure.json   | 65 ++++++++++++++++
 .../Webhook/Fixtures/temporary_failure.php    | 12 +++
 .../Tests/Webhook/Fixtures/unsubscribes.json  | 42 ++++++++++
 .../Tests/Webhook/Fixtures/unsubscribes.php   | 11 +++
 .../Webhook/MailgunRequestParserTest.php      | 30 +++++++
 .../Mailgun/Webhook/MailgunRequestParser.php  | 70 +++++++++++++++++
 .../Mailer/Bridge/Mailgun/composer.json       |  6 +-
 .../RemoteEvent/PostmarkPayloadConverter.php  | 60 ++++++++++++++
 .../Tests/Webhook/Fixtures/bounce.json        | 25 ++++++
 .../Tests/Webhook/Fixtures/bounce.php         | 12 +++
 .../Tests/Webhook/Fixtures/delivery.json      | 14 ++++
 .../Tests/Webhook/Fixtures/delivery.php       | 12 +++
 .../Tests/Webhook/Fixtures/link_click.json    | 36 +++++++++
 .../Tests/Webhook/Fixtures/link_click.php     | 11 +++
 .../Postmark/Tests/Webhook/Fixtures/open.json | 36 +++++++++
 .../Postmark/Tests/Webhook/Fixtures/open.php  | 11 +++
 .../Webhook/Fixtures/spam_complaint.json      | 25 ++++++
 .../Tests/Webhook/Fixtures/spam_complaint.php | 11 +++
 .../Webhook/Fixtures/subscription_change.json | 16 ++++
 .../Webhook/Fixtures/subscription_change.php  | 11 +++
 .../Webhook/PostmarkRequestParserTest.php     | 25 ++++++
 .../Webhook/PostmarkRequestParser.php         | 63 +++++++++++++++
 .../Mailer/Bridge/Postmark/composer.json      |  6 +-
 .../Tests/Webhook/Fixtures/delivered.php      |  9 +++
 .../Tests/Webhook/Fixtures/delivered.txt      |  1 +
 .../Tests/Webhook/TwilioRequestParserTest.php | 39 ++++++++++
 .../Notifier/Bridge/Twilio/TwilioOptions.php  | 42 ++++++++++
 .../Bridge/Twilio/TwilioTransport.php         | 22 ++++--
 .../Twilio/Webhook/TwilioRequestParser.php    | 63 +++++++++++++++
 .../Notifier/Bridge/Twilio/composer.json      |  6 ++
 .../Component/RemoteEvent/.gitattributes      |  4 +
 src/Symfony/Component/RemoteEvent/.gitignore  |  3 +
 .../Attribute/AsRemoteEventConsumer.php       | 26 +++++++
 .../Component/RemoteEvent/CHANGELOG.md        |  7 ++
 .../Consumer/ConsumerInterface.php            | 24 ++++++
 .../Event/Mailer/AbstractMailerEvent.php      | 67 ++++++++++++++++
 .../Event/Mailer/MailerDeliveryEvent.php      | 38 +++++++++
 .../Event/Mailer/MailerEngagementEvent.php    | 25 ++++++
 .../RemoteEvent/Event/Sms/SmsEvent.php        | 37 +++++++++
 .../Exception/ExceptionInterface.php          | 21 +++++
 .../Exception/InvalidArgumentException.php    | 21 +++++
 .../RemoteEvent/Exception/LogicException.php  | 21 +++++
 .../RemoteEvent/Exception/ParseException.php  | 21 +++++
 .../Exception/RuntimeException.php            | 21 +++++
 src/Symfony/Component/RemoteEvent/LICENSE     | 19 +++++
 .../Messenger/ConsumeRemoteEventHandler.php   | 38 +++++++++
 .../Messenger/ConsumeRemoteEventMessage.php   | 38 +++++++++
 .../RemoteEvent/PayloadConverterInterface.php | 22 ++++++
 src/Symfony/Component/RemoteEvent/README.md   | 13 ++++
 .../Component/RemoteEvent/RemoteEvent.php     | 42 ++++++++++
 .../Tests/Event/Sms/SmsEventTest.php          | 25 ++++++
 .../Component/RemoteEvent/composer.json       | 29 +++++++
 .../Component/RemoteEvent/phpunit.xml.dist    | 30 +++++++
 src/Symfony/Component/Webhook/.gitattributes  |  4 +
 src/Symfony/Component/Webhook/.gitignore      |  3 +
 src/Symfony/Component/Webhook/CHANGELOG.md    |  7 ++
 .../Webhook/Client/AbstractRequestParser.php  | 54 +++++++++++++
 .../Webhook/Client/RequestParser.php          | 78 +++++++++++++++++++
 .../Webhook/Client/RequestParserInterface.php | 38 +++++++++
 .../Webhook/Controller/WebhookController.php  | 54 +++++++++++++
 .../Webhook/Exception/ExceptionInterface.php  | 21 +++++
 .../Exception/InvalidArgumentException.php    | 21 +++++
 .../Webhook/Exception/LogicException.php      | 21 +++++
 .../Exception/RejectWebhookException.php      | 27 +++++++
 .../Webhook/Exception/RuntimeException.php    | 21 +++++
 src/Symfony/Component/Webhook/LICENSE         | 19 +++++
 .../Webhook/Messenger/SendWebhookHandler.php  | 32 ++++++++
 .../Webhook/Messenger/SendWebhookMessage.php  | 39 ++++++++++
 src/Symfony/Component/Webhook/README.md       | 18 +++++
 .../Server/HeaderSignatureConfigurator.php    | 42 ++++++++++
 .../Webhook/Server/HeadersConfigurator.php    | 37 +++++++++
 .../Webhook/Server/JsonBodyConfigurator.php   | 38 +++++++++
 .../Server/RequestConfiguratorInterface.php   | 25 ++++++
 .../Component/Webhook/Server/Transport.php    | 44 +++++++++++
 .../Webhook/Server/TransportInterface.php     | 25 ++++++
 src/Symfony/Component/Webhook/Subscriber.php  | 31 ++++++++
 .../Test/AbstractRequestParserTest.php        | 66 ++++++++++++++++
 .../Tests/Client/RequestParserTest.php        | 29 +++++++
 src/Symfony/Component/Webhook/composer.json   | 32 ++++++++
 .../Component/Webhook/phpunit.xml.dist        | 30 +++++++
 102 files changed, 2878 insertions(+), 13 deletions(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_webhook.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_webhook.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/config/remote_event.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/config/routing/webhook.xml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/config/webhook.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/RemoteEvent/MailgunPayloadConverter.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/clicks.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/clicks.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/delivered_messages.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/delivered_messages.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/opens.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/opens.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/permanent_failure.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/permanent_failure.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/spam_complaints.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/spam_complaints.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/temporary_failure.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/temporary_failure.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/unsubscribes.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/unsubscribes.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/MailgunRequestParserTest.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Mailgun/Webhook/MailgunRequestParser.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/RemoteEvent/PostmarkPayloadConverter.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/bounce.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/bounce.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/delivery.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/delivery.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/link_click.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/link_click.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/open.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/open.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/spam_complaint.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/spam_complaint.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/subscription_change.json
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/subscription_change.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/PostmarkRequestParserTest.php
 create mode 100644 src/Symfony/Component/Mailer/Bridge/Postmark/Webhook/PostmarkRequestParser.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/Fixtures/delivered.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/Fixtures/delivered.txt
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/TwilioRequestParserTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twilio/TwilioOptions.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/Twilio/Webhook/TwilioRequestParser.php
 create mode 100644 src/Symfony/Component/RemoteEvent/.gitattributes
 create mode 100644 src/Symfony/Component/RemoteEvent/.gitignore
 create mode 100644 src/Symfony/Component/RemoteEvent/Attribute/AsRemoteEventConsumer.php
 create mode 100644 src/Symfony/Component/RemoteEvent/CHANGELOG.md
 create mode 100644 src/Symfony/Component/RemoteEvent/Consumer/ConsumerInterface.php
 create mode 100644 src/Symfony/Component/RemoteEvent/Event/Mailer/AbstractMailerEvent.php
 create mode 100644 src/Symfony/Component/RemoteEvent/Event/Mailer/MailerDeliveryEvent.php
 create mode 100644 src/Symfony/Component/RemoteEvent/Event/Mailer/MailerEngagementEvent.php
 create mode 100644 src/Symfony/Component/RemoteEvent/Event/Sms/SmsEvent.php
 create mode 100644 src/Symfony/Component/RemoteEvent/Exception/ExceptionInterface.php
 create mode 100644 src/Symfony/Component/RemoteEvent/Exception/InvalidArgumentException.php
 create mode 100644 src/Symfony/Component/RemoteEvent/Exception/LogicException.php
 create mode 100644 src/Symfony/Component/RemoteEvent/Exception/ParseException.php
 create mode 100644 src/Symfony/Component/RemoteEvent/Exception/RuntimeException.php
 create mode 100644 src/Symfony/Component/RemoteEvent/LICENSE
 create mode 100644 src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventHandler.php
 create mode 100644 src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventMessage.php
 create mode 100644 src/Symfony/Component/RemoteEvent/PayloadConverterInterface.php
 create mode 100644 src/Symfony/Component/RemoteEvent/README.md
 create mode 100644 src/Symfony/Component/RemoteEvent/RemoteEvent.php
 create mode 100644 src/Symfony/Component/RemoteEvent/Tests/Event/Sms/SmsEventTest.php
 create mode 100644 src/Symfony/Component/RemoteEvent/composer.json
 create mode 100644 src/Symfony/Component/RemoteEvent/phpunit.xml.dist
 create mode 100644 src/Symfony/Component/Webhook/.gitattributes
 create mode 100644 src/Symfony/Component/Webhook/.gitignore
 create mode 100644 src/Symfony/Component/Webhook/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Webhook/Client/AbstractRequestParser.php
 create mode 100644 src/Symfony/Component/Webhook/Client/RequestParser.php
 create mode 100644 src/Symfony/Component/Webhook/Client/RequestParserInterface.php
 create mode 100644 src/Symfony/Component/Webhook/Controller/WebhookController.php
 create mode 100644 src/Symfony/Component/Webhook/Exception/ExceptionInterface.php
 create mode 100644 src/Symfony/Component/Webhook/Exception/InvalidArgumentException.php
 create mode 100644 src/Symfony/Component/Webhook/Exception/LogicException.php
 create mode 100644 src/Symfony/Component/Webhook/Exception/RejectWebhookException.php
 create mode 100644 src/Symfony/Component/Webhook/Exception/RuntimeException.php
 create mode 100644 src/Symfony/Component/Webhook/LICENSE
 create mode 100644 src/Symfony/Component/Webhook/Messenger/SendWebhookHandler.php
 create mode 100644 src/Symfony/Component/Webhook/Messenger/SendWebhookMessage.php
 create mode 100644 src/Symfony/Component/Webhook/README.md
 create mode 100644 src/Symfony/Component/Webhook/Server/HeaderSignatureConfigurator.php
 create mode 100644 src/Symfony/Component/Webhook/Server/HeadersConfigurator.php
 create mode 100644 src/Symfony/Component/Webhook/Server/JsonBodyConfigurator.php
 create mode 100644 src/Symfony/Component/Webhook/Server/RequestConfiguratorInterface.php
 create mode 100644 src/Symfony/Component/Webhook/Server/Transport.php
 create mode 100644 src/Symfony/Component/Webhook/Server/TransportInterface.php
 create mode 100644 src/Symfony/Component/Webhook/Subscriber.php
 create mode 100644 src/Symfony/Component/Webhook/Test/AbstractRequestParserTest.php
 create mode 100644 src/Symfony/Component/Webhook/Tests/Client/RequestParserTest.php
 create mode 100644 src/Symfony/Component/Webhook/composer.json
 create mode 100644 src/Symfony/Component/Webhook/phpunit.xml.dist

diff --git a/composer.json b/composer.json
index d03652cee8f6f..17abbb834859f 100644
--- a/composer.json
+++ b/composer.json
@@ -94,6 +94,7 @@
         "symfony/property-info": "self.version",
         "symfony/proxy-manager-bridge": "self.version",
         "symfony/rate-limiter": "self.version",
+        "symfony/remote-event": "self.version",
         "symfony/routing": "self.version",
         "symfony/security-bundle": "self.version",
         "symfony/security-core": "self.version",
@@ -113,6 +114,7 @@
         "symfony/var-exporter": "self.version",
         "symfony/web-link": "self.version",
         "symfony/web-profiler-bundle": "self.version",
+        "symfony/webhook": "self.version",
         "symfony/workflow": "self.version",
         "symfony/yaml": "self.version"
     },
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
index 169a1c0a6909a..d846bc68822c3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -74,6 +74,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'property_info.list_extractor',
         'property_info.type_extractor',
         'proxy',
+        'remote_event.consumer',
         'routing.condition_service',
         'routing.expression_language_function',
         'routing.expression_language_provider',
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 4a0cc846d224a..348cf80161b91 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -36,11 +36,13 @@
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
 use Symfony\Component\RateLimiter\Policy\TokenBucketLimiter;
+use Symfony\Component\RemoteEvent\RemoteEvent;
 use Symfony\Component\Semaphore\Semaphore;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Uid\Factory\UuidFactory;
 use Symfony\Component\Validator\Validation;
+use Symfony\Component\Webhook\Controller\WebhookController;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
 use Symfony\Component\Workflow\WorkflowEvents;
 
@@ -179,6 +181,8 @@ public function getConfigTreeBuilder(): TreeBuilder
         $this->addRateLimiterSection($rootNode, $enableIfStandalone);
         $this->addUidSection($rootNode, $enableIfStandalone);
         $this->addHtmlSanitizerSection($rootNode, $enableIfStandalone);
+        $this->addWebhookSection($rootNode, $enableIfStandalone);
+        $this->addRemoteEventSection($rootNode, $enableIfStandalone);
 
         return $treeBuilder;
     }
@@ -2070,6 +2074,47 @@ private function addNotifierSection(ArrayNodeDefinition $rootNode, callable $ena
         ;
     }
 
+    private function addWebhookSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
+    {
+        $rootNode
+            ->children()
+                ->arrayNode('webhook')
+                    ->info('Webhook configuration')
+                    ->{$enableIfStandalone('symfony/webhook', WebhookController::class)}()
+                    ->children()
+                        ->scalarNode('message_bus')->defaultValue('messenger.default_bus')->info('The message bus to use.')->end()
+                        ->arrayNode('routing')
+                            ->normalizeKeys(false)
+                            ->useAttributeAsKey('type')
+                            ->prototype('array')
+                                ->children()
+                                ->scalarNode('service')
+                                    ->isRequired()
+                                    ->cannotBeEmpty()
+                                ->end()
+                                ->scalarNode('secret')
+                                    ->defaultValue('')
+                                ->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+    }
+
+    private function addRemoteEventSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
+    {
+        $rootNode
+            ->children()
+                ->arrayNode('remote-event')
+                    ->info('RemoteEvent configuration')
+                    ->{$enableIfStandalone('symfony/remote-event', RemoteEvent::class)}()
+                ->end()
+            ->end()
+        ;
+    }
+
     private function addRateLimiterSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 131e9e8c2c723..8cb557fb7d35d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -102,10 +102,12 @@
 use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
 use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
+use Symfony\Component\Mailer\Bridge\Mailgun\Webhook\MailgunRequestParser;
 use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
 use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceTransportFactory;
 use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory;
 use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
+use Symfony\Component\Mailer\Bridge\Postmark\Webhook\PostmarkRequestParser;
 use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
 use Symfony\Component\Mailer\Bridge\Sendinblue\Transport\SendinblueTransportFactory;
 use Symfony\Component\Mailer\Command\MailerTestCommand;
@@ -210,6 +212,8 @@
 use Symfony\Component\RateLimiter\LimiterInterface;
 use Symfony\Component\RateLimiter\RateLimiterFactory;
 use Symfony\Component\RateLimiter\Storage\CacheStorage;
+use Symfony\Component\RemoteEvent\Attribute\AsRemoteEventConsumer;
+use Symfony\Component\RemoteEvent\RemoteEvent;
 use Symfony\Component\Routing\Loader\Psr4DirectoryLoader;
 use Symfony\Component\Security\Core\AuthenticationEvents;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
@@ -244,6 +248,7 @@
 use Symfony\Component\Validator\Mapping\Loader\PropertyInfoLoader;
 use Symfony\Component\Validator\ObjectInitializerInterface;
 use Symfony\Component\Validator\Validation;
+use Symfony\Component\Webhook\Controller\WebhookController;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
 use Symfony\Component\Workflow;
 use Symfony\Component\Workflow\WorkflowInterface;
@@ -403,7 +408,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($this->readConfigEnabled('mailer', $container, $config['mailer'])) {
-            $this->registerMailerConfiguration($config['mailer'], $container, $loader);
+            $this->registerMailerConfiguration($config['mailer'], $container, $loader, $this->readConfigEnabled('webhook', $container, $config['webhook']));
 
             if (!$this->hasConsole() || !class_exists(MailerTestCommand::class)) {
                 $container->removeDefinition('console.command.mailer_test');
@@ -558,12 +563,20 @@ public function load(array $configs, ContainerBuilder $container)
 
         // notifier depends on messenger, mailer being registered
         if ($this->readConfigEnabled('notifier', $container, $config['notifier'])) {
-            $this->registerNotifierConfiguration($config['notifier'], $container, $loader);
+            $this->registerNotifierConfiguration($config['notifier'], $container, $loader, $this->readConfigEnabled('webhook', $container, $config['webhook']));
         }
 
         // profiler depends on form, validation, translation, messenger, mailer, http-client, notifier, serializer being registered
         $this->registerProfilerConfiguration($config['profiler'], $container, $loader);
 
+        if ($this->readConfigEnabled('webhook', $container, $config['webhook'])) {
+            $this->registerWebhookConfiguration($config['webhook'], $container, $loader);
+        }
+
+        if ($this->readConfigEnabled('remote-event', $container, $config['remote-event'])) {
+            $this->registerRemoteEventConfiguration($config['remote-event'], $container, $loader);
+        }
+
         if ($this->readConfigEnabled('html_sanitizer', $container, $config['html_sanitizer'])) {
             if (!class_exists(HtmlSanitizerConfig::class)) {
                 throw new LogicException('HtmlSanitizer support cannot be enabled as the HtmlSanitizer component is not installed. Try running "composer require symfony/html-sanitizer".');
@@ -678,7 +691,9 @@ public function load(array $configs, ContainerBuilder $container)
         $container->registerAttributeForAutoconfiguration(AsController::class, static function (ChildDefinition $definition, AsController $attribute): void {
             $definition->addTag('controller.service_arguments');
         });
-
+        $container->registerAttributeForAutoconfiguration(AsRemoteEventConsumer::class, static function (ChildDefinition $definition, AsRemoteEventConsumer $attribute): void {
+            $definition->addTag('remote_event.consumer', ['consumer' => $attribute->name]);
+        });
         $container->registerAttributeForAutoconfiguration(AsMessageHandler::class, static function (ChildDefinition $definition, AsMessageHandler $attribute, \ReflectionClass|\ReflectionMethod $reflector): void {
             $tagAttributes = get_object_vars($attribute);
             $tagAttributes['from_transport'] = $tagAttributes['fromTransport'];
@@ -2467,7 +2482,7 @@ private function registerRetryableHttpClient(array $options, string $name, Conta
             ->addTag('monolog.logger', ['channel' => 'http_client']);
     }
 
-    private function registerMailerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
+    private function registerMailerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $webhookEnabled): void
     {
         if (!class_exists(Mailer::class)) {
             throw new LogicException('Mailer support cannot be enabled as the component is not installed. Try running "composer require symfony/mailer".');
@@ -2512,6 +2527,19 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
             }
         }
 
+        $webhookRequestParsers = [
+            MailgunRequestParser::class => 'mailer.webhook.request_parser.mailgun',
+            PostmarkRequestParser::class => 'mailer.webhook.request_parser.postmark',
+        ];
+
+        foreach ($webhookRequestParsers as $class => $service) {
+            $package = substr($service, \strlen('mailer.transport_factory.'));
+
+            if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
+                $container->removeDefinition($service);
+            }
+        }
+
         $envelopeListener = $container->getDefinition('mailer.envelope_listener');
         $envelopeListener->setArgument(0, $config['envelope']['sender'] ?? null);
         $envelopeListener->setArgument(1, $config['envelope']['recipients'] ?? null);
@@ -2534,9 +2562,13 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
         if (!class_exists(MessengerTransportListener::class)) {
             $container->removeDefinition('mailer.messenger_transport_listener');
         }
+
+        if ($webhookEnabled) {
+            $loader->load('mailer_webhook.php');
+        }
     }
 
-    private function registerNotifierConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
+    private function registerNotifierConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $webhookEnabled): void
     {
         if (!class_exists(Notifier::class)) {
             throw new LogicException('Notifier support cannot be enabled as the component is not installed. Try running "composer require symfony/notifier".');
@@ -2701,6 +2733,40 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
                 $notifier->addMethodCall('addAdminRecipient', [new Reference($id)]);
             }
         }
+
+        if ($webhookEnabled) {
+            $loader->load('notifier_webhook.php');
+        }
+    }
+
+    private function registerWebhookConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    {
+        if (!class_exists(WebhookController::class)) {
+            throw new LogicException('Webhook support cannot be enabled as the component is not installed. Try running "composer require symfony/webhook".');
+        }
+
+        $loader->load('webhook.php');
+
+        $parsers = [];
+        foreach ($config['routing'] as $type => $cfg) {
+            $parsers[$type] = [
+                'parser' => new Reference($cfg['service']),
+                'secret' => $cfg['secret'],
+            ];
+        }
+
+        $controller = $container->getDefinition('webhook.controller');
+        $controller->replaceArgument(0, $parsers);
+        $controller->replaceArgument(1, new Reference($config['message_bus']));
+    }
+
+    private function registerRemoteEventConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
+    {
+        if (!class_exists(RemoteEvent::class)) {
+            throw new LogicException('RemoteEvent support cannot be enabled as the component is not installed. Try running "composer require symfony/remote-event".');
+        }
+
+        $loader->load('remote_event.php');
     }
 
     private function registerRateLimiterConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_webhook.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_webhook.php
new file mode 100644
index 0000000000000..7780b3df51e78
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_webhook.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\Mailer\Bridge\Mailgun\RemoteEvent\MailgunPayloadConverter;
+use Symfony\Component\Mailer\Bridge\Mailgun\Webhook\MailgunRequestParser;
+use Symfony\Component\Mailer\Bridge\Postmark\RemoteEvent\PostmarkPayloadConverter;
+use Symfony\Component\Mailer\Bridge\Postmark\Webhook\PostmarkRequestParser;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('mailer.payload_converter.mailgun', MailgunPayloadConverter::class)
+        ->set('mailer.webhook.request_parser.mailgun', MailgunRequestParser::class)
+            ->args([service('mailer.payload_converter.mailgun')])
+        ->alias(MailgunRequestParser::class, 'mailer.webhook.request_parser.mailgun')
+
+        ->set('mailer.payload_converter.postmark', PostmarkPayloadConverter::class)
+        ->set('mailer.webhook.request_parser.postmark', PostmarkRequestParser::class)
+            ->args([service('mailer.payload_converter.postmark')])
+        ->alias(PostmarkRequestParser::class, 'mailer.webhook.request_parser.postmark')
+    ;
+};
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_webhook.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_webhook.php
new file mode 100644
index 0000000000000..87dfc6c6a08e4
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_webhook.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\Notifier\Bridge\Twilio\Webhook\TwilioRequestParser;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('notifier.webhook.request_parser.twilio', TwilioRequestParser::class)
+        ->alias(TwilioRequestParser::class, 'notifier.webhook.request_parser.twilio')
+    ;
+};
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/remote_event.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/remote_event.php
new file mode 100644
index 0000000000000..41209314b224b
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/remote_event.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\RemoteEvent\Messenger\ConsumeRemoteEventHandler;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('remote_event.messenger.handler', ConsumeRemoteEventHandler::class)
+            ->args([
+                tagged_locator('remote_event.consumer', 'consumer'),
+            ])
+            ->tag('messenger.message_handler')
+    ;
+};
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing/webhook.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing/webhook.xml
new file mode 100644
index 0000000000000..aa71fec2d4c23
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing/webhook.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://symfony.com/schema/routing"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="_webhook_controller" path="/{type}">
+        <default key="_controller">webhook.controller::handle</default>
+    </route>
+</routes>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
index fd17176c2fe7a..de0603e966a9c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -42,6 +42,8 @@
             <xsd:element name="notifier" type="notifier" minOccurs="0" maxOccurs="1" />
             <xsd:element name="html-sanitizer" type="html-sanitizer" minOccurs="0" maxOccurs="1" />
             <xsd:element name="enabled-locale" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="webhook" type="webhook" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="remote-event" type="remote-event" minOccurs="0" maxOccurs="1" />
         </xsd:choice>
 
         <xsd:attribute name="http-method-override" type="xsd:boolean" />
@@ -916,4 +918,23 @@
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" use="required" />
     </xsd:complexType>
+
+    <xsd:complexType name="webhook">
+        <xsd:sequence>
+            <xsd:element name="routing" type="webhook_routing" minOccurs="0" maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute name="enabled" type="xsd:boolean" />
+        <xsd:attribute name="message-bus" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="webhook_routing" mixed="true">
+        <xsd:sequence>
+            <xsd:element name="service" type="xsd:string" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="secret" type="xsd:string" minOccurs="0" maxOccurs="1" />
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="remote-event">
+        <xsd:attribute name="enabled" type="xsd:boolean" />
+    </xsd:complexType>
 </xsd:schema>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/webhook.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/webhook.php
new file mode 100644
index 0000000000000..a7e9d58ce9a65
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/webhook.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\Webhook\Client\RequestParser;
+use Symfony\Component\Webhook\Controller\WebhookController;
+use Symfony\Component\Webhook\Messenger\SendWebhookHandler;
+use Symfony\Component\Webhook\Server\HeadersConfigurator;
+use Symfony\Component\Webhook\Server\HeaderSignatureConfigurator;
+use Symfony\Component\Webhook\Server\JsonBodyConfigurator;
+use Symfony\Component\Webhook\Server\Transport;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('webhook.transport', Transport::class)
+            ->args([
+                service('http_client'),
+                service('webhook.headers_configurator'),
+                service('webhook.body_configurator.json'),
+                service('webhook.signer'),
+            ])
+
+        ->set('webhook.headers_configurator', HeadersConfigurator::class)
+
+        ->set('webhook.body_configurator.json', JsonBodyConfigurator::class)
+            ->args([
+                service('serializer'),
+            ])
+
+        ->set('webhook.signer', HeaderSignatureConfigurator::class)
+
+        ->set('webhook.messenger.send_handler', SendWebhookHandler::class)
+            ->args([
+                service('webhook.transport'),
+            ])
+            ->tag('messenger.message_handler')
+
+        ->set('webhook.request_parser', RequestParser::class)
+        ->alias(RequestParser::class, 'webhook.request_parser')
+
+        ->set('webhook.controller', WebhookController::class)
+            ->public()
+            ->args([
+                abstract_arg('user defined parsers'),
+                abstract_arg('message bus'),
+            ])
+    ;
+};
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index 6be5ac85a10c6..e80427c717bed 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -688,6 +688,14 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
                 'sanitizers' => [],
             ],
             'exceptions' => [],
+            'webhook' => [
+                'enabled' => false,
+                'routing' => [],
+                'message_bus' => 'messenger.default_bus',
+            ],
+            'remote-event' => [
+                'enabled' => false,
+            ],
         ];
     }
 }
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/RemoteEvent/MailgunPayloadConverter.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/RemoteEvent/MailgunPayloadConverter.php
new file mode 100644
index 0000000000000..3ff2fe5f6d531
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/RemoteEvent/MailgunPayloadConverter.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Bridge\Mailgun\RemoteEvent;
+
+use Symfony\Component\RemoteEvent\Event\Mailer\AbstractMailerEvent;
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerDeliveryEvent;
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerEngagementEvent;
+use Symfony\Component\RemoteEvent\Exception\ParseException;
+use Symfony\Component\RemoteEvent\PayloadConverterInterface;
+
+final class MailgunPayloadConverter implements PayloadConverterInterface
+{
+    public function convert(array $payload): AbstractMailerEvent
+    {
+        if (\in_array($payload['event'], ['accepted', 'rejected', 'delivered', 'failed', 'blocked'], true)) {
+            $name = match ($payload['event']) {
+                'accepted' => MailerDeliveryEvent::RECEIVED,
+                'rejected' => MailerDeliveryEvent::DROPPED,
+                'delivered' => MailerDeliveryEvent::DELIVERED,
+                'blocked' => MailerDeliveryEvent::DROPPED,
+                'failed' => 'permanent' === $payload['severity'] ? MailerDeliveryEvent::BOUNCE : MailerDeliveryEvent::DEFERRED,
+            };
+
+            $event = new MailerDeliveryEvent($name, $payload['id'], $payload);
+            // reason is only available on failed messages
+            $event->setReason($payload['reason'] ?? '');
+        } else {
+            $name = match ($payload['event']) {
+                'clicked' => MailerEngagementEvent::CLICK,
+                'unsubscribed' => MailerEngagementEvent::UNSUBSCRIBE,
+                'opened' => MailerEngagementEvent::OPEN,
+                'complained' => MailerEngagementEvent::SPAM,
+                default => throw new ParseException(sprintf('Unsupported event "%s".', $payload['event'])),
+            };
+            $event = new MailerEngagementEvent($name, $payload['id'], $payload);
+        }
+        if (!$date = \DateTimeImmutable::createFromFormat('U.u', $payload['timestamp'])) {
+            throw new ParseException(sprintf('Invalid date "%s".', $payload['timestamp']));
+        }
+        $event->setDate($date);
+        $event->setRecipientEmail($payload['recipient']);
+        $event->setMetadata($payload['user-variables']);
+        $event->setTags($payload['tags']);
+
+        return $event;
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/clicks.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/clicks.json
new file mode 100644
index 0000000000000..0e06b0b92ee49
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/clicks.json
@@ -0,0 +1,42 @@
+{
+    "signature": {
+        "token": "885894756b6c371a377f5f9516d60a4db497ad27d4931ed215",
+        "timestamp": "1661621710",
+        "signature": "606307bb55b72686b1b2a2c8c37ae6e6ec89496592bac4a4eee5a346337d04a5"
+    },
+    "event-data": {
+        "id": "Ase7i2zsRYeDXztHGENqRA",
+        "timestamp": 1521243339.873676,
+        "log-level": "info",
+        "event": "clicked",
+        "message": {
+            "headers": {
+                "message-id": "20130503182626.18666.16540@app.symfony.com"
+            }
+        },
+        "recipient": "alice@example.com",
+        "recipient-domain": "example.com",
+        "ip": "50.56.129.169",
+        "geolocation": {
+            "country": "US",
+            "region": "CA",
+            "city": "San Francisco"
+        },
+        "client-info": {
+            "client-os": "Linux",
+            "device-type": "desktop",
+            "client-name": "Chrome",
+            "client-type": "browser",
+            "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.43 Safari/537.31"
+        },
+        "campaigns": [],
+        "tags": [
+            "my_tag_1",
+            "my_tag_2"
+        ],
+        "user-variables": {
+            "my_var_1": "Mailgun Variable #1",
+            "my-var-2": "awesome"
+        }
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/clicks.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/clicks.php
new file mode 100644
index 0000000000000..cd556e6d26168
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/clicks.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerEngagementEvent;
+
+$wh = new MailerEngagementEvent(MailerEngagementEvent::CLICK, 'Ase7i2zsRYeDXztHGENqRA', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true, flags: JSON_THROW_ON_ERROR)['event-data']);
+$wh->setRecipientEmail('alice@example.com');
+$wh->setTags(['my_tag_1', 'my_tag_2']);
+$wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521243339.873676));
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/delivered_messages.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/delivered_messages.json
new file mode 100644
index 0000000000000..1b0e4046b3ded
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/delivered_messages.json
@@ -0,0 +1,61 @@
+{
+    "signature": {
+        "token": "d1931d9645b65e60f6fddf94448e982ff8db9256144a7fcb15",
+        "timestamp": "1661621787",
+        "signature": "1aed11dcc25700d6b75f9a6d568343ea02ecdd3fc89cc3209e2883a19e5cdd50"
+    },
+    "event-data": {
+        "id": "CPgfbmQMTCKtHW6uIWtuVe",
+        "timestamp": 1521472262.908181,
+        "log-level": "info",
+        "event": "delivered",
+        "delivery-status": {
+            "tls": true,
+            "mx-host": "smtp-in.example.com",
+            "code": 250,
+            "description": "",
+            "session-seconds": 0.4331989288330078,
+            "utf8": true,
+            "attempt-no": 1,
+            "message": "OK",
+            "certificate-verified": true
+        },
+        "flags": {
+            "is-routed": false,
+            "is-authenticated": true,
+            "is-system-test": false,
+            "is-test-mode": false
+        },
+        "envelope": {
+            "transport": "smtp",
+            "sender": "bob@app.symfony.com",
+            "sending-ip": "209.61.154.250",
+            "targets": "alice@example.com"
+        },
+        "message": {
+            "headers": {
+                "to": "Alice <alice@example.com>",
+                "message-id": "20130503182626.18666.16540@app.symfony.com",
+                "from": "Bob <bob@app.symfony.com>",
+                "subject": "Test delivered webhook"
+            },
+            "attachments": [],
+            "size": 111
+        },
+        "recipient": "alice@example.com",
+        "recipient-domain": "example.com",
+        "storage": {
+            "url": "https://se.api.mailgun.net/v3/domains/app.symfony.com/messages/message_key",
+            "key": "message_key"
+        },
+        "campaigns": [],
+        "tags": [
+            "my_tag_1",
+            "my_tag_2"
+        ],
+        "user-variables": {
+            "my_var_1": "Mailgun Variable #1",
+            "my-var-2": "awesome"
+        }
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/delivered_messages.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/delivered_messages.php
new file mode 100644
index 0000000000000..9f7fb22b27684
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/delivered_messages.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerDeliveryEvent;
+
+$wh = new MailerDeliveryEvent(MailerDeliveryEvent::DELIVERED, 'CPgfbmQMTCKtHW6uIWtuVe', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true, flags: JSON_THROW_ON_ERROR)['event-data']);
+$wh->setRecipientEmail('alice@example.com');
+$wh->setTags(['my_tag_1', 'my_tag_2']);
+$wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521472262.908181));
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/opens.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/opens.json
new file mode 100644
index 0000000000000..05a0b1b7f0305
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/opens.json
@@ -0,0 +1,42 @@
+{
+    "signature": {
+        "token": "bbb203bc8d6602b6b22e4ce88a074f73fecb68d3a96e9c8318",
+        "timestamp": "1661621752",
+        "signature": "695c5558b2f9b7a05c73081c860688595fde006c60614e9d6841cc889c4c8c9f"
+    },
+    "event-data": {
+        "id": "Ase7i2zsRYeDXztHGENqRA",
+        "timestamp": 1521243339.873676,
+        "log-level": "info",
+        "event": "opened",
+        "message": {
+            "headers": {
+                "message-id": "20130503182626.18666.16540@app.symfony.com"
+            }
+        },
+        "recipient": "alice@example.com",
+        "recipient-domain": "example.com",
+        "ip": "50.56.129.169",
+        "geolocation": {
+            "country": "US",
+            "region": "CA",
+            "city": "San Francisco"
+        },
+        "client-info": {
+            "client-os": "Linux",
+            "device-type": "desktop",
+            "client-name": "Chrome",
+            "client-type": "browser",
+            "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.43 Safari/537.31"
+        },
+        "campaigns": [],
+        "tags": [
+            "my_tag_1",
+            "my_tag_2"
+        ],
+        "user-variables": {
+            "my_var_1": "Mailgun Variable #1",
+            "my-var-2": "awesome"
+        }
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/opens.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/opens.php
new file mode 100644
index 0000000000000..f224ca13bd78c
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/opens.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerEngagementEvent;
+
+$wh = new MailerEngagementEvent(MailerEngagementEvent::OPEN, 'Ase7i2zsRYeDXztHGENqRA', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true, flags: JSON_THROW_ON_ERROR)['event-data']);
+$wh->setRecipientEmail('alice@example.com');
+$wh->setTags(['my_tag_1', 'my_tag_2']);
+$wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521243339.873676));
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/permanent_failure.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/permanent_failure.json
new file mode 100644
index 0000000000000..24445359e5170
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/permanent_failure.json
@@ -0,0 +1,59 @@
+{
+    "signature": {
+        "token": "fff0ebc59c0516f4ce0823212a2f45e5c67814420b99fe558b",
+        "timestamp": "1661590666",
+        "signature": "a0cd251821d8fd56a2130b541becc8e441023574e602fe9829a9ab9fbfdea33f"
+    },
+    "event-data": {
+        "id": "G9Bn5sl1TC6nu79C8C0bwg",
+        "timestamp": 1521233195.375624,
+        "log-level": "error",
+        "event": "failed",
+        "severity": "permanent",
+        "reason": "suppress-bounce",
+        "delivery-status": {
+            "attempt-no": 1,
+            "message": "",
+            "code": 605,
+            "enhanced-code": "",
+            "description": "Not delivering to previously bounced address",
+            "session-seconds": 0
+        },
+        "flags": {
+            "is-routed": false,
+            "is-authenticated": true,
+            "is-system-test": false,
+            "is-test-mode": false
+        },
+        "envelope": {
+            "sender": "bob@app.symfony.com",
+            "transport": "smtp",
+            "targets": "alice@example.com"
+        },
+        "message": {
+            "headers": {
+                "to": "Alice <alice@example.com>",
+                "message-id": "20130503192659.13651.20287@app.symfony.com",
+                "from": "Bob <bob@app.symfony.com>",
+                "subject": "Test permanent_fail webhook"
+            },
+            "attachments": [],
+            "size": 111
+        },
+        "recipient": "alice@example.com",
+        "recipient-domain": "example.com",
+        "storage": {
+            "url": "https://se.api.mailgun.net/v3/domains/app.symfony.com/messages/message_key",
+            "key": "message_key"
+        },
+        "campaigns": [],
+        "tags": [
+            "my_tag_1",
+            "my_tag_2"
+        ],
+        "user-variables": {
+            "my_var_1": "Mailgun Variable #1",
+            "my-var-2": "awesome"
+        }
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/permanent_failure.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/permanent_failure.php
new file mode 100644
index 0000000000000..b09035839c7b5
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/permanent_failure.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerDeliveryEvent;
+
+$wh = new MailerDeliveryEvent(MailerDeliveryEvent::BOUNCE, 'G9Bn5sl1TC6nu79C8C0bwg', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true, flags: JSON_THROW_ON_ERROR)['event-data']);
+$wh->setRecipientEmail('alice@example.com');
+$wh->setTags(['my_tag_1', 'my_tag_2']);
+$wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521233195.375624));
+$wh->setReason('suppress-bounce');
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/spam_complaints.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/spam_complaints.json
new file mode 100644
index 0000000000000..8d2e1dccc6fe6
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/spam_complaints.json
@@ -0,0 +1,39 @@
+{
+    "signature": {
+        "token": "335da63647194414fe8bbb7c67b3b0585e426bcd10b258dcf4",
+        "timestamp": "1661621468",
+        "signature": "e3c1ce2c6c7a678823e610537eeef59426df9b1b8ed4a49a91e144e71aa64fa9"
+    },
+    "event-data": {
+        "id": "-Agny091SquKnsrW2NEKUA",
+        "timestamp": 1521233123.501324,
+        "log-level": "warn",
+        "event": "complained",
+        "envelope": {
+            "sending-ip": "173.193.210.33"
+        },
+        "flags": {
+            "is-test-mode": false
+        },
+        "message": {
+            "headers": {
+                "to": "Alice <alice@example.com>",
+                "message-id": "20110215055645.25246.63817@app.symfony.com",
+                "from": "Bob <bob@app.symfony.com>",
+                "subject": "Test complained webhook"
+            },
+            "attachments": [],
+            "size": 111
+        },
+        "recipient": "alice@example.com",
+        "campaigns": [],
+        "tags": [
+            "my_tag_1",
+            "my_tag_2"
+        ],
+        "user-variables": {
+            "my_var_1": "Mailgun Variable #1",
+            "my-var-2": "awesome"
+        }
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/spam_complaints.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/spam_complaints.php
new file mode 100644
index 0000000000000..224a79dc3fb41
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/spam_complaints.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerEngagementEvent;
+
+$wh = new MailerEngagementEvent(MailerEngagementEvent::SPAM, '-Agny091SquKnsrW2NEKUA', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true, flags: JSON_THROW_ON_ERROR)['event-data']);
+$wh->setRecipientEmail('alice@example.com');
+$wh->setTags(['my_tag_1', 'my_tag_2']);
+$wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521233123.501324));
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/temporary_failure.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/temporary_failure.json
new file mode 100644
index 0000000000000..c72f111613bc5
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/temporary_failure.json
@@ -0,0 +1,65 @@
+{
+    "signature": {
+        "token": "fafa24ab7699395ccfce2847b87dce8a29f6696a79127ee77c",
+        "timestamp": "1661621361",
+        "signature": "4328a8ea0818dcb218382cf70ccee285c45a8755f5f5616be90b887b67d84593"
+    },
+    "event-data": {
+        "id": "Fs7-5t81S2ispqxqDw2U4Q",
+        "timestamp": 1521472262.908181,
+        "log-level": "warn",
+        "event": "failed",
+        "reason": "generic",
+        "severity": "temporary",
+        "delivery-status": {
+            "attempt-no": 1,
+            "certificate-verified": true,
+            "code": 452,
+            "description": "",
+            "enhanced-code": "4.2.2",
+            "message": "4.2.2 The email account that you tried to reach is over quota. Please direct\n4.2.2 the recipient to\n4.2.2  https://support.example.com/mail/?p=422",
+            "mx-host": "smtp-in.example.com",
+            "retry-seconds": 600,
+            "session-seconds": 0.1281740665435791,
+            "tls": true,
+            "utf8": true
+        },
+        "flags": {
+            "is-authenticated": true,
+            "is-routed": false,
+            "is-system-test": false,
+            "is-test-mode": false
+        },
+        "envelope": {
+            "sender": "bob@app.symfony.com",
+            "transport": "smtp",
+            "targets": "alice@example.com",
+            "sending-ip": "209.61.154.250"
+        },
+        "message": {
+            "attachments": [],
+            "headers": {
+                "message-id": "20130503182626.18666.16540@app.symfony.com",
+                "from": "Bob <bob@app.symfony.com>",
+                "to": "Alice <alice@example.com>",
+                "subject": "Test delivered webhook"
+            },
+            "size": 111
+        },
+        "recipient": "alice@example.com",
+        "recipient-domain": "example.com",
+        "storage": {
+            "key": "message_key",
+            "url": "https://se.api.mailgun.net/v3/domains/app.symfony.com/messages/message_key"
+        },
+        "campaigns": [],
+        "tags": [
+            "my_tag_1",
+            "my_tag_2"
+        ],
+        "user-variables": {
+            "my_var_1": "Mailgun Variable #1",
+            "my-var-2": "awesome"
+        }
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/temporary_failure.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/temporary_failure.php
new file mode 100644
index 0000000000000..739856b020909
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/temporary_failure.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerDeliveryEvent;
+
+$wh = new MailerDeliveryEvent(MailerDeliveryEvent::DEFERRED, 'Fs7-5t81S2ispqxqDw2U4Q', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true, flags: JSON_THROW_ON_ERROR)['event-data']);
+$wh->setRecipientEmail('alice@example.com');
+$wh->setTags(['my_tag_1', 'my_tag_2']);
+$wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521472262.908181));
+$wh->setReason('generic');
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/unsubscribes.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/unsubscribes.json
new file mode 100644
index 0000000000000..ba97174dea2f4
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/unsubscribes.json
@@ -0,0 +1,42 @@
+{
+    "signature": {
+        "token": "1483353025fd6e45b682f14b18d943c52cea11161c1721ee85",
+        "timestamp": "1661621652",
+        "signature": "83456337a19a70187a620658448ae21d3a50b0aca571bcdad43616741ca300b2"
+    },
+    "event-data": {
+        "id": "Ase7i2zsRYeDXztHGENqRA",
+        "timestamp": 1521243339.873676,
+        "log-level": "info",
+        "event": "unsubscribed",
+        "message": {
+            "headers": {
+                "message-id": "20130503182626.18666.16540@app.symfony.com"
+            }
+        },
+        "recipient": "alice@example.com",
+        "recipient-domain": "example.com",
+        "ip": "50.56.129.169",
+        "geolocation": {
+            "country": "US",
+            "region": "CA",
+            "city": "San Francisco"
+        },
+        "client-info": {
+            "client-os": "Linux",
+            "device-type": "desktop",
+            "client-name": "Chrome",
+            "client-type": "browser",
+            "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.43 Safari/537.31"
+        },
+        "campaigns": [],
+        "tags": [
+            "my_tag_1",
+            "my_tag_2"
+        ],
+        "user-variables": {
+            "my_var_1": "Mailgun Variable #1",
+            "my-var-2": "awesome"
+        }
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/unsubscribes.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/unsubscribes.php
new file mode 100644
index 0000000000000..1f38f2e9184ff
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/Fixtures/unsubscribes.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerEngagementEvent;
+
+$wh = new MailerEngagementEvent(MailerEngagementEvent::UNSUBSCRIBE, 'Ase7i2zsRYeDXztHGENqRA', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true, flags: JSON_THROW_ON_ERROR)['event-data']);
+$wh->setRecipientEmail('alice@example.com');
+$wh->setTags(['my_tag_1', 'my_tag_2']);
+$wh->setMetadata(['my_var_1' => 'Mailgun Variable #1', 'my-var-2' => 'awesome']);
+$wh->setDate(\DateTimeImmutable::createFromFormat('U.u', 1521243339.873676));
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/MailgunRequestParserTest.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/MailgunRequestParserTest.php
new file mode 100644
index 0000000000000..d037dcc60b7f5
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgu
10000
n/Tests/Webhook/MailgunRequestParserTest.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Bridge\Mailgun\Tests\Webhook;
+
+use Symfony\Component\Mailer\Bridge\Mailgun\RemoteEvent\MailgunPayloadConverter;
+use Symfony\Component\Mailer\Bridge\Mailgun\Webhook\MailgunRequestParser;
+use Symfony\Component\Webhook\Client\RequestParserInterface;
+use Symfony\Component\Webhook\Test\AbstractRequestParserTest;
+
+class MailgunRequestParserTest extends AbstractRequestParserTest
+{
+    protected function createRequestParser(): RequestParserInterface
+    {
+        return new MailgunRequestParser(new MailgunPayloadConverter());
+    }
+
+    protected function getSecret(): string
+    {
+        return 'key-0p6mqbf74lb20gzq9f4dhpn9rg3zyk26';
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Webhook/MailgunRequestParser.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Webhook/MailgunRequestParser.php
new file mode 100644
index 0000000000000..ee431aa16f9a6
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Webhook/MailgunRequestParser.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Bridge\Mailgun\Webhook;
+
+use Symfony\Component\HttpFoundation\ChainRequestMatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestMatcher\IsJsonRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcher\MethodRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcherInterface;
+use Symfony\Component\Mailer\Bridge\Mailgun\RemoteEvent\MailgunPayloadConverter;
+use Symfony\Component\RemoteEvent\Event\Mailer\AbstractMailerEvent;
+use Symfony\Component\RemoteEvent\Exception\ParseException;
+use Symfony\Component\Webhook\Client\AbstractRequestParser;
+use Symfony\Component\Webhook\Exception\RejectWebhookException;
+
+final class MailgunRequestParser extends AbstractRequestParser
+{
+    public function __construct(
+        private readonly MailgunPayloadConverter $converter,
+    ) {
+    }
+
+    protected function getRequestMatcher(): RequestMatcherInterface
+    {
+        return new ChainRequestMatcher([
+            new MethodRequestMatcher('POST'),
+            new IsJsonRequestMatcher(),
+        ]);
+    }
+
+    protected function doParse(Request $request, string $secret): ?AbstractMailerEvent
+    {
+        $content = $request->toArray();
+        if (
+            !isset($content['signature']['timestamp'])
+            || !isset($content['signature']['token'])
+            || !isset($content['signature']['signature'])
+            || !isset($content['event-data']['event'])
+            || !isset($content['event-data']['tags'])
+            || !isset($content['event-data']['user-variables'])
+        ) {
+            throw new RejectWebhookException(406, 'Payload is malformed.');
+        }
+
+        $this->validateSignature($content['signature'], $secret);
+
+        try {
+            return $this->converter->convert($content['event-data']);
+        } catch (ParseException $e) {
+            throw new RejectWebhookException(406, $e->getMessage(), $e);
+        }
+    }
+
+    private function validateSignature(array $signature, string $secret): void
+    {
+        // see https://documentation.mailgun.com/en/latest/user_manual.html#webhooks-1
+        if (!hash_equals($signature['signature'], hash_hmac('sha256', $signature['timestamp'].$signature['token'], $secret))) {
+            throw new RejectWebhookException(406, 'Signature is wrong.');
+        }
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json
index 87c7dd84429a5..4f7f6de23d5d1 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json
@@ -20,7 +20,11 @@
         "symfony/mailer": "^5.4.21|^6.2.7"
     },
     "require-dev": {
-        "symfony/http-client": "^5.4|^6.0"
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/webhook": "^6.3"
+    },
+    "conflict": {
+        "symfony/http-foundation": "<6.2"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Mailgun\\": "" },
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/RemoteEvent/PostmarkPayloadConverter.php b/src/Symfony/Component/Mailer/Bridge/Postmark/RemoteEvent/PostmarkPayloadConverter.php
new file mode 100644
index 0000000000000..6463c0e2a209c
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/RemoteEvent/PostmarkPayloadConverter.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Bridge\Postmark\RemoteEvent;
+
+use Symfony\Component\RemoteEvent\Event\Mailer\AbstractMailerEvent;
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerDeliveryEvent;
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerEngagementEvent;
+use Symfony\Component\RemoteEvent\Exception\ParseException;
+use Symfony\Component\RemoteEvent\PayloadConverterInterface;
+
+final class PostmarkPayloadConverter implements PayloadConverterInterface
+{
+    public function convert(array $payload): AbstractMailerEvent
+    {
+        if (\in_array($payload['RecordType'], ['Delivery', 'Bounce'], true)) {
+            $name = match ($payload['RecordType']) {
+                'Delivery' => MailerDeliveryEvent::DELIVERED,
+                'Bounce' => MailerDeliveryEvent::BOUNCE,
+            };
+            $event = new MailerDeliveryEvent($name, $payload['MessageID'], $payload);
+            $event->setReason($payload['Description'] ?? '');
+        } else {
+            $name = match ($payload['RecordType']) {
+                'Click' => MailerEngagementEvent::CLICK,
+                'SubscriptionChange' => MailerEngagementEvent::UNSUBSCRIBE,
+                'Open' => MailerEngagementEvent::OPEN,
+                'SpamComplaint' => MailerEngagementEvent::SPAM,
+                default => throw new ParseException(sprintf('Unsupported event "%s".', $payload['RecordType'])),
+            };
+            $event = new MailerEngagementEvent($name, $payload['MessageID'], $payload);
+        }
+        $payloadDate = match ($payload['RecordType']) {
+            'Delivery' => $payload['DeliveredAt'],
+            'Bounce' => $payload['BouncedAt'],
+            'Click' => $payload['ReceivedAt'],
+            'SubscriptionChange' => $payload['ChangedAt'],
+            'Open' => $payload['ReceivedAt'],
+            'SpamComplaint' => $payload['BouncedAt'],
+            default => throw new ParseException(sprintf('Unsupported event "%s".', $payload['RecordType'])),
+        };
+        if (!$date = \DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', $payloadDate)) {
+            throw new ParseException(sprintf('Invalid date "%s".', $payloadDate));
+        }
+        $event->setDate($date);
+        $event->setRecipientEmail($payload['Recipient'] ?? $payload['Email']);
+        $event->setMetadata($payload['Metadata']);
+        $event->setTags([$payload['Tag']]);
+
+        return $event;
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/bounce.json b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/bounce.json
new file mode 100644
index 0000000000000..d8658cbae3716
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/bounce.json
@@ -0,0 +1,25 @@
+{
+    "Metadata": {
+      "example": "value",
+      "example_2": "value"
+    },
+    "RecordType": "Bounce",
+    "ID": 42,
+    "Type": "HardBounce",
+    "TypeCode": 1,
+    "Name": "Hard bounce",
+    "Tag": "Test",
+    "MessageID": "00000000-0000-0000-0000-000000000000",
+    "ServerID": 1234,
+    "MessageStream": "outbound",
+    "Description": "The server was unable to deliver your message (ex: unknown user, mailbox not found).",
+    "Details": "Test bounce details",
+    "Email": "john@example.com",
+    "From": "sender@example.com",
+    "BouncedAt": "2022-09-02T14:29:19Z",
+    "DumpAvailable": true,
+    "Inactive": true,
+    "CanActivate": true,
+    "Subject": "Test subject",
+    "Content": "Test content"
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/bounce.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/bounce.php
new file mode 100644
index 0000000000000..5d2f453ce21ac
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/bounce.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerDeliveryEvent;
+
+$wh = new MailerDeliveryEvent(MailerDeliveryEvent::BOUNCE, '00000000-0000-0000-0000-000000000000', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true));
+$wh->setRecipientEmail('john@example.com');
+$wh->setTags(['Test']);
+$wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
+$wh->setReason('The server was unable to deliver your message (ex: unknown user, mailbox not found).');
+$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T14:29:19Z'));
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/delivery.json b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/delivery.json
new file mode 100644
index 0000000000000..62f8303a3c8a0
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/delivery.json
@@ -0,0 +1,14 @@
+{
+    "RecordType": "Delivery",
+    "ServerID": 23,
+    "MessageStream": "outbound",
+    "MessageID": "00000000-0000-0000-0000-000000000000",
+    "Recipient": "john@example.com",
+    "Tag": "welcome-email",
+    "DeliveredAt": "2022-09-02T11:49:27Z",
+    "Details": "Test delivery webhook details",
+    "Metadata": {
+      "example": "value",
+      "example_2": "value"
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/delivery.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/delivery.php
new file mode 100644
index 0000000000000..6adb84cbb2832
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/delivery.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerDeliveryEvent;
+
+$wh = new MailerDeliveryEvent(MailerDeliveryEvent::DELIVERED, '00000000-0000-0000-0000-000000000000', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true));
+$wh->setRecipientEmail('john@example.com');
+$wh->setTags(['welcome-email']);
+$wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
+$wh->setReason('');
+$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T11:49:27Z'));
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/link_click.json b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/link_click.json
new file mode 100644
index 0000000000000..cd0af00d02bc3
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/link_click.json
@@ -0,0 +1,36 @@
+{
+    "Metadata": {
+      "example": "value",
+      "example_2": "value"
+    },
+    "RecordType": "Click",
+    "ClickLocation": "HTML",
+    "Client": {
+      "Name": "Chrome 35.0.1916.153",
+      "Company": "Google",
+      "Family": "Chrome"
+    },
+    "OS": {
+      "Name": "OS X 10.7 Lion",
+      "Company": "Apple Computer, Inc.",
+      "Family": "OS X 10"
+    },
+    "Platform": "Desktop",
+    "UserAgent": "Mozilla\/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit\/537.36 (KHTML, like Gecko) Chrome\/35.0.1916.153 Safari\/537.36",
+    "OriginalLink": "https://example.com",
+    "Geo": {
+      "CountryISOCode": "RS",
+      "Country": "Serbia",
+      "RegionISOCode": "VO",
+      "Region": "Autonomna Pokrajina Vojvodina",
+      "City": "Novi Sad",
+      "Zip": "21000",
+      "Coords": "45.2517,19.8369",
+      "IP": "188.2.95.4"
+    },
+    "MessageID": "00000000-0000-0000-0000-000000000000",
+    "MessageStream": "outbound",
+    "ReceivedAt": "2022-09-02T14:31:09Z",
+    "Tag": "welcome-email",
+    "Recipient": "john@example.com"
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/link_click.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/link_click.php
new file mode 100644
index 0000000000000..dab89a07eed8b
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/link_click.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerEngagementEvent;
+
+$wh = new MailerEngagementEvent(MailerEngagementEvent::CLICK, '00000000-0000-0000-0000-000000000000', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true));
+$wh->setRecipientEmail('john@example.com');
+$wh->setTags(['welcome-email']);
+$wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
+$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T14:31:09Z'));
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/open.json b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/open.json
new file mode 100644
index 0000000000000..ace6f4041188f
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/open.json
@@ -0,0 +1,36 @@
+{
+    "Metadata": {
+      "example": "value",
+      "example_2": "value"
+    },
+    "RecordType": "Open",
+    "FirstOpen": true,
+    "Client": {
+      "Name": "Chrome 35.0.1916.153",
+      "Company": "Google",
+      "Family": "Chrome"
+    },
+    "OS": {
+      "Name": "OS X 10.7 Lion",
+      "Company": "Apple Computer, Inc.",
+      "Family": "OS X 10"
+    },
+    "Platform": "WebMail",
+    "UserAgent": "Mozilla\/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit\/537.36 (KHTML, like Gecko) Chrome\/35.0.1916.153 Safari\/537.36",
+    "ReadSeconds": 5,
+    "Geo": {
+      "CountryISOCode": "RS",
+      "Country": "Serbia",
+      "RegionISOCode": "VO",
+      "Region": "Autonomna Pokrajina Vojvodina",
+      "City": "Novi Sad",
+      "Zip": "21000",
+      "Coords": "45.2517,19.8369",
+      "IP": "188.2.95.4"
+    },
+    "MessageID": "00000000-0000-0000-0000-000000000000",
+    "MessageStream": "outbound",
+    "ReceivedAt": "2022-09-02T14:30:47Z",
+    "Tag": "welcome-email",
+    "Recipient": "john@example.com"
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/open.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/open.php
new file mode 100644
index 0000000000000..cd91e6dcdafbb
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/open.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerEngagementEvent;
+
+$wh = new MailerEngagementEvent(MailerEngagementEvent::OPEN, '00000000-0000-0000-0000-000000000000', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true));
+$wh->setRecipientEmail('john@example.com');
+$wh->setTags(['welcome-email']);
+$wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
+$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T14:30:47Z'));
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/spam_complaint.json b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/spam_complaint.json
new file mode 100644
index 0000000000000..222819433d4fe
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/spam_complaint.json
@@ -0,0 +1,25 @@
+{
+    "Metadata": {
+      "example": "value",
+      "example_2": "value"
+    },
+    "RecordType": "SpamComplaint",
+    "ID": 42,
+    "Type": "SpamComplaint",
+    "TypeCode": 100001,
+    "Name": "Spam complaint",
+    "Tag": "Test",
+    "MessageID": "00000000-0000-0000-0000-000000000000",
+    "ServerID": 1234,
+    "MessageStream": "outbound",
+    "Description": "The subscriber explicitly marked this message as spam.",
+    "Details": "Test spam complaint details",
+    "Email": "john@example.com",
+    "From": "sender@example.com",
+    "BouncedAt": "2022-09-02T14:29:57Z",
+    "DumpAvailable": true,
+    "Inactive": true,
+    "CanActivate": false,
+    "Subject": "Test subject",
+    "Content": "Test content"
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/spam_complaint.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/spam_complaint.php
new file mode 100644
index 0000000000000..87a22219c5bbb
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/spam_complaint.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerEngagementEvent;
+
+$wh = new MailerEngagementEvent(MailerEngagementEvent::SPAM, '00000000-0000-0000-0000-000000000000', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true));
+$wh->setRecipientEmail('john@example.com');
+$wh->setTags(['Test']);
+$wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
+$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T14:29:57Z'));
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/subscription_change.json b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/subscription_change.json
new file mode 100644
index 0000000000000..68ba55b64629e
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/subscription_change.json
@@ -0,0 +1,16 @@
+{
+    "RecordType": "SubscriptionChange",
+    "MessageID": "00000000-0000-0000-0000-000000000000",
+    "ServerID": 23,
+    "MessageStream": "outbound",
+    "ChangedAt": "2022-09-02T14:32:30Z",
+    "Recipient": "john@example.com",
+    "Origin": "Recipient",
+    "SuppressSending": true,
+    "SuppressionReason": "HardBounce",
+    "Tag": "welcome-email",
+    "Metadata": {
+      "example": "value",
+      "example_2": "value"
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/subscription_change.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/subscription_change.php
new file mode 100644
index 0000000000000..65c82c972f8f6
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/Fixtures/subscription_change.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Mailer\MailerEngagementEvent;
+
+$wh = new MailerEngagementEvent(MailerEngagementEvent::UNSUBSCRIBE, '00000000-0000-0000-0000-000000000000', json_decode(file_get_contents(str_replace('.php', '.json', __FILE__)), true));
+$wh->setRecipientEmail('john@example.com');
+$wh->setTags(['welcome-email']);
+$wh->setMetadata(['example' => 'value', 'example_2' => 'value']);
+$wh->setDate(\DateTimeImmutable::createFromFormat('Y-m-d\TH:i:sT', '2022-09-02T14:32:30Z'));
+
+return $wh;
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/PostmarkRequestParserTest.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/PostmarkRequestParserTest.php
new file mode 100644
index 0000000000000..3a135060b440d
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/PostmarkRequestParserTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Bridge\Postmark\Tests\Webhook;
+
+use Symfony\Component\Mailer\Bridge\Postmark\RemoteEvent\PostmarkPayloadConverter;
+use Symfony\Component\Mailer\Bridge\Postmark\Webhook\PostmarkRequestParser;
+use Symfony\Component\Webhook\Client\RequestParserInterface;
+use Symfony\Component\Webhook\Test\AbstractRequestParserTest;
+
+class PostmarkRequestParserTest extends AbstractRequestParserTest
+{
+    protected function createRequestParser(): RequestParserInterface
+    {
+        return new PostmarkRequestParser(new PostmarkPayloadConverter());
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Webhook/PostmarkRequestParser.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Webhook/PostmarkRequestParser.php
new file mode 100644
index 0000000000000..5ffd8a17d0a30
--- /dev/null
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Webhook/PostmarkRequestParser.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Bridge\Postmark\Webhook;
+
+use Symfony\Component\HttpFoundation\ChainRequestMatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestMatcher\IpsRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcher\IsJsonRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcher\MethodRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcherInterface;
+use Symfony\Component\Mailer\Bridge\Postmark\RemoteEvent\PostmarkPayloadConverter;
+use Symfony\Component\Webhook\Client\AbstractRequestParser;
+use Symfony\Component\Webhook\Exception\RejectWebhookException;
+use Symfony\Component\RemoteEvent\Event\Mailer\AbstractMailerEvent;
+use Symfony\Component\RemoteEvent\Exception\ParseException;
+
+final class PostmarkRequestParser extends AbstractRequestParser
+{
+    public function __construct(
+        private readonly PostmarkPayloadConverter $converter,
+    ) {
+    }
+
+    protected function getRequestMatcher(): RequestMatcherInterface
+    {
+        return new ChainRequestMatcher([
+            new MethodRequestMatcher('POST'),
+            // https://postmarkapp.com/support/article/800-ips-for-firewalls#webhooks
+            // localhost is added for testing
+            new IpsRequestMatcher(['3.134.147.250', '50.31.156.6', '50.31.156.77', '18.217.206.57', '127.0.0.1']),
+            new IsJsonRequestMatcher(),
+        ]);
+    }
+
+    protected function doParse(Request $request, string $secret): ?AbstractMailerEvent
+    {
+        $payload = $request->toArray();
+        if (
+            !isset($payload['RecordType'])
+            || !isset($payload['MessageID'])
+            || !(isset($payload['Recipient']) || isset($payload['Email']))
+            || !isset($payload['Metadata'])
+            || !isset($payload['Tag'])
+        ) {
+            throw new RejectWebhookException(406, 'Payload is malformed.');
+        }
+
+        try {
+            return $this->converter->convert($payload);
+        } catch (ParseException $e) {
+            throw new RejectWebhookException(406, $e->getMessage(), $e);
+        }
+    }
+}
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json
index 77ff5324abf99..55fe5c4a83960 100644
--- a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json
@@ -21,7 +21,11 @@
         "symfony/mailer": "^5.4.21|^6.2.7"
     },
     "require-dev": {
-        "symfony/http-client": "^5.4|^6.0"
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/webhook": "^6.3"
+    },
+    "conflict": {
+        "symfony/http-foundation": "<6.2"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Postmark\\": "" },
diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/Fixtures/delivered.php b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/Fixtures/delivered.php
new file mode 100644
index 0000000000000..2b4ccb9988d3f
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/Fixtures/delivered.php
@@ -0,0 +1,9 @@
+<?php
+
+use Symfony\Component\RemoteEvent\Event\Sms\SmsEvent;
+
+parse_str(trim(file_get_contents(str_replace('.php', '.txt', __FILE__))), $payload);
+$wh = new SmsEvent(SmsEvent::DELIVERED, 'SM4262411b90e5464b98a4f66a49c57a97', $payload);
+$wh->setRecipientPhone('+15622089096');
+
+return $wh;
diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/Fixtures/delivered.txt b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/Fixtures/delivered.txt
new file mode 100644
index 0000000000000..672103afccaa4
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/Fixtures/delivered.txt
@@ -0,0 +1 @@
+SmsSid=SM4262411b90e5464b98a4f66a49c57a97&SmsStatus=delivered&MessageStatus=delivered&To=%2B15622089096&MessagingServiceSid=MG4d9d720b38f7892254869fabdca51e69&MessageSid=SM4262411b90e5464b98a4f66a49c57a97&AccountSid=AC0db966d80e9f1662da09c61287f8bba1&From=%2B16232320112&ApiVersion=2010-04-01
diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/TwilioRequestParserTest.php b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/TwilioRequestParserTest.php
new file mode 100644
index 0000000000000..41e0bd2d8ac42
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/TwilioRequestParserTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Twilio\Tests\Webhook;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Notifier\Bridge\Twilio\Webhook\TwilioRequestParser;
+use Symfony\Component\Webhook\Client\RequestParserInterface;
+use Symfony\Component\Webhook\Test\AbstractRequestParserTest;
+
+class TwilioRequestParserTest extends AbstractRequestParserTest
+{
+    protected function createRequestParser(): RequestParserInterface
+    {
+        return new TwilioRequestParser();
+    }
+
+    protected function createRequest(string $payload): Request
+    {
+        parse_str(trim($payload), $parameters);
+
+        return Request::create('/', 'POST', $parameters, [], [], [
+            'Content-Type' => 'application/x-www-form-urlencoded',
+        ]);
+    }
+
+    protected static function getFixtureExtension(): string
+    {
+        return 'txt';
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioOptions.php b/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioOptions.php
new file mode 100644
index 0000000000000..81077b4eaac01
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioOptions.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Twilio;
+
+use Symfony\Component\Notifier\Message\MessageOptionsInterface;
+
+final class TwilioOptions implements MessageOptionsInterface
+{
+    public function __construct(
+        private array $options = [],
+    ) {
+    }
+
+    public function toArray(): array
+    {
+        return $this->options;
+    }
+
+    public function getRecipientId(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * @return $this
+     */
+    public function webhookUrl(string $url): static
+    {
+        $this->options['webhook_url'] = $url;
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php b/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php
index e467233afeac2..adced312f5f3a 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Notifier\Bridge\Twilio;
 
 use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Exception\LogicException;
 use Symfony\Component\Notifier\Exception\TransportException;
 use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
 use Symfony\Component\Notifier\Message\MessageInterface;
@@ -49,7 +50,7 @@ public function __toString(): string
 
     public function supports(MessageInterface $message): bool
     {
-        return $message instanceof SmsMessage;
+        return $message instanceof SmsMessage && (null === $message->getOptions() || $message->getOptions() instanceof TwilioOptions);
     }
 
     protected function doSend(MessageInterface $message): SentMessage
@@ -58,6 +59,10 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
+        if ($message->getOptions() && !$message->getOptions() instanceof TwilioOptions) {
+            throw new LogicException(sprintf('The "%s" transport only supports instances of "%s" for options.', __CLASS__, TwilioOptions::class));
+        }
+
         $from = $message->getFrom() ?: $this->from;
 
         if (!preg_match('/^[a-zA-Z0-9\s]{2,11}$/', $from) && !preg_match('/^\+[1-9]\d{1,14}$/', $from)) {
@@ -65,13 +70,18 @@ protected function doSend(MessageInterface $message): SentMessage
         }
 
         $endpoint = sprintf('https://%s/2010-04-01/Accounts/%s/Messages.json', $this->getEndpoint(), $this->accountSid);
+        $options = ($opts = $message->getOptions()) ? $opts->toArray() : [];
+        $body = [
+            'From' => $from,
+            'To' => $message->getPhone(),
+            'Body' => $message->getSubject(),
+        ];
+        if (isset($options['webhook_url'])) {
+            $body['StatusCallback'] = $options['webhook_url'];
+        }
         $response = $this->client->request('POST', $endpoint, [
             'auth_basic' => $this->accountSid.':'.$this->authToken,
-            'body' => [
-                'From' => $from,
-                'To' => $message->getPhone(),
-                'Body' => $message->getSubject(),
-            ],
+            'body' => $body,
         ]);
 
         try {
diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/Webhook/TwilioRequestParser.php b/src/Symfony/Component/Notifier/Bridge/Twilio/Webhook/TwilioRequestParser.php
new file mode 100644
index 0000000000000..24bf65dcae683
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/Twilio/Webhook/TwilioRequestParser.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\Twilio\Webhook;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestMatcher\MethodRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcherInterface;
+use Symfony\Component\RemoteEvent\Event\Sms\SmsEvent;
+use Symfony\Component\Webhook\Client\AbstractRequestParser;
+use Symfony\Component\Webhook\Exception\RejectWebhookException;
+
+final class TwilioRequestParser extends AbstractRequestParser
+{
+    protected function getRequestMatcher(): RequestMatcherInterface
+    {
+        return new MethodRequestMatcher('POST');
+    }
+
+    protected function doParse(Request $request, string $secret): ?SmsEvent
+    {
+        // Statuses: https://www.twilio.com/docs/sms/api/message-resource#message-status-values
+        // Payload examples: https://www.twilio.com/docs/sms/outbound-message-logging
+        $payload = $request->request->all();
+        if (
+            !isset($payload['MessageStatus'])
+            || !isset($payload['MessageSid'])
+            || !isset($payload['To'])
+        ) {
+            throw new RejectWebhookException(406, 'Payload is malformed.');
+        }
+
+        $name = match ($payload['MessageStatus']) {
+            'delivered' => SmsEvent::DELIVERED,
+            'failed' => SmsEvent::FAILED,
+            'undelivered' => SmsEvent::FAILED,
+            'accepted' => null,
+            'queued' => null,
+            'sending' => null,
+            'sent' => null,
+            'canceled' => null,
+            'receiving' => null,
+            'received' => null,
+            'scheduled' => null,
+            default => throw new RejectWebhookException(406, sprintf('Unsupported event "%s".', $payload['event'])),
+        };
+        if (!$name) {
+            return null;
+        }
+        $event = new SmsEvent($name, $payload['MessageSid'], $payload);
+        $event->setRecipientPhone($payload['To']);
+
+        return $event;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json b/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json
index 5a6d350a2674b..6bebb65ffcaf4 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json
@@ -20,6 +20,12 @@
         "symfony/http-client": "^5.4|^6.0",
         "symfony/notifier": "^6.2.7"
     },
+    "require-dev": {
+        "symfony/webhook": "^6.3"
+    },
+    "conflict": {
+        "symfony/http-foundation": "<6.2"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Twilio\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/RemoteEvent/.gitattributes b/src/Symfony/Component/RemoteEvent/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/RemoteEvent/.gitignore b/src/Symfony/Component/RemoteEvent/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/RemoteEvent/Attribute/AsRemoteEventConsumer.php b/src/Symfony/Component/RemoteEvent/Attribute/AsRemoteEventConsumer.php
new file mode 100644
index 0000000000000..e130dc8511080
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Attribute/AsRemoteEventConsumer.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Attribute;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class AsRemoteEventConsumer
+{
+    public function __construct(
+        public string $name,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/RemoteEvent/CHANGELOG.md b/src/Symfony/Component/RemoteEvent/CHANGELOG.md
new file mode 100644
index 0000000000000..0634052525eae
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+ * Add the component (experimental)
diff --git a/src/Symfony/Component/RemoteEvent/Consumer/ConsumerInterface.php b/src/Symfony/Component/RemoteEvent/Consumer/ConsumerInterface.php
new file mode 100644
index 0000000000000..407cf174632b1
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Consumer/ConsumerInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Consumer;
+
+use Symfony\Component\RemoteEvent\RemoteEvent;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+interface ConsumerInterface
+{
+    public function consume(RemoteEvent $event): void;
+}
diff --git a/src/Symfony/Component/RemoteEvent/Event/Mailer/AbstractMailerEvent.php b/src/Symfony/Component/RemoteEvent/Event/Mailer/AbstractMailerEvent.php
new file mode 100644
index 0000000000000..c094e136ef8c7
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Event/Mailer/AbstractMailerEvent.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Event\Mailer;
+
+use Symfony\Component\RemoteEvent\RemoteEvent;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+abstract class AbstractMailerEvent extends RemoteEvent
+{
+    private \DateTimeImmutable $date;
+    private string $email = '';
+    private array $metadata = [];
+    private array $tags = [];
+
+    public function setDate(\DateTimeImmutable $date): void
+    {
+        $this->date = $date;
+    }
+
+    public function getDate(): \DateTimeImmutable
+    {
+        return $this->date;
+    }
+
+    public function setRecipientEmail(string $email): void
+    {
+        $this->email = $email;
+    }
+
+    public function getRecipientEmail(): string
+    {
+        return $this->email;
+    }
+
+    public function setMetadata(array $metadata): void
+    {
+        $this->metadata = $metadata;
+    }
+
+    public function getMetadata(): array
+    {
+        return $this->metadata;
+    }
+
+    public function setTags(array $tags): void
+    {
+        $this->tags = $tags;
+    }
+
+    public function getTags(): array
+    {
+        return $this->tags;
+    }
+}
diff --git a/src/Symfony/Component/RemoteEvent/Event/Mailer/MailerDeliveryEvent.php b/src/Symfony/Component/RemoteEvent/Event/Mailer/MailerDeliveryEvent.php
new file mode 100644
index 0000000000000..a86788e8ebcd8
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Event/Mailer/MailerDeliveryEvent.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Event\Mailer;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+final class MailerDeliveryEvent extends AbstractMailerEvent
+{
+    public const RECEIVED = 'received';
+    public const DROPPED = 'dropped';
+    public const DELIVERED = 'delivered';
+    public const DEFERRED = 'deferred';
+    public const BOUNCE = 'bounce';
+
+    private string $reason = '';
+
+    public function setReason(string $reason): void
+    {
+        $this->reason = $reason;
+    }
+
+    public function getReason(): string
+    {
+        return $this->reason;
+    }
+}
diff --git a/src/Symfony/Component/RemoteEvent/Event/Mailer/MailerEngagementEvent.php b/src/Symfony/Component/RemoteEvent/Event/Mailer/MailerEngagementEvent.php
new file mode 100644
index 0000000000000..0425ed46cf611
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Event/Mailer/MailerEngagementEvent.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Event\Mailer;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+final class MailerEngagementEvent extends AbstractMailerEvent
+{
+    public const OPEN = 'open';
+    public const CLICK = 'click';
+    public const SPAM = 'spam';
+    public const UNSUBSCRIBE = 'unsubscribe';
+}
diff --git a/src/Symfony/Component/RemoteEvent/Event/Sms/SmsEvent.php b/src/Symfony/Component/RemoteEvent/Event/Sms/SmsEvent.php
new file mode 100644
index 0000000000000..a2330047d539e
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Event/Sms/SmsEvent.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Event\Sms;
+
+use Symfony\Component\RemoteEvent\RemoteEvent;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+final class SmsEvent extends RemoteEvent
+{
+    public const FAILED = 'failed';
+    public const DELIVERED = 'delivered';
+
+    private string $phone = '';
+
+    public function setRecipientPhone(string $phone): void
+    {
+        $this->phone = $phone;
+    }
+
+    public function getRecipientPhone(): string
+    {
+        return $this->phone;
+    }
+}
diff --git a/src/Symfony/Component/RemoteEvent/Exception/ExceptionInterface.php b/src/Symfony/Component/RemoteEvent/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000000..67616fa0b9a5c
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Exception/ExceptionInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Exception;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+interface ExceptionInterface extends \Throwable
+{
+}
diff --git a/src/Symfony/Component/RemoteEvent/Exception/InvalidArgumentException.php b/src/Symfony/Component/RemoteEvent/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000000..1092e60fed80c
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Exception/InvalidArgumentException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Exception;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/RemoteEvent/Exception/LogicException.php b/src/Symfony/Component/RemoteEvent/Exception/LogicException.php
new file mode 100644
index 0000000000000..05b01651f183c
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Exception/LogicException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Exception;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class LogicException extends \LogicException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/RemoteEvent/Exception/ParseException.php b/src/Symfony/Component/RemoteEvent/Exception/ParseException.php
new file mode 100644
index 0000000000000..f2365e053c3ee
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Exception/ParseException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Exception;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class ParseException extends InvalidArgumentException
+{
+}
diff --git a/src/Symfony/Component/RemoteEvent/Exception/RuntimeException.php b/src/Symfony/Component/RemoteEvent/Exception/RuntimeException.php
new file mode 100644
index 0000000000000..290ff094e655c
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Exception/RuntimeException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Exception;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/RemoteEvent/LICENSE b/src/Symfony/Component/RemoteEvent/LICENSE
new file mode 100644
index 0000000000000..733c826ebcd63
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2022-present Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventHandler.php b/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventHandler.php
new file mode 100644
index 0000000000000..daa7f4d8d9fda
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventHandler.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Messenger;
+
+use Psr\Container\ContainerInterface;
+use Symfony\Component\RemoteEvent\Exception\LogicException;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class ConsumeRemoteEventHandler
+{
+    public function __construct(
+        private readonly ContainerInterface $consumers,
+    ) {
+    }
+
+    public function __invoke(ConsumeRemoteEventMessage $message): void
+    {
+        if (!$this->consumers->has($message->getType())) {
+            throw new LogicException(sprintf('Unable to find a consumer for message of type "%s".', $message->getType()));
+        }
+        $consumer = $this->consumers->get($message->getType());
+
+        $consumer->consume($message->getEvent());
+    }
+}
diff --git a/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventMessage.php b/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventMessage.php
new file mode 100644
index 0000000000000..23665865ddf02
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventMessage.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Messenger;
+
+use Symfony\Component\RemoteEvent\RemoteEvent;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class ConsumeRemoteEventMessage
+{
+    public function __construct(
+        private string $type,
+        private RemoteEvent $event,
+    ) {
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function getEvent(): RemoteEvent
+    {
+        return $this->event;
+    }
+}
diff --git a/src/Symfony/Component/RemoteEvent/PayloadConverterInterface.php b/src/Symfony/Component/RemoteEvent/PayloadConverterInterface.php
new file mode 100644
index 0000000000000..9241418022b66
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/PayloadConverterInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent;
+
+use Symfony\Component\RemoteEvent\Exception\ParseException;
+
+interface PayloadConverterInterface
+{
+    /**
+     * @throws ParseException when the payload is not valid
+     */
+    public function convert(array $payload): RemoteEvent;
+}
diff --git a/src/Symfony/Component/RemoteEvent/README.md b/src/Symfony/Component/RemoteEvent/README.md
new file mode 100644
index 0000000000000..caf7a85e78b1a
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/README.md
@@ -0,0 +1,13 @@
+RemoteEvent Component
+=====================
+
+Symfony RemoteEvent eases handling remote events.
+
+Resources
+---------
+
+ * [Documentation](https://symfony.com/doc/current/remote-event.html)
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/RemoteEvent/RemoteEvent.php b/src/Symfony/Component/RemoteEvent/RemoteEvent.php
new file mode 100644
index 0000000000000..e9fe2075b21a2
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/RemoteEvent.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class RemoteEvent
+{
+    public function __construct(
+        private string $name,
+        private string $id,
+        private array $payload,
+    ) {
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    public function getPayload(): array
+    {
+        return $this->payload;
+    }
+}
diff --git a/src/Symfony/Component/RemoteEvent/Tests/Event/Sms/SmsEventTest.php b/src/Symfony/Component/RemoteEvent/Tests/Event/Sms/SmsEventTest.php
new file mode 100644
index 0000000000000..94a0143cceb63
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/Tests/Event/Sms/SmsEventTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\RemoteEvent\Tests\Event\Sms;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\RemoteEvent\Event\Sms\SmsEvent;
+
+class SmsEventTest extends TestCase
+{
+    public function testPhone()
+    {
+        $event = new SmsEvent('name', 'id', []);
+        $event->setRecipientPhone($phone = '0102030405');
+        $this->assertSame($phone, $event->getRecipientPhone());
+    }
+}
diff --git a/src/Symfony/Component/RemoteEvent/composer.json b/src/Symfony/Component/RemoteEvent/composer.json
new file mode 100644
index 0000000000000..527b4f8c5d796
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/composer.json
@@ -0,0 +1,29 @@
+{
+    "name": "symfony/remote-event",
+    "type": "library",
+    "description": "Eases handling remote events",
+    "keywords": ["event"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/messenger": "^5.4|^6.1"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\RemoteEvent\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/RemoteEvent/phpunit.xml.dist b/src/Symfony/Component/RemoteEvent/phpunit.xml.dist
new file mode 100644
index 0000000000000..80dd2bf19ffee
--- /dev/null
+++ b/src/Symfony/Component/RemoteEvent/phpunit.xml.dist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony RemoteEvent Component Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory>./</directory>
+        </include>
+        <exclude>
+            <directory>./Tests</directory>
+            <directory>./vendor</directory>
+        </exclude>
+    </coverage>
+</phpunit>
diff --git a/src/Symfony/Component/Webhook/.gitattributes b/src/Symfony/Component/Webhook/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Webhook/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Webhook/.gitignore b/src/Symfony/Component/Webhook/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Webhook/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Webhook/CHANGELOG.md b/src/Symfony/Component/Webhook/CHANGELOG.md
new file mode 100644
index 0000000000000..0634052525eae
--- /dev/null
+++ b/src/Symfony/Component/Webhook/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+ * Add the component (experimental)
diff --git a/src/Symfony/Component/Webhook/Client/AbstractRequestParser.php b/src/Symfony/Component/Webhook/Client/AbstractRequestParser.php
new file mode 100644
index 0000000000000..9e162931a48d7
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Client/AbstractRequestParser.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Client;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestMatcherInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\RemoteEvent\RemoteEvent;
+use Symfony\Component\Webhook\Exception\RejectWebhookException;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+abstract class AbstractRequestParser implements RequestParserInterface
+{
+    public function parse(Request $request, string $secret): ?RemoteEvent
+    {
+        $this->validate($request);
+
+        return $this->doParse($request, $secret);
+    }
+
+    public function createSuccessfulResponse(): Response
+    {
+        return new Response('', 202);
+    }
+
+    public function createRejectedResponse(string $reason): Response
+    {
+        return new Response($reason, 406);
+    }
+
+    abstract protected function getRequestMatcher(): RequestMatcherInterface;
+
+    abstract protected function doParse(Request $request, string $secret): ?RemoteEvent;
+
+    protected function validate(Request $request): void
+    {
+        if (!$this->getRequestMatcher()->matches($request)) {
+            throw new RejectWebhookException(406, 'Request does not match.');
+        }
+    }
+}
diff --git a/src/Symfony/Component/Webhook/Client/RequestParser.php b/src/Symfony/Component/Webhook/Client/RequestParser.php
new file mode 100644
index 0000000000000..08e4ab9626bfb
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Client/RequestParser.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Client;
+
+use Symfony\Component\HttpFoundation\ChainRequestMatcher;
+use Symfony\Component\HttpFoundation\HeaderBag;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestMatcher\IsJsonRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcher\MethodRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcherInterface;
+use Symfony\Component\RemoteEvent\RemoteEvent;
+use Symfony\Component\Webhook\Exception\RejectWebhookException;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class RequestParser extends AbstractRequestParser
+{
+    public function __construct(
+        private readonly string $algo = 'sha256',
+        private readonly string $signatureHeaderName = 'Webhook-Signature',
+        private readonly string $eventHeaderName = 'Webhook-Event',
+        private readonly string $idHeaderName = 'Webhook-Id',
+    ) {
+    }
+
+    protected function getRequestMatcher(): RequestMatcherInterface
+    {
+        return new ChainRequestMatcher([
+            new MethodRequestMatcher('POST'),
+            new IsJsonRequestMatcher(),
+        ]);
+    }
+
+    protected function doParse(Request $request, string $secret): RemoteEvent
+    {
+        // $body = $this->bodyParser->parse($request, $secret);
+        $body = $request->toArray();
+
+        // $this->headerParser->validate($request, $secret);
+        foreach ([$this->signatureHeaderName, $this->eventHeaderName, $this->idHeaderName] as $header) {
+            if (!$request->headers->has($header)) {
+                throw new RejectWebhookException(406, sprintf('Missing "%s" HTTP request signature header.', $header));
+            }
+        }
+
+        // $this->signatureParser->validate($request, $secret);
+        $this->validateSignature($request->headers, $request->getContent(), $secret);
+
+        return new RemoteEvent(
+            $request->headers->get($this->eventHeaderName),
+            $request->headers->get($this->idHeaderName),
+            $body
+        );
+    }
+
+    private function validateSignature(HeaderBag $headers, string $body, $secret): void
+    {
+        $signature = $headers->get($this->signatureHeaderName);
+        $event = $headers->get($this->eventHeaderName);
+        $id = $headers->get($this->idHeaderName);
+
+        if (!hash_equals($signature, $this->algo.'='.hash_hmac($this->algo, $event.$id.$body, $secret))) {
+            throw new RejectWebhookException(406, 'Signature is wrong.');
+        }
+    }
+}
diff --git a/src/Symfony/Component/Webhook/Client/RequestParserInterface.php b/src/Symfony/Component/Webhook/Client/RequestParserInterface.php
new file mode 100644
index 0000000000000..cff44ce8c0cf0
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Client/RequestParserInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Client;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\RemoteEvent\RemoteEvent;
+use Symfony\Component\Webhook\Exception\RejectWebhookException;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+interface RequestParserInterface
+{
+    /**
+     * Parses an HTTP Request and converts it into a RemoteEvent.
+     *
+     * @return ?RemoteEvent Returns null if the webhook must be ignored
+     *
+     * @throws RejectWebhookException When the payload is rejected (signature issue, parse issue, ...)
+     */
+    public function parse(Request $request, string $secret): ?RemoteEvent;
+
+    public function createSuccessfulResponse(): Response;
+
+    public function createRejectedResponse(string $reason): Response;
+}
diff --git a/src/Symfony/Component/Webhook/Controller/WebhookController.php b/src/Symfony/Component/Webhook/Controller/WebhookController.php
new file mode 100644
index 0000000000000..f0d90f0609889
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Controller/WebhookController.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Controller;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\RemoteEvent\Messenger\ConsumeRemoteEventMessage;
+use Symfony\Component\Webhook\Client\RequestParserInterface;
+
+/**
+ * Receives webhooks from a variety of third-party providers.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ *
+ * @internal
+ */
+final class WebhookController
+{
+    public function __construct(
+        /** @var array<string, array{parser: RequestParserInterface, secret: string}> $parsers */
+        private array $parsers,
+        private MessageBusInterface $bus,
+    ) {
+    }
+
+    public function handle(string $type, Request $request): Response
+    {
+        if (!isset($this->parsers[$type])) {
+            return new Response(sprintf('No parser found for webhook of type "%s".', $type), 404);
+        }
+        /** @var RequestParserInterface $parser */
+        $parser = $this->parsers[$type]['parser'];
+
+        if (!$event = $parser->parse($request, $this->parsers[$type]['secret'])) {
+            return $parser->createRejectedResponse('Unable to parse the webhook payload.');
+        }
+
+        $this->bus->dispatch(new ConsumeRemoteEventMessage($type, $event));
+
+        return $parser->createSuccessfulResponse();
+    }
+}
diff --git a/src/Symfony/Component/Webhook/Exception/ExceptionInterface.php b/src/Symfony/Component/Webhook/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000000..0a5ac6d2e43f3
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Exception/ExceptionInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Exception;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+interface ExceptionInterface extends \Throwable
+{
+}
diff --git a/src/Symfony/Component/Webhook/Exception/InvalidArgumentException.php b/src/Symfony/Component/Webhook/Exce
10000
ption/InvalidArgumentException.php
new file mode 100644
index 0000000000000..c7bfc15b52e24
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Exception/InvalidArgumentException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Exception;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Webhook/Exception/LogicException.php b/src/Symfony/Component/Webhook/Exception/LogicException.php
new file mode 100644
index 0000000000000..4755dd89b0048
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Exception/LogicException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Exception;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class LogicException extends \LogicException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Webhook/Exception/RejectWebhookException.php b/src/Symfony/Component/Webhook/Exception/RejectWebhookException.php
new file mode 100644
index 0000000000000..50efc0b4aee23
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Exception/RejectWebhookException.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Exception;
+
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class RejectWebhookException extends HttpException
+{
+    public function __construct(int $statusCode = 406, string $message = '', \Throwable $previous = null, array $headers = [], int $code = 0)
+    {
+        parent::__construct($statusCode, $message, $previous, $headers, $code);
+    }
+}
diff --git a/src/Symfony/Component/Webhook/Exception/RuntimeException.php b/src/Symfony/Component/Webhook/Exception/RuntimeException.php
new file mode 100644
index 0000000000000..de167791ea28d
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Exception/RuntimeException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Exception;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Webhook/LICENSE b/src/Symfony/Component/Webhook/LICENSE
new file mode 100644
index 0000000000000..733c826ebcd63
--- /dev/null
+++ b/src/Symfony/Component/Webhook/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2022-present Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Webhook/Messenger/SendWebhookHandler.php b/src/Symfony/Component/Webhook/Messenger/SendWebhookHandler.php
new file mode 100644
index 0000000000000..d7cf44dda0e26
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Messenger/SendWebhookHandler.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Messenger;
+
+use Symfony\Component\Webhook\Server\TransportInterface;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class SendWebhookHandler
+{
+    public function __construct(
+        private readonly TransportInterface $transport,
+    ) {
+    }
+
+    public function __invoke(SendWebhookMessage $message): void
+    {
+        $this->transport->send($message->getSubscriber(), $message->getEvent());
+    }
+}
diff --git a/src/Symfony/Component/Webhook/Messenger/SendWebhookMessage.php b/src/Symfony/Component/Webhook/Messenger/SendWebhookMessage.php
new file mode 100644
index 0000000000000..e9e73f9321150
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Messenger/SendWebhookMessage.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Messenger;
+
+use Symfony\Component\RemoteEvent\RemoteEvent;
+use Symfony\Component\Webhook\Subscriber;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class SendWebhookMessage
+{
+    public function __construct(
+        private readonly Subscriber $subscriber,
+        private readonly RemoteEvent $event,
+    ) {
+    }
+
+    public function getSubscriber(): Subscriber
+    {
+        return $this->subscriber;
+    }
+
+    public function getEvent(): RemoteEvent
+    {
+        return $this->event;
+    }
+}
diff --git a/src/Symfony/Component/Webhook/README.md b/src/Symfony/Component/Webhook/README.md
new file mode 100644
index 0000000000000..4ef92d1d52ed1
--- /dev/null
+++ b/src/Symfony/Component/Webhook/README.md
@@ -0,0 +1,18 @@
+Webhook Component
+=================
+
+Symfony Webhook eases sending and consuming webhooks.
+
+**This Component is experimental**.
+[Experimental features](https://symfony.com/doc/current/contributing/code/experimental.html)
+are not covered by Symfony's
+[Backward Compatibility Promise](https://symfony.com/doc/current/contributing/code/bc.html).
+
+Resources
+---------
+
+ * [Documentation](https://symfony.com/doc/current/webhook.html)
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Webhook/Server/HeaderSignatureConfigurator.php b/src/Symfony/Component/Webhook/Server/HeaderSignatureConfigurator.php
new file mode 100644
index 0000000000000..d14d25c3fa93f
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Server/HeaderSignatureConfigurator.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Server;
+
+use Symfony\Component\HttpClient\HttpOptions;
+use Symfony\Component\RemoteEvent\RemoteEvent;
+use Symfony\Component\Webhook\Exception\LogicException;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+final class HeaderSignatureConfigurator implements RequestConfiguratorInterface
+{
+    public function __construct(
+        private string $algo = 'sha256',
+        private string $signatureHeaderName = 'Webhook-Signature',
+    ) {
+    }
+
+    public function configure(RemoteEvent $event, string $secret, HttpOptions $options): void
+    {
+        $opts = $options->toArray();
+        $headers = $opts['headers'];
+        if (!isset($opts['body'])) {
+            throw new LogicException('The body must be set.');
+        }
+        $body = $opts['body'];
+        $headers[$this->signatureHeaderName] = $this->algo.'='.hash_hmac($this->algo, $event->getName().$event->getId().$body, $secret);
+        $options->setHeaders($headers);
+    }
+}
diff --git a/src/Symfony/Component/Webhook/Server/HeadersConfigurator.php b/src/Symfony/Component/Webhook/Server/HeadersConfigurator.php
new file mode 100644
index 0000000000000..70ca1b63ae035
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Server/HeadersConfigurator.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Server;
+
+use Symfony\Component\HttpClient\HttpOptions;
+use Symfony\Component\RemoteEvent\RemoteEvent;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+final class HeadersConfigurator implements RequestConfiguratorInterface
+{
+    public function __construct(
+        private string $eventHeaderName = 'Webhook-Event',
+        private string $idHeaderName = 'Webhook-Id',
+    ) {
+    }
+
+    public function configure(RemoteEvent $event, string $secret, HttpOptions $options): void
+    {
+        $options->setHeaders([
+            $this->eventHeaderName => $event->getName(),
+            $this->idHeaderName => $event->getId(),
+        ]);
+    }
+}
diff --git a/src/Symfony/Component/Webhook/Server/JsonBodyConfigurator.php b/src/Symfony/Component/Webhook/Server/JsonBodyConfigurator.php
new file mode 100644
index 0000000000000..b1329e743a891
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Server/JsonBodyConfigurator.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Server;
+
+use Symfony\Component\HttpClient\HttpOptions;
+use Symfony\Component\RemoteEvent\RemoteEvent;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+final class JsonBodyConfigurator implements RequestConfiguratorInterface
+{
+    public function __construct(
+        private readonly SerializerInterface $serializer,
+    ) {
+    }
+
+    public function configure(RemoteEvent $event, string $secret, HttpOptions $options): void
+    {
+        $body = $this->serializer->serialize($event->getPayload(), 'json');
+        $options->setBody($body);
+        $headers = $options->toArray()['headers'];
+        $headers['Content-Type'] = 'application/json';
+        $options->setHeaders($headers);
+    }
+}
diff --git a/src/Symfony/Component/Webhook/Server/RequestConfiguratorInterface.php b/src/Symfony/Component/Webhook/Server/RequestConfiguratorInterface.php
new file mode 100644
index 0000000000000..57d9f56b9ac42
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Server/RequestConfiguratorInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Server;
+
+use Symfony\Component\HttpClient\HttpOptions;
+use Symfony\Component\RemoteEvent\RemoteEvent;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+interface RequestConfiguratorInterface
+{
+    public function configure(RemoteEvent $event, string $secret, HttpOptions $options): void;
+}
diff --git a/src/Symfony/Component/Webhook/Server/Transport.php b/src/Symfony/Component/Webhook/Server/Transport.php
new file mode 100644
index 0000000000000..c25b03d602ea0
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Server/Transport.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Server;
+
+use Symfony\Component\HttpClient\HttpOptions;
+use Symfony\Component\RemoteEvent\RemoteEvent;
+use Symfony\Component\Webhook\Subscriber;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+class Transport implements TransportInterface
+{
+    public function __construct(
+        private readonly HttpClientInterface $client,
+        private readonly RequestConfiguratorInterface $headers,
+        private readonly RequestConfiguratorInterface $body,
+        private readonly RequestConfiguratorInterface $signer,
+    ) {
+    }
+
+    public function send(Subscriber $subscriber, RemoteEvent $event): void
+    {
+        $options = new HttpOptions();
+
+        $this->headers->configure($event, $subscriber->getSecret(), $options);
+        $this->body->configure($event, $subscriber->getSecret(), $options);
+        $this->signer->configure($event, $subscriber->getSecret(), $options);
+
+        $this->client->request('POST', $subscriber->getUrl(), $options->toArray());
+    }
+}
diff --git a/src/Symfony/Component/Webhook/Server/TransportInterface.php b/src/Symfony/Component/Webhook/Server/TransportInterface.php
new file mode 100644
index 0000000000000..55ff825358366
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Server/TransportInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Server;
+
+use Symfony\Component\RemoteEvent\RemoteEvent;
+use Symfony\Component\Webhook\Subscriber;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+interface TransportInterface
+{
+    public function send(Subscriber $subscriber, RemoteEvent $event): void;
+}
diff --git a/src/Symfony/Component/Webhook/Subscriber.php b/src/Symfony/Component/Webhook/Subscriber.php
new file mode 100644
index 0000000000000..a369cb0470c34
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Subscriber.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook;
+
+class Subscriber
+{
+    public function __construct(
+        private string $url,
+        #[\SensitiveParameter] private string $secret,
+    ) {
+    }
+
+    public function getUrl(): string
+    {
+        return $this->url;
+    }
+
+    public function getSecret(): string
+    {
+        return $this->secret;
+    }
+}
diff --git a/src/Symfony/Component/Webhook/Test/AbstractRequestParserTest.php b/src/Symfony/Component/Webhook/Test/AbstractRequestParserTest.php
new file mode 100644
index 0000000000000..6fa3760c3cf10
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Test/AbstractRequestParserTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Test;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\RemoteEvent\RemoteEvent;
+use Symfony\Component\Webhook\Client\RequestParserInterface;
+
+abstract class AbstractRequestParserTest extends TestCase
+{
+    /**
+     * @dataProvider getPayloads
+     */
+    public function testParse(string $payload, RemoteEvent $expected)
+    {
+        $request = $this->createRequest($payload);
+        $parser = $this->createRequestParser();
+        $wh = $parser->parse($request, $this->getSecret());
+        $this->assertEquals($expected, $wh);
+    }
+
+    public static function getPayloads(): iterable
+    {
+        $currentDir = \dirname((new \ReflectionClass(static::class))->getFileName());
+        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($currentDir.'/Fixtures', \RecursiveDirectoryIterator::SKIP_DOTS)) as $file) {
+            $filename = str_replace($currentDir.'/Fixtures/', '', $file->getPathname());
+            if (static::getFixtureExtension() !== pathinfo($filename, \PATHINFO_EXTENSION)) {
+                continue;
+            }
+
+            yield $filename => [
+                file_get_contents($file),
+                include(str_replace('.'.static::getFixtureExtension(), '.php', $file->getPathname())),
+            ];
+        }
+    }
+
+    abstract protected function createRequestParser(): RequestParserInterface;
+
+    protected function getSecret(): string
+    {
+        return '';
+    }
+
+    protected function createRequest(string $payload): Request
+    {
+        return Request::create('/', 'POST', [], [], [], [
+            'Content-Type' => 'application/json',
+        ], $payload);
+    }
+
+    protected static function getFixtureExtension(): string
+    {
+        return 'json';
+    }
+}
diff --git a/src/Symfony/Component/Webhook/Tests/Client/RequestParserTest.php b/src/Symfony/Component/Webhook/Tests/Client/RequestParserTest.php
new file mode 100644
index 0000000000000..18dbe5c1ff616
--- /dev/null
+++ b/src/Symfony/Component/Webhook/Tests/Client/RequestParserTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Webhook\Tests\Client;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Webhook\Client\RequestParser;
+use Symfony\Component\Webhook\Exception\RejectWebhookException;
+
+class RequestParserTest extends TestCase
+{
+    public function testParseDoesNotMatch()
+    {
+        $this->expectException(RejectWebhookException::class);
+
+        $request = new Request();
+        $parser = new RequestParser();
+        $parser->parse($request, '$ecret');
+    }
+}
diff --git a/src/Symfony/Component/Webhook/composer.json b/src/Symfony/Component/Webhook/composer.json
new file mode 100644
index 0000000000000..3a33faf7cc350
--- /dev/null
+++ b/src/Symfony/Component/Webhook/composer.json
@@ -0,0 +1,32 @@
+{
+    "name": "symfony/webhook",
+    "type": "library",
+    "description": "Eases sending and consuming webhooks",
+    "keywords": ["webhook"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/http-foundation": "^6.3",
+        "symfony/http-kernel": "^6.3",
+        "symfony/messenger": "^5.4|^6.1",
+        "symfony/remote-event": "^6.3"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\Webhook\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Webhook/phpunit.xml.dist b/src/Symfony/Component/Webhook/phpunit.xml.dist
new file mode 100644
index 0000000000000..ff3020250d20c
--- /dev/null
+++ b/src/Symfony/Component/Webhook/phpunit.xml.dist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony Webhook Component Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory>./</directory>
+        </include>
+        <exclude>
+            <directory>./Tests</directory>
+            <directory>./vendor</directory>
+        </exclude>
+    </coverage>
+</phpunit>

From e70241d712a2c35e8f053033fe178e7bc8081261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Buliard?= <mbuliard@live.fr>
Date: Wed, 15 Mar 2023 20:10:46 +0100
Subject: [PATCH 291/475] [Validator] Add PHPDoc void return types

---
 .github/expected-missing-return-types.diff    | 185 +++++++++++++-----
 .../Constraints/UniqueEntityValidator.php     |   2 +
 .../ConstraintValidatorInterface.php          |   4 +
 .../ConstraintViolationListInterface.php      |   8 +
 .../NoSuspiciousCharactersValidator.php       |   3 +
 .../Context/ExecutionContextInterface.php     |   6 +-
 .../Validator/ObjectInitializerInterface.php  |   3 +
 .../Tests/ConstraintValidatorTest.php         |   2 +-
 .../Fixtures/DummyConstraintValidator.php     |   2 +-
 .../Fixtures/FailingConstraintValidator.php   |   2 +-
 .../Test/ConstraintValidatorTestCaseTest.php  |   2 +-
 .../Validator/RecursiveValidatorTest.php      |   2 +-
 .../ConstraintViolationBuilderInterface.php   |   2 +
 13 files changed, 167 insertions(+), 56 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index 2a605edc61415..ee5f8a0b05775 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -255,6 +255,17 @@ index 9d61be61bd..e89985de26 100644
 +    public function createNewToken(PersistentTokenInterface $token): void
      {
          $sql = 'INSERT INTO rememberme_token (class, username, series, value, lastUsed) VALUES (:class, :username, :series, :value, :lastUsed)';
+diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+index 67575134b6..09a3926120 100644
+--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
++++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+@@ -43,5 +43,5 @@ class UniqueEntityValidator extends ConstraintValidator
+      * @throws ConstraintDefinitionException
+      */
+-    public function validate(mixed $entity, Constraint $constraint)
++    public function validate(mixed $entity, Constraint $constraint): void
+     {
+         if (!$constraint instanceof UniqueEntity) {
 diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php
 index bf8a5feb9f..e346c8b17c 100644
 --- a/src/Symfony/Bridge/Doctrine/Validator/DoctrineInitializer.php
@@ -637,10 +648,10 @@ index 6e7669a710..27517d34ae 100644
      {
          if (!$container->hasDefinition('test.private_services_locator')) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
-index 169a1c0a69..57f5d7bf3c 100644
+index d846bc6882..21ee26b1f3 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
-@@ -105,5 +105,5 @@ class UnusedTagsPass implements CompilerPassInterface
+@@ -106,5 +106,5 @@ class UnusedTagsPass implements CompilerPassInterface
       * @return void
       */
 -    public function process(ContainerBuilder $container)
@@ -659,17 +670,17 @@ index bda9ca9515..c0d1f91339 100644
      {
          if (!$container->hasParameter('workflow.has_guard_listeners')) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-index 131e9e8c2c..5a3ff18f22 100644
+index 8cb557fb7d..7a7830c7df 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-@@ -274,5 +274,5 @@ class FrameworkExtension extends Extension
+@@ -279,5 +279,5 @@ class FrameworkExtension extends Extension
       * @throws LogicException
       */
 -    public function load(array $configs, ContainerBuilder $container)
 +    public function load(array $configs, ContainerBuilder $container): void
      {
          $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
-@@ -2746,5 +2746,5 @@ class FrameworkExtension extends Extension
+@@ -2812,5 +2812,5 @@ class FrameworkExtension extends Extension
       * @return void
       */
 -    public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)
@@ -988,7 +999,7 @@ index a2c5815e4b..1c9721ccc6 100644
 +    public function addConfiguration(NodeDefinition $builder): void;
  }
 diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
-index 41d807d8c0..1d8d25b59d 100644
+index 37978b285f..ca1f5ae517 100644
 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
 +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
 @@ -82,5 +82,5 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
@@ -3564,7 +3575,7 @@ index 3f070dcc0c..aa0e5186bf 100644
      {
          foreach ($container->findTaggedServiceIds('auto_alias') as $serviceId => $tags) {
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
-index 48cacd7877..651b72c818 100644
+index 6cb09ccdfe..85380018ce 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
 +++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
 @@ -61,5 +61,5 @@ class AutowirePass extends AbstractRecursivePass
@@ -4025,101 +4036,101 @@ index ac67b468c5..bc1e395810 100644
      {
          if (1 > \func_num_args()) {
 diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
-index adeba8cfe3..6dc444bd08 100644
+index e920980b28..83a3221b97 100644
 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
 +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
-@@ -176,5 +176,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -178,5 +178,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function setResourceTracking(bool $track)
 +    public function setResourceTracking(bool $track): void
      {
          $this->trackResources = $track;
-@@ -194,5 +194,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -196,5 +196,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function setProxyInstantiator(InstantiatorInterface $proxyInstantiator)
 +    public function setProxyInstantiator(InstantiatorInterface $proxyInstantiator): void
      {
          $this->proxyInstantiator = $proxyInstantiator;
-@@ -202,5 +202,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -204,5 +204,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function registerExtension(ExtensionInterface $extension)
 +    public function registerExtension(ExtensionInterface $extension): void
      {
          $this->extensions[$extension->getAlias()] = $extension;
-@@ -484,5 +484,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -486,5 +486,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @throws BadMethodCallException When this ContainerBuilder is compiled
       */
 -    public function set(string $id, ?object $service)
 +    public function set(string $id, ?object $service): void
      {
          if ($this->isCompiled() && (isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())) {
-@@ -501,5 +501,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -503,5 +503,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function removeDefinition(string $id)
 +    public function removeDefinition(string $id): void
      {
          if (isset($this->definitions[$id])) {
-@@ -613,5 +613,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -615,5 +615,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @throws BadMethodCallException When this ContainerBuilder is compiled
       */
 -    public function merge(self $container)
 +    public function merge(self $container): void
      {
          if ($this->isCompiled()) {
-@@ -705,5 +705,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -707,5 +707,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function prependExtensionConfig(string $name, array $config)
 +    public function prependExtensionConfig(string $name, array $config): void
      {
          if (!isset($this->extensionConfigs[$name])) {
-@@ -749,5 +749,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -751,5 +751,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function compile(bool $resolveEnvPlaceholders = false)
 +    public function compile(bool $resolveEnvPlaceholders = false): void
      {
          $compiler = $this->getCompiler();
-@@ -813,5 +813,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -815,5 +815,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function addAliases(array $aliases)
 +    public function addAliases(array $aliases): void
      {
          foreach ($aliases as $alias => $id) {
-@@ -827,5 +827,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -829,5 +829,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function setAliases(array $aliases)
 +    public function setAliases(array $aliases): void
      {
          $this->aliasDefinitions = [];
-@@ -861,5 +861,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -863,5 +863,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function removeAlias(string $alias)
 +    public function removeAlias(string $alias): void
      {
          if (isset($this->aliasDefinitions[$alias])) {
-@@ -923,5 +923,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -925,5 +925,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function addDefinitions(array $definitions)
 +    public function addDefinitions(array $definitions): void
      {
          foreach ($definitions as $id => $definition) {
-@@ -937,5 +937,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -939,5 +939,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function setDefinitions(array $definitions)
 +    public function setDefinitions(array $definitions): void
      {
          $this->definitions = [];
-@@ -1304,5 +1304,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -1311,5 +1311,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
@@ -7091,7 +7102,7 @@ index 44d8d96d28..43124c0ea0 100644
      {
          unset($this->parameters[$key]);
 diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
-index ec2402f221..09703104ea 100644
+index 17eb95829c..9d234147b5 100644
 --- a/src/Symfony/Component/HttpFoundation/Request.php
 +++ b/src/Symfony/Component/HttpFoundation/Request.php
 @@ -267,5 +267,5 @@ class Request
@@ -7101,84 +7112,84 @@ index ec2402f221..09703104ea 100644
 +    public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null): void
      {
          $this->request = new InputBag($request);
-@@ -423,5 +423,5 @@ class Request
+@@ -427,5 +427,5 @@ class Request
       * @return void
       */
 -    public static function setFactory(?callable $callable)
 +    public static function setFactory(?callable $callable): void
      {
          self::$requestFactory = $callable;
-@@ -529,5 +529,5 @@ class Request
+@@ -533,5 +533,5 @@ class Request
       * @return void
       */
 -    public function overrideGlobals()
 +    public function overrideGlobals(): void
      {
          $this->server->set('QUERY_STRING', static::normalizeQueryString(http_build_query($this->query->all(), '', '&')));
-@@ -571,5 +571,5 @@ class Request
+@@ -575,5 +575,5 @@ class Request
       * @return void
       */
 -    public static function setTrustedProxies(array $proxies, int $trustedHeaderSet)
 +    public static function setTrustedProxies(array $proxies, int $trustedHeaderSet): void
      {
          self::$trustedProxies = array_reduce($proxies, function ($proxies, $proxy) {
-@@ -614,5 +614,5 @@ class Request
+@@ -618,5 +618,5 @@ class Request
       * @return void
       */
 -    public static function setTrustedHosts(array $hostPatterns)
 +    public static function setTrustedHosts(array $hostPatterns): void
      {
          self::$trustedHostPatterns = array_map(fn ($hostPattern) => sprintf('{%s}i', $hostPattern), $hostPatterns);
-@@ -662,5 +662,5 @@ class Request
+@@ -666,5 +666,5 @@ class Request
       * @return void
       */
 -    public static function enableHttpMethodParameterOverride()
 +    public static function enableHttpMethodParameterOverride(): void
      {
          self::$httpMethodParameterOverride = true;
-@@ -749,5 +749,5 @@ class Request
+@@ -753,5 +753,5 @@ class Request
       * @return void
       */
 -    public function setSession(SessionInterface $session)
 +    public function setSession(SessionInterface $session): void
      {
          $this->session = $session;
-@@ -1172,5 +1172,5 @@ class Request
+@@ -1176,5 +1176,5 @@ class Request
       * @return void
       */
 -    public function setMethod(string $method)
 +    public function setMethod(string $method): void
      {
          $this->method = null;
-@@ -1295,5 +1295,5 @@ class Request
+@@ -1299,5 +1299,5 @@ class Request
       * @return void
       */
 -    public function setFormat(?string $format, string|array $mimeTypes)
 +    public function setFormat(?string $format, string|array $mimeTypes): void
      {
          if (null === static::$formats) {
-@@ -1327,5 +1327,5 @@ class Request
+@@ -1331,5 +1331,5 @@ class Request
       * @return void
       */
 -    public function setRequestFormat(?string $format)
 +    public function setRequestFormat(?string $format): void
      {
          $this->format = $format;
-@@ -1359,5 +1359,5 @@ class Request
+@@ -1363,5 +1363,5 @@ class Request
       * @return void
       */
 -    public function setDefaultLocale(string $locale)
 +    public function setDefaultLocale(string $locale): void
      {
          $this->defaultLocale = $locale;
-@@ -1381,5 +1381,5 @@ class Request
+@@ -1385,5 +1385,5 @@ class Request
       * @return void
       */
 -    public function setLocale(string $locale)
 +    public function setLocale(string $locale): void
      {
          $this->setPhpDefaultLocale($this->locale = $locale);
-@@ -1888,5 +1888,5 @@ class Request
+@@ -1892,5 +1892,5 @@ class Request
       * @return void
       */
 -    protected static function initializeFormats()
@@ -8130,7 +8141,6 @@ index 1924b1ddb0..62c58c8e8b 100644
          $annotatedClasses = [];
 diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
 index dff3e248ae..381db9aa8f 100644
-index 6e00840c7e..8e69c81c23 100644
 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
 +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
 @@ -34,5 +34,5 @@ class ControllerArgumentValueResolverPass implements CompilerPassInterface
@@ -8763,7 +8773,7 @@ index 8de1468ac6..858ef75b57 100644
      {
          $this->collectors[$collector->getName()] = $collector;
 diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
-index 5d6fad8fe3..e723e1e445 100644
+index 58508e5b48..2c7f3c06da 100644
 --- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
 +++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php
 @@ -50,5 +50,5 @@ class Profiler implements ResetInterface
@@ -12032,6 +12042,23 @@ index 3a3da8da82..db923387a5 100644
 +    public function initialize(ExecutionContextInterface $context): void
      {
          $this->context = $context;
+diff --git a/src/Symfony/Component/Validator/ConstraintValidatorInterface.php b/src/Symfony/Component/Validator/ConstraintValidatorInterface.php
+index fe7da2e8f7..61d3632e2a 100644
+--- a/src/Symfony/Component/Validator/ConstraintValidatorInterface.php
++++ b/src/Symfony/Component/Validator/ConstraintValidatorInterface.php
+@@ -24,5 +24,5 @@ interface ConstraintValidatorInterface
+      * @return void
+      */
+-    public function initialize(ExecutionContextInterface $context);
++    public function initialize(ExecutionContextInterface $context): void;
+ 
+     /**
+@@ -31,4 +31,4 @@ interface ConstraintValidatorInterface
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint);
++    public function validate(mixed $value, Constraint $constraint): void;
+ }
 diff --git a/src/Symfony/Component/Validator/ConstraintViolationList.php b/src/Symfony/Component/Validator/ConstraintViolationList.php
 index 0b98624509..4367f247fc 100644
 --- a/src/Symfony/Component/Validator/ConstraintViolationList.php
@@ -12064,6 +12091,37 @@ index 0b98624509..4367f247fc 100644
 +    public function remove(int $offset): void
      {
          unset($this->violations[$offset]);
+diff --git a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
+index c6d2f0c306..a3a61916bb 100644
+--- a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
++++ b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
+@@ -29,5 +29,5 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
+      * @return void
+      */
+-    public function add(ConstraintViolationInterface $violation);
++    public function add(ConstraintViolationInterface $violation): void;
+ 
+     /**
+@@ -36,5 +36,5 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
+      * @return void
+      */
+-    public function addAll(self $otherList);
++    public function addAll(self $otherList): void;
+ 
+     /**
+@@ -61,5 +61,5 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
+      * @return void
+      */
+-    public function set(int $offset, ConstraintViolationInterface $violation);
++    public function set(int $offset, ConstraintViolationInterface $violation): void;
+ 
+     /**
+@@ -70,4 +70,4 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
+      * @return void
+      */
+-    public function remove(int $offset);
++    public function remove(int $offset): void;
+ }
 diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
 index 29fd4daa8a..c358e6cc6f 100644
 --- a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
@@ -12470,6 +12528,17 @@ index a3f871e339..c6064e8b30 100644
 +    public function validate(mixed $value, Constraint $constraint): void
      {
          if (!$constraint instanceof Luhn) {
+diff --git a/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharactersValidator.php b/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharactersValidator.php
+index 659de93f9e..44b23e1205 100644
+--- a/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharactersValidator.php
++++ b/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharactersValidator.php
+@@ -60,5 +60,5 @@ class NoSuspiciousCharactersValidator extends ConstraintValidator
+      * @return void
+      */
+-    public function validate(mixed $value, Constraint $constraint)
++    public function validate(mixed $value, Constraint $constraint): void
+     {
+         if (!$constraint instanceof NoSuspiciousCharacters) {
 diff --git a/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php b/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
 index fa6c794c02..f46f38845e 100644
 --- a/src/Symfony/Component/Validator/Constraints/NotBlankValidator.php
@@ -12636,7 +12705,7 @@ index 7c960ffee1..3952a146b0 100644
      {
          if (!$constraint instanceof Valid) {
 diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
-index 365e0dd05c..81c2698665 100644
+index 305a597665..3b14b2d078 100644
 --- a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
 +++ b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
 @@ -70,5 +70,5 @@ interface ExecutionContextInterface
@@ -12702,17 +12771,17 @@ index a7eda1457d..28630f205f 100644
      {
          return $this->options;
 diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
-index 7909020b4d..51d0c2dd14 100644
+index f5f084f2ed..b0f6545ab0 100644
 --- a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
 +++ b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
-@@ -321,5 +321,5 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
+@@ -325,5 +325,5 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
       * @return void
       */
 -    public function mergeConstraints(self $source)
 +    public function mergeConstraints(self $source): void
      {
          if ($source->isGroupSequenceProvider()) {
-@@ -430,5 +430,5 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
+@@ -434,5 +434,5 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
       * @throws GroupDefinitionException
       */
 -    public function setGroupSequenceProvider(bool $active)
@@ -12741,6 +12810,16 @@ index e7389f7b8e..3c07cdc9f7 100644
 +    public function getClassName(): string
      {
          return $this->class;
+diff --git a/src/Symfony/Component/Validator/ObjectInitializerInterface.php b/src/Symfony/Component/Validator/ObjectInitializerInterface.php
+index 629a214a04..10e60dafac 100644
+--- a/src/Symfony/Component/Validator/ObjectInitializerInterface.php
++++ b/src/Symfony/Component/Validator/ObjectInitializerInterface.php
+@@ -26,4 +26,4 @@ interface ObjectInitializerInterface
+      * @return void
+      */
+-    public function initialize(object $object);
++    public function initialize(object $object): void;
+ }
 diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
 index 9712d35ac1..2a0b248897 100644
 --- a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
@@ -12763,6 +12842,16 @@ index 241ce901b5..bde6394ec3 100644
 +    public function reset(): void
      {
          $this->collectedData = [];
+diff --git a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
+index 2c1fa7e306..d116d14556 100644
+--- a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
++++ b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
+@@ -111,4 +111,4 @@ interface ConstraintViolationBuilderInterface
+      * @return void
+      */
+-    public function addViolation();
++    public function addViolation(): void;
+ }
 diff --git a/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php b/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
 index 22026f46a7..52b1ef696b 100644
 --- a/src/Symfony/Component/VarDumper/Caster/AmqpCaster.php
@@ -13633,7 +13722,7 @@ index 053a90972b..5876b02373 100644
      {
          if (-1 !== $depth) {
 diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
-index f5780a87ed..285e5e5377 100644
+index c3d848ec17..ba28ebcb11 100644
 --- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
 +++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
 @@ -90,5 +90,5 @@ class CliDumper extends AbstractDumper
@@ -13678,42 +13767,42 @@ index f5780a87ed..285e5e5377 100644
 +    public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut): void
      {
          $this->dumpKey($cursor);
-@@ -278,5 +278,5 @@ class CliDumper extends AbstractDumper
+@@ -281,5 +281,5 @@ class CliDumper extends AbstractDumper
       * @return void
       */
 -    public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild)
 +    public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild): void
      {
          $this->colors ??= $this->supportsColors();
-@@ -317,5 +317,5 @@ class CliDumper extends AbstractDumper
+@@ -320,5 +320,5 @@ class CliDumper extends AbstractDumper
       * @return void
       */
 -    public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut)
 +    public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut): void
      {
          if (empty($cursor->attr['cut_hash'])) {
-@@ -335,5 +335,5 @@ class CliDumper extends AbstractDumper
+@@ -338,5 +338,5 @@ class CliDumper extends AbstractDumper
       * @return void
       */
 -    protected function dumpEllipsis(Cursor $cursor, bool $hasChild, int $cut)
 +    protected function dumpEllipsis(Cursor $cursor, bool $hasChild, int $cut): void
      {
          if ($cut) {
-@@ -353,5 +353,5 @@ class CliDumper extends AbstractDumper
+@@ -356,5 +356,5 @@ class CliDumper extends AbstractDumper
       * @return void
       */
 -    protected function dumpKey(Cursor $cursor)
 +    protected function dumpKey(Cursor $cursor): void
      {
          if (null !== $key = $cursor->hashKey) {
-@@ -558,5 +558,5 @@ class CliDumper extends AbstractDumper
+@@ -561,5 +561,5 @@ class CliDumper extends AbstractDumper
       * @return void
       */
 -    protected function dumpLine(int $depth, bool $endOfValue = false)
 +    protected function dumpLine(int $depth, bool $endOfValue = false): void
      {
          if ($this->colors) {
-@@ -569,5 +569,5 @@ class CliDumper extends AbstractDumper
+@@ -572,5 +572,5 @@ class CliDumper extends AbstractDumper
       * @return void
       */
 -    protected function endValue(Cursor $cursor)
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
index 2363cf1cfe162..67575134b660b 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -37,6 +37,8 @@ public function __construct(ManagerRegistry $registry)
     /**
      * @param object $entity
      *
+     * @return void
+     *
      * @throws UnexpectedTypeException
      * @throws ConstraintDefinitionException
      */
diff --git a/src/Symfony/Component/Validator/ConstraintValidatorInterface.php b/src/Symfony/Component/Validator/ConstraintValidatorInterface.php
index 6fdffcd6abf00..fe7da2e8f76b8 100644
--- a/src/Symfony/Component/Validator/ConstraintValidatorInterface.php
+++ b/src/Symfony/Component/Validator/ConstraintValidatorInterface.php
@@ -20,11 +20,15 @@ interface ConstraintValidatorInterface
 {
     /**
      * Initializes the constraint validator.
+     *
+     * @return void
      */
     public function initialize(ExecutionContextInterface $context);
 
     /**
      * Checks if the passed value is valid.
+     *
+     * @return void
      */
     public function validate(mixed $value, Constraint $constraint);
 }
diff --git a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
index 241e426105105..c6d2f0c306d6a 100644
--- a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
+++ b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
@@ -25,11 +25,15 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
 {
     /**
      * Adds a constraint violation to this list.
+     *
+     * @return void
      */
     public function add(ConstraintViolationInterface $violation);
 
     /**
      * Merges an existing violation list into this list.
+     *
+     * @return void
      */
     public function addAll(self $otherList);
 
@@ -53,6 +57,8 @@ public function has(int $offset): bool;
      * Sets a violation at a given offset.
      *
      * @param int $offset The violation offset
+     *
+     * @return void
      */
     public function set(int $offset, ConstraintViolationInterface $violation);
 
@@ -60,6 +66,8 @@ public function set(int $offset, ConstraintViolationInterface $violation);
      * Removes a violation at a given offset.
      *
      * @param int $offset The offset to remove
+     *
+     * @return void
      */
     public function remove(int $offset);
 }
diff --git a/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharactersValidator.php b/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharactersValidator.php
index e3d2f347606ab..659de93f9e69d 100644
--- a/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharactersValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/NoSuspiciousCharactersValidator.php
@@ -56,6 +56,9 @@ public function __construct(private readonly array $defaultLocales = [])
     {
     }
 
+    /**
+     * @return void
+     */
     public function validate(mixed $value, Constraint $constraint)
     {
         if (!$constraint instanceof NoSuspiciousCharacters) {
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
index 365e0dd05c4f7..305a597665b17 100644
--- a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
+++ b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
@@ -29,7 +29,7 @@
  * When you make another call to the validator, while the validation is in
  * progress, the violations will be isolated from each other:
  *
- *     public function validate(mixed $value, Constraint $constraint)
+ *     public function validate(mixed $value, Constraint $constraint): void
  *     {
  *         $validator = $this->context->getValidator();
  *
@@ -40,7 +40,7 @@
  * However, if you want to add the violations to the current context, use the
  * {@link ValidatorInterface::inContext()} method:
  *
- *     public function validate(mixed $value, Constraint $constraint)
+ *     public function validate(mixed $value, Constraint $constraint): void
  *     {
  *         $validator = $this->context->getValidator();
  *
@@ -93,7 +93,7 @@ public function buildViolation(string $message, array $parameters = []): Constra
      *
      * Useful if you want to validate additional constraints:
      *
-     *     public function validate(mixed $value, Constraint $constraint)
+     *     public function validate(mixed $value, Constraint $constraint): void
      *     {
      *         $validator = $this->context->getValidator();
      *
diff --git a/src/Symfony/Component/Validator/ObjectInitializerInterface.php b/src/Symfony/Component/Validator/ObjectInitializerInterface.php
index 6f3ac5e2f6b86..629a214a04177 100644
--- a/src/Symfony/Component/Validator/ObjectInitializerInterface.php
+++ b/src/Symfony/Component/Validator/ObjectInitializerInterface.php
@@ -22,5 +22,8 @@
  */
 interface ObjectInitializerInterface
 {
+    /**
+     * @return void
+     */
     public function initialize(object $object);
 }
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php b/src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php
index 613c44338a789..94ad3cfc5a31f 100644
--- a/src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php
@@ -56,7 +56,7 @@ public static function formatValueProvider()
 
 final class TestFormatValueConstraintValidator extends ConstraintValidator
 {
-    public function validate($value, Constraint $constraint)
+    public function validate($value, Constraint $constraint): void
     {
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/DummyConstraintValidator.php b/src/Symfony/Component/Validator/Tests/Fixtures/DummyConstraintValidator.php
index 3481a5e2d8c1f..897f5aca2447a 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/DummyConstraintValidator.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/DummyConstraintValidator.php
@@ -16,7 +16,7 @@
 
 class DummyConstraintValidator extends ConstraintValidator
 {
-    public function validate($value, Constraint $constraint)
+    public function validate($value, Constraint $constraint): void
     {
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/FailingConstraintValidator.php b/src/Symfony/Component/Validator/Tests/Fixtures/FailingConstraintValidator.php
index 1224643851117..fa7e054544ee5 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/FailingConstraintValidator.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/FailingConstraintValidator.php
@@ -16,7 +16,7 @@
 
 class FailingConstraintValidator extends ConstraintValidator
 {
-    public function validate($value, Constraint $constraint)
+    public function validate($value, Constraint $constraint): void
     {
         $this->context->addViolation($constraint->message, []);
     }
diff --git a/src/Symfony/Component/Validator/Tests/Test/ConstraintValidatorTestCaseTest.php b/src/Symfony/Component/Validator/Tests/Test/ConstraintValidatorTestCaseTest.php
index 7dc7e966677cc..349b2f81201a1 100644
--- a/src/Symfony/Component/Validator/Tests/Test/ConstraintValidatorTestCaseTest.php
+++ b/src/Symfony/Component/Validator/Tests/Test/ConstraintValidatorTestCaseTest.php
@@ -55,7 +55,7 @@ public function testAssertingContextualValidatorRemainingExpectationsThrow()
 
 class TestCustomValidator extends ConstraintValidator
 {
-    public function validate($value, Constraint $constraint)
+    public function validate($value, Constraint $constraint): void
     {
         $validator = $this->context
             ->getValidator()
diff --git a/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
index a72b65f258e83..010536e661f19 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
@@ -2362,7 +2362,7 @@ final class TestConstraintHashesDoNotCollide extends Constraint
 
 final class TestConstraintHashesDoNotCollideValidator extends ConstraintValidator
 {
-    public function validate($value, Constraint $constraint)
+    public function validate($value, Constraint $constraint): void
     {
         if (!$value instanceof Entity) {
             throw new \LogicException();
diff --git a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
index b9e6c3fc92390..2c1fa7e306f30 100644
--- a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
+++ b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
@@ -107,6 +107,8 @@ public function setCause(mixed $cause): static;
 
     /**
      * Adds the violation to the current execution context.
+     *
+     * @return void
      */
     public function addViolation();
 }

From 80cb3f595447a19b560938b7d9a4e1c09e84d8a7 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Thu, 16 Mar 2023 08:06:39 +0100
Subject: [PATCH 292/475] Fix DI logic when mailer is available but webhook is
 not

---
 .../DependencyInjection/FrameworkExtension.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 8cb557fb7d35d..35ca155fd7a7e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2527,16 +2527,18 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
             }
         }
 
-        $webhookRequestParsers = [
-            MailgunRequestParser::class => 'mailer.webhook.request_parser.mailgun',
-            PostmarkRequestParser::class => 'mailer.webhook.request_parser.postmark',
-        ];
+        if ($webhookEnabled) {
+            $webhookRequestParsers = [
+                MailgunRequestParser::class => 'mailer.webhook.request_parser.mailgun',
+                PostmarkRequestParser::class => 'mailer.webhook.request_parser.postmark',
+            ];
 
-        foreach ($webhookRequestParsers as $class => $service) {
-            $package = substr($service, \strlen('mailer.transport_factory.'));
+            foreach ($webhookRequestParsers as $class => $service) {
+                $package = substr($service, \strlen('mailer.transport_factory.'));
 
-            if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
-                $container->removeDefinition($service);
+                if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
+                    $container->removeDefinition($service);
+                }
             }
         }
 

From 6d9311f0870dbfcba19be27440232b65e633a6ee Mon Sep 17 00:00:00 2001
From: Sergey Rabochiy <upyx.00@gmail.com>
Date: Fri, 29 Jul 2022 18:33:27 +1000
Subject: [PATCH 293/475] Add the Scheduler component

---
 composer.json                                 |   1 +
 .../Compiler/UnusedTagsPass.php               |   1 +
 .../FrameworkExtension.php                    |   9 +
 .../FrameworkBundle/FrameworkBundle.php       |   2 +
 .../Resources/config/scheduler.php            |  52 +++++
 .../Fixtures/php/messenger_schedule.php       |  15 ++
 .../Fixtures/php/messenger_transports.php     |   1 +
 .../Fixtures/xml/messenger_schedule.xml       |  13 ++
 .../Fixtures/xml/messenger_transports.xml     |   1 +
 .../Fixtures/yml/messenger_schedule.yml       |   5 +
 .../Fixtures/yml/messenger_transports.yml     |   1 +
 .../FrameworkExtensionTestCase.php            |  41 +++-
 .../Messenger/DummyScheduleConfigLocator.php  |  29 +++
 .../Tests/Functional/SchedulerTest.php        |  62 ++++++
 .../Functional/app/Scheduler/bundles.php      |  16 ++
 .../Tests/Functional/app/Scheduler/config.yml |  23 +++
 .../Bundle/FrameworkBundle/composer.json      |   2 +
 src/Symfony/Component/Messenger/CHANGELOG.md  |   1 +
 .../Transport/Receiver/ReceiverInterface.php  |   2 +-
 .../Messenger/Transport/TransportFactory.php  |   2 +
 src/Symfony/Component/Messenger/composer.json |   3 +
 .../Component/Scheduler/.gitattributes        |   4 +
 src/Symfony/Component/Scheduler/.gitignore    |   3 +
 src/Symfony/Component/Scheduler/CHANGELOG.md  |   7 +
 .../DependencyInjection/SchedulerPass.php     | 125 ++++++++++++
 .../Exception/ExceptionInterface.php          |  19 ++
 .../Exception/InvalidArgumentException.php    |  16 ++
 .../Scheduler/Exception/LogicException.php    |  16 ++
 .../Exception/LogicMessengerException.php     |  19 ++
 src/Symfony/Component/Scheduler/LICENSE       |  19 ++
 .../Locator/ChainScheduleConfigLocator.php    |  64 +++++++
 .../ScheduleConfigLocatorInterface.php        |  20 ++
 .../Scheduler/Messenger/ScheduleTransport.php |  50 +++++
 .../Messenger/ScheduleTransportFactory.php    |  73 +++++++
 .../Scheduler/Messenger/ScheduledStamp.php    |  18 ++
 src/Symfony/Component/Scheduler/README.md     |  56 ++++++
 .../Component/Scheduler/Schedule/Schedule.php |  95 +++++++++
 .../Scheduler/Schedule/ScheduleConfig.php     |  47 +++++
 .../Scheduler/Schedule/ScheduleHeap.php       |  36 ++++
 .../Scheduler/Schedule/ScheduleInterface.php  |  17 ++
 .../Scheduler/State/CacheStateDecorator.php   |  56 ++++++
 .../Scheduler/State/LockStateDecorator.php    |  73 +++++++
 .../Component/Scheduler/State/State.php       |  48 +++++
 .../Scheduler/State/StateFactory.php          |  91 +++++++++
 .../Scheduler/State/StateFactoryInterface.php |  20 ++
 .../Scheduler/State/StateInterface.php        |  25 +++
 .../ChainScheduleConfigLocatorTest.php        |  49 +++++
 .../ScheduleTransportFactoryTest.php          | 125 ++++++++++++
 .../Tests/Messenger/ScheduleTransportTest.php |  67 +++++++
 .../Tests/Schedule/ScheduleConfigTest.php     |  61 ++++++
 .../Scheduler/Tests/Schedule/ScheduleTest.php | 180 ++++++++++++++++++
 .../Tests/State/CacheStateDecoratorTest.php   | 115 +++++++++++
 .../Tests/State/LockStateDecoratorTest.php    | 172 +++++++++++++++++
 .../Tests/State/StateFactoryTest.php          | 176 +++++++++++++++++
 .../Scheduler/Tests/State/StateTest.php       |  36 ++++
 .../Tests/Trigger/ExcludeTimeTriggerTest.php  |  38 ++++
 .../Tests/Trigger/OnceTriggerTest.php         |  29 +++
 .../Tests/Trigger/PeriodicalTriggerTest.php   | 140 ++++++++++++++
 .../Scheduler/Trigger/ExcludeTimeTrigger.php  |  32 ++++
 .../Scheduler/Trigger/OnceTrigger.php         |  25 +++
 .../Scheduler/Trigger/PeriodicalTrigger.php   | 112 +++++++++++
 .../Scheduler/Trigger/Trigger
10000
Interface.php    |  17 ++
 src/Symfony/Component/Scheduler/composer.json |  42 ++++
 .../Component/Scheduler/phpunit.xml.dist      |  30 +++
 64 files changed, 2738 insertions(+), 7 deletions(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/config/scheduler.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_schedule.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_schedule.xml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_schedule.yml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyScheduleConfigLocator.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SchedulerTest.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/bundles.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/config.yml
 create mode 100644 src/Symfony/Component/Scheduler/.gitattributes
 create mode 100644 src/Symfony/Component/Scheduler/.gitignore
 create mode 100644 src/Symfony/Component/Scheduler/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Scheduler/DependencyInjection/SchedulerPass.php
 create mode 100644 src/Symfony/Component/Scheduler/Exception/ExceptionInterface.php
 create mode 100644 src/Symfony/Component/Scheduler/Exception/InvalidArgumentException.php
 create mode 100644 src/Symfony/Component/Scheduler/Exception/LogicException.php
 create mode 100644 src/Symfony/Component/Scheduler/Exception/LogicMessengerException.php
 create mode 100644 src/Symfony/Component/Scheduler/LICENSE
 create mode 100644 src/Symfony/Component/Scheduler/Locator/ChainScheduleConfigLocator.php
 create mode 100644 src/Symfony/Component/Scheduler/Locator/ScheduleConfigLocatorInterface.php
 create mode 100644 src/Symfony/Component/Scheduler/Messenger/ScheduleTransport.php
 create mode 100644 src/Symfony/Component/Scheduler/Messenger/ScheduleTransportFactory.php
 create mode 100644 src/Symfony/Component/Scheduler/Messenger/ScheduledStamp.php
 create mode 100644 src/Symfony/Component/Scheduler/README.md
 create mode 100644 src/Symfony/Component/Scheduler/Schedule/Schedule.php
 create mode 100644 src/Symfony/Component/Scheduler/Schedule/ScheduleConfig.php
 create mode 100644 src/Symfony/Component/Scheduler/Schedule/ScheduleHeap.php
 create mode 100644 src/Symfony/Component/Scheduler/Schedule/ScheduleInterface.php
 create mode 100644 src/Symfony/Component/Scheduler/State/CacheStateDecorator.php
 create mode 100644 src/Symfony/Component/Scheduler/State/LockStateDecorator.php
 create mode 100644 src/Symfony/Component/Scheduler/State/State.php
 create mode 100644 src/Symfony/Component/Scheduler/State/StateFactory.php
 create mode 100644 src/Symfony/Component/Scheduler/State/StateFactoryInterface.php
 create mode 100644 src/Symfony/Component/Scheduler/State/StateInterface.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Locator/ChainScheduleConfigLocatorTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleConfigTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/State/CacheStateDecoratorTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/State/LockStateDecoratorTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/State/StateFactoryTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/State/StateTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Trigger/ExcludeTimeTriggerTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Trigger/OnceTriggerTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php
 create mode 100644 src/Symfony/Component/Scheduler/Trigger/OnceTrigger.php
 create mode 100644 src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php
 create mode 100644 src/Symfony/Component/Scheduler/Trigger/TriggerInterface.php
 create mode 100644 src/Symfony/Component/Scheduler/composer.json
 create mode 100644 src/Symfony/Component/Scheduler/phpunit.xml.dist

diff --git a/composer.json b/composer.json
index 17abbb834859f..2f738e6eb93cc 100644
--- a/composer.json
+++ b/composer.json
@@ -96,6 +96,7 @@
         "symfony/rate-limiter": "self.version",
         "symfony/remote-event": "self.version",
         "symfony/routing": "self.version",
+        "symfony/scheduler": "self.version",
         "symfony/security-bundle": "self.version",
         "symfony/security-core": "self.version",
         "symfony/security-csrf": "self.version",
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
index d846bc68822c3..be113a4fe89d2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -80,6 +80,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'routing.expression_language_provider',
         'routing.loader',
         'routing.route_loader',
+        'scheduler.schedule_config_locator',
         'security.authenticator.login_linker',
         'security.expression_language_provider',
         'security.remember_me_aware',
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 35ca155fd7a7e..bd1ae852a667f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -215,6 +215,8 @@
 use Symfony\Component\RemoteEvent\Attribute\AsRemoteEventConsumer;
 use Symfony\Component\RemoteEvent\RemoteEvent;
 use Symfony\Component\Routing\Loader\Psr4DirectoryLoader;
+use Symfony\Component\Scheduler\Locator\ScheduleConfigLocatorInterface;
+use Symfony\Component\Scheduler\Messenger\ScheduleTransportFactory;
 use Symfony\Component\Security\Core\AuthenticationEvents;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
@@ -673,6 +675,8 @@ public function load(array $configs, ContainerBuilder $container)
             ->addTag('messenger.message_handler');
         $container->registerForAutoconfiguration(TransportFactoryInterface::class)
             ->addTag('messenger.transport_factory');
+        $container->registerForAutoconfiguration(ScheduleConfigLocatorInterface::class)
+            ->addTag('scheduler.schedule_config_locator');
         $container->registerForAutoconfiguration(MimeTypeGuesserInterface::class)
             ->addTag('mime.mime_type_guesser');
         $container->registerForAutoconfiguration(LoggerAwareInterface::class)
@@ -2027,6 +2031,10 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $container->getDefinition('messenger.transport.beanstalkd.factory')->addTag('messenger.transport_factory');
         }
 
+        if (ContainerBuilder::willBeAvailable('symfony/scheduler', ScheduleTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'])) {
+            $loader->load('scheduler.php');
+        }
+
         if (null === $config['default_bus'] && 1 === \count($config['buses'])) {
             $config['default_bus'] = key($config['buses']);
         }
@@ -2083,6 +2091,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $container->removeDefinition('messenger.transport.redis.factory');
             $container->removeDefinition('messenger.transport.sqs.factory');
             $container->removeDefinition('messenger.transport.beanstalkd.factory');
+            $container->removeDefinition('scheduler.messenger_transport_factory');
             $container->removeAlias(SerializerInterface::class);
         } else {
             $container->getDefinition('messenger.transport.symfony_serializer')
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index 7f48810e50475..a1e5a0e4a91c0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -60,6 +60,7 @@
 use Symfony\Component\Mime\DependencyInjection\AddMimeTypeGuesserPass;
 use Symfony\Component\PropertyInfo\DependencyInjection\PropertyInfoPass;
 use Symfony\Component\Routing\DependencyInjection\RoutingResolverPass;
+use Symfony\Component\Scheduler\DependencyInjection\SchedulerPass;
 use Symfony\Component\Serializer\DependencyInjection\SerializerPass;
 use Symfony\Component\Translation\DependencyInjection\TranslationDumperPass;
 use Symfony\Component\Translation\DependencyInjection\TranslationExtractorPass;
@@ -166,6 +167,7 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new TestServiceContainerRealRefPass(), PassConfig::TYPE_AFTER_REMOVING);
         $this->addCompilerPassIfExists($container, AddMimeTypeGuesserPass::class);
         $this->addCompilerPassIfExists($container, MessengerPass::class);
+        $this->addCompilerPassIfExists($container, SchedulerPass::class);
         $this->addCompilerPassIfExists($container, HttpClientPass::class);
         $this->addCompilerPassIfExists($container, AddAutoMappingConfigurationPass::class);
         $container->addCompilerPass(new RegisterReverseContainerPass(true));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/scheduler.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/scheduler.php
new file mode 100644
index 0000000000000..2735fad5a1d47
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/scheduler.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\Scheduler\Locator\ChainScheduleConfigLocator;
+use Symfony\Component\Scheduler\Messenger\ScheduleTransportFactory;
+use Symfony\Component\Scheduler\State\StateFactory;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('scheduler.messenger_transport_factory', ScheduleTransportFactory::class)
+            ->args([
+                service('clock'),
+                service('scheduler.schedule_config_locator'),
+                service('scheduler.state_factory'),
+            ])
+            ->tag('messenger.transport_factory')
+
+        ->set('scheduler.schedule_config_locator', ChainScheduleConfigLocator::class)
+            ->args([
+                tagged_iterator('scheduler.schedule_config_locator'),
+            ])
+
+        ->set('scheduler.state_factory', StateFactory::class)
+            ->args([
+                service('scheduler.lock_locator'),
+                service('scheduler.cache_locator'),
+            ])
+
+        ->set('scheduler.lock_locator', ServiceLocator::class)
+            ->args([
+                [],
+            ])
+            ->tag('container.service_locator')
+
+        ->set('scheduler.cache_locator', ServiceLocator::class)
+            ->args([
+                [],
+            ])
+            ->tag('container.service_locator')
+    ;
+};
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_schedule.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_schedule.php
new file mode 100644
index 0000000000000..f42d388c3a052
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_schedule.php
@@ -0,0 +1,15 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'http_method_override' => false,
+    'messenger' => [
+        'transports' => [
+            'schedule' => [
+                'dsn' => 'schedule://default',
+                'options' => [
+                    'cache' => 'array',
+                ]
+            ],
+        ],
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transports.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transports.php
index 19f22f2c78c99..dc94f2907e254 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transports.php
@@ -25,6 +25,7 @@
             'failed' => 'in-memory:///',
             'redis' => 'redis://127.0.0.1:6379/messages',
             'beanstalkd' => 'beanstalkd://127.0.0.1:11300',
+            'schedule' => 'schedule://default',
         ],
     ],
 ]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_schedule.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_schedule.xml
new file mode 100644
index 0000000000000..a5fab75c9d381
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_schedule.xml
@@ -0,0 +1,13 @@
+<?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 http-method-override="false">
+        <framework:messenger>
+            <framework:transport name="schedule" dsn="schedule://default" />
+        </framework:messenger>
+    </framework:config>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml
index 28e27e380bfe0..ea623dab282bb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml
@@ -21,6 +21,7 @@
             <framework:transport name="failed" dsn="in-memory:///" />
             <framework:transport name="redis" dsn="redis://127.0.0.1:6379/messages" />
             <framework:transport name="beanstalkd" dsn="beanstalkd://127.0.0.1:11300" />
+            <framework:transport name="schedule" dsn="schedule://default" />
         </framework:messenger>
     </framework:config>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_schedule.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_schedule.yml
new file mode 100644
index 0000000000000..d0b4c33e41870
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_schedule.yml
@@ -0,0 +1,5 @@
+framework:
+    http_method_override: false
+    messenger:
+        transports:
+            schedule: 'schedule://default'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transports.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transports.yml
index 24471939c5435..15728009e57ef 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transports.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transports.yml
@@ -22,3 +22,4 @@ framework:
             failed: 'in-memory:///'
             redis: 'redis://127.0.0.1:6379/messages'
             beanstalkd: 'beanstalkd://127.0.0.1:11300'
+            schedule: 'schedule://default'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
index 4af61f85cf07a..6c48d03e988ea 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -769,6 +769,13 @@ public function testWebLink()
     public function testMessengerServicesRemovedWhenDisabled()
     {
         $container = $this->createContainerFromFile('messenger_disabled');
+        $messengerDefinitions = array_filter(
+            $container->getDefinitions(),
+            static fn ($name) => str_starts_with($name, 'messenger.'),
+            \ARRAY_FILTER_USE_KEY
+        );
+
+        $this->assertEmpty($messengerDefinitions);
         $this->assertFalse($container->hasDefinition('console.command.messenger_consume_messages'));
         $this->assertFalse($container->hasDefinition('console.command.messenger_debug'));
         $this->assertFalse($container->hasDefinition('console.command.messenger_stop_workers'));
@@ -801,14 +808,28 @@ public function testMessengerWithExplictResetOnMessageLegacy()
 
     public function testMessenger()
     {
-        $container = $this->createContainerFromFile('messenger');
+        $container = $this->createContainerFromFile('messenger', [], true, false);
+        $container->addCompilerPass(new ResolveTaggedIteratorArgumentPass());
+        $container->compile();
+
+        $expectedFactories = [
+            new Reference('messenger.transport.amqp.factory'),
+            new Reference('messenger.transport.redis.factory'),
+            new Reference('messenger.transport.sync.factory'),
+            new Reference('messenger.transport.in_memory.factory'),
+            new Reference('messenger.transport.sqs.factory'),
+            new Reference('messenger.transport.beanstalkd.factory'),
+            new Reference('scheduler.messenger_transport_factory'),
+        ];
+
+        $this->assertTrue($container->hasDefinition('messenger.receiver_locator'));
         $this->assertTrue($container->hasDefinition('console.command.messenger_consume_messages'));
         $this->assertTrue($container->hasAlias('messenger.default_bus'));
         $this->assertTrue($container->getAlias('messenger.default_bus')->isPublic());
-        $this->assertTrue($container->hasDefinition('messenger.transport.amqp.factory'));
-        $this->assertTrue($container->hasDefinition('messenger.transport.redis.factory'));
         $this->assertTrue($container->hasDefinition('messenger.transport_factory'));
         $this->assertSame(TransportFactory::class, $container->getDefinition('messenger.transport_factory')->getClass());
+        $this->assertInstanceOf(TaggedIteratorArgument::class, $container->getDefinition('messenger.transport_factory')->getArgument(0));
+        $this->assertEquals($expectedFactories, $container->getDefinition('messenger.transport_factory')->getArgument(0)->getValues());
         $this->assertTrue($container->hasDefinition('messenger.listener.reset_services'));
         $this->assertSame('messenger.listener.reset_services', (string) $container->getDefinition('console.command.messenger_consume_messages')->getArgument(5));
     }
@@ -825,10 +846,7 @@ public function testMessengerWithoutConsole()
         $this->assertFalse($container->hasDefinition('console.command.messenger_consume_messages'));
         $this->assertTrue($container->hasAlias('messenger.default_bus'));
         $this->assertTrue($container->getAlias('messenger.default_bus')->isPublic());
-        $this->assertTrue($container->hasDefinition('messenger.transport.amqp.factory'));
-        $this->assertTrue($container->hasDefinition('messenger.transport.redis.factory'));
         $this->assertTrue($container->hasDefinition('messenger.transport_factory'));
-        $this->assertSame(TransportFactory::class, $container->getDefinition('messenger.transport_factory')->getClass());
         $this->assertFalse($container->hasDefinition('messenger.listener.reset_services'));
     }
 
@@ -953,6 +971,16 @@ public function testMessengerTransports()
 
         $this->assertTrue($container->hasDefinition('messenger.transport.beanstalkd.factory'));
 
+        $this->assertTrue($container->hasDefinition('messenger.transport.schedule'));
+        $transportFactory = $container->getDefinition('messenger.transport.schedule')->getFactory();
+        $transportArguments = $container->getDefinition('messenger.transport.schedule')->getArguments();
+
+        $this->assertEquals([new Reference('messenger.transport_factory'), 'createTransport'], $transportFactory);
+        $this->assertCount(3, $transportArguments);
+        $this->assertSame('schedule://default', $transportArguments[0]);
+
+        $this->assertTrue($container->hasDefinition('scheduler.messenger_transport_factory'));
+
         $this->assertSame(10, $container->getDefinition('messenger.retry.multiplier_retry_strategy.customised')->getArgument(0));
         $this->assertSame(7, $container->getDefinition('messenger.retry.multiplier_retry_strategy.customised')->getArgument(1));
         $this->assertSame(3, $container->getDefinition('messenger.retry.multiplier_retry_strategy.customised')->getArgument(2));
@@ -966,6 +994,7 @@ public function testMessengerTransports()
             'default' => new Reference('messenger.transport.failed'),
             'failed' => new Reference('messenger.transport.failed'),
             'redis' => new Reference('messenger.transport.failed'),
+            'schedule' => new Reference('messenger.transport.failed'),
         ];
 
         $failureTransportsReferences = array_map(function (ServiceClosureArgument $serviceClosureArgument) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyScheduleConfigLocator.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyScheduleConfigLocator.php
new file mode 100644
index 0000000000000..616c1a2201a3d
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyScheduleConfigLocator.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger;
+
+use Psr\Container\NotFoundExceptionInterface;
+use Symfony\Component\Scheduler\Locator\ScheduleConfigLocatorInterface;
+use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
+
+class DummyScheduleConfigLocator implements ScheduleConfigLocatorInterface
+{
+    /**
+     * @var array<string, ScheduleConfig>
+     */
+    public static array $schedules = [];
+
+    public function get(string $id): ScheduleConfig
+    {
+        if (isset(static::$schedules[$id])) {
+            return static::$schedules[$id];
+        }
+
+        throw new class(sprintf('You have requested a non-existent schedule "%s".', $id)) extends \InvalidArgumentException implements NotFoundExceptionInterface { };
+    }
+
+    public function has(string $id): bool
+    {
+        return isset(static::$schedules[$id]);
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SchedulerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SchedulerTest.php
new file mode 100644
index 0000000000000..02b8ea9e55b42
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SchedulerTest.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyScheduleConfigLocator;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Scheduler\Messenger\ScheduleTransport;
+use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
+use Symfony\Component\Scheduler\Trigger\PeriodicalTrigger;
+
+class SchedulerTest extends AbstractWebTestCase
+{
+    public function testScheduler()
+    {
+        $scheduleConfig = new ScheduleConfig([
+            [PeriodicalTrigger::create(600, '2020-01-01T00:00:00Z'), $foo = new FooMessage()],
+            [PeriodicalTrigger::create(600, '2020-01-01T00:01:00Z'), $bar = new BarMessage()],
+        ]);
+        DummyScheduleConfigLocator::$schedules = ['default' => $scheduleConfig];
+
+        $container = self::getContainer();
+        $container->set('clock', $clock = new MockClock('2020-01-01T00:09:59Z'));
+
+        $this->assertTrue($container->get('receivers')->has('schedule'));
+        $this->assertInstanceOf(ScheduleTransport::class, $cron = $container->get('receivers')->get('schedule'));
+
+        $fetchMessages = static function (float $sleep) use ($clock, $cron) {
+            if (0 < $sleep) {
+                $clock->sleep($sleep);
+            }
+            $messages = [];
+            foreach ($cron->get() as $key => $envelope) {
+                $messages[$key] = $envelope->getMessage();
+            }
+
+            return $messages;
+        };
+
+        $this->assertSame([], $fetchMessages(0.0));
+        $this->assertSame([$foo], $fetchMessages(1.0));
+        $this->assertSame([], $fetchMessages(1.0));
+        $this->assertSame([$bar], $fetchMessages(60.0));
+        $this->assertSame([$foo, $bar], $fetchMessages(600.0));
+    }
+
+    protected static function createKernel(array $options = []): KernelInterface
+    {
+        return parent::createKernel(['test_case' => 'Scheduler'] + $options);
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/bundles.php
new file mode 100644
index 0000000000000..13ab9fddee4a6
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/bundles.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+
+return [
+    new FrameworkBundle(),
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/config.yml
new file mode 100644
index 0000000000000..68e3213f900e3
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/config.yml
@@ -0,0 +1,23 @@
+imports:
+    - { resource: ../config/default.yml }
+
+framework:
+    lock: ~
+    messenger:
+        transports:
+            schedule:
+                dsn: 'schedule://default'
+                options:
+                    cache: 'app'
+                    lock: 'default'
+
+services:
+    Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyScheduleConfigLocator:
+        autoconfigure: true
+
+    clock:
+        synthetic: true
+
+    receivers:
+        public: true
+        alias: 'messenger.receiver_locator'
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index cf9aa6345893e..cfada74f05290 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -38,6 +38,7 @@
         "symfony/asset": "^5.4|^6.0",
         "symfony/browser-kit": "^5.4|^6.0",
         "symfony/console": "^5.4.9|^6.0.9",
+        "symfony/clock": "^6.2",
         "symfony/css-selector": "^5.4|^6.0",
         "symfony/dom-crawler": "^6.3",
         "symfony/dotenv": "^5.4|^6.0",
@@ -53,6 +54,7 @@
         "symfony/notifier": "^5.4|^6.0",
         "symfony/process": "^5.4|^6.0",
         "symfony/rate-limiter": "^5.4|^6.0",
+        "symfony/scheduler": "^6.3",
         "symfony/security-bundle": "^5.4|^6.0",
         "symfony/semaphore": "^5.4|^6.0",
         "symfony/serializer": "^6.1",
diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
index 8a16de384199c..29708d8102ded 100644
--- a/src/Symfony/Component/Messenger/CHANGELOG.md
+++ b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG
  * Deprecate `StopWorkerOnSigtermSignalListener` in favor of
    `StopWorkerOnSignalsListener` and make it configurable with SIGINT and
    SIGTERM by default
+ * Add `ScheduleTransport` to generate messages on a schedule
 
 6.2
 ---
diff --git a/src/Symfony/Component/Messenger/Transport/Receiver/ReceiverInterface.php b/src/Symfony/Component/Messenger/Transport/Receiver/ReceiverInterface.php
index 01e1ca9f2cb83..f9594854bd1f1 100644
--- a/src/Symfony/Component/Messenger/Transport/Receiver/ReceiverInterface.php
+++ b/src/Symfony/Component/Messenger/Transport/Receiver/ReceiverInterface.php
@@ -39,7 +39,7 @@ interface ReceiverInterface
      * be retried again (e.g. if there's a queue, it should be removed)
      * and a MessageDecodingFailedException should be thrown.
      *
-     * @return Envelope[]
+     * @return iterable<Envelope>
      *
      * @throws TransportException If there is an issue communicating with the transport
      */
diff --git a/src/Symfony/Component/Messenger/Transport/TransportFactory.php b/src/Symfony/Component/Messenger/Transport/TransportFactory.php
index 987f19d2a74bf..dbae2f95e19b6 100644
--- a/src/Symfony/Component/Messenger/Transport/TransportFactory.php
+++ b/src/Symfony/Component/Messenger/Transport/TransportFactory.php
@@ -49,6 +49,8 @@ public function createTransport(#[\SensitiveParameter] string $dsn, array $optio
             $packageSuggestion = ' Run "composer require symfony/amazon-sqs-messenger" to install Amazon SQS transport.';
         } elseif (str_starts_with($dsn, 'beanstalkd://')) {
             $packageSuggestion = ' Run "composer require symfony/beanstalkd-messenger" to install Beanstalkd transport.';
+        } elseif (str_starts_with($dsn, 'schedule://')) {
+            $packageSuggestion = ' Run "composer require symfony/scheduler" to install Schedule transport.';
         }
 
         throw new InvalidArgumentException('No transport supports the given Messenger DSN.'.$packageSuggestion);
diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json
index 8d3d0f2653ac7..8de4667134423 100644
--- a/src/Symfony/Component/Messenger/composer.json
+++ b/src/Symfony/Component/Messenger/composer.json
@@ -21,10 +21,13 @@
     },
     "require-dev": {
         "psr/cache": "^1.0|^2.0|^3.0",
+        "symfony/cache": "^5.4|^6.0",
+        "symfony/clock": "^6.2",
         "symfony/console": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/http-kernel": "^5.4|^6.0",
+        "symfony/lock": "^5.4|^6.0",
         "symfony/process": "^5.4|^6.0",
         "symfony/property-access": "^5.4|^6.0",
         "symfony/rate-limiter": "^5.4|^6.0",
diff --git a/src/Symfony/Component/Scheduler/.gitattributes b/src/Symfony/Component/Scheduler/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Scheduler/.gitignore b/src/Symfony/Component/Scheduler/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Scheduler/CHANGELOG.md b/src/Symfony/Component/Scheduler/CHANGELOG.md
new file mode 100644
index 0000000000000..42172c9780f92
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+ * Add the component
diff --git a/src/Symfony/Component/Scheduler/DependencyInjection/SchedulerPass.php b/src/Symfony/Component/Scheduler/DependencyInjection/SchedulerPass.php
new file mode 100644
index 0000000000000..b8b7780392e97
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/DependencyInjection/SchedulerPass.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\DependencyInjection;
+
+use Symfony\Component\Cache\CacheItem;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Lock\LockFactory;
+use Symfony\Component\Scheduler\Messenger\ScheduleTransportFactory;
+use Symfony\Contracts\Cache\CacheInterface;
+
+class SchedulerPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        $usedCachePools = [];
+        $usedLockFactories = [];
+
+        foreach ($container->findTaggedServiceIds('messenger.receiver') as $id => $tags) {
+            $transport = $container->getDefinition($id);
+            [$dsn, $options] = $transport->getArguments();
+            if (!ScheduleTransportFactory::isSupported($dsn)) {
+                continue;
+            }
+
+            if (\is_string($options['cache'] ?? null) && $options['cache']) {
+                $usedCachePools[] = $options['cache'];
+            }
+            if (\is_string($options['lock'] ?? null) && $options['lock']) {
+                $usedLockFactories[] = $options['lock'];
+            }
+            if (\is_array($options['lock'] ?? null) &&
+                \is_string($options['lock']['resource'] ?? null) &&
+                $options['lock']['resource']
+            ) {
+                $usedLockFactories[] = $options['lock']['resource'];
+            }
+        }
+
+        if ($usedCachePools) {
+            $this->locateCachePools($container, $usedCachePools);
+        }
+        if ($usedLockFactories) {
+            $this->locateLockFactories($container, $usedLockFactories);
+        }
+    }
+
+    /**
+     * @param string[] $cachePools
+     */
+    private function locateCachePools(ContainerBuilder $container, array $cachePools): void
+    {
+        if (!class_exists(CacheItem::class)) {
+            throw new \LogicException('You cannot use the "cache" option if the Cache Component is not available. Try running "composer require symfony/cache".');
+        }
+
+        $references = [];
+        foreach (array_unique($cachePools) as $name) {
+            if (!$this->isServiceInstanceOf($container, $id = $name, CacheInterface::class) &&
+                !$this->isServiceInstanceOf($container, $id = 'cache.'.$name, CacheInterface::class)
+            ) {
+                throw new RuntimeException(sprintf('The cache pool "%s" does not exist.', $name));
+            }
+
+            $references[$name] = new Reference($id);
+        }
+
+        $container->getDefinition('scheduler.cache_locator')
+            ->replaceArgument(0, $references);
+    }
+
+    /**
+     * @param string[] $lockFactories
+     */
+    private function locateLockFactories(ContainerBuilder $container, array $lockFactories): void
+    {
+        if (!class_exists(LockFactory::class)) {
+            throw new \LogicException('You cannot use the "lock" option if the Lock Component is not available. Try running "composer require symfony/lock".');
+        }
+
+        $references = [];
+        foreach (array_unique($lockFactories) as $name) {
+            if (!$this->isServiceInstanceOf($container, $id = $name, LockFactory::class) &&
+                !$this->isServiceInstanceOf($container, $id = 'lock.'.$name.'.factory', LockFactory::class)
+            ) {
+                throw new RuntimeException(sprintf('The lock resource "%s" does not exist.', $name));
+            }
+
+            $references[$name] = new Reference($id);
+        }
+
+        $container->getDefinition('scheduler.lock_locator')
+            ->replaceArgument(0, $references);
+    }
+
+    private function isServiceInstanceOf(ContainerBuilder $container, string $serviceId, string $className): bool
+    {
+        if (!$container->hasDefinition($serviceId)) {
+            return false;
+        }
+
+        while (true) {
+            $definition = $container->getDefinition($serviceId);
+            if (!$definition->getClass() && $definition instanceof ChildDefinition) {
+                $serviceId = $definition->getParent();
+
+                continue;
+            }
+
+            return $definition->getClass() && is_a($definition->getClass(), $className, true);
+        }
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Exception/ExceptionInterface.php b/src/Symfony/Component/Scheduler/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000000..4c8719428c23a
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Exception/ExceptionInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Exception;
+
+/**
+ * Base Scheduler component's exception.
+ */
+interface ExceptionInterface extends \Throwable
+{
+}
diff --git a/src/Symfony/Component/Scheduler/Exception/InvalidArgumentException.php b/src/Symfony/Component/Scheduler/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000000..bccf614d94b29
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Exception/InvalidArgumentException.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Scheduler/Exception/LogicException.php b/src/Symfony/Component/Scheduler/Exception/LogicException.php
new file mode 100644
index 0000000000000..61875edd47367
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Exception/LogicException.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Exception;
+
+class LogicException extends \LogicException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Scheduler/Exception/LogicMessengerException.php b/src/Symfony/Component/Scheduler/Exception/LogicMessengerException.php
new file mode 100644
index 0000000000000..31445bc398e48
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Exception/LogicMessengerException.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Exception;
+
+use Symfony\Component\Messenger\Exception\ExceptionInterface;
+
+// not sure about this
+class LogicMessengerException extends LogicException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/Scheduler/LICENSE b/src/Symfony/Component/Scheduler/LICENSE
new file mode 100644
index 0000000000000..f961401699b27
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2023 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Scheduler/Locator/ChainScheduleConfigLocator.php b/src/Symfony/Component/Scheduler/Locator/ChainScheduleConfigLocator.php
new file mode 100644
index 0000000000000..d7ced277e06b1
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Locator/ChainScheduleConfigLocator.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Locator;
+
+use Psr\Container\NotFoundExceptionInterface;
+use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
+
+final class ChainScheduleConfigLocator implements ScheduleConfigLocatorInterface
+{
+    /**
+     * @var ScheduleConfigLocatorInterface[]
+     */
+    private array $locators;
+
+    private array $lastFound = [];
+
+    /**
+     * @param iterable<ScheduleConfigLocatorInterface> $locators
+     */
+    public function __construct(iterable $locators)
+    {
+        $this->locators = (static fn (ScheduleConfigLocatorInterface ...$l) => $l)(...$locators);
+    }
+
+    public function get(string $id): ScheduleConfig
+    {
+        if ($locator = $this->findLocator($id)) {
+            return $locator->get($id);
+        }
+
+        throw new class(sprintf('You have requested a non-existent schedule "%s".', $id)) extends \InvalidArgumentException implements NotFoundExceptionInterface { };
+    }
+
+    public function has(string $id): bool
+    {
+        return null !== $this->findLocator($id);
+    }
+
+    private function findLocator(string $id): ?ScheduleConfigLocatorInterface
+    {
+        if (isset($this->lastFound[$id])) {
+            return $this->lastFound[$id];
+        }
+
+        foreach ($this->locators as $locator) {
+            if ($locator->has($id)) {
+                $this->lastFound = [$id => $locator];
+
+                return $locator;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Locator/ScheduleConfigLocatorInterface.php b/src/Symfony/Component/Scheduler/Locator/ScheduleConfigLocatorInterface.php
new file mode 100644
index 0000000000000..594a892814ee4
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Locator/ScheduleConfigLocatorInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Locator;
+
+use Psr\Container\ContainerInterface;
+use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
+
+interface ScheduleConfigLocatorInterface extends ContainerInterface
+{
+    public function get(string $id): ScheduleConfig;
+}
diff --git a/src/Symfony/Component/Scheduler/Messenger/ScheduleTransport.php b/src/Symfony/Component/Scheduler/Messenger/ScheduleTransport.php
new file mode 100644
index 0000000000000..bac7646b6a097
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Messenger/ScheduleTransport.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Messenger;
+
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Transport\TransportInterface;
+use Symfony\Component\Scheduler\Exception\LogicMessengerException;
+use Symfony\Component\Scheduler\Schedule\ScheduleInterface;
+
+class ScheduleTransport implements TransportInterface
+{
+    private readonly array $stamps;
+
+    public function __construct(
+        private readonly ScheduleInterface $schedule,
+    ) {
+        $this->stamps = [new ScheduledStamp()];
+    }
+
+    public function get(): iterable
+    {
+        foreach ($this->schedule->getMessages() as $message) {
+            yield new Envelope($message, $this->stamps);
+        }
+    }
+
+    public function ack(Envelope $envelope): void
+    {
+        // ignore
+    }
+
+    public function reject(Envelope $envelope): void
+    {
+        throw new LogicMessengerException('Messages from ScheduleTransport must not be rejected.');
+    }
+
+    public function send(Envelope $envelope): Envelope
+    {
+        throw new LogicMessengerException('The ScheduleTransport cannot send messages.');
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Messenger/ScheduleTransportFactory.php b/src/Symfony/Component/Scheduler/Messenger/ScheduleTransportFactory.php
new file mode 100644
index 0000000000000..d28500b5b5224
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Messenger/ScheduleTransportFactory.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Messenger;
+
+use Psr\Clock\ClockInterface;
+use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
+use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
+use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
+use Symfony\Component\Scheduler\Locator\ScheduleConfigLocatorInterface;
+use Symfony\Component\Scheduler\Schedule\Schedule;
+use Symfony\Component\Scheduler\State\StateFactoryInterface;
+
+class ScheduleTransportFactory implements TransportFactoryInterface
+{
+    protected const DEFAULT_OPTIONS = [
+        'cache' => null,
+        'lock' => null,
+    ];
+
+    public function __construct(
+        private readonly ClockInterface $clock,
+        private readonly ScheduleConfigLocatorInterface $schedules,
+        private readonly StateFactoryInterface $stateFactory,
+    ) {
+    }
+
+    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): ScheduleTransport
+    {
+        if ('schedule://' === $dsn) {
+            throw new InvalidArgumentException('The Schedule DSN must contains a name, e.g. "schedule://default".');
+        }
+        if (false === $scheduleName = parse_url($dsn, \PHP_URL_HOST)) {
+            throw new InvalidArgumentException(sprintf('The given Schedule DSN "%s" is invalid.', $dsn));
+        }
+
+        unset($options['transport_name']);
+        $options += static::DEFAULT_OPTIONS;
+        if (0 < \count($invalidOptions = array_diff_key($options, static::DEFAULT_OPTIONS))) {
+            throw new InvalidArgumentException(sprintf('Invalid option(s) "%s" passed to the Schedule Messenger transport.', implode('", "', array_keys($invalidOptions))));
+        }
+
+        if (!$this->schedules->has($scheduleName)) {
+            throw new InvalidArgumentException(sprintf('The schedule "%s" is not found.', $scheduleName));
+        }
+
+        return new ScheduleTransport(
+            new Schedule(
+                $this->clock,
+                $this->stateFactory->create($scheduleName, $options),
+                $this->schedules->get($scheduleName)
+            )
+        );
+    }
+
+    public function supports(string $dsn, array $options): bool
+    {
+        return self::isSupported($dsn);
+    }
+
+    final public static function isSupported(string $dsn): bool
+    {
+        return str_starts_with($dsn, 'schedule://');
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Messenger/ScheduledStamp.php b/src/Symfony/Component/Scheduler/Messenger/ScheduledStamp.php
new file mode 100644
index 0000000000000..78f7535358534
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Messenger/ScheduledStamp.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Messenger;
+
+use Symfony\Component\Messenger\Stamp\NonSendableStampInterface;
+
+final class ScheduledStamp implements NonSendableStampInterface
+{
+}
diff --git a/src/Symfony/Component/Scheduler/README.md b/src/Symfony/Component/Scheduler/README.md
new file mode 100644
index 0000000000000..6ea658c8a07e4
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/README.md
@@ -0,0 +1,56 @@
+Scheduler Component
+====================
+
+Provides basic scheduling through the Symfony Messenger.
+
+Getting Started
+---------------
+
+```
+$ composer require symfony/scheduler
+```
+
+Full DSN with schedule name: `schedule://<name>`
+
+```yaml
+# messenger.yaml
+framework:
+  messenger:
+    transports:
+      schedule_default: 'schedule://default'
+```
+
+```php
+<?php
+
+use Symfony\Component\Scheduler\ScheduleConfig;
+use Symfony\Component\Scheduler\Trigger\PeriodicalTrigger;
+
+class ExampleLocator implements ScheduleConfigLocatorInterface
+{
+    public function get(string $id): ScheduleConfig
+    {
+        return (new ScheduleConfig())
+            ->add(
+                // do the MaintenanceJob every night at 3 a.m. UTC
+                PeriodicalTrigger::create('P1D', '03:00:00+00'),
+                new MaintenanceJob()
+            )
+        ;
+    }
+
+    public function has(string $id): bool
+    {
+        return 'default' === $id;
+    }
+}
+```
+
+Resources
+---------
+
+* [Documentation](https://symfony.com/doc/current/scheduler.html)
+* [Contributing](https://symfony.com/doc/current/contributing/index.html)
+* [Report issues](https://github.com/symfony/symfony/issues) and
+  [send Pull Requests](https://github.com/symfony/symfony/pulls)
+  in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Scheduler/Schedule/Schedule.php b/src/Symfony/Component/Scheduler/Schedule/Schedule.php
new file mode 100644
index 0000000000000..733f9cc26f9bb
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Schedule/Schedule.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Schedule;
+
+use Psr\Clock\ClockInterface;
+use Symfony\Component\Scheduler\State\StateInterface;
+use Symfony\Component\Scheduler\Trigger\TriggerInterface;
+
+final class Schedule implements ScheduleInterface
+{
+    /**
+     * @var array<int, array{TriggerInterface, object}>
+     */
+    private readonly array $schedule;
+    private ScheduleHeap $scheduleHeap;
+    private ?\DateTimeImmutable $waitUntil;
+
+    public function __construct(
+        private readonly ClockInterface $clock,
+        private readonly StateInterface $state,
+        ScheduleConfig $scheduleConfig,
+    ) {
+        $this->schedule = $scheduleConfig->getSchedule();
+        $this->waitUntil = new \DateTimeImmutable('@0');
+    }
+
+    public function getMessages(): \Generator
+    {
+        if (!$this->waitUntil ||
+            $this->waitUntil > ($now = $this->clock->now()) ||
+            !$this->state->acquire($now)
+        ) {
+            return;
+        }
+
+        $lastTime = $this->state->time();
+        $lastIndex = $this->state->index();
+        $heap = $this->heap($lastTime);
+
+        while (!$heap->isEmpty() && $heap->top()[0] <= $now) {
+            /** @var TriggerInterface $trigger */
+            [$time, $index, $trigger, $message] = $heap->extract();
+            $yield = true;
+
+            if ($time < $lastTime) {
+                $time = $lastTime;
+                $yield = false;
+            } elseif ($time == $lastTime && $index <= $lastIndex) {
+                $yield = false;
+            }
+
+            if ($nextTime = $trigger->nextTo($time)) {
+                $heap->insert([$nextTime, $index, $trigger, $message]);
+            }
+
+            if ($yield) {
+                yield $message;
+                $this->state->save($time, $index);
+            }
+        }
+
+        $this->waitUntil = $heap->isEmpty() ? null : $heap->top()[0];
+
+        $this->state->release($now, $this->waitUntil);
+    }
+
+    private function heap(\DateTimeImmutable $time): ScheduleHeap
+    {
+        if (isset($this->scheduleHeap) && $this->scheduleHeap->time <= $time) {
+            return $this->scheduleHeap;
+        }
+
+        $heap = new ScheduleHeap($time);
+
+        foreach ($this->schedule as $index => [$trigger, $message]) {
+            /** @var TriggerInterface $trigger */
+            if (!$nextTime = $trigger->nextTo($time)) {
+                continue;
+            }
+
+            $heap->insert([$nextTime, $index, $trigger, $message]);
+        }
+
+        return $this->scheduleHeap = $heap;
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Schedule/ScheduleConfig.php b/src/Symfony/Component/Scheduler/Schedule/ScheduleConfig.php
new file mode 100644
index 0000000000000..0a692929dff82
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Schedule/ScheduleConfig.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Schedule;
+
+use Symfony\Component\Scheduler\Trigger\TriggerInterface;
+
+final class ScheduleConfig
+{
+    /**
+     * @var array<int, array{TriggerInterface, object}>
+     */
+    private array $schedule = [];
+
+    /**
+     * @param iterable<array{TriggerInterface, object}> $schedule
+     */
+    public function __construct(iterable $schedule = [])
+    {
+        foreach ($schedule as $args) {
+            $this->add(...$args);
+        }
+    }
+
+    public function add(TriggerInterface $trigger, object $message): self
+    {
+        $this->schedule[] = [$trigger, $message];
+
+        return $this;
+    }
+
+    /**
+     * @return array<int, array{TriggerInterface, object}>
+     */
+    public function getSchedule(): array
+    {
+        return $this->schedule;
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Schedule/ScheduleHeap.php b/src/Symfony/Component/Scheduler/Schedule/ScheduleHeap.php
new file mode 100644
index 0000000000000..a6c92265d4a55
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Schedule/ScheduleHeap.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Schedule;
+
+use Symfony\Component\Scheduler\Trigger\TriggerInterface;
+
+/**
+ * @internal
+ *
+ * @extends \SplHeap<array{\DateTimeImmutable, int, TriggerInterface, object}>
+ */
+final class ScheduleHeap extends \SplHeap
+{
+    public function __construct(
+        public \DateTimeImmutable $time,
+    ) {
+    }
+
+    /**
+     * @param array{\DateTimeImmutable, int, TriggerInterface, object} $value1
+     * @param array{\DateTimeImmutable, int, TriggerInterface, object} $value2
+     */
+    protected function compare(mixed $value1, mixed $value2): int
+    {
+        return $value2[0] <=> $value1[0] ?: $value2[1] <=> $value1[1];
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Schedule/ScheduleInterface.php b/src/Symfony/Component/Scheduler/Schedule/ScheduleInterface.php
new file mode 100644
index 0000000000000..9da99091a329f
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Schedule/ScheduleInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Schedule;
+
+interface ScheduleInterface
+{
+    public function getMessages(): iterable;
+}
diff --git a/src/Symfony/Component/Scheduler/State/CacheStateDecorator.php b/src/Symfony/Component/Scheduler/State/CacheStateDecorator.php
new file mode 100644
index 0000000000000..1ca3bfff6c1af
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/State/CacheStateDecorator.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\State;
+
+use Symfony\Contracts\Cache\CacheInterface;
+
+final class CacheStateDecorator implements StateInterface
+{
+    public function __construct(
+        private readonly StateInterface $inner,
+        private readonly CacheInterface $cache,
+        private readonly string $name,
+    ) {
+    }
+
+    public function acquire(\DateTimeImmutable $now): bool
+    {
+        if (!$this->inner->acquire($now)) {
+            return false;
+        }
+
+        $this->inner->save(...$this->cache->get($this->name, fn () => [$now, -1]));
+
+        return true;
+    }
+
+    public function time(): \DateTimeImmutable
+    {
+        return $this->inner->time();
+    }
+
+    public function index(): int
+    {
+        return $this->inner->index();
+    }
+
+    public function save(\DateTimeImmutable $time, int $index): void
+    {
+        $this->inner->save($time, $index);
+        $this->cache->get($this->name, fn () => [$time, $index], \INF);
+    }
+
+    public function release(\DateTimeImmutable $now, ?\DateTimeImmutable $nextTime): void
+    {
+        $this->inner->release($now, $nextTime);
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/State/LockStateDecorator.php b/src/Symfony/Component/Scheduler/State/LockStateDecorator.php
new file mode 100644
index 0000000000000..57b90fbaf6d33
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/State/LockStateDecorator.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\State;
+
+use Symfony\Component\Lock\LockInterface;
+
+final class LockStateDecorator implements StateInterface
+{
+    private bool $reset = false;
+
+    public function __construct(
+        private readonly State $inner,
+        private readonly LockInterface $lock,
+    ) {
+    }
+
+    public function acquire(\DateTimeImmutable $now): bool
+    {
+        if (!$this->lock->acquire()) {
+            // Reset local state if a `Lock` is acquired by another `Worker`.
+            $this->reset = true;
+
+            return false;
+        }
+
+        if ($this->reset) {
+            $this->reset = false;
+            $this->inner->save($now, -1);
+        }
+
+        return $this->inner->acquire($now);
+    }
+
+    public function time(): \DateTimeImmutable
+    {
+        return $this->inner->time();
+    }
+
+    public function index(): int
+    {
+        return $this->inner->index();
+    }
+
+    public function save(\DateTimeImmutable $time, int $index): void
+    {
+        $this->inner->save($time, $index);
+    }
+
+    /**
+     * Releases `State`, not `Lock`.
+     *
+     * It tries to keep a `Lock` as long as a `Worker` is alive.
+     */
+    public function release(\DateTimeImmutable $now, ?\DateTimeImmutable $nextTime): void
+    {
+        $this->inner->release($now, $nextTime);
+
+        if (!$nextTime) {
+            $this->lock->release();
+        } elseif ($remaining = $this->lock->getRemainingLifetime()) {
+            $this->lock->refresh((float) $nextTime->format('U.u') - (float) $now->format('U.u') + $remaining);
+        }
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/State/State.php b/src/Symfony/Component/Scheduler/State/State.php
new file mode 100644
index 0000000000000..e910bc5a3b7c0
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/State/State.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\State;
+
+final class State implements StateInterface
+{
+    private \DateTimeImmutable $time;
+    private int $index = -1;
+
+    public function acquire(\DateTimeImmutable $now): bool
+    {
+        if (!isset($this->time)) {
+            $this->time = $now;
+        }
+
+        return true;
+    }
+
+    public function time(): \DateTimeImmutable
+    {
+        return $this->time;
+    }
+
+    public function index(): int
+    {
+        return $this->index;
+    }
+
+    public function save(\DateTimeImmutable $time, int $index): void
+    {
+        $this->time = $time;
+        $this->index = $index;
+    }
+
+    public function release(\DateTimeImmutable $now, ?\DateTimeImmutable $nextTime): void
+    {
+        // skip
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/State/StateFactory.php b/src/Symfony/Component/Scheduler/State/StateFactory.php
new file mode 100644
index 0000000000000..b9070b8d3023c
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/State/StateFactory.php
@@ -0,0 +1,91 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\State;
+
+use Psr\Container\ContainerInterface;
+use Symfony\Component\Lock\LockFactory;
+use Symfony\Component\Lock\LockInterface;
+use Symfony\Component\Scheduler\Exception\LogicException;
+use Symfony\Contracts\Cache\CacheInterface;
+
+final class StateFactory implements StateFactoryInterface
+{
+    public function __construct(
+        private readonly ContainerInterface $lockFactories,
+        private readonly ContainerInterface $caches,
+    ) {
+    }
+
+    public function create(string $scheduleName, array $options): StateInterface
+    {
+        $name = 'messenger.schedule.'.$scheduleName;
+        $state = new State();
+
+        if ($lock = $this->createLock($scheduleName, $name, $options)) {
+            $state = new LockStateDecorator($state, $lock);
+        }
+        if ($cache = $this->createCache($scheduleName, $options)) {
+            $state = new CacheStateDecorator($state, $cache, $name);
+        }
+
+        return $state;
+    }
+
+    private function createLock(string $scheduleName, string $resourceName, array $options): ?LockInterface
+    {
+        if (!($options[
10000
'lock'] ?? false)) {
+            return null;
+        }
+
+        if (\is_string($options['lock'])) {
+            $options['lock'] = ['resource' => $options['lock']];
+        }
+
+        if (\is_array($options['lock']) && \is_string($resource = $options['lock']['resource'] ?? null)) {
+            if (!$this->lockFactories->has($resource)) {
+                throw new LogicException(sprintf('The lock resource "%s" does not exist.', $resource));
+            }
+
+            /** @var LockFactory $lockFactory */
+            $lockFactory = $this->lockFactories->get($resource);
+
+            $args = ['resource' => $resourceName];
+            if (isset($options['lock']['ttl'])) {
+                $args['ttl'] = (float) $options['lock']['ttl'];
+            }
+            if (isset($options['lock']['auto_release'])) {
+                $args['autoRelease'] = (float) $options['lock']['auto_release'];
+            }
+
+            return $lockFactory->createLock(...$args);
+        }
+
+        throw new LogicException(sprintf('Invalid lock configuration for "%s" schedule.', $scheduleName));
+    }
+
+    private function createCache(string $scheduleName, array $options): ?CacheInterface
+    {
+        if (!($options['cache'] ?? false)) {
+            return null;
+        }
+
+        if (\is_string($options['cache'])) {
+            if (!$this->caches->has($options['cache'])) {
+                throw new LogicException(sprintf('The cache pool "%s" does not exist.', $options['cache']));
+            }
+
+            return $this->caches->get($options['cache']);
+        }
+
+        throw new LogicException(sprintf('Invalid cache configuration for "%s" schedule.', $scheduleName));
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/State/StateFactoryInterface.php b/src/Symfony/Component/Scheduler/State/StateFactoryInterface.php
new file mode 100644
index 0000000000000..d1fa88bcff1cb
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/State/StateFactoryInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\State;
+
+interface StateFactoryInterface
+{
+    /**
+     * @param array<string, int|float|string|bool|null> $options
+     */
+    public function create(string $scheduleName, array $options): StateInterface;
+}
diff --git a/src/Symfony/Component/Scheduler/State/StateInterface.php b/src/Symfony/Component/Scheduler/State/StateInterface.php
new file mode 100644
index 0000000000000..4fc443c4f51f6
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/State/StateInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\State;
+
+interface StateInterface
+{
+    public function acquire(\DateTimeImmutable $now): bool;
+
+    public function time(): \DateTimeImmutable;
+
+    public function index(): int;
+
+    public function save(\DateTimeImmutable $time, int $index): void;
+
+    public function release(\DateTimeImmutable $now, ?\DateTimeImmutable $nextTime): void;
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Locator/ChainScheduleConfigLocatorTest.php b/src/Symfony/Component/Scheduler/Tests/Locator/ChainScheduleConfigLocatorTest.php
new file mode 100644
index 0000000000000..6e951b444a708
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Locator/ChainScheduleConfigLocatorTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Locator;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\NotFoundExceptionInterface;
+use Symfony\Component\Scheduler\Locator\ChainScheduleConfigLocator;
+use Symfony\Component\Scheduler\Locator\ScheduleConfigLocatorInterface;
+use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
+
+class ChainScheduleConfigLocatorTest extends TestCase
+{
+    public function testExists()
+    {
+        $schedule = new ScheduleConfig();
+
+        $empty = $this->createMock(ScheduleConfigLocatorInterface::class);
+        $empty->expects($this->once())->method('has')->with('exists')->willReturn(false);
+        $empty->expects($this->never())->method('get');
+
+        $full = $this->createMock(ScheduleConfigLocatorInterface::class);
+        $full->expects($this->once())->method('has')->with('exists')->willReturn(true);
+        $full->expects($this->once())->method('get')->with('exists')->willReturn($schedule);
+
+        $locator = new ChainScheduleConfigLocator([$empty, $full]);
+
+        $this->assertTrue($locator->has('exists'));
+        $this->assertSame($schedule, $locator->get('exists'));
+    }
+
+    public function testNonExists()
+    {
+        $locator = new ChainScheduleConfigLocator([$this->createMock(ScheduleConfigLocatorInterface::class)]);
+
+        $this->assertFalse($locator->has('non-exists'));
+        $this->expectException(NotFoundExceptionInterface::class);
+
+        $locator->get('non-exists');
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportFactoryTest.php b/src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportFactoryTest.php
new file mode 100644
index 0000000000000..858189d11b63b
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportFactoryTest.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Messenger;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Clock\ClockInterface;
+use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
+use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
+use Symfony\Component\Scheduler\Locator\ScheduleConfigLocatorInterface;
+use Symfony\Component\Scheduler\Messenger\ScheduleTransport;
+use Symfony\Component\Scheduler\Messenger\ScheduleTransportFactory;
+use Symfony\Component\Scheduler\Schedule\Schedule;
+use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
+use Symfony\Component\Scheduler\State\StateFactoryInterface;
+use Symfony\Component\Scheduler\State\StateInterface;
+use Symfony\Component\Scheduler\Trigger\TriggerInterface;
+
+class ScheduleTransportFactoryTest extends TestCase
+{
+    public function testCreateTransport()
+    {
+        $trigger = $this->createMock(TriggerInterface::class);
+        $serializer = $this->createMock(SerializerInterface::class);
+        $clock = $this->createMock(ClockInterface::class);
+        $container = new class() extends \ArrayObject implements ScheduleConfigLocatorInterface {
+            public function get(string $id): ScheduleConfig
+            {
+                return $this->offsetGet($id);
+            }
+
+            public function has(string $id): bool
+            {
+                return $this->offsetExists($id);
+            }
+        };
+
+        $stateFactory = $this->createMock(StateFactoryInterface::class);
+        $stateFactory
+            ->expects($this->exactly(2))
+            ->method('create')
+            ->withConsecutive(
+                ['default', ['cache' => null, 'lock' => null]],
+                ['custom', ['cache' => 'app', 'lock' => null]]
+            )
+            ->willReturn($state = $this->createMock(StateInterface::class));
+
+        $container['default'] = new ScheduleConfig([[$trigger, (object) ['id' => 'default']]]);
+        $container['custom'] = new ScheduleConfig([[$trigger, (object) ['id' => 'custom']]]);
+        $default = new ScheduleTransport(new Schedule($clock, $state, $container['default']));
+        $custom = new ScheduleTransport(new Schedule($clock, $state, $container['custom']));
+
+        $factory = new ScheduleTransportFactory($clock, $container, $stateFactory);
+
+        $this->assertEquals($default, $factory->createTransport('schedule://default', [], $serializer));
+        $this->assertEquals($custom, $factory->createTransport('schedule://custom', ['cache' => 'app'], $serializer));
+    }
+
+    public function testInvalidDsn()
+    {
+        $factory = $this->makeTransportFactoryWithStubs();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The given Schedule DSN "schedule://#wrong" is invalid.');
+
+        $factory->createTransport('schedule://#wrong', [], $this->createMock(SerializerInterface::class));
+    }
+
+    public function testNoName()
+    {
+        $factory = $this->makeTransportFactoryWithStubs();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The Schedule DSN must contains a name, e.g. "schedule://default".');
+
+        $factory->createTransport('schedule://', [], $this->createMock(SerializerInterface::class));
+    }
+
+    public function testInvalidOption()
+    {
+        $factory = $this->makeTransportFactoryWithStubs();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid option(s) "invalid" passed to the Schedule Messenger transport.');
+
+        $factory->createTransport('schedule://name', ['invalid' => true], $this->createMock(SerializerInterface::class));
+    }
+
+    public function testNotFound()
+    {
+        $factory = $this->makeTransportFactoryWithStubs();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The schedule "not-exists" is not found.');
+
+        $factory->createTransport('schedule://not-exists', [], $this->createMock(SerializerInterface::class));
+    }
+
+    public function testSupports()
+    {
+        $factory = $this->makeTransportFactoryWithStubs();
+
+        $this->assertTrue($factory->supports('schedule://', []));
+        $this->assertTrue($factory->supports('schedule://name', []));
+        $this->assertFalse($factory->supports('', []));
+        $this->assertFalse($factory->supports('string', []));
+    }
+
+    private function makeTransportFactoryWithStubs(): ScheduleTransportFactory
+    {
+        return new ScheduleTransportFactory(
+            $this->createMock(ClockInterface::class),
+            $this->createMock(ScheduleConfigLocatorInterface::class),
+            $this->createMock(StateFactoryInterface::class)
+        );
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportTest.php b/src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportTest.php
new file mode 100644
index 0000000000000..b8a9d6acfb4a8
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Messenger;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Scheduler\Exception\LogicMessengerException;
+use Symfony\Component\Scheduler\Messenger\ScheduledStamp;
+use Symfony\Component\Scheduler\Messenger\ScheduleTransport;
+use Symfony\Component\Scheduler\Schedule\ScheduleInterface;
+
+class ScheduleTransportTest extends TestCase
+{
+    public function testGetFromIterator()
+    {
+        $messages = [
+            (object) ['id' => 'first'],
+            (object) ['id' => 'second'],
+        ];
+        $scheduler = $this->createConfiguredMock(ScheduleInterface::class, [
+            'getMessages' => $messages,
+        ]);
+        $transport = new ScheduleTransport($scheduler);
+
+        foreach ($transport->get() as $envelope) {
+            $this->assertInstanceOf(Envelope::class, $envelope);
+            $this->assertNotNull($envelope->last(ScheduledStamp::class));
+            $this->assertSame(array_shift($messages), $envelope->getMessage());
+        }
+
+        $this->assertEmpty($messages);
+    }
+
+    public function testAckIgnored()
+    {
+        $transport = new ScheduleTransport($this->createMock(ScheduleInterface::class));
+
+        $transport->ack(new Envelope(new \stdClass()));
+
+        $this->assertTrue(true); // count coverage
+    }
+
+    public function testRejectException()
+    {
+        $transport = new ScheduleTransport($this->createMock(ScheduleInterface::class));
+
+        $this->expectException(LogicMessengerException::class);
+        $transport->reject(new Envelope(new \stdClass()));
+    }
+
+    public function testSendException()
+    {
+        $transport = new ScheduleTransport($this->createMock(ScheduleInterface::class));
+
+        $this->expectException(LogicMessengerException::class);
+        $transport->send(new Envelope(new \stdClass()));
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleConfigTest.php b/src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleConfigTest.php
new file mode 100644
index 0000000000000..0c350aa084884
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleConfigTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Schedule;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
+use Symfony\Component\Scheduler\Trigger\TriggerInterface;
+
+class ScheduleConfigTest extends TestCase
+{
+    public function testEmpty()
+    {
+        $config = new ScheduleConfig();
+
+        $this->assertSame([], $config->getSchedule());
+    }
+
+    public function testAdd()
+    {
+        $config = new ScheduleConfig();
+
+        $config->add($t1 = $this->createMock(TriggerInterface::class), $o1 = (object) ['name' => 'first']);
+        $config->add($t2 = $this->createMock(TriggerInterface::class), $o2 = (object) ['name' => 'second']);
+
+        $expected = [
+            [$t1, $o1],
+            [$t2, $o2],
+        ];
+
+        $this->assertSame($expected, $config->getSchedule());
+    }
+
+    public function testFromIterator()
+    {
+        $expected = [
+            [$this->createMock(TriggerInterface::class), (object) ['name' => 'first']],
+            [$this->createMock(TriggerInterface::class), (object) ['name' => 'second']],
+        ];
+
+        $config = new ScheduleConfig(new \ArrayObject($expected));
+
+        $this->assertSame($expected, $config->getSchedule());
+    }
+
+    public function testFromBadIterator()
+    {
+        $this->expectException(\TypeError::class);
+        $this->expectExceptionMessage('must be of type Symfony\Component\Scheduler\Trigger\TriggerInterface');
+
+        new ScheduleConfig([new \ArrayObject(['wrong'])]);
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleTest.php b/src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleTest.php
new file mode 100644
index 0000000000000..1f90c84916296
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleTest.php
@@ -0,0 +1,180 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Schedule;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Scheduler\Schedule\Schedule;
+use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
+use Symfony\Component\Scheduler\State\State;
+use Symfony\Component\Scheduler\Trigger\TriggerInterface;
+
+class ScheduleTest extends TestCase
+{
+    public function messagesProvider(): \Generator
+    {
+        $first = (object) ['id' => 'first'];
+        $second = (object) ['id' => 'second'];
+        $third = (object) ['id' => 'third'];
+
+        yield 'first' => [
+            'startTime' => '22:12:00',
+            'runs' => [
+                '22:12:00' => [],
+                '22:12:01' => [],
+                '22:13:00' => [$first],
+                '22:13:01' => [],
+            ],
+            'schedule' => [
+                $this->makeSchedule($first, '22:13:00', '22:14:00'),
+            ],
+        ];
+
+        yield 'microseconds' => [
+            'startTime' => '22:12:00',
+            'runs' => [
+                '22:12:59.999999' => [],
+                '22:13:00' => [$first],
+                '22:13:01' => [],
+            ],
+            'schedule' => [
+                $this->makeSchedule($first, '22:13:00', '22:14:00', '22:15:00'),
+            ],
+        ];
+
+        yield 'skipped' => [
+            'startTime' => '22:12:00',
+            'runs' => [
+                '22:14:01' => [$first, $first],
+            ],
+            'schedule' => [
+                $this->makeSchedule($first, '22:13:00', '22:14:00', '22:15:00'),
+            ],
+        ];
+
+        yield 'sequence' => [
+            'startTime' => '22:12:00',
+            'runs' => [
+                '22:12:59' => [],
+                '22:13:00' => [$first],
+                '22:13:01' => [],
+                '22:13:59' => [],
+                '22:14:00' => [$first],
+                '22:14:01' => [],
+            ],
+            'schedule' => [
+                $this->makeSchedule($first, '22:13:00', '22:14:00', '22:15:00'),
+            ],
+        ];
+
+        yield 'concurrency' => [
+            'startTime' => '22:12:00',
+            'runs' => [
+                '22:12:00.555' => [],
+                '22:13:01.555' => [$third, $first, $first, $second, $first],
+                '22:13:02.000' => [$first],
+                '22:13:02.555' => [],
+            ],
+            'schedule' => [
+                $this->makeSchedule($first, '22:12:59', '22:13:00', '22:13:01', '22:13:02', '22:13:03'),
+                $this->makeSchedule($second, '22:13:00', '22:14:00'),
+                $this->makeSchedule($third, '22:12:30', '22:13:30'),
+            ],
+        ];
+
+        yield 'parallel' => [
+            'startTime' => '22:12:00',
+            'runs' => [
+                '22:12:59' => [],
+                '22:13:59' => [$first, $second],
+                '22:14:00' => [$first, $second],
+                '22:14:01' => [],
+            ],
+            'schedule' => [
+                $this->makeSchedule($first, '22:13:00', '22:14:00', '22:15:00'),
+                $this->makeSchedule($second, '22:13:00', '22:14:00', '22:15:00'),
+            ],
+        ];
+
+        yield 'past' => [
+            'startTime' => '22:12:00',
+            'runs' => [
+                '22:12:01' => [],
+            ],
+            'schedule' => [
+                [$this->createMock(TriggerInterface::class), $this],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider messagesProvider
+     */
+    public function testGetMessages(string $startTime, array $runs, array $schedule)
+    {
+        // for referencing
+        $now = $this->makeDateTime($startTime);
+
+        $clock = $this->createMock(ClockInterface::class);
+        $clock->method('now')->willReturnReference($now);
+
+        $scheduler = new Schedule($clock, new State(), new ScheduleConfig($schedule));
+
+        // Warmup. The first run is always returns nothing.
+        $this->assertSame([], iterator_to_array($scheduler->getMessages()));
+
+        foreach ($runs as $time => $expected) {
+            $now = $this->makeDateTime($time);
+            $this->assertSame($expected, iterator_to_array($scheduler->getMessages()));
+        }
+    }
+
+    private function makeDateTime(string $time): \DateTimeImmutable
+    {
+        return new \DateTimeImmutable('2020-02-20T'.$time, new \DateTimeZone('UTC'));
+    }
+
+    /**
+     * @return array{TriggerInterface, object}
+     */
+    private function makeSchedule(object $message, string ...$runs): array
+    {
+        $runs = array_map(fn ($time) => $this->makeDateTime($time), $runs);
+        sort($runs);
+
+        $ticks = [$this->makeDateTime(''), 0];
+
+        $trigger = $this->createMock(TriggerInterface::class);
+        $trigger
+            ->method('nextTo')
+            ->willReturnCallback(function (\DateTimeImmutable $lastTick) use ($runs, &$ticks): \DateTimeImmutable {
+                [$tick, $count] = $ticks;
+                if ($lastTick > $tick) {
+                    $ticks = [$lastTick, 1];
+                } elseif ($lastTick == $tick && $count < 2) {
+                    $ticks = [$lastTick, ++$count];
+                } else {
+                    $this->fail(sprintf('Invalid tick %s', $lastTick->format(\DateTimeImmutable::RFC3339_EXTENDED)));
+                }
+
+                foreach ($runs as $run) {
+                    if ($lastTick < $run) {
+                        return $run;
+                    }
+                }
+
+                $this->fail(sprintf('There is no next run for tick %s', $lastTick->format(\DateTimeImmutable::RFC3339_EXTENDED)));
+            });
+
+        return [$trigger, $message];
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/State/CacheStateDecoratorTest.php b/src/Symfony/Component/Scheduler/Tests/State/CacheStateDecoratorTest.php
new file mode 100644
index 0000000000000..48cd22b69cd3b
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/State/CacheStateDecoratorTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\State;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Scheduler\State\CacheStateDecorator;
+use Symfony\Component\Scheduler\State\State;
+use Symfony\Component\Scheduler\State\StateInterface;
+use Symfony\Contracts\Cache\CacheInterface;
+
+class CacheStateDecoratorTest extends TestCase
+{
+    private ArrayAdapter $cache;
+    private State $inner;
+    private CacheStateDecorator $state;
+    private \DateTimeImmutable $now;
+
+    protected function setUp(): void
+    {
+        $this->cache = new ArrayAdapter(storeSerialized: false);
+        $this->inner = new State();
+        $this->state = new CacheStateDecorator($this->inner, $this->cache, 'cache');
+        $this->now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+    }
+
+    public function testInitStateOnFirstAcquiring()
+    {
+        [$cache, $state, $now] = [$this->cache, $this->state, $this->now];
+
+        $this->assertTrue($state->acquire($now));
+        $this->assertEquals($now, $state->time());
+        $this->assertEquals(-1, $state->index());
+        $this->assertEquals([$now, -1], $cache->get('cache', fn () => []));
+    }
+
+    public function testLoadStateOnAcquiring()
+    {
+        [$cache, $inner, $state, $now] = [$this->cache, $this->inner, $this->state, $this->now];
+
+        $cache->get('cache', fn () => [$now, 0], \INF);
+
+        $this->assertTrue($state->acquire($now->modify('1 min')));
+        $this->assertEquals($now, $state->time());
+        $this->assertEquals(0, $state->index());
+        $this->assertEquals([$now, 0], $cache->get('cache', fn () => []));
+    }
+
+    public function testCannotAcquereIfInnerAcquered()
+    {
+        $inner = $this->createMock(StateInterface::class);
+        $inner->method('acquire')->willReturn(false);
+        $state = new CacheStateDecorator($inner, $this->cache, 'cache');
+
+        $this->assertFalse($state->acquire($this->now));
+    }
+
+    public function testSave()
+    {
+        [$cache, $inner, $state, $now] = [$this->cache, $this->inner, $this->state, $this->now];
+
+        $state->acquire($now->modify('-1 hour'));
+        $state->save($now, 3);
+
+        $this->assertSame($now, $state->time());
+        $this->assertSame(3, $state->index());
+        $this->assertSame($inner->time(), $state->time());
+        $this->assertSame($inner->index(), $state->index());
+        $this->assertSame([$now, 3], $cache->get('cache', fn () => []));
+    }
+
+    public function testRelease()
+    {
+        $now = $this->now;
+        $later = $now->modify('1 min');
+        $cache = $this->createMock(CacheInterface::class);
+        $inner = $this->createMock(StateInterface::class);
+        $inner->expects($this->once())->method('release')->with($now, $later);
+        $state = new CacheStateDecorator($inner, $cache, 'cache');
+
+        $state->release($now, $later);
+    }
+
+    public function testFullCycle()
+    {
+        [$cache, $inner, $state, $now] = [$this->cache, $this->inner, $this->state, $this->now];
+
+        // init
+        $cache->get('cache', fn () => [$now->modify('-1 min'), 3], \INF);
+
+        // action
+        $acquired = $state->acquire($now);
+        $lastTime = $state->time();
+        $lastIndex = $state->index();
+        $state->save($now, 0);
+        $state->release($now, null);
+
+        // asserting
+        $this->assertTrue($acquired);
+        $this->assertEquals($now->modify('-1 min'), $lastTime);
+        $this->assertSame(3, $lastIndex);
+        $this->assertEquals($now, $inner->time());
+        $this->assertSame(0, $inner->index());
+        $this->assertEquals([$now, 0], $cache->get('cache', fn () => []));
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/State/LockStateDecoratorTest.php b/src/Symfony/Component/Scheduler/Tests/State/LockStateDecoratorTest.php
new file mode 100644
index 0000000000000..e3feab24c6da9
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/State/LockStateDecoratorTest.php
@@ -0,0 +1,172 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\State;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Lock\Key;
+use Symfony\Component\Lock\Lock;
+use Symfony\Component\Lock\LockInterface;
+use Symfony\Component\Lock\Store\InMemoryStore;
+use Symfony\Component\Scheduler\State\LockStateDecorator;
+use Symfony\Component\Scheduler\State\State;
+
+class LockStateDecoratorTest extends TestCase
+{
+    private InMemoryStore $store;
+    private Lock $lock;
+    private State $inner;
+    private LockStateDecorator $state;
+    private \DateTimeImmutable $now;
+
+    protected function setUp(): void
+    {
+        $this->store = new InMemoryStore();
+        $this->lock = new Lock(new Key('lock'), $this->store);
+        $this->inner = new State();
+        $this->state = new LockStateDecorator($this->inner, $this->lock);
+        $this->now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+    }
+
+    public function testSave()
+    {
+        [$inner, $state, $now] = [$this->inner, $this->state, $this->now];
+
+        $state->acquire($now->modify('-1 hour'));
+        $state->save($now, 3);
+
+        $this->assertSame($now, $state->time());
+        $this->assertSame(3, $state->index());
+        $this->assertSame($inner->time(), $state->time());
+        $this->assertSame($inner->index(), $state->index());
+    }
+
+    public function testInitStateOnFirstAcquiring()
+    {
+        [$lock, $state, $now] = [$this->lock, $this->state, $this->now];
+
+        $this->assertTrue($state->acquire($now));
+        $this->assertEquals($now, $state->time());
+        $this->assertEquals(-1, $state->index());
+        $this->assertTrue($lock->isAcquired());
+    }
+
+    public function testLoadStateOnAcquiring()
+    {
+        [$lock, $inner, $state, $now] = [$this->lock, $this->inner, $this->state, $this->now];
+
+        $inner->save($now, 0);
+
+        $this->assertTrue($state->acquire($now->modify('1 min')));
+        $this->assertEquals($now, $state->time());
+        $this->assertEquals(0, $state->index());
+        $this->assertTrue($lock->isAcquired());
+    }
+
+    public function testCannotAcquereIfLocked()
+    {
+        [$state, $now] = [$this->state, $this->now];
+
+        $this->concurrentLock();
+
+        $this->assertFalse($state->acquire($now));
+    }
+
+    public function testResetStateAfterLockedAcquiring()
+    {
+        [$lock, $inner, $state, $now] = [$this->lock, $this->inner, $this->state, $this->now];
+
+        $concurrentLock = $this->concurrentLock();
+        $inner->save($now->modify('-2 min'), 0);
+        $state->acquire($now->modify('-1 min'));
+        $concurrentLock->release();
+
+        $this->assertTrue($state->acquire($now));
+        $this->assertEquals($now, $state->time());
+        $this->assertEquals(-1, $state->index());
+        $this->assertTrue($lock->isAcquired());
+        $this->assertFalse($concurrentLock->isAcquired());
+    }
+
+    public function testKeepLock()
+    {
+        [$lock, $state, $now] = [$this->lock, $this->state, $this->now];
+
+        $state->acquire($now->modify('-1 min'));
+        $state->release($now, $now->modify('1 min'));
+
+        $this->assertTrue($lock->isAcquired());
+    }
+
+    public function testReleaseLock()
+    {
+        [$lock, $state, $now] = [$this->lock, $this->state, $this->now];
+
+        $state->acquire($now->modify('-1 min'));
+        $state->release($now, null);
+
+        $this->assertFalse($lock->isAcquired());
+    }
+
+    public function testRefreshLock()
+    {
+        $lock = $this->createMock(LockInterface::class);
+        $lock->method('acquire')->willReturn(true);
+        $lock->method('getRemainingLifetime')->willReturn(120.0);
+        $lock->expects($this->once())->method('refresh')->with(120.0 + 60.0);
+        $lock->expects($this->never())->method('release');
+
+        $state = new LockStateDecorator(new State(), $lock);
+        $now = $this->now;
+
+        $state->acquire($now->modify('-10 sec'));
+        $state->release($now, $now->modify('60 sec'));
+    }
+
+    public function testFullCycle()
+    {
+        [$lock, $inner, $state, $now] = [$this->lock, $this->inner, $this->state, $this->now];
+
+        // init
+        $inner->save($now->modify('-1 min'), 3);
+
+        // action
+        $acquired = $state->acquire($now);
+        $lastTime = $state->time();
+        $lastIndex = $state->index();
+        $state->save($now, 0);
+        $state->release($now, null);
+
+        // asserting
+        $this->assertTrue($acquired);
+        $this->assertEquals($now->modify('-1 min'), $lastTime);
+        $this->assertSame(3, $lastIndex);
+        $this->assertEquals($now, $inner->time());
+        $this->assertSame(0, $inner->index());
+        $this->assertFalse($lock->isAcquired());
+    }
+
+    // No need to unlock after test, because the `InMemoryStore` is deleted
+    private function concurrentLock(): Lock
+    {
+        $lock = new Lock(
+            key: new Key('lock'),
+            store: $this->store,
+            autoRelease: false
+        );
+
+        if (!$lock->acquire()) {
+            throw new \LogicException('Already locked.');
+        }
+
+        return $lock;
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/State/StateFactoryTest.php b/src/Symfony/Component/Scheduler/Tests/State/StateFactoryTest.php
new file mode 100644
index 0000000000000..540245610a0f6
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/State/StateFactoryTest.php
@@ -0,0 +1,176 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\State;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\Lock\LockFactory;
+use Symfony\Component\Lock\Store\InMemoryStore;
+use Symfony\Component\Scheduler\Exception\LogicException;
+use Symfony\Component\Scheduler\State\CacheStateDecorator;
+use Symfony\Component\Scheduler\State\LockStateDecorator;
+use Symfony\Component\Scheduler\State\State;
+use Symfony\Component\Scheduler\State\StateFactory;
+use Symfony\Contracts\Cache\CacheInterface;
+
+class StateFactoryTest extends TestCase
+{
+    public function testCreateSimple()
+    {
+        $factory = new StateFactory(
+            $this->makeContainer([]),
+            $this->makeContainer([])
+        );
+
+        $expected = new State();
+
+        $this->assertEquals($expected, $factory->create('name', []));
+    }
+
+    public function testCreateWithCache()
+    {
+        $cache = $this->createMock(CacheInterface::class);
+        $cache->method('get')->willReturnCallback(fn ($key, \Closure $f) => $f());
+
+        $factory = new StateFactory(
+            $this->makeContainer([]),
+            $this->makeContainer(['app' => $cache]),
+        );
+
+        $state = new State();
+        $expected = new CacheStateDecorator($state, $cache, 'messenger.schedule.name');
+
+        $this->assertEquals($expected, $factory->create('name', ['cache' => 'app']));
+    }
+
+    public function testCreateWithCacheAndLock()
+    {
+        $cache = $this->createMock(CacheInterface::class);
+        $cache->method('get')->willReturnCallback(fn ($key, \Closure $f) => $f());
+
+        $lockFactory = new LockFactory(new InMemoryStore());
+
+        $factory = new StateFactory(
+            $this->makeContainer(['unlock' => $lockFactory]),
+            $this->makeContainer(['app' => $cache]),
+        );
+
+        $lock = $lockFactory->createLock($name = 'messenger.schedule.name');
+        $state = new State();
+        $state = new LockStateDecorator($state, $lock);
+        $expected = new CacheStateDecorator($state, $cache, $name);
+
+        $this->assertEquals($expected, $factory->create('name', ['cache' => 'app', 'lock' => 'unlock']));
+    }
+
+    public function testCreateWithConfiguredLock()
+    {
+        $cache = $this->createMock(CacheInterface::class);
+        $cache->method('get')->willReturnCallback(fn ($key, \Closure $f) => $f());
+
+        $lockFactory = new LockFactory(new InMemoryStore());
+
+        $factory = new StateFactory(
+            $this->makeContainer(['unlock' => $lockFactory]),
+            $this->makeContainer([]),
+        );
+
+        $lock = $lockFactory->createLock('messenger.schedule.name', $ttl = 77.7, false);
+        $state = new State();
+        $expected = new LockStateDecorator($state, $lock);
+
+        $cfg = [
+            'resource' => 'unlock',
+            'ttl' => $ttl,
+            'auto_release' => false,
+        ];
+        $this->assertEquals($expected, $factory->create('name', ['lock' => $cfg]));
+    }
+
+    public function testInvalidCacheName()
+    {
+        $factory = new StateFactory(
+            $this->makeContainer([]),
+            $this->makeContainer([])
+        );
+
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('The cache pool "wrong-cache" does not exist.');
+
+        $factory->create('name', ['cache' => 'wrong-cache']);
+    }
+
+    public function testInvalidLockName()
+    {
+        $factory = new StateFactory(
+            $this->makeContainer([]),
+            $this->makeContainer([])
+        );
+
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('The lock resource "wrong-lock" does not exist.');
+
+        $factory->create('name', ['lock' => 'wrong-lock']);
+    }
+
+    public function testInvalidConfiguredLockName()
+    {
+        $factory = new StateFactory(
+            $this->makeContainer([]),
+            $this->makeContainer([])
+        );
+
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('The lock resource "wrong-lock" does not exist.');
+
+        $factory->create('name', ['lock' => ['resource' => 'wrong-lock']]);
+    }
+
+    public function testInvalidCacheOption()
+    {
+        $factory = new StateFactory(
+            $this->makeContainer([]),
+            $this->makeContainer([]),
+        );
+
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('Invalid cache configuration for "default" schedule.');
+        $factory->create('default', ['cache' => true]);
+    }
+
+    public function testInvalidLockOption()
+    {
+        $factory = new StateFactory(
+            $this->makeContainer([]),
+            $this->makeContainer([]),
+        );
+
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('Invalid lock configuration for "default" schedule.');
+        $factory->create('default', ['lock' => true]);
+    }
+
+    private function makeContainer(array $services): ContainerInterface|\ArrayObject
+    {
+        return new class($services) extends \ArrayObject implements ContainerInterface {
+            public function get(string $id): mixed
+            {
+                return $this->offsetGet($id);
+            }
+
+            public function has(string $id): bool
+            {
+                return $this->offsetExists($id);
+            }
+        };
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/State/StateTest.php b/src/Symfony/Component/Scheduler/Tests/State/StateTest.php
new file mode 100644
index 0000000000000..f5f769665bbbe
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/State/StateTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\State;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Scheduler\State\State;
+
+class StateTest extends TestCase
+{
+    public function testState()
+    {
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+        $later = $now->modify('1 hour');
+        $state = new State();
+
+        $this->assertTrue($state->acquire($now));
+        $this->assertSame($now, $state->time());
+        $this->assertSame(-1, $state->index());
+
+        $state->save($later, 7);
+
+        $this->assertSame($later, $state->time());
+        $this->assertSame(7, $state->index());
+
+        $state->release($later, null);
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/ExcludeTimeTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/ExcludeTimeTriggerTest.php
new file mode 100644
index 0000000000000..b18d60f01e1be
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/ExcludeTimeTriggerTest.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Trigger;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Scheduler\Trigger\ExcludeTimeTrigger;
+use Symfony\Component\Scheduler\Trigger\TriggerInterface;
+
+class ExcludeTimeTriggerTest extends TestCase
+{
+    public function testGetNextRun()
+    {
+        $inner = $this->createMock(TriggerInterface::class);
+        $inner
+            ->method('nextTo')
+            ->willReturnCallback(static fn (\DateTimeImmutable $d) => $d->modify('+1 sec'));
+
+        $scheduled = new ExcludeTimeTrigger(
+            $inner,
+            new \DateTimeImmutable('2020-02-20T02:02:02Z'),
+            new \DateTimeImmutable('2020-02-20T20:20:20Z')
+        );
+
+        $this->assertEquals(new \DateTimeImmutable('2020-02-20T02:02:01Z'), $scheduled->nextTo(new \DateTimeImmutable('2020-02-20T02:02:00Z')));
+        $this->assertEquals(new \DateTimeImmutable('2020-02-20T20:20:21Z'), $scheduled->nextTo(new \DateTimeImmutable('2020-02-20T02:02:02Z')));
+        $this->assertEquals(new \DateTimeImmutable('2020-02-20T20:20:21Z'), $scheduled->nextTo(new \DateTimeImmutable('2020-02-20T20:20:20Z')));
+        $this->assertEquals(new \DateTimeImmutable('2020-02-20T22:22:23Z'), $scheduled->nextTo(new \DateTimeImmutable('2020-02-20T22:22:22Z')));
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/OnceTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/OnceTriggerTest.php
new file mode 100644
index 0000000000000..2fd5d0ca729e7
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/OnceTriggerTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Trigger;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Scheduler\Trigger\OnceTrigger;
+
+class OnceTriggerTest extends TestCase
+{
+    public function testNextTo()
+    {
+        $time = new \DateTimeImmutable('2020-02-20 20:00:00');
+        $schedule = new OnceTrigger($time);
+
+        $this->assertEquals($time, $schedule->nextTo(new \DateTimeImmutable('@0'), ''));
+        $this->assertEquals($time, $schedule->nextTo($time->modify('-1 sec'), ''));
+        $this->assertNull($schedule->nextTo($time, ''));
+        $this->assertNull($schedule->nextTo($time->modify('+1 sec'), ''));
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php
new file mode 100644
index 0000000000000..ce998cd90988d
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php
@@ -0,0 +1,140 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Trigger;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
+use Symfony\Component\Scheduler\Trigger\PeriodicalTrigger;
+
+class PeriodicalTriggerTest extends TestCase
+{
+    public function providerNextTo(): iterable
+    {
+        $periodicalMessage = new PeriodicalTrigger(
+            600,
+            new \DateTimeImmutable('2020-02-20T02:00:00+02'),
+            new \DateTimeImmutable('2020-02-20T03:00:00+02')
+        );
+
+        yield [
+            $periodicalMessage,
+            new \DateTimeImmutable('@0'),
+            new \DateTimeImmutable('2020-02-20T02:00:00+02'),
+        ];
+        yield [
+            $periodicalMessage,
+            new \DateTimeImmutable('2020-02-20T01:59:59.999999+02'),
+            new \DateTimeImmutable('2020-02-20T02:00:00+02'),
+        ];
+        yield [
+            $periodicalMessage,
+            new \DateTimeImmutable('2020-02-20T02:00:00+02'),
+            new \DateTimeImmutable('2020-02-20T02:10:00+02'),
+        ];
+        yield [
+            $periodicalMessage,
+            new \DateTimeImmutable('2020-02-20T02:05:00+02'),
+            new \DateTimeImmutable('2020-02-20T02:10:00+02'),
+        ];
+        yield [
+            $periodicalMessage,
+            new \DateTimeImmutable('2020-02-20T02:49:59.999999+02'),
+            new \DateTimeImmutable('2020-02-20T02:50:00+02'),
+        ];
+        yield [
+            $periodicalMessage,
+            new \DateTimeImmutable('2020-02-20T02:50:00+02'),
+            null,
+        ];
+        yield [
+            $periodicalMessage,
+            new \DateTimeImmutable('2020-02-20T03:00:00+02'),
+            null,
+        ];
+
+        $periodicalMessage = new PeriodicalTrigger(
+            600,
+            new \DateTimeImmutable('2020-02-20T02:00:00Z'),
+            new \DateTimeImmutable('2020-02-20T03:01:00Z')
+        );
+
+        yield [
+            $periodicalMessage,
+            new \DateTimeImmutable('2020-02-20T02:59:59.999999Z'),
+            new \DateTimeImmutable('2020-02-20T03:00:00Z'),
+        ];
+        yield [
+            $periodicalMessage,
+            new \DateTimeImmutable('2020-02-20T03:00:00Z'),
+            null,
+        ];
+    }
+
+    /**
+     * @dataProvider providerNextTo
+     */
+    public function testNextTo(PeriodicalTrigger $periodicalMessage, \DateTimeImmutable $lastRun, ?\DateTimeImmutable $expected)
+    {
+        $this->assertEquals($expected, $periodicalMessage->nextTo($lastRun));
+    }
+
+    public function testConstructors()
+    {
+        $firstRun = new \DateTimeImmutable($now = '2222-02-22');
+        $priorTo = new \DateTimeImmutable($farFuture = '3000-01-01');
+        $day = new \DateInterval('P1D');
+
+        $message = new PeriodicalTrigger(86400, $firstRun, $priorTo);
+
+        $this->assertEquals($message, PeriodicalTrigger::create(86400, $firstRun, $priorTo));
+        $this->assertEquals($message, PeriodicalTrigger::create('86400', $firstRun, $priorTo));
+        $this->assertEquals($message, PeriodicalTrigger::create('P1D', $firstRun, $priorTo));
+        $this->assertEquals($message, PeriodicalTrigger::create($day, $now, $farFuture));
+        $this->assertEquals($message, PeriodicalTrigger::create($day, $now));
+
+        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($firstRun, $day, $priorTo)));
+        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($firstRun->sub($day), $day, $priorTo, \DatePeriod::EXCLUDE_START_DATE)));
+        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($firstRun, $day, 284107)));
+        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($firstRun->sub($day), $day, 284108, \DatePeriod::EXCLUDE_START_DATE)));
+    }
+
+    public function testTooBigInterval()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The interval for a periodical message is too big');
+
+        PeriodicalTrigger::create(\PHP_INT_MAX.'0', new \DateTimeImmutable('2002-02-02'));
+    }
+
+    public function getInvalidIntervals(): iterable
+    {
+        yield ['wrong'];
+        yield ['3600.5'];
+        yield [0];
+        yield [-3600];
+    }
+
+    /**
+     * @dataProvider getInvalidIntervals
+     */
+    public function testInvalidInterval($interval)
+    {
+        $this->expectException(InvalidArgumentException::class);
+        PeriodicalTrigger::create($interval, $now = new \DateTimeImmutable(), $now->modify('1 day'));
+    }
+
+    public function testNegativeInterval()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        PeriodicalTrigger::create('wrong', $now = new \DateTimeImmutable(), $now->modify('1 day'));
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php b/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php
new file mode 100644
index 0000000000000..9b8ade31ea894
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Trigger;
+
+final class ExcludeTimeTrigger implements TriggerInterface
+{
+    public function __construct(
+        private readonly TriggerInterface $inner,
+        private readonly \DateTimeImmutable $from,
+        private readonly \DateTimeImmutable $to,
+    ) {
+    }
+
+    public function nextTo(\DateTimeImmutable $run): \DateTimeImmutable
+    {
+        $nextRun = $this->inner->nextTo($run);
+        if ($nextRun >= $this->from && $nextRun <= $this->to) {
+            return $this->inner->nextTo($this->to);
+        }
+
+        return $nextRun;
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Trigger/OnceTrigger.php b/src/Symfony/Component/Scheduler/Trigger/OnceTrigger.php
new file mode 100644
index 0000000000000..4837fa6c64440
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Trigger/OnceTrigger.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Trigger;
+
+final class OnceTrigger implements TriggerInterface
+{
+    public function __construct(
+        private readonly \DateTimeImmutable $time,
+    ) {
+    }
+
+    public function nextTo(\DateTimeImmutable $run): ?\DateTimeImmutable
+    {
+        return $run < $this->time ? $this->time : null;
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php b/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php
new file mode 100644
index 0000000000000..44a90828865fe
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php
@@ -0,0 +1,112 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Trigger;
+
+use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
+
+final class PeriodicalTrigger implements TriggerInterface
+{
+    public function __construct(
+        private readonly int $intervalInSeconds,
+        private readonly \DateTimeImmutable $firstRun,
+        private readonly \DateTimeImmutable $priorTo,
+    ) {
+        if (0 >= $this->intervalInSeconds) {
+            throw new InvalidArgumentException('The `$intervalInSeconds` argument must be greater then zero.');
+        }
+    }
+
+    public static function create(
+        string|int|\DateInterval $interval,
+        string|\DateTimeImmutable $firstRun,
+        string|\DateTimeImmutable $priorTo = new \DateTimeImmutable('3000-01-01'),
+    ): self {
+        if (\is_string($firstRun)) {
+            $firstRun = new \DateTimeImmutable($firstRun);
+        }
+        if (\is_string($priorTo)) {
+            $priorTo = new \DateTimeImmutable($priorTo);
+        }
+        if (\is_string($interval)) {
+            if ('P' === $interval[0]) {
+                $interval = new \DateInterval($interval);
+            } elseif (ctype_digit($interval)) {
+                self::ensureIntervalSize($interval);
+                $interval = (int) $interval;
+            } else {
+                throw new InvalidArgumentException(sprintf('The interval "%s" for a periodical message is invalid.', $interval));
+            }
+        }
+        if (!\is_int($interval)) {
+            $interval = self::calcInterval($firstRun, $firstRun->add($interval));
+        }
+
+        return new self($interval, $firstRun, $priorTo);
+    }
+
+    public static function fromPeriod(\DatePeriod $period): self
+    {
+        $startDate = \DateTimeImmutable::createFromInterface($period->getStartDate());
+        $nextDate = $startDate->add($period->getDateInterval());
+        $firstRun = $period->include_start_date ? $startDate : $nextDate;
+        $interval = self::calcInterval($startDate, $nextDate);
+
+        $priorTo = $period->getEndDate()
+            ? \DateTimeImmutable::createFromInterface($period->getEndDate())
+            : $startDate->modify($period->getRecurrences() * $interval.' seconds');
+
+        return new self($interval, $firstRun, $priorTo);
+    }
+
+    private static function calcInterval(\DateTimeImmutable $from, \DateTimeImmutable $to): int
+    {
+        if (8 <= \PHP_INT_SIZE) {
+            return $to->getTimestamp() - $from->getTimestamp();
+        }
+
+        // @codeCoverageIgnoreStart
+        $interval = $to->format('U') - $from->format('U');
+        self::ensureIntervalSize(abs($interval));
+
+        return (int) $interval;
+        // @codeCoverageIgnoreEnd
+    }
+
+    private static function ensureIntervalSize(string|float $interval): void
+    {
+        if ($interval > \PHP_INT_MAX) {
+            throw new InvalidArgumentException('The interval for a periodical message is too big. If you need to run it once, use `$priorTo` argument.');
+        }
+    }
+
+    public function nextTo(\DateTimeImmutable $run): ?\DateTimeImmutable
+    {
+        if ($this->firstRun > $run) {
+            return $this->firstRun;
+        }
+        if ($this->priorTo <= $run) {
+            return null;
+        }
+
+        $delta = (float) $run->format('U.u') - (float) $this->firstRun->format('U.u');
+        $recurrencesPassed = (int) ($delta / $this->intervalInSeconds);
+        $nextRunTimestamp = ($recurrencesPassed + 1) * $this->intervalInSeconds + $this->firstRun->getTimestamp();
+        /** @var \DateTimeImmutable $nextRun */
+        $nextRun = \DateTimeImmutable::createFromFormat('U.u', $nextRunTimestamp.$this->firstRun->format('.u'));
+
+        if ($this->priorTo <= $nextRun) {
+            return null;
+        }
+
+        return $nextRun;
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Trigger/TriggerInterface.php b/src/Symfony/Component/Scheduler/Trigger/TriggerInterface.php
new file mode 100644
index 0000000000000..787d7b9897f07
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Trigger/TriggerInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Trigger;
+
+interface TriggerInterface
+{
+    public function nextTo(\DateTimeImmutable $run): ?\DateTimeImmutable;
+}
diff --git a/src/Symfony/Component/Scheduler/composer.json b/src/Symfony/Component/Scheduler/composer.json
new file mode 100644
index 0000000000000..e22183d38f1c9
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/composer.json
@@ -0,0 +1,42 @@
+{
+    "name": "symfony/scheduler",
+    "type": "library",
+    "description": "Provides basic scheduling through the Symfony Messenger",
+    "keywords": ["scheduler", "schedule", "cron"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Sergey Rabochiy",
+            "email": "upyx.00@gmail.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "psr/clock-implementation": "^1.0",
+        "psr/container-implementation": "^1.1|^2.0",
+        "symfony/cache-implementation": "^1.1|^2.0|^3.0",
+        "symfony/messenger": "^5.4|^6.0"
+    },
+    "require-dev": {
+        "symfony/cache": "^5.4|^6.0",
+        "symfony/clock": "^6.2",
+        "symfony/dependency-injection": "^5.4|^6.0",
+        "symfony/lock": "^5.4|^6.0"
+    },
+    "suggest": {
+        "symfony/cache": "For saving state between restarts.",
+        "symfony/lock": "For preventing workers race."
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\Scheduler\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Scheduler/phpunit.xml.dist b/src/Symfony/Component/Scheduler/phpunit.xml.dist
new file mode 100644
index 0000000000000..5a9b7c647b600
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/phpunit.xml.dist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony Scheduler Component Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory>./</directory>
+        </include>
+        <exclude>
+            <directory>./Tests</directory>
+            <directory>./vendor</directory>
+        </exclude>
+    </coverage>
+</phpunit>

From a18127b78910426be230704dc623fc3ad8f07614 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 21 Jan 2023 09:32:23 +0100
Subject: [PATCH 294/475] [Scheduler] Rework the component

---
 composer.json                                 |   1 +
 .../Compiler/UnusedTagsPass.php               |   2 +-
 .../DependencyInjection/Configuration.php     |  14 +
 .../FrameworkExtension.php                    |  45 +++-
 .../FrameworkBundle/FrameworkBundle.php       |   4 +-
 .../Resources/config/cache.php                |   5 +
 .../Resources/config/messenger.php            |   1 +
 .../Resources/config/scheduler.php            |  33 +--
 .../Resources/config/schema/symfony-1.0.xsd   |   5 +
 .../DependencyInjection/ConfigurationTest.php |   4 +
 .../Fixtures/php/messenger.php                |   1 +
 .../Fixtures/php/messenger_schedule.php       |  15 --
 .../Fixtures/xml/messenger.xml                |   1 +
 .../Fixtures/yml/messenger.yml                |   1 +
 .../FrameworkExtensionTestCase.php            |   4 +-
 .../Fixtures/Messenger/DummySchedule.php      |  26 ++
 .../Messenger/DummyScheduleConfigLocator.php  |  29 --
 .../Tests/Functional/SchedulerTest.php        |  23 +-
 .../Tests/Functional/app/Scheduler/config.yml |  11 +-
 src/Symfony/Component/Messenger/CHANGELOG.md  |   1 -
 .../Messenger/Transport/TransportFactory.php  |   2 -
 src/Symfony/Component/Messenger/composer.json |   3 -
 .../Scheduler/Attribute/AsSchedule.php        |  28 ++
 src/Symfony/Component/Scheduler/CHANGELOG.md  |   2 +-
 .../AddScheduleMessengerPass.php              |  51 ++++
 .../DependencyInjection/SchedulerPass.php     | 125 ---------
 .../Checkpoint.php}                           |  44 ++-
 .../CheckpointInterface.php}                  |   7 +-
 .../Scheduler/Generator/MessageGenerator.php  |  98 +++++++
 .../MessageGeneratorInterface.php}            |   7 +-
 .../TriggerHeap.php}                          |   6 +-
 .../Locator/ChainScheduleConfigLocator.php    |  64 -----
 .../ScheduleConfigLocatorInterface.php        |  20 --
 .../Messenger/ScheduleTransportFactory.php    |  73 -----
 .../Scheduler/Messenger/ScheduledStamp.php    |   3 +
 ...leTransport.php => SchedulerTransport.php} |  22 +-
 .../Messenger/SchedulerTransportFactory.php   |  58 ++++
 src/Symfony/Component/Scheduler/README.md     |  50 +---
 .../Component/Scheduler/RecurringMessage.php  |  58 ++++
 src/Symfony/Component/Scheduler/Schedule.php  |  84 ++++++
 .../Component/Scheduler/Schedule/Schedule.php |  95 -------
 .../Scheduler/Schedule/ScheduleConfig.php     |  47 ----
 ...tion.php => ScheduleProviderInterface.php} |  11 +-
 .../Scheduler/State/CacheStateDecorator.php   |  56 ----
 .../Component/Scheduler/State/State.php       |  48 ----
 .../Scheduler/State/StateFactory.php          |  91 -------
 .../Scheduler/State/StateFactoryInterface.php |  20 --
 .../Tests/Generator/CheckpointTest.php        | 252 ++++++++++++++++++
 .../MessageGeneratorTest.php}                 | 122 ++++-----
 .../ChainScheduleConfigLocatorTest.php        |  49 ----
 ....php => SchedulerTransportFactoryTest.php} |  96 ++++---
 ...ortTest.php => SchedulerTransportTest.php} |  25 +-
 .../Tests/Schedule/ScheduleConfigTest.php     |  61 -----
 .../Tests/State/CacheStateDecoratorTest.php   | 115 --------
 .../Tests/State/LockStateDecoratorTest.php    | 172 ------------
 .../Tests/State/StateFactoryTest.php          | 176 ------------
 .../Scheduler/Tests/State/StateTest.php       |  36 ---
 .../Tests/Trigger/ExcludeTimeTriggerTest.php  |  10 +-
 .../Tests/Trigger/OnceTriggerTest.php         |  29 --
 .../Tests/Trigger/PeriodicalTriggerTest.php   |  34 +--
 .../Scheduler/Trigger/CallbackTrigger.php     |  32 +++
 .../Trigger/CronExpressionTrigger.php         |  44 +++
 .../Scheduler/Trigger/ExcludeTimeTrigger.php  |   9 +-
 .../Scheduler/Trigger/OnceTrigger.php         |  25 --
 .../Scheduler/Trigger/PeriodicalTrigger.php   |  53 ++--
 .../Scheduler/Trigger/TriggerInterface.php    |   5 +-
 src/Symfony/Component/Scheduler/composer.json |  20 +-
 67 files changed, 1074 insertions(+), 1690 deletions(-)
 delete mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_schedule.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummySchedule.php
 delete mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyScheduleConfigLocator.php
 create mode 100644 src/Symfony/Component/Scheduler/Attribute/AsSchedule.php
 create mode 100644 src/Symfony/Component/Scheduler/DependencyInjection/AddScheduleMessengerPass.php
 delete mode 100644 src/Symfony/Component/Scheduler/DependencyInjection/SchedulerPass.php
 rename src/Symfony/Component/Scheduler/{State/LockStateDecorator.php => Generator/Checkpoint.php} (52%)
 rename src/Symfony/Component/Scheduler/{State/StateInterface.php => Generator/CheckpointInterface.php} (84%)
 create mode 100644 src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
 rename src/Symfony/Component/Scheduler/{Schedule/ScheduleInterface.php => Generator/MessageGeneratorInterface.php} (72%)
 rename src/Symfony/Component/Scheduler/{Schedule/ScheduleHeap.php => Generator/TriggerHeap.php} (88%)
 delete mode 100644 src/Symfony/Component/Scheduler/Locator/ChainScheduleConfigLocator.php
 delete mode 100644 src/Symfony/Component/Scheduler/Locator/ScheduleConfigLocatorInterface.php
 delete mode 100644 src/Symfony/Component/Scheduler/Messenger/ScheduleTransportFactory.php
 rename src/Symfony/Component/Scheduler/Messenger/{ScheduleTransport.php => SchedulerTransport.php} (53%)
 create mode 100644 src/Symfony/Component/Scheduler/Messenger/SchedulerTransportFactory.php
 create mode 100644 src/Symfony/Component/Scheduler/RecurringMessage.php
 create mode 100644 src/Symfony/Component/Scheduler/Schedule.php
 delete mode 100644 src/Symfony/Component/Scheduler/Schedule/Schedule.php
 delete mode 100644 src/Symfony/Component/Scheduler/Schedule/ScheduleConfig.php
 rename src/Symfony/Component/Scheduler/{Exception/LogicMessengerException.php => ScheduleProviderInterface.php} (52%)
 delete mode 100644 src/Symfony/Component/Scheduler/State/CacheStateDecorator.php
 delete mode 100644 src/Symfony/Component/Scheduler/State/State.php
 delete mode 100644 src/Symfony/Component/Scheduler/State/StateFactory.php
 delete mode 100644 src/Symfony/Component/Scheduler/State/StateFactoryInterface.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Generator/CheckpointTest.php
 rename src/Symfony/Component/Scheduler/Tests/{Schedule/ScheduleTest.php => Generator/MessageGeneratorTest.php} (66%)
 delete mode 100644 src/Symfony/Component/Scheduler/Tests/Locator/ChainScheduleConfigLocatorTest.php
 rename src/Symfony/Component/Scheduler/Tests/Messenger/{ScheduleTransportFactoryTest.php => SchedulerTransportFactoryTest.php} (52%)
 rename src/Symfony/Component/Scheduler/Tests/Messenger/{ScheduleTransportTest.php => SchedulerTransportTest.php} (61%)
 delete mode 100644 src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleConfigTest.php
 delete mode 100644 src/Symfony/Component/Scheduler/Tests/State/CacheStateDecoratorTest.php
 delete mode 100644 src/Symfony/Component/Scheduler/Tests/State/LockStateDecoratorTest.php
 delete mode 100644 src/Symfony/Component/Scheduler/Tests/State/StateFactoryTest.php
 delete mode 100644 src/Symfony/Component/Scheduler/Tests/State/StateTest.php
 delete mode 100644 src/Symfony/Component/Scheduler/Tests/Trigger/OnceTriggerTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Trigger/CallbackTrigger.php
 create mode 100644 src/Symfony/Component/Scheduler/Trigger/CronExpressionT
10000
rigger.php
 delete mode 100644 src/Symfony/Component/Scheduler/Trigger/OnceTrigger.php

diff --git a/composer.json b/composer.json
index 2f738e6eb93cc..a44ae7c3b283a 100644
--- a/composer.json
+++ b/composer.json
@@ -132,6 +132,7 @@
         "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "^2.13.1|^3.0",
         "doctrine/orm": "^2.12",
+        "dragonmantank/cron-expression": "^3",
         "egulias/email-validator": "^2.1.10|^3.1|^4",
         "guzzlehttp/promises": "^1.4",
         "league/html-to-markdown": "^5.0",
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
index be113a4fe89d2..7fa0fb289005a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -80,7 +80,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'routing.expression_language_provider',
         'routing.loader',
         'routing.route_loader',
-        'scheduler.schedule_config_locator',
+        'scheduler.schedule_provider',
         'security.authenticator.login_linker',
         'security.expression_language_provider',
         'security.remember_me_aware',
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 348cf80161b91..1d85518a190f9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -37,6 +37,7 @@
 use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
 use Symfony\Component\RateLimiter\Policy\TokenBucketLimiter;
 use Symfony\Component\RemoteEvent\RemoteEvent;
+use Symfony\Component\Scheduler\Messenger\SchedulerTransportFactory;
 use Symfony\Component\Semaphore\Semaphore;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Translation\Translator;
@@ -173,6 +174,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         $this->addLockSection($rootNode, $enableIfStandalone);
         $this->addSemaphoreSection($rootNode, $enableIfStandalone);
         $this->addMessengerSection($rootNode, $enableIfStandalone);
+        $this->addSchedulerSection($rootNode, $enableIfStandalone);
         $this->addRobotsIndexSection($rootNode);
         $this->addHttpClientSection($rootNode, $enableIfStandalone);
         $this->addMailerSection($rootNode, $enableIfStandalone);
@@ -1606,6 +1608,18 @@ function ($a) {
         ;
     }
 
+    private function addSchedulerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
+    {
+        $rootNode
+            ->children()
+                ->arrayNode('scheduler')
+                    ->info('Scheduler configuration')
+                    ->{$enableIfStandalone('symfony/scheduler', SchedulerTransportFactory::class)}()
+                ->end()
+            ->end()
+        ;
+    }
+
     private function addRobotsIndexSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index bd1ae852a667f..0b2ffa38aa8fc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -215,8 +215,8 @@
 use Symfony\Component\RemoteEvent\Attribute\AsRemoteEventConsumer;
 use Symfony\Component\RemoteEvent\RemoteEvent;
 use Symfony\Component\Routing\Loader\Psr4DirectoryLoader;
-use Symfony\Component\Scheduler\Locator\ScheduleConfigLocatorInterface;
-use Symfony\Component\Scheduler\Messenger\ScheduleTransportFactory;
+use Symfony\Component\Scheduler\Attribute\AsSchedule;
+use Symfony\Component\Scheduler\Messenger\SchedulerTransportFactory;
 use Symfony\Component\Security\Core\AuthenticationEvents;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
@@ -528,9 +528,18 @@ public function load(array $configs, ContainerBuilder $container)
         // validation depends on form, annotations being registered
         $this->registerValidationConfiguration($config['validation'], $container, $loader, $propertyInfoEnabled);
 
+        $messengerEnabled = $this->readConfigEnabled('messenger', $container, $config['messenger']);
+
+        if ($this->readConfigEnabled('scheduler', $container, $config['scheduler'])) {
+            if (!$messengerEnabled) {
+                throw new LogicException('Scheduler support cannot be enabled as the Messenger component is not '.(interface_exists(MessageBusInterface::class) ? 'enabled.' : 'installed. Try running "composer require symfony/messenger".'));
+            }
+            $this->registerSchedulerConfiguration($config['scheduler'], $container, $loader);
+        }
+
         // messenger depends on validation being registered
-        if ($this->readConfigEnabled('messenger', $container, $config['messenger'])) {
-            $this->registerMessengerConfiguration($config['messenger'], $container, $loader, $config['validation']);
+        if ($messengerEnabled) {
+            $this->registerMessengerConfiguration($config['messenger'], $container, $loader, $this->readConfigEnabled('validation', $container, $config['validation']));
         } else {
             $container->removeDefinition('console.command.messenger_consume_messages');
             $container->removeDefinition('console.command.messenger_stats');
@@ -675,8 +684,6 @@ public function load(array $configs, ContainerBuilder $container)
             ->addTag('messenger.message_handler');
         $container->registerForAutoconfiguration(TransportFactoryInterface::class)
             ->addTag('messenger.transport_factory');
-        $container->registerForAutoconfiguration(ScheduleConfigLocatorInterface::class)
-            ->addTag('scheduler.schedule_config_locator');
         $container->registerForAutoconfiguration(MimeTypeGuesserInterface::class)
             ->addTag('mime.mime_type_guesser');
         $container->registerForAutoconfiguration(LoggerAwareInterface::class)
@@ -710,10 +717,12 @@ public function load(array $configs, ContainerBuilder $container)
             }
             $definition->addTag('messenger.message_handler', $tagAttributes);
         });
-
         $container->registerAttributeForAutoconfiguration(AsTargetedValueResolver::class, static function (ChildDefinition $definition, AsTargetedValueResolver $attribute): void {
             $definition->addTag('controller.targeted_value_resolver', $attribute->name ? ['name' => $attribute->name] : []);
         });
+        $container->registerAttributeForAutoconfiguration(AsSchedule::class, static function (ChildDefinition $definition, AsSchedule $attribute): void {
+            $definition->addTag('scheduler.schedule_provider', ['name' => $attribute->name]);
+        });
 
         if (!$container->getParameter('kernel.debug')) {
             // remove tagged iterator argument for resource checkers
@@ -1999,7 +2008,20 @@ private function registerSemaphoreConfiguration(array $config, ContainerBuilder
         }
     }
 
-    private function registerMessengerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, array $validationConfig): void
+    private function registerSchedulerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
+    {
+        if (!class_exists(SchedulerTransportFactory::class)) {
+            throw new LogicException('Scheduler support cannot be enabled as the Scheduler component is not installed. Try running "composer require symfony/scheduler".');
+        }
+
+        if (!interface_exists(MessageBusInterface::class)) {
+            throw new LogicException('Scheduler support cannot be enabled as the Messenger component is not installed. Try running "composer require symfony/messenger".');
+        }
+
+        $loader->load('scheduler.php');
+    }
+
+    private function registerMessengerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $validationEnabled): void
     {
         if (!interface_exists(MessageBusInterface::class)) {
             throw new LogicException('Messenger support cannot be enabled as the Messenger component is not installed. Try running "composer require symfony/messenger".');
@@ -2031,10 +2053,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $container->getDefinition('messenger.transport.beanstalkd.factory')->addTag('messenger.transport_factory');
         }
 
-        if (ContainerBuilder::willBeAvailable('symfony/scheduler', ScheduleTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'])) {
-            $loader->load('scheduler.php');
-        }
-
         if (null === $config['default_bus'] && 1 === \count($config['buses'])) {
             $config['default_bus'] = key($config['buses']);
         }
@@ -2065,7 +2083,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             }
 
             foreach ($middleware as $middlewareItem) {
-                if (!$validationConfig['enabled'] && \in_array($middlewareItem['id'], ['validation', 'messenger.middleware.validation'], true)) {
+                if (!$validationEnabled && \in_array($middlewareItem['id'], ['validation', 'messenger.middleware.validation'], true)) {
                     throw new LogicException('The Validation middleware is only available when the Validator component is installed and enabled. Try running "composer require symfony/validator".');
                 }
             }
@@ -2091,7 +2109,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $container->removeDefinition('messenger.transport.redis.factory');
             $container->removeDefinition('messenger.transport.sqs.factory');
             $container->removeDefinition('messenger.transport.beanstalkd.factory');
-            $container->removeDefinition('scheduler.messenger_transport_factory');
             $container->removeAlias(SerializerInterface::class);
         } else {
             $container->getDefinition('messenger.transport.symfony_serializer')
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index a1e5a0e4a91c0..ffb96a23e5f5b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -60,7 +60,7 @@
 use Symfony\Component\Mime\DependencyInjection\AddMimeTypeGuesserPass;
 use Symfony\Component\PropertyInfo\DependencyInjection\PropertyInfoPass;
 use Symfony\Component\Routing\DependencyInjection\RoutingResolverPass;
-use Symfony\Component\Scheduler\DependencyInjection\SchedulerPass;
+use Symfony\Component\Scheduler\DependencyInjection\AddScheduleMessengerPass;
 use Symfony\Component\Serializer\DependencyInjection\SerializerPass;
 use Symfony\Component\Translation\DependencyInjection\TranslationDumperPass;
 use Symfony\Component\Translation\DependencyInjection\TranslationExtractorPass;
@@ -166,8 +166,8 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new TestServiceContainerWeakRefPass(), PassConfig::TYPE_BEFORE_REMOVING, -32);
         $container->addCompilerPass(new TestServiceContainerRealRefPass(), PassConfig::TYPE_AFTER_REMOVING);
         $this->addCompilerPassIfExists($container, AddMimeTypeGuesserPass::class);
+        $this->addCompilerPassIfExists($container, AddScheduleMessengerPass::class);
         $this->addCompilerPassIfExists($container, MessengerPass::class);
-        $this->addCompilerPassIfExists($container, SchedulerPass::class);
         $this->addCompilerPassIfExists($container, HttpClientPass::class);
         $this->addCompilerPassIfExists($container, AddAutoMappingConfigurationPass::class);
         $container->addCompilerPass(new RegisterReverseContainerPass(true));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php
index 679d74c80dc37..2ea62a0b71882 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.php
@@ -71,6 +71,11 @@
             ->private()
             ->tag('cache.pool')
 
+        ->set('cache.scheduler')
+            ->parent('cache.app')
+            ->private()
+            ->tag('cache.pool')
+
         ->set('cache.adapter.system', AdapterInterface::class)
             ->abstract()
             ->factory([AbstractAdapter::class, 'createSystemCache'])
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
index db3f79a593725..caeaf3ce49194 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
@@ -75,6 +75,7 @@
             ->tag('serializer.normalizer', ['priority' => -880])
 
         ->set('messenger.transport.native_php_serializer', PhpSerializer::class)
+        ->alias('messenger.default_serializer', 'messenger.transport.native_php_serializer')
 
         // Middleware
         ->set('messenger.middleware.handle_message', HandleMessageMiddleware::class)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/scheduler.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/scheduler.php
index 2735fad5a1d47..9ad64c56a051d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/scheduler.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/scheduler.php
@@ -11,42 +11,15 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-use Symfony\Component\DependencyInjection\ServiceLocator;
-use Symfony\Component\Scheduler\Locator\ChainScheduleConfigLocator;
-use Symfony\Component\Scheduler\Messenger\ScheduleTransportFactory;
-use Symfony\Component\Scheduler\State\StateFactory;
+use Symfony\Component\Scheduler\Messenger\SchedulerTransportFactory;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
-        ->set('scheduler.messenger_transport_factory', ScheduleTransportFactory::class)
+        ->set('scheduler.messenger_transport_factory', SchedulerTransportFactory::class)
             ->args([
+                tagged_locator('scheduler.schedule_provider', 'name'),
                 service('clock'),
-                service('scheduler.schedule_config_locator'),
-                service('scheduler.state_factory'),
             ])
             ->tag('messenger.transport_factory')
-
-        ->set('scheduler.schedule_config_locator', ChainScheduleConfigLocator::class)
-            ->args([
-                tagged_iterator('scheduler.schedule_config_locator'),
-            ])
-
-        ->set('scheduler.state_factory', StateFactory::class)
-            ->args([
-                service('scheduler.lock_locator'),
-                service('scheduler.cache_locator'),
-            ])
-
-        ->set('scheduler.lock_locator', ServiceLocator::class)
-            ->args([
-                [],
-            ])
-            ->tag('container.service_locator')
-
-        ->set('scheduler.cache_locator', ServiceLocator::class)
-            ->args([
-                [],
-            ])
-            ->tag('container.service_locator')
     ;
 };
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
index 78c8a5ad32396..33ac86560b756 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -24,6 +24,7 @@
             <xsd:element name="validation" type="validation" minOccurs="0" maxOccurs="1" />
             <xsd:element name="annotations" type="annotations" minOccurs="0" maxOccurs="1" />
             <xsd:element name="property-access" type="property_access" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="scheduler" type="scheduler" minOccurs="0" maxOccurs="1" />
             <xsd:element name="serializer" type="serializer" minOccurs="0" maxOccurs="1" />
             <xsd:element name="property-info" type="property_info" minOccurs="0" maxOccurs="1" />
             <xsd:element name="cache" type="cache" minOccurs="0" maxOccurs="1" />
@@ -271,6 +272,10 @@
         <xsd:attribute name="throw-exception-on-invalid-property-path" type="xsd:boolean" />
     </xsd:complexType>
 
+    <xsd:complexType name="scheduler">
+        <xsd:attribute name="enabled" type="xsd:boolean" />
+    </xsd:complexType>
+
     <xsd:complexType name="serializer">
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
             <xsd:element name="mapping" type="file_mapping" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index e80427c717bed..0b92db46f292a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -26,6 +26,7 @@
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Notifier\Notifier;
 use Symfony\Component\RateLimiter\Policy\TokenBucketLimiter;
+use Symfony\Component\Scheduler\Messenger\SchedulerTransportFactory;
 use Symfony\Component\Uid\Factory\UuidFactory;
 
 class ConfigurationTest extends TestCase
@@ -687,6 +688,9 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
                 'enabled' => !class_exists(FullStack::class) && class_exists(HtmlSanitizer::class),
                 'sanitizers' => [],
             ],
+            'scheduler' => [
+                'enabled' => !class_exists(FullStack::class) && class_exists(SchedulerTransportFactory::class),
+            ],
             'exceptions' => [],
             'webhook' => [
                 'enabled' => false,
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger.php
index dc22cd5ff8917..6285a3b894c9f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger.php
@@ -5,6 +5,7 @@
 
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
+    'scheduler' => true,
     'messenger' => [
         'routing' => [
             FooMessage::class => ['sender.bar', 'sender.biz'],
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_schedule.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_schedule.php
deleted file mode 100644
index f42d388c3a052..0000000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_schedule.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-$container->loadFromExtension('framework', [
-    'http_method_override' => false,
-    'messenger' => [
-        'transports' => [
-            'schedule' => [
-                'dsn' => 'schedule://default',
-                'options' => [
-                    'cache' => 'array',
-                ]
-            ],
-        ],
-    ],
-]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger.xml
index fef09b934a3aa..90df7ec51352d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger.xml
@@ -6,6 +6,7 @@
         http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
     <framework:config http-method-override="false">
+        <framework:scheduler enabled="true" />
         <framework:messenger>
             <framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage">
                 <framework:sender service="sender.bar" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger.yml
index 29174a9b407f2..929b1230e8a6c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger.yml
@@ -1,5 +1,6 @@
 framework:
     http_method_override: false
+    scheduler: true
     messenger:
         routing:
             'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage': ['sender.bar', 'sender.biz']
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
index 6c48d03e988ea..4aeda47a39f14 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -813,13 +813,13 @@ public function testMessenger()
         $container->compile();
 
         $expectedFactories = [
+            new Reference('scheduler.messenger_transport_factory'),
             new Reference('messenger.transport.amqp.factory'),
             new Reference('messenger.transport.redis.factory'),
             new Reference('messenger.transport.sync.factory'),
             new Reference('messenger.transport.in_memory.factory'),
             new Reference('messenger.transport.sqs.factory'),
             new Reference('messenger.transport.beanstalkd.factory'),
-            new Reference('scheduler.messenger_transport_factory'),
         ];
 
         $this->assertTrue($container->hasDefinition('messenger.receiver_locator'));
@@ -979,8 +979,6 @@ public function testMessengerTransports()
         $this->assertCount(3, $transportArguments);
         $this->assertSame('schedule://default', $transportArguments[0]);
 
-        $this->assertTrue($container->hasDefinition('scheduler.messenger_transport_factory'));
-
         $this->assertSame(10, $container->getDefinition('messenger.retry.multiplier_retry_strategy.customised')->getArgument(0));
         $this->assertSame(7, $container->getDefinition('messenger.retry.multiplier_retry_strategy.customised')->getArgument(1));
         $this->assertSame(3, $container->getDefinition('messenger.retry.multiplier_retry_strategy.customised')->getArgument(2));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummySchedule.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummySchedule.php
new file mode 100644
index 0000000000000..51a50e33ca796
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummySchedule.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger;
+
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Lock\Key;
+use Symfony\Component\Lock\Lock;
+use Symfony\Component\Lock\Store\InMemoryStore;
+use Symfony\Component\Scheduler\Attribute\AsSchedule;
+use Symfony\Component\Scheduler\Schedule;
+use Symfony\Component\Scheduler\ScheduleProviderInterface;
+
+#[AsSchedule('dummy')]
+class DummySchedule implements ScheduleProviderInterface
+{
+    public static array $recurringMessages;
+
+    public function getSchedule(): Schedule
+    {
+        return (new Schedule())
+            ->add(...self::$recurringMessages)
+            ->stateful(new ArrayAdapter())
+            ->lock(new Lock(new Key('dummy'), new InMemoryStore()))
+        ;
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyScheduleConfigLocator.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyScheduleConfigLocator.php
deleted file mode 100644
index 616c1a2201a3d..0000000000000
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyScheduleConfigLocator.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger;
-
-use Psr\Container\NotFoundExceptionInterface;
-use Symfony\Component\Scheduler\Locator\ScheduleConfigLocatorInterface;
-use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
-
-class DummyScheduleConfigLocator implements ScheduleConfigLocatorInterface
-{
-    /**
-     * @var array<string, ScheduleConfig>
-     */
-    public static array $schedules = [];
-
-    public function get(string $id): ScheduleConfig
-    {
-        if (isset(static::$schedules[$id])) {
-            return static::$schedules[$id];
-        }
-
-        throw new class(sprintf('You have requested a non-existent schedule "%s".', $id)) extends \InvalidArgumentException implements NotFoundExceptionInterface { };
-    }
-
-    public function has(string $id): bool
-    {
-        return isset(static::$schedules[$id]);
-    }
-}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SchedulerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SchedulerTest.php
index 02b8ea9e55b42..5aef74f473088 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SchedulerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SchedulerTest.php
@@ -12,29 +12,28 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyScheduleConfigLocator;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummySchedule;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;
 use Symfony\Component\Clock\MockClock;
 use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Component\Scheduler\Messenger\ScheduleTransport;
-use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
-use Symfony\Component\Scheduler\Trigger\PeriodicalTrigger;
+use Symfony\Component\Scheduler\Messenger\SchedulerTransport;
+use Symfony\Component\Scheduler\RecurringMessage;
 
 class SchedulerTest extends AbstractWebTestCase
 {
     public function testScheduler()
     {
-        $scheduleConfig = new ScheduleConfig([
-            [PeriodicalTrigger::create(600, '2020-01-01T00:00:00Z'), $foo = new FooMessage()],
-            [PeriodicalTrigger::create(600, '2020-01-01T00:01:00Z'), $bar = new BarMessage()],
-        ]);
-        DummyScheduleConfigLocator::$schedules = ['default' => $scheduleConfig];
+        $scheduledMessages = [
+            RecurringMessage::every('5 minutes', $foo = new FooMessage(), new \DateTimeImmutable('2020-01-01T00:00:00Z')),
+            RecurringMessage::every('5 minutes', $bar = new BarMessage(), new \DateTimeImmutable('2020-01-01T00:01:00Z')),
+        ];
+        DummySchedule::$recurringMessages = $scheduledMessages;
 
         $container = self::getContainer();
         $container->set('clock', $clock = new MockClock('2020-01-01T00:09:59Z'));
 
-        $this->assertTrue($container->get('receivers')->has('schedule'));
-        $this->assertInstanceOf(ScheduleTransport::class, $cron = $container->get('receivers')->get('schedule'));
+        $this->assertTrue($container->get('receivers')->has('scheduler_dummy'));
+        $this->assertInstanceOf(SchedulerTransport::class, $cron = $container->get('receivers')->get('scheduler_dummy'));
 
         $fetchMessages = static function (float $sleep) use ($clock, $cron) {
             if (0 < $sleep) {
@@ -52,7 +51,7 @@ public function testScheduler()
         $this->assertSame([$foo], $fetchMessages(1.0));
         $this->assertSame([], $fetchMessages(1.0));
         $this->assertSame([$bar], $fetchMessages(60.0));
-        $this->assertSame([$foo, $bar], $fetchMessages(600.0));
+        $this->assertSame([$foo, $bar, $foo, $bar], $fetchMessages(600.0));
     }
 
     protected static function createKernel(array $options = []): KernelInterface
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/config.yml
index 68e3213f900e3..e39d423f4f4cd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/config.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Scheduler/config.yml
@@ -3,16 +3,11 @@ imports:
 
 framework:
     lock: ~
-    messenger:
-        transports:
-            schedule:
-                dsn: 'schedule://default'
-                options:
-                    cache: 'app'
-                    lock: 'default'
+    scheduler: ~
+    messenger: ~
 
 services:
-    Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyScheduleConfigLocator:
+    Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummySchedule:
         autoconfigure: true
 
     clock:
diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
index 29708d8102ded..8a16de384199c 100644
--- a/src/Symfony/Component/Messenger/CHANGELOG.md
+++ b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -14,7 +14,6 @@ CHANGELOG
  * Deprecate `StopWorkerOnSigtermSignalListener` in favor of
    `StopWorkerOnSignalsListener` and make it configurable with SIGINT and
    SIGTERM by default
- * Add `ScheduleTransport` to generate messages on a schedule
 
 6.2
 ---
diff --git a/src/Symfony/Component/Messenger/Transport/TransportFactory.php b/src/Symfony/Component/Messenger/Transport/TransportFactory.php
index dbae2f95e19b6..987f19d2a74bf 100644
--- a/src/Symfony/Component/Messenger/Transport/TransportFactory.php
+++ b/src/Symfony/Component/Messenger/Transport/TransportFactory.php
@@ -49,8 +49,6 @@ public function createTransport(#[\SensitiveParameter] string $dsn, array $optio
             $packageSuggestion = ' Run "composer require symfony/amazon-sqs-messenger" to install Amazon SQS transport.';
         } elseif (str_starts_with($dsn, 'beanstalkd://')) {
             $packageSuggestion = ' Run "composer require symfony/beanstalkd-messenger" to install Beanstalkd transport.';
-        } elseif (str_starts_with($dsn, 'schedule://')) {
-            $packageSuggestion = ' Run "composer require symfony/scheduler" to install Schedule transport.';
         }
 
         throw new InvalidArgumentException('No transport supports the given Messenger DSN.'.$packageSuggestion);
diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json
index 8de4667134423..8d3d0f2653ac7 100644
--- a/src/Symfony/Component/Messenger/composer.json
+++ b/src/Symfony/Component/Messenger/composer.json
@@ -21,13 +21,10 @@
     },
     "require-dev": {
         "psr/cache": "^1.0|^2.0|^3.0",
-        "symfony/cache": "^5.4|^6.0",
-        "symfony/clock": "^6.2",
         "symfony/console": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/http-kernel": "^5.4|^6.0",
-        "symfony/lock": "^5.4|^6.0",
         "symfony/process": "^5.4|^6.0",
         "symfony/property-access": "^5.4|^6.0",
         "symfony/rate-limiter": "^5.4|^6.0",
diff --git a/src/Symfony/Component/Scheduler/Attribute/AsSchedule.php b/src/Symfony/Component/Scheduler/Attribute/AsSchedule.php
new file mode 100644
index 0000000000000..ea060a98b31f1
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Attribute/AsSchedule.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Attribute;
+
+/**
+ * Service tag to autoconfigure schedules.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental
+ */
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class AsSchedule
+{
+    public function __construct(
+        public string $name = 'default',
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/CHANGELOG.md b/src/Symfony/Component/Scheduler/CHANGELOG.md
index 42172c9780f92..f5a3d015eac64 100644
--- a/src/Symfony/Component/Scheduler/CHANGELOG.md
+++ b/src/Symfony/Component/Scheduler/CHANGELOG.md
@@ -4,4 +4,4 @@ CHANGELOG
 6.3
 ---
 
- * Add the component
+ * Add the component as experimental
diff --git a/src/Symfony/Component/Scheduler/DependencyInjection/AddScheduleMessengerPass.php b/src/Symfony/Component/Scheduler/DependencyInjection/AddScheduleMessengerPass.php
new file mode 100644
index 0000000000000..c67831bb70679
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/DependencyInjection/AddScheduleMessengerPass.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Messenger\Transport\TransportInterface;
+
+/**
+ * @internal
+ */
+class AddScheduleMessengerPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        $receivers = [];
+        foreach ($container->findTaggedServiceIds('messenger.receiver') as $tags) {
+            $receivers[$tags[0]['alias']] = true;
+        }
+
+        foreach ($container->findTaggedServiceIds('scheduler.schedule_provider') as $tags) {
+            $name = $tags[0]['name'];
+            $transportName = 'scheduler_'.$name;
+
+            // allows to override the default transport registration
+            // in case one needs to configure it further (like choosing a different serializer)
+            if (isset($receivers[$transportName])) {
+                continue;
+            }
+
+            $transportDefinition = (new Definition(TransportInterface::class))
+                ->setFactory([new Reference('messenger.transport_factory'), 'createTransport'])
+                ->setArguments(['schedule://'.$name, ['transport_name' => $transportName], new Reference('messenger.default_serializer')])
+                ->addTag('messenger.receiver', ['alias' => $transportName])
+            ;
+            $container->setDefinition($transportId = 'messenger.transport.'.$transportName, $transportDefinition);
+            $senderAliases[$transportName] = $transportId;
+        }
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/DependencyInjection/SchedulerPass.php b/src/Symfony/Component/Scheduler/DependencyInjection/SchedulerPass.php
deleted file mode 100644
index b8b7780392e97..0000000000000
--- a/src/Symfony/Component/Scheduler/DependencyInjection/SchedulerPass.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\DependencyInjection;
-
-use Symfony\Component\Cache\CacheItem;
-use Symfony\Component\DependencyInjection\ChildDefinition;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\Lock\LockFactory;
-use Symfony\Component\Scheduler\Messenger\ScheduleTransportFactory;
-use Symfony\Contracts\Cache\CacheInterface;
-
-class SchedulerPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container)
-    {
-        $usedCachePools = [];
-        $usedLockFactories = [];
-
-        foreach ($container->findTaggedServiceIds('messenger.receiver') as $id => $tags) {
-            $transport = $container->getDefinition($id);
-            [$dsn, $options] = $transport->getArguments();
-            if (!ScheduleTransportFactory::isSupported($dsn)) {
-                continue;
-            }
-
-            if (\is_string($options['cache'] ?? null) && $options['cache']) {
-                $usedCachePools[] = $options['cache'];
-            }
-            if (\is_string($options['lock'] ?? null) && $options['lock']) {
-                $usedLockFactories[] = $options['lock'];
-            }
-            if (\is_array($options['lock'] ?? null) &&
-                \is_string($options['lock']['resource'] ?? null) &&
-                $options['lock']['resource']
-            ) {
-                $usedLockFactories[] = $options['lock']['resource'];
-            }
-        }
-
-        if ($usedCachePools) {
-            $this->locateCachePools($container, $usedCachePools);
-        }
-        if ($usedLockFactories) {
-            $this->locateLockFactories($container, $usedLockFactories);
-        }
-    }
-
-    /**
-     * @param string[] $cachePools
-     */
-    private function locateCachePools(ContainerBuilder $container, array $cachePools): void
-    {
-        if (!class_exists(CacheItem::class)) {
-            throw new \LogicException('You cannot use the "cache" option if the Cache Component is not available. Try running "composer require symfony/cache".');
-        }
-
-        $references = [];
-        foreach (array_unique($cachePools) as $name) {
-            if (!$this->isServiceInstanceOf($container, $id = $name, CacheInterface::class) &&
-                !$this->isServiceInstanceOf($container, $id = 'cache.'.$name, CacheInterface::class)
-            ) {
-                throw new RuntimeException(sprintf('The cache pool "%s" does not exist.', $name));
-            }
-
-            $references[$name] = new Reference($id);
-        }
-
-        $container->getDefinition('scheduler.cache_locator')
-            ->replaceArgument(0, $references);
-    }
-
-    /**
-     * @param string[] $lockFactories
-     */
-    private function locateLockFactories(ContainerBuilder $container, array $lockFactories): void
-    {
-        if (!class_exists(LockFactory::class)) {
-            throw new \LogicException('You cannot use the "lock" option if the Lock Component is not available. Try running "composer require symfony/lock".');
-        }
-
-        $references = [];
-        foreach (array_unique($lockFactories) as $name) {
-            if (!$this->isServiceInstanceOf($container, $id = $name, LockFactory::class) &&
-                !$this->isServiceInstanceOf($container, $id = 'lock.'.$name.'.factory', LockFactory::class)
-            ) {
-                throw new RuntimeException(sprintf('The lock resource "%s" does not exist.', $name));
-            }
-
-            $references[$name] = new Reference($id);
-        }
-
-        $container->getDefinition('scheduler.lock_locator')
-            ->replaceArgument(0, $references);
-    }
-
-    private function isServiceInstanceOf(ContainerBuilder $container, string $serviceId, string $className): bool
-    {
-        if (!$container->hasDefinition($serviceId)) {
-            return false;
-        }
-
-        while (true) {
-            $definition = $container->getDefinition($serviceId);
-            if (!$definition->getClass() && $definition instanceof ChildDefinition) {
-                $serviceId = $definition->getParent();
-
-                continue;
-            }
-
-            return $definition->getClass() && is_a($definition->getClass(), $className, true);
-        }
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/State/LockStateDecorator.php b/src/Symfony/Component/Scheduler/Generator/Checkpoint.php
similarity index 52%
rename from src/Symfony/Component/Scheduler/State/LockStateDecorator.php
rename to src/Symfony/Component/Scheduler/Generator/Checkpoint.php
index 57b90fbaf6d33..aba7f499d70b1 100644
--- a/src/Symfony/Component/Scheduler/State/LockStateDecorator.php
+++ b/src/Symfony/Component/Scheduler/Generator/Checkpoint.php
@@ -9,24 +9,31 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Scheduler\State;
+namespace Symfony\Component\Scheduler\Generator;
 
 use Symfony\Component\Lock\LockInterface;
+use Symfony\Contracts\Cache\CacheInterface;
 
-final class LockStateDecorator implements StateInterface
+/**
+ * @experimental
+ */
+final class Checkpoint implements CheckpointInterface
 {
+    private \DateTimeImmutable $time;
+    private int $index = -1;
     private bool $reset = false;
 
     public function __construct(
-        private readonly State $inner,
-        private readonly LockInterface $lock,
+        private readonly string $name,
+        private readonly ?LockInterface $lock = null,
+        private readonly ?CacheInterface $cache = null,
     ) {
     }
 
     public function acquire(\DateTimeImmutable $now): bool
     {
-        if (!$this->lock->acquire()) {
-            // Reset local state if a `Lock` is acquired by another `Worker`.
+        if ($this->lock && !$this->lock->acquire()) {
+            // Reset local state if a Lock is acquired by another Worker.
             $this->reset = true;
 
             return false;
@@ -34,35 +41,44 @@ public function acquire(\DateTimeImmutable $now): bool
 
         if ($this->reset) {
             $this->reset = false;
-            $this->inner->save($now, -1);
+            $this->save($now, -1);
+        }
+
+        $this->time ??= $now;
+        if ($this->cache) {
+            $this->save(...$this->cache->get($this->name, fn () => [$now, -1]));
         }
 
-        return $this->inner->acquire($now);
+        return true;
     }
 
     public function time(): \DateTimeImmutable
     {
-        return $this->inner->time();
+        return $this->time;
     }
 
     public function index(): int
     {
-        return $this->inner->index();
+        return $this->index;
     }
 
     public function save(\DateTimeImmutable $time, int $index): void
     {
-        $this->inner->save($time, $index);
+        $this->time = $time;
+        $this->index = $index;
+        $this->cache?->get($this->name, fn () => [$time, $index], \INF);
     }
 
     /**
-     * Releases `State`, not `Lock`.
+     * Releases State, not Lock.
      *
-     * It tries to keep a `Lock` as long as a `Worker` is alive.
+     * It tries to keep a Lock as long as a Worker is alive.
      */
     public function release(\DateTimeImmutable $now, ?\DateTimeImmutable $nextTime): void
     {
-        $this->inner->release($now, $nextTime);
+        if (!$this->lock) {
+            return;
+        }
 
         if (!$nextTime) {
             $this->lock->release();
diff --git a/src/Symfony/Component/Scheduler/State/StateInterface.php b/src/Symfony/Component/Scheduler/Generator/CheckpointInterface.php
similarity index 84%
rename from src/Symfony/Component/Scheduler/State/StateInterface.php
rename to src/Symfony/Component/Scheduler/Generator/CheckpointInterface.php
index 4fc443c4f51f6..71bc2f49f9ab0 100644
--- a/src/Symfony/Component/Scheduler/State/StateInterface.php
+++ b/src/Symfony/Component/Scheduler/Generator/CheckpointInterface.php
@@ -9,9 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Scheduler\State;
+namespace Symfony\Component\Scheduler\Generator;
 
-interface StateInterface
+/**
+ * @experimental
+ */
+interface CheckpointInterface
 {
     public function acquire(\DateTimeImmutable $now): bool;
 
diff --git a/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php b/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
new file mode 100644
index 0000000000000..3643631cd29ce
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
@@ -0,0 +1,98 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Generator;
+
+use Psr\Clock\ClockInterface;
+use Symfony\Component\Clock\Clock;
+use Symfony\Component\Scheduler\Schedule;
+use Symfony\Component\Scheduler\Trigger\TriggerInterface;
+
+/**
+ * @experimental
+ */
+final class MessageGenerator implements MessageGeneratorInterface
+{
+    private TriggerHeap $triggerHeap;
+    private ?\DateTimeImmutable $waitUntil;
+    private CheckpointInterface $checkpoint;
+
+    public function __construct(
+        private Schedule $schedule,
+        string|CheckpointInterface $checkpoint,
+        private ClockInterface $clock = new Clock(),
+    ) {
+        $this->waitUntil = new \DateTimeImmutable('@0');
+        if (\is_string($checkpoint)) {
+            $checkpoint = new Checkpoint('scheduler_checkpoint_'.$checkpoint, $this->schedule->getLock(), $this->schedule->getState());
+        }
+        $this->checkpoint = $checkpoint;
+    }
+
+    public function getMessages(): \Generator
+    {
+        if (!$this->waitUntil
+            || $this->waitUntil > ($now = $this->clock->now())
+            || !$this->checkpoint->acquire($now)
+        ) {
+            return;
+        }
+
+        $lastTime = $this->checkpoint->time();
+        $lastIndex = $this->checkpoint->index();
+        $heap = $this->heap($lastTime);
+
+        while (!$heap->isEmpty() && $heap->top()[0] <= $now) {
+            /** @var TriggerInterface $trigger */
+            [$time, $index, $trigger, $message] = $heap->extract();
+            $yield = true;
+
+            if ($time < $lastTime) {
+                $time = $lastTime;
+                $yield = false;
+            } elseif ($time == $lastTime && $index <= $lastIndex) {
+                $yield = false;
+            }
+
+            if ($nextTime = $trigger->getNextRunDate($time)) {
+                $heap->insert([$nextTime, $index, $trigger, $message]);
+            }
+
+            if ($yield) {
+                yield $message;
+                $this->checkpoint->save($time, $index);
+            }
+        }
+
+        $this->waitUntil = $heap->isEmpty() ? null : $heap->top()[0];
+
+        $this->checkpoint->release($now, $this->waitUntil);
+    }
+
+    private function heap(\DateTimeImmutable $time): TriggerHeap
+    {
+        if (isset($this->triggerHeap) && $this->triggerHeap->time <= $time) {
+            return $this->triggerHeap;
+        }
+
+        $heap = new TriggerHeap($time);
+
+        foreach ($this->schedule->getRecurringMessages() as $index => $recurringMessage) {
+            if (!$nextTime = $recurringMessage->getTrigger()->getNextRunDate($time)) {
+                continue;
+            }
+
+            $heap->insert([$nextTime, $index, $recurringMessage->getTrigger(), $recurringMessage->getMessage()]);
+        }
+
+        return $this->triggerHeap = $heap;
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Schedule/ScheduleInterface.php b/src/Symfony/Component/Scheduler/Generator/MessageGeneratorInterface.php
similarity index 72%
rename from src/Symfony/Component/Scheduler/Schedule/ScheduleInterface.php
rename to src/Symfony/Component/Scheduler/Generator/MessageGeneratorInterface.php
index 9da99091a329f..0ee6483f974b1 100644
--- a/src/Symfony/Component/Scheduler/Schedule/ScheduleInterface.php
+++ b/src/Symfony/Component/Scheduler/Generator/MessageGeneratorInterface.php
@@ -9,9 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Scheduler\Schedule;
+namespace Symfony\Component\Scheduler\Generator;
 
-interface ScheduleInterface
+/**
+ * @experimental
+ */
+interface MessageGeneratorInterface
 {
     public function getMessages(): iterable;
 }
diff --git a/src/Symfony/Component/Scheduler/Schedule/ScheduleHeap.php b/src/Symfony/Component/Scheduler/Generator/TriggerHeap.php
similarity index 88%
rename from src/Symfony/Component/Scheduler/Schedule/ScheduleHeap.php
rename to src/Symfony/Component/Scheduler/Generator/TriggerHeap.php
index a6c92265d4a55..abd68bdd43146 100644
--- a/src/Symfony/Component/Scheduler/Schedule/ScheduleHeap.php
+++ b/src/Symfony/Component/Scheduler/Generator/TriggerHeap.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Scheduler\Schedule;
+namespace Symfony\Component\Scheduler\Generator;
 
 use Symfony\Component\Scheduler\Trigger\TriggerInterface;
 
@@ -17,8 +17,10 @@
  * @internal
  *
  * @extends \SplHeap<array{\DateTimeImmutable, int, TriggerInterface, object}>
+ *
+ * @experimental
  */
-final class ScheduleHeap extends \SplHeap
+final class TriggerHeap extends \SplHeap
 {
     public function __construct(
         public \DateTimeImmutable $time,
diff --git a/src/Symfony/Component/Scheduler/Locator/ChainScheduleConfigLocator.php b/src/Symfony/Component/Scheduler/Locator/ChainScheduleConfigLocator.php
deleted file mode 100644
index d7ced277e06b1..0000000000000
--- a/src/Symfony/Component/Scheduler/Locator/ChainScheduleConfigLocator.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Locator;
-
-use Psr\Container\NotFoundExceptionInterface;
-use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
-
-final class ChainScheduleConfigLocator implements ScheduleConfigLocatorInterface
-{
-    /**
-     * @var ScheduleConfigLocatorInterface[]
-     */
-    private array $locators;
-
-    private array $lastFound = [];
-
-    /**
-     * @param iterable<ScheduleConfigLocatorInterface> $locators
-     */
-    public function __construct(iterable $locators)
-    {
-        $this->locators = (static fn (ScheduleConfigLocatorInterface ...$l) => $l)(...$locators);
-    }
-
-    public function get(string $id): ScheduleConfig
-    {
-        if ($locator = $this->findLocator($id)) {
-            return $locator->get($id);
-        }
-
-        throw new class(sprintf('You have requested a non-existent schedule "%s".', $id)) extends \InvalidArgumentException implements NotFoundExceptionInterface { };
-    }
-
-    public function has(string $id): bool
-    {
-        return null !== $this->findLocator($id);
-    }
-
-    private function findLocator(string $id): ?ScheduleConfigLocatorInterface
-    {
-        if (isset($this->lastFound[$id])) {
-            return $this->lastFound[$id];
-        }
-
-        foreach ($this->locators as $locator) {
-            if ($locator->has($id)) {
-                $this->lastFound = [$id => $locator];
-
-                return $locator;
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Locator/ScheduleConfigLocatorInterface.php b/src/Symfony/Component/Scheduler/Locator/ScheduleConfigLocatorInterface.php
deleted file mode 100644
index 594a892814ee4..0000000000000
--- a/src/Symfony/Component/Scheduler/Locator/ScheduleConfigLocatorInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Locator;
-
-use Psr\Container\ContainerInterface;
-use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
-
-interface ScheduleConfigLocatorInterface extends ContainerInterface
-{
-    public function get(string $id): ScheduleConfig;
-}
diff --git a/src/Symfony/Component/Scheduler/Messenger/ScheduleTransportFactory.php b/src/Symfony/Component/Scheduler/Messenger/ScheduleTransportFactory.php
deleted file mode 100644
index d28500b5b5224..0000000000000
--- a/src/Symfony/Component/Scheduler/Messenger/ScheduleTransportFactory.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Messenger;
-
-use Psr\Clock\ClockInterface;
-use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
-use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
-use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
-use Symfony\Component\Scheduler\Locator\ScheduleConfigLocatorInterface;
-use Symfony\Component\Scheduler\Schedule\Schedule;
-use Symfony\Component\Scheduler\State\StateFactoryInterface;
-
-class ScheduleTransportFactory implements TransportFactoryInterface
-{
-    protected const DEFAULT_OPTIONS = [
-        'cache' => null,
-        'lock' => null,
-    ];
-
-    public function __construct(
-        private readonly ClockInterface $clock,
-        private readonly ScheduleConfigLocatorInterface $schedules,
-        private readonly StateFactoryInterface $stateFactory,
-    ) {
-    }
-
-    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): ScheduleTransport
-    {
-        if ('schedule://' === $dsn) {
-            throw new InvalidArgumentException('The Schedule DSN must contains a name, e.g. "schedule://default".');
-        }
-        if (false === $scheduleName = parse_url($dsn, \PHP_URL_HOST)) {
-            throw new InvalidArgumentException(sprintf('The given Schedule DSN "%s" is invalid.', $dsn));
-        }
-
-        unset($options['transport_name']);
-        $options += static::DEFAULT_OPTIONS;
-        if (0 < \count($invalidOptions = array_diff_key($options, static::DEFAULT_OPTIONS))) {
-            throw new InvalidArgumentException(sprintf('Invalid option(s) "%s" passed to the Schedule Messenger transport.', implode('", "', array_keys($invalidOptions))));
-        }
-
-        if (!$this->schedules->has($scheduleName)) {
-            throw new InvalidArgumentException(sprintf('The schedule "%s" is not found.', $scheduleName));
-        }
-
-        return new ScheduleTransport(
-            new Schedule(
-                $this->clock,
-                $this->stateFactory->create($scheduleName, $options),
-                $this->schedules->get($scheduleName)
-            )
-        );
-    }
-
-    public function supports(string $dsn, array $options): bool
-    {
-        return self::isSupported($dsn);
-    }
-
-    final public static function isSupported(string $dsn): bool
-    {
-        return str_starts_with($dsn, 'schedule://');
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Messenger/ScheduledStamp.php b/src/Symfony/Component/Scheduler/Messenger/ScheduledStamp.php
index 78f7535358534..4b1b5cf1b577d 100644
--- a/src/Symfony/Component/Scheduler/Messenger/ScheduledStamp.php
+++ b/src/Symfony/Component/Scheduler/Messenger/ScheduledStamp.php
@@ -13,6 +13,9 @@
 
 use Symfony\Component\Messenger\Stamp\NonSendableStampInterface;
 
+/**
+ * @experimental
+ */
 final class ScheduledStamp implements NonSendableStampInterface
 {
 }
diff --git a/src/Symfony/Component/Scheduler/Messenger/ScheduleTransport.php b/src/Symfony/Component/Scheduler/Messenger/SchedulerTransport.php
similarity index 53%
rename from src/Symfony/Component/Scheduler/Messenger/ScheduleTransport.php
rename to src/Symfony/Component/Scheduler/Messenger/SchedulerTransport.php
index bac7646b6a097..af2a8f9adc1b2 100644
--- a/src/Symfony/Component/Scheduler/Messenger/ScheduleTransport.php
+++ b/src/Symfony/Component/Scheduler/Messenger/SchedulerTransport.php
@@ -13,23 +13,23 @@
 
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Transport\TransportInterface;
-use Symfony\Component\Scheduler\Exception\LogicMessengerException;
-use Symfony\Component\Scheduler\Schedule\ScheduleInterface;
+use Symfony\Component\Scheduler\Exception\LogicException;
+use Symfony\Component\Scheduler\Generator\MessageGeneratorInterface;
 
-class ScheduleTransport implements TransportInterface
+/**
+ * @experimental
+ */
+class SchedulerTransport implements TransportInterface
 {
-    private readonly array $stamps;
-
     public function __construct(
-        private readonly ScheduleInterface $schedule,
+        private readonly MessageGeneratorInterface $messageGenerator,
     ) {
-        $this->stamps = [new ScheduledStamp()];
     }
 
     public function get(): iterable
     {
-        foreach ($this->schedule->getMessages() as $message) {
-            yield new Envelope($message, $this->stamps);
+        foreach ($this->messageGenerator->getMessages() as $message) {
+            yield Envelope::wrap($message, [new ScheduledStamp()]);
         }
     }
 
@@ -40,11 +40,11 @@ public function ack(Envelope $envelope): void
 
     public function reject(Envelope $envelope): void
     {
-        throw new LogicMessengerException('Messages from ScheduleTransport must not be rejected.');
+        throw new LogicException(sprintf('Messages from "%s" must not be rejected.', __CLASS__));
     }
 
     public function send(Envelope $envelope): Envelope
     {
-        throw new LogicMessengerException('The ScheduleTransport cannot send messages.');
+        throw new LogicException(sprintf('"%s" cannot send messages.', __CLASS__));
     }
 }
diff --git a/src/Symfony/Component/Scheduler/Messenger/SchedulerTransportFactory.php b/src/Symfony/Component/Scheduler/Messenger/SchedulerTransportFactory.php
new file mode 100644
index 0000000000000..9fac1115ae596
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Messenger/SchedulerTransportFactory.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Messenger;
+
+use Psr\Clock\ClockInterface;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\Clock\Clock;
+use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
+use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
+use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
+use Symfony\Component\Scheduler\Generator\Checkpoint;
+use Symfony\Component\Scheduler\Generator\MessageGenerator;
+use Symfony\Component\Scheduler\Schedule;
+
+/**
+ * @experimental
+ */
+class SchedulerTransportFactory implements TransportFactoryInterface
+{
+    public function __construct(
+        private readonly ContainerInterface $scheduleProviders,
+        private readonly ClockInterface $clock = new Clock(),
+    ) {
+    }
+
+    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): SchedulerTransport
+    {
+        if ('schedule://' === $dsn) {
+            throw new InvalidArgumentException('The Schedule DSN must contains a name, e.g. "schedule://default".');
+        }
+        if (false === $scheduleName = parse_url($dsn, \PHP_URL_HOST)) {
+            throw new InvalidArgumentException(sprintf('The given Schedule DSN "%s" is invalid.', $dsn));
+        }
+        if (!$this->scheduleProviders->has($scheduleName)) {
+            throw new InvalidArgumentException(sprintf('The schedule "%s" is not found.', $scheduleName));
+        }
+
+        /** @var Schedule $schedule */
+        $schedule = $this->scheduleProviders->get($scheduleName)->getSchedule();
+        $checkpoint = new Checkpoint('scheduler_checkpoint_'.$scheduleName, $schedule->getLock(), $schedule->getState());
+
+        return new SchedulerTransport(new MessageGenerator($schedule, $checkpoint, $this->clock));
+    }
+
+    public function supports(string $dsn, array $options): bool
+    {
+        return str_starts_with($dsn, 'schedule://');
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/README.md b/src/Symfony/Component/Scheduler/README.md
index 6ea658c8a07e4..01de586172157 100644
--- a/src/Symfony/Component/Scheduler/README.md
+++ b/src/Symfony/Component/Scheduler/README.md
@@ -1,50 +1,12 @@
 Scheduler Component
-====================
+===================
 
-Provides basic scheduling through the Symfony Messenger.
+Provides scheduling through Symfony Messenger.
 
-Getting Started
----------------
-
-```
-$ composer require symfony/scheduler
-```
-
-Full DSN with schedule name: `schedule://<name>`
-
-```yaml
-# messenger.yaml
-framework:
-  messenger:
-    transports:
-      schedule_default: 'schedule://default'
-```
-
-```php
-<?php
-
-use Symfony\Component\Scheduler\ScheduleConfig;
-use Symfony\Component\Scheduler\Trigger\PeriodicalTrigger;
-
-class ExampleLocator implements ScheduleConfigLocatorInterface
-{
-    public function get(string $id): ScheduleConfig
-    {
-        return (new ScheduleConfig())
-            ->add(
-                // do the MaintenanceJob every night at 3 a.m. UTC
-                PeriodicalTrigger::create('P1D', '03:00:00+00'),
-                new MaintenanceJob()
-            )
-        ;
-    }
-
-    public function has(string $id): bool
-    {
-        return 'default' === $id;
-    }
-}
-```
+**This Component is experimental**.
+[Experimental features](https://symfony.com/doc/current/contributing/code/experimental.html)
+are not covered by Symfony's
+[Backward Compatibility Promise](https://symfony.com/doc/current/contributing/code/bc.html).
 
 Resources
 ---------
diff --git a/src/Symfony/Component/Scheduler/RecurringMessage.php b/src/Symfony/Component/Scheduler/RecurringMessage.php
new file mode 100644
index 0000000000000..173c65aa4196a
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/RecurringMessage.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler;
+
+use Symfony\Component\Scheduler\Trigger\CronExpressionTrigger;
+use Symfony\Component\Scheduler\Trigger\PeriodicalTrigger;
+use Symfony\Component\Scheduler\Trigger\TriggerInterface;
+
+/**
+ * @experimental
+ */
+final class RecurringMessage
+{
+    private function __construct(
+        private readonly TriggerInterface $trigger,
+        private readonly object $message,
+    ) {
+    }
+
+    /**
+     * Uses a relative date format to define the frequency.
+     *
+     * @see https://php.net/datetime.formats.relative
+     */
+    public static function every(string $frequency, object $message, \DateTimeImmutable $from = new \DateTimeImmutable(), ?\DateTimeImmutable $until = new \DateTimeImmutable('3000-01-01')): self
+    {
+        return new self(PeriodicalTrigger::create(\DateInterval::createFromDateString($frequency), $from, $until), $message);
+    }
+
+    public static function cron(string $expression, object $message): self
+    {
+        return new self(CronExpressionTrigger::fromSpec($expression), $message);
+    }
+
+    public static function trigger(TriggerInterface $trigger, object $message): self
+    {
+        return new self($trigger, $message);
+    }
+
+    public function getMessage(): object
+    {
+        return $this->message;
+    }
+
+    public function getTrigger(): TriggerInterface
+    {
+        return $this->trigger;
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Schedule.php b/src/Symfony/Component/Scheduler/Schedule.php
new file mode 100644
index 0000000000000..318274bfc33ce
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Schedule.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler;
+
+use Symfony\Component\Lock\LockInterface;
+use Symfony\Component\Lock\NoLock;
+use Symfony\Contracts\Cache\CacheInterface;
+
+/**
+ * @experimental
+ */
+final class Schedule implements ScheduleProviderInterface
+{
+    /** @var array<RecurringMessage> */
+    private array $messages = [];
+    private ?LockInterface $lock = null;
+    private ?CacheInterface $state = null;
+
+    /**
+     * @return $this
+     */
+    public funct
10000
ion add(RecurringMessage $message, RecurringMessage ...$messages): static
+    {
+        $this->messages[] = $message;
+        $this->messages = array_merge($this->messages, $messages);
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function lock(LockInterface $lock): static
+    {
+        $this->lock = $lock;
+
+        return $this;
+    }
+
+    public function getLock(): LockInterface
+    {
+        return $this->lock ?? new NoLock();
+    }
+
+    /**
+     * @return $this
+     */
+    public function stateful(CacheInterface $state): static
+    {
+        $this->state = $state;
+
+        return $this;
+    }
+
+    public function getState(): ?CacheInterface
+    {
+        return $this->state;
+    }
+
+    /**
+     * @return array<RecurringMessage>
+     */
+    public function getRecurringMessages(): array
+    {
+        return $this->messages;
+    }
+
+    /**
+     * @return $this
+     */
+    public function getSchedule(): static
+    {
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Schedule/Schedule.php b/src/Symfony/Component/Scheduler/Schedule/Schedule.php
deleted file mode 100644
index 733f9cc26f9bb..0000000000000
--- a/src/Symfony/Component/Scheduler/Schedule/Schedule.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Schedule;
-
-use Psr\Clock\ClockInterface;
-use Symfony\Component\Scheduler\State\StateInterface;
-use Symfony\Component\Scheduler\Trigger\TriggerInterface;
-
-final class Schedule implements ScheduleInterface
-{
-    /**
-     * @var array<int, array{TriggerInterface, object}>
-     */
-    private readonly array $schedule;
-    private ScheduleHeap $scheduleHeap;
-    private ?\DateTimeImmutable $waitUntil;
-
-    public function __construct(
-        private readonly ClockInterface $clock,
-        private readonly StateInterface $state,
-        ScheduleConfig $scheduleConfig,
-    ) {
-        $this->schedule = $scheduleConfig->getSchedule();
-        $this->waitUntil = new \DateTimeImmutable('@0');
-    }
-
-    public function getMessages(): \Generator
-    {
-        if (!$this->waitUntil ||
-            $this->waitUntil > ($now = $this->clock->now()) ||
-            !$this->state->acquire($now)
-        ) {
-            return;
-        }
-
-        $lastTime = $this->state->time();
-        $lastIndex = $this->state->index();
-        $heap = $this->heap($lastTime);
-
-        while (!$heap->isEmpty() && $heap->top()[0] <= $now) {
-            /** @var TriggerInterface $trigger */
-            [$time, $index, $trigger, $message] = $heap->extract();
-            $yield = true;
-
-            if ($time < $lastTime) {
-                $time = $lastTime;
-                $yield = false;
-            } elseif ($time == $lastTime && $index <= $lastIndex) {
-                $yield = false;
-            }
-
-            if ($nextTime = $trigger->nextTo($time)) {
-                $heap->insert([$nextTime, $index, $trigger, $message]);
-            }
-
-            if ($yield) {
-                yield $message;
-                $this->state->save($time, $index);
-            }
-        }
-
-        $this->waitUntil = $heap->isEmpty() ? null : $heap->top()[0];
-
-        $this->state->release($now, $this->waitUntil);
-    }
-
-    private function heap(\DateTimeImmutable $time): ScheduleHeap
-    {
-        if (isset($this->scheduleHeap) && $this->scheduleHeap->time <= $time) {
-            return $this->scheduleHeap;
-        }
-
-        $heap = new ScheduleHeap($time);
-
-        foreach ($this->schedule as $index => [$trigger, $message]) {
-            /** @var TriggerInterface $trigger */
-            if (!$nextTime = $trigger->nextTo($time)) {
-                continue;
-            }
-
-            $heap->insert([$nextTime, $index, $trigger, $message]);
-        }
-
-        return $this->scheduleHeap = $heap;
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Schedule/ScheduleConfig.php b/src/Symfony/Component/Scheduler/Schedule/ScheduleConfig.php
deleted file mode 100644
index 0a692929dff82..0000000000000
--- a/src/Symfony/Component/Scheduler/Schedule/ScheduleConfig.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Schedule;
-
-use Symfony\Component\Scheduler\Trigger\TriggerInterface;
-
-final class ScheduleConfig
-{
-    /**
-     * @var array<int, array{TriggerInterface, object}>
-     */
-    private array $schedule = [];
-
-    /**
-     * @param iterable<array{TriggerInterface, object}> $schedule
-     */
-    public function __construct(iterable $schedule = [])
-    {
-        foreach ($schedule as $args) {
-            $this->add(...$args);
-        }
-    }
-
-    public function add(TriggerInterface $trigger, object $message): self
-    {
-        $this->schedule[] = [$trigger, $message];
-
-        return $this;
-    }
-
-    /**
-     * @return array<int, array{TriggerInterface, object}>
-     */
-    public function getSchedule(): array
-    {
-        return $this->schedule;
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Exception/LogicMessengerException.php b/src/Symfony/Component/Scheduler/ScheduleProviderInterface.php
similarity index 52%
rename from src/Symfony/Component/Scheduler/Exception/LogicMessengerException.php
rename to src/Symfony/Component/Scheduler/ScheduleProviderInterface.php
index 31445bc398e48..91f83838d0ccf 100644
--- a/src/Symfony/Component/Scheduler/Exception/LogicMessengerException.php
+++ b/src/Symfony/Component/Scheduler/ScheduleProviderInterface.php
@@ -9,11 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Scheduler\Exception;
+namespace Symfony\Component\Scheduler;
 
-use Symfony\Component\Messenger\Exception\ExceptionInterface;
-
-// not sure about this
-class LogicMessengerException extends LogicException implements ExceptionInterface
+/**
+ * @experimental
+ */
+interface ScheduleProviderInterface
 {
+    public function getSchedule(): Schedule;
 }
diff --git a/src/Symfony/Component/Scheduler/State/CacheStateDecorator.php b/src/Symfony/Component/Scheduler/State/CacheStateDecorator.php
deleted file mode 100644
index 1ca3bfff6c1af..0000000000000
--- a/src/Symfony/Component/Scheduler/State/CacheStateDecorator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\State;
-
-use Symfony\Contracts\Cache\CacheInterface;
-
-final class CacheStateDecorator implements StateInterface
-{
-    public function __construct(
-        private readonly StateInterface $inner,
-        private readonly CacheInterface $cache,
-        private readonly string $name,
-    ) {
-    }
-
-    public function acquire(\DateTimeImmutable $now): bool
-    {
-        if (!$this->inner->acquire($now)) {
-            return false;
-        }
-
-        $this->inner->save(...$this->cache->get($this->name, fn () => [$now, -1]));
-
-        return true;
-    }
-
-    public function time(): \DateTimeImmutable
-    {
-        return $this->inner->time();
-    }
-
-    public function index(): int
-    {
-        return $this->inner->index();
-    }
-
-    public function save(\DateTimeImmutable $time, int $index): void
-    {
-        $this->inner->save($time, $index);
-        $this->cache->get($this->name, fn () => [$time, $index], \INF);
-    }
-
-    public function release(\DateTimeImmutable $now, ?\DateTimeImmutable $nextTime): void
-    {
-        $this->inner->release($now, $nextTime);
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/State/State.php b/src/Symfony/Component/Scheduler/State/State.php
deleted file mode 100644
index e910bc5a3b7c0..0000000000000
--- a/src/Symfony/Component/Scheduler/State/State.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\State;
-
-final class State implements StateInterface
-{
-    private \DateTimeImmutable $time;
-    private int $index = -1;
-
-    public function acquire(\DateTimeImmutable $now): bool
-    {
-        if (!isset($this->time)) {
-            $this->time = $now;
-        }
-
-        return true;
-    }
-
-    public function time(): \DateTimeImmutable
-    {
-        return $this->time;
-    }
-
-    public function index(): int
-    {
-        return $this->index;
-    }
-
-    public function save(\DateTimeImmutable $time, int $index): void
-    {
-        $this->time = $time;
-        $this->index = $index;
-    }
-
-    public function release(\DateTimeImmutable $now, ?\DateTimeImmutable $nextTime): void
-    {
-        // skip
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/State/StateFactory.php b/src/Symfony/Component/Scheduler/State/StateFactory.php
deleted file mode 100644
index b9070b8d3023c..0000000000000
--- a/src/Symfony/Component/Scheduler/State/StateFactory.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\State;
-
-use Psr\Container\ContainerInterface;
-use Symfony\Component\Lock\LockFactory;
-use Symfony\Component\Lock\LockInterface;
-use Symfony\Component\Scheduler\Exception\LogicException;
-use Symfony\Contracts\Cache\CacheInterface;
-
-final class StateFactory implements StateFactoryInterface
-{
-    public function __construct(
-        private readonly ContainerInterface $lockFactories,
-        private readonly ContainerInterface $caches,
-    ) {
-    }
-
-    public function create(string $scheduleName, array $options): StateInterface
-    {
-        $name = 'messenger.schedule.'.$scheduleName;
-        $state = new State();
-
-        if ($lock = $this->createLock($scheduleName, $name, $options)) {
-            $state = new LockStateDecorator($state, $lock);
-        }
-        if ($cache = $this->createCache($scheduleName, $options)) {
-            $state = new CacheStateDecorator($state, $cache, $name);
-        }
-
-        return $state;
-    }
-
-    private function createLock(string $scheduleName, string $resourceName, array $options): ?LockInterface
-    {
-        if (!($options['lock'] ?? false)) {
-            return null;
-        }
-
-        if (\is_string($options['lock'])) {
-            $options['lock'] = ['resource' => $options['lock']];
-        }
-
-        if (\is_array($options['lock']) && \is_string($resource = $options['lock']['resource'] ?? null)) {
-            if (!$this->lockFactories->has($resource)) {
-                throw new LogicException(sprintf('The lock resource "%s" does not exist.', $resource));
-            }
-
-            /** @var LockFactory $lockFactory */
-            $lockFactory = $this->lockFactories->get($resource);
-
-            $args = ['resource' => $resourceName];
-            if (isset($options['lock']['ttl'])) {
-                $args['ttl'] = (float) $options['lock']['ttl'];
-            }
-            if (isset($options['lock']['auto_release'])) {
-                $args['autoRelease'] = (float) $options['lock']['auto_release'];
-            }
-
-            return $lockFactory->createLock(...$args);
-        }
-
-        throw new LogicException(sprintf('Invalid lock configuration for "%s" schedule.', $scheduleName));
-    }
-
-    private function createCache(string $scheduleName, array $options): ?CacheInterface
-    {
-        if (!($options['cache'] ?? false)) {
-            return null;
-        }
-
-        if (\is_string($options['cache'])) {
-            if (!$this->caches->has($options['cache'])) {
-                throw new LogicException(sprintf('The cache pool "%s" does not exist.', $options['cache']));
-            }
-
-            return $this->caches->get($options['cache']);
-        }
-
-        throw new LogicException(sprintf('Invalid cache configuration for "%s" schedule.', $scheduleName));
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/State/StateFactoryInterface.php b/src/Symfony/Component/Scheduler/State/StateFactoryInterface.php
deleted file mode 100644
index d1fa88bcff1cb..0000000000000
--- a/src/Symfony/Component/Scheduler/State/StateFactoryInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\State;
-
-interface StateFactoryInterface
-{
-    /**
-     * @param array<string, int|float|string|bool|null> $options
-     */
-    public function create(string $scheduleName, array $options): StateInterface;
-}
diff --git a/src/Symfony/Component/Scheduler/Tests/Generator/CheckpointTest.php b/src/Symfony/Component/Scheduler/Tests/Generator/CheckpointTest.php
new file mode 100644
index 0000000000000..b8c3895a97304
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Generator/CheckpointTest.php
@@ -0,0 +1,252 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Generator;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Lock\Key;
+use Symfony\Component\Lock\Lock;
+use Symfony\Component\Lock\LockInterface;
+use Symfony\Component\Lock\NoLock;
+use Symfony\Component\Lock\Store\InMemoryStore;
+use Symfony\Component\Scheduler\Generator\Checkpoint;
+
+class CheckpointTest extends TestCase
+{
+    public function testWithoutLockAndWithoutState()
+    {
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+        $later = $now->modify('1 hour');
+        $checkpoint = new Checkpoint('dummy');
+
+        $this->assertTrue($checkpoint->acquire($now));
+        $this->assertSame($now, $checkpoint->time());
+        $this->assertSame(-1, $checkpoint->index());
+
+        $checkpoint->save($later, 7);
+
+        $this->assertSame($later, $checkpoint->time());
+        $this->assertSame(7, $checkpoint->index());
+
+        $checkpoint->release($later, null);
+    }
+
+    public function testWithStateInitStateOnFirstAcquiring()
+    {
+        $checkpoint = new Checkpoint('cache', new NoLock(), $cache = new ArrayAdapter());
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        $this->assertTrue($checkpoint->acquire($now));
+        $this->assertEquals($now, $checkpoint->time());
+        $this->assertEquals(-1, $checkpoint->index());
+        $this->assertEquals([$now, -1], $cache->get('cache', fn () => []));
+    }
+
+    public function testWithStateLoadStateOnAcquiring()
+    {
+        $checkpoint = new Checkpoint('cache', new NoLock(), $cache = new ArrayAdapter());
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        $cache->get('cache', fn () => [$now, 0], \INF);
+
+        $this->assertTrue($checkpoint->acquire($now->modify('1 min')));
+        $this->assertEquals($now, $checkpoint->time());
+        $this->assertEquals(0, $checkpoint->index());
+        $this->assertEquals([$now, 0], $cache->get('cache', fn () => []));
+    }
+
+    public function testWithLockInitStateOnFirstAcquiring()
+    {
+        $lock = new Lock(new Key('lock'), new InMemoryStore());
+        $checkpoint = new Checkpoint('dummy', $lock);
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        $this->assertTrue($checkpoint->acquire($now));
+        $this->assertEquals($now, $checkpoint->time());
+        $this->assertEquals(-1, $checkpoint->index());
+        $this->assertTrue($lock->isAcquired());
+    }
+
+    public function testwithLockLoadStateOnAcquiring()
+    {
+        $lock = new Lock(new Key('lock'), new InMemoryStore());
+        $checkpoint = new Checkpoint('dummy', $lock);
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        $checkpoint->save($now, 0);
+
+        $this->assertTrue($checkpoint->acquire($now->modify('1 min')));
+        $this->assertEquals($now, $checkpoint->time());
+        $this->assertEquals(0, $checkpoint->index());
+        $this->assertTrue($lock->isAcquired());
+    }
+
+    public function testWithLockCannotAcquireIfAlreadyAcquired()
+    {
+        $concurrentLock = new Lock(new Key('locked'), $store = new InMemoryStore(), autoRelease: false);
+        $concurrentLock->acquire();
+        $this->assertTrue($concurrentLock->isAcquired());
+
+        $lock = new Lock(new Key('locked'), $store, autoRelease: false);
+        $checkpoint = new Checkpoint('locked', $lock);
+        $this->assertFalse($checkpoint->acquire(new \DateTimeImmutable()));
+    }
+
+    public function testWithCacheSave()
+    {
+        $checkpoint = new Checkpoint('cache', new NoLock(), $cache = new ArrayAdapter());
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+        $checkpoint->acquire($n = $now->modify('-1 hour'));
+        $checkpoint->save($now, 3);
+
+        $this->assertSame($now, $checkpoint->time());
+        $this->assertSame(3, $checkpoint->index());
+        $this->assertEquals([$now, 3], $cache->get('cache', fn () => []));
+    }
+
+    public function testWithLockSave()
+    {
+        $lock = new Lock(new Key('lock'), new InMemoryStore());
+        $checkpoint = new Checkpoint('dummy', $lock);
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        $checkpoint->acquire($now->modify('-1 hour'));
+        $checkpoint->save($now, 3);
+
+        $this->assertSame($now, $checkpoint->time());
+        $this->assertSame(3, $checkpoint->index());
+    }
+
+    public function testWithLockAndCacheSave()
+    {
+        $lock = new Lock(new Key('lock'), new InMemoryStore());
+        $checkpoint = new Checkpoint('dummy', $lock, $cache = new ArrayAdapter());
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        $checkpoint->acquire($now->modify('-1 hour'));
+        $checkpoint->save($now, 3);
+
+        $this->assertSame($now, $checkpoint->time());
+        $this->assertSame(3, $checkpoint->index());
+        $this->assertEquals([$now, 3], $cache->get('dummy', fn () => []));
+    }
+
+    public function testWithCacheFullCycle()
+    {
+        $checkpoint = new Checkpoint('cache', new NoLock(), $cache = new ArrayAdapter());
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        // init
+        $cache->get('cache', fn () => [$now->modify('-1 min'), 3], \INF);
+
+        // action
+        $acquired = $checkpoint->acquire($now);
+        $lastTime = $checkpoint->time();
+        $lastIndex = $checkpoint->index();
+        $checkpoint->save($now, 0);
+        $checkpoint->release($now, null);
+
+        // asserting
+        $this->assertTrue($acquired);
+        $this->assertEquals($now->modify('-1 min'), $lastTime);
+        $this->assertSame(3, $lastIndex);
+        $this->assertEquals($now, $checkpoint->time());
+        $this->assertSame(0, $checkpoint->index());
+        $this->assertEquals([$now, 0], $cache->get('cache', fn () => []));
+    }
+
+    public function testWithLockResetStateAfterLockedAcquiring()
+    {
+        $concurrentLock = new Lock(new Key('locked'), $store = new InMemoryStore(), autoRelease: false);
+        $concurrentLock->acquire();
+        $this->assertTrue($concurrentLock->isAcquired());
+
+        $lock = new Lock(new Key('locked'), $store, autoRelease: false);
+        $checkpoint = new Checkpoint('locked', $lock);
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        $checkpoint->save($now->modify('-2 min'), 0);
+        $checkpoint->acquire($now->modify('-1 min'));
+
+        $concurrentLock->release();
+
+        $this->assertTrue($checkpoint->acquire($now));
+        $this->assertEquals($now, $checkpoint->time());
+        $this->assertEquals(-1, $checkpoint->index());
+        $this->assertTrue($lock->isAcquired());
+        $this->assertFalse($concurrentLock->isAcquired());
+    }
+
+    public function testWithLockKeepLock()
+    {
+        $lock = new Lock(new Key('lock'), new InMemoryStore());
+        $checkpoint = new Checkpoint('dummy', $lock);
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        $checkpoint->acquire($now->modify('-1 min'));
+        $checkpoint->release($now, $now->modify('1 min'));
+
+        $this->assertTrue($lock->isAcquired());
+    }
+
+    public function testWithLockReleaseLock()
+    {
+        $lock = new Lock(new Key('lock'), new InMemoryStore());
+        $checkpoint = new Checkpoint('dummy', $lock);
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        $checkpoint->acquire($now->modify('-1 min'));
+        $checkpoint->release($now, null);
+
+        $this->assertFalse($lock->isAcquired());
+    }
+
+    public function testWithLockRefreshLock()
+    {
+        $lock = $this->createMock(LockInterface::class);
+        $lock->method('acquire')->willReturn(true);
+        $lock->method('getRemainingLifetime')->willReturn(120.0);
+        $lock->expects($this->once())->method('refresh')->with(120.0 + 60.0);
+        $lock->expects($this->never())->method('release');
+
+        $checkpoint = new Checkpoint('dummy', $lock);
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        $checkpoint->acquire($now->modify('-10 sec'));
+        $checkpoint->release($now, $now->modify('60 sec'));
+    }
+
+    public function testWithLockFullCycle()
+    {
+        $lock = new Lock(new Key('lock'), new InMemoryStore());
+        $checkpoint = new Checkpoint('dummy', $lock);
+        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
+
+        // init
+        $checkpoint->save($now->modify('-1 min'), 3);
+
+        // action
+        $acquired = $checkpoint->acquire($now);
+        $lastTime = $checkpoint->time();
+        $lastIndex = $checkpoint->index();
+        $checkpoint->save($now, 0);
+        $checkpoint->release($now, null);
+
+        // asserting
+        $this->assertTrue($acquired);
+        $this->assertEquals($now->modify('-1 min'), $lastTime);
+        $this->assertSame(3, $lastIndex);
+        $this->assertEquals($now, $checkpoint->time());
+        $this->assertSame(0, $checkpoint->index());
+        $this->assertFalse($lock->isAcquired());
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleTest.php b/src/Symfony/Component/Scheduler/Tests/Generator/MessageGeneratorTest.php
similarity index 66%
rename from src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleTest.php
rename to src/Symfony/Component/Scheduler/Tests/Generator/MessageGeneratorTest.php
index 1f90c84916296..8b6900b8bb037 100644
--- a/src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Generator/MessageGeneratorTest.php
@@ -9,18 +9,49 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Scheduler\Tests\Schedule;
+namespace Symfony\Component\Scheduler\Tests\Generator;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Clock\ClockInterface;
-use Symfony\Component\Scheduler\Schedule\Schedule;
-use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
-use Symfony\Component\Scheduler\State\State;
+use Symfony\Component\Scheduler\Generator\MessageGenerator;
+use Symfony\Component\Scheduler\RecurringMessage;
+use Symfony\Component\Scheduler\Schedule;
 use Symfony\Component\Scheduler\Trigger\TriggerInterface;
 
-class ScheduleTest extends TestCase
+class MessageGeneratorTest extends TestCase
 {
-    public function messagesProvider(): \Generator
+    /**
+     * @dataProvider messagesProvider
+     */
+    public function testGetMessages(string $startTime, array $runs, array $schedule)
+    {
+        // for referencing
+        $now = self::makeDateTime($startTime);
+
+        $clock = $this->createMock(ClockInterface::class);
+        $clock->method('now')->willReturnReference($now);
+
+        foreach ($schedule as $i => $s) {
+            if (\is_array($s)) {
+                $schedule[$i] = $this->createMessage(...$s);
+            }
+        }
+        $schedule = (new Schedule())->add(...$schedule);
+        $schedule->stateful(new ArrayAdapter());
+
+        $scheduler = new MessageGenerator($schedule, 'dummy', $clock);
+
+        // Warmup. The first run is always returns nothing.
+        $this->assertSame([], iterator_to_array($scheduler->getMessages()));
+
+        foreach ($runs as $time => $expected) {
+            $now = self::makeDateTime($time);
+            $this->assertSame($expected, iterator_to_array($scheduler->getMessages()));
+        }
+    }
+
+    public static function messagesProvider(): \Generator
     {
         $first = (object) ['id' => 'first'];
         $second = (object) ['id' => 'second'];
@@ -34,9 +65,7 @@ public function messagesProvider(): \Generator
                 '22:13:00' => [$first],
                 '22:13:01' => [],
             ],
-            'schedule' => [
-                $this->makeSchedule($first, '22:13:00', '22:14:00'),
-            ],
+            'schedule' => [[$first, '22:13:00', '22:14:00']],
         ];
 
         yield 'microseconds' => [
@@ -46,9 +75,7 @@ public function messagesProvider(): \Generator
                 '22:13:00' => [$first],
                 '22:13:01' => [],
             ],
-            'schedule' => [
-                $this->makeSchedule($first, '22:13:00', '22:14:00', '22:15:00'),
-            ],
+            'schedule' => [[$first, '22:13:00', '22:14:00', '22:15:00']],
         ];
 
         yield 'skipped' => [
@@ -56,9 +83,7 @@ public function messagesProvider(): \Generator
             'runs' => [
                 '22:14:01' => [$first, $first],
             ],
-            'schedule' => [
-                $this->makeSchedule($first, '22:13:00', '22:14:00', '22:15:00'),
-            ],
+            'schedule' => [[$first, '22:13:00', '22:14:00', '22:15:00']],
         ];
 
         yield 'sequence' => [
@@ -71,9 +96,7 @@ public function messagesProvider(): \Generator
                 '22:14:00' => [$first],
                 '22:14:01' => [],
             ],
-            'schedule' => [
-                $this->makeSchedule($first, '22:13:00', '22:14:00', '22:15:00'),
-            ],
+            'schedule' => [[$first, '22:13:00', '22:14:00', '22:15:00']],
         ];
 
         yield 'concurrency' => [
@@ -85,9 +108,9 @@ public function messagesProvider(): \Generator
                 '22:13:02.555' => [],
             ],
             'schedule' => [
-                $this->makeSchedule($first, '22:12:59', '22:13:00', '22:13:01', '22:13:02', '22:13:03'),
-                $this->makeSchedule($second, '22:13:00', '22:14:00'),
-                $this->makeSchedule($third, '22:12:30', '22:13:30'),
+                [$first, '22:12:59', '22:13:00', '22:13:01', '22:13:02', '22:13:03'],
+                [$second, '22:13:00', '22:14:00'],
+                [$third, '22:12:30', '22:13:30'],
             ],
         ];
 
@@ -100,8 +123,8 @@ public function messagesProvider(): \Generator
                 '22:14:01' => [],
             ],
             'schedule' => [
-                $this->makeSchedule($first, '22:13:00', '22:14:00', '22:15:00'),
-                $this->makeSchedule($second, '22:13:00', '22:14:00', '22:15:00'),
+                [$first, '22:13:00', '22:14:00', '22:15:00'],
+                [$second, '22:13:00', '22:14:00', '22:15:00'],
             ],
         ];
 
@@ -111,51 +134,25 @@ public function messagesProvider(): \Generator
                 '22:12:01' => [],
             ],
             'schedule' => [
-                [$this->createMock(TriggerInterface::class), $this],
+                RecurringMessage::trigger(new class() implements TriggerInterface {
+                    public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
+                    {
+                        return null;
+                    }
+                }, (object) []),
             ],
         ];
     }
 
-    /**
-     * @dataProvider messagesProvider
-     */
-    public function testGetMessages(string $startTime, array $runs, array $schedule)
-    {
-        // for referencing
-        $now = $this->makeDateTime($startTime);
-
-        $clock = $this->createMock(ClockInterface::class);
-        $clock->method('now')->willReturnReference($now);
-
-        $scheduler = new Schedule($clock, new State(), new ScheduleConfig($schedule));
-
-        // Warmup. The first run is always returns nothing.
-        $this->assertSame([], iterator_to_array($scheduler->getMessages()));
-
-        foreach ($runs as $time => $expected) {
-            $now = $this->makeDateTime($time);
-            $this->assertSame($expected, iterator_to_array($scheduler->getMessages()));
-        }
-    }
-
-    private function makeDateTime(string $time): \DateTimeImmutable
+    private function createMessage(object $message, string ...$runs): RecurringMessage
     {
-        return new \DateTimeImmutable('2020-02-20T'.$time, new \DateTimeZone('UTC'));
-    }
-
-    /**
-     * @return array{TriggerInterface, object}
-     */
-    private function makeSchedule(object $message, string ...$runs): array
-    {
-        $runs = array_map(fn ($time) => $this->makeDateTime($time), $runs);
+        $runs = array_map(fn ($time) => self::makeDateTime($time), $runs);
         sort($runs);
 
-        $ticks = [$this->makeDateTime(''), 0];
-
+        $ticks = [self::makeDateTime(''), 0];
         $trigger = $this->createMock(TriggerInterface::class);
         $trigger
-            ->method('nextTo')
+            ->method('getNextRunDate')
             ->willReturnCallback(function (\DateTimeImmutable $lastTick) use ($runs, &$ticks): \DateTimeImmutable {
                 [$tick, $count] = $ticks;
                 if ($lastTick > $tick) {
@@ -175,6 +172,11 @@ private function makeSchedule(object $message, string ...$runs): array
                 $this->fail(sprintf('There is no next run for tick %s', $lastTick->format(\DateTimeImmutable::RFC3339_EXTENDED)));
             });
 
-        return [$trigger, $message];
+        return RecurringMessage::trigger($trigger, $message);
+    }
+
+    private static function makeDateTime(string $time): \DateTimeImmutable
+    {
+        return new \DateTimeImmutable('2020-02-20T'.$time, new \DateTimeZone('UTC'));
     }
 }
diff --git a/src/Symfony/Component/Scheduler/Tests/Locator/ChainScheduleConfigLocatorTest.php b/src/Symfony/Component/Scheduler/Tests/Locator/ChainScheduleConfigLocatorTest.php
deleted file mode 100644
index 6e951b444a708..0000000000000
--- a/src/Symfony/Component/Scheduler/Tests/Locator/ChainScheduleConfigLocatorTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Tests\Locator;
-
-use PHPUnit\Framework\TestCase;
-use Psr\Container\NotFoundExceptionInterface;
-use Symfony\Component\Scheduler\Locator\ChainScheduleConfigLocator;
-use Symfony\Component\Scheduler\Locator\ScheduleConfigLocatorInterface;
-use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
-
-class ChainScheduleConfigLocatorTest extends TestCase
-{
-    public function testExists()
-    {
-        $schedule = new ScheduleConfig();
-
-        $empty = $this->createMock(ScheduleConfigLocatorInterface::class);
-        $empty->expects($this->once())->method('has')->with('exists')->willReturn(false);
-        $empty->expects($this->never())->method('get');
-
-        $full = $this->createMock(ScheduleConfigLocatorInterface::class);
-        $full->expects($this->once())->method('has')->with('exists')->willReturn(true);
-        $full->expects($this->once())->method('get')->with('exists')->willReturn($schedule);
-
-        $locator = new ChainScheduleConfigLocator([$empty, $full]);
-
-        $this->assertTrue($locator->has('exists'));
-        $this->assertSame($schedule, $locator->get('exists'));
-    }
-
-    public function testNonExists()
-    {
-        $locator = new ChainScheduleConfigLocator([$this->createMock(ScheduleConfigLocatorInterface::class)]);
-
-        $this->assertFalse($locator->has('non-exists'));
-        $this->expectException(NotFoundExceptionInterface::class);
-
-        $locator->get('non-exists');
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportFactoryTest.php b/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportFactoryTest.php
similarity index 52%
rename from src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportFactoryTest.php
rename to src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportFactoryTest.php
index 858189d11b63b..4f5c53e70bd25 100644
--- a/src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportFactoryTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportFactoryTest.php
@@ -13,52 +13,39 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Clock\ClockInterface;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
-use Symfony\Component\Scheduler\Locator\ScheduleConfigLocatorInterface;
-use Symfony\Component\Scheduler\Messenger\ScheduleTransport;
-use Symfony\Component\Scheduler\Messenger\ScheduleTransportFactory;
-use Symfony\Component\Scheduler\Schedule\Schedule;
-use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
-use Symfony\Component\Scheduler\State\StateFactoryInterface;
-use Symfony\Component\Scheduler\State\StateInterface;
+use Symfony\Component\Scheduler\Generator\MessageGenerator;
+use Symfony\Component\Scheduler\Messenger\SchedulerTransport;
+use Symfony\Component\Scheduler\Messenger\SchedulerTransportFactory;
+use Symfony\Component\Scheduler\RecurringMessage;
+use Symfony\Component\Scheduler\Schedule;
+use Symfony\Component\Scheduler\ScheduleProviderInterface;
 use Symfony\Component\Scheduler\Trigger\TriggerInterface;
+use Symfony\Contracts\Service\ServiceLocatorTrait;
 
-class ScheduleTransportFactoryTest extends TestCase
+class SchedulerTransportFactoryTest extends TestCase
 {
     public function testCreateTransport()
     {
         $trigger = $this->createMock(TriggerInterface::class);
         $serializer = $this->createMock(SerializerInterface::class);
         $clock = $this->createMock(ClockInterface::class);
-        $container = new class() extends \ArrayObject implements ScheduleConfigLocatorInterface {
-            public function get(string $id): ScheduleConfig
-            {
-                return $this->offsetGet($id);
-            }
-
-            public function has(string $id): bool
-            {
-                return $this->offsetExists($id);
-            }
-        };
-
-        $stateFactory = $this->createMock(StateFactoryInterface::class);
-        $stateFactory
-            ->expects($this->exactly(2))
-            ->method('create')
-            ->withConsecutive(
-                ['default', ['cache' => null, 'lock' => null]],
-                ['custom', ['cache' => 'app', 'lock' => null]]
-            )
-            ->willReturn($state = $this->createMock(StateInterface::class));
-
-        $container['default'] = new ScheduleConfig([[$trigger, (object) ['id' => 'default']]]);
-        $container['custom'] = new ScheduleConfig([[$trigger, (object) ['id' => 'custom']]]);
-        $default = new ScheduleTransport(new Schedule($clock, $state, $container['default']));
-        $custom = new ScheduleTransport(new Schedule($clock, $state, $container['custom']));
-
-        $factory = new ScheduleTransportFactory($clock, $container, $stateFactory);
+
+        $defaultRecurringMessage = RecurringMessage::trigger($trigger, (object) ['id' => 'default']);
+        $customRecurringMessage = RecurringMessage::trigger($trigger, (object) ['id' => 'custom']);
+
+        $default = new SchedulerTransport(new MessageGenerator((new SomeScheduleProvider([$defaultRecurringMessage]))->getSchedule(), 'default', $clock));
+        $custom = new SchedulerTransport(new MessageGenerator((new SomeScheduleProvider([$customRecurringMessage]))->getSchedule(), 'custom', $clock));
+
+        $factory = new SchedulerTransportFactory(
+            new Container([
+                'default' => fn () => (new SomeScheduleProvider([$defaultRecurringMessage]))->getSchedule(),
+                'custom' => fn () => (new SomeScheduleProvider([$customRecurringMessage]))->getSchedule(),
+            ]),
+            $clock,
+        );
 
         $this->assertEquals($default, $factory->createTransport('schedule://default', [], $serializer));
         $this->assertEquals($custom, $factory->createTransport('schedule://custom', ['cache' => 'app'], $serializer));
@@ -84,16 +71,6 @@ public function testNoName()
         $factory->createTransport('schedule://', [], $this->createMock(SerializerInterface::class));
     }
 
-    public function testInvalidOption()
-    {
-        $factory = $this->makeTransportFactoryWithStubs();
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Invalid option(s) "invalid" passed to the Schedule Messenger transport.');
-
-        $factory->createTransport('schedule://name', ['invalid' => true], $this->createMock(SerializerInterface::class));
-    }
-
     public function testNotFound()
     {
         $factory = $this->makeTransportFactoryWithStubs();
@@ -114,12 +91,31 @@ public function testSupports()
         $this->assertFalse($factory->supports('string', []));
     }
 
-    private function makeTransportFactoryWithStubs(): ScheduleTransportFactory
+    private function makeTransportFactoryWithStubs(): SchedulerTransportFactory
     {
-        return new ScheduleTransportFactory(
+        return new SchedulerTransportFactory(
+            new Container([
+                'default' => fn () => $this->createMock(ScheduleProviderInterface::class),
+            ]),
             $this->createMock(ClockInterface::class),
-            $this->createMock(ScheduleConfigLocatorInterface::class),
-            $this->createMock(StateFactoryInterface::class)
         );
     }
 }
+
+class SomeScheduleProvider implements ScheduleProviderInterface
+{
+    public function __construct(
+        private array $messages,
+    ) {
+    }
+
+    public function getSchedule(): Schedule
+    {
+        return (new Schedule())->add(...$this->messages);
+    }
+}
+
+class Container implements ContainerInterface
+{
+    use ServiceLocatorTrait;
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportTest.php b/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php
similarity index 61%
rename from src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportTest.php
rename to src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php
index b8a9d6acfb4a8..2b31cb67062d1 100644
--- a/src/Symfony/Component/Scheduler/Tests/Messenger/ScheduleTransportTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php
@@ -13,12 +13,12 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Scheduler\Exception\LogicMessengerException;
+use Symfony\Component\Scheduler\Exception\LogicException;
+use Symfony\Component\Scheduler\Generator\MessageGeneratorInterface;
 use Symfony\Component\Scheduler\Messenger\ScheduledStamp;
-use Symfony\Component\Scheduler\Messenger\ScheduleTransport;
-use Symfony\Component\Scheduler\Schedule\ScheduleInterface;
+use Symfony\Component\Scheduler\Messenger\SchedulerTransport;
 
-class ScheduleTransportTest extends TestCase
+class SchedulerTransportTest extends TestCase
 {
     public function testGetFromIterator()
     {
@@ -26,10 +26,10 @@ public function testGetFromIterator()
             (object) ['id' => 'first'],
             (object) ['id' => 'second'],
         ];
-        $scheduler = $this->createConfiguredMock(ScheduleInterface::class, [
+        $generator = $this->createConfiguredMock(MessageGeneratorInterface::class, [
             'getMessages' => $messages,
         ]);
-        $transport = new ScheduleTransport($scheduler);
+        $transport = new SchedulerTransport($generator);
 
         foreach ($transport->get() as $envelope) {
             $this->assertInstanceOf(Envelope::class, $envelope);
@@ -42,26 +42,25 @@ public function testGetFromIterator()
 
     public function testAckIgnored()
     {
-        $transport = new ScheduleTransport($this->createMock(ScheduleInterface::class));
+        $transport = new SchedulerTransport($this->createMock(MessageGeneratorInterface::class));
 
+        $this->expectNotToPerformAssertions();
         $transport->ack(new Envelope(new \stdClass()));
-
-        $this->assertTrue(true); // count coverage
     }
 
     public function testRejectException()
     {
-        $transport = new ScheduleTransport($this->createMock(ScheduleInterface::class));
+        $transport = new SchedulerTransport($this->createMock(MessageGeneratorInterface::class));
 
-        $this->expectException(LogicMessengerException::class);
+        $this->expectException(LogicException::class);
         $transport->reject(new Envelope(new \stdClass()));
     }
 
     public function testSendException()
     {
-        $transport = new ScheduleTransport($this->createMock(ScheduleInterface::class));
+        $transport = new SchedulerTransport($this->createMock(MessageGeneratorInterface::class));
 
-        $this->expectException(LogicMessengerException::class);
+        $this->expectException(LogicException::class);
         $transport->send(new Envelope(new \stdClass()));
     }
 }
diff --git a/src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleConfigTest.php b/src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleConfigTest.php
deleted file mode 100644
index 0c350aa084884..0000000000000
--- a/src/Symfony/Component/Scheduler/Tests/Schedule/ScheduleConfigTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Tests\Schedule;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Scheduler\Schedule\ScheduleConfig;
-use Symfony\Component\Scheduler\Trigger\TriggerInterface;
-
-class ScheduleConfigTest extends TestCase
-{
-    public function testEmpty()
-    {
-        $config = new ScheduleConfig();
-
-        $this->assertSame([], $config->getSchedule());
-    }
-
-    public function testAdd()
-    {
-        $config = new ScheduleConfig();
-
-        $config->add($t1 = $this->createMock(TriggerInterface::class), $o1 = (object) ['name' => 'first']);
-        $config->add($t2 = $this->createMock(TriggerInterface::class), $o2 = (object) ['name' => 'second']);
-
-        $expected = [
-            [$t1, $o1],
-            [$t2, $o2],
-        ];
-
-        $this->assertSame($expected, $config->getSchedule());
-    }
-
-    public function testFromIterator()
-    {
-        $expected = [
-            [$this->createMock(TriggerInterface::class), (object) ['name' => 'first']],
-            [$this->createMock(TriggerInterface::class), (object) ['name' => 'second']],
-        ];
-
-        $config = new ScheduleConfig(new \ArrayObject($expected));
-
-        $this->assertSame($expected, $config->getSchedule());
-    }
-
-    public function testFromBadIterator()
-    {
-        $this->expectException(\TypeError::class);
-        $this->expectExceptionMessage('must be of type Symfony\Component\Scheduler\Trigger\TriggerInterface');
-
-        new ScheduleConfig([new \ArrayObject(['wrong'])]);
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Tests/State/CacheStateDecoratorTest.php b/src/Symfony/Component/Scheduler/Tests/State/CacheStateDecoratorTest.php
deleted file mode 100644
index 48cd22b69cd3b..0000000000000
--- a/src/Symfony/Component/Scheduler/Tests/State/CacheStateDecoratorTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Tests\State;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Scheduler\State\CacheStateDecorator;
-use Symfony\Component\Scheduler\State\State;
-use Symfony\Component\Scheduler\State\StateInterface;
-use Symfony\Contracts\Cache\CacheInterface;
-
-class CacheStateDecoratorTest extends TestCase
-{
-    private ArrayAdapter $cache;
-    private State $inner;
-    private CacheStateDecorator $state;
-    private \DateTimeImmutable $now;
-
-    protected function setUp(): void
-    {
-        $this->cache = new ArrayAdapter(storeSerialized: false);
-        $this->inner = new State();
-        $this->state = new CacheStateDecorator($this->inner, $this->cache, 'cache');
-        $this->now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
-    }
-
-    public function testInitStateOnFirstAcquiring()
-    {
-        [$cache, $state, $now] = [$this->cache, $this->state, $this->now];
-
-        $this->assertTrue($state->acquire($now));
-        $this->assertEquals($now, $state->time());
-        $this->assertEquals(-1, $state->index());
-        $this->assertEquals([$now, -1], $cache->get('cache', fn () => []));
-    }
-
-    public function testLoadStateOnAcquiring()
-    {
-        [$cache, $inner, $state, $now] = [$this->cache, $this->inner, $this->state, $this->now];
-
-        $cache->get('cache', fn () => [$now, 0], \INF);
-
-        $this->assertTrue($state->acquire($now->modify('1 min')));
-        $this->assertEquals($now, $state->time());
-        $this->assertEquals(0, $state->index());
-        $this->assertEquals([$now, 0], $cache->get('cache', fn () => []));
-    }
-
-    public function testCannotAcquereIfInnerAcquered()
-    {
-        $inner = $this->createMock(StateInterface::class);
-        $inner->method('acquire')->willReturn(false);
-        $state = new CacheStateDecorator($inner, $this->cache, 'cache');
-
-        $this->assertFalse($state->acquire($this->now));
-    }
-
-    public function testSave()
-    {
-        [$cache, $inner, $state, $now] = [$this->cache, $this->inner, $this->state, $this->now];
-
-        $state->acquire($now->modify('-1 hour'));
-        $state->save($now, 3);
-
-        $this->assertSame($now, $state->time());
-        $this->assertSame(3, $state->index());
-        $this->assertSame($inner->time(), $state->time());
-        $this->assertSame($inner->index(), $state->index());
-        $this->assertSame([$now, 3], $cache->get('cache', fn () => []));
-    }
-
-    public function testRelease()
-    {
-        $now = $this->now;
-        $later = $now->modify('1 min');
-        $cache = $this->createMock(CacheInterface::class);
-        $inner = $this->createMock(StateInterface::class);
-        $inner->expects($this->once())->method('release')->with($now, $later);
-        $state = new CacheStateDecorator($inner, $cache, 'cache');
-
-        $state->release($now, $later);
-    }
-
-    public function testFullCycle()
-    {
-        [$cache, $inner, $state, $now] = [$this->cache, $this->inner, $this->state, $this->now];
-
-        // init
-        $cache->get('cache', fn () => [$now->modify('-1 min'), 3], \INF);
-
-        // action
-        $acquired = $state->acquire($now);
-        $lastTime = $state->time();
-        $lastIndex = $state->index();
-        $state->save($now, 0);
-        $state->release($now, null);
-
-        // asserting
-        $this->assertTrue($acquired);
-        $this->assertEquals($now->modify('-1 min'), $lastTime);
-        $this->assertSame(3, $lastIndex);
-        $this->assertEquals($now, $inner->time());
-        $this->assertSame(0, $inner->index());
-        $this->assertEquals([$now, 0], $cache->get('cache', fn () => []));
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Tests/State/LockStateDecoratorTest.php b/src/Symfony/Component/Scheduler/Tests/State/LockStateDecoratorTest.php
deleted file mode 100644
index e3feab24c6da9..0000000000000
--- a/src/Symfony/Component/Scheduler/Tests/State/LockStateDecoratorTest.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Tests\State;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Lock\Key;
-use Symfony\Component\Lock\Lock;
-use Symfony\Component\Lock\LockInterface;
-use Symfony\Component\Lock\Store\InMemoryStore;
-use Symfony\Component\Scheduler\State\LockStateDecorator;
-use Symfony\Component\Scheduler\State\State;
-
-class LockStateDecoratorTest extends TestCase
-{
-    private InMemoryStore $store;
-    private Lock $lock;
-    private State $inner;
-    private LockStateDecorator $state;
-    private \DateTimeImmutable $now;
-
-    protected function setUp(): void
-    {
-        $this->store = new InMemoryStore();
-        $this->lock = new Lock(new Key('lock'), $this->store);
-        $this->inner = new State();
-        $this->state = new LockStateDecorator($this->inner, $this->lock);
-        $this->now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
-    }
-
-    public function testSave()
-    {
-        [$inner, $state, $now] = [$this->inner, $this->state, $this->now];
-
-        $state->acquire($now->modify('-1 hour'));
-        $state->save($now, 3);
-
-        $this->assertSame($now, $state->time());
-        $this->assertSame(3, $state->index());
-        $this->assertSame($inner->time(), $state->time());
-        $this->assertSame($inner->index(), $state->index());
-    }
-
-    public function testInitStateOnFirstAcquiring()
-    {
-        [$lock, $state, $now] = [$this->lock, $this->state, $this->now];
-
-        $this->assertTrue($state->acquire($now));
-        $this->assertEquals($now, $state->time());
-        $this->assertEquals(-1, $state->index());
-        $this->assertTrue($lock->isAcquired());
-    }
-
-    public function testLoadStateOnAcquiring()
-    {
-        [$lock, $inner, $state, $now] = [$this->lock, $this->inner, $this->state, $this->now];
-
-        $inner->save($now, 0);
-
-        $this->assertTrue($state->acquire($now->modify('1 min')));
-        $this->assertEquals($now, $state->time());
-        $this->assertEquals(0, $state->index());
-        $this->assertTrue($lock->isAcquired());
-    }
-
-    public function testCannotAcquereIfLocked()
-    {
-        [$state, $now] = [$this->state, $this->now];
-
-        $this->concurrentLock();
-
-        $this->assertFalse($state->acquire($now));
-    }
-
-    public function testResetStateAfterLockedAcquiring()
-    {
-        [$lock, $inner, $state, $now] = [$this->lock, $this->inner, $this->state, $this->now];
-
-        $concurrentLock = $this->concurrentLock();
-        $inner->save($now->modify('-2 min'), 0);
-        $state->acquire($now->modify('-1 min'));
-        $concurrentLock->release();
-
-        $this->assertTrue($state->acquire($now));
-        $this->assertEquals($now, $state->time());
-        $this->assertEquals(-1, $state->index());
-        $this->assertTrue($lock->isAcquired());
-        $this->assertFalse($concurrentLock->isAcquired());
-    }
-
-    public function testKeepLock()
-    {
-        [$lock, $state, $now] = [$this->lock, $this->state, $this->now];
-
-        $state->acquire($now->modify('-1 min'));
-        $state->release($now, $now->modify('1 min'));
-
-        $this->assertTrue($lock->isAcquired());
-    }
-
-    public function testReleaseLock()
-    {
-        [$lock, $state, $now] = [$this->lock, $this->state, $this->now];
-
-        $state->acquire($now->modify('-1 min'));
-        $state->release($now, null);
-
-        $this->assertFalse($lock->isAcquired());
-    }
-
-    public function testRefreshLock()
-    {
-        $lock = $this->createMock(LockInterface::class);
-        $lock->method('acquire')->willReturn(true);
-        $lock->method('getRemainingLifetime')->willReturn(120.0);
-        $lock->expects($this->once())->method('refresh')->with(120.0 + 60.0);
-        $lock->expects($this->never())->method('release');
-
-        $state = new LockStateDecorator(new State(), $lock);
-        $now = $this->now;
-
-        $state->acquire($now->modify('-10 sec'));
-        $state->release($now, $now->modify('60 sec'));
-    }
-
-    public function testFullCycle()
-    {
-        [$lock, $inner, $state, $now] = [$this->lock, $this->inner, $this->state, $this->now];
-
-        // init
-        $inner->save($now->modify('-1 min'), 3);
-
-        // action
-        $acquired = $state->acquire($now);
-        $lastTime = $state->time();
-        $lastIndex = $state->index();
-        $state->save($now, 0);
-        $state->release($now, null);
-
-        // asserting
-        $this->assertTrue($acquired);
-        $this->assertEquals($now->modify('-1 min'), $lastTime);
-        $this->assertSame(3, $lastIndex);
-        $this->assertEquals($now, $inner->time());
-        $this->assertSame(0, $inner->index());
-        $this->assertFalse($lock->isAcquired());
-    }
-
-    // No need to unlock after test, because the `InMemoryStore` is deleted
-    private function concurrentLock(): Lock
-    {
-        $lock = new Lock(
-            key: new Key('lock'),
-            store: $this->store,
-            autoRelease: false
-        );
-
-        if (!$lock->acquire()) {
-            throw new \LogicException('Already locked.');
-        }
-
-        return $lock;
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Tests/State/StateFactoryTest.php b/src/Symfony/Component/Scheduler/Tests/State/StateFactoryTest.php
deleted file mode 100644
index 540245610a0f6..0000000000000
--- a/src/Symfony/Component/Scheduler/Tests/State/StateFactoryTest.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Tests\State;
-
-use PHPUnit\Framework\TestCase;
-use Psr\Container\ContainerInterface;
-use Symfony\Component\Lock\LockFactory;
-use Symfony\Component\Lock\Store\InMemoryStore;
-use Symfony\Component\Scheduler\Exception\LogicException;
-use Symfony\Component\Scheduler\State\CacheStateDecorator;
-use Symfony\Component\Scheduler\State\LockStateDecorator;
-use Symfony\Component\Scheduler\State\State;
-use Symfony\Component\Scheduler\State\StateFactory;
-use Symfony\Contracts\Cache\CacheInterface;
-
-class StateFactoryTest extends TestCase
-{
-    public function testCreateSimple()
-    {
-        $factory = new StateFactory(
-            $this->makeContainer([]),
-            $this->makeContainer([])
-        );
-
-        $expected = new State();
-
-        $this->assertEquals($expected, $factory->create('name', []));
-    }
-
-    public function testCreateWithCache()
-    {
-        $cache = $this->createMock(CacheInterface::class);
-        $cache->method('get')->willReturnCallback(fn ($key, \Closure $f) => $f());
-
-        $factory = new StateFactory(
-            $this->makeContainer([]),
-            $this->makeContainer(['app' => $cache]),
-        );
-
-        $state = new State();
-        $expected = new CacheStateDecorator($state, $cache, 'messenger.schedule.name');
-
-        $this->assertEquals($expected, $factory->create('name', ['cache' => 'app']));
-    }
-
-    public function testCreateWithCacheAndLock()
-    {
-        $cache = $this->createMock(CacheInterface::class);
-        $cache->method('get')->willReturnCallback(fn ($key, \Closure $f) => $f());
-
-        $lockFactory = new LockFactory(new InMemoryStore());
-
-        $factory = new StateFactory(
-            $this->makeContainer(['unlock' => $lockFactory]),
-            $this->makeContainer(['app' => $cache]),
-        );
-
-        $lock = $lockFactory->createLock($name = 'messenger.schedule.name');
-        $state = new State();
-        $state = new LockStateDecorator($state, $lock);
-        $expected = new CacheStateDecorator($state, $cache, $name);
-
-        $this->assertEquals($expected, $factory->create('name', ['cache' => 'app', 'lock' => 'unlock']));
-    }
-
-    public function testCreateWithConfiguredLock()
-    {
-        $cache = $this->createMock(CacheInterface::class);
-        $cache->method('get')->willReturnCallback(fn ($key, \Closure $f) => $f());
-
-        $lockFactory = new LockFactory(new InMemoryStore());
-
-        $factory = new StateFactory(
-            $this->makeContainer(['unlock' => $lockFactory]),
-            $this->makeContainer([]),
-        );
-
-        $lock = $lockFactory->createLock('messenger.schedule.name', $ttl = 77.7, false);
-        $state = new State();
-        $expected = new LockStateDecorator($state, $lock);
-
-        $cfg = [
-            'resource' => 'unlock',
-            'ttl' => $ttl,
-            'auto_release' => false,
-        ];
-        $this->assertEquals($expected, $factory->create('name', ['lock' => $cfg]));
-    }
-
-    public function testInvalidCacheName()
-    {
-        $factory = new StateFactory(
-            $this->makeContainer([]),
-            $this->makeContainer([])
-        );
-
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('The cache pool "wrong-cache" does not exist.');
-
-        $factory->create('name', ['cache' => 'wrong-cache']);
-    }
-
-    public function testInvalidLockName()
-    {
-        $factory = new StateFactory(
-            $this->makeContainer([]),
-            $this->makeContainer([])
-        );
-
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('The lock resource "wrong-lock" does not exist.');
-
-        $factory->create('name', ['lock' => 'wrong-lock']);
-    }
-
-    public function testInvalidConfiguredLockName()
-    {
-        $factory = new StateFactory(
-            $this->makeContainer([]),
-            $this->makeContainer([])
-        );
-
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('The lock resource "wrong-lock" does not exist.');
-
-        $factory->create('name', ['lock' => ['resource' => 'wrong-lock']]);
-    }
-
-    public function testInvalidCacheOption()
-    {
-        $factory = new StateFactory(
-            $this->makeContainer([]),
-            $this->makeContainer([]),
-        );
-
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('Invalid cache configuration for "default" schedule.');
-        $factory->create('default', ['cache' => true]);
-    }
-
-    public function testInvalidLockOption()
-    {
-        $factory = new StateFactory(
-            $this->makeContainer([]),
-            $this->makeContainer([]),
-        );
-
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('Invalid lock configuration for "default" schedule.');
-        $factory->create('default', ['lock' => true]);
-    }
-
-    private function makeContainer(array $services): ContainerInterface|\ArrayObject
-    {
-        return new class($services) extends \ArrayObject implements ContainerInterface {
-            public function get(string $id): mixed
-            {
-                return $this->offsetGet($id);
-            }
-
-            public function has(string $id): bool
-            {
-                return $this->offsetExists($id);
-            }
-        };
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Tests/State/StateTest.php b/src/Symfony/Component/Scheduler/Tests/State/StateTest.php
deleted file mode 100644
index f5f769665bbbe..0000000000000
--- a/src/Symfony/Component/Scheduler/Tests/State/StateTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Tests\State;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Scheduler\State\State;
-
-class StateTest extends TestCase
-{
-    public function testState()
-    {
-        $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
-        $later = $now->modify('1 hour');
-        $state = new State();
-
-        $this->assertTrue($state->acquire($now));
-        $this->assertSame($now, $state->time());
-        $this->assertSame(-1, $state->index());
-
-        $state->save($later, 7);
-
-        $this->assertSame($later, $state->time());
-        $this->assertSame(7, $state->index());
-
-        $state->release($later, null);
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/ExcludeTimeTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/ExcludeTimeTriggerTest.php
index b18d60f01e1be..4245806a3baad 100644
--- a/src/Symfony/Component/Scheduler/Tests/Trigger/ExcludeTimeTriggerTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/ExcludeTimeTriggerTest.php
@@ -21,7 +21,7 @@ public function testGetNextRun()
     {
         $inner = $this->createMock(TriggerInterface::class);
         $inner
-            ->method('nextTo')
+            ->method('getNextRunDate')
             ->willReturnCallback(static fn (\DateTimeImmutable $d) => $d->modify('+1 sec'));
 
         $scheduled = new ExcludeTimeTrigger(
@@ -30,9 +30,9 @@ public function testGetNextRun()
             new \DateTimeImmutable('2020-02-20T20:20:20Z')
         );
 
-        $this->assertEquals(new \DateTimeImmutable('2020-02-20T02:02:01Z'), $scheduled->nextTo(new \DateTimeImmutable('2020-02-20T02:02:00Z')));
-        $this->assertEquals(new \DateTimeImmutable('2020-02-20T20:20:21Z'), $scheduled->nextTo(new \DateTimeImmutable('2020-02-20T02:02:02Z')));
-        $this->assertEquals(new \DateTimeImmutable('2020-02-20T20:20:21Z'), $scheduled->nextTo(new \DateTimeImmutable('2020-02-20T20:20:20Z')));
-        $this->assertEquals(new \DateTimeImmutable('2020-02-20T22:22:23Z'), $scheduled->nextTo(new \DateTimeImmutable('2020-02-20T22:22:22Z')));
+        $this->assertEquals(new \DateTimeImmutable('2020-02-20T02:02:01Z'), $scheduled->getNextRunDate(new \DateTimeImmutable('2020-02-20T02:02:00Z')));
+        $this->assertEquals(new \DateTimeImmutable('2020-02-20T20:20:21Z'), $scheduled->getNextRunDate(new \DateTimeImmutable('2020-02-20T02:02:02Z')));
+        $this->assertEquals(new \DateTimeImmutable('2020-02-20T20:20:21Z'), $scheduled->getNextRunDate(new \DateTimeImmutable('2020-02-20T20:20:20Z')));
+        $this->assertEquals(new \DateTimeImmutable('2020-02-20T22:22:23Z'), $scheduled->getNextRunDate(new \DateTimeImmutable('2020-02-20T22:22:22Z')));
     }
 }
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/OnceTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/OnceTriggerTest.php
deleted file mode 100644
index 2fd5d0ca729e7..0000000000000
--- a/src/Symfony/Component/Scheduler/Tests/Trigger/OnceTriggerTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Tests\Trigger;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Compone
10000
nt\Scheduler\Trigger\OnceTrigger;
-
-class OnceTriggerTest extends TestCase
-{
-    public function testNextTo()
-    {
-        $time = new \DateTimeImmutable('2020-02-20 20:00:00');
-        $schedule = new OnceTrigger($time);
-
-        $this->assertEquals($time, $schedule->nextTo(new \DateTimeImmutable('@0'), ''));
-        $this->assertEquals($time, $schedule->nextTo($time->modify('-1 sec'), ''));
-        $this->assertNull($schedule->nextTo($time, ''));
-        $this->assertNull($schedule->nextTo($time->modify('+1 sec'), ''));
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php
index ce998cd90988d..1157fd672febc 100644
--- a/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php
@@ -17,7 +17,15 @@
 
 class PeriodicalTriggerTest extends TestCase
 {
-    public function providerNextTo(): iterable
+    /**
+     * @dataProvider providerGetNextRunDate
+     */
+    public function testGetNextRunDate(PeriodicalTrigger $periodicalMessage, \DateTimeImmutable $lastRun, ?\DateTimeImmutable $expected)
+    {
+        $this->assertEquals($expected, $periodicalMessage->getNextRunDate($lastRun));
+    }
+
+    public static function providerGetNextRunDate(): iterable
     {
         $periodicalMessage = new PeriodicalTrigger(
             600,
@@ -79,14 +87,6 @@ public function providerNextTo(): iterable
         ];
     }
 
-    /**
-     * @dataProvider providerNextTo
-     */
-    public function testNextTo(PeriodicalTrigger $periodicalMessage, \DateTimeImmutable $lastRun, ?\DateTimeImmutable $expected)
-    {
-        $this->assertEquals($expected, $periodicalMessage->nextTo($lastRun));
-    }
-
     public function testConstructors()
     {
         $firstRun = new \DateTimeImmutable($now = '2222-02-22');
@@ -115,14 +115,6 @@ public function testTooBigInterval()
         PeriodicalTrigger::create(\PHP_INT_MAX.'0', new \DateTimeImmutable('2002-02-02'));
     }
 
-    public function getInvalidIntervals(): iterable
-    {
-        yield ['wrong'];
-        yield ['3600.5'];
-        yield [0];
-        yield [-3600];
-    }
-
     /**
      * @dataProvider getInvalidIntervals
      */
@@ -132,6 +124,14 @@ public function testInvalidInterval($interval)
         PeriodicalTrigger::create($interval, $now = new \DateTimeImmutable(), $now->modify('1 day'));
     }
 
+    public static function getInvalidIntervals(): iterable
+    {
+        yield ['wrong'];
+        yield ['3600.5'];
+        yield [0];
+        yield [-3600];
+    }
+
     public function testNegativeInterval()
     {
         $this->expectException(InvalidArgumentException::class);
diff --git a/src/Symfony/Component/Scheduler/Trigger/CallbackTrigger.php b/src/Symfony/Component/Scheduler/Trigger/CallbackTrigger.php
new file mode 100644
index 0000000000000..353d53d456a1c
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Trigger/CallbackTrigger.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Trigger;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental
+ */
+final class CallbackTrigger implements TriggerInterface
+{
+    private \Closure $callback;
+
+    public function __construct(callable $callback)
+    {
+        $this->callback = $callback(...);
+    }
+
+    public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
+    {
+        return ($this->callback)($run);
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
new file mode 100644
index 0000000000000..76f3fde5bdcd3
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Trigger;
+
+use Cron\CronExpression;
+use Symfony\Component\Scheduler\Exception\LogicException;
+
+/**
+ * Use cron expressions to describe a periodical trigger.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental
+ */
+final class CronExpressionTrigger implements TriggerInterface
+{
+    public function __construct(
+        private CronExpression $expression = new CronExpression('* * * * *'),
+    ) {
+    }
+
+    public static function fromSpec(string $expression = '* * * * *'): self
+    {
+        if (!class_exists(CronExpression::class)) {
+            throw new LogicException(sprintf('You cannot use "%s" as the "cron expression" package is not installed; try running "composer require dragonmantank/cron-expression".', __CLASS__));
+        }
+
+        return new self(new CronExpression($expression));
+    }
+
+    public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
+    {
+        return \DateTimeImmutable::createFromMutable($this->expression->getNextRunDate($run));
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php b/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php
index 9b8ade31ea894..abbafde6cf1c3 100644
--- a/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\Scheduler\Trigger;
 
+/**
+ * @experimental
+ */
 final class ExcludeTimeTrigger implements TriggerInterface
 {
     public function __construct(
@@ -20,11 +23,11 @@ public function __construct(
     ) {
     }
 
-    public function nextTo(\DateTimeImmutable $run): \DateTimeImmutable
+    public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
     {
-        $nextRun = $this->inner->nextTo($run);
+        $nextRun = $this->inner->getNextRunDate($run);
         if ($nextRun >= $this->from && $nextRun <= $this->to) {
-            return $this->inner->nextTo($this->to);
+            return $this->inner->getNextRunDate($this->to);
         }
 
         return $nextRun;
diff --git a/src/Symfony/Component/Scheduler/Trigger/OnceTrigger.php b/src/Symfony/Component/Scheduler/Trigger/OnceTrigger.php
deleted file mode 100644
index 4837fa6c64440..0000000000000
--- a/src/Symfony/Component/Scheduler/Trigger/OnceTrigger.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Trigger;
-
-final class OnceTrigger implements TriggerInterface
-{
-    public function __construct(
-        private readonly \DateTimeImmutable $time,
-    ) {
-    }
-
-    public function nextTo(\DateTimeImmutable $run): ?\DateTimeImmutable
-    {
-        return $run < $this->time ? $this->time : null;
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php b/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php
index 44a90828865fe..50d83acadf65f 100644
--- a/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php
@@ -13,21 +13,24 @@
 
 use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
 
+/**
+ * @experimental
+ */
 final class PeriodicalTrigger implements TriggerInterface
 {
     public function __construct(
         private readonly int $intervalInSeconds,
-        private readonly \DateTimeImmutable $firstRun,
-        private readonly \DateTimeImmutable $priorTo,
+        private readonly \DateTimeImmutable $firstRun = new \DateTimeImmutable(),
+        private readonly \DateTimeImmutable $priorTo = new \DateTimeImmutable('3000-01-01'),
     ) {
         if (0 >= $this->intervalInSeconds) {
-            throw new InvalidArgumentException('The `$intervalInSeconds` argument must be greater then zero.');
+            throw new InvalidArgumentException('The "$intervalInSeconds" argument must be greater then zero.');
         }
     }
 
     public static function create(
         string|int|\DateInterval $interval,
-        string|\DateTimeImmutable $firstRun,
+        string|\DateTimeImmutable $firstRun = new \DateTimeImmutable(),
         string|\DateTimeImmutable $priorTo = new \DateTimeImmutable('3000-01-01'),
     ): self {
         if (\is_string($firstRun)) {
@@ -67,6 +70,24 @@ public static function fromPeriod(\DatePeriod $period): self
         return new self($interval, $firstRun, $priorTo);
     }
 
+    public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
+    {
+        if ($this->firstRun > $run) {
+            return $this->firstRun;
+        }
+        if ($this->priorTo <= $run) {
+            return null;
+        }
+
+        $delta = $run->format('U.u') - $this->firstRun->format('U.u');
+        $recurrencesPassed = (int) ($delta / $this->intervalInSeconds);
+        $nextRunTimestamp = ($recurrencesPassed + 1) * $this->intervalInSeconds + $this->firstRun->getTimestamp();
+        /** @var \DateTimeImmutable $nextRun */
+        $nextRun = \DateTimeImmutable::createFromFormat('U.u', $nextRunTimestamp.$this->firstRun->format('.u'));
+
+        return $this->priorTo > $nextRun ? $nextRun : null;
+    }
+
     private static function calcInterval(\DateTimeImmutable $from, \DateTimeImmutable $to): int
     {
         if (8 <= \PHP_INT_SIZE) {
@@ -84,29 +105,7 @@ private static function calcInterval(\DateTimeImmutable $from, \DateTimeImmutabl
     private static function ensureIntervalSize(string|float $interval): void
     {
         if ($interval > \PHP_INT_MAX) {
-            throw new InvalidArgumentException('The interval for a periodical message is too big. If you need to run it once, use `$priorTo` argument.');
-        }
-    }
-
-    public function nextTo(\DateTimeImmutable $run): ?\DateTimeImmutable
-    {
-        if ($this->firstRun > $run) {
-            return $this->firstRun;
+            throw new InvalidArgumentException('The interval for a periodical message is too big. If you need to run it once, use "$priorTo" argument.');
         }
-        if ($this->priorTo <= $run) {
-            return null;
-        }
-
-        $delta = (float) $run->format('U.u') - (float) $this->firstRun->format('U.u');
-        $recurrencesPassed = (int) ($delta / $this->intervalInSeconds);
-        $nextRunTimestamp = ($recurrencesPassed + 1) * $this->intervalInSeconds + $this->firstRun->getTimestamp();
-        /** @var \DateTimeImmutable $nextRun */
-        $nextRun = \DateTimeImmutable::createFromFormat('U.u', $nextRunTimestamp.$this->firstRun->format('.u'));
-
-        if ($this->priorTo <= $nextRun) {
-            return null;
-        }
-
-        return $nextRun;
     }
 }
diff --git a/src/Symfony/Component/Scheduler/Trigger/TriggerInterface.php b/src/Symfony/Component/Scheduler/Trigger/TriggerInterface.php
index 787d7b9897f07..5fd07e9a610cb 100644
--- a/src/Symfony/Component/Scheduler/Trigger/TriggerInterface.php
+++ b/src/Symfony/Component/Scheduler/Trigger/TriggerInterface.php
@@ -11,7 +11,10 @@
 
 namespace Symfony\Component\Scheduler\Trigger;
 
+/**
+ * @experimental
+ */
 interface TriggerInterface
 {
-    public function nextTo(\DateTimeImmutable $run): ?\DateTimeImmutable;
+    public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable;
 }
diff --git a/src/Symfony/Component/Scheduler/composer.json b/src/Symfony/Component/Scheduler/composer.json
index e22183d38f1c9..308c79d42e070 100644
--- a/src/Symfony/Component/Scheduler/composer.json
+++ b/src/Symfony/Component/Scheduler/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "symfony/scheduler",
     "type": "library",
-    "description": "Provides basic scheduling through the Symfony Messenger",
+    "description": "Provides scheduling through Symfony Messenger",
     "keywords": ["scheduler", "schedule", "cron"],
     "homepage": "https://symfony.com",
     "license": "MIT",
@@ -10,6 +10,10 @@
             "name": "Sergey Rabochiy",
             "email": "upyx.00@gmail.com"
         },
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        },
         {
             "name": "Symfony Community",
             "homepage": "https://symfony.com/contributors"
@@ -17,20 +21,14 @@
     ],
     "require": {
         "php": ">=8.1",
-        "psr/clock-implementation": "^1.0",
-        "psr/container-implementation": "^1.1|^2.0",
-        "symfony/cache-implementation": "^1.1|^2.0|^3.0",
-        "symfony/messenger": "^5.4|^6.0"
+        "symfony/clock": "^6.3"
     },
     "require-dev": {
+        "dragonmantank/cron-expression": "^3",
         "symfony/cache": "^5.4|^6.0",
-        "symfony/clock": "^6.2",
         "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/lock": "^5.4|^6.0"
-    },
-    "suggest": {
-        "symfony/cache": "For saving state between restarts.",
-        "symfony/lock": "For preventing workers race."
+        "symfony/lock": "^5.4|^6.0",
+        "symfony/messenger": "^6.3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Scheduler\\": "" },

From 2d74a76b023079e24e3e8831a272a2fe8b6596e1 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 8 Mar 2023 14:39:23 +0100
Subject: [PATCH 295/475] [DependencyInjection] Add support for generating lazy
 closures

---
 .../Argument/LazyClosure.php                  | 60 ++++++++++++++++++
 .../DependencyInjection/CHANGELOG.md          |  1 +
 .../DependencyInjection/ContainerBuilder.php  | 34 +++++++++-
 .../DependencyInjection/Dumper/PhpDumper.php  | 21 +++++++
 .../Tests/ContainerBuilderTest.php            | 19 ++++++
 .../Tests/Dumper/PhpDumperTest.php            | 26 ++++++++
 .../Fixtures/includes/autowiring_classes.php  |  6 +-
 .../Tests/Fixtures/php/lazy_closure.php       | 62 +++++++++++++++++++
 8 files changed, 225 insertions(+), 4 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_closure.php

diff --git a/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php b/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php
new file mode 100644
index 0000000000000..7b001352ac8bd
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Argument;
+
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\VarExporter\ProxyHelper;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class LazyClosure
+{
+    public readonly object $service;
+
+    public function __construct(
+        private \Closure $initializer,
+    ) {
+        unset($this->service);
+    }
+
+    public function __get(mixed $name): mixed
+    {
+        if ('service' !== $name) {
+            throw new InvalidArgumentException(sprintf('Cannot read property "%s" from a lazy closure.', $name));
+        }
+
+        if (isset($this->initializer)) {
+            $this->service = ($this->initializer)();
+            unset($this->initializer);
+        }
+
+        return $this->service;
+    }
+
+    public static function getCode(string $initializer, ?\ReflectionClass $r, string $method, ?string $id): string
+    {
+        if (!$r || !$r->hasMethod($method)) {
+            throw new RuntimeException(sprintf('Cannot create lazy closure for service "%s" because its corresponding callable is invalid.', $id));
+        }
+
+        $signature = ProxyHelper::exportSignature($r->getMethod($method));
+        $signature = preg_replace('/: static$/', ': \\'.$r->name, $signature);
+
+        return '(new class('.$initializer.') extends \\'.self::class.' { '
+            .$signature.' { return $this->service->'.$method.'(...\func_get_args()); } '
+            .'})->'.$method.'(...)';
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 59be45c99780d..d4b14d68d43a9 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -15,6 +15,7 @@ CHANGELOG
  * Allow to trim XML service parameters value by using `trim="true"` attribute
  * Allow extending the `Autowire` attribute
  * Add `#[Exclude]` to skip autoregistering a class
+ * Add support for generating lazy closures
  * Add support for autowiring services as closures using `#[AutowireCallable]` or `#[AutowireServiceClosure]`
  * Deprecate `#[MapDecorated]`, use `#[AutowireDecorated]` instead
  * Deprecate the `@required` annotation, use the `Symfony\Contracts\Service\Attribute\Required` attribute instead
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index e920980b286e7..57c0234725f7c 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -22,6 +22,7 @@
 use Symfony\Component\Config\Resource\ResourceInterface;
 use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\LazyClosure;
 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocator;
@@ -1050,13 +1051,40 @@ private function createService(Definition $definition, array &$inlineServices, b
         }
 
         $parameterBag = $this->getParameterBag();
+        $class = ($parameterBag->resolveValue($definition->getClass()) ?: (['Closure', 'fromCallable'] === $definition->getFactory() ? 'Closure' : null));
 
-        if (true === $tryProxy && $definition->isLazy() && !$tryProxy = !($proxy = $this->proxyInstantiator ??= new LazyServiceInstantiator()) || $proxy instanceof RealServiceInstantiator) {
+        if ('Closure' === $class && $definition->isLazy() && ['Closure', 'fromCallable'] === $definition->getFactory()) {
+            $callable = $parameterBag->unescapeValue($parameterBag->resolveValue($definition->getArgument(0)));
+
+            if ($callable instanceof Reference || $callable instanceof Definition) {
+                $callable = [$callable, '__invoke'];
+            }
+
+            if (\is_array($callable) && (
+                $callable[0] instanceof Reference
+                || $callable[0] instanceof Definition && !isset($inlineServices[spl_object_hash($callable[0])])
+            )) {
+                $containerRef = $this->containerRef ??= \WeakReference::create($this);
+                $class = ($callable[0] instanceof Reference ? $this->findDefinition($callable[0]) : $callable[0])->getClass();
+                $initializer = static function () use ($containerRef, $callable, &$inlineServices) {
+                    return $containerRef->get()->doResolveServices($callable[0], $inlineServices);
+                };
+
+                $proxy = eval('return '.LazyClosure::getCode('$initializer', $this->getReflectionClass($class), $callable[1], $id).';');
+                $this->shareService($definition, $proxy, $id, $inlineServices);
+
+                return $proxy;
+            }
+        }
+
+        if (true === $tryProxy && $definition->isLazy() && 'Closure' !== $class
+            && !$tryProxy = !($proxy = $this->proxyInstantiator ??= new LazyServiceInstantiator()) || $proxy instanceof RealServiceInstantiator
+        ) {
             $containerRef = $this->containerRef ??= \WeakReference::create($this);
             $proxy = $proxy->instantiateProxy(
                 $this,
                 (clone $definition)
-                    ->setClass($parameterBag->resolveValue($definition->getClass()))
+                    ->setClass($class)
                     ->setTags(($definition->hasTag('proxy') ? ['proxy' => $parameterBag->resolveValue($definition->getTag('proxy'))] : []) + $definition->getTags()),
                 $id, static function ($proxy = false) use ($containerRef, $definition, &$inlineServices, $id) {
                     return $containerRef->get()->createService($definition, $inlineServices, true, $id, $proxy);
@@ -1105,7 +1133,7 @@ private function createService(Definition $definition, array &$inlineServices, b
                 }
             }
         } else {
-            $r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass()));
+            $r = new \ReflectionClass($class);
 
             if (\is_object($tryProxy)) {
                 if ($r->getConstructor()) {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index b7ded580ebaf6..7f8054675a749 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -15,6 +15,7 @@
 use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
 use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Argument\LazyClosure;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocator;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
@@ -1179,6 +1180,22 @@ private function addNewInstance(Definition $definition, string $return = '', str
                     throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s).', $callable[1] ?: 'n/a'));
                 }
 
+                if (['...'] === $arguments && $definition->isLazy() && 'Closure' === ($definition->getClass() ?? 'Closure') && (
+                    $callable[0] instanceof Reference
+                    || ($callable[0] instanceof Definition && !$this->definitionVariables->contains($callable[0]))
+                )) {
+                    $class = ($callable[0] instanceof Reference ? $this->container->findDefinition($callable[0]) : $callable[0])->getClass();
+
+                    if (str_contains($initializer = $this->dumpValue($callable[0]), '$container')) {
+                        $this->addContainerRef = true;
+                        $initializer = sprintf('function () use ($containerRef) { $container = $containerRef; return %s; }', $initializer);
+                    } else {
+                        $initializer = 'fn () => '.$initializer;
+                    }
+
+                    return $return.LazyClosure::getCode($initializer, $this->container->getReflectionClass($class), $callable[1], $id).$tail;
+                }
+
                 if ($callable[0] instanceof Reference
                     || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))
                 ) {
@@ -2327,6 +2344,10 @@ private function isProxyCandidate(Definition $definition, ?bool &$asGhostObject,
     {
         $asGhostObject = false;
 
+        if ('Closure' === ($definition->getClass() ?: (['Closure', 'fromCallable'] === $definition->getFactory() ? 'Closure' : null))) {
+            return null;
+        }
+
         if (!$definition->isLazy() || !$this->hasProxyDumper) {
             return null;
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index 4ec0624b86288..1491e8843687e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -1985,6 +1985,25 @@ public function testNamedArgumentBeforeCompile()
 
         $this->assertSame(1, $e->first);
     }
+
+    public function testLazyClosure()
+    {
+        $container = new ContainerBuilder();
+        $container->register('closure', 'Closure')
+            ->setPublic('true')
+            ->setFactory(['Closure', 'fromCallable'])
+            ->setLazy(true)
+            ->setArguments([[new Reference('foo'), 'cloneFoo']]);
+        $container->register('foo', Foo::class);
+        $container->compile();
+
+        $cloned = Foo::$counter;
+        $this->assertInstanceOf(\Closure::class, $container->get('closure'));
+        $this->assertSame($cloned, Foo::$counter);
+        $this->assertInstanceOf(Foo::class, $container->get('closure')());
+        $this->assertSame(1 + $cloned, Foo::$counter);
+        $this->assertSame(1, (new \ReflectionFunction($container->get('closure')))->getNumberOfParameters());
+    }
 }
 
 class FooClass
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 1cc9d514fc37a..9eb3f40eb338e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -1719,6 +1719,32 @@ public function testAutowireClosure()
         $this->assertInstanceOf(Foo::class, $fooClone = ($bar->buz)());
         $this->assertNotSame($container->get('foo'), $fooClone);
     }
+
+    public function testLazyClosure()
+    {
+        $container = new ContainerBuilder();
+        $container->register('closure', 'Closure')
+            ->setPublic('true')
+            ->setFactory(['Closure', 'fromCallable'])
+            ->setLazy(true)
+            ->setArguments([[new Reference('foo'), 'cloneFoo']]);
+        $container->register('foo', Foo::class);
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/lazy_closure.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Lazy_Closure']));
+
+        require self::$fixturesPath.'/php/lazy_closure.php';
+
+        $container = new \Symfony_DI_PhpDumper_Test_Lazy_Closure();
+
+        $cloned = Foo::$counter;
+        $this->assertInstanceOf(\Closure::class, $container->get('closure'));
+        $this->assertSame($cloned, Foo::$counter);
+        $this->assertInstanceOf(Foo::class, $container->get('closure')());
+        $this->assertSame(1 + $cloned, Foo::$counter);
+        $this->assertSame(1, (new \ReflectionFunction($container->get('closure')))->getNumberOfParameters());
+    }
 }
 
 class Rot13EnvVarProcessor implements EnvVarProcessorInterface
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
index 70c46ecb4fe64..edbf86bafe6c3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -26,9 +26,13 @@ public function cloneFoo(): static
 
 class Foo
 {
+    public static int $counter = 0;
+
     #[Required]
-    public function cloneFoo(): static
+    public function cloneFoo(\stdClass $bar = null): static
     {
+        ++self::$counter;
+
         return clone $this;
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_closure.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_closure.php
new file mode 100644
index 0000000000000..e7783b6f90a1a
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_closure.php
@@ -0,0 +1,62 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class Symfony_DI_PhpDumper_Test_Lazy_Closure extends Container
+{
+    protected $parameters = [];
+    protected readonly \WeakReference $ref;
+
+    public function __construct()
+    {
+        $this->ref = \WeakReference::create($this);
+        $this->services = $this->privates = [];
+        $this->methodMap = [
+            'closure' => 'getClosureService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function compile(): void
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled(): bool
+    {
+        return true;
+    }
+
+    public function getRemovedIds(): array
+    {
+        return [
+            'foo' => true,
+        ];
+    }
+
+    protected function createProxy($class, \Closure $factory)
+    {
+        return $factory();
+    }
+
+    /**
+     * Gets the public 'closure' shared service.
+     *
+     * @return \Closure
+     */
+    protected static function getClosureService($container, $lazyLoad = true)
+    {
+        return $container->services['closure'] = (new class(fn () => new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo()) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure { public function cloneFoo(?\stdClass $bar = null): \Symfony\Component\DependencyInjection\Tests\Compiler\Foo { return $this->service->cloneFoo(...\func_get_args()); } })->cloneFoo(...);
+    }
+}

From 20ab567385e3812ef661dae01a1fdc5d1bde2666 Mon Sep 17 00:00:00 2001
From: Simon Berger <simon_-berger@web.de>
Date: Wed, 15 Mar 2023 13:51:05 +0100
Subject: [PATCH 296/475] [FrameworkBundle] Add scoped httplug clients and
 deprecate httplugs use like psr18 client

---
 UPGRADE-6.3.md                                     |  1 +
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md    |  2 ++
 .../DependencyInjection/FrameworkExtension.php     | 14 ++++++++++++--
 .../Resources/config/http_client.php               |  7 ++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 914f9b677eda6..59861f7b7785f 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -56,6 +56,7 @@ FrameworkBundle
 ---------------
 
  * Deprecate the `notifier.logger_notification_listener` service, use the `notifier.notification_logger_listener` service instead
+ * Deprecate the `Http\Client\HttpClient` service, use `Psr\Http\Client\ClientInterface` instead
 
 HttpFoundation
 --------------
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index f11f5fe12e25e..4702ca267dfd9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -18,6 +18,8 @@ CHANGELOG
  * Add `framework.http_cache.skip_response_headers` option
  * Display warmers duration on debug verbosity for `cache:clear` command
  * Add `AbstractController::sendEarlyHints()` to send HTTP Early Hints
+ * Add autowiring aliases for `Http\Client\HttpAsyncClient`
+ * Deprecate the `Http\Client\HttpClient` service, use `Psr\Http\Client\ClientInterface` instead
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 131e9e8c2c723..baf0d3b3bff61 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -13,6 +13,7 @@
 
 use Composer\InstalledVersions;
 use Doctrine\Common\Annotations\Reader;
+use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
 use phpDocumentor\Reflection\DocBlockFactoryInterface;
 use phpDocumentor\Reflection\Types\ContextFactory;
@@ -2354,8 +2355,10 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
             $container->removeAlias(ClientInterface::class);
         }
 
-        if (!ContainerBuilder::willBeAvailable('php-http/httplug', HttpClient::class, ['symfony/framework-bundle', 'symfony/http-client'])) {
-            $container->removeDefinition(HttpClient::class);
+        if (!$hasHttplug = ContainerBuilder::willBeAvailable('php-http/httplug', HttpAsyncClient::class, ['symfony/framework-bundle', 'symfony/http-client'])) {
+            $container->removeDefinition('httplug.http_client');
+            $container->removeAlias(HttpAsyncClient::class);
+            $container->removeAlias(HttpClient::class);
         }
 
         if ($this->readConfigEnabled('http_client.retry_failed', $container, $retryOptions)) {
@@ -2425,6 +2428,13 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
 
                 $container->registerAliasForArgument('psr18.'.$name, ClientInterface::class, $name);
             }
+
+            if ($hasHttplug) {
+                $container->setDefinition('httplug.'.$name, new ChildDefinition('httplug.http_client'))
+                    ->replaceArgument(0, new Reference($name));
+
+                $container->registerAliasForArgument('httplug.'.$name, HttpAsyncClient::class, $name);
+            }
         }
 
         if ($responseFactoryId = $config['mock_response_factory'] ?? null) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php
index 93d4665750ac1..23b794f45b2dd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use Http\Client\HttpAsyncClient;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
@@ -49,13 +50,17 @@
 
         ->alias(ClientInterface::class, 'psr18.http_client')
 
-        ->set(\Http\Client\HttpClient::class, HttplugClient::class)
+        ->set('httplug.http_client', HttplugClient::class)
             ->args([
                 service('http_client'),
                 service(ResponseFactoryInterface::class)->ignoreOnInvalid(),
                 service(StreamFactoryInterface::class)->ignoreOnInvalid(),
             ])
 
+        ->alias(HttpAsyncClient::class, 'httplug.http_client')
+        ->alias(\Http\Client\HttpClient::class, 'httplug.http_client')
+            ->deprecate('symfony/framework-bundle', '6.3', 'The "%alias_id%" service is deprecated, use "'.ClientInterface::class.'" instead.')
+
         ->set('http_client.abstract_retry_strategy', GenericRetryStrategy::class)
             ->abstract()
             ->args([

From bb8b73ea2205324da7537f51c0cef8ae10dfa24f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Thu, 16 Mar 2023 17:33:14 +0100
Subject: [PATCH 297/475] [ErrorHandler] Fixed tests

---
 .../ErrorHandler/Tests/Exception/FlattenExceptionTest.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
index 73d419ad4cd58..2faa25057b039 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
@@ -209,6 +209,7 @@ public function testToArray(\Throwable $exception, string $expectedClass)
                     'namespace' => '', 'short_class' => '', 'class' => '', 'type' => '', 'function' => '', 'file' => 'foo.php', 'line' => 123,
                     'args' => [],
                 ]],
+                'properties' => [],
             ],
         ], $flattened->toArray());
     }

From 9fc7cf53dd0f84cfb4bc563b6cd4e75800ca223c Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 17 Mar 2023 09:49:33 +0100
Subject: [PATCH 298/475] [Scheduler] Fix some minor bugs

---
 .../Component/Scheduler/Generator/MessageGenerator.php   | 3 +++
 .../Scheduler/Generator/MessageGeneratorInterface.php    | 3 +++
 src/Symfony/Component/Scheduler/RecurringMessage.php     | 9 +++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php b/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
index 3643631cd29ce..41cfa10c7ad85 100644
--- a/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
+++ b/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
@@ -52,6 +52,9 @@ public function getMessages(): \Generator
 
         while (!$heap->isEmpty() && $heap->top()[0] <= $now) {
             /** @var TriggerInterface $trigger */
+            /** @var int $index */
+            /** @var \DateTimeImmutable $time */
+            /** @var object $message */
             [$time, $index, $trigger, $message] = $heap->extract();
             $yield = true;
 
diff --git a/src/Symfony/Component/Scheduler/Generator/MessageGeneratorInterface.php b/src/Symfony/Component/Scheduler/Generator/MessageGeneratorInterface.php
index 0ee6483f974b1..8b2f7eeacc4ce 100644
--- a/src/Symfony/Component/Scheduler/Generator/MessageGeneratorInterface.php
+++ b/src/Symfony/Component/Scheduler/Generator/MessageGeneratorInterface.php
@@ -16,5 +16,8 @@
  */
 interface MessageGeneratorInterface
 {
+    /**
+     * @return iterable<object>
+     */
     public function getMessages(): iterable;
 }
diff --git a/src/Symfony/Component/Scheduler/RecurringMessage.php b/src/Symfony/Component/Scheduler/RecurringMessage.php
index 173c65aa4196a..e2499c0a6e497 100644
--- a/src/Symfony/Component/Scheduler/RecurringMessage.php
+++ b/src/Symfony/Component/Scheduler/RecurringMessage.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Scheduler;
 
+use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
 use Symfony\Component\Scheduler\Trigger\CronExpressionTrigger;
 use Symfony\Component\Scheduler\Trigger\PeriodicalTrigger;
 use Symfony\Component\Scheduler\Trigger\TriggerInterface;
@@ -31,9 +32,13 @@ private function __construct(
      *
      * @see https://php.net/datetime.formats.relative
      */
-    public static function every(string $frequency, object $message, \DateTimeImmutable $from = new \DateTimeImmutable(), ?\DateTimeImmutable $until = new \DateTimeImmutable('3000-01-01')): self
+    public static function every(string $frequency, object $message, \DateTimeImmutable $from = new \DateTimeImmutable(), \DateTimeImmutable $until = new \DateTimeImmutable('3000-01-01')): self
     {
-        return new self(PeriodicalTrigger::create(\DateInterval::createFromDateString($frequency), $from, $until), $message);
+        if (false === $interval = \DateInterval::createFromDateString($frequency)) {
+            throw new InvalidArgumentException(sprintf('Frequency "%s" cannot be parsed.', $frequency));
+        }
+
+        return new self(PeriodicalTrigger::create($interval, $from, $until), $message);
     }
 
     public static function cron(string $expression, object $message): self

From 172f0a775e87684fd0b042ff52eb00a061550d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= <jerome@tamarelle.net>
Date: Tue, 6 Dec 2022 22:51:24 +0100
Subject: [PATCH 299/475] [HttpFoundation] Add `ParameterBag::getString()` and
 deprecate accepting invalid values

---
 UPGRADE-6.3.md                                |   6 +
 .../Component/HttpFoundation/CHANGELOG.md     |   4 +
 .../Component/HttpFoundation/InputBag.php     |  27 ++-
 .../Component/HttpFoundation/ParameterBag.php |  50 +++++-
 .../HttpFoundation/Tests/InputBagTest.php     |  85 +++++++++
 .../HttpFoundation/Tests/ParameterBagTest.php | 165 ++++++++++++++++--
 6 files changed, 311 insertions(+), 26 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 59861f7b7785f..166040bd3d54e 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -63,6 +63,12 @@ HttpFoundation
 
  * `Response::sendHeaders()` now takes an optional `$statusCode` parameter
 
+HttpFoundation
+--------------
+
+ * Deprecate conversion of invalid values in `ParameterBag::getInt()` and `ParameterBag::getBoolean()`
+ * Deprecate ignoring invalid values when using `ParameterBag::filter()`, unless flag `FILTER_NULL_ON_FAILURE` is set
+
 HttpKernel
 ----------
 
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index 9b2c0bcf4e4cf..7b6a048882642 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -4,10 +4,14 @@ CHANGELOG
 6.3
 ---
 
+ * Calling `ParameterBag::getDigit()`, `getAlnum()`, `getAlpha()` on an `array` throws a `UnexpectedValueException` instead of a `TypeError`
+ * Add `ParameterBag::getString()` to convert a parameter into string and throw an exception if the value is invalid
  * Add `ParameterBag::getEnum()`
  * Create migration for session table when pdo handler is used
  * Add support for Relay PHP extension for Redis
  * The `Response::sendHeaders()` method now takes an optional HTTP status code as parameter, allowing to send informational responses such as Early Hints responses (103 status code)
+ * Deprecate conversion of invalid values in `ParameterBag::getInt()` and `ParameterBag::getBoolean()`,
+ * Deprecate ignoring invalid values when using `ParameterBag::filter()`, unless flag `FILTER_NULL_ON_FAILURE` is set
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpFoundation/InputBag.php b/src/Symfony/Component/HttpFoundation/InputBag.php
index d0e069b505c11..77990f5711ece 100644
--- a/src/Symfony/Component/HttpFoundation/InputBag.php
+++ b/src/Symfony/Component/HttpFoundation/InputBag.php
@@ -92,6 +92,15 @@ public function getEnum(string $key, string $class, \BackedEnum $default = null)
         }
     }
 
+    /**
+     * Returns the parameter value converted to string.
+     */
+    public function getString(string $key, string $default = ''): string
+    {
+        // Shortcuts the parent method because the validation on scalar is already done in get().
+        return (string) $this->get($key, $default);
+    }
+
     public function filter(string $key, mixed $default = null, int $filter = \FILTER_DEFAULT, mixed $options = []): mixed
     {
         $value = $this->has($key) ? $this->all()[$key] : $default;
@@ -109,6 +118,22 @@ public function filter(string $key, mixed $default = null, int $filter = \FILTER
             throw new \InvalidArgumentException(sprintf('A Closure must be passed to "%s()" when FILTER_CALLBACK is used, "%s" given.', __METHOD__, get_debug_type($options['options'] ?? null)));
         }
 
-        return filter_var($value, $filter, $options);
+        $options['flags'] ??= 0;
+        $nullOnFailure = $options['flags'] & \FILTER_NULL_ON_FAILURE;
+        $options['flags'] |= \FILTER_NULL_ON_FAILURE;
+
+        $value = filter_var($value, $filter, $options);
+
+        if (null !== $value || $nullOnFailure) {
+            return $value;
+        }
+
+        $method = debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS | \DEBUG_BACKTRACE_PROVIDE_OBJECT, 2)[1];
+        $method = ($method['object'] ?? null) === $this ? $method['function'] : 'filter';
+        $hint = 'filter' === $method ? 'pass' : 'use method "filter()" with';
+
+        trigger_deprecation('symfony/http-foundation', '6.3', 'Ignoring invalid values when using "%s::%s(\'%s\')" is deprecated and will throw a "%s" in 7.0; '.$hint.' flag "FILTER_NULL_ON_FAILURE" to keep ignoring them.', $this::class, $method, $key, BadRequestException::class);
+
+        return false;
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
index 44d8d96d28213..9d7012de35d30 100644
--- a/src/Symfony/Component/HttpFoundation/ParameterBag.php
+++ b/src/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -114,7 +114,7 @@ public function remove(string $key)
      */
     public function getAlpha(string $key, string $default = ''): string
     {
-        return preg_replace('/[^[:alpha:]]/', '', $this->get($key, $default));
+        return preg_replace('/[^[:alpha:]]/', '', $this->getString($key, $default));
     }
 
     /**
@@ -122,7 +122,7 @@ public function getAlpha(string $key, string $default = ''): string
      */
     public function getAlnum(string $key, string $default = ''): string
     {
-        return preg_replace('/[^[:alnum:]]/', '', $this->get($key, $default));
+        return preg_replace('/[^[:alnum:]]/', '', $this->getString($key, $default));
     }
 
     /**
@@ -130,8 +130,20 @@ public function getAlnum(string $key, string $default = ''): string
      */
     public function getDigits(string $key, string $default = ''): string
     {
-        // we need to remove - and + because they're allowed in the filter
-        return str_replace(['-', '+'], '', $this->filter($key, $default, \FILTER_SANITIZE_NUMBER_INT));
+        return preg_replace('/[^[:digit:]]/', '', $this->getString($key, $default));
+    }
+
+    /**
+     * Returns the parameter as string.
+     */
+    public function getString(string $key, string $default = ''): string
+    {
+        $value = $this->get($key, $default);
+        if (!\is_scalar($value) && !$value instanceof \Stringable) {
+            throw new \UnexpectedValueException(sprintf('Parameter value "%s" cannot be converted to "string".', $key));
+        }
+
+        return (string) $value;
     }
 
     /**
@@ -139,7 +151,8 @@ public function getDigits(string $key, string $default = ''): string
      */
     public function getInt(string $key, int $default = 0): int
     {
-        return (int) $this->get($key, $default);
+        // In 7.0 remove the fallback to 0, in case of failure an exception will be thrown
+        return $this->filter($key, $default, \FILTER_VALIDATE_INT, ['flags' => \FILTER_REQUIRE_SCALAR]) ?: 0;
     }
 
     /**
@@ -147,7 +160,7 @@ public function getInt(string $key, int $default = 0): int
      */
     public function getBoolean(string $key, bool $default = false): bool
     {
-        return $this->filter($key, $default, \FILTER_VALIDATE_BOOL);
+        return $this->filter($key, $default, \FILTER_VALIDATE_BOOL, ['flags' => \FILTER_REQUIRE_SCALAR]);
     }
 
     /**
@@ -178,7 +191,8 @@ public function getEnum(string $key, string $class, \BackedEnum $default = null)
     /**
      * Filter key.
      *
-     * @param int $filter FILTER_* constant
+     * @param int                                     $filter  FILTER_* constant
+     * @param int|array{flags?: int, options?: array} $options Flags from FILTER_* constants
      *
      * @see https://php.net/filter-var
      */
@@ -196,11 +210,31 @@ public function filter(string $key, mixed $default = null, int $filter = \FILTER
             $options['flags'] = \FILTER_REQUIRE_ARRAY;
         }
 
+        if (\is_object($value) && !$value instanceof \Stringable) {
+            throw new \UnexpectedValueException(sprintf('Parameter value "%s" cannot be filtered.', $key));
+        }
+
         if ((\FILTER_CALLBACK & $filter) && !(($options['options'] ?? null) instanceof \Closure)) {
             throw new \InvalidArgumentException(sprintf('A Closure must be passed to "%s()" when FILTER_CALLBACK is used, "%s" given.', __METHOD__, get_debug_type($options['options'] ?? null)));
         }
 
-        return filter_var($value, $filter, $options);
+        $options['flags'] ??= 0;
+        $nullOnFailure = $options['flags'] & \FILTER_NULL_ON_FAILURE;
+        $options['flags'] |= \FILTER_NULL_ON_FAILURE;
+
+        $value = filter_var($value, $filter, $options);
+
+        if (null !== $value || $nullOnFailure) {
+            return $value;
+        }
+
+        $method = debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS | \DEBUG_BACKTRACE_PROVIDE_OBJECT, 2)[1];
+        $method = ($method['object'] ?? null) === $this ? $method['function'] : 'filter';
+        $hint = 'filter' === $method ? 'pass' : 'use method "filter()" with';
+
+        trigger_deprecation('symfony/http-foundation', '6.3', 'Ignoring invalid values when using "%s::%s(\'%s\')" is deprecated and will throw an "%s" in 7.0; '.$hint.' flag "FILTER_NULL_ON_FAILURE" to keep ignoring them.', $this::class, $method, $key, \UnexpectedValueException::class);
+
+        return false;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php
index cdcdb3d0bd979..6a447a39ccd23 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/InputBagTest.php
@@ -12,12 +12,15 @@
 namespace Symfony\Component\HttpFoundation\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\Tests\Fixtures\FooEnum;
 
 class InputBagTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     public function testGet()
     {
         $bag = new InputBag(['foo' => 'bar', 'null' => null, 'int' => 1, 'float' => 1.0, 'bool' => false, 'stringable' => new class() implements \Stringable {
@@ -36,6 +39,58 @@ public function __toString(): string
         $this->assertFalse($bag->get('bool'), '->get() gets the value of a bool parameter');
     }
 
+    /**
+     * @group legacy
+     */
+    public function testGetIntError()
+    {
+        $this->expectDeprecation('Since symfony/http-foundation 6.3: Ignoring invalid values when using "Symfony\Component\HttpFoundation\InputBag::getInt(\'foo\')" is deprecated and will throw a "Symfony\Component\HttpFoundation\Exception\BadRequestException" in 7.0; use method "filter()" with flag "FILTER_NULL_ON_FAILURE" to keep ignoring them.');
+
+        $bag = new InputBag(['foo' => 'bar']);
+        $result = $bag->getInt('foo');
+        $this->assertSame(0, $result);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testGetBooleanError()
+    {
+        $this->expectDeprecation('Since symfony/http-foundation 6.3: Ignoring invalid values when using "Symfony\Component\HttpFoundation\InputBag::getBoolean(\'foo\')" is deprecated and will throw a "Symfony\Component\HttpFoundation\Exception\BadRequestException" in 7.0; use method "filter()" with flag "FILTER_NULL_ON_FAILURE" to keep ignoring them.');
+
+        $bag = new InputBag(['foo' => 'bar']);
+        $result = $bag->getBoolean('foo');
+        $this->assertFalse($result);
+    }
+
+    public function testGetString()
+    {
+        $bag = new InputBag(['integer' => 123, 'bool_true' => true, 'bool_false' => false, 'string' => 'abc', 'stringable' => new class() implements \Stringable {
+            public function __toString(): string
+            {
+                return 'strval';
+            }
+        }]);
+
+        $this->assertSame('123', $bag->getString('integer'), '->getString() gets a value of parameter as string');
+        $this->assertSame('abc', $bag->getString('string'), '->getString() gets a value of parameter as string');
+        $this->assertSame('', $bag->getString('unknown'), '->getString() returns zero if a parameter is not defined');
+        $this->assertSame('foo', $bag->getString('unknown', 'foo'), '->getString() returns the default if a parameter is not defined');
+        $this->assertSame('1', $bag->getString('bool_true'), '->getString() returns "1" if a parameter is true');
+        $this->assertSame('', $bag->getString('bool_false', 'foo'), '->getString() returns an empty empty string if a parameter is false');
+        $this->assertSame('strval', $bag->getString('stringable'), '->getString() gets a value of a stringable paramater as string');
+    }
+
+    public function testGetStringExceptionWithArray()
+    {
+        $bag = new InputBag(['key' => ['abc']]);
+
+        $this->expectException(BadRequestException::class);
+        $this->expectExceptionMessage('Input value "key" contains a non-scalar value.');
+
+        $bag->getString('key');
+    }
+
     public function testGetDoesNotUseDeepByDefault()
     {
         $bag = new InputBag(['foo' => ['bar' => 'moo']]);
@@ -126,4 +181,34 @@ public function testGetEnumThrowsExceptionWithInvalidValue()
 
         $this->assertNull($bag->getEnum('invalid-value', FooEnum::class));
     }
+
+    public function testGetAlnumExceptionWithArray()
+    {
+        $bag = new InputBag(['word' => ['foo_BAR_012']]);
+
+        $this->expectException(BadRequestException::class);
+        $this->expectExceptionMessage('Input value "word" contains a non-scalar value.');
+
+        $bag->getAlnum('word');
+    }
+
+    public function testGetAlphaExceptionWithArray()
+    {
+        $bag = new InputBag(['word' => ['foo_BAR_012']]);
+
+        $this->expectException(BadRequestException::class);
+        $this->expectExceptionMessage('Input value "word" contains a non-scalar value.');
+
+        $bag->getAlpha('word');
+    }
+
+    public function testGetDigitsExceptionWithArray()
+    {
+        $bag = new InputBag(['word' => ['foo_BAR_012']]);
+
+        $this->expectException(BadRequestException::class);
+        $this->expectExceptionMessage('Input value "word" contains a non-scalar value.');
+
+        $bag->getDigits('word');
+    }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
index b5f7e60068611..62b95f42f4573 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
@@ -12,12 +12,15 @@
 namespace Symfony\Component\HttpFoundation\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Tests\Fixtures\FooEnum;
 
 class ParameterBagTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     public function testConstructor()
     {
         $this->testAll();
@@ -112,34 +115,137 @@ public function testHas()
 
     public function testGetAlpha()
     {
-        $bag = new ParameterBag(['word' => 'foo_BAR_012']);
+        $bag = new ParameterBag(['word' => 'foo_BAR_012', 'bool' => true, 'integer' => 123]);
+
+        $this->assertSame('fooBAR', $bag->getAlpha('word'), '->getAlpha() gets only alphabetic characters');
+        $this->assertSame('', $bag->getAlpha('unknown'), '->getAlpha() returns empty string if a parameter is not defined');
+        $this->assertSame('abcDEF', $bag->getAlpha('unknown', 'abc_DEF_012'), '->getAlpha() returns filtered default if a parameter is not defined');
+        $this->assertSame('', $bag->getAlpha('integer', 'abc_DEF_012'), '->getAlpha() returns empty string if a parameter is an integer');
+        $this->assertSame('', $bag->getAlpha('bool', 'abc_DEF_012'), '->getAlpha() returns empty string if a parameter is a boolean');
+    }
+
+    public function testGetAlphaExceptionWithArray()
+    {
+        $bag = new ParameterBag(['word' => ['foo_BAR_012']]);
+
+        $this->expectException(\UnexpectedValueException::class);
+        $this->expectExceptionMessage('Parameter value "word" cannot be converted to "string".');
 
-        $this->assertEquals('fooBAR', $bag->getAlpha('word'), '->getAlpha() gets only alphabetic characters');
-        $this->assertEquals('', $bag->getAlpha('unknown'), '->getAlpha() returns empty string if a parameter is not defined');
+        $bag->getAlpha('word');
     }
 
     public function testGetAlnum()
     {
-        $bag = new ParameterBag(['word' => 'foo_BAR_012']);
+        $bag = new ParameterBag(['word' => 'foo_BAR_012', 'bool' => true, 'integer' => 123]);
+
+        $this->assertSame('fooBAR012', $bag->getAlnum('word'), '->getAlnum() gets only alphanumeric characters');
+        $this->assertSame('', $bag->getAlnum('unknown'), '->getAlnum() returns empty string if a parameter is not defined');
+        $this->assertSame('abcDEF012', $bag->getAlnum('unknown', 'abc_DEF_012'), '->getAlnum() returns filtered default if a parameter is not defined');
+        $this->assertSame('123', $bag->getAlnum('integer', 'abc_DEF_012'), '->getAlnum() returns the number as string if a parameter is an integer');
+        $this->assertSame('1', $bag->getAlnum('bool', 'abc_DEF_012'), '->getAlnum() returns 1 if a parameter is true');
+    }
+
+    public function testGetAlnumExceptionWithArray()
+    {
+        $bag = new ParameterBag(['word' => ['foo_BAR_012']]);
+
+        $this->expectException(\UnexpectedValueException::class);
+        $this->expectExceptionMessage('Parameter value "word" cannot be converted to "string".');
 
-        $this->assertEquals('fooBAR012', $bag->getAlnum('word'), '->getAlnum() gets only alphanumeric characters');
-        $this->assertEquals('', $bag->getAlnum('unknown'), '->getAlnum() returns empty string if a parameter is not defined');
+        $bag->getAlnum('word');
     }
 
     public function testGetDigits()
     {
-        $bag = new ParameterBag(['word' => 'foo_BAR_012']);
+        $bag = new ParameterBag(['word' => 'foo_BAR_0+1-2', 'bool' => true, 'integer' => 123]);
+
+        $this->assertSame('012', $bag->getDigits('word'), '->getDigits() gets only digits as string');
+        $this->assertSame('', $bag->getDigits('unknown'), '->getDigits() returns empty string if a parameter is not defined');
+        $this->assertSame('012', $bag->getDigits('unknown', 'abc_DEF_012'), '->getDigits() returns filtered default if a parameter is not defined');
+        $this->assertSame('123', $bag->getDigits('integer', 'abc_DEF_012'), '->getDigits() returns the number as string if a parameter is an integer');
+        $this->assertSame('1', $bag->getDigits('bool', 'abc_DEF_012'), '->getDigits() returns 1 if a parameter is true');
+    }
+
+    public function testGetDigitsExceptionWithArray()
+    {
+        $bag = new ParameterBag(['word' => ['foo_BAR_012']]);
+
+        $this->expectException(\UnexpectedValueException::class);
+        $this->expectExceptionMessage('Parameter value "word" cannot be converted to "string".');
 
-        $this->assertEquals('012', $bag->getDigits('word'), '->getDigits() gets only digits as string');
-        $this->assertEquals('', $bag->getDigits('unknown'), '->getDigits() returns empty string if a parameter is not defined');
+        $bag->getDigits('word');
     }
 
     public function testGetInt()
     {
-        $bag = new ParameterBag(['digits' => '0123']);
+        $bag = new ParameterBag(['digits' => '123', 'bool' => true]);
+
+        $this->assertSame(123, $bag->getInt('digits', 0), '->getInt() gets a value of parameter as integer');
+        $this->assertSame(0, $bag->getInt('unknown', 0), '->getInt() returns zero if a parameter is not defined');
+        $this->assertSame(10, $bag->getInt('unknown', 10), '->getInt() returns the default if a parameter is not defined');
+        $this->assertSame(1, $bag->getInt('bool', 0), '->getInt() returns 1 if a parameter is true');
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testGetIntExceptionWithArray()
+    {
+        $this->expectDeprecation('Since symfony/http-foundation 6.3: Ignoring invalid values when using "Symfony\Component\HttpFoundation\ParameterBag::getInt(\'digits\')" is deprecated and will throw an "UnexpectedValueException" in 7.0; use method "filter()" with flag "FILTER_NULL_ON_FAILURE" to keep ignoring them.');
+
+        $bag = new ParameterBag(['digits' => ['123']]);
+        $result = $bag->getInt('digits', 0);
+        $this->assertSame(0, $result);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testGetIntExceptionWithInvalid()
+    {
+        $this->expectDeprecation('Since symfony/http-foundation 6.3: Ignoring invalid values when using "Symfony\Component\HttpFoundation\ParameterBag::getInt(\'word\')" is deprecated and will throw an "UnexpectedValueException" in 7.0; use method "filter()" with flag "FILTER_NULL_ON_FAILURE" to keep ignoring them.');
+
+        $bag = new ParameterBag(['word' => 'foo_BAR_012']);
+        $result = $bag->getInt('word', 0);
+        $this->assertSame(0, $result);
+    }
 
-        $this->assertEquals(123, $bag->getInt('digits'), '->getInt() gets a value of parameter as integer');
-        $this->assertEquals(0, $bag->getInt('unknown'), '->getInt() returns zero if a parameter is not defined');
+    public function testGetString()
+    {
+        $bag = new ParameterBag(['integer' => 123, 'bool_true' => true, 'bool_false' => false, 'string' => 'abc', 'stringable' => new class() implements \Stringable {
+            public function __toString(): string
+            {
+                return 'strval';
+            }
+        }]);
+
+        $this->assertSame('123', $bag->getString('integer'), '->getString() gets a value of parameter as string');
+        $this->assertSame('abc', $bag->getString('string'), '->getString() gets a value of parameter as string');
+        $this->assertSame('', $bag->getString('unknown'), '->getString() returns zero if a parameter is not defined');
+        $this->assertSame('foo', $bag->getString('unknown', 'foo'), '->getString() returns the default if a parameter is not defined');
+        $this->assertSame('1', $bag->getString('bool_true'), '->getString() returns "1" if a parameter is true');
+        $this->assertSame('', $bag->getString('bool_false', 'foo'), '->getString() returns an empty empty string if a parameter is false');
+        $this->assertSame('strval', $bag->getString('stringable'), '->getString() gets a value of a stringable paramater as string');
+    }
+
+    public function testGetStringExceptionWithArray()
+    {
+        $bag = new ParameterBag(['key' => ['abc']]);
+
+        $this->expectException(\UnexpectedValueException::class);
+        $this->expectExceptionMessage('Parameter value "key" cannot be converted to "string".');
+
+        $bag->getString('key');
+    }
+
+    public function testGetStringExceptionWithObject()
+    {
+        $bag = new ParameterBag(['object' => $this]);
+
+        $this->expectException(\UnexpectedValueException::class);
+        $this->expectExceptionMessage('Parameter value "object" cannot be converted to "string".');
+
+        $bag->getString('object');
     }
 
     public function testFilter()
@@ -164,13 +270,13 @@ public function testFilter()
         // This test is repeated for code-coverage
         $this->assertEquals('http://example.com/foo', $bag->filter('url', '', \FILTER_VALIDATE_URL, \FILTER_FLAG_PATH_REQUIRED), '->filter() gets a value of parameter as URL with a path');
 
-        $this->assertFalse($bag->filter('dec', '', \FILTER_VALIDATE_INT, [
-            'flags' => \FILTER_FLAG_ALLOW_HEX,
+        $this->assertNull($bag->filter('dec', '', \FILTER_VALIDATE_INT, [
+            'flags' => \FILTER_FLAG_ALLOW_HEX | \FILTER_NULL_ON_FAILURE,
             'options' => ['min_range' => 1, 'max_range' => 0xFF],
         ]), '->filter() gets a value of parameter as integer between boundaries');
 
-        $this->assertFalse($bag->filter('hex', '', \FILTER_VALIDATE_INT, [
-            'flags' => \FILTER_FLAG_ALLOW_HEX,
+        $this->assertNull($bag->filter('hex', '', \FILTER_VALIDATE_INT, [
+            'flags' => \FILTER_FLAG_ALLOW_HEX | \FILTER_NULL_ON_FAILURE,
             'options' => ['min_range' => 1, 'max_range' => 0xFF],
         ]), '->filter() gets a value of parameter as integer between boundaries');
 
@@ -218,12 +324,25 @@ public function testCount()
 
     public function testGetBoolean()
     {
-        $parameters = ['string_true' => 'true', 'string_false' => 'false'];
+        $parameters = ['string_true' => 'true', 'string_false' => 'false', 'string' => 'abc'];
         $bag = new ParameterBag($parameters);
 
     
10000
    $this->assertTrue($bag->getBoolean('string_true'), '->getBoolean() gets the string true as boolean true');
         $this->assertFalse($bag->getBoolean('string_false'), '->getBoolean() gets the string false as boolean false');
         $this->assertFalse($bag->getBoolean('unknown'), '->getBoolean() returns false if a parameter is not defined');
+        $this->assertTrue($bag->getBoolean('unknown', true), '->getBoolean() returns default if a parameter is not defined');
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testGetBooleanExceptionWithInvalid()
+    {
+        $this->expectDeprecation('Since symfony/http-foundation 6.3: Ignoring invalid values when using "Symfony\Component\HttpFoundation\ParameterBag::getBoolean(\'invalid\')" is deprecated and will throw an "UnexpectedValueException" in 7.0; use method "filter()" with flag "FILTER_NULL_ON_FAILURE" to keep ignoring them.');
+
+        $bag = new ParameterBag(['invalid' => 'foo']);
+        $result = $bag->getBoolean('invalid', 0);
+        $this->assertFalse($result);
     }
 
     public function testGetEnum()
@@ -260,3 +379,15 @@ public function testGetEnumThrowsExceptionWithInvalidValueType()
         $this->assertNull($bag->getEnum('invalid-value', FooEnum::class));
     }
 }
+
+class InputStringable
+{
+    public function __construct(private string $value)
+    {
+    }
+
+    public function __toString(): string
+    {
+        return $this->value;
+    }
+}

From 09df77230622d29973e59ea5675cd5d7365bf9be Mon Sep 17 00:00:00 2001
From: onexhovia <onexhovia@gmail.com>
Date: Fri, 17 Mar 2023 17:04:40 +0700
Subject: [PATCH 300/475] [Scheduler] Remove unused variable in
 AddScheduleMessengerPass

---
 .../Scheduler/DependencyInjection/AddScheduleMessengerPass.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Scheduler/DependencyInjection/AddScheduleMessengerPass.php b/src/Symfony/Component/Scheduler/DependencyInjection/AddScheduleMessengerPass.php
index c67831bb70679..b36a40f6548c5 100644
--- a/src/Symfony/Component/Scheduler/DependencyInjection/AddScheduleMessengerPass.php
+++ b/src/Symfony/Component/Scheduler/DependencyInjection/AddScheduleMessengerPass.php
@@ -44,8 +44,7 @@ public function process(ContainerBuilder $container): void
                 ->setArguments(['schedule://'.$name, ['transport_name' => $transportName], new Reference('messenger.default_serializer')])
                 ->addTag('messenger.receiver', ['alias' => $transportName])
             ;
-            $container->setDefinition($transportId = 'messenger.transport.'.$transportName, $transportDefinition);
-            $senderAliases[$transportName] = $transportId;
+            $container->setDefinition('messenger.transport.'.$transportName, $transportDefinition);
         }
     }
 }

From 2feabc641c1d7540331d8322243f90275c3118a1 Mon Sep 17 00:00:00 2001
From: vlepeule <valerian.lepeule@gmail.com>
Date: Wed, 15 Mar 2023 23:05:52 +0100
Subject: [PATCH 301/475] [Notifier] Add "retry" and "expire" options to
 Pushover bridge

---
 .../Bridge/Pushover/PushoverOptions.php       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverOptions.php b/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverOptions.php
index 36b12150a0a1e..5733e389efe14 100644
--- a/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverOptions.php
+++ b/src/Symfony/Component/Notifier/Bridge/Pushover/PushoverOptions.php
@@ -124,6 +124,30 @@ public function priority(int $priority): static
         return $this;
     }
 
+    /**
+     * @see https://pushover.net/api#priority
+     *
+     * @return $this
+     */
+    public function expire(int $seconds): static
+    {
+        $this->options['expire'] = $seconds;
+
+        return $this;
+    }
+
+    /**
+     * @see https://pushover.net/api#priority
+     *
+     * @return $this
+     */
+    public function retry(int $seconds): static
+    {
+        $this->options['retry'] = $seconds;
+
+        return $this;
+    }
+
     /**
      * @see https://pushover.net/api#sounds
      *

From b27aab980b098c3fa433a6bedcebc1e87ae252b2 Mon Sep 17 00:00:00 2001
From: k0d3r1s <k0d3r1s@gmail.com>
Date: Wed, 15 Mar 2023 12:19:28 +0200
Subject: [PATCH 302/475] [WebProfilerBundle] replace helper with _self in
 serializer.html.twig

---
 .../views/Collector/serializer.html.twig      | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/serializer.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/serializer.html.twig
index 46100b46ca0c0..94540fe1a59c9 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/serializer.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/serializer.html.twig
@@ -154,12 +154,12 @@
                     <tbody>
                         {% for item in data %}
                             <tr>
-                                <td>{{ helper.render_data_cell(item, loop.index, cellPrefix) }}</td>
-                                <td>{{ helper.render_context_cell(item, loop.index, cellPrefix) }}</td>
-                                <td>{{ helper.render_normalizer_cell(item, loop.index, cellPrefix) }}</td>
-                                <td>{{ helper.render_encoder_cell(item, loop.index, cellPrefix) }}</td>
-                                <td>{{ helper.render_time_cell(item) }}</td>
-                                <td>{{ helper.render_caller_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_data_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_context_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_normalizer_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_encoder_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_time_cell(item) }}</td>
+                                <td>{{ _self.render_caller_cell(item, loop.index, cellPrefix) }}</td>
                             </tr>
                         {% endfor %}
                     </tbody>
@@ -224,11 +224,11 @@
                     <tbody>
                         {% for item in data %}
                             <tr>
-                                <td>{{ helper.render_data_cell(item, loop.index, cellPrefix) }}</td>
-                                <td>{{ helper.render_context_cell(item, loop.index, cellPrefix) }}</td>
-                                <td>{{ helper.render_normalizer_cell(item, loop.index, cellPrefix) }}</td>
-                                <td>{{ helper.render_time_cell(item) }}</td>
-                                <td>{{ helper.render_caller_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_data_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_context_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_normalizer_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_time_cell(item) }}</td>
+                                <td>{{ _self.render_caller_cell(item, loop.index, cellPrefix) }}</td>
                             </tr>
                         {% endfor %}
                     </tbody>
@@ -263,11 +263,11 @@
                     <tbody>
                         {% for item in data %}
                             <tr>
-                                <td>{{ helper.render_data_cell(item, loop.index, cellPrefix) }}</td>
-                                <td>{{ helper.render_context_cell(item, loop.index, cellPrefix) }}</td>
-                                <td>{{ helper.render_encoder_cell(item, loop.index, cellPrefix) }}</td>
-                                <td>{{ helper.render_time_cell(item) }}</td>
-                                <td>{{ helper.render_caller_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_data_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_context_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_encoder_cell(item, loop.index, cellPrefix) }}</td>
+                                <td>{{ _self.render_time_cell(item) }}</td>
+                                <td>{{ _self.render_caller_cell(item, loop.index, cellPrefix) }}</td>
                             </tr>
                         {% endfor %}
                     </tbody>

From 2d4396ad50dd318239e05cc5c0b11080a791df6d Mon Sep 17 00:00:00 2001
From: Jordane Vaspard <jordane.vaspard@laposte.net>
Date: Sat, 26 Nov 2022 15:45:54 +0100
Subject: [PATCH 303/475] [Form][ChoiceType] Add placeholder_attr field option

---
 .../views/Form/form_div_layout.html.twig      |  2 +-
 .../views/Form/foundation_5_layout.html.twig  |  2 +-
 src/Symfony/Component/Form/CHANGELOG.md       |  5 ++
 .../Form/Extension/Core/Type/ChoiceType.php   |  6 +-
 .../Extension/Core/Type/ChoiceTypeTest.php    | 86 +++++++++++--------
 .../Descriptor/resolved_form_type_1.json      |  1 +
 .../Descriptor/resolved_form_type_1.txt       |  4 +-
 7 files changed, 66 insertions(+), 40 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
index 61f64e33fa751..48ef558385b94 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -61,7 +61,7 @@
     {%- endif -%}
     <select {{ block('widget_attributes') }}{% if multiple %} multiple="multiple"{% endif %}>
         {%- if placeholder is not none -%}
-            <option value=""{% if required and value is empty %} selected="selected"{% endif %}>{{ placeholder != '' ? (translation_domain is same as(false) ? placeholder : placeholder|trans({}, translation_domain)) }}</option>
+            <option value=""{% if placeholder_attr|default({}) %}{% with { attr: placeholder_attr } %}{{ block('attributes') }}{% endwith %}{% endif %}{% if required and value is empty %} selected="selected"{% endif %}>{{ placeholder != '' ? (translation_domain is same as(false) ? placeholder : placeholder|trans({}, translation_domain)) }}</option>
         {%- endif -%}
         {%- if preferred_choices|length > 0 -%}
             {% set options = preferred_choices %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig
index f8c51b83dd8ed..8c6364b3e74ec 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig
@@ -156,7 +156,7 @@
     {%- endif -%}
     <select {{ block('widget_attributes') }}{% if multiple %} multiple="multiple" data-customforms="disabled"{% endif %}>
         {% if placeholder is not none -%}
-            <option value=""{% if required and value is empty %} selected="selected"{% endif %}>{{ translation_domain is same as(false) ? placeholder : placeholder|trans({}, translation_domain) }}</option>
+            <option value=""{% if placeholder_attr|default({}) %}{% with { attr: placeholder_attr } %}{{ block('attributes') }}{% endwith %}{% endif %}{% if required and value is empty %} selected="selected"{% endif %}>{{ translation_domain is same as(false) ? placeholder : placeholder|trans({}, translation_domain) }}</option>
         {%- endif %}
         {%- if preferred_choices|length > 0 -%}
             {% set options = preferred_choices %}
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index 68622612e30b3..cf21889169afe 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add a `placeholder_attr` option to `ChoiceType`
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 2dde39e8af9ef..0fc628a549b0c 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -84,7 +84,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             // Check if the choices already contain the empty value
             // Only add the placeholder option if this is not the case
             if (null !== $options['placeholder'] && 0 === \count($choiceList->getChoicesForValues(['']))) {
-                $placeholderView = new ChoiceView(null, '', $options['placeholder']);
+                $placeholderView = new ChoiceView(null, '', $options['placeholder'], $options['placeholder_attr']);
 
                 // "placeholder" is a reserved name
                 $this->addSubForm($builder, 'placeholder', $placeholderView, $options);
@@ -237,6 +237,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             'choices' => $choiceListView->choices,
             'separator' => '-------------------',
             'placeholder' => null,
+            'placeholder_attr' => [],
             'choice_translation_domain' => $choiceTranslationDomain,
             'choice_translation_parameters' => $options['choice_translation_parameters'],
         ]);
@@ -261,6 +262,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         // Only add the empty value option if this is not the case
         if (null !== $options['placeholder'] && !$view->vars['placeholder_in_choices']) {
             $view->vars['placeholder'] = $options['placeholder'];
+            $view->vars['placeholder_attr'] = $options['placeholder_attr'];
         }
 
         if ($options['multiple'] && !$options['expanded']) {
@@ -352,6 +354,7 @@ public function configureOptions(OptionsResolver $resolver)
             'group_by' => null,
             'empty_data' => $emptyData,
             'placeholder' => $placeholderDefault,
+            'placeholder_attr' => [],
             'error_bubbling' => false,
             'compound' => $compound,
             // The view data is always a string or an array of strings,
@@ -375,6 +378,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('choice_value', ['null', 'callable', 'string', PropertyPath::class, ChoiceValue::class]);
         $resolver->setAllowedTypes('choice_attr', ['null', 'array', 'callable', 'string', PropertyPath::class, ChoiceAttr::class]);
         $resolver->setAllowedTypes('choice_translation_parameters', ['null', 'array', 'callable', ChoiceTranslationParameters::class]);
+        $resolver->setAllowedTypes('placeholder_attr', ['array']);
         $resolver->setAllowedTypes('preferred_choices', ['array', \Traversable::class, 'callable', 'string', PropertyPath::class, PreferredChoice::class]);
         $resolver->setAllowedTypes('group_by', ['null', 'callable', 'string', PropertyPath::class, GroupBy::class]);
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
index 8109a9c60079d..7a0b2f5573997 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -100,6 +100,14 @@ public function testChoiceLoaderOptionExpectsChoiceLoaderInterface()
         ]);
     }
 
+    public function testPlaceholderAttrOptionExpectsArray()
+    {
+        $this->expectException(InvalidOptionsException::class);
+        $this->factory->create(static::TESTED_TYPE, null, [
+            'placeholder_attr' => new \stdClass(),
+        ]);
+    }
+
     public function testChoiceListAndChoicesCanBeEmpty()
     {
         $this->assertInstanceOf(FormInterface::class, $this->factory->create(static::TESTED_TYPE, null, []));
@@ -189,15 +197,19 @@ public function testExpandedChoiceListWithBooleanAndNullValuesAndFalseAsPreSetDa
 
     public function testPlaceholderPresentOnNonRequiredExpandedSingleChoice()
     {
+        $placeholderAttr = ['attr' => 'value'];
+
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => false,
             'expanded' => true,
             'required' => false,
             'choices' => $this->choices,
+            'placeholder_attr' => $placeholderAttr,
         ]);
 
         $this->assertArrayHasKey('placeholder', $form);
         $this->assertCount(\count($this->choices) + 1, $form, 'Each choice should become a new field');
+        $this->assertSame($placeholderAttr, $form->createView()->children['placeholder']->vars['attr']);
     }
 
     public function testPlaceholderNotPresentIfRequired()
@@ -1669,36 +1681,40 @@ public function testPlaceholderIsEmptyStringByDefaultIfNotRequired()
     /**
      * @dataProvider getOptionsWithPlaceholder
      */
-    public function testPassPlaceholderToView($multiple, $expanded, $required, $placeholder, $viewValue)
+    public function testPassPlaceholderToView($multiple, $expanded, $required, $placeholder, $placeholderViewValue, $placeholderAttr, $placeholderAttrViewValue)
     {
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => $multiple,
             'expanded' => $expanded,
             'required' => $required,
             'placeholder' => $placeholder,
+            'placeholder_attr' => $placeholderAttr,
             'choices' => $this->choices,
         ])
             ->createView();
 
-        $this->assertSame($viewValue, $view->vars['placeholder']);
+        $this->assertSame($placeholderViewValue, $view->vars['placeholder']);
+        $this->assertSame($placeholderAttrViewValue, $view->vars['placeholder_attr']);
         $this->assertFalse($view->vars['placeholder_in_choices']);
     }
 
     /**
      * @dataProvider getOptionsWithPlaceholder
      */
-    public function testDontPassPlaceholderIfContainedInChoices($multiple, $expanded, $required, $placeholder, $viewValue)
+    public function testDontPassPlaceholderIfContainedInChoices($multiple, $expanded, $required, $placeholder, $placeholderViewValue, $placeholderAttr, $placeholderAttrViewValue)
     {
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'multiple' => $multiple,
             'expanded' => $expanded,
             'required' => $required,
             'placeholder' => $placeholder,
+            'placeholder_attr' => $placeholderAttr,
             'choices' => ['Empty' => '', 'A' => 'a'],
         ])
             ->createView();
 
         $this->assertNull($view->vars['placeholder']);
+        $this->assertSame([], $view->vars['placeholder_attr']);
         $this->assertTrue($view->vars['placeholder_in_choices']);
     }
 
@@ -1706,43 +1722,43 @@ public function getOptionsWithPlaceholder()
     {
         return [
             // single non-expanded
-            [false, false, false, 'foobar', 'foobar'],
-            [false, false, false, '', ''],
-            [false, false, false, null, null],
-            [false, false, false, false, null],
-            [false, false, true, 'foobar', 'foobar'],
-            [false, false, true, '', ''],
-            [false, false, true, null, null],
-            [false, false, true, false, null],
+            [false, false, false, 'foobar', 'foobar', ['attr' => 'value'], ['attr' => 'value']],
+            [false, false, false, '', '', ['attr' => 'value'], ['attr' => 'value']],
+            [false, false, false, null, null, ['attr' => 'value'], []],
+            [false, false, false, false, null, ['attr' => 'value'], []],
+            [false, false, true, 'foobar', 'foobar', ['attr' => 'value'], ['attr' => 'value']],
+            [false, false, true, '', '', ['attr' => 'value'], ['attr' => 'value']],
+            [false, false, true, null, null, ['attr' => 'value'], []],
+            [false, false, true, false, null, ['attr' => 'value'], []],
             // single expanded
-            [false, true, false, 'foobar', 'foobar'],
+            [false, true, false, 'foobar', 'foobar', ['attr' => 'value'], ['attr' => 'value']],
             // radios should never have an empty label
-            [false, true, false, '', 'None'],
-            [false, true, false, null, null],
-            [false, true, false, false, null],
+            [false, true, false, '', 'None', ['attr' => 'value'], ['attr' => 'value']],
+            [false, true, false, null, null, ['attr' => 'value'], []],
+            [false, true, false, false, null, ['attr' => 'value'], []],
             // required radios should never have a placeholder
-            [false, true, true, 'foobar', null],
-            [false, true, true, '', null],
-            [false, true, true, null, null],
-            [false, true, true, false, null],
+            [false, true, true, 'foobar', null, ['attr' => 'value'], []],
+            [false, true, true, '', null, ['attr' => 'value'], []],
+            [false, true, true, null, null, ['attr' => 'value'], []],
+            [false, true, true, false, null, ['attr' => 'value'], []],
             // multiple non-expanded
-            [true, false, false, 'foobar', null],
-            [true, false, false, '', null],
-            [true, false, false, null, null],
-            [true, false, false, false, null],
-            [true, false, true, 'foobar', null],
-            [true, false, true, '', null],
-            [true, false, true, null, null],
-            [true, false, true, false, null],
+            [true, false, false, 'foobar', null, ['attr' => 'value'], []],
+            [true, false, false, '', null, ['attr' => 'value'], []],
+            [true, false, false, null, null, ['attr' => 'value'], []],
+            [true, false, false, false, null, ['attr' => 'value'], []],
+            [true, false, true, 'foobar', null, ['attr' => 'value'], []],
+            [true, false, true, '', null, ['attr' => 'value'], []],
+            [true, false, true, null, null, ['attr' => 'value'], []],
+            [true, false, true, false, null, ['attr' => 'value'], []],
             // multiple expanded
-            [true, true, false, 'foobar', null],
-            [true, true, false, '', null],
-            [true, true, false, null, null],
-            [true, true, false, false, null],
-            [true, true, true, 'foobar', null],
-            [true, true, true, '', null],
-            [true, true, true, null, null],
-            [true, true, true, false, null],
+            [true, true, false, 'foobar', null, ['attr' => 'value'], []],
+            [true, true, false, '', null, ['attr' => 'value'], []],
+            [true, true, false, null, null, ['attr' => 'value'], []],
+            [true, true, false, false, null, ['attr' => 'value'], []],
+            [true, true, true, 'foobar', null, ['attr' => 'value'], []],
+            [true, true, true, '', null, ['attr' => 'value'], []],
+            [true, true, true, null, null, ['attr' => 'value'], []],
+            [true, true, true, false, null, ['attr' => 'value'], []],
         ];
     }
 
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json
index c9f453c8d6cc6..3a9b7a7ecce4d 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json
@@ -16,6 +16,7 @@
             "group_by",
             "multiple",
             "placeholder",
+            "placeholder_attr",
             "preferred_choices"
         ],
         "overridden": {
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
index c4c4e901804af..a15ac42dae0f7 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
@@ -18,8 +18,8 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (Block prefix: "choice")
   group_by                                             data                                                  
   multiple                                             disabled                                              
   placeholder                                          form_attr                                             
-  preferred_choices                                    getter                                                
-                                                       help                                                  
+  placeholder_attr                                     getter                                                
+  preferred_choices                                    help                                                  
                                                        help_attr                                             
                                                        help_html                                             
                                                        help_translation_parameters                           

From 1025f3501bc55f5682871cc93cd02456b8c6c96b Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 18 Mar 2023 10:18:04 +0100
Subject: [PATCH 304/475] [Messenger] Add support for the DelayStamp in
 InMemoryTransport

---
 .../InMemory/InMemoryTransportTest.php        | 10 ++++++
 .../Transport/InMemory/InMemoryTransport.php  | 31 ++++++++++++++-----
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Messenger/Tests/Transport/InMemory/InMemoryTransportTest.php b/src/Symfony/Component/Messenger/Tests/Transport/InMemory/InMemoryTransportTest.php
index 97e7f227a50e1..1cd1db68beaa0 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/InMemory/InMemoryTransportTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/InMemory/InMemoryTransportTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Stamp\DelayStamp;
 use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\AnEnvelopeStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
@@ -84,6 +85,15 @@ public function testQueue()
         $this->assertSame([], $this->transport->get());
     }
 
+    public function testQueueWithDelay()
+    {
+        $envelope1 = new Envelope(new \stdClass());
+        $envelope1 = $this->transport->send($envelope1);
+        $envelope2 = (new Envelope(new \stdClass()))->with(new DelayStamp(10_000));
+        $envelope2 = $this->transport->send($envelope2);
+        $this->assertSame([$envelope1], $this->transport->get());
+    }
+
     public function testQueueWithSerialization()
     {
         $envelope = new Envelope(new \stdClass());
diff --git a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
index 13a97667b548b..4937c4b325786 100644
--- a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
+++ b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
@@ -11,8 +11,10 @@
 
 namespace Symfony\Component\Messenger\Transport\InMemory;
 
+use Psr\Clock\ClockInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Exception\LogicException;
+use Symfony\Component\Messenger\Stamp\DelayStamp;
 use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
@@ -46,16 +48,25 @@ class InMemoryTransport implements TransportInterface, ResetInterface
     private array $queue = [];
 
     private int $nextId = 1;
-    private ?SerializerInterface $serializer;
+    private array $availableAt = [];
 
-    public function __construct(SerializerInterface $serializer = null)
-    {
-        $this->serializer = $serializer;
+    public function __construct(
+        private ?SerializerInterface $serializer = null,
+        private ?ClockInterface $clock = null,
+    ) {
     }
 
     public function get(): iterable
     {
-        return array_values($this->decode($this->queue));
+        $envelopes = [];
+        $now = $this->clock?->now() ?? new \DateTimeImmutable();
+        foreach ($this->decode($this->queue) as $id => $envelope) {
+            if (!isset($this->availableAt[$id]) || $now > $this->availableAt[$id]) {
+                $envelopes[] = $envelope;
+            }
+        }
+
+        return $envelopes;
     }
 
     public function ack(Envelope $envelope): void
@@ -66,7 +77,7 @@ public function ack(Envelope $envelope): void
             throw new LogicException('No TransportMessageIdStamp found on the Envelope.');
         }
 
-        unset($this->queue[$transportMessageIdStamp->getId()]);
+        unset($this->queue[$id = $transportMessageIdStamp->getId()], $this->availableAt[$id]);
     }
 
     public function reject(Envelope $envelope): void
@@ -77,7 +88,7 @@ public function reject(Envelope $envelope): void
             throw new LogicException('No TransportMessageIdStamp found on the Envelope.');
         }
 
-        unset($this->queue[$transportMessageIdStamp->getId()]);
+        unset($this->queue[$id = $transportMessageIdStamp->getId()], $this->availableAt[$id]);
     }
 
     public function send(Envelope $envelope): Envelope
@@ -88,6 +99,12 @@ public function send(Envelope $envelope): Envelope
         $this->sent[] = $encodedEnvelope;
         $this->queue[$id] = $encodedEnvelope;
 
+        /** @var DelayStamp|null $delayStamp */
+        if ($delayStamp = $envelope->last(DelayStamp::class)) {
+            $now = $this->clock?->now() ?? new \DateTimeImmutable();
+            $this->availableAt[$id] = $now->modify(sprintf('+%d seconds', $delayStamp->getDelay() / 1000));
+        }
+
         return $envelope;
     }
 

From 0f5422c6fe073b502a8e40217eb6bc3932a3cacf Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sun, 19 Mar 2023 13:43:00 +0100
Subject: [PATCH 305/475] [Scheduler] Add a simple Scheduler class for when the
 component is used standalone

---
 src/Symfony/Component/Scheduler/Scheduler.php | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 src/Symfony/Component/Scheduler/Scheduler.php

diff --git a/src/Symfony/Component/Scheduler/Scheduler.php b/src/Symfony/Component/Scheduler/Scheduler.php
new file mode 100644
index 0000000000000..71cb2c05e2acf
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Scheduler.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler;
+
+use Symfony\Component\Clock\Clock;
+use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Scheduler\Generator\MessageGenerator;
+
+/**
+ * @experimental
+ */
+final class Scheduler
+{
+    /**
+     * @var array<MessageGenerator>
+     */
+    private array $generators = [];
+    private int $index = 0;
+    private bool $shouldStop = false;
+
+    /**
+     * @param iterable<Schedule> $schedules
+     */
+    public function __construct(
+        private array $handlers,
+        array $schedules,
+        private ClockInterface $clock = new Clock(),
+    ) {
+        foreach ($schedules as $schedule) {
+            $this->addSchedule($schedule);
+        }
+    }
+
+    public function addSchedule(Schedule $schedule): void
+    {
+        $this->addMessageGenerator(new MessageGenerator($schedule, 'schedule_'.$this->index++, $this->clock));
+    }
+
+    public function addMessageGenerator(MessageGenerator $generator): void
+    {
+        $this->generators[] = $generator;
+    }
+
+    /**
+     * Schedules messages.
+     *
+     * Valid options are:
+     *  * sleep (default: 1000000): Time in microseconds to sleep after no messages are found
+     */
+    public function run(array $options = []): void
+    {
+        $options += ['sleep' => 1e6];
+
+        while (!$this->shouldStop) {
+            $start = $this->clock->now();
+
+            $ran = false;
+            foreach ($this->generators as $generator) {
+                foreach ($generator->getMessages() as $message) {
+                    $this->handlers[$message::class]($message);
+                    $ran = true;
+                }
+            }
+
+            if (!$ran) {
+                if (0 < $sleep = (int) ($options['sleep'] - 1e6 * ($this->clock->now()->format('U.u') - $start->format('U.u')))) {
+                    $this->clock->sleep($sleep / 1e6);
+                }
+            }
+        }
+    }
+
+    public function stop(): void
+    {
+        $this->shouldStop = true;
+    }
+}

From 313644ff934bd40f57ab54537138775edf089baf Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sun, 19 Mar 2023 15:30:50 +0100
Subject: [PATCH 306/475] [FrameworkBundle] Fix registration of the Scheduler
 component

---
 .../FrameworkBundle/DependencyInjection/Configuration.php     | 4 ++--
 .../DependencyInjection/FrameworkExtension.php                | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 1d85518a190f9..1860f68e4f1a2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -37,7 +37,7 @@
 use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
 use Symfony\Component\RateLimiter\Policy\TokenBucketLimiter;
 use Symfony\Component\RemoteEvent\RemoteEvent;
-use Symfony\Component\Scheduler\Messenger\SchedulerTransportFactory;
+use Symfony\Component\Scheduler\Schedule;
 use Symfony\Component\Semaphore\Semaphore;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Translation\Translator;
@@ -1614,7 +1614,7 @@ private function addSchedulerSection(ArrayNodeDefinition $rootNode, callable $en
             ->children()
                 ->arrayNode('scheduler')
                     ->info('Scheduler configuration')
-                    ->{$enableIfStandalone('symfony/scheduler', SchedulerTransportFactory::class)}()
+                    ->{$enableIfStandalone('symfony/scheduler', Schedule::class)}()
                 ->end()
             ->end()
         ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 9cd811430be0a..1e95b74ea9959 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2015,10 +2015,6 @@ private function registerSchedulerConfiguration(array $config, ContainerBuilder
             throw new LogicException('Scheduler support cannot be enabled as the Scheduler component is not installed. Try running "composer require symfony/scheduler".');
         }
 
-        if (!interface_exists(MessageBusInterface::class)) {
-            throw new LogicException('Scheduler support cannot be enabled as the Messenger component is not installed. Try running "composer require symfony/messenger".');
-        }
-
         $loader->load('scheduler.php');
     }
 

From 251ed12db76c143d89a6ce928d84b85538ffa989 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sun, 19 Mar 2023 15:43:13 +0100
Subject: [PATCH 307/475] [Scheduler] Fix usage without a Lock

---
 src/Symfony/Component/Scheduler/Schedule.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Scheduler/Schedule.php b/src/Symfony/Component/Scheduler/Schedule.php
index 318274bfc33ce..49b2abdb995a4 100644
--- a/src/Symfony/Component/Scheduler/Schedule.php
+++ b/src/Symfony/Component/Scheduler/Schedule.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Scheduler;
 
 use Symfony\Component\Lock\LockInterface;
-use Symfony\Component\Lock\NoLock;
 use Symfony\Contracts\Cache\CacheInterface;
 
 /**
@@ -46,9 +45,9 @@ public function lock(LockInterface $lock): static
         return $this;
     }
 
-    public function getLock(): LockInterface
+    public function getLock(): ?LockInterface
     {
-        return $this->lock ?? new NoLock();
+        return $this->lock;
     }
 
     /**

From 542ebc6b0213ba10129445a5a35ddd88a69fadc6 Mon Sep 17 00:00:00 2001
From: Arnaud POINTET <arnaud.pointet@gmail.com>
Date: Thu, 6 Oct 2022 08:45:21 +0200
Subject: [PATCH 308/475] [WebLink] Add relations defined in RFC 8631

---
 src/Symfony/Component/WebLink/Link.php | 123 +++++++++++++++++++++++--
 1 file changed, 113 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/WebLink/Link.php b/src/Symfony/Component/WebLink/Link.php
index 97a931b36823b..af32d21a010df 100644
--- a/src/Symfony/Component/WebLink/Link.php
+++ b/src/Symfony/Component/WebLink/Link.php
@@ -15,25 +15,128 @@
 
 class Link implements EvolvableLinkInterface
 {
-    // Relations defined in https://www.w3.org/TR/html5/links.html#links and applicable on link elements
+    // @see https://www.iana.org/assignments/link-relations/link-relations.xhtml
+    public const REL_ABOUT = 'about';
+    public const REL_ACL = 'acl';
     public const REL_ALTERNATE = 'alternate';
+    public const REL_AMPHTML = 'amphtml';
+    public const REL_APPENDIX = 'appendix';
+    public const REL_APPLE_TOUCH_ICON = 'apple-touch-icon';
+    public const REL_APPLE_TOUCH_STARTUP_IMAGE = 'apple-touch-startup-image';
+    public const REL_ARCHIVES = 'archives';
     public const REL_AUTHOR = 'author';
+    public const REL_BLOCKED_BY = 'blocked-by';
+    public const REL_BOOKMARK = 'bookmark';
+    public const REL_CANONICAL = 'canonical';
+    public const REL_CHAPTER = 'chapter';
+    public const REL_CITE_AS = 'cite-as';
+    public const REL_COLLECTION = 'collection';
+    public const REL_CONTENTS = 'contents';
+    public const REL_CONVERTEDFROM = 'convertedfrom';
+    public const REL_COPYRIGHT = 'copyright';
+    public const REL_CREATE_FORM = 'create-form';
+    public const REL_CURRENT = 'current';
+    public const REL_DESCRIBEDBY = 'describedby';
+    public const REL_DESCRIBES = 'describes';
+    public const REL_DISCLOSURE = 'disclosure';
+    public const REL_DNS_PREFETCH = 'dns-prefetch';
+    public const REL_DUPLICATE = 'duplicate';
+    public const REL_EDIT = 'edit';
+    public const REL_EDIT_FORM = 'edit-form';
+    public const REL_EDIT_MEDIA = 'edit-media';
+    public const REL_ENCLOSURE = 'enclosure';
+    public const REL_EXTERNAL = 'external';
+    public const REL_FIRST = 'first';
+    public const REL_GLOSSARY = 'glossary';
     public const REL_HELP = 'help';
+    public const REL_HOSTS = 'hosts';
+    public const REL_HUB = 'hub';
     public const REL_ICON = 'icon';
+    public const REL_INDEX = 'index';
+    public const REL_INTERVALAFTER = 'intervalafter';
+    public const REL_INTERVALBEFORE = 'intervalbefore';
+    public const REL_INTERVALCONTAINS = 'intervalcontains';
+    public const REL_INTERVALDISJOINT = 'intervaldisjoint';
+    public const REL_INTERVALDURING = 'intervalduring';
+    public const REL_INTERVALEQUALS = 'intervalequals';
+    public const REL_INTERVALFINISHEDBY = 'intervalfinishedby';
+    public const REL_INTERVALFINISHES = 'intervalfinishes';
+    public const REL_INTERVALIN = 'intervalin';
+    public const REL_INTERVALMEETS = 'intervalmeets';
+    public const REL_INTERVALMETBY = 'intervalmetby';
+    public const REL_INTERVALOVERLAPPEDBY = 'intervaloverlappedby';
+    public const REL_INTERVALOVERLAPS = 'intervaloverlaps';
+    public const REL_INTERVALSTARTEDBY = 'intervalstartedby';
+    public const REL_INTERVALSTARTS = 'intervalstarts';
+    public const REL_ITEM = 'item';
+    public const REL_LAST = 'last';
+    public const REL_LATEST_VERSION = 'latest-version';
     public const REL_LICENSE = 'license';
-    public const REL_SEARCH = 'search';
-    public const REL_STYLESHEET = 'stylesheet';
+    public const REL_LINKSET = 'linkset';
+    public const REL_LRDD = 'lrdd';
+    public const REL_MANIFEST = 'manifest';
+    public const REL_MASK_ICON = 'mask-icon';
+    public const REL_MEDIA_FEED = 'media-feed';
+    public const REL_MEMENTO = 'memento';
+    public const REL_MICROPUB = 'micropub';
+    public const REL_MODULEPRELOAD = 'modulepreload';
+    public const REL_MONITOR = 'monitor';
+    public const REL_MONITOR_GROUP = 'monitor-group';
     public const REL_NEXT = 'next';
-    public const REL_PREV = 'prev';
-
-    // Relation defined in https://www.w3.org/TR/preload/
-    public const REL_PRELOAD = 'preload';
-
-    // Relations defined in https://www.w3.org/TR/resource-hints/
-    public const REL_DNS_PREFETCH = 'dns-prefetch';
+    public const REL_NEXT_ARCHIVE = 'next-archive';
+    public const REL_NOFOLLOW = 'nofollow';
+    public const REL_NOOPENER = 'noopener';
+    public const REL_NOREFERRER = 'noreferrer';
+    public const REL_OPENER = 'opener';
+    public const REL_OPENID_2_LOCAL_ID = 'openid2.local_id';
+    public const REL_OPENID_2_PROVIDER = 'openid2.provider';
+    public const REL_ORIGINAL = 'original';
+    public const REL_P_3_PV_1 = 'p3pv1';
+    public const REL_PAYMENT = 'payment';
+    public const REL_PINGBACK = 'pingback';
     public const REL_PRECONNECT = 'preconnect';
+    public const REL_PREDECESSOR_VERSION = 'predecessor-version';
     public const REL_PREFETCH = 'prefetch';
+    public const REL_PRELOAD = 'preload';
     public const REL_PRERENDER = 'prerender';
+    public const REL_PREV = 'prev';
+    public const REL_PREVIEW = 'preview';
+    public const REL_PREVIOUS = 'previous';
+    public const REL_PREV_ARCHIVE = 'prev-archive';
+    public const REL_PRIVACY_POLICY = 'privacy-policy';
+    public const REL_PROFILE = 'profile';
+    public const REL_PUBLICATION = 'publication';
+    public const REL_RELATED = 'related';
+    public const REL_RESTCONF = 'restconf';
+    public const REL_REPLIES = 'replies';
+    public const REL_RULEINPUT = 'ruleinput';
+    public const REL_SEARCH = 'search';
+    public const REL_SECTION = 'section';
+    public const REL_SELF = 'self';
+    public const REL_SERVICE = 'service';
+    public const REL_SERVICE_DESC = 'service-desc';
+    public const REL_SERVICE_DOC = 'service-doc';
+    public const REL_SERVICE_META = 'service-meta';
+    public const REL_SIPTRUNKINGCAPABILITY= 'siptrunkingcapability';
+    public const REL_SPONSORED = 'sponsored';
+    public const REL_START = 'start';
+    public const REL_STATUS = 'status';
+    public const REL_STYLESHEET = 'stylesheet';
+    public const REL_SUBSECTION = 'subsection';
+    public const REL_SUCCESSOR_VERSION = 'successor-version';
+    public const REL_SUNSET = 'sunset';
+    public const REL_TAG = 'tag';
+    public const REL_TERMS_OF_SERVICE = 'terms-of-service';
+    public const REL_TIMEGATE = 'timegate';
+    public const REL_TIMEMAP = 'timemap';
+    public const REL_TYPE = 'type';
+    public const REL_UGC = 'ugc';
+    public const REL_UP = 'up';
+    public const REL_VERSION_HISTORY = 'version-history';
+    public const REL_VIA = 'via';
+    public const REL_WEBMENTION = 'webmention';
+    public const REL_WORKING_COPY = 'working-copy';
+    public const REL_WORKING_COPY_OF = 'working-copy-of';
 
     // Extra relations
     public const REL_MERCURE = 'mercure';

From 4c1dcfa591bcc48105bfd806ec8fdd2f3fa1dfeb Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sun, 19 Mar 2023 16:44:29 +0100
Subject: [PATCH 309/475] [Messenger] Add a way to redispatch a message

---
 .../Resources/config/messenger.php            |  7 +++++
 src/Symfony/Component/Messenger/CHANGELOG.md  |  1 +
 .../Handler/RedispatchMessageHandler.php      | 29 ++++++++++++++++++
 .../Messenger/Message/RedispatchMessage.php   | 30 +++++++++++++++++++
 4 files changed, 67 insertions(+)
 create mode 100644 src/Symfony/Component/Messenger/Handler/RedispatchMessageHandler.php
 create mode 100644 src/Symfony/Component/Messenger/Message/RedispatchMessage.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
index caeaf3ce49194..fe0a8723a5446 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
@@ -24,6 +24,7 @@
 use Symfony\Component\Messenger\EventListener\StopWorkerOnCustomStopExceptionListener;
 use Symfony\Component\Messenger\EventListener\StopWorkerOnRestartSignalListener;
 use Symfony\Component\Messenger\EventListener\StopWorkerOnSignalsListener;
+use Symfony\Component\Messenger\Handler\RedispatchMessageHandler;
 use Symfony\Component\Messenger\Middleware\AddBusNameStampMiddleware;
 use Symfony\Component\Messenger\Middleware\DispatchAfterCurrentBusMiddleware;
 use Symfony\Component\Messenger\Middleware\FailedMessageProcessingMiddleware;
@@ -219,5 +220,11 @@
                 abstract_arg('message bus locator'),
                 service('messenger.default_bus'),
             ])
+
+        ->set('messenger.redispatch_message_handler', RedispatchMessageHandler::class)
+            ->args([
+                service('messenger.default_bus'),
+            ])
+            ->tag('messenger.message_handler')
     ;
 };
diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
index 8a16de384199c..2b02e2cc1c04a 100644
--- a/src/Symfony/Component/Messenger/CHANGELOG.md
+++ b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG
  * Deprecate `StopWorkerOnSigtermSignalListener` in favor of
    `StopWorkerOnSignalsListener` and make it configurable with SIGINT and
    SIGTERM by default
+ * Add `RedispatchMessage` and `RedispatchMessageHandler`
 
 6.2
 ---
diff --git a/src/Symfony/Component/Messenger/Handler/RedispatchMessageHandler.php b/src/Symfony/Component/Messenger/Handler/RedispatchMessageHandler.php
new file mode 100644
index 0000000000000..e0b8bab956116
--- /dev/null
+++ b/src/Symfony/Component/Messenger/Handler/RedispatchMessageHandler.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Messenger\Handler;
+
+use Symfony\Component\Messenger\Message\RedispatchMessage;
+use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Messenger\Stamp\TransportNamesStamp;
+
+final class RedispatchMessageHandler
+{
+    public function __construct(
+        private MessageBusInterface $bus,
+    ) {
+    }
+
+    public function __invoke(RedispatchMessage $message)
+    {
+        $this->bus->dispatch($message->envelope, [new TransportNamesStamp($message->transportNames)]);
+    }
+}
diff --git a/src/Symfony/Component/Messenger/Message/RedispatchMessage.php b/src/Symfony/Component/Messenger/Message/RedispatchMessage.php
new file mode 100644
index 0000000000000..6a6b8056ab3aa
--- /dev/null
+++ b/src/Symfony/Component/Messenger/Message/RedispatchMessage.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Messenger\Message;
+
+use Symfony\Component\Messenger\Envelope;
+
+/**
+ * @internal
+ */
+final class RedispatchMessage
+{
+    /**
+     * @param object|Envelope $message        The message or the message pre-wrapped in an envelope
+     * @param string[]|string $transportNames Transport names to be used for the message
+     */
+    public function __construct(
+        public readonly object $envelope,
+        public readonly array|string $transportNames = [],
+    ) {
+    }
+}

From f4ba2910c299cd0a38e277cb4464b607931f5986 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Sun, 19 Mar 2023 19:59:45 +0100
Subject: [PATCH 310/475] fix tests

---
 .../DependencyInjection/Fixtures/php/messenger_disabled.php      | 1 +
 .../DependencyInjection/Fixtures/xml/messenger_disabled.xml      | 1 +
 .../DependencyInjection/Fixtures/yml/messenger_disabled.yml      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_disabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_disabled.php
index d14d6e94b617e..6e099cc0d65dc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_disabled.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_disabled.php
@@ -3,4 +3,5 @@
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
     'messenger' => false,
+    'scheduler' => false,
 ]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_disabled.xml
index 513842ece8392..ec3d01e230d10 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_disabled.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_disabled.xml
@@ -7,5 +7,6 @@
 
     <framework:config http-method-override="false">
         <framework:messenger enabled="false" />
+        <framework:scheduler enabled="false" />
     </framework:config>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_disabled.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_disabled.yml
index 8bbd594e3839b..6f90172804408 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_disabled.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_disabled.yml
@@ -1,3 +1,4 @@
 framework:
     http_method_override: false
     messenger: false
+    scheduler: false

From ca4dc5ae2d924e31494fa07980dfb13070350110 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sun, 19 Mar 2023 21:27:57 +0100
Subject: [PATCH 311/475] [Scheduler] Rename argument name for more consistency

---
 .../Tests/Trigger/PeriodicalTriggerTest.php   | 20 ++++-----
 .../Scheduler/Trigger/ExcludeTimeTrigger.php  |  6 +--
 .../Scheduler/Trigger/PeriodicalTrigger.php   | 42 +++++++++----------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php
index 1157fd672febc..51c8e70498c3c 100644
--- a/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php
@@ -89,22 +89,22 @@ public static function providerGetNextRunDate(): iterable
 
     public function testConstructors()
     {
-        $firstRun = new \DateTimeImmutable($now = '2222-02-22');
-        $priorTo = new \DateTimeImmutable($farFuture = '3000-01-01');
+        $from = new \DateTimeImmutable($now = '2222-02-22');
+        $until = new \DateTimeImmutable($farFuture = '3000-01-01');
         $day = new \DateInterval('P1D');
 
-        $message = new PeriodicalTrigger(86400, $firstRun, $priorTo);
+        $message = new PeriodicalTrigger(86400, $from, $until);
 
-        $this->assertEquals($message, PeriodicalTrigger::create(86400, $firstRun, $priorTo));
-        $this->assertEquals($message, PeriodicalTrigger::create('86400', $firstRun, $priorTo));
-        $this->assertEquals($message, PeriodicalTrigger::create('P1D', $firstRun, $priorTo));
+        $this->assertEquals($message, PeriodicalTrigger::create(86400, $from, $until));
+        $this->assertEquals($message, PeriodicalTrigger::create('86400', $from, $until));
+        $this->assertEquals($message, PeriodicalTrigger::create('P1D', $from, $until));
         $this->assertEquals($message, PeriodicalTrigger::create($day, $now, $farFuture));
         $this->assertEquals($message, PeriodicalTrigger::create($day, $now));
 
-        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($firstRun, $day, $priorTo)));
-        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($firstRun->sub($day), $day, $priorTo, \DatePeriod::EXCLUDE_START_DATE)));
-        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($firstRun, $day, 284107)));
-        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($firstRun->sub($day), $day, 284108, \DatePeriod::EXCLUDE_START_DATE)));
+        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($from, $day, $until)));
+        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($from->sub($day), $day, $until, \DatePeriod::EXCLUDE_START_DATE)));
+        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($from, $day, 284107)));
+        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($from->sub($day), $day, 284108, \DatePeriod::EXCLUDE_START_DATE)));
     }
 
     public function testTooBigInterval()
diff --git a/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php b/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php
index abbafde6cf1c3..6ddefb8bcb4e8 100644
--- a/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php
@@ -19,15 +19,15 @@ final class ExcludeTimeTrigger implements TriggerInterface
     public function __construct(
         private readonly TriggerInterface $inner,
         private readonly \DateTimeImmutable $from,
-        private readonly \DateTimeImmutable $to,
+        private readonly \DateTimeImmutable $until,
     ) {
     }
 
     public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
     {
         $nextRun = $this->inner->getNextRunDate($run);
-        if ($nextRun >= $this->from && $nextRun <= $this->to) {
-            return $this->inner->getNextRunDate($this->to);
+        if ($nextRun >= $this->from && $nextRun <= $this->until) {
+            return $this->inner->getNextRunDate($this->until);
         }
 
         return $nextRun;
diff --git a/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php b/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php
index 50d83acadf65f..db71556565dcf 100644
--- a/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php
@@ -20,8 +20,8 @@ final class PeriodicalTrigger implements TriggerInterface
 {
     public function __construct(
         private readonly int $intervalInSeconds,
-        private readonly \DateTimeImmutable $firstRun = new \DateTimeImmutable(),
-        private readonly \DateTimeImmutable $priorTo = new \DateTimeImmutable('3000-01-01'),
+        private readonly \DateTimeImmutable $from = new \DateTimeImmutable(),
+        private readonly \DateTimeImmutable $until = new \DateTimeImmutable('3000-01-01'),
     ) {
         if (0 >= $this->intervalInSeconds) {
             throw new InvalidArgumentException('The "$intervalInSeconds" argument must be greater then zero.');
@@ -30,14 +30,14 @@ public function __construct(
 
     public static function create(
         string|int|\DateInterval $interval,
-        string|\DateTimeImmutable $firstRun = new \DateTimeImmutable(),
-        string|\DateTimeImmutable $priorTo = new \DateTimeImmutable('3000-01-01'),
+        string|\DateTimeImmutable $from = new \DateTimeImmutable(),
+        string|\DateTimeImmutable $until = new \DateTimeImmutable('3000-01-01'),
     ): self {
-        if (\is_string($firstRun)) {
-            $firstRun = new \DateTimeImmutable($firstRun);
+        if (\is_string($from)) {
+            $from = new \DateTimeImmutable($from);
         }
-        if (\is_string($priorTo)) {
-            $priorTo = new \DateTimeImmutable($priorTo);
+        if (\is_string($until)) {
+            $until = new \DateTimeImmutable($until);
         }
         if (\is_string($interval)) {
             if ('P' === $interval[0]) {
@@ -50,42 +50,42 @@ public static function create(
             }
         }
         if (!\is_int($interval)) {
-            $interval = self::calcInterval($firstRun, $firstRun->add($interval));
+            $interval = self::calcInterval($from, $from->add($interval));
         }
 
-        return new self($interval, $firstRun, $priorTo);
+        return new self($interval, $from, $until);
     }
 
     public static function fromPeriod(\DatePeriod $period): self
     {
         $startDate = \DateTimeImmutable::createFromInterface($period->getStartDate());
         $nextDate = $startDate->add($period->getDateInterval());
-        $firstRun = $period->include_start_date ? $startDate : $nextDate;
+        $from = $period->include_start_date ? $startDate : $nextDate;
         $interval = self::calcInterval($startDate, $nextDate);
 
-        $priorTo = $period->getEndDate()
+        $until = $period->getEndDate()
             ? \DateTimeImmutable::createFromInterface($period->getEndDate())
             : $startDate->modify($period->getRecurrences() * $interval.' seconds');
 
-        return new self($interval, $firstRun, $priorTo);
+        return new self($interval, $from, $until);
     }
 
     public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
     {
-        if ($this->firstRun > $run) {
-            return $this->firstRun;
+        if ($this->from > $run) {
+            return $this->from;
         }
-        if ($this->priorTo <= $run) {
+        if ($this->until <= $run) {
             return null;
         }
 
-        $delta = $run->format('U.u') - $this->firstRun->format('U.u');
+        $delta = $run->format('U.u') - $this->from->format('U.u');
         $recurrencesPassed = (int) ($delta / $this->intervalInSeconds);
-        $nextRunTimestamp = ($recurrencesPassed + 1) * $this->intervalInSeconds + $this->firstRun->getTimestamp();
+        $nextRunTimestamp = ($recurrencesPassed + 1) * $this->intervalInSeconds + $this->from->getTimestamp();
         /** @var \DateTimeImmutable $nextRun */
-        $nextRun = \DateTimeImmutable::createFromFormat('U.u', $nextRunTimestamp.$this->firstRun->format('.u'));
+        $nextRun = \DateTimeImmutable::createFromFormat('U.u', $nextRunTimestamp.$this->from->format('.u'));
 
-        return $this->priorTo > $nextRun ? $nextRun : null;
+        return $this->until > $nextRun ? $nextRun : null;
     }
 
     private static function calcInterval(\DateTimeImmutable $from, \DateTimeImmutable $to): int
@@ -105,7 +105,7 @@ private static function calcInterval(\DateTimeImmutable $from, \DateTimeImmutabl
     private static function ensureIntervalSize(string|float $interval): void
     {
         if ($interval > \PHP_INT_MAX) {
-            throw new InvalidArgumentException('The interval for a periodical message is too big. If you need to run it once, use "$priorTo" argument.');
+            throw new InvalidArgumentException('The interval for a periodical message is too big. If you need to run it once, use "$until" argument.');
         }
     }
 }

From 8e1a6e749ed3c8f5859f4f47655e602524554986 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sun, 19 Mar 2023 15:01:51 +0100
Subject: [PATCH 312/475] [Messenger] Add Clock support in Worker

---
 .../Component/Messenger/Tests/WorkerTest.php  | 53 +++++++++----------
 src/Symfony/Component/Messenger/Worker.php    | 28 +++++-----
 src/Symfony/Component/Messenger/composer.json |  3 +-
 3 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
index 1359458075f0b..ae62a3a5965ee 100644
--- a/src/Symfony/Component/Messenger/Tests/WorkerTest.php
+++ b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Clock\MockClock;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
 use Symfony\Component\Messenger\Envelope;
@@ -88,7 +89,7 @@ public function dispatch(object $event): object
             }
         };
 
-        $worker = new Worker(['transport' => $receiver], $bus, $dispatcher);
+        $worker = new Worker(['transport' => $receiver], $bus, $dispatcher, clock: new MockClock());
         $worker->run();
 
         $this->assertSame($apiMessage, $envelopes[0]->getMessage());
@@ -112,7 +113,7 @@ public function testHandlingErrorCausesReject()
         $dispatcher = new EventDispatcher();
         $dispatcher->addSubscriber(new StopWorkerOnMessageLimitListener(1));
 
-        $worker = new Worker(['transport1' => $receiver], $bus, $dispatcher);
+        $worker = new Worker(['transport1' => $receiver], $bus, $dispatcher, clock: new MockClock());
         $worker->run();
 
         $this->assertSame(1, $receiver->getRejectCount());
@@ -127,7 +128,7 @@ public function testWorkerResetsConnectionIfReceiverIsResettable()
         $dispatcher->addSubscriber(new ResetServicesListener(new ServicesResetter(new \ArrayIterator([$resettableReceiver]), ['reset'])));
 
         $bus = $this->createMock(MessageBusInterface::class);
-        $worker = new Worker([$resettableReceiver], $bus, $dispatcher);
+        $worker = new Worker([$resettableReceiver], $bus, $dispatcher, clock: new MockClock());
         $worker->stop();
         $worker->run();
         $this->assertTrue($resettableReceiver->hasBeenReset());
@@ -145,7 +146,7 @@ public function testWorkerResetsTransportsIfResetServicesListenerIsCalled()
         });
 
         $bus = $this->createMock(MessageBusInterface::class);
-        $worker = new Worker([$resettableReceiver], $bus, $dispatcher);
+        $worker = new Worker([$resettableReceiver], $bus, $dispatcher, clock: new MockClock());
         $worker->run();
         $this->assertTrue($resettableReceiver->hasBeenReset());
     }
@@ -162,7 +163,7 @@ public function testWorkerDoesNotResetTransportsIfResetServicesListenerIsNotCall
             $event->getWorker()->stop();
         });
 
-        $worker = new Worker([$resettableReceiver], $bus, $dispatcher);
+        $worker = new Worker([$resettableReceiver], $bus, $dispatcher, clock: new MockClock());
         $worker->run();
         $this->assertFalse($resettableReceiver->hasBeenReset());
     }
@@ -181,7 +182,7 @@ public function testWorkerDoesNotSendNullMessagesToTheBus()
             $event->getWorker()->stop();
         });
 
-        $worker = new Worker([$receiver], $bus, $dispatcher);
+        $worker = new Worker([$receiver], $bus, $dispatcher, clock: new MockClock());
         $worker->run();
     }
 
@@ -215,7 +216,7 @@ public function testWorkerDispatchesEventsOnSuccess()
                 return $event;
             });
 
-        $worker = new Worker([$receiver], $bus, $eventDispatcher);
+        $worker = new Worker([$receiver], $bus, $eventDispatcher, clock: new MockClock());
         $worker->run();
     }
 
@@ -225,7 +226,7 @@ public function testWorkerWithoutDispatcher()
         $receiver = new DummyReceiver([[$envelope]]);
 
         $bus = $this->createMock(MessageBusInterface::class);
-        $worker = new Worker([$receiver], $bus);
+        $worker = new Worker([$receiver], $bus, clock: new MockClock());
 
         $bus->expects($this->once())
             ->method('dispatch')
@@ -269,7 +270,7 @@ public function testWorkerDispatchesEventsOnError()
                 return $event;
             });
 
-        $worker = new Worker([$receiver], $bus, $eventDispatcher);
+        $worker = new Worker([$receiver], $bus, $eventDispatcher, clock: new MockClock());
         $worker->run();
10000

     }
 
@@ -286,7 +287,7 @@ public function testWorkerContainsMetadata()
             $event->getWorker()->stop();
         });
 
-        $worker = new Worker(['dummyReceiver' => $receiver], $bus, $dispatcher);
+        $worker = new Worker(['dummyReceiver' => $receiver], $bus, $dispatcher, clock: new MockClock());
         $worker->run(['queues' => ['queue1', 'queue2']]);
 
         $workerMetadata = $worker->getMetadata();
@@ -313,16 +314,10 @@ public function testTimeoutIsConfigurable()
         $dispatcher = new EventDispatcher();
         $dispatcher->addSubscriber(new StopWorkerOnMessageLimitListener(5));
 
-        $worker = new Worker([$receiver], $bus, $dispatcher);
-        $startTime = microtime(true);
-        // sleep .1 after each idle
-        $worker->run(['sleep' => 100000]);
-
-        $duration = microtime(true) - $startTime;
-        // wait time should be .3 seconds
-        // use .29 & .31 for timing "wiggle room"
-        $this->assertGreaterThanOrEqual(.29, $duration);
-        $this->assertLessThan(.31, $duration);
+        $clock = new MockClock('2023-03-19 14:00:00');
+        $worker = new Worker([$receiver], $bus, $dispatcher, clock: $clock);
+        $worker->run(['sleep' => 1000000]);
+        $this->assertEquals(new \DateTimeImmutable('2023-03-19 14:00:03'), $clock->now());
     }
 
     public function testWorkerWithMultipleReceivers()
@@ -368,7 +363,7 @@ public function testWorkerWithMultipleReceivers()
         $dispatcher->addListener(WorkerMessageReceivedEvent::class, function (WorkerMessageReceivedEvent $event) use (&$processedEnvelopes) {
             $processedEnvelopes[] = $event->getEnvelope();
         });
-        $worker = new Worker([$receiver1, $receiver2, $receiver3], $bus, $dispatcher);
+        $worker = new Worker([$receiver1, $receiver2, $receiver3], $bus, $dispatcher, clock: new MockClock());
         $worker->run();
 
         // make sure they were processed in the correct order
@@ -393,7 +388,7 @@ public function testWorkerLimitQueues()
         $dispatcher = new EventDispatcher();
         $dispatcher->addSubscriber(new StopWorkerOnMessageLimitListener(1));
 
-        $worker = new Worker(['transport' => $receiver], $bus, $dispatcher);
+        $worker = new Worker(['transport' => $receiver], $bus, $dispatcher, clock: new MockClock());
         $worker->run(['queues' => ['foo']]);
     }
 
@@ -404,7 +399,7 @@ public function testWorkerLimitQueuesUnsupported()
 
         $bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
 
-        $worker = new Worker(['transport1' => $receiver1, 'transport2' => $receiver2], $bus);
+        $worker = new Worker(['transport1' => $receiver1, 'transport2' => $receiver2], $bus, clock: new MockClock());
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage(sprintf('Receiver for "transport2" does not implement "%s".', QueueReceiverInterface::class));
         $worker->run(['queues' => ['foo']]);
@@ -429,7 +424,7 @@ public function testWorkerMessageReceivedEventMutability()
 
         $eventDispatcher->addListener(WorkerMessageReceivedEvent::class, $listener);
 
-        $worker = new Worker([$receiver], $bus, $eventDispatcher);
+        $worker = new Worker([$receiver], $bus, $eventDispatcher, clock: new MockClock());
         $worker->run();
 
         $envelope = current($receiver->getAcknowledgedEnvelopes());
@@ -464,7 +459,7 @@ public function testWorkerRateLimitMessages()
             'interval' => '1 minute',
         ], new InMemoryStorage());
 
-        $worker = new Worker(['bus' => $receiver], $bus, $eventDispatcher, null, ['bus' => $rateLimitFactory]);
+        $worker = new Worker(['bus' => $receiver], $bus, $eventDispatcher, null, ['bus' => $rateLimitFactory], new MockClock());
         $worker->run();
 
         $this->assertCount(2, $receiver->getAcknowledgedEnvelopes());
@@ -476,7 +471,7 @@ public function testWorkerShouldLogOnStop()
         $bus = $this->createMock(MessageBusInterface::class);
         $logger = $this->createMock(LoggerInterface::class);
         $logger->expects($this->once())->method('info')->with('Stopping worker.');
-        $worker = new Worker([], $bus, new EventDispatcher(), $logger);
+        $worker = new Worker([], $bus, new EventDispatcher(), $logger, clock: new MockClock());
 
         $worker->stop();
     }
@@ -512,7 +507,7 @@ public function testBatchProcessing()
             }
         });
 
-        $worker = new Worker([$receiver], $bus, $dispatcher);
+        $worker = new Worker([$receiver], $bus, $dispatcher, clock: new MockClock());
         $worker->run();
 
         $this->assertSame($expectedMessages, $handler->processedMessages);
@@ -548,7 +543,7 @@ public function testFlushBatchOnIdle()
             }
         });
 
-        $worker = new Worker([$receiver], $bus, $dispatcher);
+        $worker = new Worker([$receiver], $bus, $dispatcher, clock: new MockClock());
         $worker->run();
 
         $this->assertSame($expectedMessages, $handler->processedMessages);
@@ -578,7 +573,7 @@ public function testFlushBatchOnStop()
             $this->assertSame(0, $receiver->getAcknowledgeCount());
         });
 
-        $worker = new Worker([$receiver], $bus, $dispatcher);
+        $worker = new Worker([$receiver], $bus, $dispatcher, clock: new MockClock());
         $worker->run();
 
         $this->assertSame($expectedMessages, $handler->processedMessages);
diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php
index 1608644f9d6bd..606d4bbd387a2 100644
--- a/src/Symfony/Component/Messenger/Worker.php
+++ b/src/Symfony/Component/Messenger/Worker.php
@@ -13,6 +13,8 @@
 
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Clock\Clock;
+use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
 use Symfony\Component\Messenger\Event\WorkerMessageHandledEvent;
 use Symfony\Component\Messenger\Event\WorkerMessageReceivedEvent;
@@ -40,30 +42,26 @@
  */
 class Worker
 {
-    private array $receivers;
-    private MessageBusInterface $bus;
-    private ?EventDispatcherInterface $eventDispatcher;
-    private ?LoggerInterface $logger;
     private bool $shouldStop = false;
     private WorkerMetadata $metadata;
     private array $acks = [];
     private \SplObjectStorage $unacks;
-    private ?array $rateLimiters;
 
     /**
      * @param ReceiverInterface[] $receivers Where the key is the transport name
      */
-    public function __construct(array $receivers, MessageBusInterface $bus, EventDispatcherInterface $eventDispatcher = null, LoggerInterface $logger = null, array $rateLimiters = null)
-    {
-        $this->receivers = $receivers;
-        $this->bus = $bus;
-        $this->logger = $logger;
-        $this->eventDispatcher = $eventDispatcher;
+    public function __construct(
+        private array $receivers,
+        private MessageBusInterface $bus,
+        private ?EventDispatcherInterface $eventDispatcher = null,
+        private ?LoggerInterface $logger = null,
+        private ?array $rateLimiters = null,
+        private ClockInterface $clock = new Clock(),
+    ) {
         $this->metadata = new WorkerMetadata([
             'transportNames' => array_keys($receivers),
         ]);
         $this->unacks = new \SplObjectStorage();
-        $this->rateLimiters = $rateLimiters;
     }
 
     /**
@@ -95,7 +93,7 @@ public function run(array $options = []): void
 
         while (!$this->shouldStop) {
             $envelopeHandled = false;
-            $envelopeHandledStart = microtime(true);
+            $envelopeHandledStart = $this->clock->now();
             foreach ($this->receivers as $transportName => $receiver) {
                 if ($queueNames) {
                     $envelopes = $receiver->getFromQueues($queueNames);
@@ -130,8 +128,8 @@ public function run(array $options = []): void
             if (!$envelopeHandled) {
                 $this->eventDispatcher?->dispatch(new WorkerRunningEvent($this, true));
 
-                if (0 < $sleep = (int) ($options['sleep'] - 1e6 * (microtime(true) - $envelopeHandledStart))) {
-                    usleep($sleep);
+                if (0 < $sleep = (int) ($options['sleep'] - 1e6 * ($this->clock->now()->format('U.u') - $envelopeHandledStart->format('U.u')))) {
+                    $this->clock->sleep($sleep / 1e6);
                 }
             }
         }
diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json
index 8d3d0f2653ac7..e544bea1b1a96 100644
--- a/src/Symfony/Component/Messenger/composer.json
+++ b/src/Symfony/Component/Messenger/composer.json
@@ -17,7 +17,8 @@
     ],
     "require": {
         "php": ">=8.1",
-        "psr/log": "^1|^2|^3"
+        "psr/log": "^1|^2|^3",
+        "symfony/clock": "^6.3"
     },
     "require-dev": {
         "psr/cache": "^1.0|^2.0|^3.0",

From 610de6ad454be4236d84b661bc6636d94dae3f27 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 14 Mar 2023 18:00:39 +0100
Subject: [PATCH 313/475] [DependencyInjection] Add support for
 `#[Autowire(lazy: true)]`

---
 .../Attribute/Autowire.php                    |  10 +-
 .../Attribute/AutowireCallable.php            |   4 +-
 .../DependencyInjection/CHANGELOG.md          |   1 +
 .../Compiler/AutowirePass.php                 |  40 ++++---
 .../RegisterServiceSubscribersPassTest.php    |   2 +-
 .../Tests/Dumper/PhpDumperTest.php            |  39 ++++++-
 .../Tests/Fixtures/php/autowire_closure.php   |   4 +-
 .../Fixtures/php/lazy_autowire_attribute.php  | 102 ++++++++++++++++++
 8 files changed, 174 insertions(+), 28 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute.php

diff --git a/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php b/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
index 44f76f04742cb..b22025676820c 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
@@ -24,7 +24,7 @@
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
 class Autowire
 {
-    public readonly string|array|Expression|Reference|ArgumentInterface $value;
+    public readonly string|array|Expression|Reference|ArgumentInterface|null $value;
 
     /**
      * Use only ONE of the following.
@@ -41,8 +41,12 @@ public function __construct(
         string $expression = null,
         string $env = null,
         string $param = null,
+        public bool $lazy = false,
     ) {
-        if (!(null !== $value xor null !== $service xor null !== $expression xor null !== $env xor null !== $param)) {
+        if ($lazy && null !== ($expression ?? $env ?? $param)) {
+            throw new LogicException('#[Autowire] attribute cannot be $lazy and use $env, $param, or $value.');
+        }
+        if (!$lazy && !(null !== $value xor null !== $service xor null !== $expression xor null !== $env xor null !== $param)) {
             throw new LogicException('#[Autowire] attribute must declare exactly one of $service, $expression, $env, $param or $value.');
         }
 
@@ -59,7 +63,7 @@ public function __construct(
             null !== $expression => class_exists(Expression::class) ? new Expression($expression) : throw new LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed. Try running "composer require symfony/expression-language".'),
             null !== $env => "%env($env)%",
             null !== $param => "%$param%",
-            null !== $value => $value,
+            default => $value,
         };
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php b/src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php
index a48040935a7f8..08fdc6e6904aa 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php
@@ -24,7 +24,7 @@ public function __construct(
         string|array $callable = null,
         string $service = null,
         string $method = null,
-        public bool $lazy = false,
+        bool $lazy = false,
     ) {
         if (!(null !== $callable xor null !== $service)) {
             throw new LogicException('#[AutowireCallable] attribute must declare exactly one of $callable or $service.');
@@ -33,6 +33,6 @@ public function __construct(
             throw new LogicException('#[AutowireCallable] attribute must declare one of $callable or $method.');
         }
 
-        parent::__construct($callable ?? [new Reference($service), $method ?? '__invoke']);
+        parent::__construct($callable ?? [new Reference($service), $method ?? '__invoke'], lazy: $lazy);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index d4b14d68d43a9..7b37ddbb7b6c7 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -17,6 +17,7 @@ CHANGELOG
  * Add `#[Exclude]` to skip autoregistering a class
  * Add support for generating lazy closures
  * Add support for autowiring services as closures using `#[AutowireCallable]` or `#[AutowireServiceClosure]`
+ * Add support for `#[Autowire(lazy: true)]`
  * Deprecate `#[MapDecorated]`, use `#[AutowireDecorated]` instead
  * Deprecate the `@required` annotation, use the `Symfony\Contracts\Service\Attribute\Required` attribute instead
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 6cb09ccdfe92f..3378c8bb06f55 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -269,17 +269,38 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
             $name = Target::parseName($parameter, $target);
             $target = $target ? [$target] : [];
 
+            $getValue = function () use ($type, $parameter, $class, $method, $name, $target) {
+                if (!$value = $this->getAutowiredReference($ref = new TypedReference($type, $type, ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE, $name, $target), false)) {
+                    $failureMessage = $this->createTypeNotFoundMessageCallback($ref, sprintf('argument "$%s" of method "%s()"', $parameter->name, $class !== $this->currentId ? $class.'::'.$method : $method));
+
+                    if ($parameter->isDefaultValueAvailable()) {
+                        $value = clone $this->defaultArgument;
+                        $value->value = $parameter->getDefaultValue();
+                    } elseif (!$parameter->allowsNull()) {
+                        throw new AutowiringFailedException($this->currentId, $failureMessage);
+                    }
+                }
+
+                return $value;
+            };
+
             if ($checkAttributes) {
                 foreach ($parameter->getAttributes(Autowire::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
                     $attribute = $attribute->newInstance();
                     $invalidBehavior = $parameter->allowsNull() ? ContainerInterface::NULL_ON_INVALID_REFERENCE : ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE;
                     $value = $this->processValue(new TypedReference($type ?: '?', $type ?: 'mixed', $invalidBehavior, $name, [$attribute, ...$target]));
 
-                    if ($attribute instanceof AutowireCallable || 'Closure' === $type && \is_array($value)) {
+                    if ($attribute instanceof AutowireCallable) {
                         $value = (new Definition('Closure'))
                             ->setFactory(['Closure', 'fromCallable'])
                             ->setArguments([$value + [1 => '__invoke']])
-                            ->setLazy($attribute instanceof AutowireCallable && $attribute->lazy);
+                            ->setLazy($attribute->lazy);
+                    } elseif ($attribute->lazy && ($value instanceof Reference ? !$this->container->has($value) || !$this->container->findDefinition($value)->isLazy() : null === $attribute->value && $type)) {
+                        $this->container->register('.lazy.'.$value ??= $getValue(), $type)
+                            ->setFactory('current')
+                            ->setArguments([[$value]])
+                            ->setLazy(true);
+                        $value = new Reference('.lazy.'.$value);
                     }
                     $arguments[$index] = $value;
 
@@ -326,21 +347,6 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                 continue;
             }
 
-            $getValue = function () use ($type, $parameter, $class, $method, $name, $target) {
-                if (!$value = $this->getAutowiredReference($ref = new TypedReference($type, $type, ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE, $name, $target), false)) {
-                    $failureMessage = $this->createTypeNotFoundMessageCallback($ref, sprintf('argument "$%s" of method "%s()"', $parameter->name, $class !== $this->currentId ? $class.'::'.$method : $method));
-
-                    if ($parameter->isDefaultValueAvailable()) {
-                        $value = clone $this->defaultArgument;
-                        $value->value = $parameter->getDefaultValue();
-                    } elseif (!$parameter->allowsNull()) {
-                        throw new AutowiringFailedException($this->currentId, $failureMessage);
-                    }
-                }
-
-                return $value;
-            };
-
             if ($this->decoratedClass && is_a($this->decoratedClass, $type, true)) {
                 if ($this->getPreviousValue) {
                     // The inner service is injected only if there is only 1 argument matching the type of the decorated class
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
index e671bef672dd6..45ff1b651a47b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
@@ -462,7 +462,7 @@ public static function getSubscribedServices(): array
             'autowired' => new ServiceClosureArgument(new TypedReference('service.id', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'autowired', [new Autowire(service: 'service.id')])),
             'autowired.nullable' => new ServiceClosureArgument(new TypedReference('service.id', 'stdClass', ContainerInterface::IGNORE_ON_INVALID_REFERENCE, 'autowired.nullable', [new Autowire(service: 'service.id')])),
             'autowired.parameter' => new ServiceClosureArgument('foobar'),
-            'autowire.decorated' => new ServiceClosureArgument(new Reference('.service_locator.QVDPERh.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
+            'autowire.decorated' => new ServiceClosureArgument(new Reference('.service_locator.0tSxobl.inner', ContainerInterface::NULL_ON_INVALID_REFERENCE)),
             'target' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, 'target', [new Target('someTarget')])),
         ];
         $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 9eb3f40eb338e..2a05ce2459783 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -59,6 +59,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\WitherStaticReturnType;
 use Symfony\Component\DependencyInjection\TypedReference;
 use Symfony\Component\ExpressionLanguage\Expression;
+use Symfony\Component\VarExporter\LazyObjectInterface;
 
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
 require_once __DIR__.'/../Fixtures/includes/classes.php';
@@ -1697,7 +1698,7 @@ public function testAutowireClosure()
             ->setFactory(['Closure', 'fromCallable'])
             ->setArguments(['var_dump'])
             ->setPublic('true');
-        $container->register('bar', LazyConsumer::class)
+        $container->register('bar', LazyClosureConsumer::class)
             ->setPublic('true')
             ->setAutowired(true);
         $container->compile();
@@ -1710,7 +1711,7 @@ public function testAutowireClosure()
         $container = new \Symfony_DI_PhpDumper_Test_Autowire_Closure();
 
         $this->assertInstanceOf(Foo::class, $container->get('foo'));
-        $this->assertInstanceOf(LazyConsumer::class, $bar = $container->get('bar'));
+        $this->assertInstanceOf(LazyClosureConsumer::class, $bar = $container->get('bar'));
         $this->assertInstanceOf(\Closure::class, $bar->foo);
         $this->assertInstanceOf(\Closure::class, $bar->baz);
         $this->assertInstanceOf(\Closure::class, $bar->buz);
@@ -1745,6 +1746,29 @@ public function testLazyClosure()
         $this->assertSame(1 + $cloned, Foo::$counter);
         $this->assertSame(1, (new \ReflectionFunction($container->get('closure')))->getNumberOfParameters());
     }
+
+    public function testLazyAutowireAttribute()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', Foo::class)
+            ->setPublic('true');
+        $container->setAlias(Foo::class, 'foo');
+        $container->register('bar', LazyServiceConsumer::class)
+            ->setPublic('true')
+            ->setAutowired(true);
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/lazy_autowire_attribute.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Lazy_Autowire_Attribute']));
+
+        require self::$fixturesPath.'/php/lazy_autowire_attribute.php';
+
+        $container = new \Symfony_DI_PhpDumper_Test_Lazy_Autowire_Attribute();
+
+        $this->assertInstanceOf(Foo::class, $container->get('bar')->foo);
+        $this->assertInstanceOf(LazyObjectInterface::class, $container->get('bar')->foo);
+        $this->assertSame($container->get('foo'), $container->get('bar')->foo->initializeLazyObject());
+    }
 }
 
 class Rot13EnvVarProcessor implements EnvVarProcessorInterface
@@ -1771,7 +1795,7 @@ public function __construct(\stdClass $a, \stdClass $b)
     }
 }
 
-class LazyConsumer
+class LazyClosureConsumer
 {
     public function __construct(
         #[AutowireServiceClosure('foo')]
@@ -1783,3 +1807,12 @@ public function __construct(
     ) {
     }
 }
+
+class LazyServiceConsumer
+{
+    public function __construct(
+        #[Autowire(lazy: true)]
+        public Foo $foo,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/autowire_closure.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/autowire_closure.php
index e3ec79ab70cfd..4cdc6e28d78ac 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/autowire_closure.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/autowire_closure.php
@@ -43,13 +43,13 @@ public function isCompiled(): bool
     /**
      * Gets the public 'bar' shared autowired service.
      *
-     * @return \Symfony\Component\DependencyInjection\Tests\Dumper\LazyConsumer
+     * @return \Symfony\Component\DependencyInjection\Tests\Dumper\LazyClosureConsumer
      */
     protected static function getBarService($container)
     {
         $containerRef = $container->ref;
 
-        return $container->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\LazyConsumer(#[\Closure(name: 'foo', class: 'Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo')] function () use ($containerRef) {
+        return $container->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\LazyClosureConsumer(#[\Closure(name: 'foo', class: 'Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo')] function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->services['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo());
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute.php
new file mode 100644
index 0000000000000..fe246c8280ecb
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute.php
@@ -0,0 +1,102 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class Symfony_DI_PhpDumper_Test_Lazy_Autowire_Attribute extends Container
+{
+    protected $parameters = [];
+    protected readonly \WeakReference $ref;
+
+    public function __construct()
+    {
+        $this->ref = \WeakReference::create($this);
+        $this->services = $this->privates = [];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'foo' => 'getFooService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function compile(): void
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled(): bool
+    {
+        return true;
+    }
+
+    public function getRemovedIds(): array
+    {
+        return [
+            '.lazy.Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo' => true,
+            'Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo' => true,
+        ];
+    }
+
+    protected function createProxy($class, \Closure $factory)
+    {
+        return $factory();
+    }
+
+    /**
+     * Gets the public 'bar' shared autowired service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Dumper\LazyServiceConsumer
+     */
+    protected static function getBarService($container)
+    {
+        return $container->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\LazyServiceConsumer(($container->privates['.lazy.Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo'] ?? self::getFoo2Service($container)));
+    }
+
+    /**
+     * Gets the public 'foo' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Compiler\Foo
+     */
+    protected static function getFooService($container)
+    {
+        return $container->services['foo'] = new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo();
+    }
+
+    /**
+     * Gets the private '.lazy.Symfony\Component\DependencyInjection\Tests\Compiler\Foo' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Compiler\Foo
+     */
+    protected static function getFoo2Service($container, $lazyLoad = true)
+    {
+        $containerRef = $container->ref;
+
+        if (true === $lazyLoad) {
+            return $container->privates['.lazy.Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo'] = $container->createProxy('FooProxy9f41ec7', static fn () => \FooProxy9f41ec7::createLazyProxy(static fn () => self::getFoo2Service($containerRef->get(), false)));
+        }
+
+        return ($container->services['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo());
+    }
+}
+
+class FooProxy9f41ec7 extends \Symfony\Component\DependencyInjection\Tests\Compiler\Foo implements \Symfony\Component\VarExporter\LazyObjectInterface
+{
+    use \Symfony\Component\VarExporter\LazyProxyTrait;
+
+    private const LAZY_OBJECT_PROPERTY_SCOPES = [];
+}
+
+// Help opcache.preload discover always-needed symbols
+class_exists(\Symfony\Component\VarExporter\Internal\Hydrator::class);
+class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectRegistry::class);
+class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);

From f6a4fa737b2563151fc3dac0d9911b82fdd56e99 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 20 Mar 2023 09:28:54 +0100
Subject: [PATCH 314/475] [DI] minor fix

---
 .../DependencyInjection/Attribute/Autowire.php       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php b/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
index b22025676820c..6249e65cbc7b9 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
@@ -43,10 +43,14 @@ public function __construct(
         string $param = null,
         public bool $lazy = false,
     ) {
-        if ($lazy && null !== ($expression ?? $env ?? $param)) {
-            throw new LogicException('#[Autowire] attribute cannot be $lazy and use $env, $param, or $value.');
-        }
-        if (!$lazy && !(null !== $value xor null !== $service xor null !== $expression xor null !== $env xor null !== $param)) {
+        if ($lazy) {
+            if (null !== ($expression ?? $env ?? $param)) {
+                throw new LogicException('#[Autowire] attribute cannot be $lazy and use $expression, $env, or $param.');
+            }
+            if (null !== $value && null !== $service) {
+                throw new LogicException('#[Autowire] attribute cannot declare $value and $service at the same time.');
+            }
+        } elseif (!(null !== $value xor null !== $service xor null !== $expression xor null !== $env xor null !== $param)) {
             throw new LogicException('#[Autowire] attribute must declare exactly one of $service, $expression, $env, $param or $value.');
         }
 

From bf4ad40178f4d7da639ba4a7225c2eba78fc7b6f Mon Sep 17 00:00:00 2001
From: onexhovia <onexhovia@gmail.com>
Date: Mon, 20 Mar 2023 15:32:29 +0700
Subject: [PATCH 315/475] [Webhook] Add readonly modifier where this possible

---
 .../Component/Webhook/Controller/WebhookController.php        | 4 ++--
 .../Component/Webhook/Server/HeaderSignatureConfigurator.php  | 4 ++--
 src/Symfony/Component/Webhook/Server/HeadersConfigurator.php  | 4 ++--
 src/Symfony/Component/Webhook/Subscriber.php                  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Component/Webhook/Controller/WebhookController.php b/src/Symfony/Component/Webhook/Controller/WebhookController.php
index f0d90f0609889..a31e9a5d08567 100644
--- a/src/Symfony/Component/Webhook/Controller/WebhookController.php
+++ b/src/Symfony/Component/Webhook/Controller/WebhookController.php
@@ -30,8 +30,8 @@ final class WebhookController
 {
     public function __construct(
         /** @var array<string, array{parser: RequestParserInterface, secret: string}> $parsers */
-        private array $parsers,
-        private MessageBusInterface $bus,
+        private readonly array $parsers,
+        private readonly MessageBusInterface $bus,
     ) {
     }
 
diff --git a/src/Symfony/Component/Webhook/Server/HeaderSignatureConfigurator.php b/src/Symfony/Component/Webhook/Server/HeaderSignatureConfigurator.php
index d14d25c3fa93f..ced63cccb6aba 100644
--- a/src/Symfony/Component/Webhook/Server/HeaderSignatureConfigurator.php
+++ b/src/Symfony/Component/Webhook/Server/HeaderSignatureConfigurator.php
@@ -23,8 +23,8 @@
 final class HeaderSignatureConfigurator implements RequestConfiguratorInterface
 {
     public function __construct(
-        private string $algo = 'sha256',
-        private string $signatureHeaderName = 'Webhook-Signature',
+        private readonly string $algo = 'sha256',
+        private readonly string $signatureHeaderName = 'Webhook-Signature',
     ) {
     }
 
diff --git a/src/Symfony/Component/Webhook/Server/HeadersConfigurator.php b/src/Symfony/Component/Webhook/Server/HeadersConfigurator.php
index 70ca1b63ae035..b51d463be0a2e 100644
--- a/src/Symfony/Component/Webhook/Server/HeadersConfigurator.php
+++ b/src/Symfony/Component/Webhook/Server/HeadersConfigurator.php
@@ -22,8 +22,8 @@
 final class HeadersConfigurator implements RequestConfiguratorInterface
 {
     public function __construct(
-        private string $eventHeaderName = 'Webhook-Event',
-        private string $idHeaderName = 'Webhook-Id',
+        private readonly string $eventHeaderName = 'Webhook-Event',
+        private readonly string $idHeaderName = 'Webhook-Id',
     ) {
     }
 
diff --git a/src/Symfony/Component/Webhook/Subscriber.php b/src/Symfony/Component/Webhook/Subscriber.php
index a369cb0470c34..ae39e6087b059 100644
--- a/src/Symfony/Component/Webhook/Subscriber.php
+++ b/src/Symfony/Component/Webhook/Subscriber.php
@@ -14,8 +14,8 @@
 class Subscriber
 {
     public function __construct(
-        private string $url,
-        #[\SensitiveParameter] private string $secret,
+        private readonly string $url,
+        #[\SensitiveParameter] private readonly string $secret,
     ) {
     }
 

From fecf5eccc90bc30bcf98ca7dc060a0212cfb3195 Mon Sep 17 00:00:00 2001
From: onexhovia <onexhovia@gmail.com>
Date: Mon, 20 Mar 2023 15:52:06 +0700
Subject: [PATCH 316/475] [RemoteEvent] Add readonly modifier where this
 possible

---
 .../RemoteEvent/Messenger/ConsumeRemoteEventMessage.php     | 4 ++--
 src/Symfony/Component/RemoteEvent/RemoteEvent.php           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventMessage.php b/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventMessage.php
index 23665865ddf02..55108480af9c5 100644
--- a/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventMessage.php
+++ b/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventMessage.php
@@ -21,8 +21,8 @@
 class ConsumeRemoteEventMessage
 {
     public function __construct(
-        private string $type,
-        private RemoteEvent $event,
+        private readonly string $type,
+        private readonly RemoteEvent $event,
     ) {
     }
 
diff --git a/src/Symfony/Component/RemoteEvent/RemoteEvent.php b/src/Symfony/Component/RemoteEvent/RemoteEvent.php
index e9fe2075b21a2..e77b65eeae92a 100644
--- a/src/Symfony/Component/RemoteEvent/RemoteEvent.php
+++ b/src/Symfony/Component/RemoteEvent/RemoteEvent.php
@@ -19,9 +19,9 @@
 class RemoteEvent
 {
     public function __construct(
-        private string $name,
-        private string $id,
-        private array $payload,
+        private readonly string $name,
+        private readonly string $id,
+        private readonly array $payload,
     ) {
     }
 

From 9a4ee58ebf1145a7ab13df8deb0de29537e58207 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sun, 19 Mar 2023 21:02:25 +0100
Subject: [PATCH 317/475] [Scheduler] Add DateIntervalTrigger and
 DatePeriodTrigger

---
 .../Component/Scheduler/RecurringMessage.php  |   6 +-
 .../Tests/Trigger/AbstractTriggerTest.php     |  53 +++++++
 .../Tests/Trigger/DateIntervalTriggerTest.php | 136 +++++++++++++++++
 .../Tests/Trigger/DatePeriodTriggerTest.php   |  63 ++++++++
 .../Tests/Trigger/PeriodicalTriggerTest.php   | 140 ------------------
 .../Scheduler/Trigger/DateIntervalTrigger.php |  50 +++++++
 .../Scheduler/Trigger/DatePeriodTrigger.php   |  36 +++++
 .../Scheduler/Trigger/PeriodicalTrigger.php   | 111 --------------
 8 files changed, 341 insertions(+), 254 deletions(-)
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Trigger/DateIntervalTriggerTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php
 delete mode 100644 src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Trigger/DateIntervalTrigger.php
 create mode 100644 src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php
 delete mode 100644 src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php

diff --git a/src/Symfony/Component/Scheduler/RecurringMessage.php b/src/Symfony/Component/Scheduler/RecurringMessage.php
index e2499c0a6e497..b4e9e0ce8947e 100644
--- a/src/Symfony/Component/Scheduler/RecurringMessage.php
+++ b/src/Symfony/Component/Scheduler/RecurringMessage.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
 use Symfony\Component\Scheduler\Trigger\CronExpressionTrigger;
-use Symfony\Component\Scheduler\Trigger\PeriodicalTrigger;
+use Symfony\Component\Scheduler\Trigger\DateIntervalTrigger;
 use Symfony\Component\Scheduler\Trigger\TriggerInterface;
 
 /**
@@ -32,13 +32,13 @@ private function __construct(
      *
      * @see https://php.net/datetime.formats.relative
      */
-    public static function every(string $frequency, object $message, \DateTimeImmutable $from = new \DateTimeImmutable(), \DateTimeImmutable $until = new \DateTimeImmutable('3000-01-01')): self
+    public static function every(string $frequency, object $message, string|\DateTimeImmutable $from = new \DateTimeImmutable(), string|\DateTimeImmutable $until = new \DateTimeImmutable('3000-01-01')): self
     {
         if (false === $interval = \DateInterval::createFromDateString($frequency)) {
             throw new InvalidArgumentException(sprintf('Frequency "%s" cannot be parsed.', $frequency));
         }
 
-        return new self(PeriodicalTrigger::create($interval, $from, $until), $message);
+        return new self(new DateIntervalTrigger($interval, $from, $until), $message);
     }
 
     public static function cron(string $expression, object $message): self
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTest.php
new file mode 100644
index 0000000000000..187afdad673f3
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Trigger;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Scheduler\Trigger\DatePeriodTrigger;
+use Symfony\Component\Scheduler\Trigger\TriggerInterface;
+
+abstract class AbstractTriggerTest extends TestCase
+{
+    /**
+     * @dataProvider providerGetNextRunDate
+     */
+    public function testGetNextRunDate(TriggerInterface $trigger, array $expected)
+    {
+        $this->assertEquals($expected, $this->getNextRunDates($trigger));
+    }
+
+    abstract public static function providerGetNextRunDate(): iterable;
+
+    protected static function createTrigger(string $interval): DatePeriodTrigger
+    {
+        return new DatePeriodTrigger(
+            new \DatePeriod(new \DateTimeImmutable('13:45'), \DateInterval::createFromDateString($interval), new \DateTimeImmutable('2023-06-19'))
+        );
+    }
+
+    private function getNextRunDates(TriggerInterface $trigger): array
+    {
+        $dates = [];
+        $i = 0;
+        $next = new \DateTimeImmutable();
+        while ($i++ < 20) {
+            $next = $trigger->getNextRunDate($next);
+            if (!$next) {
+                break;
+            }
+
+            $dates[] = $next;
+        }
+
+        return $dates;
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/DateIntervalTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/DateIntervalTriggerTest.php
new file mode 100644
index 0000000000000..5b1dccd6db583
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/DateIntervalTriggerTest.php
@@ -0,0 +1,136 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Trigger;
+
+use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
+use Symfony\Component\Scheduler\Trigger\DateIntervalTrigger;
+use Symfony\Component\Scheduler\Trigger\DatePeriodTrigger;
+
+class DateIntervalTriggerTest extends DatePeriodTriggerTest
+{
+    /**
+     * @dataProvider provideForConstructor
+     */
+    public function testConstructor(DateIntervalTrigger $trigger)
+    {
+        $run = new \DateTimeImmutable('2222-02-22 13:34:00');
+
+        $this->assertSame('2222-02-23 13:34:00', $trigger->getNextRunDate($run)->format('Y-m-d H:i:s'));
+    }
+
+    public static function provideForConstructor(): iterable
+    {
+        $from = new \DateTimeImmutable($now = '2222-02-22 13:34:00');
+        $until = new \DateTimeImmutable($farFuture = '3000-01-01');
+        $day = new \DateInterval('P1D');
+
+        return [
+            [new DateIntervalTrigger(86400, $from, $until)],
+            [new DateIntervalTrigger('86400', $from, $until)],
+            [new DateIntervalTrigger('P1D', $from, $until)],
+            [new DateIntervalTrigger($day, $now, $farFuture)],
+            [new DateIntervalTrigger($day, $now)],
+        ];
+    }
+
+    /**
+     * @dataProvider getInvalidIntervals
+     */
+    public function testInvalidInterval($interval)
+    {
+        $this->expectException(InvalidArgumentException::class);
+
+        new DateIntervalTrigger($interval, $now = new \DateTimeImmutable(), $now->modify('1 day'));
+    }
+
+    public static function getInvalidIntervals(): iterable
+    {
+        yield ['wrong'];
+        yield ['3600.5'];
+        yield [-3600];
+    }
+
+    /**
+     * @dataProvider providerGetNextRunDateAgain
+     */
+    public function testGetNextRunDateAgain(DateIntervalTrigger $trigger, \DateTimeImmutable $lastRun, ?\DateTimeImmutable $expected)
+    {
+        $this->assertEquals($expected, $trigger->getNextRunDate($lastRun));
+    }
+
+    public static function providerGetNextRunDateAgain(): iterable
+    {
+        $trigger = new DateIntervalTrigger(
+            600,
+            new \DateTimeImmutable('2020-02-20T02:00:00+02'),
+            new \DateTimeImmutable('2020-02-20T03:00:00+02')
+        );
+
+        yield [
+            $trigger,
+            new \DateTimeImmutable('@0'),
+            new \DateTimeImmutable('2020-02-20T02:00:00+02'),
+        ];
+        yield [
+            $trigger,
+            new \DateTimeImmutable('2020-02-20T01:59:59.999999+02'),
+            new \DateTimeImmutable('2020-02-20T02:00:00+02'),
+        ];
+        yield [
+            $trigger,
+            new \DateTimeImmutable('2020-02-20T02:00:00+02'),
+            new \DateTimeImmutable('2020-02-20T02:10:00+02'),
+        ];
+        yield [
+            $trigger,
+            new \DateTimeImmutable('2020-02-20T02:05:00+02'),
+            new \DateTimeImmutable('2020-02-20T02:10:00+02'),
+        ];
+        yield [
+            $trigger,
+            new \DateTimeImmutable('2020-02-20T02:49:59.999999+02'),
+            new \DateTimeImmutable('2020-02-20T02:50:00+02'),
+        ];
+        yield [
+            $trigger,
+            new \DateTimeImmutable('2020-02-20T02:50:00+02'),
+            null,
+        ];
+        yield [
+            $trigger,
+            new \DateTimeImmutable('2020-02-20T03:00:00+02'),
+            null,
+        ];
+
+        $trigger = new DateIntervalTrigger(
+            600,
+            new \DateTimeImmutable('2020-02-20T02:00:00Z'),
+            new \DateTimeImmutable('2020-02-20T03:01:00Z')
+        );
+
+        yield [
+            $trigger,
+            new \DateTimeImmutable('2020-02-20T02:59:59.999999Z'),
+            new \DateTimeImmutable('2020-02-20T03:00:00Z'),
+        ];
+        yield [
+            $trigger,
+            new \DateTimeImmutable('2020-02-20T03:00:00Z'),
+            null,
+        ];
+    }
+
+    protected static function createTrigger(string $interval): DatePeriodTrigger
+    {
+        return new DateIntervalTrigger($interval, '2023-03-19 13:45', '2023-06-19');
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php
new file mode 100644
index 0000000000000..f27e180f37080
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Trigger;
+
+use Symfony\Component\Scheduler\Trigger\DatePeriodTrigger;
+
+class DatePeriodTriggerTest extends AbstractTriggerTest
+{
+    public static function providerGetNextRunDate(): iterable
+    {
+        yield [
+            self::createTrigger('next tuesday'),
+            [
+                new \DateTimeImmutable('2023-03-21 13:45:00'),
+                new \DateTimeImmutable('2023-03-28 13:45:00'),
+                new \DateTimeImmutable('2023-04-04 13:45:00'),
+                new \DateTimeImmutable('2023-04-11 13:45:00'),
+                new \DateTimeImmutable('2023-04-18 13:45:00'),
+                new \DateTimeImmutable('2023-04-25 13:45:00'),
+                new \DateTimeImmutable('2023-05-02 13:45:00'),
+                new \DateTimeImmutable('2023-05-09 13:45:00'),
+                new \DateTimeImmutable('2023-05-16 13:45:00'),
+                new \DateTimeImmutable('2023-05-23 13:45:00'),
+                new \DateTimeImmutable('2023-05-30 13:45:00'),
+                new \DateTimeImmutable('2023-06-06 13:45:00'),
+                new \DateTimeImmutable('2023-06-13 13:45:00'),
+            ],
+        ];
+
+        yield [
+            self::createTrigger('last day of next month'),
+            [
+                new \DateTimeImmutable('2023-04-30 13:45:00'),
+                new \DateTimeImmutable('2023-05-31 13:45:00'),
+            ],
+        ];
+
+        yield [
+            self::createTrigger('first monday of next month'),
+            [
+                new \DateTimeImmutable('2023-04-03 13:45:00'),
+                new \DateTimeImmutable('2023-05-01 13:45:00'),
+                new \DateTimeImmutable('2023-06-05 13:45:00'),
+            ],
+        ];
+    }
+
+    protected static function createTrigger(string $interval): DatePeriodTrigger
+    {
+        return new DatePeriodTrigger(
+            new \DatePeriod(new \DateTimeImmutable('2023-03-19 13:45'), \DateInterval::createFromDateString($interval), new \DateTimeImmutable('2023-06-19')),
+        );
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php
deleted file mode 100644
index 51c8e70498c3c..0000000000000
--- a/src/Symfony/Component/Scheduler/Tests/Trigger/PeriodicalTriggerTest.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Tests\Trigger;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
-use Symfony\Component\Scheduler\Trigger\PeriodicalTrigger;
-
-class PeriodicalTriggerTest extends TestCase
-{
-    /**
-     * @dataProvider providerGetNextRunDate
-     */
-    public function testGetNextRunDate(PeriodicalTrigger $periodicalMessage, \DateTimeImmutable $lastRun, ?\DateTimeImmutable $expected)
-    {
-        $this->assertEquals($expected, $periodicalMessage->getNextRunDate($lastRun));
-    }
-
-    public static function providerGetNextRunDate(): iterable
-    {
-        $periodicalMessage = new PeriodicalTrigger(
-            600,
-            new \DateTimeImmutable('2020-02-20T02:00:00+02'),
-            new \DateTimeImmutable('2020-02-20T03:00:00+02')
-        );
-
-        yield [
-            $periodicalMessage,
-            new \DateTimeImmutable('@0'),
-            new \DateTimeImmutable('2020-02-20T02:00:00+02'),
-        ];
-        yield [
-            $periodicalMessage,
-            new \DateTimeImmutable('2020-02-20T01:59:59.999999+02'),
-            new \DateTimeImmutable('2020-02-20T02:00:00+02'),
-        ];
-        yield [
-            $periodicalMessage,
-            new \DateTimeImmutable('2020-02-20T02:00:00+02'),
-            new \DateTimeImmutable('2020-02-20T02:10:00+02'),
-        ];
-        yield [
-            $periodicalMessage,
-            new \DateTimeImmutable('2020-02-20T02:05:00+02'),
-            new \DateTimeImmutable('2020-02-20T02:10:00+02'),
-        ];
-        yield [
-            $periodicalMessage,
-            new \DateTimeImmutable('2020-02-20T02:49:59.999999+02'),
-            new \DateTimeImmutable('2020-02-20T02:50:00+02'),
-        ];
-        yield [
-            $periodicalMessage,
-            new \DateTimeImmutable('2020-02-20T02:50:00+02'),
-            null,
-        ];
-        yield [
-            $periodicalMessage,
-            new \DateTimeImmutable('2020-02-20T03:00:00+02'),
-            null,
-        ];
-
-        $periodicalMessage = new PeriodicalTrigger(
-            600,
-            new \DateTimeImmutable('2020-02-20T02:00:00Z'),
-            new \DateTimeImmutable('2020-02-20T03:01:00Z')
-        );
-
-        yield [
-            $periodicalMessage,
-            new \DateTimeImmutable('2020-02-20T02:59:59.999999Z'),
-            new \DateTimeImmutable('2020-02-20T03:00:00Z'),
-        ];
-        yield [
-            $periodicalMessage,
-            new \DateTimeImmutable('2020-02-20T03:00:00Z'),
-            null,
-        ];
-    }
-
-    public function testConstructors()
-    {
-        $from = new \DateTimeImmutable($now = '2222-02-22');
-        $until = new \DateTimeImmutable($farFuture = '3000-01-01');
-        $day = new \DateInterval('P1D');
-
-        $message = new PeriodicalTrigger(86400, $from, $until);
-
-        $this->assertEquals($message, PeriodicalTrigger::create(86400, $from, $until));
-        $this->assertEquals($message, PeriodicalTrigger::create('86400', $from, $until));
-        $this->assertEquals($message, PeriodicalTrigger::create('P1D', $from, $until));
-        $this->assertEquals($message, PeriodicalTrigger::create($day, $now, $farFuture));
-        $this->assertEquals($message, PeriodicalTrigger::create($day, $now));
-
-        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($from, $day, $until)));
-        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($from->sub($day), $day, $until, \DatePeriod::EXCLUDE_START_DATE)));
-        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($from, $day, 284107)));
-        $this->assertEquals($message, PeriodicalTrigger::fromPeriod(new \DatePeriod($from->sub($day), $day, 284108, \DatePeriod::EXCLUDE_START_DATE)));
-    }
-
-    public function testTooBigInterval()
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The interval for a periodical message is too big');
-
-        PeriodicalTrigger::create(\PHP_INT_MAX.'0', new \DateTimeImmutable('2002-02-02'));
-    }
-
-    /**
-     * @dataProvider getInvalidIntervals
-     */
-    public function testInvalidInterval($interval)
-    {
-        $this->expectException(InvalidArgumentException::class);
-        PeriodicalTrigger::create($interval, $now = new \DateTimeImmutable(), $now->modify('1 day'));
-    }
-
-    public static function getInvalidIntervals(): iterable
-    {
-        yield ['wrong'];
-        yield ['3600.5'];
-        yield [0];
-        yield [-3600];
-    }
-
-    public function testNegativeInterval()
-    {
-        $this->expectException(InvalidArgumentException::class);
-        PeriodicalTrigger::create('wrong', $now = new \DateTimeImmutable(), $now->modify('1 day'));
-    }
-}
diff --git a/src/Symfony/Component/Scheduler/Trigger/DateIntervalTrigger.php b/src/Symfony/Component/Scheduler/Trigger/DateIntervalTrigger.php
new file mode 100644
index 0000000000000..6d71a8ed83830
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Trigger/DateIntervalTrigger.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Trigger;
+
+use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
+
+/**
+ * @experimental
+ */
+class DateIntervalTrigger extends DatePeriodTrigger
+{
+    public function __construct(
+        string|int|\DateInterval $interval,
+        string|\DateTimeImmutable $from = new \DateTimeImmutable(),
+        string|\DateTimeImmutable $until = new \DateTimeImmutable('3000-01-01'),
+    ) {
+        if (\is_string($from)) {
+            $from = new \DateTimeImmutable($from);
+        }
+        if (\is_string($until)) {
+            $until = new \DateTimeImmutable($until);
+        }
+        try {
+            if (\is_int($interval)) {
+                $interval = new \DateInterval('PT'.$interval.'S');
+            } elseif (\is_string($interval)) {
+                if ('P' === ($interval[0] ?? '')) {
+                    $interval = new \DateInterval($interval);
+                } elseif (ctype_digit($interval)) {
+                    $interval = new \DateInterval('PT'.$interval.'S');
+                } else {
+                    $interval = \DateInterval::createFromDateString($interval);
+                }
+            }
+        } catch (\Exception $e) {
+            throw new InvalidArgumentException(sprintf('Invalid interval "%s": ', $interval).$e->getMessage(), 0, $e);
+        }
+
+        parent::__construct(new \DatePeriod($from, $interval, $until));
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php b/src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php
new file mode 100644
index 0000000000000..461ceb241d67d
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Trigger;
+
+/**
+ * @experimental
+ */
+class DatePeriodTrigger implements TriggerInterface
+{
+    public function __construct(
+        private \DatePeriod $period,
+    ) {
+    }
+
+    public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
+    {
+        $iterator = $this->period->getIterator();
+        while ($run >= $next = $iterator->current()) {
+            $iterator->next();
+            if (!$iterator->valid()) {
+                return null;
+            }
+        }
+
+        return $next;
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php b/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php
deleted file mode 100644
index db71556565dcf..0000000000000
--- a/src/Symfony/Component/Scheduler/Trigger/PeriodicalTrigger.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Scheduler\Trigger;
-
-use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
-
-/**
- * @experimental
- */
-final class PeriodicalTrigger implements TriggerInterface
-{
-    public function __construct(
-        private readonly int $intervalInSeconds,
-        private readonly \DateTimeImmutable $from = new \DateTimeImmutable(),
-        private readonly \DateTimeImmutable $until = new \DateTimeImmutable('3000-01-01'),
-    ) {
-        if (0 >= $this->intervalInSeconds) {
-            throw new InvalidArgumentException('The "$intervalInSeconds" argument must be greater then zero.');
-        }
-    }
-
-    public static function create(
-        string|int|\DateInterval $interval,
-        string|\DateTimeImmutable $from = new \DateTimeImmutable(),
-        string|\DateTimeImmutable $until = new \DateTimeImmutable('3000-01-01'),
-    ): self {
-        if (\is_string($from)) {
-            $from = new \DateTimeImmutable($from);
-        }
-        if (\is_string($until)) {
-            $until = new \DateTimeImmutable($until);
-        }
-        if (\is_string($interval)) {
-            if ('P' === $interval[0]) {
-                $interval = new \DateInterval($interval);
-            } elseif (ctype_digit($interval)) {
-                self::ensureIntervalSize($interval);
-                $interval = (int) $interval;
-            } else {
-                throw new InvalidArgumentException(sprintf('The interval "%s" for a periodical message is invalid.', $interval));
-            }
-        }
-        if (!\is_int($interval)) {
-            $interval = self::calcInterval($from, $from->add($interval));
-        }
-
-        return new self($interval, $from, $until);
-    }
-
-    public static function fromPeriod(\DatePeriod $period): self
-    {
-        $startDate = \DateTimeImmutable::createFromInterface($period->getStartDate());
-        $nextDate = $startDate->add($period->getDateInterval());
-        $from = $period->include_start_date ? $startDate : $nextDate;
-        $interval = self::calcInterval($startDate, $nextDate);
-
-        $until = $period->getEndDate()
-            ? \DateTimeImmutable::createFromInterface($period->getEndDate())
-            : $startDate->modify($period->getRecurrences() * $interval.' seconds');
-
-        return new self($interval, $from, $until);
-    }
-
-    public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
-    {
-        if ($this->from > $run) {
-            return $this->from;
-        }
-        if ($this->until <= $run) {
-            return null;
-        }
-
-        $delta = $run->format('U.u') - $this->from->format('U.u');
-        $recurrencesPassed = (int) ($delta / $this->intervalInSeconds);
-        $nextRunTimestamp = ($recurrencesPassed + 1) * $this->intervalInSeconds + $this->from->getTimestamp();
-        /** @var \DateTimeImmutable $nextRun */
-        $nextRun = \DateTimeImmutable::createFromFormat('U.u', $nextRunTimestamp.$this->from->format('.u'));
-
-        return $this->until > $nextRun ? $nextRun : null;
-    }
-
-    private static function calcInterval(\DateTimeImmutable $from, \DateTimeImmutable $to): int
-    {
-        if (8 <= \PHP_INT_SIZE) {
-            return $to->getTimestamp() - $from->getTimestamp();
-        }
-
-        // @codeCoverageIgnoreStart
-        $interval = $to->format('U') - $from->format('U');
-        self::ensureIntervalSize(abs($interval));
-
-        return (int) $interval;
-        // @codeCoverageIgnoreEnd
-    }
-
-    private static function ensureIntervalSize(string|float $interval): void
-    {
-        if ($interval > \PHP_INT_MAX) {
-            throw new InvalidArgumentException('The interval for a periodical message is too big. If you need to run it once, use "$until" argument.');
-        }
-    }
-}

From a251902f3114d50b20498f3905ac952929b94c22 Mon Sep 17 00:00:00 2001
From: Maximilian Zumbansen <maximilian.zumbansen@qossmic.com>
Date: Wed, 15 Mar 2023 14:12:04 +0100
Subject: [PATCH 318/475] [Security] Add argument `$exceptionCode` to
 `#[IsGranted]`

---
 .../Core/Exception/AccessDeniedException.php  |  4 +-
 .../Security/Http/Attribute/IsGranted.php     |  5 ++
 .../Component/Security/Http/CHANGELOG.md      |  1 +
 .../IsGrantedAttributeListener.php            |  4 +-
 .../IsGrantedAttributeListenerTest.php        | 46 +++++++++++++++++++
 .../IsGrantedAttributeMethodsController.php   | 10 ++++
 6 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
index 88804d6591e3d..c95bae03b4fae 100644
--- a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
+++ b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
@@ -24,9 +24,9 @@ class AccessDeniedException extends RuntimeException
     private array $attributes = [];
     private mixed $subject = null;
 
-    public function __construct(string $message = 'Access Denied.', \Throwable $previous = null)
+    public function __construct(string $message = 'Access Denied.', \Throwable $previous = null, int $code = 403)
     {
-        parent::__construct($message, 403, $previous);
+        parent::__construct($message, $code, $previous);
     }
 
     public function getAttributes(): array
diff --git a/src/Symfony/Component/Security/Http/Attribute/IsGranted.php b/src/Symfony/Component/Security/Http/Attribute/IsGranted.php
index c8066a256971d..050293b04403a 100644
--- a/src/Symfony/Component/Security/Http/Attribute/IsGranted.php
+++ b/src/Symfony/Component/Security/Http/Attribute/IsGranted.php
@@ -42,6 +42,11 @@ public function __construct(
          * If null, Security\Core's AccessDeniedException will be used.
          */
         public ?int $statusCode = null,
+
+        /**
+         * If set, will add the exception code to thrown exception.
+         */
+        public ?int $exceptionCode = null,
     ) {
     }
 }
diff --git a/src/Symfony/Component/Security/Http/CHANGELOG.md b/src/Symfony/Component/Security/Http/CHANGELOG.md
index df2bdfd0dc1bf..418bd1f49244d 100644
--- a/src/Symfony/Component/Security/Http/CHANGELOG.md
+++ b/src/Symfony/Component/Security/Http/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add `RememberMeBadge` to `JsonLoginAuthenticator` and enable reading parameter in JSON request body
+ * Add argument `$exceptionCode` to `#[IsGranted]`
 
 6.2
 ---
diff --git a/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php b/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
index 7ee9f41fcdb4b..513b6494e5314 100644
--- a/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
+++ b/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
@@ -66,10 +66,10 @@ public function onKernelControllerArguments(ControllerArgumentsEvent $event)
                 $message = $attribute->message ?: sprintf('Access Denied by #[IsGranted(%s)] on controller', $this->getIsGrantedString($attribute));
 
                 if ($statusCode = $attribute->statusCode) {
-                    throw new HttpException($statusCode, $message);
+                    throw new HttpException($statusCode, $message, code: $attribute->exceptionCode ?? 0);
                 }
 
-                $accessDeniedException = new AccessDeniedException($message);
+                $accessDeniedException = new AccessDeniedException($message, code: $attribute->exceptionCode ?? 403);
                 $accessDeniedException->setAttributes($attribute->attribute);
                 $accessDeniedException->setSubject($subject);
 
diff --git a/src/Symfony/Component/Security/Http/Tests/EventListener/IsGrantedAttributeListenerTest.php b/src/Symfony/Component/Security/Http/Tests/EventListener/IsGrantedAttributeListenerTest.php
index ae00389df82f2..3f5f2ff7a01c7 100644
--- a/src/Symfony/Component/Security/Http/Tests/EventListener/IsGrantedAttributeListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/EventListener/IsGrantedAttributeListenerTest.php
@@ -384,4 +384,50 @@ public function testIsGrantedWithRequestAsSubject()
         $listener = 
10000
new IsGrantedAttributeListener($authChecker, new ExpressionLanguage());
         $listener->onKernelControllerArguments($event);
     }
+
+    public function testHttpExceptionWithExceptionCode()
+    {
+        $this->expectException(HttpException::class);
+        $this->expectExceptionMessage('Exception Code');
+        $this->expectExceptionCode(10010);
+
+        $authChecker = $this->createMock(AuthorizationCheckerInterface::class);
+        $authChecker->expects($this->any())
+            ->method('isGranted')
+            ->willReturn(false);
+
+        $event = new ControllerArgumentsEvent(
+            $this->createMock(HttpKernelInterface::class),
+            [new IsGrantedAttributeMethodsController(), 'exceptionCodeInHttpException'],
+            [],
+            new Request(),
+            null
+        );
+
+        $listener = new IsGrantedAttributeListener($authChecker);
+        $listener->onKernelControllerArguments($event);
+    }
+
+    public function testAccessDeniedExceptionWithExceptionCode()
+    {
+        $this->expectException(AccessDeniedException::class);
+        $this->expectExceptionMessage('Exception Code');
+        $this->expectExceptionCode(10010);
+
+        $authChecker = $this->createMock(AuthorizationCheckerInterface::class);
+        $authChecker->expects($this->any())
+            ->method('isGranted')
+            ->willReturn(false);
+
+        $event = new ControllerArgumentsEvent(
+            $this->createMock(HttpKernelInterface::class),
+            [new IsGrantedAttributeMethodsController(), 'exceptionCodeInAccessDeniedException'],
+            [],
+            new Request(),
+            null
+        );
+
+        $listener = new IsGrantedAttributeListener($authChecker);
+        $listener->onKernelControllerArguments($event);
+    }
 }
diff --git a/src/Symfony/Component/Security/Http/Tests/Fixtures/IsGrantedAttributeMethodsController.php b/src/Symfony/Component/Security/Http/Tests/Fixtures/IsGrantedAttributeMethodsController.php
index 83d18e7ac315f..f4e54704538ac 100644
--- a/src/Symfony/Component/Security/Http/Tests/Fixtures/IsGrantedAttributeMethodsController.php
+++ b/src/Symfony/Component/Security/Http/Tests/Fixtures/IsGrantedAttributeMethodsController.php
@@ -45,6 +45,16 @@ public function notFound()
     {
     }
 
+    #[IsGranted(attribute: 'ROLE_ADMIN', message: 'Exception Code Http', statusCode: 404, exceptionCode: 10010)]
+    public function exceptionCodeInHttpException()
+    {
+    }
+
+    #[IsGranted(attribute: 'ROLE_ADMIN', message: 'Exception Code Access Denied', exceptionCode: 10010)]
+    public function exceptionCodeInAccessDeniedException()
+    {
+    }
+
     #[IsGranted(attribute: new Expression('"ROLE_ADMIN" in role_names or is_granted("POST_VIEW", subject)'), subject: 'post')]
     public function withExpressionInAttribute($post)
     {

From 245d75df943d47934964c0fed2713b46775d00f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rokas=20Mikalk=C4=97nas?= <rokas.mikalkenas@nfq.lt>
Date: Thu, 16 Mar 2023 13:18:51 +0200
Subject: [PATCH 319/475] [FrameworkBundle] Make StopWorkerOnSignalsListener
 configurable via messenger's config

---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md              | 1 +
 .../FrameworkBundle/DependencyInjection/Configuration.php    | 5 +++++
 .../DependencyInjection/FrameworkExtension.php               | 4 ++++
 .../Tests/DependencyInjection/ConfigurationTest.php          | 1 +
 4 files changed, 11 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 4702ca267dfd9..396cf456e3747 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -20,6 +20,7 @@ CHANGELOG
  * Add `AbstractController::sendEarlyHints()` to send HTTP Early Hints
  * Add autowiring aliases for `Http\Client\HttpAsyncClient`
  * Deprecate the `Http\Client\HttpClient` service, use `Psr\Http\Client\ClientInterface` instead
+ * Add `stop_worker_on_signals` configuration option to `messenger` to define signals which would stop a worker
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 1860f68e4f1a2..e11d610b42da6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1528,6 +1528,11 @@ function ($a) {
                                 ->thenInvalid('The "framework.messenger.reset_on_message" configuration option can be set to "true" only. To prevent services resetting after each message you can set the "--no-reset" option in "messenger:consume" command.')
                             ->end()
                         ->end()
+                        ->arrayNode('stop_worker_on_signals')
+                            ->defaultValue([])
+                            ->info('A list of signals that should stop the worker; defaults to SIGTERM and SIGINT.')
+                            ->integerPrototype()->end()
+                        ->end()
                         ->scalarNode('default_bus')->defaultNull()->end()
                         ->arrayNode('buses')
                             ->defaultValue(['messenger.bus.default' => ['default_middleware' => ['enabled' => true, 'allow_no_handlers' => false, 'allow_no_senders' => true], 'middleware' => []]])
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 1e95b74ea9959..6d1401463fcf2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2050,6 +2050,10 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $container->getDefinition('messenger.transport.beanstalkd.factory')->addTag('messenger.transport_factory');
         }
 
+        if ($config['stop_worker_on_signals']) {
+            $container->getDefinition('messenger.listener.stop_worker_signals_listener')->replaceArgument(0, $config['stop_worker_on_signals']);
+        }
+
         if (null === $config['default_bus'] && 1 === \count($config['buses'])) {
             $config['default_bus'] = key($config['buses']);
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index 0b92db46f292a..e11042d66e941 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -639,6 +639,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
                 'default_bus' => null,
                 'buses' => ['messenger.bus.default' => ['default_middleware' => ['enabled' => true, 'allow_no_handlers' => false, 'allow_no_senders' => true], 'middleware' => []]],
                 'reset_on_message' => true,
+                'stop_worker_on_signals' => [],
             ],
             'disallow_search_engine_index' => true,
             'http_client' => [

From 6984dcee27b3f35fb8bd3ade595f24b4555d0454 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 19 Mar 2023 19:19:19 +0100
Subject: [PATCH 320/475] [Serializer] Allow filtering "object" when using
 "getSupportedTypes()"

---
 .../Normalizer/ArrayDenormalizer.php          |  7 +-----
 .../Normalizer/DenormalizerInterface.php      | 14 ++++-------
 .../Normalizer/GetSetMethodNormalizer.php     |  2 +-
 .../Normalizer/NormalizerInterface.php        | 14 ++++-------
 .../Normalizer/ObjectNormalizer.php           |  2 +-
 .../Normalizer/PropertyNormalizer.php         |  2 +-
 .../Component/Serializer/Serializer.php       | 25 +++++++++++++------
 .../Tests/Fixtures/Annotations/GroupDummy.php |  2 +-
 .../DummyObjectWithEnumConstructor.php        | 11 ++++++--
 .../Serializer/Tests/Fixtures/Php74Full.php   |  1 -
 .../Serializer/Tests/SerializerTest.php       |  3 ---
 11 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
index 8b36935081f30..b37e9eace0041 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ArrayDenormalizer.php
@@ -38,12 +38,7 @@ public function setDenormalizer(DenormalizerInterface $denormalizer): void
 
     public function getSupportedTypes(?string $format): array
     {
-        // @deprecated remove condition in 7.0
-        if (!method_exists($this->denormalizer, 'getSupportedTypes')) {
-            return ['*' => $this->denormalizer instanceof CacheableSupportsMethodInterface && $this->denormalizer->hasCacheableSupportsMethod()];
-        }
-
-        return $this->denormalizer->getSupportedTypes($format);
+        return ['object' => null, '*' => false];
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
index 1d83b2da1166d..4edb70096daaa 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
@@ -51,11 +51,6 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
     /**
      * Checks whether the given class is supported for denormalization by this normalizer.
      *
-     * Since Symfony 6.3, this method will only be called if the type is
-     * included in the supported types returned by getSupportedTypes().
-     *
-     * @see getSupportedTypes()
-     *
      * @param mixed       $data    Data to denormalize from
      * @param string      $type    The class to which the data should be denormalized
      * @param string|null $format  The format being deserialized from
@@ -72,12 +67,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
      * returned as keys, and each type should be mapped to a boolean indicating
      * if the result of supportsDenormalization() can be cached or not
      * (a result cannot be cached when it depends on the context or on the data.)
+     * A null value means that the denormalizer does not support the corresponding
+     * type.
      *
-     * The special type '*' can be used to indicate that the denormalizer might
-     * support any types. A null value means that the denormalizer does not support
-     * the corresponding type.
+     * Use type "object" to match any classes or interfaces,
+     * and type "*" to match any types.
      *
-     * @return array<class-string|'*'|string, bool|null>
+     * @return array<class-string|'*'|'object'|string, bool|null>
      */
     /* public function getSupportedTypes(?string $format): array; */
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
index 2719c8b52c16e..403bb2a45f621 100644
--- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -38,7 +38,7 @@ class GetSetMethodNormalizer extends AbstractObjectNormalizer
 
     public function getSupportedTypes(?string $format): array
     {
-        return ['*' => __CLASS__ === static::class || $this->hasCacheableSupportsMethod()];
+        return ['object' => __CLASS__ === static::class || $this->hasCacheableSupportsMethod()];
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
index d6d0707ff5ec8..40779de316d7c 100644
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
@@ -43,11 +43,6 @@ public function normalize(mixed $object, string $format = null, array $context =
     /**
      * Checks whether the given class is supported for normalization by this normalizer.
      *
-     * Since Symfony 6.3, this method will only be called if the $data type is
-     * included in the supported types returned by getSupportedTypes().
-     *
-     * @see getSupportedTypes()
-     *
      * @param mixed       $data    Data to normalize
      * @param string|null $format  The format being (de-)serialized from or into
      * @param array       $context Context options for the normalizer
@@ -63,12 +58,13 @@ public function supportsNormalization(mixed $data, string $format = null /* , ar
      * returned as keys, and each type should be mapped to a boolean indicating
      * if the result of supportsNormalization() can be cached or not
      * (a result cannot be cached when it depends on the context or on the data.)
+     * A null value means that the normalizer does not support the corresponding
+     * type.
      *
-     * The special type '*' can be used to indicate that the normalizer might
-     * support any types. A null value means that the normalizer does not support
-     * the corresponding type.
+     * Use type "object" to match any classes or interfaces,
+     * and type "*" to match any types.
      *
-     * @return array<class-string|'*'|string, bool|null>
+     * @return array<class-string|'*'|'object'|string, bool|null>
      */
     /* public function getSupportedTypes(?string $format): array; */
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index 140e89c6a13b1..dce4434641346 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -49,7 +49,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
 
     public function getSupportedTypes(?string $format): array
     {
-        return ['*' => __CLASS__ === static::class || $this->hasCacheableSupportsMethod()];
+        return ['object' => __CLASS__ === static::class || $this->hasCacheableSupportsMethod()];
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
index 645ba74290249..56e5ebf740760 100644
--- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -56,7 +56,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
 
     public function getSupportedTypes(?string $format): array
     {
-        return ['*' => __CLASS__ === static::class || $this->hasCacheableSupportsMethod()];
+        return ['object' => __CLASS__ === static::class || $this->hasCacheableSupportsMethod()];
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
index 5eb0c5b6b2e2e..ea219f40351bb 100644
--- a/src/Symfony/Component/Serializer/Serializer.php
+++ b/src/Symfony/Component/Serializer/Serializer.php
@@ -251,7 +251,13 @@ public function supportsDenormalization(mixed $data, string $type, string $forma
      */
     private function getNormalizer(mixed $data, ?string $format, array $context): ?NormalizerInterface
     {
-        $type = \is_object($data) ? $data::class : 'native-'.\gettype($data);
+        if (\is_object($data)) {
+            $type = $data::class;
+            $genericType = 'object';
+        } else {
+            $type = 'native-'.\gettype($data);
+            $genericType = '*';
+        }
 
         if (!isset($this->normalizerCache[$format][$type])) {
             $this->normalizerCache[$format][$type] = [];
@@ -277,12 +283,14 @@ private function getNormalizer(mixed $data, ?string $format, array $context): ?N
                 $supportedTypes = $normalizer->getSupportedTypes($format);
 
                 foreach ($supportedTypes as $supportedType => $isCacheable) {
-                    if ('*' === $supportedType || $type !== $supportedType && !is_subclass_of($type, $supportedType, true)) {
+                    if (\in_array($supportedType, ['*', 'object'], true)
+                        || $type !== $supportedType && ('object' !== $genericType || !is_subclass_of($type, $supportedType))
+                    ) {
                         continue;
                     }
 
                     if (null === $isCacheable) {
-                        unset($supportedTypes['*']);
+                        unset($supportedTypes['*'], $supportedTypes['object']);
                     } elseif ($this->normalizerCache[$format][$type][$k] = $isCacheable && $normalizer->supportsNormalization($data, $format, $context)) {
                         break 2;
                     }
@@ -290,7 +298,7 @@ private function getNormalizer(mixed $data, ?string $format, array $context): ?N
                     break;
                 }
 
-                if (null === $isCacheable = $supportedTypes['*'] ?? null) {
+                if (null === $isCacheable = $supportedTypes[\array_key_exists($genericType, $supportedTypes) ? $genericType : '*'] ?? null) {
                     continue;
                 }
 
@@ -322,6 +330,7 @@ private function getDenormalizer(mixed $data, string $class, ?string $format, ar
     {
         if (!isset($this->denormalizerCache[$format][$class])) {
             $this->denormalizerCache[$format][$class] = [];
+            $genericType = class_exists($class) || interface_exists($class, false) ? 'object' : '*';
 
             foreach ($this->normalizers as $k => $normalizer) {
                 if (!$normalizer instanceof DenormalizerInterface) {
@@ -344,12 +353,14 @@ private function getDenormalizer(mixed $data, string $class, ?string $format, ar
                 $supportedTypes = $normalizer->getSupportedTypes($format);
 
                 foreach ($supportedTypes as $supportedType => $isCacheable) {
-                    if ('*' === $supportedType || $class !== $supportedType && !is_subclass_of($class, $supportedType, true)) {
+                    if (\in_array($supportedType, ['*', 'object'], true)
+                        || $class !== $supportedType && ('object' !== $genericType || !is_subclass_of($class, $supportedType))
+                    ) {
                         continue;
                     }
 
                     if (null === $isCacheable) {
-                        unset($supportedTypes['*']);
+                        unset($supportedTypes['*'], $supportedTypes['object']);
                     } elseif ($this->denormalizerCache[$format][$class][$k] = $isCacheable && $normalizer->supportsDenormalization(null, $class, $format, $context)) {
                         break 2;
                     }
@@ -357,7 +368,7 @@ private function getDenormalizer(mixed $data, string $class, ?string $format, ar
                     break;
                 }
 
-                if (null === $isCacheable = $supportedTypes['*'] ?? null) {
+                if (null === $isCacheable = $supportedTypes[\array_key_exists($genericType, $supportedTypes) ? $genericType : '*'] ?? null) {
                     continue;
                 }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Annotations/GroupDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Annotations/GroupDummy.php
index 1d502c60c5f86..36a63e6f816c8 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/Annotations/GroupDummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/Annotations/GroupDummy.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Serializer\Tests\Fixtures\Annotations;
 
 use Symfony\Component\Serializer\Annotation\Groups;
-use Symfony\Component\Serializer\Tests\Fixtures\GroupDummyInterface;
 use Symfony\Component\Serializer\Tests\Fixtures\ChildOfGroupsAnnotationDummy;
+use Symfony\Component\Serializer\Tests\Fixtures\GroupDummyInterface;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DummyObjectWithEnumConstructor.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyObjectWithEnumConstructor.php
index be5ea3cff0ece..022b57cd97efe 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/DummyObjectWithEnumConstructor.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyObjectWithEnumConstructor.php
@@ -1,8 +1,15 @@
 <?php
 
-namespace Symfony\Component\Serializer\Tests\Fixtures;
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
-use Symfony\Component\Serializer\Tests\Fixtures\StringBackedEnumDummy;
+namespace Symfony\Component\Serializer\Tests\Fixtures;
 
 class DummyObjectWithEnumConstructor
 {
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Php74Full.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Php74Full.php
index 5aea0fa4af76f..0da6be20ff5b9 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/Php74Full.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/Php74Full.php
@@ -35,7 +35,6 @@ final class Php74Full
     public $anotherCollection;
 }
 
-
 final class Php74FullWithConstructor
 {
     public function __construct($constructorArgument)
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
index 331eaa25ea44d..8de4eefb758b1 100644
--- a/src/Symfony/Component/Serializer/Tests/SerializerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -17,8 +17,6 @@
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
-use Symfony\Component\Serializer\Encoder\DecoderInterface;
-use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Exception\ExtraAttributesException;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
@@ -49,7 +47,6 @@
 use Symfony\Component\Serializer\Normalizer\UidNormalizer;
 use Symfony\Component\Serializer\Normalizer\UnwrappingDenormalizer;
 use Symfony\Component\Serializer\Serializer;
-use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Serializer\Tests\Fixtures\Annotations\AbstractDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Annotations\AbstractDummyFirstChild;
 use Symfony\Component\Serializer\Tests\Fixtures\Annotations\AbstractDummySecondChild;

From b5fbe18842a193943dab9336e82e632ed2258f99 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 20 Mar 2023 16:28:30 +0100
Subject: [PATCH 321/475] [ErrorHandler] Rewrite logic to dump exception
 properties and fix serializing FlattenException

---
 .../ErrorRenderer/HtmlErrorRenderer.php       | 17 ++----
 .../Exception/FlattenException.php            | 60 +++++++++++++++----
 .../Resources/views/traces.html.php           |  4 +-
 .../Tests/Exception/FlattenExceptionTest.php  |  2 +-
 .../DataCollector/ExceptionDataCollector.php  |  2 +-
 .../ExceptionDataCollectorTest.php            |  2 +-
 .../Component/HttpKernel/composer.json        |  2 +-
 .../VarDumper/Caster/ExceptionCaster.php      |  2 +-
 .../Component/VarDumper/Cloner/VarCloner.php  |  2 -
 9 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
index 95ed8504efcd9..ac50cd8c7e6e1 100644
--- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
+++ b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
@@ -17,7 +17,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
-use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Dumper\HtmlDumper;
 
 /**
@@ -69,7 +69,7 @@ public function render(\Throwable $exception): FlattenException
             $headers['X-Debug-Exception-File'] = rawurlencode($exception->getFile()).':'.$exception->getLine();
         }
 
-        $exception = FlattenException::createFromThrowable($exception, null, $headers);
+        $exception = FlattenException::createWithDataRepresentation($exception, null, $headers);
 
         return $exception->setAsString($this->renderException($exception));
     }
@@ -149,21 +149,12 @@ private function renderException(FlattenException $exception, string $debugTempl
         ]);
     }
 
-    private function dumpValue(mixed $value): string
+    private function dumpValue(Data $value): string
     {
-        $cloner = new VarCloner();
-        $data = $cloner->cloneVar($value);
-
         $dumper = new HtmlDumper();
         $dumper->setTheme('light');
-        $dumper->setOutput($output = fopen('php://memory', 'r+'));
-        $dumper->dump($data);
-
-        $dump = stream_get_contents($output, -1, 0);
-        rewind($output);
-        ftruncate($output, 0);
 
-        return $dump;
+        return $dumper->dump($value, true);
     }
 
     private function formatArgs(array $args): string
diff --git a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
index 8d1c6575b7d04..ab62b1be367f8 100644
--- a/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
+++ b/src/Symfony/Component/ErrorHandler/Exception/FlattenException.php
@@ -14,6 +14,10 @@
 use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+use Symfony\Component\VarDumper\Caster\Caster;
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Cloner\Stub;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
 
 /**
  * FlattenException wraps a PHP Error or Exception to be able to serialize it.
@@ -36,7 +40,7 @@ class FlattenException
     private string $file;
     private int $line;
     private ?string $asString = null;
-    private array $properties = [];
+    private Data $dataRepresentation;
 
     public static function create(\Exception $exception, int $statusCode = null, array $headers = []): static
     {
@@ -78,14 +82,34 @@ public static function createFromThrowable(\Throwable $exception, int $statusCod
             $e->setPrevious(static::createFromThrowable($previous));
         }
 
-        if ((new \ReflectionClass($exception::class))->isUserDefined()) {
-            $getProperties = \Closure::bind(fn (\Throwable $e) => get_object_vars($e), null, $exception::class);
-            $properties = $getProperties($exception);
-            unset($properties['message'], $properties['code'], $properties['file'], $properties['line']);
-            $e->properties = $properties;
+        return $e;
+    }
+
+    public static function createWithDataRepresentation(\Throwable $throwable, int $statusCode = null, array $headers = [], VarCloner $cloner = null): static
+    {
+        $e = static::createFromThrowable($throwable, $statusCode, $headers);
+
+        static $defaultCloner;
+
+        if (!$cloner ??= $defaultCloner) {
+            $cloner = $defaultCloner = new VarCloner();
+            $cloner->addCasters([
+                \Throwable::class => function (\Throwable $e, array $a, Stub $s, bool $isNested): array {
+                    if (!$isNested) {
+                        unset($a[Caster::PREFIX_PROTECTED.'message']);
+                        unset($a[Caster::PREFIX_PROTECTED.'code']);
+                        unset($a[Caster::PREFIX_PROTECTED.'file']);
+                        unset($a[Caster::PREFIX_PROTECTED.'line']);
+                        unset($a["\0Error\0trace"], $a["\0Exception\0trace"]);
+                        unset($a["\0Error\0previous"], $a["\0Exception\0previous"]);
+                    }
+
+                    return $a;
+                },
+            ]);
         }
 
-        return $e;
+        return $e->setDataRepresentation($cloner->cloneVar($throwable));
     }
 
     public function toArray(): array
@@ -96,7 +120,7 @@ public function toArray(): array
                 'message' => $exception->getMessage(),
                 'class' => $exception->getClass(),
                 'trace' => $exception->getTrace(),
-                'properties' => $exception->getProperties(),
+                'data' => $exception->getDataRepresentation(),
             ];
         }
 
@@ -230,11 +254,6 @@ public function setCode(int|string $code): static
         return $this;
     }
 
-    public function getProperties(): array
-    {
-        return $this->properties;
-    }
-
     public function getPrevious(): ?self
     {
         return $this->previous;
@@ -319,6 +338,21 @@ public function setTrace(array $trace, ?string $file, ?int $line): static
         return $this;
     }
 
+    public function getDataRepresentation(): ?Data
+    {
+        return $this->dataRepresentation ?? null;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setDataRepresentation(Data $data): static
+    {
+        $this->dataRepresentation = $data;
+
+        return $this;
+    }
+
     private function flattenArgs(array $args, int $level = 0, int &$count = 0): array
     {
         $result = [];
diff --git a/src/Symfony/Component/ErrorHandler/Resources/views/traces.html.php b/src/Symfony/Component/ErrorHandler/Resources/views/traces.html.php
index fdca8a70e72e2..fd834c144e881 100644
--- a/src/Symfony/Component/ErrorHandler/Resources/views/traces.html.php
+++ b/src/Symfony/Component/ErrorHandler/Resources/views/traces.html.php
@@ -25,11 +25,11 @@
                     <p class="break-long-words trace-message"><?= $this->escape($exception['message']); ?></p>
                 <?php } ?>
             </div>
-            <?php if ($exception['properties']) { ?>
+            <?php if (\count($exception['data'] ?? [])) { ?>
                 <details class="exception-properties-wrapper">
                     <summary>Show exception properties</summary>
                     <div class="exception-properties">
-                        <?= $this->dumpValue($exception['properties']) ?>
+                        <?= $this->dumpValue($exception['data']) ?>
                     </div>
                 </details>
             <?php } ?>
diff --git a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
index 2faa25057b039..a3ff2f6b02987 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
@@ -209,7 +209,7 @@ public function testToArray(\Throwable $exception, string $expectedClass)
                     'namespace' => '', 'short_class' => '', 'class' => '', 'type' => '', 'function' => '', 'file' => 'foo.php', 'line' => 123,
                     'args' => [],
                 ]],
-                'properties' => [],
+                'data' => null,
             ],
         ], $flattened->toArray());
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
index 77601ad90cc3f..bcd7f238beaf2 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/ExceptionDataCollector.php
@@ -26,7 +26,7 @@ public function collect(Request $request, Response $response, \Throwable $except
     {
         if (null !== $exception) {
             $this->data = [
-                'exception' => FlattenException::createFromThrowable($exception),
+                'exception' => FlattenException::createWithDataRepresentation($exception),
             ];
         }
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php
index d1fc578b131f6..6ddeea7f9558a 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ExceptionDataCollectorTest.php
@@ -23,7 +23,7 @@ public function testCollect()
     {
         $e = new \Exception('foo', 500);
         $c = new ExceptionDataCollector();
-        $flattened = FlattenException::createFromThrowable($e);
+        $flattened = FlattenException::createWithDataRepresentation($e);
         $trace = $flattened->getTrace();
 
         $this->assertFalse($c->hasException());
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 6af8d45f3e6b8..04b6c09677f90 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "symfony/deprecation-contracts": "^2.5|^3",
-        "symfony/error-handler": "^6.1",
+        "symfony/error-handler": "^6.3",
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/http-foundation": "^5.4.21|^6.2.7",
         "symfony/polyfill-ctype": "^1.8",
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
index c58e74a50a7ad..d6e0e0dc00487 100644
--- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -306,7 +306,7 @@ private static function filterExceptionArray(string $xClass, array $a, string $x
         if (empty($a[$xPrefix.'previous'])) {
             unset($a[$xPrefix.'previous']);
         }
-        unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']);
+        unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message']);
 
         if (isset($a[Caster::PREFIX_PROTECTED.'message']) && str_contains($a[Caster::PREFIX_PROTECTED.'message'], "@anonymous\0")) {
             $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', fn ($m) => class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0], $a[Caster::PREFIX_PROTECTED.'message']);
diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
index 4f5c347155b2a..e168d0d3b7a66 100644
--- a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
@@ -16,7 +16,6 @@
  */
 class VarCloner extends AbstractCloner
 {
-    private static string $gid;
     private static array $arrayCache = [];
 
     protected function doClone(mixed $var): array
@@ -41,7 +40,6 @@ protected function doClone(mixed $var): array
         $stub = null;                   // Stub capturing the main properties of an original item value
                                         // or null if the original value is used directly
 
-        $gid = self::$gid ??= hash('xxh128', random_bytes(6)); // Unique string used to detect the special $GLOBALS variable
         $arrayStub = new Stub();
         $arrayStub->type = Stub::TYPE_ARRAY;
         $fromObjCast = false;

From 6983f554da50de23545e9e3be9cc560df5df0315 Mon Sep 17 00:00:00 2001
From: Franck Ranaivo-Harisoa <franckranaivo@gmail.com>
Date: Mon, 6 Mar 2023 17:06:03 +0100
Subject: [PATCH 322/475] [CssSelector] Add suport for :scope

---
 src/Symfony/Component/CssSelector/CHANGELOG.md    |  5 +++++
 .../Exception/SyntaxErrorException.php            |  5 +++++
 .../Component/CssSelector/Parser/Parser.php       | 15 +++++++++++++--
 .../CssSelector/Tests/Parser/ParserTest.php       |  7 +++++++
 .../CssSelector/Tests/XPath/TranslatorTest.php    |  5 +++++
 .../XPath/Extension/PseudoClassExtension.php      |  6 ++++++
 6 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/CssSelector/CHANGELOG.md b/src/Symfony/Component/CssSelector/CHANGELOG.md
index de81fa2e7d437..c035d6b3db49e 100644
--- a/src/Symfony/Component/CssSelector/CHANGELOG.md
+++ b/src/Symfony/Component/CssSelector/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+-----
+
+ * Add support for `:scope`
+
 4.4.0
 -----
 
diff --git a/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php b/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
index f73860cef5689..5a9d8078dbb5b 100644
--- a/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
+++ b/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
@@ -43,6 +43,11 @@ public static function nestedNot(): self
         return new self('Got nested ::not().');
     }
 
+    public static function notAtTheStartOfASelector(string $pseudoElement): self
+    {
+        return new self(sprintf('Got immediate child pseudo-element ":%s" not at the start of a selector', $pseudoElement));
+    }
+
     public static function stringAsFunctionArgument(): self
     {
         return new self('String not allowed as function argument.');
diff --git a/src/Symfony/Component/CssSelector/Parser/Parser.php b/src/Symfony/Component/CssSelector/Parser/Parser.php
index 101df57f3866f..5313d3435ba9c 100644
--- a/src/Symfony/Component/CssSelector/Parser/Parser.php
+++ b/src/Symfony/Component/CssSelector/Parser/Parser.php
@@ -19,7 +19,7 @@
  * CSS selector parser.
  *
  * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
+ * which is copyright Ian Bicking, @see https://github.com/scrapy/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
  *
@@ -192,7 +192,18 @@ private function parseSimpleSelector(TokenStream $stream, bool $insideNegation =
 
                 if (!$stream->getPeek()->isDelimiter(['('])) {
                     $result = new Node\PseudoNode($result, $identifier);
-
+                    if ('Pseudo[Element[*]:scope]' === $result->__toString()) {
+                        $used = \count($stream->getUsed());
+                        if (!(2 === $used
+                           || 3 === $used && $stream->getUsed()[0]->isWhiteSpace()
+                           || $used >= 3 && $stream->getUsed()[$used - 3]->isDelimiter([','])
+                           || $used >= 4
+                                && $stream->getUsed()[$used - 3]->isWhiteSpace()
+                                && $stream->getUsed()[$used - 4]->isDelimiter([','])
+                        )) {
+                            throw SyntaxErrorException::notAtTheStartOfASelector('scope');
+                        }
+                    }
                     continue;
                 }
 
diff --git a/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php b/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php
index af8cf589d086f..a8708ce47282e 100644
--- a/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php
@@ -146,6 +146,12 @@ public static function getParserTestData()
             // unicode escape: \20 ==  (space)
             ['*[aval="\'\20  \'"]', ['Attribute[Element[*][aval = \'\'  \'\']]']],
             ["*[aval=\"'\\20\r\n '\"]", ['Attribute[Element[*][aval = \'\'  \'\']]']],
+            [':scope > foo', ['CombinedSelector[Pseudo[Element[*]:scope] > Element[foo]]']],
+            [':scope > foo bar > div', ['CombinedSelector[CombinedSelector[CombinedSelector[Pseudo[Element[*]:scope] > Element[foo]] <followed> Element[bar]] > Element[div]]']],
+            [':scope > #foo #bar', ['CombinedSelector[CombinedSelector[Pseudo[Element[*]:scope] > Hash[Element[*]#foo]] <followed> Hash[Element[*]#bar]]']],
+            [':scope', ['Pseudo[Element[*]:scope]']],
+            ['foo bar, :scope > div', ['CombinedSelector[Element[foo] <followed> Element[bar]]', 'CombinedSelector[Pseudo[Element[*]:scope] > Element[div]]']],
+            ['foo bar,:scope > div', ['CombinedSelector[Element[foo] <followed> Element[bar]]', 'CombinedSelector[Pseudo[Element[*]:scope] > Element[div]]']],
         ];
     }
 
@@ -176,6 +182,7 @@ public static function getParserExceptionTestData()
             [':lang(fr', SyntaxErrorException::unexpectedToken('an argument', new Token(Token::TYPE_FILE_END, '', 8))->getMessage()],
             [':contains("foo', SyntaxErrorException::unclosedString(10)->getMessage()],
             ['foo!', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '!', 3))->getMessage()],
+            [':scope > div :scope header', SyntaxErrorException::notAtTheStartOfASelector('scope')->getMessage()],
         ];
     }
 
diff --git a/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php b/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php
index d3306001352f3..894b8a0c70028 100644
--- a/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php
+++ b/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php
@@ -219,6 +219,8 @@ public static function getCssToXPathTestData()
             ['e + f', "e/following-sibling::*[(name() = 'f') and (position() = 1)]"],
             ['e ~ f', 'e/following-sibling::f'],
             ['div#container p', "div[@id = 'container']/descendant-or-self::*/p"],
+            [':scope > div[dataimg="<testmessage>"]', "*[1]/div[@dataimg = '<testmessage>']"],
+            [':scope', '*[1]'],
         ];
     }
 
@@ -411,6 +413,9 @@ public static function getHtmlShakespearTestData()
             ['div[class|=dialog]', 50], // ? Seems right
             ['div[class!=madeup]', 243], // ? Seems right
             ['div[class~=dialog]', 51], // ? Seems right
+            [':scope > div', 1],
+            [':scope > div > div[class=dialog]', 1],
+            [':scope > div div', 242],
         ];
     }
 }
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
index 36ab582ee9f9c..aada83291aa59 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php
@@ -30,6 +30,7 @@ public function getPseudoClassTranslators(): array
     {
         return [
             'root' => $this->translateRoot(...),
+            'scope' => $this->translateScopePseudo(...),
             'first-child' => $this->translateFirstChild(...),
             'last-child' => $this->translateLastChild(...),
             'first-of-type' => $this->translateFirstOfType(...),
@@ -45,6 +46,11 @@ public function translateRoot(XPathExpr $xpath): XPathExpr
         return $xpath->addCondition('not(parent::*)');
     }
 
+    public function translateScopePseudo(XPathExpr $xpath): XPathExpr
+    {
+        return $xpath->addCondition('1');
+    }
+
     public function translateFirstChild(XPathExpr $xpath): XPathExpr
     {
         return $xpath

From e8fa3f426a5311b3bfb8f7a20f53da4c460bb717 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Mon, 20 Mar 2023 07:56:31 +0100
Subject: [PATCH 323/475] fix tests

---
 .../php/notifier_without_messenger.php        |  1 +
 .../xml/notifier_without_messenger.xml        |  1 +
 .../yml/notifier_without_messenger.yml        |  1 +
 .../FrameworkExtensionTestCase.php            | 29 +++++++++++++++----
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_without_messenger.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_without_messenger.php
index bc4280b97a551..5ab0199a2437f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_without_messenger.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_without_messenger.php
@@ -28,4 +28,5 @@
             ['email' => 'test@test.de', 'phone' => '+490815',],
         ]
     ],
+    'scheduler' => false,
 ]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_without_messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_without_messenger.xml
index 7d65d064e9947..8fd6df87c6dee 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_without_messenger.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_without_messenger.xml
@@ -17,5 +17,6 @@
                 <framework:admin-recipient email="test@test.de" phone="+490815" />
             </framework:admin-recipients>
         </framework:notifier>
+        <framework:scheduler enabled="false" />
     </framework:config>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_without_messenger.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_without_messenger.yml
index 9ff92d0ac74af..c55bc0358c89b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_without_messenger.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_without_messenger.yml
@@ -16,3 +16,4 @@ framework:
             high: ['slack', 'twilio']
         admin_recipients:
             - { email: 'test@test.de', phone: '+490815' }
+    scheduler: false
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
index 4aeda47a39f14..5e151512d1cc2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -57,6 +57,10 @@
 use Symfony\Component\HttpClient\ScopingHttpClient;
 use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
 use Symfony\Component\HttpKernel\Fragment\FragmentUriGeneratorInterface;
+use Symfony\Component\Messenger\Bridge\AmazonSqs\Transport\AmazonSqsTransportFactory;
+use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpTransportFactory;
+use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\BeanstalkdTransportFactory;
+use Symfony\Component\Messenger\Bridge\Redis\Transport\RedisTransportFactory;
 use Symfony\Component\Messenger\Transport\TransportFactory;
 use Symfony\Component\Notifier\ChatterInterface;
 use Symfony\Component\Notifier\TexterInterface;
@@ -814,14 +818,27 @@ public function testMessenger()
 
         $expectedFactories = [
             new Reference('scheduler.messenger_transport_factory'),
-            new Reference('messenger.transport.amqp.factory'),
-            new Reference('messenger.transport.redis.factory'),
-            new Reference('messenger.transport.sync.factory'),
-            new Reference('messenger.transport.in_memory.factory'),
-            new Reference('messenger.transport.sqs.factory'),
-            new Reference('messenger.transport.beanstalkd.factory'),
         ];
 
+        if (class_exists(AmqpTransportFactory::class)) {
+            $expectedFactories[] = 'messenger.transport.amqp.factory';
+        }
+
+        if (class_exists(RedisTransportFactory::class)) {
+            $expectedFactories[] = 'messenger.transport.redis.factory';
+        }
+
+        $expectedFactories[] = 'messenger.transport.sync.factory';
+        $expectedFactories[] = 'messenger.transport.in_memory.factory';
+
+        if (class_exists(AmazonSqsTransportFactory::class)) {
+            $expectedFactories[] = 'messenger.transport.sqs.factory';
+        }
+
+        if (class_exists(BeanstalkdTransportFactory::class)) {
+            $expectedFactories[] = 'messenger.transport.beanstalkd.factory';
+        }
+
         $this->assertTrue($container->hasDefinition('messenger.receiver_locator'));
         $this->assertTrue($container->hasDefinition('console.command.messenger_consume_messages'));
         $this->assertTrue($container->hasAlias('messenger.default_bus'));

From d5a4cb1f0e7523a90bf0283e1d9c7604e151eca7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 20 Mar 2023 19:50:18 +0100
Subject: [PATCH 324/475] Fix tests

---
 src/Symfony/Component/Security/Http/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
index e93e81bee6f1d..94ccbdcd403d3 100644
--- a/src/Symfony/Component/Security/Http/composer.json
+++ b/src/Symfony/Component/Security/Http/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "symfony/deprecation-contracts": "^2.5|^3",
-        "symfony/security-core": "~6.0.19|~6.1.11|^6.2.5",
+        "symfony/security-core": "^6.3",
         "symfony/http-foundation": "^5.4|^6.0",
         "symfony/http-kernel": "^6.3",
         "symfony/polyfill-mbstring": "~1.0",

From 6471582f8410d5414e409846ab7a34bb3e9e2e2c Mon Sep 17 00:00:00 2001
From: Daniel Burger <48986191+danielburger1337@users.noreply.github.com>
Date: Sat, 18 Mar 2023 15:45:21 +0100
Subject: [PATCH 325/475] [HttpFoundation] Add IpUtils::isPrivateIp

---
 .../HttpClient/NoPrivateNetworkHttpClient.php | 17 +---------
 .../Component/HttpClient/composer.json        |  3 ++
 .../Component/HttpFoundation/CHANGELOG.md     |  1 +
 .../Component/HttpFoundation/IpUtils.php      | 23 ++++++++++++++
 .../HttpFoundation/Tests/IpUtilsTest.php      | 31 +++++++++++++++++++
 5 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php
index f334572726a35..ef80d4f0dd9bf 100644
--- a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php
+++ b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php
@@ -30,21 +30,6 @@ final class NoPrivateNetworkHttpClient implements HttpClientInterface, LoggerAwa
 {
     use HttpClientTrait;
 
-    private const PRIVATE_SUBNETS = [
-        '127.0.0.0/8',
-        '10.0.0.0/8',
-        '192.168.0.0/16',
-        '172.16.0.0/12',
-        '169.254.0.0/16',
-        '0.0.0.0/8',
-        '240.0.0.0/4',
-        '::1/128',
-        'fc00::/7',
-        'fe80::/10',
-        '::ffff:0:0/96',
-        '::/128',
-    ];
-
     private HttpClientInterface $client;
     private string|array|null $subnets;
 
@@ -74,7 +59,7 @@ public function request(string $method, string $url, array $options = []): Respo
 
         $options['on_progress'] = function (int $dlNow, int $dlSize, array $info) use ($onProgress, $subnets, &$lastPrimaryIp): void {
             if ($info['primary_ip'] !== $lastPrimaryIp) {
-                if ($info['primary_ip'] && IpUtils::checkIp($info['primary_ip'], $subnets ?? self::PRIVATE_SUBNETS)) {
+                if ($info['primary_ip'] && IpUtils::checkIp($info['primary_ip'], $subnets ?? IpUtils::PRIVATE_SUBNETS)) {
                     throw new TransportException(sprintf('IP "%s" is blocked for "%s".', $info['primary_ip'], $info['url']));
                 }
 
diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json
index 4fc2ea35d8776..79740066dd7ab 100644
--- a/src/Symfony/Component/HttpClient/composer.json
+++ b/src/Symfony/Component/HttpClient/composer.json
@@ -42,6 +42,9 @@
         "symfony/process": "^5.4|^6.0",
         "symfony/stopwatch": "^5.4|^6.0"
     },
+    "conflict": {
+        "symfony/http-foundation": "<6.3"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\HttpClient\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index 7b6a048882642..b40e8c7e79a0c 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
  * Create migration for session table when pdo handler is used
  * Add support for Relay PHP extension for Redis
  * The `Response::sendHeaders()` method now takes an optional HTTP status code as parameter, allowing to send informational responses such as Early Hints responses (103 status code)
+ * Add `IpUtils::isPrivateIp`
  * Deprecate conversion of invalid values in `ParameterBag::getInt()` and `ParameterBag::getBoolean()`,
  * Deprecate ignoring invalid values when using `ParameterBag::filter()`, unless flag `FILTER_NULL_ON_FAILURE` is set
 
diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php
index 8f78d1b1d629a..4f17be64a122e 100644
--- a/src/Symfony/Component/HttpFoundation/IpUtils.php
+++ b/src/Symfony/Component/HttpFoundation/IpUtils.php
@@ -18,6 +18,21 @@
  */
 class IpUtils
 {
+    public const PRIVATE_SUBNETS = [
+        '127.0.0.0/8',    // RFC1700 (Loopback)
+        '10.0.0.0/8',     // RFC1918
+        '192.168.0.0/16', // RFC1918
+        '172.16.0.0/12',  // RFC1918
+        '169.254.0.0/16', // RFC3927
+        '0.0.0.0/8',      // RFC5735
+        '240.0.0.0/4',    // RFC1112
+        '::1/128',        // Loopback
+        'fc00::/7',       // Unique Local Address
+        'fe80::/10',      // Link Local Address
+        '::ffff:0:0/96',  // IPv4 translations
+        '::/128',         // Unspecified address
+    ];
+
     private static array $checkedIps = [];
 
     /**
@@ -191,4 +206,12 @@ public static function anonymize(string $ip): string
 
         return $ip;
     }
+
+    /**
+     * Checks if an IPv4 or IPv6 address is contained in the list of private IP subnets.
+     */
+    public static function isPrivateIp(string $requestIp): bool
+    {
+        return self::checkIp($requestIp, self::PRIVATE_SUBNETS);
+    }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
index a8416a513d4b5..7146f32ddabe0 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
@@ -154,4 +154,35 @@ public static function getIp4SubnetMaskZeroData()
             [false, '1.2.3.4', '256.256.256/0'], // invalid CIDR notation
         ];
     }
+
+    /**
+     * @dataProvider getIsPrivateIpData
+     */
+    public function testIsPrivateIp(string $ip, bool $matches)
+    {
+        $this->assertSame($matches, IpUtils::isPrivateIp($ip));
+    }
+
+    public static function getIsPrivateIpData(): array
+    {
+        return [
+            // private
+            ['127.0.0.1',       true],
+            ['10.0.0.1',        true],
+            ['192.168.0.1',     true],
+            ['172.16.0.1',      true],
+            ['169.254.0.1',     true],
+            ['0.0.0.1',         true],
+            ['240.0.0.1',       true],
+            ['::1',             true],
+            ['fc00::1',         true],
+            ['fe80::1',         true],
+            ['::ffff:0:1',      true],
+            ['fd00::1',         true],
+
+            // public
+            ['104.26.14.6',             false],
+            ['2606:4700:20::681a:e06',  false],
+        ];
+    }
 }

From 44726c41dc29c25b934d96b150e776843db70fd5 Mon Sep 17 00:00:00 2001
From: Chi-teck <Chi-teck@users.noreply.github.com>
Date: Tue, 21 Mar 2023 23:22:26 +0500
Subject: [PATCH 326/475] Use file system completion for redirect operators

---
 .../Component/Console/Resources/completion.bash        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Symfony/Component/Console/Resources/completion.bash b/src/Symfony/Component/Console/Resources/completion.bash
index ad69eab0ff070..0d76eacc3b748 100644
--- a/src/Symfony/Component/Console/Resources/completion.bash
+++ b/src/Symfony/Component/Console/Resources/completion.bash
@@ -6,6 +6,16 @@
 # https://symfony.com/doc/current/contributing/code/license.html
 
 _sf_{{ COMMAND_NAME }}() {
+
+    # Use the default completion for shell redirect operators.
+    for w in '>' '>>' '&>' '<'; do
+        if [[ $w = "${COMP_WORDS[COMP_CWORD-1]}" ]]; then
+            compopt -o filenames
+            COMPREPLY=($(compgen -f -- "${COMP_WORDS[COMP_CWORD]}"))
+            return 0
+        fi
+    done
+
     # Use newline as only separator to allow space in completion values
     IFS=$'\n'
     local sf_cmd="${COMP_WORDS[0]}"

From 65422ecf4b43af140dc424cc3c2ca586939cfc34 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 21 Mar 2023 22:03:43 +0100
Subject: [PATCH 327/475] Replace "use-by-ref" by static vars when possible in
 closures

---
 src/Symfony/Component/Cache/Adapter/ChainAdapter.php |  6 +++---
 src/Symfony/Component/Console/Question/Question.php  |  5 +++--
 .../Component/Form/ChoiceList/ArrayChoiceList.php    |  5 +++--
 src/Symfony/Component/HttpClient/CurlHttpClient.php  |  7 ++++---
 .../Component/HttpClient/NativeHttpClient.php        |  7 ++++---
 .../HttpClient/NoPrivateNetworkHttpClient.php        |  4 ++--
 .../Component/HttpClient/Response/AmpResponse.php    |  2 +-
 .../Component/HttpClient/RetryableHttpClient.php     |  8 ++++----
 .../HttpClient/Tests/AsyncDecoratorTraitTest.php     | 12 ++++++------
 .../Component/HttpFoundation/AcceptHeader.php        |  5 ++---
 .../EventListener/AbstractSessionListener.php        |  7 ++++---
 src/Symfony/Component/Process/Process.php            |  6 +++---
 .../Component/String/AbstractUnicodeString.php       |  4 +++-
 src/Symfony/Component/String/LazyString.php          |  4 +++-
 14 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
index 07ef47f5eb947..ffaa56f3ed3e9 100644
--- a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
@@ -98,9 +98,9 @@ public function get(string $key, callable $callback, float $beta = null, array &
             return $value;
         };
 
-        $lastItem = null;
-        $i = 0;
-        $wrap = function (CacheItem $item = null, bool &$save = true) use ($key, $callback, $beta, &$wrap, &$i, &$doSave, &$lastItem, &$metadata) {
+        $wrap = function (CacheItem $item = null, bool &$save = true) use ($key, $callback, $beta, &$wrap, &$doSave, &$metadata) {
+            static $lastItem;
+            static $i = 0;
             $adapter = $this->adapters[$i];
             if (isset($this->adapters[++$i])) {
                 $callback = $wrap;
diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
index e1f981bc1e90d..26896bb5314fa 100644
--- a/src/Symfony/Component/Console/Question/Question.php
+++ b/src/Symfony/Component/Console/Question/Question.php
@@ -148,8 +148,9 @@ public function setAutocompleterValues(?iterable $values): static
 
             $callback = static fn () => $values;
         } elseif ($values instanceof \Traversable) {
-            $valueCache = null;
-            $callback = static function () use ($values, &$valueCache) {
+            $callback = static function () use ($values) {
+                static $valueCache;
+
                 return $valueCache ??= iterator_to_array($values, false);
             };
         } else {
diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
index ef09ca58370fa..2dfc497d3d848 100644
--- a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
+++ b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
@@ -72,8 +72,9 @@ public function __construct(iterable $choices, callable $value = null)
             $this->valueCallback = $value;
         } else {
             // Otherwise generate incrementing integers as values
-            $i = 0;
-            $value = function () use (&$i) {
+            $value = function () {
+                static $i = 0;
+
                 return $i++;
             };
         }
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
index 23cccad666645..b7f5a7f70005d 100644
--- a/src/Symfony/Component/HttpClient/CurlHttpClient.php
+++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -224,9 +224,10 @@ public function request(string $method, string $url, array $options = []): Respo
             if (\is_resource($body)) {
                 $curlopts[\CURLOPT_INFILE] = $body;
             } else {
-                $eof = false;
-                $buffer = '';
-                $curlopts[\CURLOPT_READFUNCTION] = static function ($ch, $fd, $length) use ($body, &$buffer, &$eof) {
+                $curlopts[\CURLOPT_READFUNCTION] = static function ($ch, $fd, $length) use ($body) {
+                    static $eof = false;
+                    static $buffer = '';
+
                     return self::readRequestBody($length, $body, $buffer, $eof);
                 };
             }
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
index 6357b5507c93b..23e1b3f0fe936 100644
--- a/src/Symfony/Component/HttpClient/NativeHttpClient.php
+++ b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -132,10 +132,8 @@ public function request(string $method, string $url, array $options = []): Respo
         ];
 
         if ($onProgress = $options['on_progress']) {
-            // Memoize the last progress to ease calling the callback periodically when no network transfer happens
-            $lastProgress = [0, 0];
             $maxDuration = 0 < $options['max_duration'] ? $options['max_duration'] : \INF;
-            $onProgress = static function (...$progress) use ($onProgress, &$lastProgress, &$info, $maxDuration) {
+            $onProgress = static function (...$progress) use ($onProgress, &$info, $maxDuration) {
                 if ($info['total_time'] >= $maxDuration) {
                     throw new TransportException(sprintf('Max duration was reached for "%s".', implode('', $info['url'])));
                 }
@@ -144,6 +142,9 @@ public function request(string $method, string $url, array $options = []): Respo
                 $progressInfo['url'] = implode('', $info['url']);
                 unset($progressInfo['size_body']);
 
+                // Memoize the last progress to ease calling the callback periodically when no network transfer happens
+                static $lastProgress = [0, 0];
+
                 if ($progress && -1 === $progress[0]) {
                     // Response completed
                     $lastProgress[0] = max($lastProgress);
diff --git a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php
index f334572726a35..70638c67f6e53 100644
--- a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php
+++ b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php
@@ -70,9 +70,9 @@ public function request(string $method, string $url, array $options = []): Respo
         }
 
         $subnets = $this->subnets;
-        $lastPrimaryIp = '';
 
-        $options['on_progress'] = function (int $dlNow, int $dlSize, array $info) use ($onProgress, $subnets, &$lastPrimaryIp): void {
+        $options['on_progress'] = function (int $dlNow, int $dlSize, array $info) use ($onProgress, $subnets): void {
+            static $lastPrimaryIp = '';
             if ($info['primary_ip'] !== $lastPrimaryIp) {
                 if ($info['primary_ip'] && IpUtils::checkIp($info['primary_ip'], $subnets ?? self::PRIVATE_SUBNETS)) {
                     throw new TransportException(sprintf('IP "%s" is blocked for "%s".', $info['primary_ip'], $info['url']));
diff --git a/src/Symfony/Component/HttpClient/Response/AmpResponse.php b/src/Symfony/Component/HttpClient/Response/AmpResponse.php
index 1c143e5c83041..e263b7782627e 100644
--- a/src/Symfony/Component/HttpClient/Response/AmpResponse.php
+++ b/src/Symfony/Component/HttpClient/Response/AmpResponse.php
@@ -101,7 +101,7 @@ public function __construct(AmpClientState $multi, Request $request, array $opti
         $throttleWatcher = null;
 
   
10000
      $this->id = $id = self::$nextId++;
-        Loop::defer(static function () use ($request, $multi, &$id, &$info, &$headers, $canceller, &$options, $onProgress, &$handle, $logger, &$pause) {
+        Loop::defer(static function () use ($request, $multi, $id, &$info, &$headers, $canceller, &$options, $onProgress, &$handle, $logger, &$pause) {
             return new Coroutine(self::generateResponse($request, $multi, $id, $info, $headers, $canceller, $options, $onProgress, $handle, $logger, $pause));
         });
 
diff --git a/src/Symfony/Component/HttpClient/RetryableHttpClient.php b/src/Symfony/Component/HttpClient/RetryableHttpClient.php
index 4dc54727565cc..2fc429489c268 100644
--- a/src/Symfony/Component/HttpClient/RetryableHttpClient.php
+++ b/src/Symfony/Component/HttpClient/RetryableHttpClient.php
@@ -53,11 +53,11 @@ public function request(string $method, string $url, array $options = []): Respo
             return new AsyncResponse($this->client, $method, $url, $options);
         }
 
-        $retryCount = 0;
-        $content = '';
-        $firstChunk = null;
+        return new AsyncResponse($this->client, $method, $url, $options, function (ChunkInterface $chunk, AsyncContext $context) use ($method, $url, $options) {
+            static $retryCount = 0;
+            static $content = '';
+            static $firstChunk;
 
-        return new AsyncResponse($this->client, $method, $url, $options, function (ChunkInterface $chunk, AsyncContext $context) use ($method, $url, $options, &$retryCount, &$content, &$firstChunk) {
             $exception = null;
             try {
                 if ($context->getInfo('canceled') || $chunk->isTimeout() || null !== $chunk->getInformationalStatus()) {
diff --git a/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php b/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php
index 892c3e4d2ce96..e8d699e9993ce 100644
--- a/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php
@@ -235,8 +235,8 @@ public function testBufferPurePassthru()
 
     public function testRetryTimeout()
     {
-        $cpt = 0;
-        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) use (&$cpt) {
+        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) {
+            static $cpt = 0;
             try {
                 $this->assertTrue($chunk->isTimeout());
                 yield $chunk;
@@ -301,8 +301,8 @@ public function testInfoPassToDecorator()
 
     public function testMultipleYieldInInitializer()
     {
-        $first = null;
-        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) use (&$first) {
+        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) {
+            static $first;
             if ($chunk->isFirst()) {
                 $first = $chunk;
 
@@ -343,8 +343,8 @@ public function request(string $method, string $url, array $options = []): Respo
 
     public function testMaxDuration()
     {
-        $sawFirst = false;
-        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) use (&$sawFirst) {
+        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) {
+            static $sawFirst = false;
             try {
                 if (!$chunk->isFirst() || !$sawFirst) {
                     $sawFirst = $sawFirst || $chunk->isFirst();
diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeader.php b/src/Symfony/Component/HttpFoundation/AcceptHeader.php
index 5edf5f5f18251..853c000e00f12 100644
--- a/src/Symfony/Component/HttpFoundation/AcceptHeader.php
+++ b/src/Symfony/Component/HttpFoundation/AcceptHeader.php
@@ -46,11 +46,10 @@ public function __construct(array $items)
      */
     public static function fromString(?string $headerValue): self
     {
-        $index = 0;
-
         $parts = HeaderUtils::split($headerValue ?? '', ',;=');
 
-        return new self(array_map(function ($subParts) use (&$index) {
+        return new self(array_map(function ($subParts) {
+            static $index = 0;
             $part = array_shift($subParts);
             $attributes = HeaderUtils::combine($subParts);
 
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
index aab8782c7a978..ec27eaec122e5 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
@@ -65,9 +65,10 @@ public function onKernelRequest(RequestEvent $event): void
 
         $request = $event->getRequest();
         if (!$request->hasSession()) {
-            // This variable prevents calling `$this->getSession()` twice in case the Request (and the below factory) is cloned
-            $sess = null;
-            $request->setSessionFactory(function () use (&$sess, $request) {
+            $request->setSessionFactory(function () use ($request) {
+                // Prevent calling `$this->getSession()` twice in case the Request (and the below factory) is cloned
+                static $sess;
+
                 if (!$sess) {
                     $sess = $this->getSession();
                     $request->setSession($sess);
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index 909a247641cf2..7defb879f77a7 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -1480,8 +1480,6 @@ private function doSignal(int $signal, bool $throwException): bool
     private function prepareWindowsCommandLine(string $cmd, array &$env): string
     {
         $uid = uniqid('', true);
-        $varCount = 0;
-        $varCache = [];
         $cmd = preg_replace_callback(
             '/"(?:(
                 [^"%!^]*+
@@ -1490,7 +1488,9 @@ private function prepareWindowsCommandLine(string $cmd, array &$env): string
                     [^"%!^]*+
                 )++
             ) | [^"]*+ )"/x',
-            function ($m) use (&$env, &$varCache, &$varCount, $uid) {
+            function ($m) use (&$env, $uid) {
+                static $varCount = 0;
+                static $varCache = [];
                 if (!isset($m[1])) {
                     return $m[0];
                 }
diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/AbstractUnicodeString.php
index ec1c78b44672f..d19a61a9c6854 100644
--- a/src/Symfony/Component/String/AbstractUnicodeString.php
+++ b/src/Symfony/Component/String/AbstractUnicodeString.php
@@ -155,7 +155,9 @@ public function ascii(array $rules = []): self
     public function camel(): static
     {
         $str = clone $this;
-        $str->string = str_replace(' ', '', preg_replace_callback('/\b.(?![A-Z]{2,})/u', static function ($m) use (&$i) {
+        $str->string = str_replace(' ', '', preg_replace_callback('/\b.(?![A-Z]{2,})/u', static function ($m) {
+            static $i = 0;
+
             return 1 === ++$i ? ('İ' === $m[0] ? 'i̇' : mb_strtolower($m[0], 'UTF-8')) : mb_convert_case($m[0], \MB_CASE_TITLE, 'UTF-8');
         }, preg_replace('/[^\pL0-9]++/u', ' ', $this->string)));
 
diff --git a/src/Symfony/Component/String/LazyString.php b/src/Symfony/Component/String/LazyString.php
index 9523b8cdb2248..3128ebb361747 100644
--- a/src/Symfony/Component/String/LazyString.php
+++ b/src/Symfony/Component/String/LazyString.php
@@ -30,7 +30,9 @@ public static function fromCallable(callable|array $callback, mixed ...$argument
         }
 
         $lazyString = new static();
-        $lazyString->value = static function () use (&$callback, &$arguments, &$value): string {
+        $lazyString->value = static function () use (&$callback, &$arguments): string {
+            static $value;
+
             if (null !== $arguments) {
                 if (!\is_callable($callback)) {
                     $callback[0] = $callback[0]();

From 1772c870fb51db9550f90b248e1ce5e6ad5b976d Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Wed, 22 Mar 2023 15:14:13 +0100
Subject: [PATCH 328/475] [Scheduler] Fix PHPUnit deprecation on abstract test
 cases naming

---
 .../{AbstractTriggerTest.php => AbstractTriggerTestCase.php}    | 2 +-
 .../Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/Symfony/Component/Scheduler/Tests/Trigger/{AbstractTriggerTest.php => AbstractTriggerTestCase.php} (96%)

diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTestCase.php
similarity index 96%
rename from src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTest.php
rename to src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTestCase.php
index 187afdad673f3..45eccb09de22b 100644
--- a/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTestCase.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Scheduler\Trigger\DatePeriodTrigger;
 use Symfony\Component\Scheduler\Trigger\TriggerInterface;
 
-abstract class AbstractTriggerTest extends TestCase
+abstract class AbstractTriggerTestCase extends TestCase
 {
     /**
      * @dataProvider providerGetNextRunDate
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php
index f27e180f37080..0b1869d9ada26 100644
--- a/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Scheduler\Trigger\DatePeriodTrigger;
 
-class DatePeriodTriggerTest extends AbstractTriggerTest
+class DatePeriodTriggerTest extends AbstractTriggerTestCase
 {
     public static function providerGetNextRunDate(): iterable
     {

From c2bd30c35a84a0085185a42b1bc3923775e26692 Mon Sep 17 00:00:00 2001
From: "hubert.lenoir" <hubert.lenoir@sensiolabs.com>
Date: Wed, 22 Mar 2023 18:01:48 +0100
Subject: [PATCH 329/475] [Scheduler] Fix unit tests

---
 .../Scheduler/Tests/Trigger/AbstractTriggerTestCase.php   | 8 ++++----
 .../Scheduler/Tests/Trigger/DatePeriodTriggerTest.php     | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTestCase.php b/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTestCase.php
index 45eccb09de22b..ee996e23d1d26 100644
--- a/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTestCase.php
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/AbstractTriggerTestCase.php
@@ -20,9 +20,9 @@ abstract class AbstractTriggerTestCase extends TestCase
     /**
      * @dataProvider providerGetNextRunDate
      */
-    public function testGetNextRunDate(TriggerInterface $trigger, array $expected)
+    public function testGetNextRunDate(\DateTimeImmutable $from, TriggerInterface $trigger, array $expected)
     {
-        $this->assertEquals($expected, $this->getNextRunDates($trigger));
+        $this->assertEquals($expected, $this->getNextRunDates($from, $trigger));
     }
 
     abstract public static function providerGetNextRunDate(): iterable;
@@ -34,11 +34,11 @@ protected static function createTrigger(string $interval): DatePeriodTrigger
         );
     }
 
-    private function getNextRunDates(TriggerInterface $trigger): array
+    private function getNextRunDates(\DateTimeImmutable $from, TriggerInterface $trigger): array
     {
         $dates = [];
         $i = 0;
-        $next = new \DateTimeImmutable();
+        $next = $from;
         while ($i++ < 20) {
             $next = $trigger->getNextRunDate($next);
             if (!$next) {
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php
index 0b1869d9ada26..f538eb67c4bec 100644
--- a/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/DatePeriodTriggerTest.php
@@ -18,6 +18,7 @@ class DatePeriodTriggerTest extends AbstractTriggerTestCase
     public static function providerGetNextRunDate(): iterable
     {
         yield [
+            new \DateTimeImmutable('2023-03-19 13:45'),
             self::createTrigger('next tuesday'),
             [
                 new \DateTimeImmutable('2023-03-21 13:45:00'),
@@ -37,6 +38,7 @@ public static function providerGetNextRunDate(): iterable
         ];
 
         yield [
+            new \DateTimeImmutable('2023-03-19 13:45'),
             self::createTrigger('last day of next month'),
             [
                 new \DateTimeImmutable('2023-04-30 13:45:00'),
@@ -45,6 +47,7 @@ public static function providerGetNextRunDate(): iterable
         ];
 
         yield [
+            new \DateTimeImmutable('2023-03-19 13:45'),
             self::createTrigger('first monday of next month'),
             [
                 new \DateTimeImmutable('2023-04-03 13:45:00'),

From 276c5a74b3b919ed64d9ea997219ce16260b8f33 Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Thu, 23 Mar 2023 14:29:01 +0100
Subject: [PATCH 330/475] Improve security factory signatures

---
 .../Security/Factory/AuthenticatorFactoryInterface.php          | 2 ++
 .../Security/Factory/FirewallListenerFactoryInterface.php       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php
index 764e7d35c3810..8082b6f3524b5 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php
@@ -38,6 +38,8 @@ public function addConfiguration(NodeDefinition $builder);
     /**
      * Creates the authenticator service(s) for the provided configuration.
      *
+     * @param array<string, mixed> $config
+     *
      * @return string|string[] The authenticator service ID(s) to be used by the firewall
      */
     public function createAuthenticator(ContainerBuilder $container, string $firewallName, array $config, string $userProviderId): string|array;
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FirewallListenerFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FirewallListenerFactoryInterface.php
index c4842010a779f..443ced6c4c936 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FirewallListenerFactoryInterface.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FirewallListenerFactoryInterface.php
@@ -23,6 +23,8 @@ interface FirewallListenerFactoryInterface
     /**
      * Creates the firewall listener services for the provided configuration.
      *
+     * @param array<string, mixed> $config
+     *
      * @return string[] The listener service IDs to be used by the firewall
      */
     public function createListeners(ContainerBuilder $container, string $firewallName, array $config): array;

From ae6c25b33bbf77919f8c57672bb536e8c075e13e Mon Sep 17 00:00:00 2001
From: Mathieu Santostefano <msantostefano@protonmail.com>
Date: Thu, 23 Mar 2023 13:13:04 +0100
Subject: [PATCH 331/475] fix(translation): Improve performance of debug and
 extract command for big code base

---
 .../Component/Translation/Extractor/PhpAstExtractor.php     | 4 +++-
 .../Translation/Extractor/Visitor/ConstraintVisitor.php     | 6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Translation/Extractor/PhpAstExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpAstExtractor.php
index d0bbf0e083847..4dd7f41b2dd91 100644
--- a/src/Symfony/Component/Translation/Extractor/PhpAstExtractor.php
+++ b/src/Symfony/Component/Translation/Extractor/PhpAstExtractor.php
@@ -64,7 +64,9 @@ public function setPrefix(string $prefix): void
 
     protected function canBeExtracted(string $file): bool
     {
-        return 'php' === pathinfo($file, \PATHINFO_EXTENSION) && $this->isFile($file);
+        return 'php' === pathinfo($file, \PATHINFO_EXTENSION)
+            && $this->isFile($file)
+            && preg_match('/\bt\(|->trans\(|TranslatableMessage|Symfony\\\\Component\\\\Validator\\\\Constraints/i', file_get_contents($file));
     }
 
     protected function extractFromDirectory(array|string $resource): iterable|Finder
diff --git a/src/Symfony/Component/Translation/Extractor/Visitor/ConstraintVisitor.php b/src/Symfony/Component/Translation/Extractor/Visitor/ConstraintVisitor.php
index 3c6458440b9f8..33dc8437a7207 100644
--- a/src/Symfony/Component/Translation/Extractor/Visitor/ConstraintVisitor.php
+++ b/src/Symfony/Component/Translation/Extractor/Visitor/ConstraintVisitor.php
@@ -21,8 +21,6 @@
  */
 final class ConstraintVisitor extends AbstractVisitor implements NodeVisitor
 {
-    private const CONSTRAINT_VALIDATION_MESSAGE_PATTERN = '/[a-zA-Z]*message/i';
-
     public function __construct(
         private readonly array $constraintClassNames = []
     ) {
@@ -65,7 +63,7 @@ public function enterNode(Node $node): ?Node
         }
 
         if ($this->hasNodeNamedArguments($node)) {
-            $messages = $this->getStringArguments($node, self::CONSTRAINT_VALIDATION_MESSAGE_PATTERN, true);
+            $messages = $this->getStringArguments($node, '/message/i', true);
         } else {
             if (!$arg->value instanceof Node\Expr\Array_) {
                 // There is no way to guess which argument is a message to be translated.
@@ -81,7 +79,7 @@ public function enterNode(Node $node): ?Node
                     continue;
                 }
 
-                if (!preg_match(self::CONSTRAINT_VALIDATION_MESSAGE_PATTERN, $item->key->value ?? '')) {
+                if (false === stripos($item->key->value ?? '', 'message')) {
                     continue;
                 }
 

From 170cc743f856efb7d73ad212b4675a6441d6ce69 Mon Sep 17 00:00:00 2001
From: "hubert.lenoir" <hubert.lenoir@sensiolabs.com>
Date: Fri, 24 Mar 2023 17:12:37 +0100
Subject: [PATCH 332/475] [Messenger] Fix timezone in appveyor tests

---
 src/Symfony/Component/Messenger/Tests/WorkerTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
index ae62a3a5965ee..e781d2958ef0c 100644
--- a/src/Symfony/Component/Messenger/Tests/WorkerTest.php
+++ b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
@@ -314,10 +314,10 @@ public function testTimeoutIsConfigurable()
         $dispatcher = new EventDispatcher();
         $dispatcher->addSubscriber(new StopWorkerOnMessageLimitListener(5));
 
-        $clock = new MockClock('2023-03-19 14:00:00');
+        $clock = new MockClock('2023-03-19 14:00:00+00:00');
         $worker = new Worker([$receiver], $bus, $dispatcher, clock: $clock);
         $worker->run(['sleep' => 1000000]);
-        $this->assertEquals(new \DateTimeImmutable('2023-03-19 14:00:03'), $clock->now());
+        $this->assertEquals(new \DateTimeImmutable('2023-03-19 14:00:03+00:00'), $clock->now());
     }
 
     public function testWorkerWithMultipleReceivers()

From bdb5e81f9a43b147181815e6c31a573265ac2c44 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Fri, 24 Mar 2023 18:07:05 +0100
Subject: [PATCH 333/475] [Scheduler] Make some properties readonly

---
 .../Component/Scheduler/Generator/MessageGenerator.php        | 4 ++--
 src/Symfony/Component/Scheduler/Scheduler.php                 | 4 ++--
 .../Component/Scheduler/Tests/Generator/CheckpointTest.php    | 2 +-
 .../Tests/Messenger/SchedulerTransportFactoryTest.php         | 2 +-
 .../Component/Scheduler/Trigger/CronExpressionTrigger.php     | 2 +-
 src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php b/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
index 41cfa10c7ad85..2f9743c59bfc2 100644
--- a/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
+++ b/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
@@ -26,9 +26,9 @@ final class MessageGenerator implements MessageGeneratorInterface
     private CheckpointInterface $checkpoint;
 
     public function __construct(
-        private Schedule $schedule,
+        private readonly Schedule $schedule,
         string|CheckpointInterface $checkpoint,
-        private ClockInterface $clock = new Clock(),
+        private readonly ClockInterface $clock = new Clock(),
     ) {
         $this->waitUntil = new \DateTimeImmutable('@0');
         if (\is_string($checkpoint)) {
diff --git a/src/Symfony/Component/Scheduler/Scheduler.php b/src/Symfony/Component/Scheduler/Scheduler.php
index 71cb2c05e2acf..8c9e8fac7b3ca 100644
--- a/src/Symfony/Component/Scheduler/Scheduler.php
+++ b/src/Symfony/Component/Scheduler/Scheduler.php
@@ -31,9 +31,9 @@ final class Scheduler
      * @param iterable<Schedule> $schedules
      */
     public function __construct(
-        private array $handlers,
+        private readonly array $handlers,
         array $schedules,
-        private ClockInterface $clock = new Clock(),
+        private readonly ClockInterface $clock = new Clock(),
     ) {
         foreach ($schedules as $schedule) {
             $this->addSchedule($schedule);
diff --git a/src/Symfony/Component/Scheduler/Tests/Generator/CheckpointTest.php b/src/Symfony/Component/Scheduler/Tests/Generator/CheckpointTest.php
index b8c3895a97304..5f919b5c4e870 100644
--- a/src/Symfony/Component/Scheduler/Tests/Generator/CheckpointTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Generator/CheckpointTest.php
@@ -105,7 +105,7 @@ public function testWithCacheSave()
     {
         $checkpoint = new Checkpoint('cache', new NoLock(), $cache = new ArrayAdapter());
         $now = new \DateTimeImmutable('2020-02-20 20:20:20Z');
-        $checkpoint->acquire($n = $now->modify('-1 hour'));
+        $checkpoint->acquire($now->modify('-1 hour'));
         $checkpoint->save($now, 3);
 
         $this->assertSame($now, $checkpoint->time());
diff --git a/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportFactoryTest.php b/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportFactoryTest.php
index 4f5c53e70bd25..55767d6b4740c 100644
--- a/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportFactoryTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportFactoryTest.php
@@ -105,7 +105,7 @@ private function makeTransportFactoryWithStubs(): SchedulerTransportFactory
 class SomeScheduleProvider implements ScheduleProviderInterface
 {
     public function __construct(
-        private array $messages,
+        private readonly array $messages,
     ) {
     }
 
diff --git a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
index 76f3fde5bdcd3..d31b00ca5bff5 100644
--- a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
@@ -24,7 +24,7 @@
 final class CronExpressionTrigger implements TriggerInterface
 {
     public function __construct(
-        private CronExpression $expression = new CronExpression('* * * * *'),
+        private readonly CronExpression $expression = new CronExpression('* * * * *'),
     ) {
     }
 
diff --git a/src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php b/src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php
index 461ceb241d67d..9d17af05ae69b 100644
--- a/src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php
@@ -17,7 +17,7 @@
 class DatePeriodTrigger implements TriggerInterface
 {
     public function __construct(
-        private \DatePeriod $period,
+        private readonly \DatePeriod $period,
     ) {
     }
 

From 05e9be765cc23fb8fdbd6e3117225e3969a21aed Mon Sep 17 00:00:00 2001
From: Sander De la Marche <sander@sumocoders.be>
Date: Sat, 25 Mar 2023 09:20:41 +0100
Subject: [PATCH 334/475] [Mailer] Update default Mailgun port

---
 .../Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php    | 2 +-
 src/Symfony/Component/Mailer/CHANGELOG.md                       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php
index 84c4479d2defc..e499d72f0b615 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php
@@ -24,7 +24,7 @@ class MailgunSmtpTransport extends EsmtpTransport
 
     public function __construct(string $username, #[\SensitiveParameter] string $password, string $region = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
-        parent::__construct('us' !== ($region ?: 'us') ? sprintf('smtp.%s.mailgun.org', $region) : 'smtp.mailgun.org', 465, true, $dispatcher, $logger);
+        parent::__construct('us' !== ($region ?: 'us') ? sprintf('smtp.%s.mailgun.org', $region) : 'smtp.mailgun.org', 587, true, $dispatcher, $logger);
 
         $this->setUsername($username);
         $this->setPassword($password);
diff --git a/src/Symfony/Component/Mailer/CHANGELOG.md b/src/Symfony/Component/Mailer/CHANGELOG.md
index 6724bf10e18cd..14baa891ec5a1 100644
--- a/src/Symfony/Component/Mailer/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add `MessageEvent::reject()` to allow rejecting an email before sending it
+ * Change the default port for the `mailgun+smtp` transport from 465 to 587
 
 6.2.7
 -----

From 3a50d2db67d56d067a7f0b316ee1bef0565ec00f Mon Sep 17 00:00:00 2001
From: Bob van de Vijver <bobvandevijver@hotmail.com>
Date: Thu, 16 Mar 2023 14:46:34 +0100
Subject: [PATCH 335/475] [FrameworkBundle] Add support to easily clear all
 cache pools

---
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  1 +
 .../Command/CachePoolClearCommand.php         | 18 +++++++++--
 .../Functional/CachePoolClearCommandTest.php  | 32 +++++++++++++++++--
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 396cf456e3747..0e59213f54c29 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -21,6 +21,7 @@ CHANGELOG
  * Add autowiring aliases for `Http\Client\HttpAsyncClient`
  * Deprecate the `Http\Client\HttpClient` service, use `Psr\Http\Client\ClientInterface` instead
  * Add `stop_worker_on_signals` configuration option to `messenger` to define signals which would stop a worker
+ * Add support for `--all` option to clear all cache pools with `cache:pool:clear` command
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
index 152e6cfcaeecd..5569a5ab19ffe 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
@@ -19,6 +19,7 @@
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
@@ -49,8 +50,9 @@ protected function configure(): void
     {
         $this
             ->setDefinition([
-                new InputArgument('pools', InputArgument::IS_ARRAY | InputArgument::REQUIRED, 'A list of cache pools or cache pool clearers'),
+                new InputArgument('pools', InputArgument::IS_ARRAY | InputArgument::OPTIONAL, 'A list of cache pools or cache pool clearers'),
             ])
+            ->addOption('all', null, InputOption::VALUE_NONE, 'Clear all cache pools')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command clears the given cache pools or cache pool clearers.
 
@@ -67,7 +69,19 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $pools = [];
         $clearers = [];
 
-        foreach ($input->getArgument('pools') as $id) {
+        $poolNames = $input->getArgument('pools');
+        if ($input->getOption('all')) {
+            if (!$this->poolNames) {
+                throw new InvalidArgumentException('Could not clear all cache pools, try specifying a specific pool or cache clearer.');
+            }
+
+            $io->comment('Clearing all cache pools...');
+            $poolNames = $this->poolNames;
+        } elseif (!$poolNames) {
+            throw new InvalidArgumentException('Either specify at least one pool name, or provide the --all option to clear all pools.');
+        }
+
+        foreach ($poolNames as $id) {
             if ($this->poolClearer->hasPool($id)) {
                 $pools[$id] = $id;
             } else {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php
index b01295607b17f..76ac645d2b6f6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php
@@ -14,6 +14,7 @@
 use Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\Finder\SplFileInfo;
@@ -76,6 +77,33 @@ public function testClearUnexistingPool()
             ->execute(['pools' => ['unknown_pool']], ['decorated' => false]);
     }
 
+    public function testClearAll()
+    {
+        $tester = $this->createCommandTester(['cache.app_clearer']);
+        $tester->execute(['--all' => true], ['decorated' => false]);
+
+        $tester->assertCommandIsSuccessful('cache:pool:clear exits with 0 in case of success');
+        $this->assertStringContainsString('Clearing all cache pools...', $tester->getDisplay());
+        $this->assertStringContainsString('Calling cache clearer: cache.app_clearer', $tester->getDisplay());
+        $this->assertStringContainsString('[OK] Cache was successfully cleared.', $tester->getDisplay());
+    }
+
+    public function testClearWithoutPoolNames()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Could not clear all cache pools, try specifying a specific pool or cache clearer.');
+
+        $this->createCommandTester()->execute(['--all' => true], ['decorated' => false]);
+    }
+
+    public function testClearNoOptions()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Either specify at least one pool name, or provide the --all option to clear all pools.');
+
+        $this->createCommandTester()->execute([], ['decorated' => false]);
+    }
+
     public function testClearFailed()
     {
         $tester = $this->createCommandTester();
@@ -104,10 +132,10 @@ public function testClearFailed()
         $this->assertStringContainsString('[WARNING] Cache pool "cache.public_pool" could not be cleared.', $tester->getDisplay());
     }
 
-    private function createCommandTester()
+    private function createCommandTester(array $poolNames = null)
     {
         $application = new Application(static::$kernel);
-        $application->add(new CachePoolClearCommand(static::getContainer()->get('cache.global_clearer')));
+        $application->add(new CachePoolClearCommand(static::getContainer()->get('cache.global_clearer'), $poolNames));
 
         return new CommandTester($application->find('cache:pool:clear'));
     }

From 398e2b27089753c441fb180cfc0d5549f7adffdc Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Fri, 24 Mar 2023 10:35:01 -0400
Subject: [PATCH 336/475] add `debug:scheduler` command

---
 .../FrameworkExtension.php                    |  4 +
 .../Resources/config/console.php              | 11 ++-
 .../Scheduler/Command/DebugCommand.php        | 96 +++++++++++++++++++
 .../Trigger/CronExpressionTrigger.php         |  7 +-
 4 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 src/Symfony/Component/Scheduler/Command/DebugCommand.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 6d1401463fcf2..6d0eb3bd93c60 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2016,6 +2016,10 @@ private function registerSchedulerConfiguration(array $config, ContainerBuilder
         }
 
         $loader->load('scheduler.php');
+
+        if (!$this->hasConsole()) {
+            $container->removeDefinition('console.command.scheduler_debug');
+        }
     }
 
     private function registerMessengerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $validationEnabled): void
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
index d64cd058e61f8..732a7bae49707 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
@@ -42,13 +42,14 @@
 use Symfony\Component\Console\EventListener\ErrorListener;
 use Symfony\Component\Dotenv\Command\DebugCommand as DotenvDebugCommand;
 use Symfony\Component\Messenger\Command\ConsumeMessagesCommand;
-use Symfony\Component\Messenger\Command\DebugCommand;
+use Symfony\Component\Messenger\Command\DebugCommand as MessengerDebugCommand;
 use Symfony\Component\Messenger\Command\FailedMessagesRemoveCommand;
 use Symfony\Component\Messenger\Command\FailedMessagesRetryCommand;
 use Symfony\Component\Messenger\Command\FailedMessagesShowCommand;
 use Symfony\Component\Messenger\Command\SetupTransportsCommand;
 use Symfony\Component\Messenger\Command\StatsCommand;
 use Symfony\Component\Messenger\Command\StopWorkersCommand;
+use Symfony\Component\Scheduler\Command\DebugCommand as SchedulerDebugCommand;
 use Symfony\Component\Translation\Command\TranslationPullCommand;
 use Symfony\Component\Translation\Command\TranslationPushCommand;
 use Symfony\Component\Translation\Command\XliffLintCommand;
@@ -172,7 +173,7 @@
             ])
             ->tag('console.command')
 
-        ->set('console.command.messenger_debug', DebugCommand::class)
+        ->set('console.command.messenger_debug', MessengerDebugCommand::class)
             ->args([
                 [], // Message to handlers mapping
             ])
@@ -218,6 +219,12 @@
             ])
             ->tag('console.command')
 
+        ->set('console.command.scheduler_debug', SchedulerDebugCommand::class)
+            ->args([
+                tagged_locator('scheduler.schedule_provider', 'name'),
+            ])
+            ->tag('console.command')
+
         ->set('console.command.router_debug', RouterDebugCommand::class)
             ->args([
                 service('router'),
diff --git a/src/Symfony/Component/Scheduler/Command/DebugCommand.php b/src/Symfony/Component/Scheduler/Command/DebugCommand.php
new file mode 100644
index 0000000000000..04a2ed533f5e8
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Command/DebugCommand.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Command;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Scheduler\RecurringMessage;
+use Symfony\Component\Scheduler\ScheduleProviderInterface;
+use Symfony\Contracts\Service\ServiceProviderInterface;
+
+use function Symfony\Component\Clock\now;
+
+/**
+ * Command to list/debug schedules.
+ *
+ * @author Kevin Bond <kevinbond@gmail.com>
+ */
+#[AsCommand(name: 'debug:scheduler', description: 'List schedules and their recurring messages')]
+final class DebugCommand extends Command
+{
+    private array $scheduleNames;
+
+    public function __construct(private ServiceProviderInterface $schedules)
+    {
+        $this->scheduleNames = array_keys($this->schedules->getProvidedServices());
+
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->addArgument('schedule', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, sprintf('The schedule name (one of "%s")', implode('", "', $this->scheduleNames)), null, $this->scheduleNames)
+            ->setHelp(<<<'EOF'
+                The <info>%command.name%</info> lists schedules and their recurring messages:
+
+                  <info>php %command.full_name%</info>
+
+                Or for a specific schedule only:
+
+                  <info>php %command.full_name% default</info>
+
+                EOF
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+        $io->title('Scheduler');
+
+        $names = $input->getArgument('schedule') ?: $this->scheduleNames;
+
+        foreach ($names as $name) {
+            /** @var ScheduleProviderInterface $schedule */
+            $schedule = $this->schedules->get($name);
+
+            $io->section($name);
+            $io->table(
+                ['Message', 'Trigger', 'Next Run'],
+                array_map(self::renderRecurringMessage(...), $schedule->getSchedule()->getRecurringMessages())
+            );
+        }
+
+        return self::SUCCESS;
+    }
+
+    /**
+     * @return array{0:string,1:string,2:string}
+     */
+    private static function renderRecurringMessage(RecurringMessage $recurringMessage): array
+    {
+        $message = $recurringMessage->getMessage();
+        $trigger = $recurringMessage->getTrigger();
+
+        return [
+            $message instanceof \Stringable ? (string) $message : (new \ReflectionClass($message))->getShortName(),
+            $trigger instanceof \Stringable ? (string) $trigger : (new \ReflectionClass($trigger))->getShortName(),
+            $recurringMessage->getTrigger()->getNextRunDate(now())->format(\DateTimeInterface::ATOM),
+        ];
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
index 76f3fde5bdcd3..487d8e59fcf6c 100644
--- a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
@@ -21,13 +21,18 @@
  *
  * @experimental
  */
-final class CronExpressionTrigger implements TriggerInterface
+final class CronExpressionTrigger implements TriggerInterface, \Stringable
 {
     public function __construct(
         private CronExpression $expression = new CronExpression('* * * * *'),
     ) {
     }
 
+    public function __toString(): string
+    {
+        return "cron: {$this->expression->getExpression()}";
+    }
+
     public static function fromSpec(string $expression = '* * * * *'): self
     {
         if (!class_exists(CronExpression::class)) {

From 149798c91a6defdc63d29f621e63973c60e03114 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 25 Mar 2023 15:15:10 +0100
Subject: [PATCH 337/475] [Scheduler] Tweak debug:scheduler command output

---
 .../Scheduler/Command/DebugCommand.php          | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Scheduler/Command/DebugCommand.php b/src/Symfony/Component/Scheduler/Command/DebugCommand.php
index 04a2ed533f5e8..f6c19939a574f 100644
--- a/src/Symfony/Component/Scheduler/Command/DebugCommand.php
+++ b/src/Symfony/Component/Scheduler/Command/DebugCommand.php
@@ -27,6 +27,8 @@
  * Command to list/debug schedules.
  *
  * @author Kevin Bond <kevinbond@gmail.com>
+ *
+ * @experimental
  */
 #[AsCommand(name: 'debug:scheduler', description: 'List schedules and their recurring messages')]
 final class DebugCommand extends Command
@@ -63,16 +65,25 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $io = new SymfonyStyle($input, $output);
         $io->title('Scheduler');
 
-        $names = $input->getArgument('schedule') ?: $this->scheduleNames;
+        if (!$names = $input->getArgument('schedule') ?: $this->scheduleNames) {
+            $io->error('No schedules found.');
+
+            return self::FAILURE;
+        }
 
         foreach ($names as $name) {
+            $io->section($name);
+
             /** @var ScheduleProviderInterface $schedule */
             $schedule = $this->schedules->get($name);
+            if (!$messages = $schedule->getSchedule()->getRecurringMessages()) {
+                $io->warning(sprintf('No recurring messages found for schedule "%s".', $name));
 
-            $io->section($name);
+                continue;
+            }
             $io->table(
                 ['Message', 'Trigger', 'Next Run'],
-                array_map(self::renderRecurringMessage(...), $schedule->getSchedule()->getRecurringMessages())
+                array_map(self::renderRecurringMessage(...), $messages),
             );
         }
 

From 037997520918a597fcbd3e4e8387ed7081c5b183 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Sun, 26 Mar 2023 12:44:19 +0200
Subject: [PATCH 338/475] remove scheduler debug command definition if the
 component is not installed

---
 .../FrameworkBundle/DependencyInjection/FrameworkExtension.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 6d0eb3bd93c60..bd5dc7f66a202 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -536,6 +536,8 @@ public function load(array $configs, ContainerBuilder $container)
                 throw new LogicException('Scheduler support cannot be enabled as the Messenger component is not '.(interface_exists(MessageBusInterface::class) ? 'enabled.' : 'installed. Try running "composer require symfony/messenger".'));
             }
             $this->registerSchedulerConfiguration($config['scheduler'], $container, $loader);
+        } else {
+            $container->removeDefinition('console.command.scheduler_debug');
         }
 
         // messenger depends on validation being registered

From 1d93f5cdc0debbd7abdb50c5d6a55487f5ed8f72 Mon Sep 17 00:00:00 2001
From: Florent Morselli <florent.morselli@spomky-labs.com>
Date: Thu, 23 Mar 2023 22:49:58 +0100
Subject: [PATCH 339/475] [Validator] New `PasswordStrength` constraint

---
 composer.json                                 |  3 +-
 src/Symfony/Component/Validator/CHANGELOG.md  |  1 +
 .../Constraints/PasswordStrength.php          | 67 +++++++++++++++
 .../Constraints/PasswordStrengthValidator.php | 76 +++++++++++++++++
 .../Constraints/PasswordStrengthTest.php      | 58 +++++++++++++
 .../PasswordStrengthValidatorTest.php         | 81 +++++++++++++++++++
 src/Symfony/Component/Validator/composer.json |  3 +-
 7 files changed, 287 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Component/Validator/Constraints/PasswordStrength.php
 create mode 100644 src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
 create mode 100644 src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthTest.php
 create mode 100644 src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php

diff --git a/composer.json b/composer.json
index 20ade09dbb979..f246838ba1cd6 100644
--- a/composer.json
+++ b/composer.json
@@ -152,7 +152,8 @@
         "symfony/security-acl": "~2.8|~3.0",
         "twig/cssinliner-extra": "^2.12|^3",
         "twig/inky-extra": "^2.12|^3",
-        "twig/markdown-extra": "^2.12|^3"
+        "twig/markdown-extra": "^2.12|^3",
+        "bjeavons/zxcvbn-php": "^1.0"
     },
     "conflict": {
         "ext-psr": "<1.1|>=2",
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
index 93407796bd055..5c1681dcd2459 100644
--- a/src/Symfony/Component/Validator/CHANGELOG.md
+++ b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Add `Uuid::TIME_BASED_VERSIONS` to match that a UUID being validated embeds a timestamp
  * Add the `pattern` parameter in violations of the `Regex` constraint
  * Add a `NoSuspiciousCharacters` constraint to validate a string is not a spoofing attempt
+ * Add a `PasswordStrength` constraint to check the strength of a password (requires `bjeavons/zxcvbn-php` library)
  * Add the `countUnit` option to the `Length` constraint to allow counting the string length either by code points (like before, now the default setting `Length::COUNT_CODEPOINTS`), bytes (`Length::COUNT_BYTES`) or graphemes (`Length::COUNT_GRAPHEMES`)
  * Add the `filenameMaxLength` option to the `File` constraint
  * Add the `exclude` option to the `Cascade` constraint
diff --git a/src/Symfony/Component/Validator/Constraints/PasswordStrength.php b/src/Symfony/Component/Validator/Constraints/PasswordStrength.php
new file mode 100644
index 0000000000000..9eb571f7dfb84
--- /dev/null
+++ b/src/Symfony/Component/Validator/Constraints/PasswordStrength.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
+use Symfony\Component\Validator\Exception\LogicException;
+use ZxcvbnPhp\Zxcvbn;
+
+/**
+ * @Annotation
+ *
+ * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
+ *
+ * @author Florent Morselli <florent.morselli@spomky-labs.com>
+ */
+#[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
+final class PasswordStrength extends Constraint
+{
+    public const PASSWORD_STRENGTH_ERROR = '4234df00-45dd-49a4-b303-a75dbf8b10d8';
+    public const RESTRICTED_USER_INPUT_ERROR = 'd187ff45-bf23-4331-aa87-c24a36e9b400';
+
+    protected const ERROR_NAMES = [
+        self::PASSWORD_STRENGTH_ERROR => 'PASSWORD_STRENGTH_ERROR',
+        self::RESTRICTED_USER_INPUT_ERROR => 'RESTRICTED_USER_INPUT_ERROR',
+    ];
+
+    public string $lowStrengthMessage = 'The password strength is too low. Please use a stronger password.';
+
+    public int $minScore = 2;
+
+    public string $restrictedDataMessage = 'The password contains the following restricted data: {{ wordList }}.';
+
+    /**
+     * @var array<string>
+     */
+    public array $restrictedData = [];
+
+    public function __construct(mixed $options = null, array $groups = null, mixed $payload = null)
+    {
+        if (!class_exists(Zxcvbn::class)) {
+            throw new LogicException(sprintf('The "%s" class requires the "bjeavons/zxcvbn-php" library. Try running "composer require bjeavons/zxcvbn-php".', self::class));
+        }
+
+        if (isset($options['minScore']) && (!\is_int($options['minScore']) || $options['minScore'] < 1 || $options['minScore'] > 4)) {
+            throw new ConstraintDefinitionException(sprintf('The parameter "minScore" of the "%s" constraint must be an integer between 1 and 4.', static::class));
+        }
+
+        if (isset($options['restrictedData'])) {
+            array_walk($options['restrictedData'], static function (mixed $value): void {
+                if (!\is_string($value)) {
+                    throw new ConstraintDefinitionException(sprintf('The parameter "restrictedData" of the "%s" constraint must be a list of strings.', static::class));
+                }
+            });
+        }
+        parent::__construct($options, $groups, $payload);
+    }
+}
diff --git a/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php b/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
new file mode 100644
index 0000000000000..66a68096fda96
--- /dev/null
+++ b/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+use ZxcvbnPhp\Matchers\DictionaryMatch;
+use ZxcvbnPhp\Matchers\MatchInterface;
+use ZxcvbnPhp\Zxcvbn;
+
+final class PasswordStrengthValidator extends ConstraintValidator
+{
+    public function validate(#[\SensitiveParameter] mixed $value, Constraint $constraint): void
+    {
+        if (!$constraint instanceof PasswordStrength) {
+            throw new UnexpectedTypeException($constraint, PasswordStrength::class);
+        }
+
+        if (null === $value) {
+            return;
+        }
+
+        if (!\is_string($value)) {
+            throw new UnexpectedValueException($value, 'string');
+        }
+
+        $zxcvbn = new Zxcvbn();
+        $strength = $zxcvbn->passwordStrength($value, $constraint->restrictedData);
+
+        if ($strength['score'] < $constraint->minScore) {
+            $this->context->buildViolation($constraint->lowStrengthMessage)
+                ->setCode(PasswordStrength::PASSWORD_STRENGTH_ERROR)
+                ->addViolation();
+        }
+        $wordList = $this->findRestrictedUserInputs($strength['sequence'] ?? []);
+        if (0 !== \count($wordList)) {
+            $this->context->buildViolation($constraint->restrictedDataMessage, [
+                '{{ wordList }}' => implode(', ', $wordList),
+            ])
+                ->setCode(PasswordStrength::RESTRICTED_USER_INPUT_ERROR)
+                ->addViolation();
+        }
+    }
+
+    /**
+     * @param array<MatchInterface> $sequence
+     *
+     * @return array<string>
+     */
+    private function findRestrictedUserInputs(array $sequence): array
+    {
+        $found = [];
+
+        foreach ($sequence as $item) {
+            if (!$item instanceof DictionaryMatch) {
+                continue;
+            }
+            if ('user_inputs' === $item->dictionaryName) {
+                $found[] = $item->token;
+            }
+        }
+
+        return $found;
+    }
+}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthTest.php b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthTest.php
new file mode 100644
index 0000000000000..aa31d5a9ef999
--- /dev/null
+++ b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Constraints;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Validator\Constraints\PasswordStrength;
+use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
+
+class PasswordStrengthTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $constraint = new PasswordStrength();
+        $this->assertEquals(2, $constraint->minScore);
+        $this->assertEquals([], $constraint->restrictedData);
+    }
+
+    public function testConstructorWithParameters()
+    {
+        $constraint = new PasswordStrength([
+            'minScore' => 3,
+            'restrictedData' => ['foo', 'bar'],
+        ]);
+
+        $this->assertEquals(3, $constraint->minScore);
+        $this->assertEquals(['foo', 'bar'], $constraint->restrictedData);
+    }
+
+    public function testInvalidScoreOfZero()
+    {
+        $this->expectException(ConstraintDefinitionException::class);
+        $this->expectExceptionMessage('The parameter "minScore" of the "Symfony\Component\Validator\Constraints\PasswordStrength" constraint must be an integer between 1 and 4.');
+        new PasswordStrength(['minScore' => 0]);
+    }
+
+    public function testInvalidScoreOfFive()
+    {
+        $this->expectException(ConstraintDefinitionException::class);
+        $this->expectExceptionMessage('The parameter "minScore" of the "Symfony\Component\Validator\Constraints\PasswordStrength" constraint must be an integer between 1 and 4.');
+        new PasswordStrength(['minScore' => 5]);
+    }
+
+    public function testInvalidRestrictedData()
+    {
+        $this->expectException(ConstraintDefinitionException::class);
+        $this->expectExceptionMessage('The parameter "restrictedData" of the "Symfony\Component\Validator\Constraints\PasswordStrength" constraint must be a list of strings.');
+        new PasswordStrength(['restrictedData' => [123]]);
+    }
+}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php
new file mode 100644
index 0000000000000..33bd0f8809435
--- /dev/null
+++ b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Constraints;
+
+use Symfony\Component\Validator\Constraints\PasswordStrength;
+use Symfony\Component\Validator\Constraints\PasswordStrengthValidator;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+
+class PasswordStrengthValidatorTest extends ConstraintValidatorTestCase
+{
+    protected function createValidator(): PasswordStrengthValidator
+    {
+        return new PasswordStrengthValidator();
+    }
+
+    /**
+     * @dataProvider getValidValues
+     */
+    public function testValidValues(string $value)
+    {
+        $this->validator->validate($value, new PasswordStrength());
+
+        $this->assertNoViolation();
+    }
+
+    public static function getValidValues(): iterable
+    {
+        yield ['This 1s a very g00d Pa55word! ;-)'];
+    }
+
+    /**
+     * @dataProvider provideInvalidConstraints
+     */
+    public function testThePasswordIsWeak(PasswordStrength $constraint, string $password, string $expectedMessage, string $expectedCode, array $parameters = [])
+    {
+        $this->validator->validate($password, $constraint);
+
+        $this->buildViolation($expectedMessage)
+            ->setCode($expectedCode)
+            ->setParameters($parameters)
+            ->assertRaised();
+    }
+
+    public static function provideInvalidConstraints(): iterable
+    {
+        yield [
+            new PasswordStrength(),
+            'password',
+            'The password strength is too low. Please use a stronger password.',
+            PasswordStrength::PASSWORD_STRENGTH_ERROR,
+        ];
+        yield [
+            new PasswordStrength([
+                'minScore' => 4,
+            ]),
+            'Good password?',
+            'The password strength is too low. Please use a stronger password.',
+            PasswordStrength::PASSWORD_STRENGTH_ERROR,
+        ];
+        yield [
+            new PasswordStrength([
+                'restrictedData' => ['symfony'],
+            ]),
+            'SyMfONY-framework-john',
+            'The password contains the following restricted data: {{ wordList }}.',
+            PasswordStrength::RESTRICTED_USER_INPUT_ERROR,
+            [
+                '{{ wordList }}' => 'SyMfONY',
+            ],
+        ];
+    }
+}
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index 7e90c5238c127..7e99fcfa78ecb 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -40,7 +40,8 @@
         "symfony/property-info": "^5.4|^6.0",
         "symfony/translation": "^5.4|^6.0",
         "doctrine/annotations": "^1.13|^2",
-        "egulias/email-validator": "^2.1.10|^3|^4"
+        "egulias/email-validator": "^2.1.10|^3|^4",
+        "bjeavons/zxcvbn-php": "^1.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.13",

From 1c4b9e67703ee5f0f0133f903f03a7ec8c445989 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Mon, 27 Mar 2023 16:35:52 +0200
Subject: [PATCH 340/475] [Console][DoctrineBridge][PhpUnitBridge] Remove
 backticks from exception messages

---
 .../Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php  | 2 +-
 .../Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php        | 2 +-
 .../Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php       | 4 ++--
 src/Symfony/Component/Console/Application.php                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
index 30ea98880887d..52cc766ac9c5d 100644
--- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -41,7 +41,7 @@ public function __construct(ObjectManager $manager, string $class, IdReader $idR
         $classMetadata = $manager->getClassMetadata($class);
 
         if ($idReader && !$idReader->isSingleId()) {
-            throw new \InvalidArgumentException(sprintf('The second argument `$idReader` of "%s" must be null when the query cannot be optimized because of composite id fields.', __METHOD__));
+            throw new \InvalidArgumentException(sprintf('The second argument "$idReader" of "%s" must be null when the query cannot be optimized because of composite id fields.', __METHOD__));
         }
 
         $this->manager = $manager;
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
index 8a5eb97c1d573..7205799b8fa7a 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
@@ -416,7 +416,7 @@ public function testLoadChoicesForValuesLoadsOnlyChoicesIfValueIsIdReader()
     public function testPassingIdReaderWithoutSingleIdEntity()
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('The second argument `$idReader` of "Symfony\\Bridge\\Doctrine\\Form\\ChoiceList\\DoctrineChoiceLoader::__construct" must be null when the query cannot be optimized because of composite id fields.');
+        $this->expectExceptionMessage('The second argument "$idReader" of "Symfony\\Bridge\\Doctrine\\Form\\ChoiceList\\DoctrineChoiceLoader::__construct" must be null when the query cannot be optimized because of composite id fields.');
 
         $idReader = $this->createMock(IdReader::class);
         $idReader->expects($this->once())
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
index 3652c3bb388c4..62e57b8e9707c 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -224,7 +224,7 @@ public function startTest($test): void
             $annotations = Test::parseTestMethodAnnotations(\get_class($test), $test->getName(false));
 
             if (isset($annotations['class']['expectedDeprecation'])) {
-                $test->getTestResultObject()->addError($test, new AssertionFailedError('`@expectedDeprecation` annotations are not allowed at the class level.'), 0);
+                $test->getTestResultObject()->addError($test, new AssertionFailedError('"@expectedDeprecation" annotations are not allowed at the class level.'), 0);
             }
             if (isset($annotations['method']['expectedDeprecation']) || $this->checkNumAssertions = method_exists($test, 'expectDeprecation') && (new \ReflectionMethod($test, 'expectDeprecation'))->getFileName() === (new \ReflectionMethod(ExpectDeprecationTrait::class, 'expectDeprecation'))->getFileName()) {
                 if (isset($annotations['method']['expectedDeprecation'])) {
@@ -297,7 +297,7 @@ public function endTest($test, $time): void
             restore_error_handler();
 
             if (!\in_array('legacy', $groups, true)) {
-                $test->getTestResultObject()->addError($test, new AssertionFailedError('Only tests with the `@group legacy` annotation can expect a deprecation.'), 0);
+                $test->getTestResultObject()->addError($test, new AssertionFailedError('Only tests with the "@group legacy" annotation can expect a deprecation.'), 0);
             } elseif (!\in_array($test->getStatus(), [BaseTestRunner::STATUS_SKIPPED, BaseTestRunner::STATUS_INCOMPLETE, BaseTestRunner::STATUS_FAILURE, BaseTestRunner::STATUS_ERROR], true)) {
                 try {
                     $prefix = "@expectedDeprecation:\n";
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 28fec5fdec9e0..b7aaa6a29e65a 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -121,7 +121,7 @@ public function setCommandLoader(CommandLoaderInterface $commandLoader)
     public function getSignalRegistry(): SignalRegistry
     {
         if (!$this->signalRegistry) {
-            throw new RuntimeException('Signals are not supported. Make sure that the `pcntl` extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
+            throw new RuntimeException('Signals are not supported. Make sure that the "pcntl" extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
         }
 
         return $this->signalRegistry;
@@ -1003,7 +1003,7 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
         $commandSignals = $command instanceof SignalableCommandInterface ? $command->getSubscribedSignals() : [];
         if ($commandSignals || $this->dispatcher && $this->signalsToDispatchEvent) {
             if (!$this->signalRegistry) {
-                throw new RuntimeException('Unable to subscribe to signal events. Make sure that the `pcntl` extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
+                throw new RuntimeException('Unable to s
10000
ubscribe to signal events. Make sure that the "pcntl" extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
             }
 
             if (Terminal::hasSttyAvailable()) {

From b169b4373a572c501515cd991147dc20b3081e95 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 28 Mar 2023 11:09:35 +0200
Subject: [PATCH 341/475] [Form] Use static closures when possible

---
 .../Factory/CachingFactoryDecorator.php       |  2 +-
 .../Factory/DefaultChoiceListFactory.php      |  9 +++----
 .../Factory/PropertyAccessDecorator.php       | 14 +++++------
 .../Component/Form/Command/DebugCommand.php   |  4 +--
 .../Form/Console/Descriptor/Descriptor.php    |  2 +-
 .../Form/Extension/Core/Type/CheckboxType.php |  2 +-
 .../Form/Extension/Core/Type/ChoiceType.php   | 25 ++++++++++---------
 .../Extension/Core/Type/CollectionType.php    |  2 +-
 .../Form/Extension/Core/Type/ColorType.php    |  5 ++--
 .../Form/Extension/Core/Type/CountryType.php  |  2 +-
 .../Form/Extension/Core/Type/CurrencyType.php |  2 +-
 .../Extension/Core/Type/DateIntervalType.php  | 12 ++++-----
 .../Form/Extension/Core/Type/DateTimeType.php | 16 ++++++------
 .../Form/Extension/Core/Type/DateType.php     | 14 +++++------
 .../Form/Extension/Core/Type/FileType.php     |  4 +--
 .../Form/Extension/Core/Type/FormType.php     | 12 ++++-----
 .../Form/Extension/Core/Type/LanguageType.php |  4 +--
 .../Form/Extension/Core/Type/LocaleType.php   |  2 +-
 .../Form/Extension/Core/Type/MoneyType.php    |  2 +-
 .../Form/Extension/Core/Type/NumberType.php   |  2 +-
 .../Form/Extension/Core/Type/TimeType.php     | 16 ++++++------
 .../Form/Extension/Core/Type/TimezoneType.php |  8 +++---
 .../Form/Extension/Core/Type/WeekType.php     | 12 ++++-----
 .../DataCollector/FormDataCollector.php       |  6 ++---
 .../Validator/Type/BaseValidatorExtension.php |  2 +-
 .../Type/FormTypeValidatorExtension.php       |  2 +-
 .../Type/RepeatedTypeValidatorExtension.php   |  2 +-
 .../Type/UploadValidatorExtension.php         |  2 +-
 .../Validator/ValidatorTypeGuesser.php        | 14 +++++------
 .../Component/Form/FormTypeGuesserChain.php   |  8 +++---
 .../default_option_with_normalizer.txt        |  1 -
 31 files changed, 104 insertions(+), 106 deletions(-)

diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
index 304105cbc2fea..40c0604ea4de8 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
@@ -54,7 +54,7 @@ public static function generateHash(mixed $value, string $namespace = ''): strin
         if (\is_object($value)) {
             $value = spl_object_hash($value);
         } elseif (\is_array($value)) {
-            array_walk_recursive($value, function (&$v) {
+            array_walk_recursive($value, static function (&$v) {
                 if (\is_object($v)) {
                     $v = spl_object_hash($v);
                 }
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
index b5b8337047cce..fb30fc6ded4cc 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
@@ -35,8 +35,9 @@ public function createListFromChoices(iterable $choices, callable $value = null,
         if ($filter) {
             // filter the choice list lazily
             return $this->createListFromLoader(new FilterChoiceLoaderDecorator(
-                new CallbackChoiceLoader(static fn () => $choices
-                ), $filter), $value);
+                new CallbackChoiceLoader(static fn () => $choices),
+                $filter
+            ), $value);
         }
 
         return new ArrayChoiceList($choices, $value);
@@ -133,9 +134,7 @@ public function createView(ChoiceListInterface $list, array|callable $preferredC
             );
         }
 
-        uksort($preferredViews, static fn ($a, $b): int => isset($preferredViewsOrder[$a], $preferredViewsOrder[$b])
-            ? $preferredViewsOrder[$a] <=> $preferredViewsOrder[$b]
-            : 0);
+        uksort($preferredViews, static fn ($a, $b) => isset($preferredViewsOrder[$a], $preferredViewsOrder[$b]) ? $preferredViewsOrder[$a] <=> $preferredViewsOrder[$b] : 0);
 
         return new ChoiceListView($otherViews, $preferredViews);
     }
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
index b0b8e479d8aba..fa66290e34485 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
@@ -67,7 +67,7 @@ public function createListFromChoices(iterable $choices, mixed $value = null, mi
             // when such values are passed to
             // ChoiceListInterface::getValuesForChoices(). Handle this case
             // so that the call to getValue() doesn't break.
-            $value = fn ($choice) => \is_object($choice) || \is_array($choice) ? $accessor->getValue($choice, $value) : null;
+            $value = static fn ($choice) => \is_object($choice) || \is_array($choice) ? $accessor->getValue($choice, $value) : null;
         }
 
         if (\is_string($filter)) {
@@ -94,7 +94,7 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, mixed $value
             // when such values are passed to
             // ChoiceListInterface::getValuesForChoices(). Handle this case
             // so that the call to getValue() doesn't break.
-            $value = fn ($choice) => \is_object($choice) || \is_array($choice) ? $accessor->getValue($choice, $value) : null;
+            $value = static fn ($choice) => \is_object($choice) || \is_array($choice) ? $accessor->getValue($choice, $value) : null;
         }
 
         if (\is_string($filter)) {
@@ -118,7 +118,7 @@ public function createView(ChoiceListInterface $list, mixed $preferredChoices =
         }
 
         if ($label instanceof PropertyPathInterface) {
-            $label = fn ($choice) => $accessor->getValue($choice, $label);
+            $label = static fn ($choice) => $accessor->getValue($choice, $label);
         }
 
         if (\is_string($preferredChoices)) {
@@ -126,7 +126,7 @@ public function createView(ChoiceListInterface $list, mixed $preferredChoices =
         }
 
         if ($preferredChoices instanceof PropertyPathInterface) {
-            $preferredChoices = function ($choice) use ($accessor, $preferredChoices) {
+            $preferredChoices = static function ($choice) use ($accessor, $preferredChoices) {
                 try {
                     return $accessor->getValue($choice, $preferredChoices);
                 } catch (UnexpectedTypeException) {
@@ -141,7 +141,7 @@ public function createView(ChoiceListInterface $list, mixed $preferredChoices =
         }
 
         if ($index instanceof PropertyPathInterface) {
-            $index = fn ($choice) => $accessor->getValue($choice, $index);
+            $index = static fn ($choice) => $accessor->getValue($choice, $index);
         }
 
         if (\is_string($groupBy)) {
@@ -149,7 +149,7 @@ public function createView(ChoiceListInterface $list, mixed $preferredChoices =
         }
 
         if ($groupBy instanceof PropertyPathInterface) {
-            $groupBy = function ($choice) use ($accessor, $groupBy) {
+            $groupBy = static function ($choice) use ($accessor, $groupBy) {
                 try {
                     return $accessor->getValue($choice, $groupBy);
                 } catch (UnexpectedTypeException) {
@@ -164,7 +164,7 @@ public function createView(ChoiceListInterface $list, mixed $preferredChoices =
         }
 
         if ($attr instanceof PropertyPathInterface) {
-            $attr = fn ($choice) => $accessor->getValue($choice, $attr);
+            $attr = static fn ($choice) => $accessor->getValue($choice, $attr);
         }
 
         if (\is_string($labelTranslationParameters)) {
diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
index 9b6b830341bda..5e4635870a8ef 100644
--- a/src/Symfony/Component/Form/Command/DebugCommand.php
+++ b/src/Symfony/Component/Form/Command/DebugCommand.php
@@ -207,7 +207,7 @@ private function getCoreTypes(): array
         $coreExtension = new CoreExtension();
         $loadTypesRefMethod = (new \ReflectionObject($coreExtension))->getMethod('loadTypes');
         $coreTypes = $loadTypesRefMethod->invoke($coreExtension);
-        $coreTypes = array_map(fn (FormTypeInterface $type) => $type::class, $coreTypes);
+        $coreTypes = array_map(static fn (FormTypeInterface $type) => $type::class, $coreTypes);
         sort($coreTypes);
 
         return $coreTypes;
@@ -240,7 +240,7 @@ private function findAlternatives(string $name, array $collection): array
         }
 
         $threshold = 1e3;
-        $alternatives = array_filter($alternatives, fn ($lev) => $lev < 2 * $threshold);
+        $alternatives = array_filter($alternatives, static fn ($lev) => $lev < 2 * $threshold);
         ksort($alternatives, \SORT_NATURAL | \SORT_FLAG_CASE);
 
         return array_keys($alternatives);
diff --git a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
index 782bad8870c1a..3c54545cf12ac 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
@@ -149,7 +149,7 @@ protected function filterOptionsByDeprecated(ResolvedFormTypeInterface $type): v
             }
         }
 
-        $filterByDeprecated = function (array $options) use ($deprecatedOptions) {
+        $filterByDeprecated = static function (array $options) use ($deprecatedOptions) {
             foreach ($options as $class => $opts) {
                 if ($deprecated = array_intersect($deprecatedOptions, $opts)) {
                     $options[$class] = $deprecated;
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
index b261f926bb01b..291ede93ef3ec 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
@@ -51,7 +51,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $emptyData = fn (FormInterface $form, $viewData) => $viewData;
+        $emptyData = static fn (FormInterface $form, $viewData) => $viewData;
 
         $resolver->setDefaults([
             'value' => '1',
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 9694ed750a346..05ef3b9656d41 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -97,7 +97,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         if ($options['expanded'] || $options['multiple']) {
             // Make sure that scalar, submitted values are converted to arrays
             // which can be submitted to the checkboxes/radio buttons
-            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($choiceList, $options, &$unknownValues) {
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, static function (FormEvent $event) use ($choiceList, $options, &$unknownValues) {
                 $form = $event->getForm();
                 $data = $event->getData();
 
@@ -166,16 +166,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         if ($options['multiple']) {
             $messageTemplate = $options['invalid_message'] ?? 'The value {{ value }} is not valid.';
+            $translator = $this->translator;
 
-            $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use (&$unknownValues, $messageTemplate) {
+            $builder->addEventListener(FormEvents::POST_SUBMIT, static function (FormEvent $event) use (&$unknownValues, $messageTemplate, $translator) {
                 // Throw exception if unknown values were submitted
                 if (\count($unknownValues) > 0) {
                     $form = $event->getForm();
 
                     $clientDataAsString = \is_scalar($form->getViewData()) ? (string) $form->getViewData() : (\is_array($form->getViewData()) ? implode('", "', array_keys($unknownValues)) : \gettype($form->getViewData()));
 
-                    if (null !== $this->translator) {
-                        $message = $this->translator->trans($messageTemplate, ['{{ value }}' => $clientDataAsString], 'validators');
+                    if ($translator) {
+                        $message = $translator->trans($messageTemplate, ['{{ value }}' => $clientDataAsString], 'validators');
                     } else {
                         $message = strtr($messageTemplate, ['{{ value }}' => $clientDataAsString]);
                     }
@@ -199,7 +200,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         // To avoid issues when the submitted choices are arrays (i.e. array to string conversions),
         // we have to ensure that all elements of the submitted choice data are NULL, strings or ints.
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, static function (FormEvent $event) {
             $data = $event->getData();
 
             if (!\is_array($data)) {
@@ -245,9 +246,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         // closure here that is optimized for the value of the form, to
         // avoid making the type check inside the closure.
         if ($options['multiple']) {
-            $view->vars['is_selected'] = fn ($choice, array $values) => \in_array($choice, $values, true);
+            $view->vars['is_selected'] = static fn ($choice, array $values) => \in_array($choice, $values, true);
         } else {
-            $view->vars['is_selected'] = fn ($choice, $value) => $choice === $value;
+            $view->vars['is_selected'] = static fn ($choice, $value) => $choice === $value;
         }
 
         // Check if the choices already contain the empty value
@@ -285,7 +286,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $emptyData = function (Options $options) {
+        $emptyData = static function (Options $options) {
             if ($options['expanded'] && !$options['multiple']) {
                 return null;
             }
@@ -297,9 +298,9 @@ public function configureOptions(OptionsResolver $resolver)
             return '';
         };
 
-        $placeholderDefault = fn (Options $options) => $options['required'] ? null : '';
+        $placeholderDefault = static fn (Options $options) => $options['required'] ? null : '';
 
-        $placeholderNormalizer = function (Options $options, $placeholder) {
+        $placeholderNormalizer = static function (Options $options, $placeholder) {
             if ($options['multiple']) {
                 // never use an empty value for this case
                 return null;
@@ -318,9 +319,9 @@ public function configureOptions(OptionsResolver $resolver)
             return $placeholder;
         };
 
-        $compound = fn (Options $options) => $options['expanded'];
+        $compound = static fn (Options $options) => $options['expanded'];
 
-        $choiceTranslationDomainNormalizer = function (Options $options, $choiceTranslationDomain) {
+        $choiceTranslationDomainNormalizer = static function (Options $options, $choiceTranslationDomain) {
             if (true === $choiceTranslationDomain) {
                 return $options['translation_domain'];
             }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
index 1654d379a83b3..27e9a6a019f16 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -106,7 +106,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $entryOptionsNormalizer = function (Options $options, $value) {
+        $entryOptionsNormalizer = static function (Options $options, $value) {
             $value['block_name'] = 'entry';
 
             return $value;
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
index 6e205fcbc97d5..31538fc3c7c48 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
@@ -42,7 +42,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             return;
         }
 
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event): void {
+        $translator = $this->translator;
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, static function (FormEvent $event) use ($translator): void {
             $value = $event->getData();
             if (null === $value || '' === $value) {
                 return;
@@ -56,7 +57,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $messageParameters = [
                 '{{ value }}' => \is_scalar($value) ? (string) $value : \gettype($value),
             ];
-            $message = $this->translator ? $this->translator->trans($messageTemplate, $messageParameters, 'validators') : $messageTemplate;
+            $message = $translator?->trans($messageTemplate, $messageParameters, 'validators') ?? $messageTemplate;
 
             $event->getForm()->addError(new FormError($message, $messageTemplate, $messageParameters));
         });
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
index b6472849042dd..6f872660a0c65 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
@@ -36,7 +36,7 @@ public function configureOptions(OptionsResolver $resolver)
                 $choiceTranslationLocale = $options['choice_translation_locale'];
                 $alpha3 = $options['alpha3'];
 
-                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(fn () => array_flip($alpha3 ? Countries::getAlpha3Names($choiceTranslationLocale) : Countries::getNames($choiceTranslationLocale))), [$choiceTranslationLocale, $alpha3]);
+                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(static fn () => array_flip($alpha3 ? Countries::getAlpha3Names($choiceTranslationLocale) : Countries::getNames($choiceTranslationLocale))), [$choiceTranslationLocale, $alpha3]);
             },
             'choice_translation_domain' => false,
             'choice_translation_locale' => null,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
index 1c0ac471b8c45..89edc6f6309d3 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
@@ -35,7 +35,7 @@ public function configureOptions(OptionsResolver $resolver)
 
                 $choiceTranslationLocale = $options['choice_translation_locale'];
 
-                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(fn () => array_flip(Currencies::getNames($choiceTranslationLocale))), $choiceTranslationLocale);
+                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(static fn () => array_flip(Currencies::getNames($choiceTranslationLocale))), $choiceTranslationLocale);
             },
             'choice_translation_domain' => false,
             'choice_translation_locale' => null,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
index 0e4a7555a025f..655ef6682f691 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
@@ -168,12 +168,12 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $compound = fn (Options $options) => 'single_text' !== $options['widget'];
-        $emptyData = fn (Options $options) => 'single_text' === $options['widget'] ? '' : [];
+        $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
+        $emptyData = static fn (Options $options) => 'single_text' === $options['widget'] ? '' : [];
 
-        $placeholderDefault = fn (Options $options) => $options['required'] ? null : '';
+        $placeholderDefault = static fn (Options $options) => $options['required'] ? null : '';
 
-        $placeholderNormalizer = function (Options $options, $placeholder) use ($placeholderDefault) {
+        $placeholderNormalizer = static function (Options $options, $placeholder) use ($placeholderDefault) {
             if (\is_array($placeholder)) {
                 $default = $placeholderDefault($options);
 
@@ -183,7 +183,7 @@ public function configureOptions(OptionsResolver $resolver)
             return array_fill_keys(self::TIME_PARTS, $placeholder);
         };
 
-        $labelsNormalizer = fn (Options $options, array $labels) => array_replace([
+        $labelsNormalizer = static fn (Options $options, array $labels) => array_replace([
             'years' => null,
             'months' => null,
             'days' => null,
@@ -192,7 +192,7 @@ public function configureOptions(OptionsResolver $resolver)
             'minutes' => null,
             'seconds' => null,
             'invert' => 'Negative interval',
-        ], array_filter($labels, fn ($label) => null !== $label));
+        ], array_filter($labels, static fn ($label) => null !== $label));
 
         $resolver->setDefaults([
             'with_years' => true,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
index ae47519c53d5a..a0a0c92fe01e4 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -229,13 +229,13 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+        $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 
         // Defaults to the value of "widget"
-        $dateWidget = fn (Options $options) => 'single_text' === $options['widget'] ? null : $options['widget'];
+        $dateWidget = static fn (Options $options) => 'single_text' === $options['widget'] ? null : $options['widget'];
 
         // Defaults to the value of "widget"
-        $timeWidget = fn (Options $options) => 'single_text' === $options['widget'] ? null : $options['widget'];
+        $timeWidget = static fn (Options $options) => 'single_text' === $options['widget'] ? null : $options['widget'];
 
         $resolver->setDefaults([
             'input' => 'datetime',
@@ -261,7 +261,7 @@ public function configureOptions(OptionsResolver $resolver)
             'compound' => $compound,
             'date_label' => null,
             'time_label' => null,
-            'empty_data' => fn (Options $options) => $options['compound'] ? [] : '',
+            'empty_data' => static fn (Options $options) => $options['compound'] ? [] : '',
             'input_format' => 'Y-m-d H:i:s',
             'invalid_message' => 'Please enter a valid date and time.',
         ]);
@@ -308,28 +308,28 @@ public function configureOptions(OptionsResolver $resolver)
 
         $resolver->setAllowedTypes('input_format', 'string');
 
-        $resolver->setNormalizer('date_format', function (Options $options, $dateFormat) {
+        $resolver->setNormalizer('date_format', static function (Options $options, $dateFormat) {
             if (null !== $dateFormat && 'single_text' === $options['widget'] && self::HTML5_FORMAT === $options['format']) {
                 throw new LogicException(sprintf('Cannot use the "date_format" option of the "%s" with an HTML5 date.', self::class));
             }
 
             return $dateFormat;
         });
-        $resolver->setNormalizer('date_widget', function (Options $options, $dateWidget) {
+        $resolver->setNormalizer('date_widget', static function (Options $options, $dateWidget) {
             if (null !== $dateWidget && 'single_text' === $options['widget']) {
                 throw new LogicException(sprintf('Cannot use the "date_widget" option of the "%s" when the "widget" option is set to "single_text".', self::class));
             }
 
             return $dateWidget;
         });
-        $resolver->setNormalizer('time_widget', function (Options $options, $timeWidget) {
+        $resolver->setNormalizer('time_widget', static function (Options $options, $timeWidget) {
             if (null !== $timeWidget && 'single_text' === $options['widget']) {
                 throw new LogicException(sprintf('Cannot use the "time_widget" option of the "%s" when the "widget" option is set to "single_text".', self::class));
             }
 
             return $timeWidget;
         });
-        $resolver->setNormalizer('html5', function (Options $options, $html5) {
+        $resolver->setNormalizer('html5', static function (Options $options, $html5) {
             if ($html5 && self::HTML5_FORMAT !== $options['format']) {
                 throw new LogicException(sprintf('Cannot use the "format" option of "%s" when the "html5" option is enabled.', self::class));
             }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
index b08a4dd834247..5c81097e0efbc 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -216,11 +216,11 @@ public function finishView(FormView $view, FormInterface $form, array $options)
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+        $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 
-        $placeholderDefault = fn (Options $options) => $options['required'] ? null : '';
+        $placeholderDefault = static fn (Options $options) => $options['required'] ? null : '';
 
-        $placeholderNormalizer = function (Options $options, $placeholder) use ($placeholderDefault) {
+        $placeholderNormalizer = static function (Options $options, $placeholder) use ($placeholderDefault) {
             if (\is_array($placeholder)) {
                 $default = $placeholderDefault($options);
 
@@ -237,7 +237,7 @@ public function configureOptions(OptionsResolver $resolver)
             ];
         };
 
-        $choiceTranslationDomainNormalizer = function (Options $options, $choiceTranslationDomain) {
+        $choiceTranslationDomainNormalizer = static function (Options $options, $choiceTranslationDomain) {
             if (\is_array($choiceTranslationDomain)) {
                 $default = false;
 
@@ -254,7 +254,7 @@ public function configureOptions(OptionsResolver $resolver)
             ];
         };
 
-        $format = fn (Options $options) => 'single_text' === $options['widget'] ? self::HTML5_FORMAT : self::DEFAULT_FORMAT;
+        $format = static fn (Options $options) => 'single_text' === $options['widget'] ? self::HTML5_FORMAT : self::DEFAULT_FORMAT;
 
         $resolver->setDefaults([
             'years' => range((int) date('Y') - 5, (int) date('Y') + 5),
@@ -277,7 +277,7 @@ public function configureOptions(OptionsResolver $resolver)
             // this option.
             'data_class' => null,
             'compound' => $compound,
-            'empty_data' => fn (Options $options) => $options['compound'] ? [] : '',
+            'empty_data' => static fn (Options $options) => $options['compound'] ? [] : '',
             'choice_translation_domain' => false,
             'input_format' => 'Y-m-d',
             'invalid_message' => 'Please enter a valid date.',
@@ -305,7 +305,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('days', 'array');
         $resolver->setAllowedTypes('input_format', 'string');
 
-        $resolver->setNormalizer('html5', function (Options $options, $html5) {
+        $resolver->setNormalizer('html5', static function (Options $options, $html5) {
             if ($html5 && 'single_text' === $options['widget'] && self::HTML5_FORMAT !== $options['format']) {
                 throw new LogicException(sprintf('Cannot use the "format" option of "%s" when the "html5" option is enabled.', self::class));
             }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
index 16d212ef0f75c..6e4b78251d74c 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -104,10 +104,10 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $dataClass = null;
         if (class_exists(File::class)) {
-            $dataClass = fn (Options $options) => $options['multiple'] ? null : File::class;
+            $dataClass = static fn (Options $options) => $options['multiple'] ? null : File::class;
         }
 
-        $emptyData = fn (Options $options) => $options['multiple'] ? [] : null;
+        $emptyData = static fn (Options $options) => $options['multiple'] ? [] : null;
 
         $resolver->setDefaults([
             'compound' => false,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
index 560d1e2cb3d80..82aa77f0a3715 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -136,25 +136,25 @@ public function configureOptions(OptionsResolver $resolver)
         parent::configureOptions($resolver);
 
         // Derive "data_class" option from passed "data" object
-        $dataClass = fn (Options $options) => isset($options['data']) && \is_object($options['data']) ? $options['data']::class : null;
+        $dataClass = static fn (Options $options) => isset($options['data']) && \is_object($options['data']) ? $options['data']::class : null;
 
         // Derive "empty_data" closure from "data_class" option
-        $emptyData = function (Options $options) {
+        $emptyData = static function (Options $options) {
             $class = $options['data_class'];
 
             if (null !== $class) {
-                return fn (FormInterface $form) => $form->isEmpty() && !$form->isRequired() ? null : new $class();
+                return static fn (FormInterface $form) => $form->isEmpty() && !$form->isRequired() ? null : new $class();
             }
 
-            return fn (FormInterface $form) => $form->getConfig()->getCompound() ? [] : '';
+            return static fn (FormInterface $form) => $form->getConfig()->getCompound() ? [] : '';
         };
 
         // Wrap "post_max_size_message" in a closure to translate it lazily
-        $uploadMaxSizeMessage = fn (Options $options) => fn () => $options['post_max_size_message'];
+        $uploadMaxSizeMessage = static fn (Options $options) => static fn () => $options['post_max_size_message'];
 
         // For any form that is not represented by a single HTML control,
         // errors should bubble up by default
-        $errorBubbling = fn (Options $options) => $options['compound'] && !$options['inherit_data'];
+        $errorBubbling = static fn (Options $options) => $options['compound'] && !$options['inherit_data'];
 
         // If data is given, the form is locked to that data
         // (independent of its value)
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
index 0c6faafec6d0e..eeb9e591a12bc 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
@@ -37,7 +37,7 @@ public function configureOptions(OptionsResolver $resolver)
                 $useAlpha3Codes = $options['alpha3'];
                 $choiceSelfTranslation = $options['choice_self_translation'];
 
-                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale, $useAlpha3Codes, $choiceSelfTranslation) {
+                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(static function () use ($choiceTranslationLocale, $useAlpha3Codes, $choiceSelfTranslation) {
                     if (true === $choiceSelfTranslation) {
                         foreach (Languages::getLanguageCodes() as $alpha2Code) {
                             try {
@@ -65,7 +65,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('choice_translation_locale', ['null', 'string']);
         $resolver->setAllowedTypes('alpha3', 'bool');
 
-        $resolver->setNormalizer('choice_self_translation', function (Options $options, $value) {
+        $resolver->setNormalizer('choice_self_translation', static function (Options $options, $value) {
             if (true === $value && $options['choice_translation_locale']) {
                 throw new LogicException('Cannot use the "choice_self_translation" and "choice_translation_locale" options at the same time. Remove one of them.');
             }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
index 5086b0b0e6353..e98134febda87 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
@@ -35,7 +35,7 @@ public function configureOptions(OptionsResolver $resolver)
 
                 $choiceTranslationLocale = $options['choice_translation_locale'];
 
-                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(fn () => array_flip(Locales::getNames($choiceTranslationLocale))), $choiceTranslationLocale);
+                return ChoiceList::loader($this, new IntlCallbackChoiceLoader(static fn () => array_flip(Locales::getNames($choiceTranslationLocale))), $choiceTranslationLocale);
             },
             'choice_translation_domain' => false,
             'choice_translation_locale' => null,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
index aea35410c1643..27c1dbb49ba32 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
@@ -84,7 +84,7 @@ public function configureOptions(OptionsResolver $resolver)
 
         $resolver->setAllowedTypes('html5', 'bool');
 
-        $resolver->setNormalizer('grouping', function (Options $options, $value) {
+        $resolver->setNormalizer('grouping', static function (Options $options, $value) {
             if ($value && $options['html5']) {
                 throw new LogicException('Cannot use the "grouping" option when the "html5" option is enabled.');
             }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
index 3ddfbfeb1cb4d..578991f9fd1e9 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
@@ -85,7 +85,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('scale', ['null', 'int']);
         $resolver->setAllowedTypes('html5', 'bool');
 
-        $resolver->setNormalizer('grouping', function (Options $options, $value) {
+        $resolver->setNormalizer('grouping', static function (Options $options, $value) {
             if (true === $value && $options['html5']) {
                 throw new LogicException('Cannot use the "grouping" option when the "html5" option is enabled.');
             }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index a22f2122cd543..cc734e50a9b36 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -61,7 +61,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
 
         if ('single_text' === $options['widget']) {
-            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $e) use ($options) {
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, static function (FormEvent $e) use ($options) {
                 $data = $e->getData();
                 if ($data && preg_match('/^(?P<hours>\d{2}):(?P<minutes>\d{2})(?::(?P<seconds>\d{2})(?:\.\d+)?)?$/', $data, $matches)) {
                     if ($options['with_seconds']) {
@@ -79,7 +79,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             if (null !== $options['reference_date']) {
                 $parseFormat = 'Y-m-d '.$format;
 
-                $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($options) {
+                $builder->addEventListener(FormEvents::PRE_SUBMIT, static function (FormEvent $event) use ($options) {
                     $data = $event->getData();
 
                     if (preg_match('/^\d{2}:\d{2}(:\d{2})?$/', $data)) {
@@ -242,11 +242,11 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+        $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 
-        $placeholderDefault = fn (Options $options) => $options['required'] ? null : '';
+        $placeholderDefault = static fn (Options $options) => $options['required'] ? null : '';
 
-        $placeholderNormalizer = function (Options $options, $placeholder) use ($placeholderDefault) {
+        $placeholderNormalizer = static function (Options $options, $placeholder) use ($placeholderDefault) {
             if (\is_array($placeholder)) {
                 $default = $placeholderDefault($options);
 
@@ -263,7 +263,7 @@ public function configureOptions(OptionsResolver $resolver)
             ];
         };
 
-        $choiceTranslationDomainNormalizer = function (Options $options, $choiceTranslationDomain) {
+        $choiceTranslationDomainNormalizer = static function (Options $options, $choiceTranslationDomain) {
             if (\is_array($choiceTranslationDomain)) {
                 $default = false;
 
@@ -327,13 +327,13 @@ public function configureOptions(OptionsResolver $resolver)
             // representation is not \DateTime, but an array, we need to unset
             // this option.
             'data_class' => null,
-            'empty_data' => fn (Options $options) => $options['compound'] ? [] : '',
+            'empty_data' => static fn (Options $options) => $options['compound'] ? [] : '',
             'compound' => $compound,
             'choice_translation_domain' => false,
             'invalid_message' => 'Please enter a valid time.',
         ]);
 
-        $resolver->setNormalizer('view_timezone', function (Options $options, $viewTimezone): ?string {
+        $resolver->setNormalizer('view_timezone', static function (Options $options, $viewTimezone): ?string {
             if (null !== $options['model_timezone'] && $viewTimezone !== $options['model_timezone'] && null === $options['reference_date']) {
                 throw new LogicException('Using different values for the "model_timezone" and "view_timezone" options without configuring a reference date is not supported.');
             }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
index 0827fcfc5a9de..a5d4bc61c0bb5 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
@@ -54,10 +54,10 @@ public function configureOptions(OptionsResolver $resolver)
 
                     $choiceTranslationLocale = $options['choice_translation_locale'];
 
-                    return ChoiceList::loader($this, new IntlCallbackChoiceLoader(fn () => self::getIntlTimezones($input, $choiceTranslationLocale)), [$input, $choiceTranslationLocale]);
+                    return ChoiceList::loader($this, new IntlCallbackChoiceLoader(static fn () => self::getIntlTimezones($input, $choiceTranslationLocale)), [$input, $choiceTranslationLocale]);
                 }
 
-                return ChoiceList::lazy($this, fn () => self::getPhpTimezones($input), $input);
+                return ChoiceList::lazy($this, static fn () => self::getPhpTimezones($input), $input);
             },
             'choice_translation_domain' => false,
             'choice_translation_locale' => null,
@@ -69,7 +69,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('intl', ['bool']);
 
         $resolver->setAllowedTypes('choice_translation_locale', ['null', 'string']);
-        $resolver->setNormalizer('choice_translation_locale', function (Options $options, $value) {
+        $resolver->setNormalizer('choice_translation_locale', static function (Options $options, $value) {
             if (null !== $value && !$options['intl']) {
                 throw new LogicException('The "choice_translation_locale" option can only be used if the "intl" option is set to true.');
             }
@@ -78,7 +78,7 @@ public function configureOptions(OptionsResolver $resolver)
         });
 
         $resolver->setAllowedValues('input', ['string', 'datetimezone', 'intltimezone']);
-        $resolver->setNormalizer('input', function (Options $options, $value) {
+        $resolver->setNormalizer('input', static function (Options $options, $value) {
             if ('intltimezone' === $value && !class_exists(\IntlTimeZone::class)) {
                 throw new LogicException('Cannot use "intltimezone" input because the PHP intl extension is not available.');
             }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
index f0d8f9646747d..8027a41a99cd8 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
@@ -100,11 +100,11 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+        $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 
-        $placeholderDefault = fn (Options $options) => $options['required'] ? null : '';
+        $placeholderDefault = static fn (Options $options) => $options['required'] ? null : '';
 
-        $placeholderNormalizer = function (Options $options, $placeholder) use ($placeholderDefault) {
+        $placeholderNormalizer = static function (Options $options, $placeholder) use ($placeholderDefault) {
             if (\is_array($placeholder)) {
                 $default = $placeholderDefault($options);
 
@@ -120,7 +120,7 @@ public function configureOptions(OptionsResolver $resolver)
             ];
         };
 
-        $choiceTranslationDomainNormalizer = function (Options $options, $choiceTranslationDomain) {
+        $choiceTranslationDomainNormalizer = static function (Options $options, $choiceTranslationDomain) {
             if (\is_array($choiceTranslationDomain)) {
                 $default = false;
 
@@ -144,7 +144,7 @@ public function configureOptions(OptionsResolver $resolver)
             'placeholder' => $placeholderDefault,
             'html5' => static fn (Options $options) => 'single_text' === $options['widget'],
             'error_bubbling' => false,
-            'empty_data' => fn (Options $options) => $options['compound'] ? [] : '',
+            'empty_data' => static fn (Options $options) => $options['compound'] ? [] : '',
             'compound' => $compound,
             'choice_translation_domain' => false,
             'invalid_message' => 'Please enter a valid week.',
@@ -152,7 +152,7 @@ public function configureOptions(OptionsResolver $resolver)
 
         $resolver->setNormalizer('placeholder', $placeholderNormalizer);
         $resolver->setNormalizer('choice_translation_domain', $choiceTranslationDomainNormalizer);
-        $resolver->setNormalizer('html5', function (Options $options, $html5) {
+        $resolver->setNormalizer('html5', static function (Options $options, $html5) {
             if ($html5 && 'single_text' !== $options['widget']) {
                 throw new LogicException(sprintf('The "widget" option of "%s" must be set to "single_text" when the "html5" option is enabled.', self::class));
             }
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
index b93bfd82a133b..ffce3ac137f56 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -219,7 +219,7 @@ public function __sleep(): array
     protected function getCasters(): array
     {
         return parent::getCasters() + [
-            \Exception::class => function (\Exception $e, array $a, Stub $s) {
+            \Exception::class => static function (\Exception $e, array $a, Stub $s) {
                 foreach (["\0Exception\0previous", "\0Exception\0trace"] as $k) {
                     if (isset($a[$k])) {
                         unset($a[$k]);
@@ -229,12 +229,12 @@ protected function getCasters(): array
 
                 return $a;
             },
-            FormInterface::class => fn (FormInterface $f, array $a) => [
+            FormInterface::class => static fn (FormInterface $f, array $a) => [
                 Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
                 Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub($f->getConfig()->getType()->getInnerType()::class),
             ],
             FormView::class => StubCaster::cutInternals(...),
-            ConstraintViolationInterface::class => fn (ConstraintViolationInterface $v, array $a) => [
+            ConstraintViolationInterface::class => static fn (ConstraintViolationInterface $v, array $a) => [
                 Caster::PREFIX_VIRTUAL.'root' => $v->getRoot(),
                 Caster::PREFIX_VIRTUAL.'path' => $v->getPropertyPath(),
                 Caster::PREFIX_VIRTUAL.'value' => $v->getInvalidValue(),
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
index 2abc466fe398f..ea01d03699cfd 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
@@ -30,7 +30,7 @@ abstract class BaseValidatorExtension extends AbstractTypeExtension
     public function configureOptions(OptionsResolver $resolver)
     {
         // Make sure that validation groups end up as null, closure or array
-        $validationGroupsNormalizer = function (Options $options, $groups) {
+        $validationGroupsNormalizer = static function (Options $options, $groups) {
             if (false === $groups) {
                 return [];
             }
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
index 4602918c3a9b8..54eebaf63e43b 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
@@ -53,7 +53,7 @@ public function configureOptions(OptionsResolver $resolver)
         parent::configureOptions($resolver);
 
         // Constraint should always be converted to an array
-        $constraintsNormalizer = fn (Options $options, $constraints) => \is_object($constraints) ? [$constraints] : (array) $constraints;
+        $constraintsNormalizer = static fn (Options $options, $constraints) => \is_object($constraints) ? [$constraints] : (array) $constraints;
 
         $resolver->setDefaults([
             'error_mapping' => [],
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
index 2e2c21426ae4c..d41dc0168c311 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
@@ -27,7 +27,7 @@ class RepeatedTypeValidatorExtension extends AbstractTypeExtension
     public function configureOptions(OptionsResolver $resolver)
     {
         // Map errors to the first field
-        $errorMapping = fn (Options $options) => ['.' => $options['first_name']];
+        $errorMapping = static fn (Options $options) => ['.' => $options['first_name']];
 
         $resolver->setDefaults([
             'error_mapping' => $errorMapping,
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
index 70034135bf912..b7a19ed26a490 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
@@ -39,7 +39,7 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $translator = $this->translator;
         $translationDomain = $this->translationDomain;
-        $resolver->setNormalizer('upload_max_size_message', fn (Options $options, $message) => fn () => $translator->trans($message(), [], $translationDomain));
+        $resolver->setNormalizer('upload_max_size_message', static fn (Options $options, $message) => static fn () => $translator->trans($message(), [], $translationDomain));
     }
 
     public static function getExtendedTypes(): iterable
diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
index 039955b7d4198..9a74a125ed00a 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
@@ -66,26 +66,24 @@ public function __construct(MetadataFactoryInterface $metadataFactory)
 
     public function guessType(string $class, string $property): ?TypeGuess
     {
-        return $this->guess($class, $property, fn (Constraint $constraint) => $this->guessTypeForConstraint($constraint));
+        return $this->guess($class, $property, $this->guessTypeForConstraint(...));
     }
 
     public function guessRequired(string $class, string $property): ?ValueGuess
     {
-        return $this->guess($class, $property, function (Constraint $constraint) {
-            return $this->guessRequiredForConstraint($constraint);
-            // If we don't find any constraint telling otherwise, we can assume
-            // that a field is not required (with LOW_CONFIDENCE)
-        }, false);
+        // If we don't find any constraint telling otherwise, we can assume
+        // that a field is not required (with LOW_CONFIDENCE)
+        return $this->guess($class, $property, $this->guessRequiredForConstraint(...), false);
     }
 
     public function guessMaxLength(string $class, string $property): ?ValueGuess
     {
-        return $this->guess($class, $property, fn (Constraint $constraint) => $this->guessMaxLengthForConstraint($constraint));
+        return $this->guess($class, $property, $this->guessMaxLengthForConstraint(...));
     }
 
     public function guessPattern(string $class, string $property): ?ValueGuess
     {
-        return $this->guess($class, $property, fn (Constraint $constraint) => $this->guessPatternForConstraint($constraint));
+        return $this->guess($class, $property, $this->guessPatternForConstraint(...));
     }
 
     /**
diff --git a/src/Symfony/Component/Form/FormTypeGuesserChain.php b/src/Symfony/Component/Form/FormTypeGuesserChain.php
index 2ac8e3c263ab1..ed94ece6e9d0a 100644
--- a/src/Symfony/Component/Form/FormTypeGuesserChain.php
+++ b/src/Symfony/Component/Form/FormTypeGuesserChain.php
@@ -45,22 +45,22 @@ public function __construct(iterable $guessers)
 
     public function guessType(string $class, string $property): ?TypeGuess
     {
-        return $this->guess(fn ($guesser) => $guesser->guessType($class, $property));
+        return $this->guess(static fn ($guesser) => $guesser->guessType($class, $property));
     }
 
     public function guessRequired(string $class, string $property): ?ValueGuess
     {
-        return $this->guess(fn ($guesser) => $guesser->guessRequired($class, $property));
+        return $this->guess(static fn ($guesser) => $guesser->guessRequired($class, $property));
     }
 
     public function guessMaxLength(string $class, string $property): ?ValueGuess
     {
-        return $this->guess(fn ($guesser) => $guesser->guessMaxLength($class, $property));
+        return $this->guess(static fn ($guesser) => $guesser->guessMaxLength($class, $property));
     }
 
     public function guessPattern(string $class, string $property): ?ValueGuess
     {
-        return $this->guess(fn ($guesser) => $guesser->guessPattern($class, $property));
+        return $this->guess(static fn ($guesser) => $guesser->guessPattern($class, $property));
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt
index 4a226f576d60f..0f6f1f40e728e 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt
+++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt
@@ -20,7 +20,6 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (choice_translation_domain
   Normalizers      [         %s
                      Closure(%s
                        class:%s
-                       this: %s
                        file: %s
                        line: %s
                      }       %s

From d127ebf61c5028be2c782d9b3b34cfc519668ed0 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 27 Mar 2023 18:50:08 +0200
Subject: [PATCH 342/475] [DependencyInjection] Add support for
 `#[Autowire(lazy: class-string)]`

---
 .../Attribute/Autowire.php                    |   6 +-
 .../DependencyInjection/CHANGELOG.md          |   2 +-
 .../Compiler/AutowirePass.php                 |  29 ++++-
 .../Instantiator/LazyServiceInstantiator.php  |   2 +-
 .../LazyProxy/PhpDumper/LazyServiceDumper.php |   9 +-
 .../Tests/Dumper/PhpDumperTest.php            |  26 +++++
 .../Fixtures/includes/autowiring_classes.php  |  10 ++
 .../Fixtures/php/lazy_autowire_attribute.php  |   4 +-
 ...y_autowire_attribute_with_intersection.php | 105 ++++++++++++++++++
 .../php/services9_lazy_inlined_factories.txt  |   8 +-
 .../Fixtures/php/services_dedup_lazy.php      |  12 +-
 .../php/services_non_shared_lazy_as_files.txt |  12 +-
 .../php/services_non_shared_lazy_ghost.php    |   4 +-
 .../Fixtures/php/services_wither_lazy.php     |   4 +-
 14 files changed, 199 insertions(+), 34 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute_with_intersection.php

diff --git a/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php b/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
index 6249e65cbc7b9..c17eb13702492 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/Autowire.php
@@ -25,6 +25,7 @@
 class Autowire
 {
     public readonly string|array|Expression|Reference|ArgumentInterface|null $value;
+    public readonly bool|array $lazy;
 
     /**
      * Use only ONE of the following.
@@ -34,6 +35,7 @@ class Autowire
      * @param string|null                         $expression Expression (ie 'service("some.service").someMethod()')
      * @param string|null                         $env        Environment variable name (ie 'SOME_ENV_VARIABLE')
      * @param string|null                         $param      Parameter name (ie 'some.parameter.name')
+     * @param bool|class-string|class-string[]    $lazy       Whether to use lazy-loading for this argument
      */
     public function __construct(
         string|array|ArgumentInterface $value = null,
@@ -41,9 +43,9 @@ public function __construct(
         string $expression = null,
         string $env = null,
         string $param = null,
-        public bool $lazy = false,
+        bool|string|array $lazy = false,
     ) {
-        if ($lazy) {
+        if ($this->lazy = \is_string($lazy) ? [$lazy] : $lazy) {
             if (null !== ($expression ?? $env ?? $param)) {
                 throw new LogicException('#[Autowire] attribute cannot be $lazy and use $expression, $env, or $param.');
             }
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index 7b37ddbb7b6c7..d61830ef742c7 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -17,7 +17,7 @@ CHANGELOG
  * Add `#[Exclude]` to skip autoregistering a class
  * Add support for generating lazy closures
  * Add support for autowiring services as closures using `#[AutowireCallable]` or `#[AutowireServiceClosure]`
- * Add support for `#[Autowire(lazy: true)]`
+ * Add support for `#[Autowire(lazy: true|class-string)]`
  * Deprecate `#[MapDecorated]`, use `#[AutowireDecorated]` instead
  * Deprecate the `@required` annotation, use the `Symfony\Contracts\Service\Attribute\Required` attribute instead
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 3378c8bb06f55..dd5900bbefddf 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -295,12 +295,33 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                             ->setFactory(['Closure', 'fromCallable'])
                             ->setArguments([$value + [1 => '__invoke']])
                             ->setLazy($attribute->lazy);
-                    } elseif ($attribute->lazy && ($value instanceof Reference ? !$this->container->has($value) || !$this->container->findDefinition($value)->isLazy() : null === $attribute->value && $type)) {
-                        $this->container->register('.lazy.'.$value ??= $getValue(), $type)
+                    } elseif ($lazy = $attribute->lazy) {
+                        $definition = (new Definition($type))
                             ->setFactory('current')
-                            ->setArguments([[$value]])
+                            ->setArguments([[$value ??= $getValue()]])
                             ->setLazy(true);
-                        $value = new Reference('.lazy.'.$value);
+
+                        if (!\is_array($lazy)) {
+                            if (str_contains($type, '|')) {
+                                throw new AutowiringFailedException($this->currentId, sprintf('Cannot use #[Autowire] with option "lazy: true" on union types for service "%s"; set the option to the interface(s) that should be proxied instead.', $this->currentId));
+                            }
+                            $lazy = str_contains($type, '&') ? explode('&', $type) : [];
+                        }
+
+                        if ($lazy) {
+                            if (!class_exists($type) && !interface_exists($type, false)) {
+                                $definition->setClass('object');
+                            }
+                            foreach ($lazy as $v) {
+                                $definition->addTag('proxy', ['interface' => $v]);
+                            }
+                        }
+
+                        if ($definition->getClass() !== (string) $value || $definition->getTag('proxy')) {
+                            $value .= '.'.$this->container->hash([$definition->getClass(), $definition->getTag('proxy')]);
+                        }
+                        $this->container->setDefinition($value = '.lazy.'.$value, $definition);
+                        $value = new Reference($value);
                     }
                     $arguments[$index] = $value;
 
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/LazyServiceInstantiator.php b/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/LazyServiceInstantiator.php
index 3de3d0361d775..40b128df77d70 100644
--- a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/LazyServiceInstantiator.php
+++ b/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/LazyServiceInstantiator.php
@@ -29,7 +29,7 @@ public function instantiateProxy(ContainerInterface $container, Definition $defi
             throw new InvalidArgumentException(sprintf('Cannot instantiate lazy proxy for service "%s".', $id));
         }
 
-        if (!class_exists($proxyClass = $dumper->getProxyClass($definition, $asGhostObject, $class), false)) {
+        if (!class_exists($proxyClass = $dumper->getProxyClass($definition, $asGhostObject), false)) {
             eval($dumper->getProxyCode($definition, $id));
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
index 09426c7e4627e..2571fccbf5440 100644
--- a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
+++ b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
@@ -120,7 +120,7 @@ public function getProxyCode(Definition $definition, string $id = null): string
                 if (!interface_exists($tag['interface']) && !class_exists($tag['interface'], false)) {
                     throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": several "proxy" tags found but "%s" is not an interface.', $id ?? $definition->getClass(), $tag['interface']));
                 }
-                if (!is_a($class->name, $tag['interface'], true)) {
+                if ('object' !== $definition->getClass() && !is_a($class->name, $tag['interface'], true)) {
                     throw new InvalidArgumentException(sprintf('Invalid "proxy" tag for service "%s": class "%s" doesn\'t implement "%s".', $id ?? $definition->getClass(), $definition->getClass(), $tag['interface']));
                 }
                 $interfaces[] = new \ReflectionClass($tag['interface']);
@@ -141,10 +141,11 @@ public function getProxyCode(Definition $definition, string $id = null): string
 
     public function getProxyClass(Definition $definition, bool $asGho
10000
stObject, \ReflectionClass &$class = null): string
     {
-        $class = new \ReflectionClass($definition->getClass());
+        $class = 'object' !== $definition->getClass() ? $definition->getClass() : 'stdClass';
+        $class = new \ReflectionClass($class);
 
-        return preg_replace('/^.*\\\\/', '', $class->name)
+        return preg_replace('/^.*\\\\/', '', $definition->getClass())
             .($asGhostObject ? 'Ghost' : 'Proxy')
-            .ucfirst(substr(hash('sha256', $this->salt.'+'.$class->name), -7));
+            .ucfirst(substr(hash('sha256', $this->salt.'+'.$class->name.'+'.serialize($definition->getTag('proxy'))), -7));
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 2a05ce2459783..966a333b8cc8d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -43,8 +43,11 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\DependencyInjection\Tests\Compiler\AAndIInterfaceConsumer;
+use Symfony\Component\DependencyInjection\Tests\Compiler\AInterface;
 use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
 use Symfony\Component\DependencyInjection\Tests\Compiler\FooAnnotation;
+use Symfony\Component\DependencyInjection\Tests\Compiler\IInterface;
 use Symfony\Component\DependencyInjection\Tests\Compiler\Wither;
 use Symfony\Component\DependencyInjection\Tests\Compiler\WitherAnnotation;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
@@ -1769,6 +1772,29 @@ public function testLazyAutowireAttribute()
         $this->assertInstanceOf(LazyObjectInterface::class, $container->get('bar')->foo);
         $this->assertSame($container->get('foo'), $container->get('bar')->foo->initializeLazyObject());
     }
+
+    public function testLazyAutowireAttributeWithIntersection()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', AAndIInterfaceConsumer::class)
+            ->setPublic('true')
+            ->setAutowired(true);
+
+        $container->compile();
+
+        $lazyId = \array_slice(array_keys($container->getDefinitions()), -1)[0];
+        $this->assertStringStartsWith('.lazy.foo.', $lazyId);
+        $definition = $container->getDefinition($lazyId);
+        $this->assertSame('object', $definition->getClass());
+        $this->assertSame([
+            ['interface' => AInterface::class],
+            ['interface' => IInterface::class],
+        ], $definition->getTag('proxy'));
+
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/lazy_autowire_attribute_with_intersection.php', $dumper->dump());
+    }
 }
 
 class Rot13EnvVarProcessor implements EnvVarProcessorInterface
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
index edbf86bafe6c3..1911282a5c77e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -3,6 +3,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Contracts\Service\Attribute\Required;
 
 require __DIR__.'/uniontype_classes.php';
@@ -526,3 +527,12 @@ public function __construct(NotExisting $notExisting)
     {
     }
 }
+
+class AAndIInterfaceConsumer
+{
+    public function __construct(
+        #[Autowire(service: 'foo', lazy: true)]
+        AInterface&IInterface $logger,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute.php
index fe246c8280ecb..a82d5bc1e9b67 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute.php
@@ -82,14 +82,14 @@ protected static function getFoo2Service($container, $lazyLoad = true)
         $containerRef = $container->ref;
 
         if (true === $lazyLoad) {
-            return $container->privates['.lazy.Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo'] = $container->createProxy('FooProxy9f41ec7', static fn () => \FooProxy9f41ec7::createLazyProxy(static fn () => self::getFoo2Service($containerRef->get(), false)));
+            return $container->privates['.lazy.Symfony\\Component\\DependencyInjection\\Tests\\Compiler\\Foo'] = $container->createProxy('FooProxy4048957', static fn () => \FooProxy4048957::createLazyProxy(static fn () => self::getFoo2Service($containerRef->get(), false)));
         }
 
         return ($container->services['foo'] ??= new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo());
     }
 }
 
-class FooProxy9f41ec7 extends \Symfony\Component\DependencyInjection\Tests\Compiler\Foo implements \Symfony\Component\VarExporter\LazyObjectInterface
+class FooProxy4048957 extends \Symfony\Component\DependencyInjection\Tests\Compiler\Foo implements \Symfony\Component\VarExporter\LazyObjectInterface
 {
     use \Symfony\Component\VarExporter\LazyProxyTrait;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute_with_intersection.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute_with_intersection.php
new file mode 100644
index 0000000000000..4bf955ac2447a
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_autowire_attribute_with_intersection.php
@@ -0,0 +1,105 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class ProjectServiceContainer extends Container
+{
+    protected $parameters = [];
+    protected readonly \WeakReference $ref;
+
+    public function __construct()
+    {
+        $this->ref = \WeakReference::create($this);
+        $this->services = $this->privates = [];
+        $this->methodMap = [
+            'foo' => 'getFooService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function compile(): void
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled(): bool
+    {
+        return true;
+    }
+
+    public function getRemovedIds(): array
+    {
+        return [
+            '.lazy.foo.gDmfket' => true,
+        ];
+    }
+
+    protected function createProxy($class, \Closure $factory)
+    {
+        return $factory();
+    }
+
+    /**
+     * Gets the public 'foo' shared autowired service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Compiler\AAndIInterfaceConsumer
+     */
+    protected static function getFooService($container)
+    {
+        $a = ($container->privates['.lazy.foo.gDmfket'] ?? self::get_Lazy_Foo_GDmfketService($container));
+
+        if (isset($container->services['foo'])) {
+            return $container->services['foo'];
+        }
+
+        return $container->services['foo'] = new \Symfony\Component\DependencyInjection\Tests\Compiler\AAndIInterfaceConsumer($a);
+    }
+
+    /**
+     * Gets the private '.lazy.foo.gDmfket' shared service.
+     *
+     * @return \object
+     */
+    protected static function get_Lazy_Foo_GDmfketService($container, $lazyLoad = true)
+    {
+        $containerRef = $container->ref;
+
+        if (true === $lazyLoad) {
+            return $container->privates['.lazy.foo.gDmfket'] = $container->createProxy('objectProxy8ac8e9a', static fn () => \objectProxy8ac8e9a::createLazyProxy(static fn () => self::get_Lazy_Foo_GDmfketService($containerRef->get(), false)));
+        }
+
+        return ($container->services['foo'] ?? self::getFooService($container));
+    }
+}
+
+class objectProxy8ac8e9a implements \Symfony\Component\DependencyInjection\Tests\Compiler\AInterface, \Symfony\Component\DependencyInjection\Tests\Compiler\IInterface, \Symfony\Component\VarExporter\LazyObjectInterface
+{
+    use \Symfony\Component\VarExporter\LazyProxyTrait;
+
+    private const LAZY_OBJECT_PROPERTY_SCOPES = [];
+
+    public function initializeLazyObject(): \Symfony\Component\DependencyInjection\Tests\Compiler\AInterface&\Symfony\Component\DependencyInjection\Tests\Compiler\IInterface
+    {
+        if ($state = $this->lazyObjectState ?? null) {
+            return $state->realInstance ??= ($state->initializer)();
+        }
+
+        return $this;
+    }
+}
+
+// Help opcache.preload discover always-needed symbols
+class_exists(\Symfony\Component\VarExporter\Internal\Hydrator::class);
+class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectRegistry::class);
+class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
index 965dc91661cce..59aa77a6e150e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -6,11 +6,11 @@ namespace Container%s;
 
 include_once $container->targetDir.''.'/Fixtures/includes/foo.php';
 
-class FooClassGhost2b16075 extends \Bar\FooClass implements \Symfony\Component\VarExporter\LazyObjectInterface
+class FooClassGhostEe53b95 extends \Bar\FooClass implements \Symfony\Component\VarExporter\LazyObjectInterface
 %A
 
-if (!\class_exists('FooClassGhost2b16075', false)) {
-    \class_alias(__NAMESPACE__.'\\FooClassGhost2b16075', 'FooClassGhost2b16075', false);
+if (!\class_exists('FooClassGhostEe53b95', false)) {
+    \class_alias(__NAMESPACE__.'\\FooClassGhostEe53b95', 'FooClassGhostEe53b95', false);
 }
 
     [Container%s/ProjectServiceContainer.php] => <?php
@@ -78,7 +78,7 @@ class ProjectServiceContainer extends Container
         $containerRef = $container->ref;
 
         if (true === $lazyLoad) {
-            return $container->services['lazy_foo'] = $container->createProxy('FooClassGhost2b16075', static fn () => \FooClassGhost2b16075::createLazyGhost(static fn ($proxy) => self::getLazyFooService($containerRef->get(), $proxy)));
+            return $container->services['lazy_foo'] = $container->createProxy('FooClassGhostEe53b95', static fn () => \FooClassGhostEe53b95::createLazyGhost(static fn ($proxy) => self::getLazyFooService($containerRef->get(), $proxy)));
         }
 
         include_once $container->targetDir.''.'/Fixtures/includes/foo_lazy.php';
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dedup_lazy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dedup_lazy.php
index a4d1ee90cc64c..6c2481a68dc20 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dedup_lazy.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_dedup_lazy.php
@@ -56,7 +56,7 @@ protected static function getBarService($container, $lazyLoad = true)
         $containerRef = $container->ref;
 
         if (true === $lazyLoad) {
-            return $container->services['bar'] = $container->createProxy('stdClassGhost5a8a5eb', static fn () => \stdClassGhost5a8a5eb::createLazyGhost(static fn ($proxy) => self::getBarService($containerRef->get(), $proxy)));
+            return $container->services['bar'] = $container->createProxy('stdClassGhost2fc7938', static fn () => \stdClassGhost2fc7938::createLazyGhost(static fn ($proxy) => self::getBarService($containerRef->get(), $proxy)));
         }
 
         return $lazyLoad;
@@ -72,7 +72,7 @@ protected static function getBazService($container, $lazyLoad = true)
         $containerRef = $container->ref;
 
         if (true === $lazyLoad) {
-            return $container->services['baz'] = $container->createProxy('stdClassProxy5a8a5eb', static fn () => \stdClassProxy5a8a5eb::createLazyProxy(static fn () => self::getBazService($containerRef->get(), false)));
+            return $container->services['baz'] = $container->createProxy('stdClassProxy2fc7938', static fn () => \stdClassProxy2fc7938::createLazyProxy(static fn () => self::getBazService($containerRef->get(), false)));
         }
 
         return \foo_bar();
@@ -88,7 +88,7 @@ protected static function getBuzService($container, $lazyLoad = true)
         $containerRef = $container->ref;
 
         if (true === $lazyLoad) {
-            return $container->services['buz'] = $container->createProxy('stdClassProxy5a8a5eb', static fn () => \stdClassProxy5a8a5eb::createLazyProxy(static fn () => self::getBuzService($containerRef->get(), false)));
+            return $container->services['buz'] = $container->createProxy('stdClassProxy2fc7938', static fn () => \stdClassProxy2fc7938::createLazyProxy(static fn () => self::getBuzService($containerRef->get(), false)));
         }
 
         return \foo_bar();
@@ -104,14 +104,14 @@ protected static function getFooService($container, $lazyLoad = true)
         $containerRef = $container->ref;
 
         if (true === $lazyLoad) {
-            return $container->services['foo'] = $container->createProxy('stdClassGhost5a8a5eb', static fn () => \stdClassGhost5a8a5eb::createLazyGhost(static fn ($proxy) => self::getFooService($containerRef->get(), $proxy)));
+            return $container->services['foo'] = $container->createProxy('stdClassGhost2fc7938', static fn () => \stdClassGhost2fc7938::createLazyGhost(static fn ($proxy) => self::getFooService($containerRef->get(), $proxy)));
         }
 
         return $lazyLoad;
     }
 }
 
-class stdClassGhost5a8a5eb extends \stdClass implements \Symfony\Component\VarExporter\LazyObjectInterface
+class stdClassGhost2fc7938 extends \stdClass implements \Symfony\Component\VarExporter\LazyObjectInterface
 {
     use \Symfony\Component\VarExporter\LazyGhostTrait;
 
@@ -123,7 +123,7 @@ class_exists(\Symfony\Component\VarExporter\Internal\Hydrator::class);
 class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectRegistry::class);
 class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
 
-class stdClassProxy5a8a5eb extends \stdClass implements \Symfony\Component\VarExporter\LazyObjectInterface
+class stdClassProxy2fc7938 extends \stdClass implements \Symfony\Component\VarExporter\LazyObjectInterface
 {
     use \Symfony\Component\VarExporter\LazyProxyTrait;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
index f7436c455e450..6f74a94bc464b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
@@ -24,7 +24,7 @@ class getNonSharedFooService extends ProjectServiceContainer
         $container->factories['non_shared_foo'] ??= self::do(...);
 
         if (true === $lazyLoad) {
-            return $container->createProxy('FooLazyClassGhostF814e3a', static fn () => \FooLazyClassGhostF814e3a::createLazyGhost(static fn ($proxy) => self::do($containerRef->get(), $proxy)));
+            return $container->createProxy('FooLazyClassGhost0fc418d', static fn () => \FooLazyClassGhost0fc418d::createLazyGhost(static fn ($proxy) => self::do($containerRef->get(), $proxy)));
         }
 
         static $include = true;
@@ -39,11 +39,11 @@ class getNonSharedFooService extends ProjectServiceContainer
     }
 }
 
-    [Container%s/FooLazyClassGhostF814e3a.php] => <?php
+    [Container%s/FooLazyClassGhost0fc418d.php] => <?php
 
 namespace Container%s;
 
-class FooLazyClassGhostF814e3a extends \Bar\FooLazyClass implements \Symfony\Component\VarExporter\LazyObjectInterface
+class FooLazyClassGhost0fc418d extends \Bar\FooLazyClass implements \Symfony\Component\VarExporter\LazyObjectInterface
 {
     use \Symfony\Component\VarExporter\LazyGhostTrait;
 
@@ -55,8 +55,8 @@ class_exists(\Symfony\Component\VarExporter\Internal\Hydrator::class);
 class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectRegistry::class);
 class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
 
-if (!\class_exists('FooLazyClassGhostF814e3a', false)) {
-    \class_alias(__NAMESPACE__.'\\FooLazyClassGhostF814e3a', 'FooLazyClassGhostF814e3a', false);
+if (!\class_exists('FooLazyClassGhost0fc418d', false)) {
+    \class_alias(__NAMESPACE__.'\\FooLazyClassGhost0fc418d', 'FooLazyClassGhost0fc418d', false);
 }
 
     [Container%s/ProjectServiceContainer.php] => <?php
@@ -141,7 +141,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
 
 require dirname(__DIR__, %d).'%svendor/autoload.php';
 (require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
-require __DIR__.'/Container%s/FooLazyClassGhostF814e3a.php';
+require __DIR__.'/Container%s/FooLazyClassGhost0fc418d.php';
 require __DIR__.'/Container%s/getNonSharedFooService.php';
 
 $classes = [];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_ghost.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_ghost.php
index b318bb5cfec61..1a32c1974f7af 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_ghost.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_ghost.php
@@ -72,14 +72,14 @@ protected static function getFooService($container, $lazyLoad = true)
         $container->factories['service_container']['foo'] ??= self::getFooService(...);
 
         if (true === $lazyLoad) {
-            return $container->createProxy('stdClassGhost5a8a5eb', static fn () => \stdClassGhost5a8a5eb::createLazyGhost(static fn ($proxy) => self::getFooService($containerRef->get(), $proxy)));
+            return $container->createProxy('stdClassGhost2fc7938', static fn () => \stdClassGhost2fc7938::createLazyGhost(static fn ($proxy) => self::getFooService($containerRef->get(), $proxy)));
         }
 
         return $lazyLoad;
     }
 }
 
-class stdClassGhost5a8a5eb extends \stdClass implements \Symfony\Component\VarExporter\LazyObjectInterface
+class stdClassGhost2fc7938 extends \stdClass implements \Symfony\Component\VarExporter\LazyObjectInterface
 {
     use \Symfony\Component\VarExporter\LazyGhostTrait;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php
index 8922646fa0488..e5804f2e14805 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither_lazy.php
@@ -60,7 +60,7 @@ protected static function getWitherService($container, $lazyLoad = true)
         $containerRef = $container->ref;
 
         if (true === $lazyLoad) {
-            return $container->services['wither'] = $container->createProxy('WitherProxy94fa281', static fn () => \WitherProxy94fa281::createLazyProxy(static fn () => self::getWitherService($containerRef->get(), false)));
+            return $container->services['wither'] = $container->createProxy('WitherProxy580fe0f', static fn () => \WitherProxy580fe0f::createLazyProxy(static fn () => self::getWitherService($containerRef->get(), false)));
         }
 
         $instance = new \Symfony\Component\DependencyInjection\Tests\Compiler\Wither();
@@ -75,7 +75,7 @@ protected static function getWitherService($container, $lazyLoad = true)
     }
 }
 
-class WitherProxy94fa281 extends \Symfony\Component\DependencyInjection\Tests\Compiler\Wither implements \Symfony\Component\VarExporter\LazyObjectInterface
+class WitherProxy580fe0f extends \Symfony\Component\DependencyInjection\Tests\Compiler\Wither implements \Symfony\Component\VarExporter\LazyObjectInterface
 {
     use \Symfony\Component\VarExporter\LazyProxyTrait;
 

From 9975de266bf866f92a789e0d5f083c6a6c3ae028 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 7 Mar 2023 17:04:33 +0100
Subject: [PATCH 343/475] [DependencyInjection] Make it possible to cast
 callables into single-method interfaces

---
 .../Argument/LazyClosure.php                  | 43 ++++++++--
 .../Attribute/AutowireCallable.php            |  5 +-
 .../DependencyInjection/CHANGELOG.md          |  1 +
 .../Compiler/AutowirePass.php                 |  6 +-
 .../DependencyInjection/ContainerBuilder.php  |  9 +--
 .../DependencyInjection/Dumper/PhpDumper.php  | 81 +++++++++----------
 .../Configurator/FromCallableConfigurator.php | 47 +++++++++++
 .../Configurator/ServiceConfigurator.php      |  1 +
 .../Configurator/Traits/FromCallableTrait.php | 64 +++++++++++++++
 .../Loader/XmlFileLoader.php                  | 46 +++++++++++
 .../Loader/YamlFileLoader.php                 | 16 ++++
 .../schema/dic/services/services-1.0.xsd      |  1 +
 .../Tests/ContainerBuilderTest.php            | 16 ++++
 .../Tests/Dumper/PhpDumperTest.php            | 52 ++++++++++++
 .../config/from_callable.expected.yml         | 12 +++
 .../Tests/Fixtures/config/from_callable.php   | 14 ++++
 .../Fixtures/includes/autowiring_classes.php  |  5 ++
 .../Tests/Fixtures/includes/classes.php       |  5 +-
 .../php/callable_adapter_consumer.php         | 57 +++++++++++++
 .../Tests/Fixtures/php/closure_proxy.php      | 62 ++++++++++++++
 .../Tests/Fixtures/xml/from_callable.xml      |  8 ++
 .../Tests/Fixtures/yaml/from_callable.yml     |  4 +
 .../Tests/Loader/PhpFileLoaderTest.php        |  3 +
 .../Tests/Loader/XmlFileLoaderTest.php        | 10 +++
 .../Tests/Loader/YamlFileLoaderTest.php       | 10 +++
 25 files changed, 518 insertions(+), 60 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/FromCallableConfigurator.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FromCallableTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/from_callable.expected.yml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/from_callable.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/callable_adapter_consumer.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure_proxy.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/from_callable.xml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/from_callable.yml

diff --git a/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php b/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php
index 7b001352ac8bd..6324f021afadf 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php
@@ -11,8 +11,11 @@
 
 namespace Symfony\Component\DependencyInjection\Argument;
 
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\VarExporter\ProxyHelper;
 
 /**
@@ -44,17 +47,43 @@ public function __get(mixed $name): mixed
         return $this->service;
     }
 
-    public static function getCode(string $initializer, ?\ReflectionClass $r, string $method, ?string $id): string
+    public static function getCode(string $initializer, array $callable, Definition $definition, ContainerBuilder $container, ?string $id): string
     {
-        if (!$r || !$r->hasMethod($method)) {
+        $method = $callable[1];
+        $asClosure = 'Closure' === ($definition->getClass() ?: 'Closure');
+
+        if ($asClosure) {
+            $class = ($callable[0] instanceof Reference ? $container->findDefinition($callable[0]) : $callable[0])->getClass();
+        } else {
+            $class = $definition->getClass();
+        }
+
+        $r = $container->getReflectionClass($class);
+
+        if (!$asClosure) {
+            if (!$r || !$r->isInterface()) {
+                throw new RuntimeException(sprintf('Cannot create adapter for service "%s" because "%s" is not an interface.', $id, $class));
+            }
+            if (1 !== \count($method = $r->getMethods())) {
+                throw new RuntimeException(sprintf('Cannot create adapter for service "%s" because interface "%s" doesn\'t have exactly one method.', $id, $class));
+            }
+            $method = $method[0]->name;
+        } elseif (!$r || !$r->hasMethod($method)) {
             throw new RuntimeException(sprintf('Cannot create lazy closure for service "%s" because its corresponding callable is invalid.', $id));
         }
 
-        $signature = ProxyHelper::exportSignature($r->getMethod($method));
-        $signature = preg_replace('/: static$/', ': \\'.$r->name, $signature);
+        $code = ProxyHelper::exportSignature($r->getMethod($method));
+
+        if ($asClosure) {
+            $code = ' { '.preg_replace('/: static$/', ': \\'.$r->name, $code);
+        } else {
+            $code = ' implements \\'.$r->name.' { '.$code;
+        }
+
+        $code = 'new class('.$initializer.') extends \\'.self::class
+            .$code.' { return $this->service->'.$callable[1].'(...\func_get_args()); } '
+            .'}';
 
-        return '(new class('.$initializer.') extends \\'.self::class.' { '
-            .$signature.' { return $this->service->'.$method.'(...\func_get_args()); } '
-            .'})->'.$method.'(...)';
+        return $asClosure ? '('.$code.')->'.$method.'(...)' : $code;
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php b/src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php
index 08fdc6e6904aa..c4a7632fa45d7 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/AutowireCallable.php
@@ -20,11 +20,14 @@
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
 class AutowireCallable extends Autowire
 {
+    /**
+     * @param bool|class-string $lazy Whether to use lazy-loading for this argument
+     */
     public function __construct(
         string|array $callable = null,
         string $service = null,
         string $method = null,
-        bool $lazy = false,
+        bool|string $lazy = false,
     ) {
         if (!(null !== $callable xor null !== $service)) {
             throw new LogicException('#[AutowireCallable] attribute must declare exactly one of $callable or $service.');
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index d61830ef742c7..b92ec95897b85 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -18,6 +18,7 @@ CHANGELOG
  * Add support for generating lazy closures
  * Add support for autowiring services as closures using `#[AutowireCallable]` or `#[AutowireServiceClosure]`
  * Add support for `#[Autowire(lazy: true|class-string)]`
+ * Make it possible to cast callables into single-method interfaces
  * Deprecate `#[MapDecorated]`, use `#[AutowireDecorated]` instead
  * Deprecate the `@required` annotation, use the `Symfony\Contracts\Service\Attribute\Required` attribute instead
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index dd5900bbefddf..a68d19ea30049 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -291,10 +291,10 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                     $value = $this->processValue(new TypedReference($type ?: '?', $type ?: 'mixed', $invalidBehavior, $name, [$attribute, ...$target]));
 
                     if ($attribute instanceof AutowireCallable) {
-                        $value = (new Definition('Closure'))
+                        $value = (new Definition($type = \is_string($attribute->lazy) ? $attribute->lazy : ($type ?: 'Closure')))
                             ->setFactory(['Closure', 'fromCallable'])
-                            ->setArguments([$value + [1 => '__invoke']])
-                            ->setLazy($attribute->lazy);
+                            ->setArguments([\is_array($value) ? $value + [1 => '__invoke'] : $value])
+                            ->setLazy($attribute->lazy || 'Closure' !== $type && 'callable' !== (string) $parameter->getType());
                     } elseif ($lazy = $attribute->lazy) {
                         $definition = (new Definition($type))
                             ->setFactory('current')
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 57c0234725f7c..ca696673601ff 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1051,9 +1051,9 @@ private function createService(Definition $definition, array &$inlineServices, b
         }
 
         $parameterBag = $this->getParameterBag();
-        $class = ($parameterBag->resolveValue($definition->getClass()) ?: (['Closure', 'fromCallable'] === $definition->getFactory() ? 'Closure' : null));
+        $class = $parameterBag->resolveValue($definition->getClass()) ?: (['Closure', 'fromCallable'] === $definition->getFactory() ? 'Closure' : null);
 
-        if ('Closure' === $class && $definition->isLazy() && ['Closure', 'fromCallable'] === $definition->getFactory()) {
+        if (['Closure', 'fromCallable'] === $definition->getFactory() && ('Closure' !== $class || $definition->isLazy())) {
             $callable = $parameterBag->unescapeValue($parameterBag->resolveValue($definition->getArgument(0)));
 
             if ($callable instanceof Reference || $callable instanceof Definition) {
@@ -1065,19 +1065,18 @@ private function createService(Definition $definition, array &$inlineServices, b
                 || $callable[0] instanceof Definition && !isset($inlineServices[spl_object_hash($callable[0])])
             )) {
                 $containerRef = $this->containerRef ??= \WeakReference::create($this);
-                $class = ($callable[0] instanceof Reference ? $this->findDefinition($callable[0]) : $callable[0])->getClass();
                 $initializer = static function () use ($containerRef, $callable, &$inlineServices) {
                     return $containerRef->get()->doResolveServices($callable[0], $inlineServices);
                 };
 
-                $proxy = eval('return '.LazyClosure::getCode('$initializer', $this->getReflectionClass($class), $callable[1], $id).';');
+                $proxy = eval('return '.LazyClosure::getCode('$initializer', $callable, $definition, $this, $id).';');
                 $this->shareService($definition, $proxy, $id, $inlineServices);
 
                 return $proxy;
             }
         }
 
-        if (true === $tryProxy && $definition->isLazy() && 'Closure' !== $class
+        if (true === $tryProxy && $definition->isLazy() && ['Closure', 'fromCallable'] !== $definition->getFactory()
             && !$tryProxy = !($proxy = $this->proxyInstantiator ??= new LazyServiceInstantiator()) || $proxy instanceof RealServiceInstantiator
         ) {
             $containerRef = $this->containerRef ??= \WeakReference::create($this);
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 7f8054675a749..c8f1ebd2b1635 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1162,7 +1162,8 @@ private function addNewInstance(Definition $definition, string $return = '', str
             if ('current' === $callable && [0] === array_keys($definition->getArguments()) && \is_array($value) && [0] === array_keys($value)) {
                 return $return.$this->dumpValue($value[0]).$tail;
             }
-            if (['Closure', 'fromCallable'] === $callable && [0] === array_keys($definition->getArguments())) {
+
+            if (['Closure', 'fromCallable'] === $callable) {
                 $callable = $definition->getArgument(0);
                 if ($callable instanceof ServiceClosureArgument) {
                     return $return.$this->dumpValue($callable).$tail;
@@ -1175,58 +1176,56 @@ private function addNewInstance(Definition $definition, string $return = '', str
                 }
             }
 
-            if (\is_array($callable)) {
-                if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $callable[1])) {
-                    throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s).', $callable[1] ?: 'n/a'));
-                }
-
-                if (['...'] === $arguments && $definition->isLazy() && 'Closure' === ($definition->getClass() ?? 'Closure') && (
-                    $callable[0] instanceof Reference
-                    || ($callable[0] instanceof Definition && !$this->definitionVariables->contains($callable[0]))
-                )) {
-                    $class = ($callable[0] instanceof Reference ? $this->container->findDefinition($callable[0]) : $callable[0])->getClass();
+            if (\is_string($callable) && str_starts_with($callable, '@=')) {
+                return $return.sprintf('(($args = %s) ? (%s) : null)',
+                    $this->dumpValue(new ServiceLocatorArgument($definition->getArguments())),
+                    $this->getExpressionLanguage()->compile(substr($callable, 2), ['container' => 'container', 'args' => 'args'])
+                ).$tail;
+            }
 
-                    if (str_contains($initializer = $this->dumpValue($callable[0]), '$container')) {
-                        $this->addContainerRef = true;
-                        $initializer = sprintf('function () use ($containerRef) { $container = $containerRef; return %s; }', $initializer);
-                    } else {
-                        $initializer = 'fn () => '.$initializer;
-                    }
+            if (!\is_array($callable)) {
+                return $return.sprintf('%s(%s)', $this->dumpLiteralClass($this->dumpValue($callable)), $arguments ? implode(', ', $arguments) : '').$tail;
+            }
 
-                    return $return.LazyClosure::getCode($initializer, $this->container->getReflectionClass($class), $callable[1], $id).$tail;
-                }
+            if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $callable[1])) {
+                throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s).', $callable[1] ?: 'n/a'));
+            }
 
-                if ($callable[0] instanceof Reference
-                    || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))
-                ) {
-                    return $return.sprintf('%s->%s(%s)', $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
+            if (['...'] === $arguments && ($definition->isLazy() || 'Closure' !== ($definition->getClass() ?? 'Closure')) && (
+                $callable[0] instanceof Reference
+                || ($callable[0] instanceof Definition && !$this->definitionVariables->contains($callable[0]))
+            )) {
+                if (str_contains($initializer = $this->dumpValue($callable[0]), '$container')) {
+                    $this->addContainerRef = true;
+                    $initializer = sprintf('function () use ($containerRef) { $container = $containerRef->get(); return %s; }', $initializer);
+                } else {
+                    $initializer = 'fn () => '.$initializer;
                 }
 
-                $class = $this->dumpValue($callable[0]);
-                // If the class is a string we can optimize away
-                if (str_starts_with($class, "'") && !str_contains($class, '$')) {
-                    if ("''" === $class) {
-                        throw new RuntimeException(sprintf('Cannot dump definition: "%s" service is defined to be created by a factory but is missing the service reference, did you forget to define the factory service id or class?', $id ? 'The "'.$id.'"' : 'inline'));
-                    }
+                return $return.LazyClosure::getCode($initializer, $callable, $definition, $this->container, $id).$tail;
+            }
 
-                    return $return.sprintf('%s::%s(%s)', $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
-                }
+            if ($callable[0] instanceof Reference
+                || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))
+            ) {
+                return $return.sprintf('%s->%s(%s)', $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
+            }
 
-                if (str_starts_with($class, 'new ')) {
-                    return $return.sprintf('(%s)->%s(%s)', $class, $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
+            $class = $this->dumpValue($callable[0]);
+            // If the class is a string we can optimize away
+            if (str_starts_with($class, "'") && !str_contains($class, '$')) {
+                if ("''" === $class) {
+                    throw new RuntimeException(sprintf('Cannot dump definition: "%s" service is defined to be created by a factory but is missing the service reference, did you forget to define the factory service id or class?', $id ? 'The "'.$id.'"' : 'inline'));
                 }
 
-                return $return.sprintf("[%s, '%s'](%s)", $class, $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
+                return $return.sprintf('%s::%s(%s)', $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
             }
 
-            if (\is_string($callable) && str_starts_with($callable, '@=')) {
-                return $return.sprintf('(($args = %s) ? (%s) : null)',
-                    $this->dumpValue(new ServiceLocatorArgument($definition->getArguments())),
-                    $this->getExpressionLanguage()->compile(substr($callable, 2), ['container' => 'container', 'args' => 'args'])
-                ).$tail;
+            if (str_starts_with($class, 'new ')) {
+                return $return.sprintf('(%s)->%s(%s)', $class, $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
             }
 
-            return $return.sprintf('%s(%s)', $this->dumpLiteralClass($this->dumpValue($callable)), $arguments ? implode(', ', $arguments) : '').$tail;
+            return $return.sprintf("[%s, '%s'](%s)", $class, $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
         }
 
         if (null === $class = $definition->getClass()) {
@@ -2344,7 +2343,7 @@ private function isProxyCandidate(Definition $definition, ?bool &$asGhostObject,
     {
         $asGhostObject = false;
 
-        if ('Closure' === ($definition->getClass() ?: (['Closure', 'fromCallable'] === $definition->getFactory() ? 'Closure' : null))) {
+        if (['Closure', 'fromCallable'] === $definition->getFactory()) {
             return null;
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/FromCallableConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/FromCallableConfigurator.php
new file mode 100644
index 0000000000000..7fe0d3da14c88
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/FromCallableConfigurator.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Definition;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class FromCallableConfigurator extends AbstractServiceConfigurator
+{
+    use Traits\AbstractTrait;
+    use Traits\AutoconfigureTrait;
+    use Traits\AutowireTrait;
+    use Traits\BindTrait;
+    use Traits\DecorateTrait;
+    use Traits\DeprecateTrait;
+    use Traits\LazyTrait;
+    use Traits\PublicTrait;
+    use Traits\ShareTrait;
+    use Traits\TagTrait;
+
+    public const FACTORY = 'services';
+
+    private ServiceConfigurator $serviceConfigurator;
+
+    public function __construct(ServiceConfigurator $serviceConfigurator, Definition $definition)
+    {
+        $this->serviceConfigurator = $serviceConfigurator;
+
+        parent::__construct($serviceConfigurator->parent, $definition, $serviceConfigurator->id);
+    }
+
+    public function __destruct()
+    {
+        $this->serviceConfigurator->__destruct();
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
index 49aff7ea947e7..2312f3b6e6e97 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
@@ -31,6 +31,7 @@ class ServiceConfigurator extends AbstractServiceConfigurator
     use Traits\DeprecateTrait;
     use Traits\FactoryTrait;
     use Traits\FileTrait;
+    use Traits\FromCallableTrait;
     use Traits\LazyTrait;
     use Traits\ParentTrait;
     use Traits\PropertyTrait;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FromCallableTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FromCallableTrait.php
new file mode 100644
index 0000000000000..e3508ab89561d
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/FromCallableTrait.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Loader\Configurator\FromCallableConfigurator;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ReferenceConfigurator;
+use Symfony\Component\ExpressionLanguage\Expression;
+
+trait FromCallableTrait
+{
+    final public function fromCallable(string|array|ReferenceConfigurator|Expression $callable): FromCallableConfigurator
+    {
+        if ($this->definition instanceof ChildDefinition) {
+            throw new InvalidArgumentException('The configuration key "parent" is unsupported when using "fromCallable()".');
+        }
+
+        foreach ([
+            'synthetic' => 'isSynthetic',
+            'factory' => 'getFactory',
+            'file' => 'getFile',
+            'arguments' => 'getArguments',
+            'properties' => 'getProperties',
+            'configurator' => 'getConfigurator',
+            'calls' => 'getMethodCalls',
+        ] as $key => $method) {
+            if ($this->definition->$method()) {
+                throw new InvalidArgumentException(sprintf('The configuration key "%s" is unsupported when using "fromCallable()".', $key));
+            }
+        }
+
+        $this->definition->setFactory(['Closure', 'fromCallable']);
+
+        if (\is_string($callable) && 1 === substr_count($callable, ':')) {
+            $parts = explode(':', $callable);
+
+            throw new InvalidArgumentException(sprintf('Invalid callable "%s": the "service:method" notation is not available when using PHP-based DI configuration. Use "[service(\'%s\'), \'%s\']" instead.', $callable, $parts[0], $parts[1]));
+        }
+
+        if ($callable instanceof Expression) {
+            $callable = '@='.$callable;
+        }
+
+        $this->definition->setArguments([static::processValue($callable, true)]);
+
+        if ('Closure' !== ($this->definition->getClass() ?? 'Closure')) {
+            $this->definition->setLazy(true);
+        } else {
+            $this->definition->setClass('Closure');
+        }
+
+        return new FromCallableConfigurator($this, $this->definition);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 6350b3af307d2..6ddecf5d54ab6 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -389,6 +389,52 @@ private function parseDefinition(\DOMElement $service, string $file, Definition
             $definition->setDecoratedService($decorates, $renameId, $priority, $invalidBehavior);
         }
 
+        if ($callable = $this->getChildren($service, 'from-callable')) {
+            if ($definition instanceof ChildDefinition) {
+                throw new InvalidArgumentException(sprintf('Attribute "parent" is unsupported when using "<from-callable>" on service "%s".', (string) $service->getAttribute('id')));
+            }
+
+            foreach ([
+                'Attribute "synthetic"' => 'isSynthetic',
+                'Attribute "file"' => 'getFile',
+                'Tag "<factory>"' => 'getFactory',
+                'Tag "<argument>"' => 'getArguments',
+                'Tag "<property>"' => 'getProperties',
+                'Tag "<configurator>"' => 'getConfigurator',
+                'Tag "<call>"' => 'getMethodCalls',
+            ] as $key => $method) {
+                if ($definition->$method()) {
+                    throw new InvalidArgumentException($key.sprintf(' is unsupported when using "<from-callable>" on service "%s".', (string) $service->getAttribute('id')));
+                }
+            }
+
+            $definition->setFactory(['Closure', 'fromCallable']);
+
+            if ('Closure' !== ($definition->getClass() ?? 'Closure')) {
+                $definition->setLazy(true);
+            } else {
+                $definition->setClass('Closure');
+            }
+
+            $callable = $callable[0];
+            if ($function = $callable->getAttribute('function')) {
+                $definition->setArguments([$function]);
+            } elseif ($expression = $callable->getAttribute('expression')) {
+                if (!class_exists(Expression::class)) {
+                    throw new \LogicException('The "expression" attribute cannot be used without the ExpressionLanguage component. Try running "composer require symfony/expression-language".');
+                }
+                $definition->setArguments(['@='.$expression]);
+            } else {
+                if ($childService = $callable->getAttribute('service')) {
+                    $class = new Reference($childService, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE);
+                } else {
+                    $class = $callable->hasAttribute('class') ? $callable->getAttribute('class') : null;
+                }
+
+                $definition->setArguments([[$class, $callable->getAttribute('method') ?: '__invoke']]);
+            }
+        }
+
         return $definition;
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 650bbe3556239..901086413bbb4 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -396,6 +396,22 @@ private function parseDefinition(string $id, array|string|null $service, string
         $definition = isset($service[0]) && $service[0] instanceof Definition ? array_shift($service) : null;
         $return = null === $definition ? $return : true;
 
+        if (isset($service['from_callable'])) {
+            foreach (['alias', 'parent', 'synthetic', 'factory', 'file', 'arguments', 'properties', 'configurator', 'calls'] as $key) {
+                if (isset($service['factory'])) {
+                    throw new InvalidArgumentException(sprintf('The configuration key "%s" is unsupported for the service "%s" when using "from_callable" in "%s".', $key, $id, $file));
+                }
+            }
+
+            if ('Closure' !== $service['class'] ??= 'Closure') {
+                $service['lazy'] = true;
+            }
+
+            $service['factory'] = ['Closure', 'fromCallable'];
+            $service['arguments'] = [$service['from_callable']];
+            unset($service['from_callable']);
+        }
+
         $this->checkDefinition($id, $service, $file);
 
         if (isset($service['alias'])) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
index c5263185bd0dc..399f93dfbba6d 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
+++ b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
@@ -147,6 +147,7 @@
       <xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
       <xsd:element name="configurator" type="callable" minOccurs="0" maxOccurs="1" />
       <xsd:element name="factory" type="factory" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="from-callable" type="factory" minOccurs="0" maxOccurs="1" />
       <xsd:element name="deprecated" type="deprecated" minOccurs="0" maxOccurs="1" />
       <xsd:element name="call" type="call" minOccurs="0" maxOccurs="unbounded" />
       <xsd:element name="tag" type="tag" minOccurs="0" maxOccurs="unbounded" />
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index 1491e8843687e..d760415b4d9c9 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -49,6 +49,7 @@
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
 use Symfony\Component\DependencyInjection\Tests\Compiler\FooAnnotation;
+use Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface;
 use Symfony\Component\DependencyInjection\Tests\Compiler\Wither;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
@@ -507,6 +508,21 @@ public function testCreateLazyProxy()
         $this->assertInstanceOf(\Bar\FooClass::class, $foo1);
     }
 
+    public function testClosureProxy()
+    {
+        $container = new ContainerBuilder();
+        $container->register('closure_proxy', SingleMethodInterface::class)
+            ->setPublic('true')
+            ->setFactory(['Closure', 'fromCallable'])
+            ->setArguments([[new Reference('foo'), 'cloneFoo']])
+            ->setLazy(true);
+        $container->register('foo', Foo::class);
+        $container->compile();
+
+        $this->assertInstanceOf(SingleMethodInterface::class, $container->get('closure_proxy'));
+        $this->assertInstanceOf(Foo::class, $container->get('closure_proxy')->theMethod());
+    }
+
     public function testCreateServiceClass()
     {
         $builder = new ContainerBuilder();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 966a333b8cc8d..1e188c8f78f03 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -48,6 +48,7 @@
 use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
 use Symfony\Component\DependencyInjection\Tests\Compiler\FooAnnotation;
 use Symfony\Component\DependencyInjection\Tests\Compiler\IInterface;
+use Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface;
 use Symfony\Component\DependencyInjection\Tests\Compiler\Wither;
 use Symfony\Component\DependencyInjection\Tests\Compiler\WitherAnnotation;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
@@ -1673,6 +1674,28 @@ public function testExpressionInFactory()
         $this->assertSame(247, $container->get('foo')->bar);
     }
 
+    public function testClosureProxy()
+    {
+        $container = new ContainerBuilder();
+        $container->register('closure_proxy', SingleMethodInterface::class)
+            ->setPublic('true')
+            ->setFactory(['Closure', 'fromCallable'])
+            ->setArguments([[new Reference('foo'), 'cloneFoo']])
+            ->setLazy(true);
+        $container->register('foo', Foo::class);
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/closure_proxy.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Closure_Proxy']));
+
+        require self::$fixturesPath.'/php/closure_proxy.php';
+
+        $container = new \Symfony_DI_PhpDumper_Test_Closure_Proxy();
+
+        $this->assertInstanceOf(SingleMethodInterface::class, $container->get('closure_proxy'));
+        $this->assertInstanceOf(Foo::class, $container->get('closure_proxy')->theMethod());
+    }
+
     public function testClosure()
     {
         $container = new ContainerBuilder();
@@ -1795,6 +1818,26 @@ public function testLazyAutowireAttributeWithIntersection()
 
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/lazy_autowire_attribute_with_intersection.php', $dumper->dump());
     }
+
+    public function testCallableAdapterConsumer()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', Foo::class);
+        $container->register('bar', CallableAdapterConsumer::class)
+            ->setPublic('true')
+            ->setAutowired(true);
+        $container->compile();
+        $dumper = new PhpDumper($container);
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/callable_adapter_consumer.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_Callable_Adapter_Consumer']));
+
+        require self::$fixturesPath.'/php/callable_adapter_consumer.php';
+
+        $container = new \Symfony_DI_PhpDumper_Test_Callable_Adapter_Consumer();
+
+        $this->assertInstanceOf(SingleMethodInterface::class, $container->get('bar')->foo);
+        $this->assertInstanceOf(Foo::class, $container->get('bar')->foo->theMethod());
+    }
 }
 
 class Rot13EnvVarProcessor implements EnvVarProcessorInterface
@@ -1842,3 +1885,12 @@ public function __construct(
     ) {
     }
 }
+
+class CallableAdapterConsumer
+{
+    public function __construct(
+        #[AutowireCallable(service: 'foo', method: 'cloneFoo')]
+        public SingleMethodInterface $foo,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/from_callable.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/from_callable.expected.yml
new file mode 100644
index 0000000000000..d4dbbbadd48bf
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/from_callable.expected.yml
@@ -0,0 +1,12 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    from_callable:
+        class: stdClass
+        public: true
+        lazy: true
+        arguments: [[!service { class: stdClass }, do]]
+        factory: [Closure, fromCallable]
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/from_callable.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/from_callable.php
new file mode 100644
index 0000000000000..b734987147daf
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/from_callable.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return new class() {
+    public function __invoke(ContainerConfigurator $c)
+    {
+        $c->services()
+            ->set('from_callable', 'stdClass')
+                ->fromCallable([service('bar'), 'do'])
+                ->public()
+            ->set('bar', 'stdClass');
+    }
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
index 1911282a5c77e..d5f62b9070d31 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -536,3 +536,8 @@ public function __construct(
     ) {
     }
 }
+
+interface SingleMethodInterface
+{
+    public function theMethod();
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
index e765bf34b6b3b..846c8fe64797b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
@@ -1,8 +1,7 @@
 <?php
 
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface as ProxyDumper;
-use Symfony\Contracts\Service\ServiceSubscriberInterface;
+use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface;
 
 function sc_configure($instance)
 {
@@ -82,7 +81,7 @@ public function callPassed()
     }
 }
 
-class DummyProxyDumper implements ProxyDumper
+class DummyProxyDumper implements DumperInterface
 {
     public function isProxyCandidate(Definition $definition, bool &$asGhostObject = null, string $id = null): bool
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/callable_adapter_consumer.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/callable_adapter_consumer.php
new file mode 100644
index 0000000000000..0a32e23ae9c32
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/callable_adapter_consumer.php
@@ -0,0 +1,57 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class Symfony_DI_PhpDumper_Test_Callable_Adapter_Consumer extends Container
+{
+    protected $parameters = [];
+    protected readonly \WeakReference $ref;
+
+    public function __construct()
+    {
+        $this->ref = \WeakReference::create($this);
+        $this->services = $this->privates = [];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function compile(): void
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled(): bool
+    {
+        return true;
+    }
+
+    public function getRemovedIds(): array
+    {
+        return [
+            'foo' => true,
+        ];
+    }
+
+    /**
+     * Gets the public 'bar' shared autowired service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Dumper\CallableAdapterConsumer
+     */
+    protected static function getBarService($container)
+    {
+        return $container->services['bar'] = new \Symfony\Component\DependencyInjection\Tests\Dumper\CallableAdapterConsumer(new class(fn () => new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo()) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure implements \Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface { public function theMethod() { return $this->service->cloneFoo(...\func_get_args()); } });
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure_proxy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure_proxy.php
new file mode 100644
index 0000000000000..94ca615c4ddd4
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/closure_proxy.php
@@ -0,0 +1,62 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class Symfony_DI_PhpDumper_Test_Closure_Proxy extends Container
+{
+    protected $parameters = [];
+    protected readonly \WeakReference $ref;
+
+    public function __construct()
+    {
+        $this->ref = \WeakReference::create($this);
+        $this->services = $this->privates = [];
+        $this->methodMap = [
+            'closure_proxy' => 'getClosureProxyService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function compile(): void
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled(): bool
+    {
+        return true;
+    }
+
+    public function getRemovedIds(): array
+    {
+        return [
+            'foo' => true,
+        ];
+    }
+
+    protected function createProxy($class, \Closure $factory)
+    {
+        return $factory();
+    }
+
+    /**
+     * Gets the public 'closure_proxy' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface
+     */
+    protected static function getClosureProxyService($container, $lazyLoad = true)
+    {
+        return $container->services['closure_proxy'] = new class(fn () => new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo()) extends \Symfony\Component\DependencyInjection\Argument\LazyClosure implements \Symfony\Component\DependencyInjection\Tests\Compiler\SingleMethodInterface { public function theMethod() { return $this->service->cloneFoo(...\func_get_args()); } };
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/from
10000
_callable.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/from_callable.xml
new file mode 100644
index 0000000000000..418819d8bdb89
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/from_callable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="from_callable" class="stdClass">
+      <from-callable service="bar" method="do" />
+    </service>
+  </services>
+</container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/from_callable.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/from_callable.yml
new file mode 100644
index 0000000000000..2833ade5f3ccb
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/from_callable.yml
@@ -0,0 +1,4 @@
+services:
+    from_callable:
+        class: stdClass
+        from_callable: ['@bar', 'do']
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
index 87683f2f10bf1..f5652a3fd5ba7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -106,6 +106,7 @@ public static function provideConfig()
         yield ['config_builder'];
         yield ['expression_factory'];
         yield ['closure'];
+        yield ['from_callable'];
         yield ['env_param'];
     }
 
@@ -199,6 +200,8 @@ public function testNestedBundleConfigNotAllowed()
 
     public function testWhenEnv()
     {
+        $this->expectNotToPerformAssertions();
+
         $fixtures = realpath(__DIR__.'/../Fixtures');
         $container = new ContainerBuilder();
         $loader = new PhpFileLoader($container, new FileLocator(), 'dev', new ConfigBuilderGenerator(sys_get_temp_dir()));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
index 84acd50972016..1a3e7f0493ddf 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -1193,4 +1193,14 @@ public function testClosure()
         $definition = $container->getDefinition('closure_property')->getProperties()['foo'];
         $this->assertEquals((new Definition('Closure'))->setFactory(['Closure', 'fromCallable'])->addArgument(new Reference('bar')), $definition);
     }
+
+    public function testFromCallable()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('from_callable.xml');
+
+        $definition = $container->getDefinition('from_callable');
+        $this->assertEquals((new Definition('stdClass'))->setFactory(['Closure', 'fromCallable'])->addArgument([new Reference('bar'), 'do'])->setLazy(true), $definition);
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
index 3f5277875194a..d36ad6ae2caa3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -1149,4 +1149,14 @@ public function testClosure()
         $definition = $container->getDefinition('closure_property')->getProperties()['foo'];
         $this->assertEquals((new Definition('Closure'))->setFactory(['Closure', 'fromCallable'])->addArgument(new Reference('bar')), $definition);
     }
+
+    public function testFromCallable()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('from_callable.yml');
+
+        $definition = $container->getDefinition('from_callable');
+        $this->assertEquals((new Definition('stdClass'))->setFactory(['Closure', 'fromCallable'])->addArgument([new Reference('bar'), 'do'])->setLazy(true), $definition);
+    }
 }

From c1fa81d14417aae8236d70b43c681d0d7949d5c6 Mon Sep 17 00:00:00 2001
From: Benjamin Zaslavsky <benjamin.zaslavsky@gmail.com>
Date: Thu, 23 Mar 2023 23:49:21 +0100
Subject: [PATCH 344/475] [DependencyInjection] Add container.excluded tag on
 classes autodiscovered but excluded

---
 .../DependencyInjection/Loader/FileLoader.php | 27 ++++++++++++++-----
 .../Tests/Loader/FileLoaderTest.php           | 12 ++++-----
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
index 62ac252dd7ba4..4bcd897e00950 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -126,6 +126,7 @@ public function registerClasses(Definition $prototype, string $namespace, string
             if (null === $errorMessage && $autoconfigureAttributes) {
                 $r = $this->container->getReflectionClass($class);
                 if ($r->getAttributes(Exclude::class)[0] ?? null) {
+                    $this->addContainerExcludedTag($class, $source);
                     continue;
                 }
                 if ($this->env) {
@@ -137,6 +138,7 @@ public function registerClasses(Definition $prototype, string $namespace, string
                         }
                     }
                     if (null !== $attribute) {
+                        $this->addContainerExcludedTag($class, $source);
                         continue;
                     }
                 }
@@ -291,18 +293,29 @@ private function findClasses(string $namespace, string $pattern, array $excludeP
         }
 
         if (null !== $prefixLen) {
-            $attributes = null !== $source ? ['source' => sprintf('in "%s/%s"', basename(\dirname($source)), basename($source))] : [];
-
             foreach ($excludePaths as $path => $_) {
                 $class = $namespace.ltrim(str_replace('/', '\\', substr($path, $prefixLen, str_ends_with($path, '.php') ? -4 : null)), '\\');
-                if (!$this->container->has($class)) {
-                    $this->container->register($class)
-                        ->setAbstract(true)
-                        ->addTag('container.excluded', $attributes);
-                }
+                $this->addContainerExcludedTag($class, $source);
             }
         }
 
         return $classes;
     }
+
+    private function addContainerExcludedTag(string $class, ?string $source): void
+    {
+        if ($this->container->has($class)) {
+            return;
+        }
+
+        static $attributes = [];
+
+        if (null !== $source && !isset($attributes[$source])) {
+            $attributes[$source] = ['source' => sprintf('in "%s/%s"', basename(\dirname($source)), basename($source))];
+        }
+
+        $this->container->register($class)
+            ->setAbstract(true)
+            ->addTag('container.excluded', null !== $source ? $attributes[$source] : []);
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
index 9e8db2a998e44..b79262e9b9602 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -161,7 +161,7 @@ public function testRegisterClassesWithExcludeAttribute(bool $autoconfigure)
             'Utils/*',
         );
 
-        $this->assertSame(!$autoconfigure, $container->hasDefinition(NotAService::class));
+        $this->assertSame($autoconfigure, $container->getDefinition(NotAService::class)->hasTag('container.excluded'));
     }
 
     public function testRegisterClassesWithExcludeAsArray()
@@ -284,10 +284,10 @@ public static function excludeTrailingSlashConsistencyProvider(): iterable
     }
 
     /**
-     * @testWith ["prod", true]
-     *           ["dev", true]
-     *           ["bar", false]
-     *           [null, true]
+     * @testWith ["prod", false]
+     *           ["dev", false]
+     *           ["bar", true]
+     *           [null, false]
      */
     public function testRegisterClassesWithWhenEnv(?string $env, bool $expected)
     {
@@ -299,7 +299,7 @@ public function testRegisterClassesWithWhenEnv(?string $env, bool $expected)
             'Prototype/{Foo.php}'
         );
 
-        $this->assertSame($expected, $container->has(Foo::class));
+        $this->assertSame($expected, $container->getDefinition(Foo::class)->hasTag('container.excluded'));
     }
 
     /**

From 8dda3f0b77495398ebcccd571f20c8accbbe01fa Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Fri, 10 Mar 2023 21:32:08 +0100
Subject: [PATCH 345/475] [DependencyInjection] Add `constructor` option to
 services declaration and to `#[Autoconfigure]`

---
 .../Attribute/Autoconfigure.php               |  1 +
 .../DependencyInjection/CHANGELOG.md          |  1 +
 .../DependencyInjection/Dumper/XmlDumper.php  | 28 ++++++-----
 .../DependencyInjection/Dumper/YamlDumper.php |  6 ++-
 .../InlineServiceConfigurator.php             |  1 +
 .../Configurator/InstanceofConfigurator.php   |  1 +
 .../Configurator/PrototypeConfigurator.php    |  1 +
 .../Configurator/ServiceConfigurator.php      |  1 +
 .../Configurator/Traits/ConstructorTrait.php  | 27 ++++++++++
 .../Loader/XmlFileLoader.php                  |  9 ++++
 .../Loader/YamlFileLoader.php                 | 12 +++++
 .../schema/dic/services/services-1.0.xsd      |  3 ++
 ...egisterAutoconfigureAttributesPassTest.php | 19 +++++++
 .../Fixtures/AutoconfigureAttributed.php      |  1 +
 .../Tests/Fixtures/Bar.php                    |  8 +++
 .../PrototypeStaticConstructor.php            | 11 ++++
 .../PrototypeStaticConstructorAsArgument.php  | 10 ++++
 .../PrototypeStaticConstructorInterface.php   |  8 +++
 .../StaticConstructorAutoconfigure.php        | 33 ++++++++++++
 .../inline_static_constructor.expected.yml    | 10 ++++
 .../config/inline_static_constructor.php      | 15 ++++++
 ...instanceof_static_constructor.expected.yml | 10 ++++
 .../config/instanceof_static_constructor.php  | 14 ++++++
 .../Tests/Fixtures/config/prototype.php       |  2 +-
 .../Tests/Fixtures/config/prototype_array.php |  2 +-
 .../config/static_constructor.expected.yml    | 10 ++++
 .../Fixtures/config/static_constructor.php    |  9 ++++
 .../Fixtures/includes/autowiring_classes.php  | 17 +++++++
 .../Tests/Fixtures/php/static_constructor.php | 50 +++++++++++++++++++
 .../Tests/Fixtures/xml/services9.xml          | 10 ++--
 .../Tests/Fixtures/xml/services_prototype.xml |  2 +-
 .../Fixtures/xml/services_prototype_array.xml |  1 +
 ...rvices_prototype_array_with_space_node.xml |  1 +
 .../xml/services_prototype_constructor.xml    |  6 +++
 .../Tests/Fixtures/xml/static_constructor.xml |  7 +++
 .../xml/static_constructor_and_factory.xml    |  8 +++
 .../yaml/constructor_with_factory.yml         |  5 ++
 .../Tests/Fixtures/yaml/services9.yml         |  6 +--
 .../Fixtures/yaml/services_prototype.yml      |  2 +-
 .../Fixtures/yaml/static_constructor.yml      |  4 ++
 .../Tests/Loader/FileLoaderTest.php           |  4 +-
 .../Tests/Loader/PhpFileLoaderTest.php        |  3 ++
 .../Tests/Loader/XmlFileLoaderTest.php        | 23 +++++++++
 .../Tests/Loader/YamlFileLoaderTest.php       | 22 ++++++++
 44 files changed, 395 insertions(+), 29 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ConstructorTrait.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/StaticConstructor/PrototypeStaticConstructor.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/StaticConstructor/PrototypeStaticConstructorAsArgument.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/StaticConstructor/PrototypeStaticConstructorInterface.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/StaticConstructorAutoconfigure.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/inline_static_constructor.expected.yml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/inline_static_constructor.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof_static_constructor.expected.yml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof_static_constructor.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/static_constructor.expected.yml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/static_constructor.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/static_constructor.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype_constructor.xml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/static_constructor.xml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/static_constructor_and_factory.xml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/constructor_with_factory.yml
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/static_constructor.yml

diff --git a/src/Symfony/Component/DependencyInjection/Attribute/Autoconfigure.php b/src/Symfony/Component/DependencyInjection/Attribute/Autoconfigure.php
index abab040101532..dec8726ac2087 100644
--- a/src/Symfony/Component/DependencyInjection/Attribute/Autoconfigure.php
+++ b/src/Symfony/Component/DependencyInjection/Attribute/Autoconfigure.php
@@ -29,6 +29,7 @@ public function __construct(
         public ?bool $autowire = null,
         public ?array $properties = null,
         public array|string|null $configurator = null,
+        public string|null $constructor = null,
     ) {
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index b92ec95897b85..b3298479bffc6 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -21,6 +21,7 @@ CHANGELOG
  * Make it possible to cast callables into single-method interfaces
  * Deprecate `#[MapDecorated]`, use `#[AutowireDecorated]` instead
  * Deprecate the `@required` annotation, use the `Symfony\Contracts\Service\Attribute\Required` attribute instead
+ * Add `constructor` option to services declaration and to `#[Autoconfigure]`
 
 6.2
 ---
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
index 101a4fec9e540..74633a4fbbbc5 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -167,20 +167,24 @@ private function addService(Definition $definition, ?string $id, \DOMElement $pa
         $this->addMethodCalls($definition->getMethodCalls(), $service);
 
         if ($callable = $definition->getFactory()) {
-            $factory = $this->document->createElement('factory');
-
-            if (\is_array($callable) && $callable[0] instanceof Definition) {
-                $this->addService($callable[0], null, $factory);
-                $factory->setAttribute('method', $callable[1]);
-            } elseif (\is_array($callable)) {
-                if (null !== $callable[0]) {
-                    $factory->setAttribute($callable[0] instanceof Reference ? 'service' : 'class', $callable[0]);
-                }
-                $factory->setAttribute('method', $callable[1]);
+            if (\is_array($callable) && ['Closure', 'fromCallable'] !== $callable && $definition->getClass() === $callable[0]) {
+                $service->setAttribute('constructor', $callable[1]);
             } else {
-                $factory->setAttribute('function', $callable);
+                $factory = $this->document->createElement('factory');
+
+                if (\is_array($callable) && $callable[0] instanceof Definition) {
+                    $this->addService($callable[0], null, $factory);
+                    $factory->setAttribute('method', $callable[1]);
+                } elseif (\is_array($callable)) {
+                    if (null !== $callable[0]) {
+                        $factory->setAttribute($callable[0] instanceof Reference ? 'service' : 'class', $callable[0]);
+                    }
+                    $factory->setAttribute('method', $callable[1]);
+                } else {
+                    $factory->setAttribute('function', $callable);
+                }
+                $service->appendChild($factory);
             }
-            $service->appendChild($factory);
         }
 
         if ($definition->isDeprecated()) {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
index f0bce187a650c..82789ae7ee52d 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -151,7 +151,11 @@ private function addService(string $id, Definition $definition): string
         }
 
         if ($callable = $definition->getFactory()) {
-            $code .= sprintf("        factory: %s\n", $this->dumper->dump($this->dumpCallable($callable), 0));
+            if (\is_array($callable) && ['Closure', 'fromCallable'] !== $callable && $definition->getClass() === $callable[0]) {
+                $code .= sprintf("        constructor: %s\n", $callable[1]);
+            } else {
+                $code .= sprintf("        factory: %s\n", $this->dumper->dump($this->dumpCallable($callable), 0));
+            }
         }
 
         if ($callable = $definition->getConfigurator()) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php
index 9d3086a1b753d..0b1990e0607e7 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php
@@ -23,6 +23,7 @@ class InlineServiceConfigurator extends AbstractConfigurator
     use Traits\BindTrait;
     use Traits\CallTrait;
     use Traits\ConfiguratorTrait;
+    use Traits\ConstructorTrait;
     use Traits\FactoryTrait;
     use Traits\FileTrait;
     use Traits\LazyTrait;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php
index fc5cfdb4a4251..2db004051e5e2 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php
@@ -22,6 +22,7 @@ class InstanceofConfigurator extends AbstractServiceConfigurator
     use Traits\BindTrait;
     use Traits\CallTrait;
     use Traits\ConfiguratorTrait;
+    use Traits\ConstructorTrait;
     use Traits\LazyTrait;
     use Traits\PropertyTrait;
     use Traits\PublicTrait;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
index 091b609647640..4ab957a85ce30 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
@@ -26,6 +26,7 @@ class PrototypeConfigurator extends AbstractServiceConfigurator
     use Traits\BindTrait;
     use Traits\CallTrait;
     use Traits\ConfiguratorTrait;
+    use Traits\ConstructorTrait;
     use Traits\DeprecateTrait;
     use Traits\FactoryTrait;
     use Traits\LazyTrait;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
index 2312f3b6e6e97..9042ed1d6b494 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
@@ -27,6 +27,7 @@ class ServiceConfigurator extends AbstractServiceConfigurator
     use Traits\CallTrait;
     use Traits\ClassTrait;
     use Traits\ConfiguratorTrait;
+    use Traits\ConstructorTrait;
     use Traits\DecorateTrait;
     use Traits\DeprecateTrait;
     use Traits\FactoryTrait;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ConstructorTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ConstructorTrait.php
new file mode 100644
index 0000000000000..7f16ed589283e
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/ConstructorTrait.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator\Traits;
+
+trait ConstructorTrait
+{
+    /**
+     * Sets a static constructor.
+     *
+     * @return $this
+     */
+    final public function constructor(string $constructor): static
+    {
+        $this->definition->setFactory([null, $constructor]);
+
+        return $this;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 6ddecf5d54ab6..a3265e0bfa6d9 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -24,6 +24,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\DependencyInjection\Reference;
@@ -314,6 +315,14 @@ private function parseDefinition(\DOMElement $service, string $file, Definition
             }
         }
 
+        if ($constructor = $service->getAttribute('constructor')) {
+            if (null !== $definition->getFactory()) {
+                throw new LogicException(sprintf('The "%s" service cannot declare a factory as well as a constructor.', $service->getAttribute('id')));
+            }
+
+            $definition->setFactory([null, $constructor]);
+        }
+
         if ($configurators = $this->getChildren($service, 'configurator')) {
             $configurator = $configurators[0];
             if ($function = $configurator->getAttribute('function')) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 901086413bbb4..61bf6b0f7ef1c 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -23,6 +23,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\DependencyInjection\Reference;
@@ -63,6 +64,7 @@ class YamlFileLoader extends FileLoader
         'autowire' => 'autowire',
         'autoconfigure' => 'autoconfigure',
         'bind' => 'bind',
+        'constructor' => 'constructor',
     ];
 
     private const PROTOTYPE_KEYWORDS = [
@@ -84,6 +86,7 @@ class YamlFileLoader extends FileLoader
         'autowire' => 'autowire',
         'autoconfigure' => 'autoconfigure',
         'bind' => 'bind',
+        'constructor' => 'constructor',
     ];
 
     private const INSTANCEOF_KEYWORDS = [
@@ -96,6 +99,7 @@ class YamlFileLoader extends FileLoader
         'tags' => 'tags',
         'autowire' => 'autowire',
         'bind' => 'bind',
+        'constructor' => 'constructor',
     ];
 
     private const DEFAULTS_KEYWORDS = [
@@ -517,6 +521,14 @@ private function parseDefinition(string $id, array|string|null $service, string
             $definition->setFactory($this->parseCallable($service['factory'], 'factory', $id, $file));
         }
 
+        if (isset($service['constructor'])) {
+            if (null !== $definition->getFactory()) {
+                throw new LogicException(sprintf('The "%s" service cannot declare a factory as well as a constructor.', $id));
+            }
+
+            $definition->setFactory([null, $service['constructor']]);
+        }
+
         if (isset($service['file'])) {
             $definition->setFile($service['file']);
         }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
index 399f93dfbba6d..53c81c54d46f6 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
+++ b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
@@ -169,6 +169,7 @@
     <xsd:attribute name="decoration-priority" type="xsd:integer" />
     <xsd:attribute name="autowire" type="boolean" />
     <xsd:attribute name="autoconfigure" type="boolean" />
+    <xsd:attribute name="constructor" type="xsd:string" />
   </xsd:complexType>
 
   <xsd:complexType name="instanceof">
@@ -185,6 +186,7 @@
     <xsd:attribute name="lazy" type="xsd:string" />
     <xsd:attribute name="autowire" type="boolean" />
     <xsd:attribute name="autoconfigure" type="boolean" />
+    <xsd:attribute name="constructor" type="xsd:string" />
   </xsd:complexType>
 
   <xsd:complexType name="prototype">
@@ -209,6 +211,7 @@
     <xsd:attribute name="parent" type="xsd:string" />
     <xsd:attribute name="autowire" type="boolean" />
     <xsd:attribute name="autoconfigure" type="boolean" />
+    <xsd:attribute name="constructor" type="xsd:string" />
   </xsd:complexType>
 
   <xsd:complexType name="stack">
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterAutoconfigureAttributesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterAutoconfigureAttributesPassTest.php
index deaa2fbac3935..4d1d6ba473797 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterAutoconfigureAttributesPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterAutoconfigureAttributesPassTest.php
@@ -20,6 +20,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\AutoconfigureAttributed;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\AutoconfiguredInterface;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\StaticConstructorAutoconfigure;
 
 class RegisterAutoconfigureAttributesPassTest extends TestCase
 {
@@ -47,6 +48,7 @@ public function testProcess()
             ->addTag('another_tag', ['attr' => 234])
             ->addMethodCall('setBar', [2, 3])
             ->setBindings(['$bar' => $argument])
+            ->setFactory([null, 'create'])
         ;
         $this->assertEquals([AutoconfigureAttributed::class => $expected], $container->getAutoconfiguredInstanceof());
     }
@@ -88,4 +90,21 @@ public function testMissingParent()
 
         $this->addToAssertionCount(1);
     }
+
+    public function testStaticConstructor()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', StaticConstructorAutoconfigure::class)
+            ->setAutoconfigured(true);
+
+        $argument = new BoundArgument('foo', false, BoundArgument::INSTANCEOF_BINDING, realpath(__DIR__.'/../Fixtures/StaticConstructorAutoconfigure.php'));
+
+        (new RegisterAutoconfigureAttributesPass())->process($container);
+
+        $expected = (new ChildDefinition(''))
+            ->setFactory([null, 'create'])
+            ->setBindings(['$foo' => $argument])
+        ;
+        $this->assertEquals([StaticConstructorAutoconfigure::class => $expected], $container->getAutoconfiguredInstanceof());
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AutoconfigureAttributed.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AutoconfigureAttributed.php
index 7761e7134bb22..417f01f104086 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AutoconfigureAttributed.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AutoconfigureAttributed.php
@@ -23,6 +23,7 @@
     bind: [
         '$bar' => 1,
     ],
+    constructor: 'create'
 )]
 class AutoconfigureAttributed
 {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Bar.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Bar.php
index 7e1a30b5ffa07..f99a3f9eb5196 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Bar.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Bar.php
@@ -23,4 +23,12 @@ public function __construct($quz = null, \NonExistent $nonExistent = null, BarIn
     public static function create(\NonExistent $nonExistent = null, $factory = null)
     {
     }
+
+    public function createNonStatic()
+    {
+    }
+
+    private static function createPrivateStatic()
+    {
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/StaticConstructor/PrototypeStaticConstructor.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/StaticConstructor/PrototypeStaticConstructor.php
new file mode 100644
index 0000000000000..87de94cb15068
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/StaticConstructor/PrototypeStaticConstructor.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\StaticConstructor;
+
+class PrototypeStaticConstructor implements PrototypeStaticConstructorInterface
+{
+    public static function create(): static
+    {
+        return new self();
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/StaticConstructor/PrototypeStaticConstructorAsArgument.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/StaticConstructor/PrototypeStaticConstructorAsArgument.php
new file mode 100644
index 0000000000000..a2aaed9cc1f57
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/StaticConstructor/PrototypeStaticConstructorAsArgument.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\StaticConstructor;
+
+class PrototypeStaticConstructorAsArgument
+{
+    public function __construct(private PrototypeStaticConstructor $prototypeStaticConstructor)
+    {
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/StaticConstructor/PrototypeStaticConstructorInterface.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/StaticConstructor/PrototypeStaticConstructorInterface.php
new file mode 100644
index 0000000000000..69161772bcce6
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/StaticConstructor/PrototypeStaticConstructorInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\StaticConstructor;
+
+interface PrototypeStaticConstructorInterface
+{
+    public static function create(): static;
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/StaticConstructorAutoconfigure.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/StaticConstructorAutoconfigure.php
new file mode 100644
index 0000000000000..3d42a8c770952
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/StaticConstructorAutoconfigure.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
+use Symfony\Component\DependencyInjection\Attribute\Factory;
+
+#[Autoconfigure(bind: ['$foo' => 'foo'], constructor: 'create')]
+class StaticConstructorAutoconfigure
+{
+    public function __construct(private readonly string $bar)
+    {
+    }
+
+    public function getBar(): string
+    {
+        return $this->bar;
+    }
+
+    public static function create(string $foo): static
+    {
+        return new self($foo);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/inline_static_constructor.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/inline_static_constructor.expected.yml
new file mode 100644
index 0000000000000..9695af1ff2979
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/inline_static_constructor.expected.yml
@@ -0,0 +1,10 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    foo:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\StaticConstructor\PrototypeStaticConstructorAsArgument
+        public: true
+        arguments: [!service { class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\StaticConstructor\PrototypeStaticConstructor, constructor: create }]
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/inline_static_constructor.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/inline_static_constructor.php
new file mode 100644
index 0000000000000..b3a309e41e318
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/inline_static_constructor.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\StaticConstructor\PrototypeStaticConstructor;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\StaticConstructor\PrototypeStaticConstructorAsArgument;
+
+return function (ContainerConfigurator $c) {
+    $s = $c->services()->defaults()->public();
+    $s->set('foo', PrototypeStaticConstructorAsArgument::class)
+        ->args(
+            [inline_service(PrototypeStaticConstructor::class)
+                ->constructor('create')]
+        );
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof_static_constructor.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof_static_constructor.expected.yml
new file mode 100644
index 0000000000000..0640f86753446
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof_static_constructor.expected.yml
@@ -0,0 +1,10 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    foo:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\StaticConstructor\PrototypeStaticConstructor
+        public: true
+        constructor: create
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof_static_constructor.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof_static_constructor.php
new file mode 100644
index 0000000000000..5623d75709d44
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof_static_constructor.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\StaticConstructor\PrototypeStaticConstructor;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\StaticConstructor\PrototypeStaticConstructorInterface;
+
+return function (ContainerConfigurator $c) {
+    $s = $c->services()->defaults()->public();
+    $s->instanceof(PrototypeStaticConstructorInterface::class)
+        ->constructor('create');
+
+    $s->set('foo', PrototypeStaticConstructor::class);
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php
index 48629a64351fa..c1a6e8998c0fc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.php
@@ -10,7 +10,7 @@
     $di->load(Prototype::class.'\\', '../Prototype')
         ->public()
         ->autoconfigure()
-        ->exclude('../Prototype/{OtherDir,BadClasses,SinglyImplementedInterface}')
+        ->exclude('../Prototype/{OtherDir,BadClasses,SinglyImplementedInterface,StaticConstructor}')
         ->factory('f')
         ->deprecate('vendor/package', '1.1', '%service_id%')
         ->args([0])
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype_array.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype_array.php
index a57365fe50501..cc9d98c4e5d0b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype_array.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype_array.php
@@ -10,7 +10,7 @@
     $di->load(Prototype::class.'\\', '../Prototype')
         ->public()
         ->autoconfigure()
-        ->exclude(['../Prototype/OtherDir', '../Prototype/BadClasses', '../Prototype/SinglyImplementedInterface'])
+        ->exclude(['../Prototype/OtherDir', '../Prototype/BadClasses', '../Prototype/SinglyImplementedInterface', '../Prototype/StaticConstructor'])
         ->factory('f')
         ->deprecate('vendor/package', '1.1', '%service_id%')
         ->args([0])
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/static_constructor.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/static_constructor.expected.yml
new file mode 100644
index 0000000000000..cdb0908398c6a
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/static_constructor.expected.yml
@@ -0,0 +1,10 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    foo:
+        class: Bar\FooClass
+        public: true
+        constructor: getInstance
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/static_constructor.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/static_constructor.php
new file mode 100644
index 0000000000000..6b7b0e952b3a3
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/static_constructor.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return function (ContainerConfigurator $c) {
+    $s = $c->services()->defaults()->public();
+
+    $s->set('foo', 'Bar\FooClass')->constructor('getInstance');
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
index d5f62b9070d31..e76b58eb68c74 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -528,6 +528,23 @@ public function __construct(NotExisting $notExisting)
     }
 }
 
+class StaticConstructor
+{
+    public function __construct(private string $bar)
+    {
+    }
+
+    public function getBar(): string
+    {
+        return $this->bar;
+    }
+
+    public static function create(string $foo): static
+    {
+        return new self($foo);
+    }
+}
+
 class AAndIInterfaceConsumer
 {
     public function __construct(
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/static_constructor.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/static_constructor.php
new file mode 100644
index 0000000000000..a262304550f89
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/static_constructor.php
@@ -0,0 +1,50 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
+/**
+ * @internal This class has been auto-generated by the Symfony Dependency Injection Component.
+ */
+class ProjectServiceContainer extends Container
+{
+    protected $parameters = [];
+    protected readonly \WeakReference $ref;
+
+    public function __construct()
+    {
+        $this->ref = \WeakReference::create($this);
+        $this->services = $this->privates = [];
+        $this->methodMap = [
+            'static_constructor' => 'getStaticConstructorService',
+        ];
+
+        $this->aliases = [];
+    }
+
+    public function compile(): void
+    {
+        throw new LogicException('You cannot compile a dumped container that was already compiled.');
+    }
+
+    public function isCompiled(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Gets the public 'static_constructor' shared service.
+     *
+     * @return \Symfony\Component\DependencyInjection\Tests\Compiler\A
+     */
+    protected static function getStaticConstructorService($container)
+    {
+        return $container->services['static_constructor'] = \Symfony\Component\DependencyInjection\Tests\Compiler\A::create('foo');
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
index 24f025f523f7d..9b2462d076068 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services9.xml
@@ -7,7 +7,7 @@
   </parameters>
   <services>
     <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
-    <service id="foo" class="Bar\FooClass" public="true">
+    <service id="foo" class="Bar\FooClass" public="true" constructor="getInstance">
       <tag name="foo" foo="foo"/>
       <tag name="foo" bar="bar" baz="baz"/>
       <tag name="bar" baz="baz">foo</tag>
@@ -30,11 +30,9 @@
         <argument type="service" id="bar"/>
       </call>
       <call method="initialize"/>
-      <factory class="Bar\FooClass" method="getInstance"/>
       <configurator function="sc_configure"/>
     </service>
-    <service id="foo.baz" class="%baz_class%" public="true">
-      <factory class="%baz_class%" method="getInstance"/>
+    <service id="foo.baz" class="%baz_class%" public="true" constructor="getInstance">
       <configurator class="%baz_class%" method="configureStatic1"/>
     </service>
     <service id="bar" class="Bar\FooClass" public="true">
@@ -111,9 +109,7 @@
       <property name="foo">bar</property>
       <factory service="new_factory" method="getInstance"/>
     </service>
-    <service id="service_from_static_method" class="Bar\FooClass" public="true">
-      <factory class="Bar\FooClass" method="getInstance"/>
-    </service>
+    <service id="service_from_static_method" class="Bar\FooClass" public="true" constructor="getInstance"/>
     <service id="factory_simple" class="SimpleFactoryClass">
       <argument>foo</argument>
       <deprecated package="vendor/package" version="1.1">The "%service_id%" service is deprecated. You should stop using it, as it will be removed in the future.</deprecated>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype.xml
index 1aa28bf341f27..2b08ef7844593 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
   <services>
-      <prototype namespace="Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\" resource="../Prototype/*" exclude="../Prototype/{OtherDir,BadClasses,SinglyImplementedInterface}" />
+      <prototype namespace="Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\" resource="../Prototype/*" exclude="../Prototype/{OtherDir,BadClasses,SinglyImplementedInterface,StaticConstructor}" />
   </services>
 </container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype_array.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype_array.xml
index b24b3af5777aa..463ffdffc34c3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype_array.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype_array.xml
@@ -5,6 +5,7 @@
           <exclude>../Prototype/OtherDir</exclude>
           <exclude>../Prototype/BadClasses</exclude>
           <exclude>../Prototype/SinglyImplementedInterface</exclude>
+          <exclude>../Prototype/StaticConstructor</exclude>
       </prototype>
   </services>
 </container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype_array_with_space_node.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype_array_with_space_node.xml
index 3059ea958dfc1..6f6727b8a4a00 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype_array_with_space_node.xml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype_array_with_space_node.xml
@@ -5,6 +5,7 @@
           <exclude>../Prototype/OtherDir</exclude>
           <exclude>../Prototype/BadClasses</exclude>
           <exclude>../Prototype/SinglyImplementedInterface</exclude>
+          <exclude>../Prototype/StaticConstructor</exclude>
           <exclude> </exclude>
       </prototype>
   </services>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype_constructor.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype_constructor.xml
new file mode 100644
index 0000000000000..2b08ef7844593
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_prototype_constructor.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+      <prototype namespace="Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\" resource="../Prototype/*" exclude="../Prototype/{OtherDir,BadClasses,SinglyImplementedInterface,StaticConstructor}" />
+  </services>
+</container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/static_constructor.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/static_constructor.xml
new file mode 100644
index 0000000000000..9ead589ed478c
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/static_constructor.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="static_constructor" class="stdClass" constructor="create">
+    </service>
+  </services>
+</container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/static_constructor_and_factory.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/static_constructor_and_factory.xml
new file mode 100644
index 0000000000000..3872eb725c9ab
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/static_constructor_and_factory.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="static_constructor" class="stdClass" constructor="create">
+      <factory method="create"/>
+    </service>
+  </services>
+</container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/constructor_with_factory.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/constructor_with_factory.yml
new file mode 100644
index 0000000000000..49fc692afd9cd
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/constructor_with_factory.yml
@@ -0,0 +1,5 @@
+services:
+    invalid_service:
+        class: FooBarClass
+        factory: 'create'
+        constructor: 'create'
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
index 8fa97f4f685ab..22a6d5549557e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
@@ -21,12 +21,12 @@ services:
             - [setBar, ['@bar']]
             - [initialize, {  }]
 
-        factory: [Bar\FooClass, getInstance]
+        constructor: getInstance
         configurator: sc_configure
         public: true
     foo.baz:
         class: '%baz_class%'
-        factory: ['%baz_class%', getInstance]
+        constructor: getInstance
         configurator: ['%baz_class%', configureStatic1]
         public: true
     bar:
@@ -121,7 +121,7 @@ services:
         public: true
     service_from_static_method:
         class: Bar\FooClass
-        factory: [Bar\FooClass, getInstance]
+        constructor: getInstance
         public: true
     factory_simple:
         class: SimpleFactoryClass
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_prototype.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_prototype.yml
index 43f8d51e04246..8b890c11f4311 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_prototype.yml
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_prototype.yml
@@ -1,4 +1,4 @@
 services:
     Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\:
         resource: ../Prototype
-        exclude: '../Prototype/{OtherDir,BadClasses,SinglyImplementedInterface}'
+        exclude: '../Prototype/{OtherDir,BadClasses,SinglyImplementedInterface,StaticConstructor}'
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/static_constructor.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/static_constructor.yml
new file mode 100644
index 0000000000000..d992c379bc78a
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/static_constructor.yml
@@ -0,0 +1,4 @@
+services:
+    static_constructor:
+        class: stdClass
+        constructor: 'create'
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
index b79262e9b9602..dbfb3daf7bf27 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -123,7 +123,7 @@ public function testRegisterClassesWithExclude()
             'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\',
             'Prototype/*',
             // load everything, except OtherDir/AnotherSub & Foo.php
-            'Prototype/{%other_dir%/AnotherSub,Foo.php}'
+            'Prototype/{%other_dir%/AnotherSub,Foo.php,StaticConstructor}'
         );
 
         $this->assertFalse($container->getDefinition(Bar::class)->isAbstract());
@@ -191,7 +191,7 @@ public function testNestedRegisterClasses()
         $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
 
         $prototype = (new Definition())->setAutoconfigured(true);
-        $loader->registerClasses($prototype, 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\', 'Prototype/*');
+        $loader->registerClasses($prototype, 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\', 'Prototype/*', 'Prototype/{StaticConstructor}');
 
         $this->assertTrue($container->has(Bar::class));
         $this->assertTrue($container->has(Baz::class));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
index f5652a3fd5ba7..7b24f5e2248e6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -105,6 +105,9 @@ public static function provideConfig()
         yield ['remove'];
         yield ['config_builder'];
         yield ['expression_factory'];
+        yield ['static_constructor'];
+        yield ['inline_static_constructor'];
+        yield ['instanceof_static_constructor'];
         yield ['closure'];
         yield ['from_callable'];
         yield ['env_param'];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
index 1a3e7f0493ddf..71b53dd39e21e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -32,6 +32,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
@@ -785,6 +786,7 @@ public function testPrototype()
                 str_replace(\DIRECTORY_SEPARATOR, '/', $prototypeRealPath.\DIRECTORY_SEPARATOR.'OtherDir') => true,
                 str_replace(\DIRECTORY_SEPARATOR, '/', $prototypeRealPath.\DIRECTORY_SEPARATOR.'BadClasses') => true,
                 str_replace(\DIRECTORY_SEPARATOR, '/', $prototypeRealPath.\DIRECTORY_SEPARATOR.'SinglyImplementedInterface') => true,
+                str_replace(\DIRECTORY_SEPARATOR, '/', $prototypeRealPath.\DIRECTORY_SEPARATOR.'StaticConstructor') => true,
             ]
         );
         $this->assertContains((string) $globResource, $resources);
@@ -820,6 +822,7 @@ public function testPrototypeExcludeWithArray(string $fileName)
                 str_replace(\DIRECTORY_SEPARATOR, '/', $prototypeRealPath.\DIRECTORY_SEPARATOR.'BadClasses') => true,
                 str_replace(\DIRECTORY_SEPARATOR, '/', $prototypeRealPath.\DIRECTORY_SEPARATOR.'OtherDir') => true,
                 str_replace(\DIRECTORY_SEPARATOR, '/', $prototypeRealPath.\DIRECTORY_SEPARATOR.'SinglyImplementedInterface') => true,
+                str_replace(\DIRECTORY_SEPARATOR, '/', $prototypeRealPath.\DIRECTORY_SEPARATOR.'StaticConstructor') => true,
             ]
         );
         $this->assertContains((string) $globResource, $resources);
@@ -1203,4 +1206,24 @@ public function testFromCallable()
         $definition = $container->getDefinition('from_callable');
         $this->assertEquals((new Definition('stdClass'))->setFactory(['Closure', 'fromCallable'])->addArgument([new Reference('bar'), 'do'])->setLazy(true), $definition);
     }
+
+    public function testStaticConstructor()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('static_constructor.xml');
+
+        $definition = $container->getDefinition('static_constructor');
+        $this->assertEquals((new Definition('stdClass'))->setFactory([null, 'create']), $definition);
+    }
+
+    public function testStaticConstructorWithFactoryThrows()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('The "static_constructor" service cannot declare a factory as well as a constructor.');
+        $loader->load('static_constructor_and_factory.xml');
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
index d36ad6ae2caa3..713e89a8db48f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -29,6 +29,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
@@ -312,6 +313,16 @@ public function testFactorySyntaxError()
         $loader->load('bad_factory_syntax.yml');
     }
 
+    public function testStaticConstructorWithFactory()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('The "invalid_service" service cannot declare a factory as well as a constructor.');
+        $loader->load('constructor_with_factory.yml');
+    }
+
     public function testExtensions()
     {
         $container = new ContainerBuilder();
@@ -545,6 +556,7 @@ public function testPrototype()
                 str_replace(\DIRECTORY_SEPARATOR, '/', $prototypeRealPath.\DIRECTORY_SEPARATOR.'BadClasses') => true,
                 str_replace(\DIRECTORY_SEPARATOR, '/', $prototypeRealPath.\DIRECTORY_SEPARATOR.'OtherDir') => true,
                 str_replace(\DIRECTORY_SEPARATOR, '/', $prototypeRealPath.\DIRECTORY_SEPARATOR.'SinglyImplementedInterface') => true,
+                str_replace(\DIRECTORY_SEPARATOR, '/', $prototypeRealPath.\DIRECTORY_SEPARATOR.'StaticConstructor') => true,
             ]
         );
         $this->assertContains((string) $globResource, $resources);
@@ -1159,4 +1171,14 @@ public function testFromCallable()
         $definition = $container->getDefinition('from_callable');
         $this->assertEquals((new Definition('stdClass'))->setFactory(['Closure', 'fromCallable'])->addArgument([new Reference('bar'), 'do'])->setLazy(true), $definition);
     }
+
+    public function testStaticConstructor()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('static_constructor.yml');
+
+        $definition = $container->getDefinition('static_constructor');
+        $this->assertEquals((new Definition('stdClass'))->setFactory([null, 'create']), $definition);
+    }
 }

From f4398a14520a238e0d11cb6ad9b5078945e97829 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 28 Mar 2023 16:11:52 +0200
Subject: [PATCH 346/475] [Cache] Fix DBAL deprecations and stop using NUL
 chars in tags prefix

---
 .../ChoiceList/ORMQueryBuilderLoaderTest.php  | 15 +++---
 .../Cache/Adapter/AbstractTagAwareAdapter.php |  2 +-
 .../Cache/Adapter/DoctrineDbalAdapter.php     | 50 +++++++++++--------
 .../Cache/Adapter/TagAwareAdapter.php         |  2 +-
 4 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
index 5ae38eba3824b..c1cef742e3d28 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Tests\Form\ChoiceList;
 
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Types\GuidType;
@@ -19,6 +20,8 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
 use Symfony\Bridge\Doctrine\Tests\DoctrineTestHelper;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity;
 use Symfony\Bridge\Doctrine\Types\UlidType;
 use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Form\Exception\TransformationFailedException;
@@ -35,12 +38,12 @@ protected function tearDown(): void
 
     public function testIdentifierTypeIsStringArray()
     {
-        $this->checkIdentifierType('Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity', Connection::PARAM_STR_ARRAY);
+        $this->checkIdentifierType(SingleStringIdEntity::class, class_exists(ArrayParameterType::class) ? ArrayParameterType::STRING : Connection::PARAM_STR_ARRAY);
     }
 
     public function testIdentifierTypeIsIntegerArray()
     {
-        $this->checkIdentifierType('Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity', Connection::PARAM_INT_ARRAY);
+        $this->checkIdentifierType(SingleIntIdEntity::class, class_exists(ArrayParameterType::class) ? ArrayParameterType::INTEGER : Connection::PARAM_INT_ARRAY);
     }
 
     protected function checkIdentifierType($classname, $expectedType)
@@ -90,7 +93,7 @@ public function testFilterNonIntegerValues()
 
         $query->expects($this->once())
             ->method('setParameter')
-            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', [1, 2, 3, '9223372036854775808'], Connection::PARAM_INT_ARRAY)
+            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', [1, 2, 3, '9223372036854775808'], class_exists(ArrayParameterType::class) ? ArrayParameterType::INTEGER : Connection::PARAM_INT_ARRAY)
             ->willReturn($query);
 
         $qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
@@ -126,7 +129,7 @@ public function testFilterEmptyUuids($entityClass)
 
         $quer
10000
y->expects($this->once())
             ->method('setParameter')
-            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', ['71c5fd46-3f16-4abb-bad7-90ac1e654a2d', 'b98e8e11-2897-44df-ad24-d2627eb7f499'], Connection::PARAM_STR_ARRAY)
+            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', ['71c5fd46-3f16-4abb-bad7-90ac1e654a2d', 'b98e8e11-2897-44df-ad24-d2627eb7f499'], class_exists(ArrayParameterType::class) ? ArrayParameterType::STRING : Connection::PARAM_STR_ARRAY)
             ->willReturn($query);
 
         $qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
@@ -171,7 +174,7 @@ public function testFilterUid($entityClass)
 
         $query->expects($this->once())
             ->method('setParameter')
-            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', [Uuid::fromString('71c5fd46-3f16-4abb-bad7-90ac1e654a2d')->toBinary(), Uuid::fromString('b98e8e11-2897-44df-ad24-d2627eb7f499')->toBinary()], Connection::PARAM_STR_ARRAY)
+            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id', [Uuid::fromString('71c5fd46-3f16-4abb-bad7-90ac1e654a2d')->toBinary(), Uuid::fromString('b98e8e11-2897-44df-ad24-d2627eb7f499')->toBinary()], class_exists(ArrayParameterType::class) ? ArrayParameterType::STRING : Connection::PARAM_STR_ARRAY)
             ->willReturn($query);
 
         $qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
@@ -239,7 +242,7 @@ public function testEmbeddedIdentifierName()
 
         $query->expects($this->once())
             ->method('setParameter')
-            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id_value', [1, 2, 3], Connection::PARAM_INT_ARRAY)
+            ->with('ORMQueryBuilderLoader_getEntitiesByIds_id_value', [1, 2, 3], class_exists(ArrayParameterType::class) ? ArrayParameterType::INTEGER : Connection::PARAM_INT_ARRAY)
             ->willReturn($query);
 
         $qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
index f5cea93caa033..ef62b4fb21c7f 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
@@ -35,7 +35,7 @@ abstract class AbstractTagAwareAdapter implements TagAwareAdapterInterface, TagA
     use AbstractAdapterTrait;
     use ContractsTrait;
 
-    private const TAGS_PREFIX = "\0tags\0";
+    private const TAGS_PREFIX = "\1tags\1";
 
     protected function __construct(string $namespace = '', int $defaultLifetime = 0)
     {
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
index 45097c24693d8..bf7545457f502 100644
--- a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
 use Doctrine\DBAL\DriverManager;
@@ -147,7 +148,7 @@ protected function doFetch(array $ids): iterable
             $ids,
         ], [
             ParameterType::INTEGER,
-            Connection::PARAM_STR_ARRAY,
+            class_exists(ArrayParameterType::class) ? ArrayParameterType::STRING : Connection::PARAM_STR_ARRAY,
         ])->iterateNumeric();
 
         foreach ($result as $row) {
@@ -165,7 +166,7 @@ protected function doFetch(array $ids): iterable
                 $expired,
             ], [
                 ParameterType::INTEGER,
-                Connection::PARAM_STR_ARRAY,
+                class_exists(ArrayParameterType::class) ? ArrayParameterType::STRING : Connection::PARAM_STR_ARRAY,
             ]);
         }
     }
@@ -208,7 +209,7 @@ protected function doDelete(array $ids): bool
     {
         $sql = "DELETE FROM $this->table WHERE $this->idCol IN (?)";
         try {
-            $this->conn->executeStatement($sql, [array_values($ids)], [Connection::PARAM_STR_ARRAY]);
+            $this->conn->executeStatement($sql, [array_values($ids)], [class_exists(ArrayParameterType::class) ? ArrayParameterType::STRING : Connection::PARAM_STR_ARRAY]);
         } catch (TableNotFoundException) {
         }
 
@@ -264,35 +265,42 @@ protected function doSave(array $values, int $lifetime): array|bool
             $stmt = $this->conn->prepare($sql);
         }
 
-        // $id and $data are defined later in the loop. Binding is done by reference, values are read on execution.
         if ('sqlsrv' === $platformName || 'oci' === $platformName) {
-            $stmt->bindParam(1, $id);
-            $stmt->bindParam(2, $id);
-            $stmt->bindParam(3, $data, ParameterType::LARGE_OBJECT);
+            $bind = static function ($id, $data) use ($stmt) {
+                $stmt->bindValue(1, $id);
+                $stmt->bindValue(2, $id);
+                $stmt->bindValue(3, $data, ParameterType::LARGE_OBJECT);
+                $stmt->bindValue(6, $data, ParameterType::LARGE_OBJECT);
+            };
             $stmt->bindValue(4, $lifetime, ParameterType::INTEGER);
             $stmt->bindValue(5, $now, ParameterType::INTEGER);
-            $stmt->bindParam(6, $data, ParameterType::LARGE_OBJECT);
             $stmt->bindValue(7, $lifetime, ParameterType::INTEGER);
             $stmt->bindValue(8, $now, ParameterType::INTEGER);
         } elseif (null !== $platformName) {
-            $stmt->bindParam(1, $id);
-            $stmt->bindParam(2, $data, ParameterType::LARGE_OBJECT);
+            $bind = static function ($id, $data) use ($stmt) {
+                $stmt->bindValue(1, $id);
+                $stmt->bindValue(2, $data, ParameterType::LARGE_OBJECT);
+            };
             $stmt->bindValue(3, $lifetime, ParameterType::INTEGER);
             $stmt->bindValue(4, $now, ParameterType::INTEGER);
         } else {
-            $stmt->bindParam(1, $data, ParameterType::LARGE_OBJECT);
             $stmt->bindValue(2, $lifetime, ParameterType::INTEGER);
             $stmt->bindValue(3, $now, ParameterType::INTEGER);
-            $stmt->bindParam(4, $id);
 
             $insertStmt = $this->conn->prepare($insertSql);
-            $insertStmt->bindParam(1, $id);
-            $insertStmt->bindParam(2, $data, ParameterType::LARGE_OBJECT);
             $insertStmt->bindValue(3, $lifetime, ParameterType::INTEGER);
             $insertStmt->bindValue(4, $now, ParameterType::INTEGER);
+
+            $bind = static function ($id, $data) use ($stmt, $insertStmt) {
+                $stmt->bindValue(1, $data, ParameterType::LARGE_OBJECT);
+                $stmt->bindValue(4, $id);
+                $insertStmt->bindValue(1, $id);
+                $insertStmt->bindValue(2, $data, ParameterType::LARGE_OBJECT);
+            };
         }
 
         foreach ($values as $id => $data) {
+            $bind($id, $data);
             try {
                 $rowCount = $stmt->executeStatement();
             } catch (TableNotFoundException) {
@@ -321,16 +329,16 @@ private function getPlatformName(): string
 
         $platform = $this->conn->getDatabasePlatform();
 
-        return match (true) {
+        return $this->platformName = match (true) {
             $platform instanceof \Doctrine\DBAL\Platforms\MySQLPlatform,
-            $platform instanceof \Doctrine\DBAL\Platforms\MySQL57Platform => $this->platformName = 'mysql',
-            $platform instanceof \Doctrine\DBAL\Platforms\SqlitePlatform => $this->platformName = 'sqlite',
+            $platform instanceof \Doctrine\DBAL\Platforms\MySQL57Platform => 'mysql',
+            $platform instanceof \Doctrine\DBAL\Platforms\SqlitePlatform => 'sqlite',
             $platform instanceof \Doctrine\DBAL\Platforms\PostgreSQLPlatform,
-            $platform instanceof \Doctrine\DBAL\Platforms\PostgreSQL94Platform => $this->platformName = 'pgsql',
-            $platform instanceof \Doctrine\DBAL\Platforms\OraclePlatform => $this->platformName = 'oci',
+            $platform instanceof \Doctrine\DBAL\Platforms\PostgreSQL94Platform => 'pgsql',
+            $platform instanceof \Doctrine\DBAL\Platforms\OraclePlatform => 'oci',
             $platform instanceof \Doctrine\DBAL\Platforms\SQLServerPlatform,
-            $platform instanceof \Doctrine\DBAL\Platforms\SQLServer2012Platform => $this->platformName = 'sqlsrv',
-            default => $this->platformName = $platform::class,
+            $platform instanceof \Doctrine\DBAL\Platforms\SQLServer2012Platform => 'sqlsrv',
+            default => $platform::class,
         };
     }
 
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
index 7525632e91a13..f64ac99c11b4c 100644
--- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -38,7 +38,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
     use ContractsTrait;
     use LoggerAwareTrait;
 
-    public const TAGS_PREFIX = "\0tags\0";
+    public const TAGS_PREFIX = "\1tags\1";
 
     private array $deferred = [];
     private AdapterInterface $pool;

From 5dbd80081c6b8f66da8de1b16c9e9bfe2e9e3514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Tue, 28 Mar 2023 19:27:02 +0200
Subject: [PATCH 347/475] [VarDumper] Add Caster::PATTERN_PRIVATE to help
 builing key

---
 src/Symfony/Component/VarDumper/Caster/Caster.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Component/VarDumper/Caster/Caster.php b/src/Symfony/Component/VarDumper/Caster/Caster.php
index b6a84fcbe6984..32c69ee04dc43 100644
--- a/src/Symfony/Component/VarDumper/Caster/Caster.php
+++ b/src/Symfony/Component/VarDumper/Caster/Caster.php
@@ -36,6 +36,8 @@ class Caster
     public const PREFIX_VIRTUAL = "\0~\0";
     public const PREFIX_DYNAMIC = "\0+\0";
     public const PREFIX_PROTECTED = "\0*\0";
+    // usage: sprintf(Caster::PATTERN_PRIVATE, $class, $property)
+    public const PATTERN_PRIVATE = "\0%s\0%s";
 
     /**
      * Casts objects to arrays and adds the dynamic property prefix.

From 347b51ab8e4b4ad6c7a7d0fecadcc2a1a1d076fd Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 28 Mar 2023 19:29:22 +0200
Subject: [PATCH 348/475] [Form] fix missing static closure

---
 src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
index 2dfc497d3d848..2af19b0bf86b9 100644
--- a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
+++ b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
@@ -64,7 +64,7 @@ public function __construct(iterable $choices, callable $value = null)
         }
 
         if (null === $value && $this->castableToString($choices)) {
-            $value = fn ($choice) => false === $choice ? '0' : (string) $choice;
+            $value = static fn ($choice) => false === $choice ? '0' : (string) $choice;
         }
 
         if (null !== $value) {
@@ -72,7 +72,7 @@ public function __construct(iterable $choices, callable $value = null)
             $this->valueCallback = $value;
         } else {
             // Otherwise generate incrementing integers as values
-            $value = function () {
+            $value = static function () {
                 static $i = 0;
 
                 return $i++;

From cdbf939210e7ebd67766fa920d43be5155f24a50 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Fri, 24 Mar 2023 17:30:36 +0100
Subject: [PATCH 349/475] [HttpClient] Add ServerSentEvent::getArrayData() to
 get the SSE's data decoded as an array directly

---
 src/Symfony/Component/HttpClient/CHANGELOG.md |  1 +
 .../HttpClient/Chunk/ServerSentEvent.php      | 28 +++++++++++++
 .../Tests/Chunk/ServerSentEventTest.php       | 42 +++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
index 2523499e752c9..51683c591745b 100644
--- a/src/Symfony/Component/HttpClient/CHANGELOG.md
+++ b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add `UriTemplateHttpClient` to use URI templates as specified in the RFC 6570
+ * Add `ServerSentEvent::getArrayData()` to get the Server-Sent Event's data decoded as an array when it's a JSON payload
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpClient/Chunk/ServerSentEvent.php b/src/Symfony/Component/HttpClient/Chunk/ServerSentEvent.php
index 296918e6aff73..7231506184451 100644
--- a/src/Symfony/Component/HttpClient/Chunk/ServerSentEvent.php
+++ b/src/Symfony/Component/HttpClient/Chunk/ServerSentEvent.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpClient\Chunk;
 
+use Symfony\Component\HttpClient\Exception\JsonException;
 use Symfony\Contracts\HttpClient\ChunkInterface;
 
 /**
@@ -23,6 +24,7 @@ final class ServerSentEvent extends DataChunk implements ChunkInterface
     private string $id = '';
     private string $type = 'message';
     private float $retry = 0;
+    private ?array $jsonData = null;
 
     public function __construct(string $content)
     {
@@ -76,4 +78,30 @@ public function getRetry(): float
     {
         return $this->retry;
     }
+
+    /**
+     * Gets the SSE data decoded as an array when it's a JSON payload.
+     */
+    public function getArrayData(): array
+    {
+        if (null !== $this->jsonData) {
+            return $this->jsonData;
+        }
+
+        if ('' === $this->data) {
+            throw new JsonException(sprintf('Server-Sent Event%s data is empty.', '' !== $this->id ? sprintf(' "%s"', $this->id) : ''));
+        }
+
+        try {
+            $jsonData = json_decode($this->data, true, 512, \JSON_BIGINT_AS_STRING | \JSON_THROW_ON_ERROR);
+        } catch (\JsonException $e) {
+            throw new JsonException(sprintf('Decoding Server-Sent Event%s failed: ', '' !== $this->id ? sprintf(' "%s"', $this->id) : '').$e->getMessage(), $e->getCode());
+        }
+
+        if (!\is_array($jsonData)) {
+            throw new JsonException(sprintf('JSON content was expected to decode to an array, "%s" returned in Server-Sent Event%s.', get_debug_type($jsonData), '' !== $this->id ? sprintf(' "%s"', $this->id) : ''));
+        }
+
+        return $this->jsonData = $jsonData;
+    }
 }
diff --git a/src/Symfony/Component/HttpClient/Tests/Chunk/ServerSentEventTest.php b/src/Symfony/Component/HttpClient/Tests/Chunk/ServerSentEventTest.php
index 1c0d6834a7272..595dd3342afa1 100644
--- a/src/Symfony/Component/HttpClient/Tests/Chunk/ServerSentEventTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/Chunk/ServerSentEventTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpClient\Chunk\ServerSentEvent;
+use Symfony\Component\HttpClient\Exception\JsonException;
 
 /**
  * @author Antoine Bluchet <soyuka@gmail.com>
@@ -76,4 +77,45 @@ public function testParseNewLine()
         $sse = new ServerSentEvent($rawData);
         $this->assertSame("<tag>\n\n  <foo />\n\n\n</tag>", $sse->getData());
     }
+
+    public function testGetArrayData()
+    {
+        $this->assertSame(['foo' => 'bar'], (new ServerSentEvent(<<<STR
+id: 33
+data: {"foo": "bar"}
+STR
+        ))->getArrayData());
+    }
+
+    public function testGetArrayDataWithNoContent()
+    {
+        $this->expectException(JsonException::class);
+        $this->expectExceptionMessage('Server-Sent Event data is empty.');
+
+        (new ServerSentEvent(''))->getArrayData();
+    }
+
+    public function testGetArrayDataWithInvalidJson()
+    {
+        $this->expectException(JsonException::class);
+        $this->expectExceptionMessage('Decoding Server-Sent Event "33" failed: Syntax error');
+
+        (new ServerSentEvent(<<<STR
+id: 33
+data: foobarccc
+STR
+        ))->getArrayData();
+    }
+
+    public function testGetArrayDataWithNonArrayJson()
+    {
+        $this->expectException(JsonException::class);
+        $this->expectExceptionMessage('JSON content was expected to decode to an array, "string" returned in Server-Sent Event "33".');
+
+        (new ServerSentEvent(<<<STR
+id: 33
+data: "ccc"
+STR
+        ))->getArrayData();
+    }
 }

From 83962102382ed4637b1c9465c9007c094581f894 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Sat, 25 Mar 2023 07:59:42 -0400
Subject: [PATCH 350/475] [Scheduler] `debug:schedule` refinements

---
 .../Scheduler/Command/DebugCommand.php        | 20 +++++++++++++++++--
 .../Trigger/CronExpressionTrigger.php         |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Scheduler/Command/DebugCommand.php b/src/Symfony/Component/Scheduler/Command/DebugCommand.php
index f6c19939a574f..195d4baee9c39 100644
--- a/src/Symfony/Component/Scheduler/Command/DebugCommand.php
+++ b/src/Symfony/Component/Scheduler/Command/DebugCommand.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Scheduler\RecurringMessage;
 use Symfony\Component\Scheduler\ScheduleProviderInterface;
 use Symfony\Contracts\Service\ServiceProviderInterface;
@@ -98,9 +99,24 @@ private static function renderRecurringMessage(RecurringMessage $recurringMessag
         $message = $recurringMessage->getMessage();
         $trigger = $recurringMessage->getTrigger();
 
+        if ($message instanceof Envelope) {
+            $message = $message->getMessage();
+        }
+
+        $messageName = (new \ReflectionClass($message))->getShortName();
+        $triggerName = (new \ReflectionClass($trigger))->getShortName();
+
+        if ($message instanceof \Stringable) {
+            $messageName .= ": {$message}";
+        }
+
+        if ($trigger instanceof \Stringable) {
+            $triggerName .= ": {$trigger}";
+        }
+
         return [
-            $message instanceof \Stringable ? (string) $message : (new \ReflectionClass($message))->getShortName(),
-            $trigger instanceof \Stringable ? (string) $trigger : (new \ReflectionClass($trigger))->getShortName(),
+            $messageName,
+            $triggerName,
             $recurringMessage->getTrigger()->getNextRunDate(now())->format(\DateTimeInterface::ATOM),
         ];
     }
diff --git a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
index 5d9dba6d8f5b8..3a53bbc2c1a43 100644
--- a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
@@ -30,7 +30,7 @@ public function __construct(
 
     public function __toString(): string
     {
-        return "cron: {$this->expression->getExpression()}";
+        return $this->expression->getExpression();
     }
 
     public static function fromSpec(string $expression = '* * * * *'): self

From f2d9af6f9449de037ac4db1cf404133c1774e71c Mon Sep 17 00:00:00 2001
From: gnito-org <70450336+gnito-org@users.noreply.github.com>
Date: Mon, 5 Dec 2022 13:56:51 -0400
Subject: [PATCH 351/475] [Notifier] Add SimpleTextin bridge

---
 .../FrameworkExtension.php                    |   2 +
 .../Resources/config/notifier_transports.php  |   5 +
 .../Bridge/SimpleTextin/.gitattributes        |   4 +
 .../Notifier/Bridge/SimpleTextin/.gitignore   |   3 +
 .../Notifier/Bridge/SimpleTextin/CHANGELOG.md |   7 ++
 .../Notifier/Bridge/SimpleTextin/LICENSE      |  19 +++
 .../Notifier/Bridge/SimpleTextin/README.md    |  24 ++++
 .../SimpleTextin/SimpleTextinOptions.php      |  59 ++++++++++
 .../SimpleTextin/SimpleTextinTransport.php    | 108 +++++++++++++++++
 .../SimpleTextinTransportFactory.php          |  45 ++++++++
 .../Tests/SimpleTextinOptionsTest.php         |  25 ++++
 .../SimpleTextinTransportFactoryTest.php      |  45 ++++++++
 .../Tests/SimpleTextinTransportTest.php       | 109 ++++++++++++++++++
 .../Bridge/SimpleTextin/composer.json         |  36 ++++++
 .../Bridge/SimpleTextin/phpunit.xml.dist      |  31 +++++
 .../Exception/UnsupportedSchemeException.php  |   4 +
 .../UnsupportedSchemeExceptionTest.php        |   3 +
 src/Symfony/Component/Notifier/Transport.php  |   2 +
 18 files changed, 531 insertions(+)
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/.gitattributes
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/.gitignore
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/CHANGELOG.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/LICENSE
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/README.md
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/SimpleTextinOptions.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/SimpleTextinTransport.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/SimpleTextinTransportFactory.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinOptionsTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportFactoryTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportTest.php
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/composer.json
 create mode 100644 src/Symfony/Component/Notifier/Bridge/SimpleTextin/phpunit.xml.dist

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index bd5dc7f66a202..d7984f281d847 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -176,6 +176,7 @@
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory as SendinblueNotifierTransportFactory;
+use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sinch\SinchTransportFactory;
 use Symfony\Component\Notifier\Bridge\Slack\SlackTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sms77\Sms77TransportFactory;
@@ -2719,6 +2720,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             RingCentralTransportFactory::class => 'notifier.transport_factory.ring-central',
             RocketChatTransportFactory::class => 'notifier.transport_factory.rocket-chat',
             SendberryTransportFactory::class => 'notifier.transport_factory.sendberry',
+            SimpleTextinTransportFactory::class => 'notifier.transport_factory.simple-textin',
             SendinblueNotifierTransportFactory::class => 'notifier.transport_factory.sendinblue',
             SinchTransportFactory::class => 'notifier.transport_factory.sinch',
             SlackTransportFactory::class => 'notifier.transport_factory.slack',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
index 41471838cf309..52695219275ff 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -55,6 +55,7 @@
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory;
+use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sinch\SinchTransportFactory;
 use Symfony\Component\Notifier\Bridge\Slack\SlackTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sms77\Sms77TransportFactory;
@@ -336,5 +337,9 @@
         ->set('notifier.transport_factory.pushover', PushoverTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
+
+        ->set('notifier.transport_factory.simple-textin', SimpleTextinTransportFactory::class)
+            ->parent('notifier.transport_factory.abstract')
+            ->tag('texter.transport_factory')
     ;
 };
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/.gitattributes b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/.gitignore b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/.gitignore
new file mode 100644
index 0000000000000..c49a5d8df5c65
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/CHANGELOG.md
new file mode 100644
index 0000000000000..75d6a403c1334
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+* Add the bridge
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/LICENSE b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/LICENSE
new file mode 100644
index 0000000000000..733c826ebcd63
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2022-present Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/README.md b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/README.md
new file mode 100644
index 0000000000000..f617181cead92
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/README.md
@@ -0,0 +1,24 @@
+SimpleTextin Notifier
+=====================
+
+Provides [SimpleTextin](https://simpletexting.com/) integration for Symfony Notifier.
+
+DSN example
+-----------
+
+```
+SIMPLETEXTIN_DSN=simpletextin://API_KEY@default?from=FROM
+```
+
+where:
+
+ - `API_KEY` is your SimpleTextin API key
+ - `FROM` is your account phone sender (optional)
+
+Resources
+---------
+
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/SimpleTextinOptions.php b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/SimpleTextinOptions.php
new file mode 100644
index 0000000000000..aed250801c0e8
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/SimpleTextinOptions.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\SimpleTextin;
+
+use Symfony\Component\Notifier\Message\MessageOptionsInterface;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class SimpleTextinOptions implements MessageOptionsInterface
+{
+    private array $options;
+
+    public function __construct(array $options = [])
+    {
+        $this->options = $options;
+    }
+
+    public function getFrom(): ?string
+    {
+        return $this->options['from'] ?? null;
+    }
+
+    public function getRecipientId(): ?string
+    {
+        return $this->options['recipient_id'] ?? null;
+    }
+
+    public function setFrom(string $from): self
+    {
+        $this->options['from'] = $from;
+
+        return $this;
+    }
+
+    public function setRecipientId(string $id): self
+    {
+        $this->options['recipient_id'] = $id;
+
+        return $this;
+    }
+
+    public function toArray(): array
+    {
+        $options = $this->options;
+        unset($options['recipient_id']);
+
+        return $options;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/SimpleTextinTransport.php b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/SimpleTextinTransport.php
new file mode 100644
index 0000000000000..670be78836ea1
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/SimpleTextinTransport.php
@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\SimpleTextin;
+
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Exception\TransportException;
+use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Transport\AbstractTransport;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class SimpleTextinTransport extends AbstractTransport
+{
+    protected const HOST = 'api-app2.simpletexting.com';
+
+    public function __construct(
+        #[\SensitiveParameter] private readonly string $apiKey,
+        private readonly ?string $from = null,
+        HttpClientInterface $client = null,
+        EventDispatcherInterface $dispatcher = null
+    ) {
+        parent::__construct($client, $dispatcher);
+    }
+
+    public function __toString(): string
+    {
+        $queryParameters = [];
+        if ($this->from) {
+            $queryParameters['from'] = $this->from;
+        }
+
+        return sprintf('simpletextin://%s', $this->getEndpoint()).($queryParameters ? '?'.http_build_query($queryParameters) : '');
+    }
+
+    public function supports(MessageInterface $message): bool
+    {
+        return $message instanceof SmsMessage && (null === $message->getOptions() || $message->getOptions() instanceof SimpleTextinOptions);
+    }
+
+    /**
+     * https://simpletexting.com/api/docs/v2/.
+     */
+    protected function doSend(MessageInterface $message): SentMessage
+    {
+        if (!$message instanceof SmsMessage) {
+            throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
+        }
+        $endpoint = sprintf('https://%s/v2/api/messages', $this->getEndpoint());
+
+        $opts = $message->getOptions();
+        $options = $opts ? $opts->toArray() : [];
+        $options['text'] = $message->getSubject();
+        $options['contactPhone'] = $message->getPhone();
+        $options['mode'] = 'AUTO';
+
+        if (!isset($options['from']) && $this->from) {
+            $options['from'] = $this->from;
+        }
+
+        if (isset($options['from']) && !preg_match('/^\+?[1-9]\d{1,14}$/', $options['from'])) {
+            throw new InvalidArgumentException(sprintf('The "From" number "%s" is not a valid phone number.', $this->from));
+        }
+
+        if ($options['from'] ?? false) {
+            $options['accountPhone'] = $options['from'];
+            unset($options['from']);
+        }
+
+        $response = $this->client->request('POST', $endpoint, [
+            'auth_bearer' => $this->apiKey,
+            'json' => array_filter($options),
+        ]);
+
+        try {
+            $statusCode = $response->getStatusCode();
+        } catch (TransportExceptionInterface $e) {
+            throw new TransportException('Could not reach the remote SimpleTextin server.', $response, 0, $e);
+        }
+
+        if (201 !== $statusCode) {
+            $error = $response->getContent(false);
+            throw new TransportException(sprintf('Unable to send the SMS - "%s".', $error ?: 'unknown failure'), $response);
+        }
+
+        $success = $response->toArray(false);
+
+        $sentMessage = new SentMessage($message, (string) $this);
+        $sentMessage->setMessageId($success['id']);
+
+        return $sentMessage;
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/SimpleTextinTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/SimpleTextinTransportFactory.php
new file mode 100644
index 0000000000000..d4ca640f479a0
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/SimpleTextinTransportFactory.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\SimpleTextin;
+
+use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
+use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
+use Symfony\Component\Notifier\Transport\Dsn;
+
+/**
+ * @author gnito-org <https://github.com/gnito-org>
+ */
+final class SimpleTextinTransportFactory extends AbstractTransportFactory
+{
+    private const TRANSPORT_SCHEME = 'simpletextin';
+
+    public function create(Dsn $dsn): SimpleTextinTransport
+    {
+        $scheme = $dsn->getScheme();
+
+        if (self::TRANSPORT_SCHEME !== $scheme) {
+            throw new UnsupportedSchemeException($dsn, self::TRANSPORT_SCHEME, $this->getSupportedSchemes());
+        }
+
+        $apiKey = $this->getUser($dsn);
+        $from = $dsn->getOption('from');
+        $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
+        $port = $dsn->getPort();
+
+        return (new SimpleTextinTransport($apiKey, $from, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
+    }
+
+    protected function getSupportedSchemes(): array
+    {
+        return [self::TRANSPORT_SCHEME];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinOptionsTest.php b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinOptionsTest.php
new file mode 100644
index 0000000000000..215f13a584961
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinOptionsTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\SimpleTextin\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinOptions;
+
+class SimpleTextinOptionsTest extends TestCase
+{
+    public function testSimpleTextinOptions()
+    {
+        $simpleTextinOptions = (new SimpleTextinOptions())->setFrom('test_from')->setRecipientId('test_recipient');
+
+        self::assertSame(['from' => 'test_from'], $simpleTextinOptions->toArray());
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportFactoryTest.php
new file mode 100644
index 0000000000000..52ded833e0dca
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportFactoryTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\SimpleTextin\Tests;
+
+use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinTransportFactory;
+use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
+
+final class SimpleTextinTransportFactoryTest extends TransportFactoryTestCase
+{
+    public function createFactory(): SimpleTextinTransportFactory
+    {
+        return new SimpleTextinTransportFactory();
+    }
+
+    public function createProvider(): iterable
+    {
+        yield ['simpletextin://host.test', 'simpletextin://ApiKey@host.test'];
+        yield ['simpletextin://host.test?from=15556667777', 'simpletextin://ApiKey@host.test?from=15556667777'];
+    }
+
+    public function incompleteDsnProvider(): iterable
+    {
+        yield 'missing API key' => ['simpletextin://@default'];
+    }
+
+    public function supportsProvider(): iterable
+    {
+        yield [true, 'simpletextin://apiKey@default'];
+        yield [false, 'somethingElse://apiKey@default'];
+    }
+
+    public function unsupportedSchemeProvider(): iterable
+    {
+        yield ['somethingElse://apiKey@default'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportTest.php b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportTest.php
new file mode 100644
index 0000000000000..120db308bdbc1
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportTest.php
@@ -0,0 +1,109 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Bridge\SimpleTextin\Tests;
+
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinOptions;
+use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinTransport;
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
+use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SmsMessage;
+use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+final class SimpleTextinTransportTest extends TransportTestCase
+{
+    public function createTransport(HttpClientInterface $client = null, string $from = 'test_from'): SimpleTextinTransport
+    {
+        return new SimpleTextinTransport('test_api_key', $from, $client ?? $this->createMock(HttpClientInterface::class));
+    }
+
+    public function invalidFromProvider(): iterable
+    {
+        yield 'no zero at start if phone number' => ['+0'];
+        yield 'phone number too short' => ['+1'];
+    }
+
+    public function supportedMessagesProvider(): iterable
+    {
+        yield [new SmsMessage('0611223344', 'Hello!')];
+        yield [new SmsMessage('0611223344', 'Hello!', 'from', new SimpleTextinOptions(['from' => 'from_new']))];
+    }
+
+    /**
+     * @dataProvider invalidFromProvider
+     */
+    public function testInvalidArgumentExceptionIsThrownIfFromIsInvalid(string $from)
+    {
+        $transport = $this->createTransport(null, $from);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(sprintf('The "From" number "%s" is not a valid phone number.', $from));
+
+        $transport->send(new SmsMessage('+33612345678', 'Hello!'));
+    }
+
+    /**
+     * @dataProvider validFromProvider
+     */
+    public function testNoInvalidArgumentExceptionIsThrownIfFromIsValid(string $from)
+    {
+        $message = new SmsMessage('+33612345678', 'Hello!');
+
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects(self::exactly(2))->method('getStatusCode')->willReturn(201);
+        $response->expects(self::once())->method('getContent')->willReturn(json_encode(['id' => 'foo']));
+
+        $client = new MockHttpClient(function (string $method, string $url) use ($response): ResponseInterface {
+            self::assertSame('POST', $method);
+            self::assertSame('https://api-app2.simpletexting.com/v2/api/messages', $url);
+
+            return $response;
+        });
+
+        $transport = $this->createTransport($client, $from);
+
+        $sentMessage = $transport->send($message);
+        self::assertSame('foo', $sentMessage->getMessageId());
+    }
+
+    public function toStringProvider(): iterable
+    {
+        yield ['simpletextin://api-app2.simpletexting.com?from=test_from', $this->createTransport()];
+    }
+
+    public function unsupportedMessagesProvider(): iterable
+    {
+        yield [new ChatMessage('Hello!')];
+        yield [$this->createMock(MessageInterface::class)];
+    }
+
+    public function validFromProvider(): iterable
+    {
+        yield ['+11'];
+        yield ['+112'];
+        yield ['+1123'];
+        yield ['+11234'];
+        yield ['+112345'];
+        yield ['+1123456'];
+        yield ['+11234567'];
+        yield ['+112345678'];
+        yield ['+1123456789'];
+        yield ['+11234567891'];
+        yield ['+112345678912'];
+        yield ['+1123456789123'];
+        yield ['+11234567891234'];
+        yield ['+112345678912345'];
+    }
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/composer.json b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/composer.json
new file mode 100644
index 0000000000000..c0a207117b1c8
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "symfony/simple-textin-notifier",
+    "type": "symfony-notifier-bridge",
+    "description": "Symfony SimpleTextin Notifier Bridge",
+    "keywords": [
+        "simple-textin",
+        "notifier"
+    ],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "gnito-org",
+            "homepage": "https://github.com/gnito-org"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/http-client": "^5.4|^6.0",
+        "symfony/notifier": "^6.3"
+    },
+    "require-dev": {
+        "symfony/event-dispatcher": "^5.4|^6.0"
+    },
+    "autoload": {
+        "psr-4": {"Symfony\\Component\\Notifier\\Bridge\\SimpleTextin\\": ""},
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/phpunit.xml.dist b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/phpunit.xml.dist
new file mode 100644
index 0000000000000..869f16f92a8c8
--- /dev/null
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony SimpleTextin Notifier Bridge Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index f0312937fa587..5254a323b566a 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -184,6 +184,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\Sendinblue\SendinblueTransportFactory::class,
             'package' => 'symfony/sendinblue-notifier',
         ],
+        'simpletextin' => [
+            'class' => Bridge\SimpleTextin\SimpleTextinTransportFactory::class,
+            'package' => 'symfony/simple-textin-notifier',
+        ],
         'sinch' => [
             'class' => Bridge\Sinch\SinchTransportFactory::class,
             'package' => 'symfony/sinch-notifier',
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 8b0cda74819cb..ffc01a84a12d2 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -51,6 +51,7 @@
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory;
+use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sinch\SinchTransportFactory;
 use Symfony\Component\Notifier\Bridge\Slack\SlackTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sms77\Sms77TransportFactory;
@@ -120,6 +121,7 @@ public static function setUpBeforeClass(): void
             SendberryTransportFactory::class => false,
             SendinblueTransportFactory::class => false,
             SinchTransportFactory::class => false,
+            SimpleTextinTransportFactory::class => false,
             SlackTransportFactory::class => false,
             Sms77TransportFactory::class => false,
             SmsapiTransportFactory::class => false,
@@ -191,6 +193,7 @@ public static function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \
         yield ['rocketchat', 'symfony/rocket-chat-notifier'];
         yield ['sendberry', 'symfony/sendberry-notifier'];
         yield ['sendinblue', 'symfony/sendinblue-notifier'];
+        yield ['simpletextin', 'symfony/simple-textin-notifier'];
         yield ['sinch', 'symfony/sinch-notifier'];
         yield ['slack', 'symfony/slack-notifier'];
         yield ['sms77', 'symfony/sms77-notifier'];
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
index 9dcf3348cc68a..18952abe4e740 100644
--- a/src/Symfony/Component/Notifier/Transport.php
+++ b/src/Symfony/Component/Notifier/Transport.php
@@ -47,6 +47,7 @@
 use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory;
+use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sinch\SinchTransportFactory;
 use Symfony\Component\Notifier\Bridge\Slack\SlackTransportFactory;
 use Symfony\Component\Notifier\Bridge\Sms77\Sms77TransportFactory;
@@ -117,6 +118,7 @@ final class Transport
         RocketChatTransportFactory::class,
         SendberryTransportFactory::class,
         SendinblueTransportFactory::class,
+        SimpleTextinTransportFactory::class,
         SinchTransportFactory::class,
         SlackTransportFactory::class,
         Sms77TransportFactory::class,

From 9842dc0e4f6e61676aa16347f8a7dec7e79bf144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Tue, 28 Mar 2023 19:41:15 +0200
Subject: [PATCH 352/475] [VarDumper] Add a caster for the FlattenException

---
 .../VarDumper/Caster/ExceptionCaster.php      | 11 +++++++
 .../VarDumper/Cloner/AbstractCloner.php       |  1 +
 .../Tests/Caster/ExceptionCasterTest.php      | 30 +++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
index d6e0e0dc00487..be5a642226a19 100644
--- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\VarDumper\Caster;
 
+use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\ErrorHandler\Exception\SilencedErrorContext;
 use Symfony\Component\VarDumper\Cloner\Stub;
 use Symfony\Component\VarDumper\Exception\ThrowingCasterException;
@@ -288,6 +289,16 @@ public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, boo
         return $a;
     }
 
+    public static function castFlattenException(FlattenException $e, array $a, Stub $stub, bool $isNested)
+    {
+        if ($isNested) {
+            $k = sprintf(Caster::PATTERN_PRIVATE, FlattenException::class, 'traceAsString');
+            $a[$k] = new CutStub($a[$k]);
+        }
+
+        return $a;
+    }
+
     private static function filterExceptionArray(string $xClass, array $a, string $xPrefix, int $filter): array
     {
         if (isset($a[$xPrefix.'trace'])) {
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
index 9df2b79f0acd8..6a746b88e360e 100644
--- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -95,6 +95,7 @@ abstract class AbstractCloner implements ClonerInterface
         'Symfony\Component\VarDumper\Caster\TraceStub' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castTraceStub'],
         'Symfony\Component\VarDumper\Caster\FrameStub' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castFrameStub'],
         'Symfony\Component\VarDumper\Cloner\AbstractCloner' => ['Symfony\Component\VarDumper\Caster\StubCaster', 'cutInternals'],
+        'Symfony\Component\ErrorHandler\Exception\FlattenException' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castFlattenException'],
         'Symfony\Component\ErrorHandler\Exception\SilencedErrorContext' => ['Symfony\Component\VarDumper\Caster\ExceptionCaster', 'castSilencedErrorContext'],
 
         'Imagine\Image\ImageInterface' => ['Symfony\Component\VarDumper\Caster\ImagineCaster', 'castImage'],
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
index 2609eb7fc3072..15eafecbf5350 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\VarDumper\Tests\Caster;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\ErrorHandler\Exception\FlattenException;
 use Symfony\Component\ErrorHandler\Exception\SilencedErrorContext;
 use Symfony\Component\VarDumper\Caster\Caster;
 use Symfony\Component\VarDumper\Caster\ExceptionCaster;
@@ -354,4 +355,33 @@ public function testAnonymous()
 
         $this->assertDumpMatchesFormat($expectedDump, $e, Caster::EXCLUDE_VERBOSE);
     }
+
+    /**
+     * @requires function \Symfony\Component\ErrorHandler\Exception\FlattenException::create
+     */
+    public function testFlattenException()
+    {
+        $f = FlattenException::createFromThrowable(new \Exception('Hello'));
+
+        $expectedDump = <<<'EODUMP'
+array:1 [
+  0 => Symfony\Component\ErrorHandler\Exception\FlattenException {
+    -message: "Hello"
+    -code: 0
+    -previous: null
+    -trace: array:13 %a
+    -traceAsString: ""…%d
+    -class: "Exception"
+    -statusCode: 500
+    -statusText: "Internal Server Error"
+    -headers: []
+    -file: "%s/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php"
+    -line: %d
+    -asString: null
+  }
+]
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, [$f], Caster::EXCLUDE_VERBOSE);
+    }
 }

From 6b2bf2202ec7d13dc17b6887775db1563e9903e1 Mon Sep 17 00:00:00 2001
From: Florent Morselli <florent.morselli@spomky-labs.com>
Date: Wed, 29 Mar 2023 09:30:41 +0200
Subject: [PATCH 353/475] Remove bjeavons/zxcvbn-php in favor of a builtin
 solution

---
 composer.json                                 |  3 +-
 src/Symfony/Component/Validator/CHANGELOG.md  |  2 +-
 .../Constraints/PasswordStrength.php          | 38 ++++---------
 .../Constraints/PasswordStrengthValidator.php | 55 +++++++++----------
 .../Constraints/PasswordStrengthTest.php      | 22 ++------
 .../PasswordStrengthValidatorTest.php         | 24 +++-----
 src/Symfony/Component/Validator/composer.json |  3 +-
 7 files changed, 51 insertions(+), 96 deletions(-)

diff --git a/composer.json b/composer.json
index f246838ba1cd6..20ade09dbb979 100644
--- a/composer.json
+++ b/composer.json
@@ -152,8 +152,7 @@
         "symfony/security-acl": "~2.8|~3.0",
         "twig/cssinliner-extra": "^2.12|^3",
         "twig/inky-extra": "^2.12|^3",
-        "twig/markdown-extra": "^2.12|^3",
-        "bjeavons/zxcvbn-php": "^1.0"
+        "twig/markdown-extra": "^2.12|^3"
     },
     "conflict": {
         "ext-psr": "<1.1|>=2",
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
index 5c1681dcd2459..980001af05f71 100644
--- a/src/Symfony/Component/Validator/CHANGELOG.md
+++ b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -8,7 +8,7 @@ CHANGELOG
  * Add `Uuid::TIME_BASED_VERSIONS` to match that a UUID being validated embeds a timestamp
  * Add the `pattern` parameter in violations of the `Regex` constraint
  * Add a `NoSuspiciousCharacters` constraint to validate a string is not a spoofing attempt
- * Add a `PasswordStrength` constraint to check the strength of a password (requires `bjeavons/zxcvbn-php` library)
+ * Add a `PasswordStrength` constraint to check the strength of a password
  * Add the `countUnit` option to the `Length` constraint to allow counting the string length either by code points (like before, now the default setting `Length::COUNT_CODEPOINTS`), bytes (`Length::COUNT_BYTES`) or graphemes (`Length::COUNT_GRAPHEMES`)
  * Add the `filenameMaxLength` option to the `File` constraint
  * Add the `exclude` option to the `Cascade` constraint
diff --git a/src/Symfony/Component/Validator/Constraints/PasswordStrength.php b/src/Symfony/Component/Validator/Constraints/PasswordStrength.php
index 9eb571f7dfb84..0be2c39534c19 100644
--- a/src/Symfony/Component/Validator/Constraints/PasswordStrength.php
+++ b/src/Symfony/Component/Validator/Constraints/PasswordStrength.php
@@ -13,8 +13,6 @@
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-use Symfony\Component\Validator\Exception\LogicException;
-use ZxcvbnPhp\Zxcvbn;
 
 /**
  * @Annotation
@@ -26,42 +24,28 @@
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 final class PasswordStrength extends Constraint
 {
+    public const STRENGTH_VERY_WEAK = 0;
+    public const STRENGTH_WEAK = 1;
+    public const STRENGTH_REASONABLE = 2;
+    public const STRENGTH_STRONG = 3;
+    public const STRENGTH_VERY_STRONG = 4;
+
     public const PASSWORD_STRENGTH_ERROR = '4234df00-45dd-49a4-b303-a75dbf8b10d8';
-    public const RESTRICTED_USER_INPUT_ERROR = 'd187ff45-bf23-4331-aa87-c24a36e9b400';
 
     protected const ERROR_NAMES = [
         self::PASSWORD_STRENGTH_ERROR => 'PASSWORD_STRENGTH_ERROR',
-        self::RESTRICTED_USER_INPUT_ERROR => 'RESTRICTED_USER_INPUT_ERROR',
     ];
 
-    public string $lowStrengthMessage = 'The password strength is too low. Please use a stronger password.';
-
-    public int $minScore = 2;
+    public string $message = 'The password strength is too low. Please use a stronger password.';
 
-    public string $restrictedDataMessage = 'The password contains the following restricted data: {{ wordList }}.';
+    public int $minScore;
 
-    /**
-     * @var array<string>
-     */
-    public array $restrictedData = [];
-
-    public function __construct(mixed $options = null, array $groups = null, mixed $payload = null)
+    public function __construct(int $minScore = self::STRENGTH_REASONABLE, mixed $options = null, array $groups = null, mixed $payload = null)
     {
-        if (!class_exists(Zxcvbn::class)) {
-            throw new LogicException(sprintf('The "%s" class requires the "bjeavons/zxcvbn-php" library. Try running "composer require bjeavons/zxcvbn-php".', self::class));
-        }
-
-        if (isset($options['minScore']) && (!\is_int($options['minScore']) || $options['minScore'] < 1 || $options['minScore'] > 4)) {
+        if (isset($minScore) && (!\is_int($minScore) || $minScore < 1 || $minScore > 4)) {
             throw new ConstraintDefinitionException(sprintf('The parameter "minScore" of the "%s" constraint must be an integer between 1 and 4.', static::class));
         }
-
-        if (isset($options['restrictedData'])) {
-            array_walk($options['restrictedData'], static function (mixed $value): void {
-                if (!\is_string($value)) {
-                    throw new ConstraintDefinitionException(sprintf('The parameter "restrictedData" of the "%s" constraint must be a list of strings.', static::class));
-                }
-            });
-        }
+        $options['minScore'] = $minScore;
         parent::__construct($options, $groups, $payload);
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php b/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
index 66a68096fda96..cda5bf22a7937 100644
--- a/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
@@ -15,12 +15,17 @@
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
-use ZxcvbnPhp\Matchers\DictionaryMatch;
-use ZxcvbnPhp\Matchers\MatchInterface;
-use ZxcvbnPhp\Zxcvbn;
 
 final class PasswordStrengthValidator extends ConstraintValidator
 {
+    /**
+     * @param (\Closure(string):PasswordStrength::STRENGTH_*)|null $passwordStrengthEstimator
+     */
+    public function __construct(
+        private readonly ?\Closure $passwordStrengthEstimator = null,
+    ) {
+    }
+
     public function validate(#[\SensitiveParameter] mixed $value, Constraint $constraint): void
     {
         if (!$constraint instanceof PasswordStrength) {
@@ -34,43 +39,33 @@ public function validate(#[\SensitiveParameter] mixed $value, Constraint $constr
         if (!\is_string($value)) {
             throw new UnexpectedValueException($value, 'string');
         }
+        $passwordStrengthEstimator = $this->passwordStrengthEstimator ?? self::estimateStrength(...);
+        $strength = $passwordStrengthEstimator($value);
 
-        $zxcvbn = new Zxcvbn();
-        $strength = $zxcvbn->passwordStrength($value, $constraint->restrictedData);
-
-        if ($strength['score'] < $constraint->minScore) {
-            $this->context->buildViolation($constraint->lowStrengthMessage)
+        if ($strength < $constraint->minScore) {
+            $this->context->buildViolation($constraint->message)
                 ->setCode(PasswordStrength::PASSWORD_STRENGTH_ERROR)
                 ->addViolation();
         }
-        $wordList = $this->findRestrictedUserInputs($strength['sequence'] ?? []);
-        if (0 !== \count($wordList)) {
-            $this->context->buildViolation($constraint->restrictedDataMessage, [
-                '{{ wordList }}' => implode(', ', $wordList),
-            ])
-                ->setCode(PasswordStrength::RESTRICTED_USER_INPUT_ERROR)
-                ->addViolation();
-        }
     }
 
     /**
-     * @param array<MatchInterface> $sequence
+     * Returns the estimated strength of a password.
+     *
+     * The higher the value, the stronger the password.
      *
-     * @return array<string>
+     * @return PasswordStrength::STRENGTH_*
      */
-    private function findRestrictedUserInputs(array $sequence): array
+    private static function estimateStrength(#[\SensitiveParameter] string $password): int
     {
-        $found = [];
-
-        foreach ($sequence as $item) {
-            if (!$item instanceof DictionaryMatch) {
-                continue;
-            }
-            if ('user_inputs' === $item->dictionaryName) {
-                $found[] = $item->token;
-            }
-        }
+        $entropy = log(\strlen(count_chars($password, 3)) ** \strlen($password), 2);
 
-        return $found;
+        return match (true) {
+            $entropy >= 120 => PasswordStrength::STRENGTH_VERY_STRONG,
+            $entropy >= 100 => PasswordStrength::STRENGTH_STRONG,
+            $entropy >= 80 => PasswordStrength::STRENGTH_REASONABLE,
+            $entropy >= 60 => PasswordStrength::STRENGTH_WEAK,
+            default => PasswordStrength::STRENGTH_VERY_WEAK,
+        };
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthTest.php b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthTest.php
index aa31d5a9ef999..2cfe6a3abb697 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthTest.php
@@ -20,39 +20,27 @@ class PasswordStrengthTest extends TestCase
     public function testConstructor()
     {
         $constraint = new PasswordStrength();
-        $this->assertEquals(2, $constraint->minScore);
-        $this->assertEquals([], $constraint->restrictedData);
+        $this->assertSame(2, $constraint->minScore);
     }
 
     public function testConstructorWithParameters()
     {
-        $constraint = new PasswordStrength([
-            'minScore' => 3,
-            'restrictedData' => ['foo', 'bar'],
-        ]);
+        $constraint = new PasswordStrength(minScore: PasswordStrength::STRENGTH_STRONG);
 
-        $this->assertEquals(3, $constraint->minScore);
-        $this->assertEquals(['foo', 'bar'], $constraint->restrictedData);
+        $this->assertSame(PasswordStrength::STRENGTH_STRONG, $constraint->minScore);
     }
 
     public function testInvalidScoreOfZero()
     {
         $this->expectException(ConstraintDefinitionException::class);
         $this->expectExceptionMessage('The parameter "minScore" of the "Symfony\Component\Validator\Constraints\PasswordStrength" constraint must be an integer between 1 and 4.');
-        new PasswordStrength(['minScore' => 0]);
+        new PasswordStrength(minScore: PasswordStrength::STRENGTH_VERY_WEAK);
     }
 
     public function testInvalidScoreOfFive()
     {
         $this->expectException(ConstraintDefinitionException::class);
         $this->expectExceptionMessage('The parameter "minScore" of the "Symfony\Component\Validator\Constraints\PasswordStrength" constraint must be an integer between 1 and 4.');
-        new PasswordStrength(['minScore' => 5]);
-    }
-
-    public function testInvalidRestrictedData()
-    {
-        $this->expectException(ConstraintDefinitionException::
10000
class);
-        $this->expectExceptionMessage('The parameter "restrictedData" of the "Symfony\Component\Validator\Constraints\PasswordStrength" constraint must be a list of strings.');
-        new PasswordStrength(['restrictedData' => [123]]);
+        new PasswordStrength(minScore: 5);
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php
index 33bd0f8809435..ee73b0d85c64c 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php
@@ -25,16 +25,19 @@ protected function createValidator(): PasswordStrengthValidator
     /**
      * @dataProvider getValidValues
      */
-    public function testValidValues(string $value)
+    public function testValidValues(string $value, int $expectedStrength)
     {
-        $this->validator->validate($value, new PasswordStrength());
+        $this->validator->validate($value, new PasswordStrength(minScore: $expectedStrength));
 
         $this->assertNoViolation();
     }
 
     public static function getValidValues(): iterable
     {
-        yield ['This 1s a very g00d Pa55word! ;-)'];
+        yield ['How-is this 🤔?!', PasswordStrength::STRENGTH_WEAK];
+        yield ['Reasonable-pwd-❤️', PasswordStrength::STRENGTH_REASONABLE];
+        yield ['This 1s a very g00d Pa55word! ;-)', PasswordStrength::STRENGTH_VERY_STRONG];
+        yield ['pudding-smack-👌🏼-fox-😎', PasswordStrength::STRENGTH_VERY_STRONG];
     }
 
     /**
@@ -59,23 +62,10 @@ public static function provideInvalidConstraints(): iterable
             PasswordStrength::PASSWORD_STRENGTH_ERROR,
         ];
         yield [
-            new PasswordStrength([
-                'minScore' => 4,
-            ]),
+            new PasswordStrength(minScore: PasswordStrength::STRENGTH_VERY_STRONG),
             'Good password?',
             'The password strength is too low. Please use a stronger password.',
             PasswordStrength::PASSWORD_STRENGTH_ERROR,
         ];
-        yield [
-            new PasswordStrength([
-                'restrictedData' => ['symfony'],
-            ]),
-            'SyMfONY-framework-john',
-            'The password contains the following restricted data: {{ wordList }}.',
-            PasswordStrength::RESTRICTED_USER_INPUT_ERROR,
-            [
-                '{{ wordList }}' => 'SyMfONY',
-            ],
-        ];
     }
 }
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index 7e99fcfa78ecb..7e90c5238c127 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -40,8 +40,7 @@
         "symfony/property-info": "^5.4|^6.0",
         "symfony/translation": "^5.4|^6.0",
         "doctrine/annotations": "^1.13|^2",
-        "egulias/email-validator": "^2.1.10|^3|^4",
-        "bjeavons/zxcvbn-php": "^1.0"
+        "egulias/email-validator": "^2.1.10|^3|^4"
     },
     "conflict": {
         "doctrine/annotations": "<1.13",

From 906c7ad8556da83c9a6d56750188e7ea09948f77 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Fri, 31 Mar 2023 08:35:18 +0200
Subject: [PATCH 354/475] fix tests

---
 .../Tests/SimpleTextinTransportFactoryTest.php   |  8 ++++----
 .../Tests/SimpleTextinTransportTest.php          | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportFactoryTest.php
index 52ded833e0dca..d69d38bd7e737 100644
--- a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportFactoryTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportFactoryTest.php
@@ -21,24 +21,24 @@ public function createFactory(): SimpleTextinTransportFactory
         return new SimpleTextinTransportFactory();
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
         yield ['simpletextin://host.test', 'simpletextin://ApiKey@host.test'];
         yield ['simpletextin://host.test?from=15556667777', 'simpletextin://ApiKey@host.test?from=15556667777'];
     }
 
-    public function incompleteDsnProvider(): iterable
+    public static function incompleteDsnProvider(): iterable
     {
         yield 'missing API key' => ['simpletextin://@default'];
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [true, 'simpletextin://apiKey@default'];
         yield [false, 'somethingElse://apiKey@default'];
     }
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         yield ['somethingElse://apiKey@default'];
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportTest.php b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportTest.php
index 120db308bdbc1..b4dc58946e3b9 100644
--- a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/Tests/SimpleTextinTransportTest.php
@@ -16,17 +16,17 @@
 use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinTransport;
 use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Message\ChatMessage;
-use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Component\Notifier\Tests\Transport\DummyMessage;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 final class SimpleTextinTransportTest extends TransportTestCase
 {
-    public function createTransport(HttpClientInterface $client = null, string $from = 'test_from'): SimpleTextinTransport
+    public static function createTransport(HttpClientInterface $client = null, string $from = 'test_from'): SimpleTextinTransport
     {
-        return new SimpleTextinTransport('test_api_key', $from, $client ?? $this->createMock(HttpClientInterface::class));
+        return new SimpleTextinTransport('test_api_key', $from, $client ?? new MockHttpClient());
     }
 
     public function invalidFromProvider(): iterable
@@ -35,7 +35,7 @@ public function invalidFromProvider(): iterable
         yield 'phone number too short' => ['+1'];
     }
 
-    public function supportedMessagesProvider(): iterable
+    public static function supportedMessagesProvider(): iterable
     {
         yield [new SmsMessage('0611223344', 'Hello!')];
         yield [new SmsMessage('0611223344', 'Hello!', 'from', new SimpleTextinOptions(['from' => 'from_new']))];
@@ -78,15 +78,15 @@ public function testNoInvalidArgumentExceptionIsThrownIfFromIsValid(string $from
         self::assertSame('foo', $sentMessage->getMessageId());
     }
 
-    public function toStringProvider(): iterable
+    public static function toStringProvider(): iterable
     {
-        yield ['simpletextin://api-app2.simpletexting.com?from=test_from', $this->createTransport()];
+        yield ['simpletextin://api-app2.simpletexting.com?from=test_from', self::createTransport()];
     }
 
-    public function unsupportedMessagesProvider(): iterable
+    public static function unsupportedMessagesProvider(): iterable
     {
         yield [new ChatMessage('Hello!')];
-        yield [$this->createMock(MessageInterface::class)];
+        yield [new DummyMessage()];
     }
 
     public function validFromProvider(): iterable

From 8689920c49b595272cfa800a9976f78d3b8cef76 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Fri, 31 Mar 2023 12:58:16 +0200
Subject: [PATCH 355/475] Throw Symfony OutOfBounds exception instead of
 default one

---
 src/Symfony/Component/Validator/ConstraintViolationList.php   | 4 +++-
 .../Component/Validator/ConstraintViolationListInterface.php  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Validator/ConstraintViolationList.php b/src/Symfony/Component/Validator/ConstraintViolationList.php
index 0b986245096c2..88f90a0cdb59e 100644
--- a/src/Symfony/Component/Validator/ConstraintViolationList.php
+++ b/src/Symfony/Component/Validator/ConstraintViolationList.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Validator;
 
+use Symfony\Component\Validator\Exception\OutOfBoundsException;
+
 /**
  * Default implementation of {@ConstraintViolationListInterface}.
  *
@@ -77,7 +79,7 @@ public function addAll(ConstraintViolationListInterface $otherList)
     public function get(int $offset): ConstraintViolationInterface
     {
         if (!isset($this->violations[$offset])) {
-            throw new \OutOfBoundsException(sprintf('The offset "%s" does not exist.', $offset));
+            throw new OutOfBoundsException(sprintf('The offset "%s" does not exist.', $offset));
         }
 
         return $this->violations[$offset];
diff --git a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
index c6d2f0c306d6a..1fdbf0bc3f820 100644
--- a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
+++ b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Validator;
 
+use Symfony\Component\Validator\Exception\OutOfBoundsException;
+
 /**
  * A list of constraint violations.
  *
@@ -42,7 +44,7 @@ public function addAll(self $otherList);
      *
      * @param int $offset The offset of the violation
      *
-     * @throws \OutOfBoundsException if the offset does not exist
+     * @throws OutOfBoundsException if the offset does not exist
      */
     public function get(int $offset): ConstraintViolationInterface;
 

From 99c09ff9c4c45da492fdce2d3e81258e1b0923ae Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 31 Mar 2023 09:37:35 +0200
Subject: [PATCH 356/475] [Validator] Improve entropy estimation in
 PasswordStrengthValidator

---
 .../Constraints/PasswordStrength.php          | 14 ++++++++-----
 .../Constraints/PasswordStrengthValidator.php | 21 ++++++++++++++++++-
 .../PasswordStrengthValidatorTest.php         | 14 +++++++++++--
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Component/Validator/Constraints/PasswordStrength.php b/src/Symfony/Component/Validator/Constraints/PasswordStrength.php
index 0be2c39534c19..eef98ef337a36 100644
--- a/src/Symfony/Component/Validator/Constraints/PasswordStrength.php
+++ b/src/Symfony/Component/Validator/Constraints/PasswordStrength.php
@@ -40,12 +40,16 @@ final class PasswordStrength extends Constraint
 
     public int $minScore;
 
-    public function __construct(int $minScore = self::STRENGTH_REASONABLE, mixed $options = null, array $groups = null, mixed $payload = null)
+    public function __construct(array $options = null, int $minScore = null, array $groups = null, mixed $payload = null)
     {
-        if (isset($minScore) && (!\is_int($minScore) || $minScore < 1 || $minScore > 4)) {
-            throw new ConstraintDefinitionException(sprintf('The parameter "minScore" of the "%s" constraint must be an integer between 1 and 4.', static::class));
-        }
-        $options['minScore'] = $minScore;
+        $options['minScore'] ??= self::STRENGTH_REASONABLE;
+
         parent::__construct($options, $groups, $payload);
+
+        $this->minScore = $minScore ?? $this->minScore;
+
+        if ($this->minScore < 1 || 4 < $this->minScore) {
+            throw new ConstraintDefinitionException(sprintf('The parameter "minScore" of the "%s" constraint must be an integer between 1 and 4.', self::class));
+        }
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php b/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
index cda5bf22a7937..e4799645b8ec2 100644
--- a/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
@@ -58,7 +58,26 @@ public function validate(#[\SensitiveParameter] mixed $value, Constraint $constr
      */
     private static function estimateStrength(#[\SensitiveParameter] string $password): int
     {
-        $entropy = log(\strlen(count_chars($password, 3)) ** \strlen($password), 2);
+        if (!$length = \strlen($password)) {
+            return PasswordStrength::STRENGTH_VERY_WEAK;
+        }
+        $password = count_chars($password, 1);
+        $chars = \count($password);
+
+        $control = $digit = $upper = $lower = $symbol = $other = 0;
+        foreach ($password as $chr => $count) {
+            match (true) {
+                $chr < 32 || 127 === $chr => $control = 33,
+                48 <= $chr && $chr <= 57 => $digit = 10,
+                65 <= $chr && $chr <= 90 => $upper = 26,
+                97 <= $chr && $chr <= 122 => $lower = 26,
+                128 <= $chr => $other = 128,
+                default => $symbol = 33,
+            };
+        }
+
+        $pool = $lower + $upper + $digit + $symbol + $control + $other;
+        $entropy = $chars * log($pool, 2) + ($length - $chars) * log($chars, 2);
 
         return match (true) {
             $entropy >= 120 => PasswordStrength::STRENGTH_VERY_STRONG,
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php
index ee73b0d85c64c..f4f5816e249a1 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php
@@ -30,12 +30,22 @@ public function testValidValues(string $value, int $expectedStrength)
         $this->validator->validate($value, new PasswordStrength(minScore: $expectedStrength));
 
         $this->assertNoViolation();
+
+        if (PasswordStrength::STRENGTH_VERY_STRONG === $expectedStrength) {
+            return;
+        }
+
+        $this->validator->validate($value, new PasswordStrength(minScore: $expectedStrength + 1));
+
+        $this->buildViolation('The password strength is too low. Please use a stronger password.')
+            ->setCode(PasswordStrength::PASSWORD_STRENGTH_ERROR)
+            ->assertRaised();
     }
 
     public static function getValidValues(): iterable
     {
-        yield ['How-is this 🤔?!', PasswordStrength::STRENGTH_WEAK];
-        yield ['Reasonable-pwd-❤️', PasswordStrength::STRENGTH_REASONABLE];
+        yield ['How-is-this', PasswordStrength::STRENGTH_WEAK];
+        yield ['Reasonable-pwd', PasswordStrength::STRENGTH_REASONABLE];
         yield ['This 1s a very g00d Pa55word! ;-)', PasswordStrength::STRENGTH_VERY_STRONG];
         yield ['pudding-smack-👌🏼-fox-😎', PasswordStrength::STRENGTH_VERY_STRONG];
     }

From 2320c2a906b7a578f682319690d2a148a06267b5 Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Sun, 2 Apr 2023 02:55:08 +0200
Subject: [PATCH 357/475] Apply no_null_property_initialization PHP-CS-Fixer
 rule

---
 .../Doctrine/Validator/Constraints/UniqueEntity.php    |  6 +++---
 .../Bridge/Monolog/Tests/Handler/MailerHandlerTest.php |  2 +-
 .../PhpUnit/DeprecationErrorHandler/Configuration.php  |  2 +-
 .../Tests/Console/Descriptor/TextDescriptorTest.php    |  2 +-
 src/Symfony/Component/BrowserKit/Tests/TestClient.php  |  4 ++--
 .../Component/BrowserKit/Tests/TestHttpClient.php      |  4 ++--
 src/Symfony/Component/Config/Tests/ConfigCacheTest.php |  2 +-
 .../Config/Tests/ResourceCheckerConfigCacheTest.php    |  2 +-
 .../Component/Console/Completion/CompletionInput.php   |  2 +-
 src/Symfony/Component/Console/Helper/Helper.php        |  2 +-
 .../Component/Filesystem/Tests/FilesystemTestCase.php  |  8 ++++----
 .../Finder/Tests/Iterator/MockSplFileInfo.php          | 10 +++++-----
 .../Component/Notifier/Tests/Mailer/DummyMailer.php    |  2 +-
 src/Symfony/Component/Process/InputStream.php          |  2 +-
 src/Symfony/Component/Routing/Tests/RouterTest.php     |  4 ++--
 .../Validator/Mapping/Loader/YamlFileLoader.php        |  2 +-
 .../Tests/Mapping/Loader/StaticMethodLoaderTest.php    |  2 +-
 17 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
index 5e9048808023d..da1873cb91856 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
@@ -32,11 +32,11 @@ class UniqueEntity extends Constraint
 
     public $message = 'This value is already used.';
     public $service = 'doctrine.orm.validator.unique';
-    public $em = null;
-    public $entityClass = null;
+    public $em;
+    public $entityClass;
     public $repositoryMethod = 'findBy';
     public $fields = [];
-    public $errorPath = null;
+    public $errorPath;
     public $ignoreNull = true;
 
     /**
diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/MailerHandlerTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/MailerHandlerTest.php
index b4044d9c870db..397e84259a706 100644
--- a/src/Symfony/Bridge/Monolog/Tests/Handler/MailerHandlerTest.php
+++ b/src/Symfony/Bridge/Monolog/Tests/Handler/MailerHandlerTest.php
@@ -25,7 +25,7 @@
 class MailerHandlerTest extends TestCase
 {
     /** @var MockObject|MailerInterface */
-    private $mailer = null;
+    private $mailer;
 
     protected function setUp(): void
     {
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php
index 850630ab7169f..fd2730b0f1d5a 100644
--- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php
+++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Configuration.php
@@ -59,7 +59,7 @@ class Configuration
     /**
      * @var string|null
      */
-    private $logFile = null;
+    private $logFile;
 
     /**
      * @param int[]       $thresholds       A hash associating groups to thresholds
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/TextDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/TextDescriptorTest.php
index 55e410597344a..340defd8e61fa 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/TextDescriptorTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/TextDescriptorTest.php
@@ -17,7 +17,7 @@
 
 class TextDescriptorTest extends AbstractDescriptorTestCase
 {
-    private static $fileLinkFormatter = null;
+    private static $fileLinkFormatter;
 
     protected static function getDescriptor()
     {
diff --git a/src/Symfony/Component/BrowserKit/Tests/TestClient.php b/src/Symfony/Component/BrowserKit/Tests/TestClient.php
index bad2d47e22e32..c98c6502981e5 100644
--- a/src/Symfony/Component/BrowserKit/Tests/TestClient.php
+++ b/src/Symfony/Component/BrowserKit/Tests/TestClient.php
@@ -16,8 +16,8 @@
 
 class TestClient extends AbstractBrowser
 {
-    protected $nextResponse = null;
-    protected $nextScript = null;
+    protected $nextResponse;
+    protected $nextScript;
 
     public function setNextResponse(Response $response)
     {
diff --git a/src/Symfony/Component/BrowserKit/Tests/TestHttpClient.php b/src/Symfony/Component/BrowserKit/Tests/TestHttpClient.php
index 184418b7b4477..afb0197c918b9 100644
--- a/src/Symfony/Component/BrowserKit/Tests/TestHttpClient.php
+++ b/src/Symfony/Component/BrowserKit/Tests/TestHttpClient.php
@@ -20,8 +20,8 @@
 
 class TestHttpClient extends HttpBrowser
 {
-    protected $nextResponse = null;
-    protected $nextScript = null;
+    protected $nextResponse;
+    protected $nextScript;
 
     public function __construct(array $server = [], History $history = null, CookieJar $cookieJar = null)
     {
diff --git a/src/Symfony/Component/Config/Tests/ConfigCacheTest.php b/src/Symfony/Component/Config/Tests/ConfigCacheTest.php
index af0d348ddf4da..2c078fe3ff62c 100644
--- a/src/Symfony/Component/Config/Tests/ConfigCacheTest.php
+++ b/src/Symfony/Component/Config/Tests/ConfigCacheTest.php
@@ -18,7 +18,7 @@
 
 class ConfigCacheTest extends TestCase
 {
-    private $cacheFile = null;
+    private $cacheFile;
 
     protected function setUp(): void
     {
diff --git a/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php b/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php
index 8747cbecf435b..f205a72e5561e 100644
--- a/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php
+++ b/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php
@@ -19,7 +19,7 @@
 
 class ResourceCheckerConfigCacheTest extends TestCase
 {
-    private $cacheFile = null;
+    private $cacheFile;
 
     protected function setUp(): void
     {
diff --git a/src/Symfony/Component/Console/Completion/CompletionInput.php b/src/Symfony/Component/Console/Completion/CompletionInput.php
index 3ef8db5d1e07e..800b7235a9fd1 100644
--- a/src/Symfony/Component/Console/Completion/CompletionInput.php
+++ b/src/Symfony/Component/Console/Completion/CompletionInput.php
@@ -34,7 +34,7 @@ final class CompletionInput extends ArgvInput
     private $tokens;
     private $currentIndex;
     private $completionType;
-    private $completionName = null;
+    private $completionName;
     private $completionValue = '';
 
     /**
diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
index 51fd11b260f71..77de9daba2ee6 100644
--- a/src/Symfony/Component/Console/Helper/Helper.php
+++ b/src/Symfony/Component/Console/Helper/Helper.php
@@ -21,7 +21,7 @@
  */
 abstract class Helper implements HelperInterface
 {
-    protected $helperSet = null;
+    protected $helperSet;
 
     /**
      * @return void
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
index 725870c69857a..79cb453ed4f28 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
@@ -23,22 +23,22 @@ class FilesystemTestCase extends TestCase
     /**
      * @var Filesystem
      */
-    protected $filesystem = null;
+    protected $filesystem;
 
     /**
      * @var string
      */
-    protected $workspace = null;
+    protected $workspace;
 
     /**
      * @var bool|null Flag for hard links on Windows
      */
-    private static $linkOnWindows = null;
+    private static $linkOnWindows;
 
     /**
      * @var bool|null Flag for symbolic links on Windows
      */
-    private static $symlinkOnWindows = null;
+    private static $symlinkOnWindows;
 
     public static function setUpBeforeClass(): void
     {
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php b/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php
index 2c23df7fd1785..14bb5e4f3090c 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php
@@ -17,11 +17,11 @@ class MockSplFileInfo extends \SplFileInfo
     public const TYPE_FILE = 2;
     public const TYPE_UNKNOWN = 3;
 
-    private $contents = null;
-    private $mode = null;
-    private $type = null;
-    private $relativePath = null;
-    private $relativePathname = null;
+    private $contents;
+    private $mode;
+    private $type;
+    private $relativePath;
+    private $relativePathname;
 
     public function __construct($param)
     {
diff --git a/src/Symfony/Component/Notifier/Tests/Mailer/DummyMailer.php b/src/Symfony/Component/Notifier/Tests/Mailer/DummyMailer.php
index 3d4ddf62963bb..9c3f96402ed36 100644
--- a/src/Symfony/Component/Notifier/Tests/Mailer/DummyMailer.php
+++ b/src/Symfony/Component/Notifier/Tests/Mailer/DummyMailer.php
@@ -20,7 +20,7 @@
  */
 class DummyMailer implements MailerInterface
 {
-    private $sentMessage = null;
+    private $sentMessage;
 
     public function send(RawMessage $message, Envelope $envelope = null): void
     {
diff --git a/src/Symfony/Component/Process/InputStream.php b/src/Symfony/Component/Process/InputStream.php
index 25f574f703cb8..086f5a9edffc1 100644
--- a/src/Symfony/Component/Process/InputStream.php
+++ b/src/Symfony/Component/Process/InputStream.php
@@ -23,7 +23,7 @@
 class InputStream implements \IteratorAggregate
 {
     /** @var callable|null */
-    private $onEmpty = null;
+    private $onEmpty;
     private $input = [];
     private $open = true;
 
diff --git a/src/Symfony/Component/Routing/Tests/RouterTest.php b/src/Symfony/Component/Routing/Tests/RouterTest.php
index 0d87d26b4f8c3..460fe29eef0cb 100644
--- a/src/Symfony/Component/Routing/Tests/RouterTest.php
+++ b/src/Symfony/Component/Routing/Tests/RouterTest.php
@@ -25,9 +25,9 @@
 
 class RouterTest extends TestCase
 {
-    private $router = null;
+    private $router;
 
-    private $loader = null;
+    private $loader;
 
     private $cacheDir;
 
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
index ce0326d37949d..2bcaf70877f8c 100644
--- a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
@@ -29,7 +29,7 @@ class YamlFileLoader extends FileLoader
      *
      * @var array
      */
-    protected $classes = null;
+    protected $classes;
 
     public function __construct(string $file)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php
index a8788e0dfdf6b..4f12a5a696ee7 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php
@@ -119,7 +119,7 @@ public static function loadMetadata(ClassMetadata $metadata)
 
 class StaticLoaderEntity
 {
-    public static $invokedWith = null;
+    public static $invokedWith;
 
     public static function loadMetadata(ClassMetadata $metadata)
     {

From 6e984f00f4f2ad6ec254e0dbcdbcb766df46d77e Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Sun, 2 Apr 2023 01:26:22 +0200
Subject: [PATCH 358/475] Apply align_multiline_comment PHP-CS-Fixer rule

---
 src/Symfony/Component/Lock/Store/DoctrineDbalStore.php         | 2 +-
 src/Symfony/Component/Lock/Store/PdoStore.php                  | 2 +-
 src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
index 7e573b369208a..7c749bfec0a04 100644
--- a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
+++ b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
@@ -28,7 +28,7 @@
  *
  * Lock metadata are stored in a table. You can use createTable() to initialize
  * a correctly defined table.
-
+ *
  * CAUTION: This store relies on all client and server nodes to have
  * synchronized clocks for lock expiry to occur at the correct time.
  * To ensure locks don't expire prematurely; the TTLs should be set with enough
diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php
index 85d0de78eaf5b..ec114c13c1d42 100644
--- a/src/Symfony/Component/Lock/Store/PdoStore.php
+++ b/src/Symfony/Component/Lock/Store/PdoStore.php
@@ -22,7 +22,7 @@
  *
  * Lock metadata are stored in a table. You can use createTable() to initialize
  * a correctly defined table.
-
+ *
  * CAUTION: This store relies on all client and server nodes to have
  * synchronized clocks for lock expiry to occur at the correct time.
  * To ensure locks don't expire prematurely; the TTLs should be set with enough
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
index 03d54d5909935..6da68c7594544 100644
--- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -65,7 +65,6 @@
  *         {
  *         }
  *     }
-
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Alexander M. Turek <me@derrabus.de>

From 6edc7483d73f1d551992f39be8acda14e92df27c Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Sun, 2 Apr 2023 04:08:55 +0200
Subject: [PATCH 359/475] Apply operator_linebreak PHP-CS-Fixer rule

---
 .../AbstractDoctrineExtension.php              |  8 ++++----
 .../Bridge/Twig/Extension/RoutingExtension.php |  4 ++--
 .../NodeVisitor/TranslationNodeVisitor.php     | 18 +++++++++---------
 .../DependencyInjection/FrameworkExtension.php |  8 ++++----
 .../Loader/IniFileLoader.php                   |  4 ++--
 .../Component/ExpressionLanguage/Parser.php    |  3 +--
 src/Symfony/Component/Form/Form.php            |  6 +++---
 src/Symfony/Component/Form/Guess/Guess.php     |  4 ++--
 .../Mailer/Test/Constraint/EmailCount.php      |  3 +--
 .../Bridge/Doctrine/Transport/Connection.php   |  6 +++---
 .../Transport/PostgreSqlConnection.php         |  4 ++--
 .../Component/Mime/Header/AbstractHeader.php   |  4 ++--
 .../Component/Mime/MessageConverter.php        |  6 +++---
 .../Test/Constraint/NotificationCount.php      |  3 +--
 .../PropertyAccess/PropertyAccessor.php        |  4 ++--
 .../PropertyInfo/Extractor/PhpDocExtractor.php |  4 ++--
 .../Extractor/ReflectionExtractor.php          |  4 ++--
 .../Security/Http/Firewall/ContextListener.php |  4 ++--
 .../Serializer/Encoder/XmlEncoder.php          |  6 +++---
 .../Normalizer/AbstractNormalizer.php          |  6 +++---
 .../Normalizer/AbstractObjectNormalizer.php    |  6 +++---
 .../ConstraintViolationListNormalizer.php      |  8 ++++----
 .../Serializer/Normalizer/ObjectNormalizer.php |  8 ++++----
 .../Constraints/TimezoneValidator.php          |  4 ++--
 src/Symfony/Component/Yaml/Parser.php          |  4 ++--
 25 files changed, 68 insertions(+), 71 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
index 56b108942e627..1ce0ffd40cd9b 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -305,14 +305,14 @@ private function detectMappingType(string $directory, ContainerBuilder $containe
             $content = file_get_contents($file);
 
             if (
-                preg_match('/^#\[.*'.$quotedMappingObjectName.'\b/m', $content) ||
-                preg_match('/^#\[.*Embeddable\b/m', $content)
+                preg_match('/^#\[.*'.$quotedMappingObjectName.'\b/m', $content)
+                || preg_match('/^#\[.*Embeddable\b/m', $content)
             ) {
                 break;
             }
             if (
-                preg_match('/^(?: \*|\/\*\*) @.*'.$quotedMappingObjectName.'\b/m', $content) ||
-                preg_match('/^(?: \*|\/\*\*) @.*Embeddable\b/m', $content)
+                preg_match('/^(?: \*|\/\*\*) @.*'.$quotedMappingObjectName.'\b/m', $content)
+                || preg_match('/^(?: \*|\/\*\*) @.*Embeddable\b/m', $content)
             ) {
                 $type = 'annotation';
                 break;
diff --git a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
index 270583f27a995..5827640d5bd0d 100644
--- a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
@@ -79,8 +79,8 @@ public function isUrlGenerationSafe(Node $argsNode): array
             $argsNode->hasNode(1) ? $argsNode->getNode(1) : null
         );
 
-        if (null === $paramsNode || $paramsNode instanceof ArrayExpression && \count($paramsNode) <= 2 &&
-            (!$paramsNode->hasNode(1) || $paramsNode->getNode(1) instanceof ConstantExpression)
+        if (null === $paramsNode || $paramsNode instanceof ArrayExpression && \count($paramsNode) <= 2
+            && (!$paramsNode->hasNode(1) || $paramsNode->getNode(1) instanceof ConstantExpression)
         ) {
             return ['html'];
         }
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
index 29cb13d0b2e5b..d5e95040d6bf2 100644
--- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
+++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -56,9 +56,9 @@ protected function doEnterNode(Node $node, Environment $env): Node
         }
 
         if (
-            $node instanceof FilterExpression &&
-            'trans' === $node->getNode('filter')->getAttribute('value') &&
-            $node->getNode('node') instanceof ConstantExpression
+            $node instanceof FilterExpression
+            && 'trans' === $node->getNode('filter')->getAttribute('value')
+            && $node->getNode('node') instanceof ConstantExpression
         ) {
             // extract constant nodes with a trans filter
             $this->messages[] = [
@@ -66,8 +66,8 @@ protected function doEnterNode(Node $node, Environment $env): Node
                 $this->getReadDomainFromArguments($node->getNode('arguments'), 1),
             ];
         } elseif (
-            $node instanceof FunctionExpression &&
-            't' === $node->getAttribute('name')
+            $node instanceof FunctionExpression
+            && 't' === $node->getAttribute('name')
         ) {
             $nodeArguments = $node->getNode('arguments');
 
@@ -84,10 +84,10 @@ protected function doEnterNode(Node $node, Environment $env): Node
                 $node->hasNode('domain') ? $this->getReadDomainFromNode($node->getNode('domain')) : null,
             ];
         } elseif (
-            $node instanceof FilterExpression &&
-            'trans' === $node->getNode('filter')->getAttribute('value') &&
-            $node->getNode('node') instanceof ConcatBinary &&
-            $message = $this->getConcatValueFromNode($node->getNode('node'), null)
+            $node instanceof FilterExpression
+            && 'trans' === $node->getNode('filter')->getAttribute('value')
+            && $node->getNode('node') instanceof ConcatBinary
+            && $message = $this->getConcatValueFromNode($node->getNode('node'), null)
         ) {
             $this->messages[] = [
                 $message,
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index fe0e0ea73875b..e2223da1ab3d5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1622,8 +1622,8 @@ private function registerValidatorMapping(ContainerBuilder $container, array $co
             $configDir = is_dir($bundle['path'].'/Resources/config') ? $bundle['path'].'/Resources/config' : $bundle['path'].'/config';
 
             if (
-                $container->fileExists($file = $configDir.'/validation.yaml', false) ||
-                $container->fileExists($file = $configDir.'/validation.yml', false)
+                $container->fileExists($file = $configDir.'/validation.yaml', false)
+                || $container->fileExists($file = $configDir.'/validation.yml', false)
             ) {
                 $fileRecorder('yml', $file);
             }
@@ -1859,8 +1859,8 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             }
 
             if (
-                $container->fileExists($file = $configDir.'/serialization.yaml', false) ||
-                $container->fileExists($file = $configDir.'/serialization.yml', false)
+                $container->fileExists($file = $configDir.'/serialization.yaml', false)
+                || $container->fileExists($file = $configDir.'/serialization.yml', false)
             ) {
                 $fileRecorder('yml', $file);
             }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
index 4ba1a2dda9087..c177790e37c91 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
@@ -89,8 +89,8 @@ private function phpize(string $value): mixed
             'off' === $lowercaseValue,
             'none' === $lowercaseValue => false,
             isset($value[1]) && (
-                ("'" === $value[0] && "'" === $value[\strlen($value) - 1]) ||
-                ('"' === $value[0] && '"' === $value[\strlen($value) - 1])
+                ("'" === $value[0] && "'" === $value[\strlen($value) - 1])
+                || ('"' === $value[0] && '"' === $value[\strlen($value) - 1])
             ) => substr($value, 1, -1), // quoted string
             default => XmlUtils::phpize($value),
         };
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
index a2911686f0d15..71bcf398d4e0d 100644
--- a/src/Symfony/Component/ExpressionLanguage/Parser.php
+++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -365,7 +365,6 @@ public function parsePostfixExpression(Node\Node $node)
 
                 if (
                     Token::NAME_TYPE !== $token->type
-                    &&
                     // Operators like "not" and "matches" are valid method or property names,
                     //
                     // In other words, besides NAME_TYPE, OPERATOR_TYPE could also be parsed as a property or method.
@@ -377,7 +376,7 @@ public function parsePostfixExpression(Node\Node $node)
                     // Other types, such as STRING_TYPE and NUMBER_TYPE, can't be parsed as property nor method names.
                     //
                     // As a result, if $token is NOT an operator OR $token->value is NOT a valid property or method name, an exception shall be thrown.
-                    (Token::OPERATOR_TYPE !== $token->type || !preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A', $token->value))
+                    && (Token::OPERATOR_TYPE !== $token->type || !preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A', $token->value))
                 ) {
                     throw new SyntaxError('Expected name.', $token->cursor, $this->stream->getExpression());
                 }
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
index 851d56a46d647..a4b76506a2f91 100644
--- a/src/Symfony/Component/Form/Form.php
+++ b/src/Symfony/Component/Form/Form.php
@@ -636,11 +636,11 @@ public function isEmpty(): bool
             return $isEmptyCallback($this->modelData);
         }
 
-        return FormUtil::isEmpty($this->modelData) ||
+        return FormUtil::isEmpty($this->modelData)
             // arrays, countables
-            (is_countable($this->modelData) && 0 === \count($this->modelData)) ||
+            || (is_countable($this->modelData) && 0 === \count($this->modelData))
             // traversables that are not countable
-            ($this->modelData instanceof \Traversable && 0 === iterator_count($this->modelData));
+            || ($this->modelData instanceof \Traversable && 0 === iterator_count($this->modelData));
     }
 
     public function isValid(): bool
diff --git a/src/Symfony/Component/Form/Guess/Guess.php b/src/Symfony/Component/Form/Guess/Guess.php
index abe09cb39fd8a..fc19ed9ceee68 100644
--- a/src/Symfony/Component/Form/Guess/Guess.php
+++ b/src/Symfony/Component/Form/Guess/Guess.php
@@ -80,8 +80,8 @@ public static function getBestGuess(array $guesses): ?static
      */
     public function __construct(int $confidence)
     {
-        if (self::VERY_HIGH_CONFIDENCE !== $confidence && self::HIGH_CONFIDENCE !== $confidence &&
-            self::MEDIUM_CONFIDENCE !== $confidence && self::LOW_CONFIDENCE !== $confidence) {
+        if (self::VERY_HIGH_CONFIDENCE !== $confidence && self::HIGH_CONFIDENCE !== $confidence
+            && self::MEDIUM_CONFIDENCE !== $confidence && self::LOW_CONFIDENCE !== $confidence) {
             throw new InvalidArgumentException('The confidence should be one of the constants defined in Guess.');
         }
 
diff --git a/src/Symfony/Component/Mailer/Test/Constraint/EmailCount.php b/src/Symfony/Component/Mailer/Test/Constraint/EmailCount.php
index aaff8b886b9ca..57103ffe33700 100644
--- a/src/Symfony/Component/Mailer/Test/Constraint/EmailCount.php
+++ b/src/Symfony/Component/Mailer/Test/Constraint/EmailCount.php
@@ -54,8 +54,7 @@ private function countEmails(MessageEvents $events): int
         foreach ($events->getEvents($this->transport) as $event) {
             if (
                 ($this->queued && $event->isQueued())
-                ||
-                (!$this->queued && !$event->isQueued())
+                || (!$this->queued && !$event->isQueued())
             ) {
                 ++$count;
             }
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
index 62c96374453eb..d91c0520f81d2 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -173,9 +173,9 @@ public function get(): ?array
 
             // Append pessimistic write lock to FROM clause if db platform supports it
             $sql = $query->getSQL();
-            if (($fromPart = $query->getQueryPart('from')) &&
-                ($table = $fromPart[0]['table'] ?? null) &&
-                ($alias = $fromPart[0]['alias'] ?? null)
+            if (($fromPart = $query->getQueryPart('from'))
+                && ($table = $fromPart[0]['table'] ?? null)
+                && ($alias = $fromPart[0]['alias'] ?? null)
             ) {
                 $fromClause = sprintf('%s %s', $table, $alias);
                 $sql = str_replace(
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
index b2c65f1644f52..3e8e10928d8d2 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/PostgreSqlConnection.php
@@ -76,9 +76,9 @@ public function get(): ?array
         $notification = $wrappedConnection->pgsqlGetNotify(\PDO::FETCH_ASSOC, $this->configuration['get_notify_timeout']);
         if (
             // no notifications, or for another table or queue
-            (false === $notification || $notification['message'] !== $this->configuration['table_name'] || $notification['payload'] !== $this->configuration['queue_name']) &&
+            (false === $notification || $notification['message'] !== $this->configuration['table_name'] || $notification['payload'] !== $this->configuration['queue_name'])
             // delayed messages
-            (microtime(true) * 1000 - $this->queueEmptiedAt < $this->configuration['check_delayed_interval'])
+            && (microtime(true) * 1000 - $this->queueEmptiedAt < $this->configuration['check_delayed_interval'])
         ) {
             usleep(1000);
 
diff --git a/src/Symfony/Component/Mime/Header/AbstractHeader.php b/src/Symfony/Component/Mime/Header/AbstractHeader.php
index faa5fd8b6f757..122281127ada6 100644
--- a/src/Symfony/Component/Mime/Header/AbstractHeader.php
+++ b/src/Symfony/Component/Mime/Header/AbstractHeader.php
@@ -269,8 +269,8 @@ private function tokensToString(array $tokens): string
         // Build all tokens back into compliant header
         foreach ($tokens as $i => $token) {
             // Line longer than specified maximum or token was just a new line
-            if (("\r\n" === $token) ||
-                ($i > 0 && \strlen($currentLine.$token) > $this->lineLength)
+            if (("\r\n" === $token)
+                || ($i > 0 && \strlen($currentLine.$token) > $this->lineLength)
                 && '' !== $currentLine) {
                 $headerLines[] = '';
                 $currentLine = &$headerLines[$lineCount++];
diff --git a/src/Symfony/Component/Mime/MessageConverter.php b/src/Symfony/Component/Mime/MessageConverter.php
index 4d86afc316aff..bdce921af1a59 100644
--- a/src/Symfony/Component/Mime/MessageConverter.php
+++ b/src/Symfony/Component/Mime/MessageConverter.php
@@ -80,9 +80,9 @@ private static function createEmailFromAlternativePart(Message $message, Alterna
     {
         $parts = $part->getParts();
         if (
-            2 === \count($parts) &&
-            $parts[0] instanceof TextPart && 'text' === $parts[0]->getMediaType() && 'plain' === $parts[0]->getMediaSubtype() &&
-            $parts[1] instanceof TextPart && 'text' === $parts[1]->getMediaType() && 'html' === $parts[1]->getMediaSubtype()
+            2 === \count($parts)
+            && $parts[0] instanceof TextPart && 'text' === $parts[0]->getMediaType() && 'plain' === $parts[0]->getMediaSubtype()
+            && $parts[1] instanceof TextPart && 'text' === $parts[1]->getMediaType() && 'html' === $parts[1]->getMediaSubtype()
         ) {
             return (new Email(clone $message->getHeaders()))
                 ->text($parts[0]->getBody(), $parts[0]->getPreparedHeaders()->getHeaderParameter('Content-Type', 'charset') ?: 'utf-8')
diff --git a/src/Symfony/Component/Notifier/Test/Constraint/NotificationCount.php b/src/Symfony/Component/Notifier/Test/Constraint/NotificationCount.php
index ed820ccc2bb9a..01fc953735ff1 100644
--- a/src/Symfony/Component/Notifier/Test/Constraint/NotificationCount.php
+++ b/src/Symfony/Component/Notifier/Test/Constraint/NotificationCount.php
@@ -57,8 +57,7 @@ private function countNotifications(NotificationEvents $events): int
         foreach ($events->getEvents($this->transport) as $event) {
             if (
                 ($this->queued && $event->isQueued())
-                ||
-                (!$this->queued && !$event->isQueued())
+                || (!$this->queued && !$event->isQueued())
             ) {
                 ++$count;
             }
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index 843031f01eee6..c9125af216f3e 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -301,8 +301,8 @@ private function readPropertiesUntil(array $zval, PropertyPathInterface $propert
 
             if ($isIndex) {
                 // Create missing nested arrays on demand
-                if (($zval[self::VALUE] instanceof \ArrayAccess && !$zval[self::VALUE]->offsetExists($property)) ||
-                    (\is_array($zval[self::VALUE]) && !isset($zval[self::VALUE][$property]) && !\array_key_exists($property, $zval[self::VALUE]))
+                if (($zval[self::VALUE] instanceof \ArrayAccess && !$zval[self::VALUE]->offsetExists($property))
+                    || (\is_array($zval[self::VALUE]) && !isset($zval[self::VALUE][$property]) && !\array_key_exists($property, $zval[self::VALUE]))
                 ) {
                     if (!$ignoreInvalidIndices) {
                         if (!\is_array($zval[self::VALUE])) {
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
index f5800ce7df5aa..75cae97b71afd 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -301,8 +301,8 @@ private function getDocBlockFromMethod(string $class, string $ucFirstProperty, i
                 }
 
                 if (
-                    (self::ACCESSOR === $type && 0 === $reflectionMethod->getNumberOfRequiredParameters()) ||
-                    (self::MUTATOR === $type && $reflectionMethod->getNumberOfParameters() >= 1)
+                    (self::ACCESSOR === $type && 0 === $reflectionMethod->getNumberOfRequiredParameters())
+                    || (self::MUTATOR === $type && $reflectionMethod->getNumberOfParameters() >= 1)
                 ) {
                     break;
                 }
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
index bd22664a345bb..aaebb102e432a 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -144,8 +144,8 @@ public function getTypes(string $class, string $property, array $context = []):
         }
 
         if (
-            ($context['enable_constructor_extraction'] ?? $this->enableConstructorExtraction) &&
-            $fromConstructor = $this->extractFromConstructor($class, $property)
+            ($context['enable_constructor_extraction'] ?? $this->enableConstructorExtraction)
+            && $fromConstructor = $this->extractFromConstructor($class, $property)
         ) {
             return $fromConstructor;
         }
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
index 277e1a02fe6d5..f9b36fb35a28a 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -307,8 +307,8 @@ private static function hasUserChanged(UserInterface $originalUser, TokenInterfa
         }
 
         if (
-            \count($userRoles) !== \count($refreshedToken->getRoleNames()) ||
-            \count($userRoles) !== \count(array_intersect($userRoles, $refreshedToken->getRoleNames()))
+            \count($userRoles) !== \count($refreshedToken->getRoleNames())
+            || \count($userRoles) !== \count(array_intersect($userRoles, $refreshedToken->getRoleNames()))
         ) {
             return true;
         }
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index 2207012ca6225..965683c899fde 100644
--- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -227,9 +227,9 @@ final protected function appendComment(\DOMNode $node, string $data): bool
      */
     final protected function isElementNameValid(string $name): bool
     {
-        return $name &&
-            !str_contains($name, ' ') &&
-            preg_match('#^[\pL_][\pL0-9._:-]*$#ui', $name);
+        return $name
+            && !str_contains($name, ' ')
+            && preg_match('#^[\pL_][\pL0-9._:-]*$#ui', $name);
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
index 95f65df45f39f..58deea9f01048 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -236,9 +236,9 @@ protected function getAllowedAttributes(string|object $classOrObject, array $con
 
             // If you update this check, update accordingly the one in Symfony\Component\PropertyInfo\Extractor\SerializerExtractor::getProperties()
             if (
-                !$ignore &&
-                ([] === $groups || array_intersect(array_merge($attributeMetadata->getGroups(), ['*']), $groups)) &&
-                $this->isAllowedAttribute($classOrObject, $name = $attributeMetadata->getName(), null, $context)
+                !$ignore
+                && ([] === $groups || array_intersect(array_merge($attributeMetadata->getGroups(), ['*']), $groups))
+                && $this->isAllowedAttribute($classOrObject, $name = $attributeMetadata->getName(), null, $context)
             ) {
                 $allowedAttributes[] = $attributesAsString ? $name : $attributeMetadata;
             }
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 647628018eb8d..20f15becb20cf 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -678,9 +678,9 @@ private function isMaxDepthReached(array $attributesMetadata, string $class, str
     {
         $enableMaxDepth = $context[self::ENABLE_MAX_DEPTH] ?? $this->defaultContext[self::ENABLE_MAX_DEPTH] ?? false;
         if (
-            !$enableMaxDepth ||
-            !isset($attributesMetadata[$attribute]) ||
-            null === $maxDepth = $attributesMetadata[$attribute]->getMaxDepth()
+            !$enableMaxDepth
+            || !isset($attributesMetadata[$attribute])
+            || null === $maxDepth = $attributesMetadata[$attribute]->getMaxDepth()
         ) {
             return false;
         }
diff --git a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
index 0e23d90b304d4..9b39b727fe103 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
@@ -76,11 +76,11 @@ public function normalize(mixed $object, string $format = null, array $context =
 
             $constraint = $violation->getConstraint();
             if (
-                [] !== $payloadFieldsToSerialize &&
-                $constraint &&
-                $constraint->payload &&
+                [] !== $payloadFieldsToSerialize
+                && $constraint
+                && $constraint->payload
                 // If some or all payload fields are whitelisted, add them
-                $payloadFields = null === $payloadFieldsToSerialize || true === $payloadFieldsToSerialize ? $constraint->payload : array_intersect_key($constraint->payload, $payloadFieldsToSerialize)
+                && $payloadFields = null === $payloadFieldsToSerialize || true === $payloadFieldsToSerialize ? $constraint->payload : array_intersect_key($constraint->payload, $payloadFieldsToSerialize)
             ) {
                 $violationEntry['payload'] = $payloadFields;
             }
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index dce4434641346..dc5067dfb6f4b 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -77,10 +77,10 @@ protected function extractAttributes(object $object, string $format = null, arra
 
         foreach ($reflClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflMethod) {
             if (
-                0 !== $reflMethod->getNumberOfRequiredParameters() ||
-                $reflMethod->isStatic() ||
-                $reflMethod->isConstructor() ||
-                $reflMethod->isDestructor()
+                0 !== $reflMethod->getNumberOfRequiredParameters()
+                || $reflMethod->isStatic()
+                || $reflMethod->isConstructor()
+                || $reflMethod->isDestructor()
             ) {
                 continue;
             }
diff --git a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
index 20d81e8809da3..21481a5afd37e 100644
--- a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
@@ -55,8 +55,8 @@ public function validate(mixed $value, Constraint $constraint)
         }
 
         if (
-            \in_array($value, self::getPhpTimezones($constraint->zone, $constraint->countryCode), true) ||
-            \in_array($value, self::getIntlTimezones($constraint->zone, $constraint->countryCode), true)
+            \in_array($value, self::getPhpTimezones($constraint->zone, $constraint->countryCode), true)
+            || \in_array($value, self::getIntlTimezones($constraint->zone, $constraint->countryCode), true)
         ) {
             return;
         }
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index 32eb429f5a686..f1cc47e7fbf67 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -844,8 +844,8 @@ private function parseBlockScalar(string $style, string $chomping = '', int $ind
 
             while (
                 $notEOF && (
-                    $isCurrentLineBlank ||
-                    self::preg_match($pattern, $this->currentLine, $matches)
+                    $isCurrentLineBlank
+                    || self::preg_match($pattern, $this->currentLine, $matches)
                 )
             ) {
                 if ($isCurrentLineBlank && \strlen($this->currentLine) > $indentation) {

From bb656d0bf6f7acea90aca23bf99f3f308d0358ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Anne?= <cedric.anne@gmail.com>
Date: Sun, 2 Apr 2023 11:57:25 +0200
Subject: [PATCH 360/475] [Mailer] Allow overriding default eSMTP
 authenticators

---
 src/Symfony/Component/Mailer/CHANGELOG.md     |   2 +
 .../Tests/Transport/Smtp/DummyStream.php      |  16 ++-
 .../Transport/Smtp/EsmtpTransportTest.php     | 135 ++++++++++++++++++
 .../Mailer/Transport/Smtp/EsmtpTransport.php  |  28 ++--
 4 files changed, 172 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Mailer/CHANGELOG.md b/src/Symfony/Component/Mailer/CHANGELOG.md
index 14baa891ec5a1..291125f3aec32 100644
--- a/src/Symfony/Component/Mailer/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/CHANGELOG.md
@@ -6,6 +6,8 @@ CHANGELOG
 
  * Add `MessageEvent::reject()` to allow rejecting an email before sending it
  * Change the default port for the `mailgun+smtp` transport from 465 to 587
+ * Add `$authenticators` parameter in `EsmtpTransport` constructor and `EsmtpTransport::setAuthenticators()`
+  to allow overriding of default eSMTP authenticators
 
 6.2.7
 -----
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/DummyStream.php b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/DummyStream.php
index 6b24289a269ad..8f2032e8a54d8 100644
--- a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/DummyStream.php
+++ b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/DummyStream.php
@@ -55,7 +55,21 @@ public function write(string $bytes, $debug = true): void
         $this->commands[] = $bytes;
 
         if (str_starts_with($bytes, 'EHLO')) {
-            $this->nextResponse = '250 localhost';
+            $this->nextResponse = '250 localhost'."\r\n".'250-AUTH PLAIN LOGIN CRAM-MD5 XOAUTH2';
+        } elseif (str_starts_with($bytes, 'AUTH LOGIN')) {
+            $this->nextResponse = '334 VXNlcm5hbWU6';
+        } elseif (str_starts_with($bytes, 'dGVzdHVzZXI=')) {
+            $this->nextResponse = '334 UGFzc3dvcmQ6';
+        } elseif (str_starts_with($bytes, 'cDRzc3cwcmQ=')) {
+            $this->nextResponse = '535 5.7.139 Authentication unsuccessful';
+        } elseif (str_starts_with($bytes, 'AUTH CRAM-MD5')) {
+            $this->nextResponse = '334 PDAxMjM0NTY3ODkuMDEyMzQ1NjdAc3ltZm9ueT4=';
+        } elseif (str_starts_with($bytes, 'dGVzdHVzZXIgNTdlYzg2ODM5OWZhZThjY2M5OWFhZGVjZjhiZTAwNmY=')) {
+            $this->nextResponse = '535 5.7.139 Authentication unsuccessful';
+        } elseif (str_starts_with($bytes, 'AUTH PLAIN') || str_starts_with($bytes, 'AUTH XOAUTH2')) {
+            $this->nextResponse = '535 5.7.139 Authentication unsuccessful';
+        } elseif (str_starts_with($bytes, 'RSET')) {
+            $this->nextResponse = '250 2.0.0 Resetting';
         } elseif (str_starts_with($bytes, 'DATA')) {
             $this->nextResponse = '354 Enter message, ending with "." on a line by itself';
         } elseif (str_starts_with($bytes, 'QUIT')) {
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportTest.php
index 6570aaaef4e73..39dea5d3f3e62 100644
--- a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportTest.php
+++ b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportTest.php
@@ -12,6 +12,10 @@
 namespace Symfony\Component\Mailer\Tests\Transport\Smtp;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Exception\TransportException;
+use Symfony\Component\Mailer\Transport\Smtp\Auth\CramMd5Authenticator;
+use Symfony\Component\Mailer\Transport\Smtp\Auth\LoginAuthenticator;
+use Symfony\Component\Mailer\Transport\Smtp\Auth\XOAuth2Authenticator;
 use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
 use Symfony\Component\Mime\Email;
 
@@ -57,6 +61,137 @@ public function testExtensibility()
         $this->assertContains("MAIL FROM:<sender@example.org> RET=HDRS\r\n", $stream->getCommands());
         $this->assertContains("RCPT TO:<recipient@example.org> NOTIFY=FAILURE\r\n", $stream->getCommands());
     }
+
+    public function testConstructorWithDefaultAuthenticators()
+    {
+        $stream = new DummyStream();
+        $transport = new EsmtpTransport(stream: $stream);
+        $transport->setUsername('testuser');
+        $transport->setPassword('p4ssw0rd');
+
+        $message = new Email();
+        $message->from('sender@example.org');
+        $message->addTo('recipient@example.org');
+        $message->text('.');
+
+        try {
+            $transport->send($message);
+            $this->fail('Symfony\Component\Mailer\Exception\TransportException to be thrown');
+        } catch (TransportException $e) {
+            $this->assertStringStartsWith('Failed to authenticate on SMTP server with username "testuser" using the following authenticators: "CRAM-MD5", "LOGIN", "PLAIN", "XOAUTH2".', $e->getMessage());
+        }
+
+        $this->assertEquals(
+            [
+                "EHLO [127.0.0.1]\r\n",
+                // S: 250 localhost
+                // S: 250-AUTH PLAIN LOGIN CRAM-MD5 XOAUTH2
+                "AUTH CRAM-MD5\r\n",
+                // S: 334 PDAxMjM0NTY3ODkuMDEyMzQ1NjdAc3ltZm9ueT4=
+                "dGVzdHVzZXIgNTdlYzg2ODM5OWZhZThjY2M5OWFhZGVjZjhiZTAwNmY=\r\n",
+                // S: 535 5.7.139 Authentication unsuccessful
+                "RSET\r\n",
+                // S: 250 2.0.0 Resetting
+                "AUTH LOGIN\r\n",
+                // S: 334 VXNlcm5hbWU6
+                "dGVzdHVzZXI=\r\n",
+                // S: 334 UGFzc3dvcmQ6
+                "cDRzc3cwcmQ=\r\n",
+                // S: 535 5.7.139 Authentication unsuccessful
+                "RSET\r\n",
+                // S: 250 2.0.0 Resetting
+                "AUTH PLAIN dGVzdHVzZXIAdGVzdHVzZXIAcDRzc3cwcmQ=\r\n",
+                // S: 535 5.7.139 Authentication unsuccessful
+                "RSET\r\n",
+                // S: 250 2.0.0 Resetting
+                "AUTH XOAUTH2 dXNlcj10ZXN0dXNlcgFhdXRoPUJlYXJlciBwNHNzdzByZAEB\r\n",
+                // S: 535 5.7.139 Authentication unsuccessful
+                "RSET\r\n",
+                // S: 250 2.0.0 Resetting
+            ],
+            $stream->getCommands()
+        );
+    }
+
+    public function testConstructorWithRedefinedAuthenticators()
+    {
+        $stream = new DummyStream();
+        $transport = new EsmtpTransport(
+            stream: $stream,
+            authenticators: [new CramMd5Authenticator(), new LoginAuthenticator()]
+        );
+        $transport->setUsername('testuser');
+        $transport->setPassword('p4ssw0rd');
+
+        $message = new Email();
+        $message->from('sender@example.org');
+        $message->addTo('recipient@example.org');
+        $message->text('.');
+
+        try {
+            $transport->send($message);
+            $this->fail('Symfony\Component\Mailer\Exception\TransportException to be thrown');
+        } catch (TransportException $e) {
+            $this->assertStringStartsWith('Failed to authenticate on SMTP server with username "testuser" using the following authenticators: "CRAM-MD5", "LOGIN".', $e->getMessage());
+        }
+
+        $this->assertEquals(
+            [
+                "
10000
EHLO [127.0.0.1]\r\n",
+                // S: 250 localhost
+                // S: 250-AUTH PLAIN LOGIN CRAM-MD5 XOAUTH2
+                "AUTH CRAM-MD5\r\n",
+                // S: 334 PDAxMjM0NTY3ODkuMDEyMzQ1NjdAc3ltZm9ueT4=
+                "dGVzdHVzZXIgNTdlYzg2ODM5OWZhZThjY2M5OWFhZGVjZjhiZTAwNmY=\r\n",
+                // S: 535 5.7.139 Authentication unsuccessful
+                "RSET\r\n",
+                // S: 250 2.0.0 Resetting
+                "AUTH LOGIN\r\n",
+                // S: 334 VXNlcm5hbWU6
+                "dGVzdHVzZXI=\r\n",
+                // S: 334 UGFzc3dvcmQ6
+                "cDRzc3cwcmQ=\r\n",
+                // S: 535 5.7.139 Authentication unsuccessful
+                "RSET\r\n",
+                // S: 250 2.0.0 Resetting
+            ],
+            $stream->getCommands()
+        );
+    }
+
+    public function testSetAuthenticators()
+    {
+        $stream = new DummyStream();
+        $transport = new EsmtpTransport(stream: $stream);
+        $transport->setUsername('testuser');
+        $transport->setPassword('p4ssw0rd');
+        $transport->setAuthenticators([new XOAuth2Authenticator()]);
+
+        $message = new Email();
+        $message->from('sender@example.org');
+        $message->addTo('recipient@example.org');
+        $message->text('.');
+
+        try {
+            $transport->send($message);
+            $this->fail('Symfony\Component\Mailer\Exception\TransportException to be thrown');
+        } catch (TransportException $e) {
+            $this->assertStringStartsWith('Failed to authenticate on SMTP server with username "testuser" using the following authenticators: "XOAUTH2".', $e->getMessage());
+        }
+
+        $this->assertEquals(
+            [
+                "EHLO [127.0.0.1]\r\n",
+                // S: 250 localhost
+                // S: 250-AUTH PLAIN LOGIN CRAM-MD5 XOAUTH2
+                "AUTH XOAUTH2 dXNlcj10ZXN0dXNlcgFhdXRoPUJlYXJlciBwNHNzdzByZAEB\r\n",
+                // S: 535 5.7.139 Authentication unsuccessful
+                "RSET\r\n",
+                // S: 250 2.0.0 Resetting
+            ],
+            $stream->getCommands()
+        );
+    }
 }
 
 class CustomEsmtpTransport extends EsmtpTransport
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
index 0dfe9d1905547..83aef862155bf 100644
--- a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
+++ b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
@@ -32,17 +32,21 @@ class EsmtpTransport extends SmtpTransport
     private string $password = '';
     private array $capabilities;
 
-    public function __construct(string $host = 'localhost', int $port = 0, bool $tls = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null, AbstractStream $stream = null)
+    public function __construct(string $host = 'localhost', int $port = 0, bool $tls = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null, AbstractStream $stream = null, array $authenticators = null)
     {
         parent::__construct($stream, $dispatcher, $logger);
 
-        // order is important here (roughly most secure and popular first)
-        $this->authenticators = [
-            new Auth\CramMd5Authenticator(),
-            new Auth\LoginAuthenticator(),
-            new Auth\PlainAuthenticator(),
-            new Auth\XOAuth2Authenticator(),
-        ];
+        if (null === $authenticators) {
+            // fallback to default authenticators
+            // order is important here (roughly most secure and popular first)
+            $authenticators = [
+                new Auth\CramMd5Authenticator(),
+                new Auth\LoginAuthenticator(),
+                new Auth\PlainAuthenticator(),
+                new Auth\XOAuth2Authenticator(),
+            ];
+        }
+        $this->setAuthenticators($authenticators);
 
         /** @var SocketStream $stream */
         $stream = $this->getStream();
@@ -95,6 +99,14 @@ public function getPassword(): string
         return $this->password;
     }
 
+    public function setAuthenticators(array $authenticators): void
+    {
+        $this->authenticators = [];
+        foreach ($authenticators as $authenticator) {
+            $this->addAuthenticator($authenticator);
+        }
+    }
+
     public function addAuthenticator(AuthenticatorInterface $authenticator): void
     {
         $this->authenticators[] = $authenticator;

From cd23623f548fba111f70043a038b1b762adb5cfc Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 3 Apr 2023 14:52:22 +0200
Subject: [PATCH 361/475] [Notifier][SimpleTextin] Fix license year

---
 src/Symfony/Component/Notifier/Bridge/SimpleTextin/LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/LICENSE b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/LICENSE
index 733c826ebcd63..3ed9f412ce53d 100644
--- a/src/Symfony/Component/Notifier/Bridge/SimpleTextin/LICENSE
+++ b/src/Symfony/Component/Notifier/Bridge/SimpleTextin/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022-present Fabien Potencier
+Copyright (c) 2023-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 27b38987b1facda394c3c3a54e9a3f97af40b2cc Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 3 Apr 2023 15:29:57 +0200
Subject: [PATCH 362/475] Fix tests

---
 src/Symfony/Component/Cache/Traits/RelayProxy.php    | 12 ++++++------
 .../VarDumper/Tests/Caster/ExceptionCasterTest.php   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Cache/Traits/RelayProxy.php b/src/Symfony/Component/Cache/Traits/RelayProxy.php
index ffdd18dd53236..da98b609ae146 100644
--- a/src/Symfony/Component/Cache/Traits/RelayProxy.php
+++ b/src/Symfony/Component/Cache/Traits/RelayProxy.php
@@ -327,9 +327,9 @@ public function lastsave(): \Relay\Relay|false|int
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->lastsave();
     }
 
-    public function bgsave(): \Relay\Relay|bool
+    public function bgsave($schedule = false): \Relay\Relay|bool
     {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgsave();
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bgsave($schedule);
     }
 
     public function save(): \Relay\Relay|bool
@@ -1157,14 +1157,14 @@ public function zrevrangebylex($key, $max, $min, $offset = -1, $count = -1): \Re
         return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrevrangebylex($key, $max, $min, $offset, $count);
     }
 
-    public function zrank($key, $rank): \Relay\Relay|false|int
+    public function zrank($key, $rank, $withscore = false): \Relay\Relay|array|false|int
     {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrank($key, $rank);
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrank($key, $rank, $withscore);
     }
 
-    public function zrevrank($key, $rank): \Relay\Relay|false|int
+    public function zrevrank($key, $rank, $withscore = false): \Relay\Relay|array|false|int
     {
-        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrevrank($key, $rank);
+        return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zrevrank($key, $rank, $withscore);
     }
 
     public function zrem($key, ...$args): \Relay\Relay|false|int
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
index 15eafecbf5350..9c615d9fb0a67 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
@@ -369,7 +369,7 @@ public function testFlattenException()
     -message: "Hello"
     -code: 0
     -previous: null
-    -trace: array:13 %a
+    -trace: array:%d %a
     -traceAsString: ""…%d
     -class: "Exception"
     -statusCode: 500

From 1c6152e77c9f0179a08ac875e9772411065596a6 Mon Sep 17 00:00:00 2001
From: "Phil E. Taylor" <phil@phil-taylor.com>
Date: Fri, 31 Mar 2023 20:49:16 +0100
Subject: [PATCH 363/475] [WebProfilerBundle] Add clickable entry view to debug
 toolbar

---
 src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md |  1 +
 .../Resources/views/Collector/twig.html.twig      | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
index c78fffefd8a15..bdcfc3bdc5d3f 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Add a "role=img" and an explicit title in the .svg file used by the web debug toolbar
    to improve accessibility with screen readers for blind users
+ * Add a clickable link to the entry view twig file in the toolbar
 
 6.1
 ---
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
index a54cc8ff414c4..2e375bb989701 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/twig.html.twig
@@ -46,6 +46,21 @@
     {% endset %}
 
     {% set text %}
+        {% set template = collector.templates|keys|first %}
+        {% set file = collector.templatePaths[template]|default(false) %}
+        {% set link = file ? file|file_link(1) : false %}
+        <div class="sf-toolbar-info-piece">
+            <b>Entry View</b>
+            <span>
+                 {% if link %}
+                     <a href="{{ link }}" title="{{ file }}" class="stretched-link">
+                         {{ template }}
+                     </a>
+                 {% else %}
+                     {{ template }}
+                 {% endif %}
+            </span>
+        </div>
         <div class="sf-toolbar-info-piece">
             <b>Render Time</b>
             <span>{{ time }} ms</span>

From 8a917c923427e437e9040f86d6b4e0ed2f17194a Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 3 Apr 2023 17:18:41 +0200
Subject: [PATCH 364/475] List basecom as backer of version 6.3

---
 README.md | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ff6e42444de69..443b798415f73 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,11 @@ Installation
 Sponsor
 -------
 
-Symfony 6.3 is [backed][27] by [SensioLabs][28], [Shopware][29] and [Les-Tilleuls.coop][30].
+Symfony 6.3 is [backed][27] by
+- [SensioLabs][28]
+- [Shopware][29]
+- [Les-Tilleuls.coop][30]
+- [basecom][31]
 
 As the creator of Symfony, **SensioLabs** supports companies using Symfony,
 with an offering encompassing consultancy, expertise, services, training, and
@@ -33,7 +37,12 @@ develop and fix your projects. We provide a wide range of professional services
 including development, consulting, coaching, training and audits. We also are
 highly skilled in JS, Go and DevOps. We are a worker cooperative!
 
-Help Symfony by [sponsoring][31] its development!
+As a professional software service provider, **basecom** implements customized
+solutions in the areas of e-commerce, PIM solutions and web portals. With their
+experience and certified expertise, they have been one of the most renowned
+Symfony specialists in Germany for many years.
+
+Help Symfony by [sponsoring][32] its development!
 
 Documentation
 -------------
@@ -99,4 +108,5 @@ and supported by [Symfony contributors][19].
 [28]: https://sensiolabs.com
 [29]: https://www.shopware.com
 [30]: https://les-tilleuls.coop
-[31]: https://symfony.com/sponsor
+[31]: https://basecom.de
+[32]: https://symfony.com/sponsor

From caa6fe1583f71652335e1602944507c56b86442d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 3 Apr 2023 17:24:44 +0200
Subject: [PATCH 365/475] [Console] Add Les-Tilleuls.coop as a backer of
 version 6.3

---
 src/Symfony/Component/Console/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/Symfony/Component/Console/README.md b/src/Symfony/Component/Console/README.md
index c89b4a1a2066b..bfd4881092b5f 100644
--- a/src/Symfony/Component/Console/README.md
+++ b/src/Symfony/Component/Console/README.md
@@ -4,6 +4,18 @@ Console Component
 The Console component eases the creation of beautiful and testable command line
 interfaces.
 
+Sponsor
+-------
+
+The Console component for Symfony 6.3 is [backed][1] by [Les-Tilleuls.coop][2].
+
+Les-Tilleuls.coop is a team of 70+ Symfony experts who can help you design, develop and
+fix your projects. They provide a wide range of professional services including development,
+consulting, coaching, training and audits. They also are highly skilled in JS, Go and DevOps.
+They are a worker cooperative!
+
+Help Symfony by [sponsoring][3] its development!
+
 Resources
 ---------
 
@@ -18,3 +30,7 @@ Credits
 
 `Resources/bin/hiddeninput.exe` is a third party binary provided within this
 component. Find sources and license at https://github.com/Seldaek/hidden-input.
+
+[1]: https://symfony.com/backers
+[2]: https://les-tilleuls.coop
+[3]: https://symfony.com/sponsor

From 31f65d480ef90b3639654314a09b6693d38261fc Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 3 Apr 2023 17:40:29 +0200
Subject: [PATCH 366/475] [Security] Add SymfonyCasts as a backer of version
 6.3

---
 src/Symfony/Component/Security/Core/README.md | 2 +-
 src/Symfony/Component/Security/Csrf/README.md | 2 +-
 src/Symfony/Component/Security/Http/README.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Security/Core/README.md b/src/Symfony/Component/Security/Core/README.md
index f930a12bfe9cc..c7385af898948 100644
--- a/src/Symfony/Component/Security/Core/README.md
+++ b/src/Symfony/Component/Security/Core/README.md
@@ -41,7 +41,7 @@ if (!$accessDecisionManager->decide($token, ['ROLE_ADMIN'])) {
 Sponsor
 -------
 
-The Security component for Symfony 6.2 is [backed][1] by [SymfonyCasts][2].
+The Security component for Symfony 6.3 is [backed][1] by [SymfonyCasts][2].
 
 Learn Symfony faster by watching real projects being built and actively coding
 along with them. SymfonyCasts bridges that learning gap, bringing you video
diff --git a/src/Symfony/Component/Security/Csrf/README.md b/src/Symfony/Component/Security/Csrf/README.md
index d4887824125f7..c5eec93bf36eb 100644
--- a/src/Symfony/Component/Security/Csrf/README.md
+++ b/src/Symfony/Component/Security/Csrf/README.md
@@ -7,7 +7,7 @@ The Security CSRF (cross-site request forgery) component provides a class
 Sponsor
 -------
 
-The Security component for Symfony 6.2 is [backed][1] by [SymfonyCasts][2].
+The Security component for Symfony 6.3 is [backed][1] by [SymfonyCasts][2].
 
 Learn Symfony faster by watching real projects being built and actively coding
 along with them. SymfonyCasts bridges that learning gap, bringing you video
diff --git a/src/Symfony/Component/Security/Http/README.md b/src/Symfony/Component/Security/Http/README.md
index 658d4cd9985a1..df491eed73eab 100644
--- a/src/Symfony/Component/Security/Http/README.md
+++ b/src/Symfony/Component/Security/Http/README.md
@@ -15,7 +15,7 @@ $ composer require symfony/security-http
 Sponsor
 -------
 
-The Security component for Symfony 6.2 is [backed][1] by [SymfonyCasts][2].
+The Security component for Symfony 6.3 is [backed][1] by [SymfonyCasts][2].
 
 Learn Symfony faster by watching real projects being built and actively coding
 along with them. SymfonyCasts bridges that learning gap, bringing you video

From 51753b67e14f2f0b12aa7ffcecf4b4fde5b813d1 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 4 Apr 2023 10:25:51 +0200
Subject: [PATCH 367/475] [Notifier] Fix registering many bridges

---
 .../Notifier/Bridge/Mastodon/composer.json    |   2 +-
 .../Notifier/Bridge/Twitter/composer.json     |   2 +-
 .../Exception/UnsupportedSchemeException.php  |   8 +
 .../UnsupportedSchemeExceptionTest.php        | 178 +++++++-----------
 src/Symfony/Component/Notifier/Transport.php  | 171 +++++++----------
 5 files changed, 137 insertions(+), 224 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json b/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json
index 86f548f24c8f0..d29affaa23eb9 100644
--- a/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Mastodon/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "symfony/http-client": "^5.4|^6.0",
-        "symfony/notifier": "^6.2.7"
+        "symfony/notifier": "^6.3"
     },
     "require-dev": {
         "symfony/mime": "^6.2"
diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json b/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json
index a3722597839d5..a8d49444e9ca1 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json
+++ b/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "symfony/http-client": "^5.4.21|^6.2.7",
-        "symfony/notifier": "^6.2.7"
+        "symfony/notifier": "^6.3"
     },
     "require-dev": {
         "symfony/mime": "^6.2"
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index 5254a323b566a..49a9ce0f7c36e 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -28,6 +28,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\Bandwidth\BandwidthTransportFactory::class,
             'package' => 'symfony/bandwidth-notifier',
         ],
+        'chatwork' => [
+            'class' => Bridge\Chatwork\ChatworkTransportFactory::class,
+            'package' => 'symfony/chatwork-notifier',
+        ],
         'clickatell' => [
             'class' => Bridge\Clickatell\ClickatellTransportFactory::class,
             'package' => 'symfony/clickatell-notifier',
@@ -96,6 +100,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\Isendpro\IsendproTransportFactory::class,
             'package' => 'symfony/isendpro-notifier',
         ],
+        'kaz-info-teh' => [
+            'class' => Bridge\KazInfoTeh\KazInfoTehTransportFactory::class,
+            'package' => 'symfony/symfony/kaz-info-teh-notifier',
+        ],
         'lightsms' => [
             'class' => Bridge\LightSms\LightSmsTransportFactory::class,
             'package' => 'symfony/light-sms-notifier',
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index ffc01a84a12d2..528c41b5435d9 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -13,63 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\ClassExistsMock;
-use Symfony\Component\Notifier\Bridge\AllMySms\AllMySmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\AmazonSns\AmazonSnsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Bandwidth\BandwidthTransportFactory;
-use Symfony\Component\Notifier\Bridge\Clickatell\ClickatellTransportFactory;
-use Symfony\Component\Notifier\Bridge\ContactEveryone\ContactEveryoneTransportFactory;
-use Symfony\Component\Notifier\Bridge\Discord\DiscordTransportFactory;
-use Symfony\Component\Notifier\Bridge\Esendex\EsendexTransportFactory;
-use Symfony\Component\Notifier\Bridge\FakeChat\FakeChatTransportFactory;
-use Symfony\Component\Notifier\Bridge\FakeSms\FakeSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Firebase\FirebaseTransportFactory;
-use Symfony\Component\Notifier\Bridge\FortySixElks\FortySixElksTransportFactory;
-use Symfony\Component\Notifier\Bridge\FreeMobile\FreeMobileTransportFactory;
-use Symfony\Component\Notifier\Bridge\GatewayApi\GatewayApiTransportFactory;
-use Symfony\Component\Notifier\Bridge\Gitter\GitterTransportFactory;
-use Symfony\Component\Notifier\Bridge\GoogleChat\GoogleChatTransportFactory;
-use Symfony\Component\Notifier\Bridge\Infobip\InfobipTransportFactory;
-use Symfony\Component\Notifier\Bridge\Iqsms\IqsmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
-use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransportFactory;
-use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mastodon\MastodonTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mercure\MercureTransportFactory;
-use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransportFactory;
-use Symfony\Component\Notifier\Bridge\MessageMedia\MessageMediaTransportFactory;
-use Symfony\Component\Notifier\Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mobyt\MobytTransportFactory;
-use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
-use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
-use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
-use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory;
-use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
-use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
-use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory;
-use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sinch\SinchTransportFactory;
-use Symfony\Component\Notifier\Bridge\Slack\SlackTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sms77\Sms77TransportFactory;
-use Symfony\Component\Notifier\Bridge\Smsapi\SmsapiTransportFactory;
-use Symfony\Component\Notifier\Bridge\SmsBiuras\SmsBiurasTransportFactory;
-use Symfony\Component\Notifier\Bridge\Smsc\SmscTransportFactory;
-use Symfony\Component\Notifier\Bridge\SmsFactor\SmsFactorTransportFactory;
-use Symfony\Component\Notifier\Bridge\SpotHit\SpotHitTransportFactory;
-use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransportFactory;
-use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
-use Symfony\Component\Notifier\Bridge\Termii\TermiiTransportFactory;
-use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
-use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransportFactory;
-use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory;
-use Symfony\Component\Notifier\Bridge\Yunpian\YunpianTransportFactory;
-use Symfony\Component\Notifier\Bridge\Zendesk\ZendeskTransportFactory;
-use Symfony\Component\Notifier\Bridge\Zulip\ZulipTransportFactory;
+use Symfony\Component\Notifier\Bridge;
 use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
 use Symfony\Component\Notifier\Transport\Dsn;
 
@@ -82,63 +26,69 @@ public static function setUpBeforeClass(): void
     {
         ClassExistsMock::register(__CLASS__);
         ClassExistsMock::withMockedClasses([
-            AllMySmsTransportFactory::class => false,
-            AmazonSnsTransportFactory::class => false,
-            BandwidthTransportFactory::class => false,
-            ClickatellTransportFactory::class => false,
-            ContactEveryoneTransportFactory::class => false,
-            DiscordTransportFactory::class => false,
-            EsendexTransportFactory::class => false,
-            FakeChatTransportFactory::class => false,
-            FakeSmsTransportFactory::class => false,
-            FirebaseTransportFactory::class => false,
-            FortySixElksTransportFactory::class => false,
-            FreeMobileTransportFactory::class => false,
-            GatewayApiTransportFactory::class => false,
-            GitterTransportFactory::class => false,
-            GoogleChatTransportFactory::class => false,
-            InfobipTransportFactory::class => false,
-            IqsmsTransportFactory::class => false,
-            IsendproTransportFactory::class => false,
-            LightSmsTransportFactory::class => false,
-            LineNotifyTransportFactory::class => false,
-            LinkedInTransportFactory::class => false,
-            MailjetTransportFactory::class => false,
-            MastodonTransportFactory::class => false,
-            MattermostTransportFactory::class => false,
-            MercureTransportFactory::class => false,
-            MessageBirdTransportFactory::class => false,
-            MessageMediaTransportFactory::class => false,
-            MicrosoftTeamsTransportFactory::class => false,
-            MobytTransportFactory::class => false,
-            OctopushTransportFactory::class => false,
-            OneSignalTransportFactory::class => false,
-            OvhCloudTransportFactory::class => false,
-            PagerDutyTransportFactory::class => false,
-            PlivoTransportFactory::class => false,
-            RingCentralTransportFactory::class => false,
-            RocketChatTransportFactory::class => false,
-            SendberryTransportFactory::class => false,
-            SendinblueTransportFactory::class => false,
-            SinchTransportFactory::class => false,
-            SimpleTextinTransportFactory::class => false,
-            SlackTransportFactory::class => false,
-            Sms77TransportFactory::class => false,
-            SmsapiTransportFactory::class => false,
-            SmsFactorTransportFactory::class => false,
-            SmsBiurasTransportFactory::class => false,
-            SmscTransportFactory::class => false,
-            SpotHitTransportFactory::class => false,
-            TelegramTransportFactory::class => false,
-            TelnyxTransportFactory::class => false,
-            TermiiTransportFactory::class => false,
-            TurboSmsTransportFactory::class => false,
-            TwilioTransportFactory::class => false,
-            TwitterTransportFactory::class => false,
-            VonageTransportFactory::class => false,
-            YunpianTransportFactory::class => false,
-            ZendeskTransportFactory::class => false,
-            ZulipTransportFactory::class => false,
+            Bridge\AllMySms\AllMySmsTransportFactory::class => false,
+            Bridge\AmazonSns\AmazonSnsTransportFactory::class => false,
+            Bridge\Bandwidth\BandwidthTransportFactory::class => false,
+            Bridge\Chatwork\ChatworkTransportFactory::class => false,
+            Bridge\Clickatell\ClickatellTransportFactory::class => false,
+            Bridge\ContactEveryone\ContactEveryoneTransportFactory::class => false,
+            Bridge\Discord\DiscordTransportFactory::class => false,
+            Bridge\Engagespot\EngagespotTransportFactory::class => false,
+            Bridge\Esendex\EsendexTransportFactory::class => false,
+            Bridge\Expo\ExpoTransportFactory::class => false,
+            Bridge\FakeChat\FakeChatTransportFactory::class => false,
+            Bridge\FakeSms\FakeSmsTransportFactory::class => false,
+            Bridge\Firebase\FirebaseTransportFactory::class => false,
+            Bridge\FortySixElks\FortySixElksTransportFactory::class => false,
+            Bridge\FreeMobile\FreeMobileTransportFactory::class => false,
+            Bridge\GatewayApi\GatewayApiTransportFactory::class => false,
+            Bridge\Gitter\GitterTransportFactory::class => false,
+            Bridge\GoogleChat\GoogleChatTransportFactory::class => false,
+            Bridge\Infobip\InfobipTransportFactory::class => false,
+            Bridge\Iqsms\IqsmsTransportFactory::class => false,
+            Bridge\Isendpro\IsendproTransportFactory::class => false,
+            Bridge\KazInfoTeh\KazInfoTehTransportFactory::class => false,
+            Bridge\LightSms\LightSmsTransportFactory::class => false,
+            Bridge\LineNotify\LineNotifyTransportFactory::class => false,
+            Bridge\LinkedIn\LinkedInTransportFactory::class => false,
+            Bridge\Mailjet\MailjetTransportFactory::class => false,
+            Bridge\Mastodon\MastodonTransportFactory::class => false,
+            Bridge\Mattermost\MattermostTransportFactory::class => false,
+            Bridge\Mercure\MercureTransportFactory::class => false,
+            Bridge\MessageBird\MessageBirdTransportFactory::class => false,
+            Bridge\MessageMedia\MessageMediaTransportFactory::class => false,
+            Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory::class => false,
+            Bridge\Mobyt\MobytTransportFactory::class => false,
+            Bridge\Octopush\OctopushTransportFactory::class => false,
+            Bridge\OneSignal\OneSignalTransportFactory::class => false,
+            Bridge\OrangeSms\OrangeSmsTransportFactory::class => false,
+            Bridge\OvhCloud\OvhCloudTransportFactory::class => false,
+            Bridge\PagerDuty\PagerDutyTransportFactory::class => false,
+            Bridge\Plivo\PlivoTransportFactory::class => false,
+            Bridge\Pushover\PushoverTransportFactory::class => false,
+            Bridge\RingCentral\RingCentralTransportFactory::class => false,
+            Bridge\RocketChat\RocketChatTransportFactory::class => false,
+            Bridge\Sendberry\SendberryTransportFactory::class => false,
+            Bridge\Sendinblue\SendinblueTransportFactory::class => false,
+            Bridge\SimpleTextin\SimpleTextinTransportFactory::class => false,
+            Bridge\Sinch\SinchTransportFactory::class => false,
+            Bridge\Slack\SlackTransportFactory::class => false,
+            Bridge\Sms77\Sms77TransportFactory::class => false,
+            Bridge\Smsapi\SmsapiTransportFactory::class => false,
+            Bridge\SmsBiuras\SmsBiurasTransportFactory::class => false,
+            Bridge\Smsc\SmscTransportFactory::class => false,
+            Bridge\SmsFactor\SmsFactorTransportFactory::class => false,
+            Bridge\SpotHit\SpotHitTransportFactory::class => false,
+            Bridge\Telegram\TelegramTransportFactory::class => false,
+            Bridge\Telnyx\TelnyxTransportFactory::class => false,
+            Bridge\Termii\TermiiTransportFactory::class => false,
+            Bridge\TurboSms\TurboSmsTransportFactory::class => false,
+            Bridge\Twilio\TwilioTransportFactory::class => false,
+            Bridge\Twitter\TwitterTransportFactory::class => false,
+            Bridge\Vonage\VonageTransportFactory::class => false,
+            Bridge\Yunpian\YunpianTransportFactory::class => false,
+            Bridge\Zendesk\ZendeskTransportFactory::class => false,
+            Bridge\Zulip\ZulipTransportFactory::class => false,
         ]);
     }
 
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
index 18952abe4e740..fa37f6c9b5848 100644
--- a/src/Symfony/Component/Notifier/Transport.php
+++ b/src/Symfony/Component/Notifier/Transport.php
@@ -11,60 +11,6 @@
 
 namespace Symfony\Component\Notifier;
 
-use Symfony\Component\Notifier\Bridge\AllMySms\AllMySmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\AmazonSns\AmazonSnsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Bandwidth\BandwidthTransportFactory;
-use Symfony\Component\Notifier\Bridge\Chatwork\ChatworkTransportFactory;
-use Symfony\Component\Notifier\Bridge\Clickatell\ClickatellTransportFactory;
-use Symfony\Component\Notifier\Bridge\ContactEveryone\ContactEveryoneTransportFactory;
-use Symfony\Component\Notifier\Bridge\Discord\DiscordTransportFactory;
-use Symfony\Component\Notifier\Bridge\Engagespot\EngagespotTransportFactory;
-use Symfony\Component\Notifier\Bridge\Esendex\EsendexTransportFactory;
-use Symfony\Component\Notifier\Bridge\Expo\ExpoTransportFactory;
-use Symfony\Component\Notifier\Bridge\Firebase\FirebaseTransportFactory;
-use Symfony\Component\Notifier\Bridge\FortySixElks\FortySixElksTransportFactory;
-use Symfony\Component\Notifier\Bridge\FreeMobile\FreeMobileTransportFactory;
-use Symfony\Component\Notifier\Bridge\GatewayApi\GatewayApiTransportFactory;
-use Symfony\Component\Notifier\Bridge\Gitter\GitterTransportFactory;
-use Symfony\Component\Notifier\Bridge\Infobip\InfobipTransportFactory;
-use Symfony\Component\Notifier\Bridge\Iqsms\IqsmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
-use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mastodon\MastodonTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
-use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransportFactory;
-use Symfony\Component\Notifier\Bridge\MessageMedia\MessageMediaTransportFactory;
-use Symfony\Component\Notifier\Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mobyt\MobytTransportFactory;
-use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
-use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
-use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory;
-use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
-use Symfony\Component\Notifier\Bridge\Pushover\PushoverTransportFactory;
-use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
-use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory;
-use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sinch\SinchTransportFactory;
-use Symfony\Component\Notifier\Bridge\Slack\SlackTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sms77\Sms77TransportFactory;
-use Symfony\Component\Notifier\Bridge\Smsapi\SmsapiTransportFactory;
-use Symfony\Component\Notifier\Bridge\SmsBiuras\SmsBiurasTransportFactory;
-use Symfony\Component\Notifier\Bridge\Smsc\SmscTransportFactory;
-use Symfony\Component\Notifier\Bridge\SmsFactor\SmsFactorTransportFactory;
-use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransportFactory;
-use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
-use Symfony\Component\Notifier\Bridge\Termii\TermiiTransportFactory;
-use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
-use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransportFactory;
-use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory;
-use Symfony\Component\Notifier\Bridge\Yunpian\YunpianTransportFactory;
-use Symfony\Component\Notifier\Bridge\Zendesk\ZendeskTransportFactory;
-use Symfony\Component\Notifier\Bridge\Zulip\ZulipTransportFactory;
 use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
 use Symfony\Component\Notifier\Transport\Dsn;
 use Symfony\Component\Notifier\Transport\FailoverTransport;
@@ -82,60 +28,69 @@
 final class Transport
 {
     private const FACTORY_CLASSES = [
-        AllMySmsTransportFactory::class,
-        AmazonSnsTransportFactory::class,
-        BandwidthTransportFactory::class,
-        ChatworkTransportFactory::class,
-        ClickatellTransportFactory::class,
-        ContactEveryoneTransportFactory::class,
-        DiscordTransportFactory::class,
-        EngagespotTransportFactory::class,
-        EsendexTransportFactory::class,
-        ExpoTransportFactory::class,
-        FirebaseTransportFactory::class,
-        FortySixElksTransportFactory::class,
-        FreeMobileTransportFactory::class,
-        GatewayApiTransportFactory::class,
-        GitterTransportFactory::class,
-        InfobipTransportFactory::class,
-        IqsmsTransportFactory::class,
-        IsendproTransportFactory::class,
-        LightSmsTransportFactory::class,
-        MailjetTransportFactory::class,
-        MastodonTransportFactory::class,
-        MattermostTransportFactory::class,
-        MessageBirdTransportFactory::class,
-        MessageMediaTransportFactory::class,
-        MicrosoftTeamsTransportFactory::class,
-        MobytTransportFactory::class,
-        OctopushTransportFactory::class,
-        OrangeSmsTransportFactory::class,
-        OvhCloudTransportFactory::class,
-        PagerDutyTransportFactory::class,
-        PlivoTransportFactory::class,
-        PushoverTransportFactory::class,
-        RingCentralTransportFactory::class,
-        RocketChatTransportFactory::class,
-        SendberryTransportFactory::class,
-        SendinblueTransportFactory::class,
-        SimpleTextinTransportFactory::class,
-        SinchTransportFactory::class,
-        SlackTransportFactory::class,
-        Sms77TransportFactory::class,
-        SmsapiTransportFactory::class,
-        SmsBiurasTransportFactory::class,
-        SmscTransportFactory::class,
-        SmsFactorTransportFactory::class,
-        TelegramTransportFactory::class,
-        TelnyxTransportFactory::class,
-        TermiiTransportFactory::class,
-        TurboSmsTransportFactory::class,
-        TwilioTransportFactory::class,
-        TwitterTransportFactory::class,
-        VonageTransportFactory::class,
-        YunpianTransportFactory::class,
-        ZendeskTransportFactory::class,
-        ZulipTransportFactory::class,
+        Bridge\AllMySms\AllMySmsTransportFactory::class,
+        Bridge\AmazonSns\AmazonSnsTransportFactory::class,
+        Bridge\Bandwidth\BandwidthTransportFactory::class,
+        Bridge\Chatwork\ChatworkTransportFactory::class,
+        Bridge\Clickatell\ClickatellTransportFactory::class,
+        Bridge\ContactEveryone\ContactEveryoneTransportFactory::class,
+        Bridge\Discord\DiscordTransportFactory::class,
+        Bridge\Engagespot\EngagespotTransportFactory::class,
+        Bridge\Esendex\EsendexTransportFactory::class,
+        Bridge\Expo\ExpoTransportFactory::class,
+        Bridge\FakeChat\FakeChatTransportFactory::class,
+        Bridge\FakeSms\FakeSmsTransportFactory::class,
+        Bridge\Firebase\FirebaseTransportFactory::class,
+        Bridge\FortySixElks\FortySixElksTransportFactory::class,
+        Bridge\FreeMobile\FreeMobileTransportFactory::class,
+        Bridge\GatewayApi\GatewayApiTransportFactory::class,
+        Bridge\Gitter\GitterTransportFactory::class,
+        Bridge\GoogleChat\GoogleChatTransportFactory::class,
+        Bridge\Infobip\InfobipTransportFactory::class,
+        Bridge\Iqsms\IqsmsTransportFactory::class,
+        Bridge\Isendpro\IsendproTransportFactory::class,
+        Bridge\KazInfoTeh\KazInfoTehTransportFactory::class,
+        Bridge\LightSms\LightSmsTransportFactory::class,
+        Bridge\LineNotify\LineNotifyTransportFactory::class,
+        Bridge\LinkedIn\LinkedInTransportFactory::class,
+        Bridge\Mailjet\MailjetTransportFactory::class,
+        Bridge\Mastodon\MastodonTransportFactory::class,
+        Bridge\Mattermost\MattermostTransportFactory::class,
+        Bridge\Mercure\MercureTransportFactory::class,
+        Bridge\MessageBird\MessageBirdTransportFactory::class,
+        Bridge\MessageMedia\MessageMediaTransportFactory::class,
+        Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory::class,
+        Bridge\Mobyt\MobytTransportFactory::class,
+        Bridge\Octopush\OctopushTransportFactory::class,
+        Bridge\OneSignal\OneSignalTransportFactory::class,
+        Bridge\OrangeSms\OrangeSmsTransportFactory::class,
+        Bridge\OvhCloud\OvhCloudTransportFactory::class,
+        Bridge\PagerDuty\PagerDutyTransportFactory::class,
+        Bridge\Plivo\PlivoTransportFactory::class,
+        Bridge\Pushover\PushoverTransportFactory::class,
+        Bridge\RingCentral\RingCentralTransportFactory::class,
+        Bridge\RocketChat\RocketChatTransportFactory::class,
+        Bridge\Sendberry\SendberryTransportFactory::class,
+        Bridge\Sendinblue\SendinblueTransportFactory::class,
+        Bridge\SimpleTextin\SimpleTextinTransportFactory::class,
+        Bridge\Sinch\SinchTransportFactory::class,
+        Bridge\Slack\SlackTransportFactory::class,
+        Bridge\Sms77\Sms77TransportFactory::class,
+        Bridge\Smsapi\SmsapiTransportFactory::class,
+        Bridge\SmsBiuras\SmsBiurasTransportFactory::class,
+        Bridge\Smsc\SmscTransportFactory::class,
+        Bridge\SmsFactor\SmsFactorTransportFactory::class,
+        Bridge\SpotHit\SpotHitTransportFactory::class,
+        Bridge\Telegram\TelegramTransportFactory::class,
+        Bridge\Telnyx\TelnyxTransportFactory::class,
+        Bridge\Termii\TermiiTransportFactory::class,
+        Bridge\TurboSms\TurboSmsTransportFactory::class,
+        Bridge\Twilio\TwilioTransportFactory::class,
+        Bridge\Twitter\TwitterTransportFactory::class,
+        Bridge\Vonage\VonageTransportFactory::class,
+        Bridge\Yunpian\YunpianTransportFactory::class,
+        Bridge\Zendesk\ZendeskTransportFactory::class,
+        Bridge\Zulip\ZulipTransportFactory::class,
     ];
 
     private iterable $factories;

From 91f6bc0ad3bf8859290e66962681ec2a3641cffc Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 4 Apr 2023 10:45:02 +0200
Subject: [PATCH 368/475] [Translation] Crowdin renewed their sponsorship for
 v6.3

---
 src/Symfony/Component/Translation/Bridge/Crowdin/README.md | 2 +-
 src/Symfony/Component/Translation/README.md                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/README.md b/src/Symfony/Component/Translation/Bridge/Crowdin/README.md
index ef0702e3d79ba..bce877e2a4083 100644
--- a/src/Symfony/Component/Translation/Bridge/Crowdin/README.md
+++ b/src/Symfony/Component/Translation/Bridge/Crowdin/README.md
@@ -23,7 +23,7 @@ where:
 Sponsor
 -------
 
-This bridge for Symfony 6.2 is [backed][1] by [Crowdin][2].
+This bridge for Symfony 6.3 is [backed][1] by [Crowdin][2].
 
 Crowdin is a cloud-based localization management software helping teams to go global and stay agile.
 
diff --git a/src/Symfony/Component/Translation/README.md b/src/Symfony/Component/Translation/README.md
index b17332198536b..8c981a60ef501 100644
--- a/src/Symfony/Component/Translation/README.md
+++ b/src/Symfony/Component/Translation/README.md
@@ -26,7 +26,7 @@ echo $translator->trans('Hello World!'); // outputs « Bonjour ! »
 Sponsor
 -------
 
-The Translation component for Symfony 6.2 is [backed][1] by:
+The Translation component for Symfony 6.3 is [backed][1] by:
 
  * [Crowdin][2], a cloud-based localization management software helping teams to go global and stay agile.
 

From d708656ea542d4edebf93d2d67b8e38eeb9364e2 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 4 Apr 2023 10:49:48 +0200
Subject: [PATCH 369/475] [FrameworkBundle] alximy renewed their sponsorship
 for v6.3

---
 src/Symfony/Bundle/FrameworkBundle/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/README.md b/src/Symfony/Bundle/FrameworkBundle/README.md
index 1b7dc2c3cf312..402d8718d4875 100644
--- a/src/Symfony/Bundle/FrameworkBundle/README.md
+++ b/src/Symfony/Bundle/FrameworkBundle/README.md
@@ -7,7 +7,7 @@ Symfony full-stack framework.
 Sponsor
 -------
 
-The FrameworkBundle for Symfony 6.2 is [backed][1] by [alximy][2].
+The FrameworkBundle for Symfony 6.3 is [backed][1] by [alximy][2].
 
 A team of passionate humans from very different backgrounds, sharing their love of
 PHP, Symfony and its ecosystem. Their CTO, Expert developers, tech leads, can help

From 4d7facdcb2a3ce9e56efb7d016eb058226dec31f Mon Sep 17 00:00:00 2001
From: Nicolas Dousson <nicolas.dousson@yousign.com>
Date: Wed, 22 Feb 2023 11:43:08 +0100
Subject: [PATCH 370/475] Add new attributes to Infobip API transport to
 support reporting behavior

---
 .../Mailer/Bridge/Infobip/CHANGELOG.md        |  5 ++
 .../Transport/InfobipApiTransportTest.php     | 70 +++++++++++++++++++
 .../Infobip/Transport/InfobipApiTransport.php | 13 ++++
 3 files changed, 88 insertions(+)

diff --git a/src/Symfony/Component/Mailer/Bridge/Infobip/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/Infobip/CHANGELOG.md
index 7174cd7fdeedd..1320fd5f75bc2 100644
--- a/src/Symfony/Component/Mailer/Bridge/Infobip/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/Bridge/Infobip/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add reporting behavior thanks to new attributes support
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Infobip/Tests/Transport/InfobipApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Infobip/Tests/Transport/InfobipApiTransportTest.php
index 020d897559fd6..86470e1591905 100644
--- a/src/Symfony/Component/Mailer/Bridge/Infobip/Tests/Transport/InfobipApiTransportTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Infobip/Tests/Transport/InfobipApiTransportTest.php
@@ -241,6 +241,51 @@ public function testSendEmailWithAttachmentsShouldCalledInfobipWithTheRightParam
         );
     }
 
+    public function testSendEmailWithHeadersShouldCalledInfobipWithTheRightParameters()
+    {
+        $email = $this->basicValidEmail();
+        $email->getHeaders()
+            ->addTextHeader('X-Infobip-IntermediateReport', 'true')
+            ->addTextHeader('X-Infobip-NotifyUrl', 'https://foo.bar')
+            ->addTextHeader('X-Infobip-NotifyContentType', 'application/json')
+            ->addTextHeader('X-Infobip-MessageId', 'RANDOM-CUSTOM-ID');
+
+        $this->transport->send($email);
+
+        $options = $this->response->getRequestOptions();
+        $this->arrayHasKey('body');
+        $this->assertStringMatchesFormat(<<<'TXT'
+            %a
+            --%s
+            Content-Type: text/plain; charset=utf-8
+            Content-Transfer-Encoding: 8bit
+            Content-Disposition: form-data; name="intermediateReport"
+
+            true
+            --%s
+            Content-Type: text/plain; charset=utf-8
+            Content-Transfer-Encoding: 8bit
+            Content-Disposition: form-data; name="notifyUrl"
+
+            https://foo.bar
+            --%s
+            Content-Type: text/plain; charset=utf-8
+            Content-Transfer-Encoding: 8bit
+            Content-Disposition: form-data; name="notifyContentType"
+
+            application/json
+            --%s
+            Content-Type: text/plain; charset=utf-8
+            Content-Transfer-Encoding: 8bit
+            Content-Disposition: form-data; name="messageId"
+
+            RANDOM-CUSTOM-ID
+            --%s--
+            TXT,
+            $options['body']
+        );
+    }
+
     public function testSendMinimalEmailWithSuccess()
     {
         $email = (new Email())
@@ -357,6 +402,31 @@ public function testSendEmailWithAttachmentsWithSuccess()
         );
     }
 
+    public function testSendEmailWithHeadersWithSuccess()
+    {
+        $email = $this->basicValidEmail();
+        $email->getHeaders()
+            ->addTextHeader('X-Infobip-IntermediateReport', 'true')
+            ->addTextHeader('X-Infobip-NotifyUrl', 'https://foo.bar')
+            ->addTextHeader('X-Infobip-NotifyContentType', 'application/json')
+            ->addTextHeader('X-Infobip-MessageId', 'RANDOM-CUSTOM-ID');
+
+        $sentMessage = $this->transport->send($email);
+
+        $this->assertInstanceOf(SentMessage::class, $sentMessage);
+        $this->assertStringMatchesFormat(
+            <<<'TXT'
+            %a
+            X-Infobip-IntermediateReport: true
+            X-Infobip-NotifyUrl: https://foo.bar
+            X-Infobip-NotifyContentType: application/json
+            X-Infobip-MessageId: RANDOM-CUSTOM-ID
+            %a
+            TXT,
+            $sentMessage->toString()
+        );
+    }
+
     public function testSentMessageShouldCaptureInfobipMessageId()
     {
         $this->response = new MockResponse('{"messages": [{"messageId": "somexternalMessageId0"}]}');
diff --git a/src/Symfony/Component/Mailer/Bridge/Infobip/Transport/InfobipApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Infobip/Transport/InfobipApiTransport.php
index ad20f468417c2..7902b9cdff250 100644
--- a/src/Symfony/Component/Mailer/Bridge/Infobip/Transport/InfobipApiTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Infobip/Transport/InfobipApiTransport.php
@@ -33,6 +33,13 @@ final class InfobipApiTransport extends AbstractApiTransport
 {
     private const API_VERSION = '3';
 
+    private const HEADER_TO_MESSAGE = [
+        'X-Infobip-IntermediateReport' => 'intermediateReport',
+        'X-Infobip-NotifyUrl' => 'notifyUrl',
+        'X-Infobip-NotifyContentType' => 'notifyContentType',
+        'X-Infobip-MessageId' => 'messageId',
+    ];
+
     private string $key;
 
     public function __construct(string $key, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
@@ -123,6 +130,12 @@ private function formDataPart(Email $email, Envelope $envelope): FormDataPart
 
         $this->attachmentsFormData($fields, $email);
 
+        foreach ($email->getHeaders()->all() as $header) {
+            if ($convertConf = self::HEADER_TO_MESSAGE[$header->getName()] ?? false) {
+                $fields[$convertConf] = $header->getBodyAsString();
+            }
+        }
+
         return new FormDataPart($fields);
     }
 

From 9fb701dfe19b158c6e4b1dd4fab138b6c0abc999 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Wed, 5 Apr 2023 10:53:22 +0200
Subject: [PATCH 371/475] Add more precise types in EnvVarProcessorInterface

---
 .../DependencyInjection/EnvVarProcessorInterface.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php
index f1295a5debae6..c5366e01b7000 100644
--- a/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php
@@ -23,16 +23,16 @@ interface EnvVarProcessorInterface
     /**
      * Returns the value of the given variable as managed by the current instance.
      *
-     * @param string   $prefix The namespace of the variable
-     * @param string   $name   The name of the variable within the namespace
-     * @param \Closure $getEnv A closure that allows fetching more env vars
+     * @param string                  $prefix The namespace of the variable
+     * @param string                  $name   The name of the variable within the namespace
+     * @param \Closure(string): mixed $getEnv A closure that allows fetching more env vars
      *
      * @throws RuntimeException on error
      */
     public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed;
 
     /**
-     * @return string[] The PHP-types managed by getEnv(), keyed by prefixes
+     * @return array<string, string> The PHP-types managed by getEnv(), keyed by prefixes
      */
     public static function getProvidedTypes(): array;
 }

From 1464e1eb5eeb3fd858691c8de0d8f5b2ec2283fc Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Wed, 5 Apr 2023 11:41:04 +0200
Subject: [PATCH 372/475] Fix the test for casting FlattenException on Windows

The assertion should avoid forcing to show path separators, as done in
other tests of the caster, as path separators are different on Windows.
---
 .../Component/VarDumper/Tests/Caster/ExceptionCasterTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
index 9c615d9fb0a67..66708944c63d6 100644
--- a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
@@ -375,7 +375,7 @@ public function testFlattenException()
     -statusCode: 500
     -statusText: "Internal Server Error"
     -headers: []
-    -file: "%s/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php"
+    -file: "%sExceptionCasterTest.php"
     -line: %d
     -asString: null
   }

From 046faf2ea3ee8a9005289b34caf3585cb76429c0 Mon Sep 17 00:00:00 2001
From: Tugdual Saunier <tugdual.saunier@gmail.com>
Date: Wed, 5 Apr 2023 13:04:49 -0400
Subject: [PATCH 373/475] [Serializer] Cleanup `static` uses when classes are
 final

---
 .../Component/Serializer/Normalizer/FormErrorNormalizer.php     | 2 +-
 .../Component/Serializer/Normalizer/MimeMessageNormalizer.php   | 2 +-
 src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Normalizer/FormErrorNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/FormErrorNormalizer.php
index 77f17639ae15a..57d9bd4bb10a9 100644
--- a/src/Symfony/Component/Serializer/Normalizer/FormErrorNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/FormErrorNormalizer.php
@@ -90,6 +90,6 @@ public function hasCacheableSupportsMethod(): bool
     {
         trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
 
-        return __CLASS__ === static::class;
+        return true;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
index 74a8b66b10100..1decc0137be77 100644
--- a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
@@ -121,6 +121,6 @@ public function hasCacheableSupportsMethod(): bool
     {
         trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
 
-        return __CLASS__ === static::class;
+        return true;
     }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php
index e723ec3f2dadb..40559ec0b04e2 100644
--- a/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php
@@ -106,6 +106,6 @@ public function hasCacheableSupportsMethod(): bool
     {
         trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "getSupportedTypes()" instead.', __METHOD__);
 
-        return __CLASS__ === static::class;
+        return true;
     }
 }

From a28ff011e89f3d247eab517f69e0d1e58d8cdb29 Mon Sep 17 00:00:00 2001
From: Tugdual Saunier <tugdual.saunier@gmail.com>
Date: Wed, 5 Apr 2023 15:10:35 -0400
Subject: [PATCH 374/475] [Serializer] Add missing upgrade note

---
 UPGRADE-6.3.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 166040bd3d54e..8b44f06e2fb1b 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -109,3 +109,4 @@ Serializer
 ----------
 
  * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
+ * Deprecate `CacheableSupportsMethodInterface` in favor of the new `getSupportedTypes(?string $format)` methods

From 2683ad19ed99f29d4ec839f5d41d0f94cf9ff857 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 5 Apr 2023 15:55:52 +0200
Subject: [PATCH 375/475] [FrameworkBundle] Reduce aliasing for etc bridges

---
 .../FrameworkExtension.php                    | 280 +++++++-----------
 .../Resources/config/notifier_transports.php  | 190 ++++--------
 2 files changed, 164 insertions(+), 306 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index e2223da1ab3d5..f4c68337394f2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -97,29 +97,13 @@
 use Symfony\Component\Lock\LockInterface;
 use Symfony\Component\Lock\PersistingStoreInterface;
 use Symfony\Component\Lock\Store\StoreFactory;
-use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesTransportFactory;
-use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
-use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipTransportFactory as InfobipMailerTransportFactory;
-use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
-use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendTransportFactory;
-use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
-use Symfony\Component\Mailer\Bridge\Mailgun\Webhook\MailgunRequestParser;
-use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
-use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceTransportFactory;
-use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory;
-use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
-use Symfony\Component\Mailer\Bridge\Postmark\Webhook\PostmarkRequestParser;
-use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
-use Symfony\Component\Mailer\Bridge\Sendinblue\Transport\SendinblueTransportFactory;
+use Symfony\Component\Mailer\Bridge as MailerBridge;
 use Symfony\Component\Mailer\Command\MailerTestCommand;
 use Symfony\Component\Mailer\EventListener\MessengerTransportListener;
 use Symfony\Component\Mailer\Mailer;
 use Symfony\Component\Mercure\HubRegistry;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
-use Symfony\Component\Messenger\Bridge\AmazonSqs\Transport\AmazonSqsTransportFactory;
-use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpTransportFactory;
-use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\BeanstalkdTransportFactory;
-use Symfony\Component\Messenger\Bridge\Redis\Transport\RedisTransportFactory;
+use Symfony\Component\Messenger\Bridge as MessengerBridge;
 use Symfony\Component\Messenger\Command\StatsCommand;
 use Symfony\Component\Messenger\Handler\BatchHandlerInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
@@ -127,74 +111,12 @@
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Middleware\RouterContextMiddleware;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
-use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
+use Symfony\Component\Messenger\Transport\TransportFactoryInterface as MessengerTransportFactoryInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\MimeTypeGuesserInterface;
 use Symfony\Component\Mime\MimeTypes;
-use Symfony\Component\Notifier\Bridge\AllMySms\AllMySmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\AmazonSns\AmazonSnsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Bandwidth\BandwidthTransportFactory;
-use Symfony\Component\Notifier\Bridge\Chatwork\ChatworkTransportFactory;
-use Symfony\Component\Notifier\Bridge\Clickatell\ClickatellTransportFactory;
-use Symfony\Component\Notifier\Bridge\ContactEveryone\ContactEveryoneTransportFactory;
-use Symfony\Component\Notifier\Bridge\Discord\DiscordTransportFactory;
-use Symfony\Component\Notifier\Bridge\Engagespot\EngagespotTransportFactory;
-use Symfony\Component\Notifier\Bridge\Esendex\EsendexTransportFactory;
-use Symfony\Component\Notifier\Bridge\Expo\ExpoTransportFactory;
-use Symfony\Component\Notifier\Bridge\FakeChat\FakeChatTransportFactory;
-use Symfony\Component\Notifier\Bridge\FakeSms\FakeSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Firebase\FirebaseTransportFactory;
-use Symfony\Component\Notifier\Bridge\FortySixElks\FortySixElksTransportFactory;
-use Symfony\Component\Notifier\Bridge\FreeMobile\FreeMobileTransportFactory;
-use Symfony\Component\Notifier\Bridge\GatewayApi\GatewayApiTransportFactory;
-use Symfony\Component\Notifier\Bridge\Gitter\GitterTransportFactory;
-use Symfony\Component\Notifier\Bridge\GoogleChat\GoogleChatTransportFactory;
-use Symfony\Component\Notifier\Bridge\Infobip\InfobipTransportFactory;
-use Symfony\Component\Notifier\Bridge\Iqsms\IqsmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
-use Symfony\Component\Notifier\Bridge\KazInfoTeh\KazInfoTehTransportFactory;
-use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransportFactory;
-use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory as MailjetNotifierTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mastodon\MastodonTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mercure\MercureTransportFactory;
-use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransport;
-use Symfony\Component\Notifier\Bridge\MessageMedia\MessageMediaTransportFactory;
-use Symfony\Component\Notifier\Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mobyt\MobytTransportFactory;
-use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
-use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
-use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
-use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory;
-use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
-use Symfony\Component\Notifier\Bridge\Pushover\PushoverTransportFactory;
-use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
-use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory as SendinblueNotifierTransportFactory;
-use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sinch\SinchTransportFactory;
-use Symfony\Component\Notifier\Bridge\Slack\SlackTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sms77\Sms77TransportFactory;
-use Symfony\Component\Notifier\Bridge\Smsapi\SmsapiTransportFactory;
-use Symfony\Component\Notifier\Bridge\SmsBiuras\SmsBiurasTransportFactory;
-use Symfony\Component\Notifier\Bridge\Smsc\SmscTransportFactory;
-use Symfony\Component\Notifier\Bridge\SmsFactor\SmsFactorTransportFactory;
-use Symfony\Component\Notifier\Bridge\SpotHit\SpotHitTransportFactory;
-use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransportFactory;
-use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
-use Symfony\Component\Notifier\Bridge\Termii\TermiiTransportFactory;
-use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransport;
-use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
-use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransportFactory;
-use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory;
-use Symfony\Component\Notifier\Bridge\Yunpian\YunpianTransportFactory;
-use Symfony\Component\Notifier\Bridge\Zendesk\ZendeskTransportFactory;
-use Symfony\Component\Notifier\Bridge\Zulip\ZulipTransportFactory;
+use Symfony\Component\Notifier\Bridge as NotifierBridge;
 use Symfony\Component\Notifier\ChatterInterface;
 use Symfony\C
10000
omponent\Notifier\Notifier;
 use Symfony\Component\Notifier\Recipient\Recipient;
@@ -237,9 +159,7 @@
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\String\LazyString;
 use Symfony\Component\String\Slugger\SluggerInterface;
-use Symfony\Component\Translation\Bridge\Crowdin\CrowdinProviderFactory;
-use Symfony\Component\Translation\Bridge\Loco\LocoProviderFactory;
-use Symfony\Component\Translation\Bridge\Lokalise\LokaliseProviderFactory;
+use Symfony\Component\Translation\Bridge as TranslationBridge;
 use Symfony\Component\Translation\Command\XliffLintCommand as BaseXliffLintCommand;
 use Symfony\Component\Translation\Extractor\PhpAstExtractor;
 use Symfony\Component\Translation\LocaleSwitcher;
@@ -555,7 +475,7 @@ public function load(array $configs, ContainerBuilder $container)
             $container->removeDefinition('console.command.messenger_failed_messages_remove');
             $container->removeDefinition('cache.messenger.restart_workers_signal');
 
-            if ($container->hasDefinition('messenger.transport.amqp.factory') && !class_exists(AmqpTransportFactory::class)) {
+            if ($container->hasDefinition('messenger.transport.amqp.factory') && !class_exists(MessengerBridge\Amqp\Transport\AmqpTransportFactory::class)) {
                 if (class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory::class)) {
                     $container->getDefinition('messenger.transport.amqp.factory')
                         ->setClass(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory::class)
@@ -565,7 +485,7 @@ public function load(array $configs, ContainerBuilder $container)
                 }
             }
 
-            if ($container->hasDefinition('messenger.transport.redis.factory') && !class_exists(RedisTransportFactory::class)) {
+            if ($container->hasDefinition('messenger.transport.redis.factory') && !class_exists(MessengerBridge\Redis\Transport\RedisTransportFactory::class)) {
                 if (class_exists(\Symfony\Component\Messenger\Transport\RedisExt\RedisTransportFactory::class)) {
                     $container->getDefinition('messenger.transport.redis.factory')
                         ->setClass(\Symfony\Component\Messenger\Transport\RedisExt\RedisTransportFactory::class)
@@ -686,7 +606,7 @@ public function load(array $configs, ContainerBuilder $container)
             ->addTag('messenger.message_handler');
         $container->registerForAutoconfiguration(BatchHandlerInterface::class)
             ->addTag('messenger.message_handler');
-        $container->registerForAutoconfiguration(TransportFactoryInterface::class)
+        $container->registerForAutoconfiguration(MessengerTransportFactoryInterface::class)
             ->addTag('messenger.transport_factory');
         $container->registerForAutoconfiguration(MimeTypeGuesserInterface::class)
             ->addTag('mime.mime_type_guesser');
@@ -1488,9 +1408,9 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         }
 
         $classToServices = [
-            CrowdinProviderFactory::class => 'translation.provider_factory.crowdin',
-            LocoProviderFactory::class => 'translation.provider_factory.loco',
-            LokaliseProviderFactory::class => 'translation.provider_factory.lokalise',
+            TranslationBridge\Crowdin\CrowdinProviderFactory::class => 'translation.provider_factory.crowdin',
+            TranslationBridge\Loco\LocoProviderFactory::class => 'translation.provider_factory.loco',
+            TranslationBridge\Lokalise\LokaliseProviderFactory::class => 'translation.provider_factory.lokalise',
         ];
 
         $parentPackages = ['symfony/framework-bundle', 'symfony/translation', 'symfony/http-client'];
@@ -2039,19 +1959,19 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $container->removeDefinition('serializer.normalizer.flatten_exception');
         }
 
-        if (ContainerBuilder::willBeAvailable('symfony/amqp-messenger', AmqpTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'])) {
+        if (ContainerBuilder::willBeAvailable('symfony/amqp-messenger', MessengerBridge\Amqp\Transport\AmqpTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'])) {
             $container->getDefinition('messenger.transport.amqp.factory')->addTag('messenger.transport_factory');
         }
 
-        if (ContainerBuilder::willBeAvailable('symfony/redis-messenger', RedisTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'])) {
+        if (ContainerBuilder::willBeAvailable('symfony/redis-messenger', MessengerBridge\Redis\Transport\RedisTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'])) {
             $container->getDefinition('messenger.transport.redis.factory')->addTag('messenger.transport_factory');
         }
 
-        if (ContainerBuilder::willBeAvailable('symfony/amazon-sqs-messenger', AmazonSqsTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'])) {
+        if (ContainerBuilder::willBeAvailable('symfony/amazon-sqs-messenger', MessengerBridge\AmazonSqs\Transport\AmazonSqsTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'])) {
             $container->getDefinition('messenger.transport.sqs.factory')->addTag('messenger.transport_factory');
         }
 
-        if (ContainerBuilder::willBeAvailable('symfony/beanstalkd-messenger', BeanstalkdTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'])) {
+        if (ContainerBuilder::willBeAvailable('symfony/beanstalkd-messenger', MessengerBridge\Beanstalkd\Transport\BeanstalkdTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'])) {
             $container->getDefinition('messenger.transport.beanstalkd.factory')->addTag('messenger.transport_factory');
         }
 
@@ -2546,18 +2466,18 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
         }
 
         $classToServices = [
-            GmailTransportFactory::class => 'mailer.transport_factory.gmail',
-            InfobipMailerTransportFactory::class => 'mailer.transport_factory.infobip',
-            MailerSendTransportFactory::class => 'mailer.transport_factory.mailersend',
-            MailgunTransportFactory::class => 'mailer.transport_factory.mailgun',
-            MailjetTransportFactory::class => 'mailer.transport_factory.mailjet',
-            MailPaceTransportFactory::class => 'mailer.transport_factory.mailpace',
-            MandrillTransportFactory::class => 'mailer.transport_factory.mailchimp',
-            OhMySmtpTransportFactory::class => 'mailer.transport_factory.ohmysmtp',
-            PostmarkTransportFactory::class => 'mailer.transport_factory.postmark',
-            SendgridTransportFactory::class => 'mailer.transport_factory.sendgrid',
-            SendinblueTransportFactory::class => 'mailer.transport_factory.sendinblue',
-            SesTransportFactory::class => 'mailer.transport_factory.amazon',
+            MailerBridge\Google\Transport\GmailTransportFactory::class => 'mailer.transport_factory.gmail',
+            MailerBridge\Infobip\Transport\InfobipTransportFactory::class => 'mailer.transport_factory.infobip',
+            MailerBridge\MailerSend\Transport\MailerSendTransportFactory::class => 'mailer.transport_factory.mailersend',
+            MailerBridge\Mailgun\Transport\MailgunTransportFactory::class => 'mailer.transport_factory.mailgun',
+            MailerBridge\Mailjet\Transport\MailjetTransportFactory::class => 'mailer.transport_factory.mailjet',
+            MailerBridge\MailPace\Transport\MailPaceTransportFactory::class => 'mailer.transport_factory.mailpace',
+            MailerBridge\Mailchimp\Transport\MandrillTransportFactory::class => 'mailer.transport_factory.mailchimp',
+            MailerBridge\OhMySmtp\Transport\OhMySmtpTransportFactory::class => 'mailer.transport_factory.ohmysmtp',
+            MailerBridge\Postmark\Transport\PostmarkTransportFactory::class => 'mailer.transport_factory.postmark',
+            MailerBridge\Sendgrid\Transport\SendgridTransportFactory::class => 'mailer.transport_factory.sendgrid',
+            MailerBridge\Sendinblue\Transport\SendinblueTransportFactory::class => 'mailer.transport_factory.sendinblue',
+            MailerBridge\Amazon\Transport\SesTransportFactory::class => 'mailer.transport_factory.amazon',
         ];
 
         foreach ($classToServices as $class => $service) {
@@ -2570,8 +2490,8 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
 
         if ($webhookEnabled) {
             $webhookRequestParsers = [
-                MailgunRequestParser::class => 'mailer.webhook.request_parser.mailgun',
-                PostmarkRequestParser::class => 'mailer.webhook.request_parser.postmark',
+                MailerBridge\Mailgun\Webhook\MailgunRequestParser::class => 'mailer.webhook.request_parser.mailgun',
+                MailerBridge\Postmark\Webhook\PostmarkRequestParser::class => 'mailer.webhook.request_parser.postmark',
             ];
 
             foreach ($webhookRequestParsers as $class => $service) {
@@ -2675,69 +2595,69 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             ->addTag('texter.transport_factory');
 
         $classToServices = [
-            AllMySmsTransportFactory::class => 'notifier.transport_factory.all-my-sms',
-            AmazonSnsTransportFactory::class => 'notifier.transport_factory.amazon-sns',
-            BandwidthTransportFactory::class => 'notifier.transport_factory.bandwidth',
-            ChatworkTransportFactory::class => 'notifier.transport_factory.chatwork',
-            ClickatellTransportFactory::class => 'notifier.transport_factory.clickatell',
-            ContactEveryoneTransportFactory::class => 'notifier.transport_factory.contact-everyone',
-            DiscordTransportFactory::class => 'notifier.transport_factory.discord',
-            EngagespotTransportFactory::class => 'notifier.transport_factory.engagespot',
-            EsendexTransportFactory::class => 'notifier.transport_factory.esendex',
-            ExpoTransportFactory::class => 'notifier.transport_factory.expo',
-            FakeChatTransportFactory::class => 'notifier.transport_factory.fake-chat',
-            FakeSmsTransportFactory::class => 'notifier.transport_factory.fake-sms',
-            FirebaseTransportFactory::class => 'notifier.transport_factory.firebase',
-            FortySixElksTransportFactory::class => 'notifier.transport_factory.forty-six-elks',
-            FreeMobileTransportFactory::class => 'notifier.transport_factory.free-mobile',
-            GatewayApiTransportFactory::class => 'notifier.transport_factory.gateway-api',
-            GitterTransportFactory::class => 'notifier.transport_factory.gitter',
-            GoogleChatTransportFactory::class => 'notifier.transport_factory.google-chat',
-            InfobipTransportFactory::class => 'notifier.transport_factory.infobip',
-            IqsmsTransportFactory::class => 'notifier.transport_factory.iqsms',
-            IsendproTransportFactory::class => 'notifier.transport_factory.isendpro',
-            KazInfoTehTransportFactory::class => 'notifier.transport_factory.kaz-info-teh',
-            LightSmsTransportFactory::class => 'notifier.transport_factory.light-sms',
-            LineNotifyTransportFactory::class => 'notifier.transport_factory.line-notify',
-            LinkedInTransportFactory::class => 'notifier.transport_factory.linked-in',
-            MailjetNotifierTransportFactory::class => 'notifier.transport_factory.mailjet',
-            MastodonTransportFactory::class => 'notifier.transport_factory.mastodon',
-            MattermostTransportFactory::class => 'notifier.transport_factory.mattermost',
-            MercureTransportFactory::class => 'notifier.transport_factory.mercure',
-            MessageBirdTransport::class => 'notifier.transport_factory.message-bird',
-            MessageMediaTransportFactory::class => 'notifier.transport_factory.message-media',
-            MicrosoftTeamsTransportFactory::class => 'notifier.transport_factory.microsoft-teams',
-            MobytTransportFactory::class => 'notifier.transport_factory.mobyt',
-            OctopushTransportFactory::class => 'notifier.transport_factory.octopush',
-            OneSignalTransportFactory::class => 'notifier.transport_factory.one-signal',
-            OrangeSmsTransportFactory::class => 'notifier.transport_factory.orange-sms',
-            OvhCloudTransportFactory::class => 'notifier.transport_factory.ovh-cloud',
-            PagerDutyTransportFactory::class => 'notifier.transport_factory.pager-duty',
-            PlivoTransportFactory::class => 'notifier.transport_factory.plivo',
-            PushoverTransportFactory::class => 'notifier.transport_factory.pushover',
-            RingCentralTransportFactory::class => 'notifier.transport_factory.ring-central',
-            RocketChatTransportFactory::class => 'notifier.transport_factory.rocket-chat',
-            SendberryTransportFactory::class => 'notifier.transport_factory.sendberry',
-            SimpleTextinTransportFactory::class => 'notifier.transport_factory.simple-textin',
-            SendinblueNotifierTransportFactory::class => 'notifier.transport_factory.sendinblue',
-            SinchTransportFactory::class => 'notifier.transport_factory.sinch',
-            SlackTransportFactory::class => 'notifier.transport_factory.slack',
-            Sms77TransportFactory::class => 'notifier.transport_factory.sms77',
-            SmsapiTransportFactory::class => 'notifier.transport_factory.smsapi',
-            SmsBiurasTransportFactory::class => 'notifier.transport_factory.sms-biuras',
-            SmscTransportFactory::class => 'notifier.transport_factory.smsc',
-            SmsFactorTransportFactory::class => 'notifier.transport_factory.sms-factor',
-            SpotHitTransportFactory::class => 'notifier.transport_factory.spot-hit',
-            TelegramTransportFactory::class => 'notifier.transport_factory.telegram',
-            TelnyxTransportFactory::class => 'notifier.transport_factory.telnyx',
-            TermiiTransportFactory::class => 'notifier.transport_factory.termii',
-            TurboSmsTransport::class => 'notifier.transport_factory.turbo-sms',
-            TwilioTransportFactory::class => 'notifier.transport_factory.twilio',
-            TwitterTransportFactory::class => 'notifier.transport_factory.twitter',
-            VonageTransportFactory::class => 'notifier.transport_factory.vonage',
-            YunpianTransportFactory::class => 'notifier.transport_factory.yunpian',
-            ZendeskTransportFactory::class => 'notifier.transport_factory.zendesk',
-            ZulipTransportFactory::class => 'notifier.transport_factory.zulip',
+            NotifierBridge\AllMySms\AllMySmsTransportFactory::class => 'notifier.transport_factory.all-my-sms',
+            NotifierBridge\AmazonSns\AmazonSnsTransportFactory::class => 'notifier.transport_factory.amazon-sns',
+            NotifierBridge\Bandwidth\BandwidthTransportFactory::class => 'notifier.transport_factory.bandwidth',
+            NotifierBridge\Chatwork\ChatworkTransportFactory::class => 'notifier.transport_factory.chatwork',
+            NotifierBridge\Clickatell\ClickatellTransportFactory::class => 'notifier.transport_factory.clickatell',
+            NotifierBridge\ContactEveryone\ContactEveryoneTransportFactory::class => 'notifier.transport_factory.contact-everyone',
+            NotifierBridge\Discord\DiscordTransportFactory::class => 'notifier.transport_factory.discord',
+            NotifierBridge\Engagespot\EngagespotTransportFactory::class => 'notifier.transport_factory.engagespot',
+            NotifierBridge\Esendex\EsendexTransportFactory::class => 'notifier.transport_factory.esendex',
+            NotifierBridge\Expo\ExpoTransportFactory::class => 'notifier.transport_factory.expo',
+            NotifierBridge\FakeChat\FakeChatTransportFactory::class => 'notifier.transport_factory.fake-chat',
+            NotifierBridge\FakeSms\FakeSmsTransportFactory::class => 'notifier.transport_factory.fake-sms',
+            NotifierBridge\Firebase\FirebaseTransportFactory::class => 'notifier.transport_factory.firebase',
+            NotifierBridge\FortySixElks\FortySixElksTransportFactory::class => 'notifier.transport_factory.forty-six-elks',
+            NotifierBridge\FreeMobile\FreeMobileTransportFactory::class => 'notifier.transport_factory.free-mobile',
+            NotifierBridge\GatewayApi\GatewayApiTransportFactory::class => 'notifier.transport_factory.gateway-api',
+            NotifierBridge\Gitter\GitterTransportFactory::class => 'notifier.transport_factory.gitter',
+            NotifierBridge\GoogleChat\GoogleChatTransportFactory::class => 'notifier.transport_factory.google-chat',
+            NotifierBridge\Infobip\InfobipTransportFactory::class => 'notifier.transport_factory.infobip',
+            NotifierBridge\Iqsms\IqsmsTransportFactory::class => 'notifier.transport_factory.iqsms',
+            NotifierBridge\Isendpro\IsendproTransportFactory::class => 'notifier.transport_factory.isendpro',
+            NotifierBridge\KazInfoTeh\KazInfoTehTransportFactory::class => 'notifier.transport_factory.kaz-info-teh',
+            NotifierBridge\LightSms\LightSmsTransportFactory::class => 'notifier.transport_factory.light-sms',
+            NotifierBridge\LineNotify\LineNotifyTransportFactory::class => 'notifier.transport_factory.line-notify',
+            NotifierBridge\LinkedIn\LinkedInTransportFactory::class => 'notifier.transport_factory.linked-in',
+            NotifierBridge\Mailjet\MailjetTransportFactory::class => 'notifier.transport_factory.mailjet',
+            NotifierBridge\Mastodon\MastodonTransportFactory::class => 'notifier.transport_factory.mastodon',
+            NotifierBridge\Mattermost\MattermostTransportFactory::class => 'notifier.transport_factory.mattermost',
+            NotifierBridge\Mercure\MercureTransportFactory::class => 'notifier.transport_factory.mercure',
+            NotifierBridge\MessageBird\MessageBirdTransport::class => 'notifier.transport_factory.message-bird',
+            NotifierBridge\MessageMedia\MessageMediaTransportFactory::class => 'notifier.transport_factory.message-media',
+            NotifierBridge\MicrosoftTeams\MicrosoftTeamsTransportFactory::class => 'notifier.transport_factory.microsoft-teams',
+            NotifierBridge\Mobyt\MobytTransportFactory::class => 'notifier.transport_factory.mobyt',
+            NotifierBridge\Octopush\OctopushTransportFactory::class => 'notifier.transport_factory.octopush',
+            NotifierBridge\OneSignal\OneSignalTransportFactory::class => 'notifier.transport_factory.one-signal',
+            NotifierBridge\OrangeSms\OrangeSmsTransportFactory::class => 'notifier.transport_factory.orange-sms',
+            NotifierBridge\OvhCloud\OvhCloudTransportFactory::class => 'notifier.transport_factory.ovh-cloud',
+            NotifierBridge\PagerDuty\PagerDutyTransportFactory::class => 'notifier.transport_factory.pager-duty',
+            NotifierBridge\Plivo\PlivoTransportFactory::class => 'notifier.transport_factory.plivo',
+            NotifierBridge\Pushover\PushoverTransportFactory::class => 'notifier.transport_factory.pushover',
+            NotifierBridge\RingCentral\RingCentralTransportFactory::class => 'notifier.transport_factory.ring-central',
+            NotifierBridge\RocketChat\RocketChatTransportFactory::class => 'notifier.transport_factory.rocket-chat',
+            NotifierBridge\Sendberry\SendberryTransportFactory::class => 'notifier.transport_factory.sendberry',
+            NotifierBridge\SimpleTextin\SimpleTextinTransportFactory::class => 'notifier.transport_factory.simple-textin',
+            NotifierBridge\Sendinblue\SendinblueTransportFactory::class => 'notifier.transport_factory.sendinblue',
+            NotifierBridge\Sinch\SinchTransportFactory::class => 'notifier.transport_factory.sinch',
+            NotifierBridge\Slack\SlackTransportFactory::class => 'notifier.transport_factory.slack',
+            NotifierBridge\Sms77\Sms77TransportFactory::class => 'notifier.transport_factory.sms77',
+            NotifierBridge\Smsapi\SmsapiTransportFactory::class => 'notifier.transport_factory.smsapi',
+            NotifierBridge\SmsBiuras\SmsBiurasTransportFactory::class => 'notifier.transport_factory.sms-biuras',
+            NotifierBridge\Smsc\SmscTransportFactory::class => 'notifier.transport_factory.smsc',
+            NotifierBridge\SmsFactor\SmsFactorTransportFactory::class => 'notifier.transport_factory.sms-factor',
+            NotifierBridge\SpotHit\SpotHitTransportFactory::class => 'notifier.transport_factory.spot-hit',
+            NotifierBridge\Telegram\TelegramTransportFactory::class => 'notifier.transport_factory.telegram',
+            NotifierBridge\Telnyx\TelnyxTransportFactory::class => 'notifier.transport_factory.telnyx',
+            NotifierBridge\Termii\TermiiTransportFactory::class => 'notifier.transport_factory.termii',
+            NotifierBridge\TurboSms\TurboSmsTransport::class => 'notifier.transport_factory.turbo-sms',
+            NotifierBridge\Twilio\TwilioTransportFactory::class => 'notifier.transport_factory.twilio',
+            NotifierBridge\Twitter\TwitterTransportFactory::class => 'notifier.transport_factory.twitter',
+            NotifierBridge\Vonage\VonageTransportFactory::class => 'notifier.transport_factory.vonage',
+            NotifierBridge\Yunpian\YunpianTransportFactory::class => 'notifier.transport_factory.yunpian',
+            NotifierBridge\Zendesk\ZendeskTransportFactory::class => 'notifier.transport_factory.zendesk',
+            NotifierBridge\Zulip\ZulipTransportFactory::class => 'notifier.transport_factory.zulip',
         ];
 
         $parentPackages = ['symfony/framework-bundle', 'symfony/notifier'];
@@ -2750,21 +2670,21 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             }
         }
 
-        if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages) && \in_array(MercureBundle::class, $container->getParameter('kernel.bundles'), true)) {
-            $container->getDefinition($classToServices[MercureTransportFactory::class])
+        if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', NotifierBridge\Mercure\MercureTransportFactory::class, $parentPackages) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages) && \in_array(MercureBundle::class, $container->getParameter('kernel.bundles'), true)) {
+            $container->getDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class])
                 ->replaceArgument('$registry', new Reference(HubRegistry::class));
-        } elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages)) {
-            $container->removeDefinition($classToServices[MercureTransportFactory::class]);
+        } elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', NotifierBridge\Mercure\MercureTransportFactory::class, $parentPackages)) {
+            $container->removeDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class]);
         }
 
-        if (ContainerBuilder::willBeAvailable('symfony/fake-chat-notifier', FakeChatTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
-            $container->getDefinition($classToServices[FakeChatTransportFactory::class])
+        if (ContainerBuilder::willBeAvailable('symfony/fake-chat-notifier', NotifierBridge\FakeChat\FakeChatTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
+            $container->getDefinition($classToServices[NotifierBridge\FakeChat\FakeChatTransportFactory::class])
                 ->replaceArgument('$mailer', new Reference('mailer'))
                 ->replaceArgument('$logger', new Reference('logger'));
         }
 
-        if (ContainerBuilder::willBeAvailable('symfony/fake-sms-notifier', FakeSmsTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
-            $container->getDefinition($classToServices[FakeSmsTransportFactory::class])
+        if (ContainerBuilder::willBeAvailable('symfony/fake-sms-notifier', NotifierBridge\FakeSms\FakeSmsTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
+            $container->getDefinition($classToServices[NotifierBridge\FakeSms\FakeSmsTransportFactory::class])
                 ->replaceArgument('$mailer', new Reference('mailer'))
                 ->replaceArgument('$logger', new Reference('logger'));
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
index 52695219275ff..474f013f000a5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -11,69 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-use Symfony\Component\Notifier\Bridge\AllMySms\AllMySmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\AmazonSns\AmazonSnsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Bandwidth\BandwidthTransportFactory;
-use Symfony\Component\Notifier\Bridge\Chatwork\ChatworkTransportFactory;
-use Symfony\Component\Notifier\Bridge\Clickatell\ClickatellTransportFactory;
-use Symfony\Component\Notifier\Bridge\ContactEveryone\ContactEveryoneTransportFactory;
-use Symfony\Component\Notifier\Bridge\Discord\DiscordTransportFactory;
-use Symfony\Component\Notifier\Bridge\Engagespot\EngagespotTransportFactory;
-use Symfony\Component\Notifier\Bridge\Esendex\EsendexTransportFactory;
-use Symfony\Component\Notifier\Bridge\Expo\ExpoTransportFactory;
-use Symfony\Component\Notifier\Bridge\FakeChat\FakeChatTransportFactory;
-use Symfony\Component\Notifier\Bridge\FakeSms\FakeSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Firebase\FirebaseTransportFactory;
-use Symfony\Component\Notifier\Bridge\FortySixElks\FortySixElksTransportFactory;
-use Symfony\Component\Notifier\Bridge\FreeMobile\FreeMobileTransportFactory;
-use Symfony\Component\Notifier\Bridge\GatewayApi\GatewayApiTransportFactory;
-use Symfony\Component\Notifier\Bridge\Gitter\GitterTransportFactory;
-use Symfony\Component\Notifier\Bridge\GoogleChat\GoogleChatTransportFactory;
-use Symfony\Component\Notifier\Bridge\Infobip\InfobipTransportFactory;
-use Symfony\Component\Notifier\Bridge\Iqsms\IqsmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Isendpro\IsendproTransportFactory;
-use Symfony\Component\Notifier\Bridge\KazInfoTeh\KazInfoTehTransportFactory;
-use Symfony\Component\Notifier\Bridge\LightSms\LightSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\LineNotify\LineNotifyTransportFactory;
-use Symfony\Component\Notifier\Bridge\LinkedIn\LinkedInTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mailjet\MailjetTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mastodon\MastodonTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mercure\MercureTransportFactory;
-use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransportFactory;
-use Symfony\Component\Notifier\Bridge\MessageMedia\MessageMediaTransportFactory;
-use Symfony\Component\Notifier\Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Mobyt\MobytTransportFactory;
-use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
-use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
-use Symfony\Component\Notifier\Bridge\OrangeSms\OrangeSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
-use Symfony\Component\Notifier\Bridge\PagerDuty\PagerDutyTransportFactory;
-use Symfony\Component\Notifier\Bridge\Plivo\PlivoTransportFactory;
-use Symfony\Component\Notifier\Bridge\Pushover\PushoverTransportFactory;
-use Symfony\Component\Notifier\Bridge\RingCentral\RingCentralTransportFactory;
-use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sendberry\SendberryTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory;
-use Symfony\Component\Notifier\Bridge\SimpleTextin\SimpleTextinTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sinch\SinchTransportFactory;
-use Symfony\Component\Notifier\Bridge\Slack\SlackTransportFactory;
-use Symfony\Component\Notifier\Bridge\Sms77\Sms77TransportFactory;
-use Symfony\Component\Notifier\Bridge\Smsapi\SmsapiTransportFactory;
-use Symfony\Component\Notifier\Bridge\SmsBiuras\SmsBiurasTransportFactory;
-use Symfony\Component\Notifier\Bridge\Smsc\SmscTransportFactory;
-use Symfony\Component\Notifier\Bridge\SmsFactor\SmsFactorTransportFactory;
-use Symfony\Component\Notifier\Bridge\SpotHit\SpotHitTransportFactory;
-use Symfony\Component\Notifier\Bridge\Telegram\TelegramTransportFactory;
-use Symfony\Component\Notifier\Bridge\Telnyx\TelnyxTransportFactory;
-use Symfony\Component\Notifier\Bridge\Termii\TermiiTransportFactory;
-use Symfony\Component\Notifier\Bridge\TurboSms\TurboSmsTransportFactory;
-use Symfony\Component\Notifier\Bridge\Twilio\TwilioTransportFactory;
-use Symfony\Component\Notifier\Bridge\Twitter\TwitterTransportFactory;
-use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory;
-use Symfony\Component\Notifier\Bridge\Yunpian\YunpianTransportFactory;
-use Symfony\Component\Notifier\Bridge\Zendesk\ZendeskTransportFactory;
-use Symfony\Component\Notifier\Bridge\Zulip\ZulipTransportFactory;
+use Symfony\Component\Notifier\Bridge;
 use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
 use Symfony\Component\Notifier\Transport\NullTransportFactory;
 
@@ -84,147 +22,147 @@
             ->abstract()
             ->args([service('event_dispatcher'), service('http_client')->ignoreOnInvalid()])
 
-        ->set('notifier.transport_factory.slack', SlackTransportFactory::class)
+        ->set('notifier.transport_factory.slack', Bridge\Slack\SlackTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.linked-in', LinkedInTransportFactory::class)
+        ->set('notifier.transport_factory.linked-in', Bridge\LinkedIn\LinkedInTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.telegram', TelegramTransportFactory::class)
+        ->set('notifier.transport_factory.telegram', Bridge\Telegram\TelegramTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.mattermost', MattermostTransportFactory::class)
+        ->set('notifier.transport_factory.mattermost', Bridge\Mattermost\MattermostTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.vonage', VonageTransportFactory::class)
+        ->set('notifier.transport_factory.vonage', Bridge\Vonage\VonageTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.rocket-chat', RocketChatTransportFactory::class)
+        ->set('notifier.transport_factory.rocket-chat', Bridge\RocketChat\RocketChatTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.google-chat', GoogleChatTransportFactory::class)
+        ->set('notifier.transport_factory.google-chat', Bridge\GoogleChat\GoogleChatTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.twilio', TwilioTransportFactory::class)
+        ->set('notifier.transport_factory.twilio', Bridge\Twilio\TwilioTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.twitter', TwitterTransportFactory::class)
+        ->set('notifier.transport_factory.twitter', Bridge\Twitter\TwitterTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.all-my-sms', AllMySmsTransportFactory::class)
+        ->set('notifier.transport_factory.all-my-sms', Bridge\AllMySms\AllMySmsTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.firebase', FirebaseTransportFactory::class)
+        ->set('notifier.transport_factory.firebase', Bridge\Firebase\FirebaseTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.forty-six-elks', FortySixElksTransportFactory::class)
+        ->set('notifier.transport_factory.forty-six-elks', Bridge\FortySixElks\FortySixElksTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.free-mobile', FreeMobileTransportFactory::class)
+        ->set('notifier.transport_factory.free-mobile', Bridge\FreeMobile\FreeMobileTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.spot-hit', SpotHitTransportFactory::class)
+        ->set('notifier.transport_factory.spot-hit', Bridge\SpotHit\SpotHitTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.fake-chat', FakeChatTransportFactory::class)
+        ->set('notifier.transport_factory.fake-chat', Bridge\FakeChat\FakeChatTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.fake-sms', FakeSmsTransportFactory::class)
+        ->set('notifier.transport_factory.fake-sms', Bridge\FakeSms\FakeSmsTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.ovh-cloud', OvhCloudTransportFactory::class)
+        ->set('notifier.transport_factory.ovh-cloud', Bridge\OvhCloud\OvhCloudTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.sinch', SinchTransportFactory::class)
+        ->set('notifier.transport_factory.sinch', Bridge\Sinch\SinchTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.zulip', ZulipTransportFactory::class)
+        ->set('notifier.transport_factory.zulip', Bridge\Zulip\ZulipTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.infobip', InfobipTransportFactory::class)
+        ->set('notifier.transport_factory.infobip', Bridge\Infobip\InfobipTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.isendpro', IsendproTransportFactory::class)
+        ->set('notifier.transport_factory.isendpro', Bridge\Isendpro\IsendproTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.mobyt', MobytTransportFactory::class)
+        ->set('notifier.transport_factory.mobyt', Bridge\Mobyt\MobytTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.smsapi', SmsapiTransportFactory::class)
+        ->set('notifier.transport_factory.smsapi', Bridge\Smsapi\SmsapiTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.esendex', EsendexTransportFactory::class)
+        ->set('notifier.transport_factory.esendex', Bridge\Esendex\EsendexTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.sendberry', SendberryTransportFactory::class)
+        ->set('notifier.transport_factory.sendberry', Bridge\Sendberry\SendberryTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.sendinblue', SendinblueTransportFactory::class)
+        ->set('notifier.transport_factory.sendinblue', Bridge\Sendinblue\SendinblueTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.iqsms', IqsmsTransportFactory::class)
+        ->set('notifier.transport_factory.iqsms', Bridge\Iqsms\IqsmsTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.octopush', OctopushTransportFactory::class)
+        ->set('notifier.transport_factory.octopush', Bridge\Octopush\OctopushTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.discord', DiscordTransportFactory::class)
+        ->set('notifier.transport_factory.discord', Bridge\Discord\DiscordTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.microsoft-teams', MicrosoftTeamsTransportFactory::class)
+        ->set('notifier.transport_factory.microsoft-teams', Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.gateway-api', GatewayApiTransportFactory::class)
+        ->set('notifier.transport_factory.gateway-api', Bridge\GatewayApi\GatewayApiTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.mercure', MercureTransportFactory::class)
+        ->set('notifier.transport_factory.mercure', Bridge\Mercure\MercureTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.gitter', GitterTransportFactory::class)
+        ->set('notifier.transport_factory.gitter', Bridge\Gitter\GitterTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.clickatell', ClickatellTransportFactory::class)
+        ->set('notifier.transport_factory.clickatell', Bridge\Clickatell\ClickatellTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.contact-everyone', ContactEveryoneTransportFactory::class)
+        ->set('notifier.transport_factory.contact-everyone', Bridge\ContactEveryone\ContactEveryoneTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.amazon-sns', AmazonSnsTransportFactory::class)
+        ->set('notifier.transport_factory.amazon-sns', Bridge\AmazonSns\AmazonSnsTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
             ->tag('chatter.transport_factory')
@@ -234,111 +172,111 @@
             ->tag('chatter.transport_factory')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.light-sms', LightSmsTransportFactory::class)
+        ->set('notifier.transport_factory.light-sms', Bridge\LightSms\LightSmsTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.sms-biuras', SmsBiurasTransportFactory::class)
+        ->set('notifier.transport_factory.sms-biuras', Bridge\SmsBiuras\SmsBiurasTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.smsc', SmscTransportFactory::class)
+        ->set('notifier.transport_factory.smsc', Bridge\Smsc\SmscTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.sms-factor', SmsFactorTransportFactory::class)
+        ->set('notifier.transport_factory.sms-factor', Bridge\SmsFactor\SmsFactorTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.message-bird', MessageBirdTransportFactory::class)
+        ->set('notifier.transport_factory.message-bird', Bridge\MessageBird\MessageBirdTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.message-media', MessageMediaTransportFactory::class)
+        ->set('notifier.transport_factory.message-media', Bridge\MessageMedia\MessageMediaTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.telnyx', TelnyxTransportFactory::class)
+        ->set('notifier.transport_factory.telnyx', Bridge\Telnyx\TelnyxTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.mailjet', MailjetTransportFactory::class)
+        ->set('notifier.transport_factory.mailjet', Bridge\Mailjet\MailjetTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.yunpian', YunpianTransportFactory::class)
+        ->set('notifier.transport_factory.yunpian', Bridge\Yunpian\YunpianTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.turbo-sms', TurboSmsTransportFactory::class)
+        ->set('notifier.transport_factory.turbo-sms', Bridge\TurboSms\TurboSmsTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.sms77', Sms77TransportFactory::class)
+        ->set('notifier.transport_factory.sms77', Bridge\Sms77\Sms77TransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.one-signal', OneSignalTransportFactory::class)
+        ->set('notifier.transport_factory.one-signal', Bridge\OneSignal\OneSignalTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.orange-sms', OrangeSmsTransportFactory::class)
+        ->set('notifier.transport_factory.orange-sms', Bridge\OrangeSms\OrangeSmsTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.expo', ExpoTransportFactory::class)
+        ->set('notifier.transport_factory.expo', Bridge\Expo\ExpoTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.kaz-info-teh', KazInfoTehTransportFactory::class)
+        ->set('notifier.transport_factory.kaz-info-teh', Bridge\KazInfoTeh\KazInfoTehTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.engagespot', EngagespotTransportFactory::class)
+        ->set('notifier.transport_factory.engagespot', Bridge\Engagespot\EngagespotTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.zendesk', ZendeskTransportFactory::class)
+        ->set('notifier.transport_factory.zendesk', Bridge\Zendesk\ZendeskTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.chatwork', ChatworkTransportFactory::class)
+        ->set('notifier.transport_factory.chatwork', Bridge\Chatwork\ChatworkTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.termii', TermiiTransportFactory::class)
+        ->set('notifier.transport_factory.termii', Bridge\Termii\TermiiTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.ring-central', RingCentralTransportFactory::class)
+        ->set('notifier.transport_factory.ring-central', Bridge\RingCentral\RingCentralTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.plivo', PlivoTransportFactory::class)
+        ->set('notifier.transport_factory.plivo', Bridge\Plivo\PlivoTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.bandwidth', BandwidthTransportFactory::class)
+        ->set('notifier.transport_factory.bandwidth', Bridge\Bandwidth\BandwidthTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.line-notify', LineNotifyTransportFactory::class)
+        ->set('notifier.transport_factory.line-notify', Bridge\LineNotify\LineNotifyTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.mastodon', MastodonTransportFactory::class)
+        ->set('notifier.transport_factory.mastodon', Bridge\Mastodon\MastodonTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.pager-duty', PagerDutyTransportFactory::class)
+        ->set('notifier.transport_factory.pager-duty', Bridge\PagerDuty\PagerDutyTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
 
-        ->set('notifier.transport_factory.pushover', PushoverTransportFactory::class)
+        ->set('notifier.transport_factory.pushover', Bridge\Pushover\PushoverTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
 
-        ->set('notifier.transport_factory.simple-textin', SimpleTextinTransportFactory::class)
+        ->set('notifier.transport_factory.simple-textin', Bridge\SimpleTextin\SimpleTextinTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
     ;

From 576f026edcb000dec381e6be7a2a34c4224adec5 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 5 Apr 2023 14:28:43 +0200
Subject: [PATCH 376/475] [Serializer] Make `ProblemNormalizer` give details
 about `ValidationFailedException` and `PartialDenormalizationException`

---
 .github/expected-missing-return-types.diff    | 279 +++++++++---------
 .../FrameworkExtension.php                    |   8 +
 .../Resources/config/serializer.php           |   2 +-
 .../Compiler/CheckTypeDeclarationsPass.php    |  10 +-
 src/Symfony/Component/Serializer/CHANGELOG.md |   1 +
 .../PartialDenormalizationException.php       |  20 +-
 .../ConstraintViolationListNormalizer.php     |   1 +
 .../Normalizer/MimeMessageNormalizer.php      |  12 +-
 .../Normalizer/ProblemNormalizer.php          |  64 +++-
 .../Normalizer/UnwrappingDenormalizer.php     |   9 +-
 .../ConstraintViolationListNormalizerTest.php |   9 +-
 .../Normalizer/ProblemNormalizerTest.php      |  60 ++++
 12 files changed, 308 insertions(+), 167 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index ee5f8a0b05775..b9b26d6f7de28 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -51,7 +51,7 @@ index 4fa5057fe2..9e111adac5 100644
      {
          if ($fixture instanceof ContainerAwareInterface) {
 diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
-index 56b108942e..20761fcc26 100644
+index 1ce0ffd40c..585265fb38 100644
 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
 +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
 @@ -43,5 +43,5 @@ abstract class AbstractDoctrineExtension extends Extension
@@ -648,10 +648,10 @@ index 6e7669a710..27517d34ae 100644
      {
          if (!$container->hasDefinition('test.private_services_locator')) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
-index d846bc6882..21ee26b1f3 100644
+index 7fa0fb2890..49bcc6dfd9 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
-@@ -106,5 +106,5 @@ class UnusedTagsPass implements CompilerPassInterface
+@@ -107,5 +107,5 @@ class UnusedTagsPass implements CompilerPassInterface
       * @return void
       */
 -    public function process(ContainerBuilder $container)
@@ -670,17 +670,17 @@ index bda9ca9515..c0d1f91339 100644
      {
          if (!$container->hasParameter('workflow.has_guard_listeners')) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-index 8cb557fb7d..7a7830c7df 100644
+index e2223da1ab..986e3e7922 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-@@ -279,5 +279,5 @@ class FrameworkExtension extends Extension
+@@ -283,5 +283,5 @@ class FrameworkExtension extends Extension
       * @throws LogicException
       */
 -    public function load(array $configs, ContainerBuilder $container)
 +    public function load(array $configs, ContainerBuilder $container): void
      {
          $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
-@@ -2812,5 +2812,5 @@ class FrameworkExtension extends Extension
+@@ -2856,5 +2856,5 @@ class FrameworkExtension extends Extension
       * @return void
       */
 -    public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)
@@ -688,17 +688,17 @@ index 8cb557fb7d..7a7830c7df 100644
      {
          trigger_deprecation('symfony/framework-bundle', '6.2', 'The "%s()" method is deprecated.', __METHOD__);
 diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
-index 7f48810e50..f85b13d818 100644
+index ffb96a23e5..e7f77881c8 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
-@@ -93,5 +93,5 @@ class FrameworkBundle extends Bundle
+@@ -94,5 +94,5 @@ class FrameworkBundle extends Bundle
       * @return void
       */
 -    public function boot()
 +    public function boot(): void
      {
          $handler = ErrorHandler::register(null, false);
-@@ -110,5 +110,5 @@ class FrameworkBundle extends Bundle
+@@ -111,5 +111,5 @@ class FrameworkBundle extends Bundle
       * @return void
       */
 -    public function build(ContainerBuilder $container)
@@ -916,7 +916,7 @@ index 24eb1377c5..6367585643 100644
      {
          return 'security.authentication.failure_handler.'.$id.'.'.str_replace('-', '_', $this->getKey());
 diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php
-index 764e7d35c3..20442e08a0 100644
+index 8082b6f352..bd9e1cff26 100644
 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php
 +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AuthenticatorFactoryInterface.php
 @@ -34,5 +34,5 @@ interface AuthenticatorFactoryInterface
@@ -1362,7 +1362,7 @@ index ca5bcaded8..90c2bf5080 100644
      {
          $this->clear();
 diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
-index 07ef47f5eb..ea659c2fb4 100644
+index ffaa56f3ed..c63206e18d 100644
 --- a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
 +++ b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
 @@ -284,5 +284,5 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
@@ -1384,7 +1384,7 @@ index d447e9f2fd..1f99e0725e 100644
      {
          return \extension_loaded('memcached') && version_compare(phpversion('memcached'), '3.1.6', '>=');
 diff --git a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
-index 8efbe06efd..b73690d91a 100644
+index dfffb3bd13..e4384af6cc 100644
 --- a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
 +++ b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
 @@ -101,5 +101,5 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
@@ -1413,7 +1413,7 @@ index d104530c0d..a1845d3ae9 100644
      {
          unset(self::$valuesCache[$file]);
 diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
-index 7525632e91..cfe5cd863d 100644
+index f64ac99c11..84d32fb424 100644
 --- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
 +++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
 @@ -283,5 +283,5 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
@@ -2114,7 +2114,7 @@ index cc024da461..00b79e915f 100644
      {
          $errors = [];
 diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
-index 28fec5fdec..e8994f2a90 100644
+index b7aaa6a29e..dd14cf2c5c 100644
 --- a/src/Symfony/Component/Console/Application.php
 +++ b/src/Symfony/Component/Console/Application.php
 @@ -114,5 +114,5 @@ class Application implements ResetInterface
@@ -2432,7 +2432,7 @@ index 433cd41978..02187a7ffc 100644
  
      /**
 diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
-index 9f1601d16d..68bfe5e98b 100644
+index 346a474c61..db3012ced8 100644
 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
 +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
 @@ -42,5 +42,5 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
@@ -2549,7 +2549,7 @@ index eb32bce8fc..57edd56954 100644
      {
          $options = array_merge([
 diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
-index 51fd11b260..3acfc88c9a 100644
+index 77de9daba2..a41cbd8111 100644
 --- a/src/Symfony/Component/Console/Helper/Helper.php
 +++ b/src/Symfony/Component/Console/Helper/Helper.php
 @@ -27,5 +27,5 @@ abstract class Helper implements HelperInterface
@@ -3147,10 +3147,10 @@ index b00445ece8..5e9b1086b0 100644
      {
          $this->buffer .= $message;
 diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
-index e1f981bc1e..f701cb549d 100644
+index 26896bb531..af97d04ddc 100644
 --- a/src/Symfony/Component/Console/Question/Question.php
 +++ b/src/Symfony/Component/Console/Question/Question.php
-@@ -269,5 +269,5 @@ class Question
+@@ -270,5 +270,5 @@ class Question
       * @return bool
       */
 -    protected function isAssoc(array $array)
@@ -3575,7 +3575,7 @@ index 3f070dcc0c..aa0e5186bf 100644
      {
          foreach ($container->findTaggedServiceIds('auto_alias') as $serviceId => $tags) {
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
-index 6cb09ccdfe..85380018ce 100644
+index a68d19ea30..f88c9046e7 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
 +++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
 @@ -61,5 +61,5 @@ class AutowirePass extends AbstractRecursivePass
@@ -4036,101 +4036,101 @@ index ac67b468c5..bc1e395810 100644
      {
          if (1 > \func_num_args()) {
 diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
-index e920980b28..83a3221b97 100644
+index 44df682ebc..e5957c6f57 100644
 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
 +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
-@@ -178,5 +178,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -179,5 +179,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function setResourceTracking(bool $track)
 +    public function setResourceTracking(bool $track): void
      {
          $this->trackResources = $track;
-@@ -196,5 +196,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -197,5 +197,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function setProxyInstantiator(InstantiatorInterface $proxyInstantiator)
 +    public function setProxyInstantiator(InstantiatorInterface $proxyInstantiator): void
      {
          $this->proxyInstantiator = $proxyInstantiator;
-@@ -204,5 +204,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -205,5 +205,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function registerExtension(ExtensionInterface $extension)
 +    public function registerExtension(ExtensionInterface $extension): void
      {
          $this->extensions[$extension->getAlias()] = $extension;
-@@ -486,5 +486,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -487,5 +487,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @throws BadMethodCallException When this ContainerBuilder is compiled
       */
 -    public function set(string $id, ?object $service)
 +    public function set(string $id, ?object $service): void
      {
          if ($this->isCompiled() && (isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())) {
-@@ -503,5 +503,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -504,5 +504,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function removeDefinition(string $id)
 +    public function removeDefinition(string $id): void
      {
          if (isset($this->definitions[$id])) {
-@@ -615,5 +615,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -616,5 +616,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @throws BadMethodCallException When this ContainerBuilder is compiled
       */
 -    public function merge(self $container)
 +    public function merge(self $container): void
      {
          if ($this->isCompiled()) {
-@@ -707,5 +707,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -708,5 +708,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function prependExtensionConfig(string $name, array $config)
 +    public function prependExtensionConfig(string $name, array $config): void
      {
          if (!isset($this->extensionConfigs[$name])) {
-@@ -751,5 +751,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -752,5 +752,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function compile(bool $resolveEnvPlaceholders = false)
 +    public function compile(bool $resolveEnvPlaceholders = false): void
      {
          $compiler = $this->getCompiler();
-@@ -815,5 +815,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -816,5 +816,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function addAliases(array $aliases)
 +    public function addAliases(array $aliases): void
      {
          foreach ($aliases as $alias => $id) {
-@@ -829,5 +829,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -830,5 +830,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function setAliases(array $aliases)
 +    public function setAliases(array $aliases): void
      {
          $this->aliasDefinitions = [];
-@@ -863,5 +863,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -864,5 +864,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function removeAlias(string $alias)
 +    public function removeAlias(string $alias): void
      {
          if (isset($this->aliasDefinitions[$alias])) {
-@@ -925,5 +925,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -926,5 +926,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function addDefinitions(array $definitions)
 +    public function addDefinitions(array $definitions): void
      {
          foreach ($definitions as $id => $definition) {
-@@ -939,5 +939,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -940,5 +940,5 @@ class ContainerBuilder extends Container implements TaggedContaine
10000
rInterface
       * @return void
       */
 -    public function setDefinitions(array $definitions)
 +    public function setDefinitions(array $definitions): void
      {
          $this->definitions = [];
-@@ -1311,5 +1311,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
+@@ -1338,5 +1338,5 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
       * @return void
       */
 -    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
@@ -4358,7 +4358,7 @@ index f4c6b29258..1402331f9e 100644
 +    public function instantiateProxy(ContainerInterface $container, Definition $definition, string $id, callable $realInstantiator): object;
  }
 diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
-index 62ac252dd7..466206277a 100644
+index c817f16422..0605b0a773 100644
 --- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
 +++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
 @@ -99,5 +99,5 @@ abstract class FileLoader extends BaseFileLoader
@@ -4368,14 +4368,14 @@ index 62ac252dd7..466206277a 100644
 +    public function registerClasses(Definition $prototype, string $namespace, string $resource, string|array $exclude = null/* , string $source = null */): void
      {
          if (!str_ends_with($namespace, '\\')) {
-@@ -191,5 +191,5 @@ abstract class FileLoader extends BaseFileLoader
+@@ -195,5 +195,5 @@ abstract class FileLoader extends BaseFileLoader
       * @return void
       */
 -    public function registerAliasesForSinglyImplementedInterfaces()
 +    public function registerAliasesForSinglyImplementedInterfaces(): void
      {
          foreach ($this->interfaces as $interface) {
-@@ -207,5 +207,5 @@ abstract class FileLoader extends BaseFileLoader
+@@ -211,5 +211,5 @@ abstract class FileLoader extends BaseFileLoader
       * @return void
       */
 -    protected function setDefinition(string $id, Definition $definition)
@@ -5122,7 +5122,7 @@ index 239624ec2c..3b497d5ccf 100644
      {
          return $this->nodes;
 diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
-index a2911686f0..8f19254f51 100644
+index 71bcf398d4..88bbb13eab 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Parser.php
 +++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
 @@ -178,5 +178,5 @@ class Parser
@@ -5160,7 +5160,7 @@ index a2911686f0..8f19254f51 100644
 +    public function parsePostfixExpression(Node\Node $node): Node\GetAttrNode|Node\Node
      {
          $token = $this->stream->current;
-@@ -417,5 +417,5 @@ class Parser
+@@ -416,5 +416,5 @@ class Parser
       * @return Node\Node
       */
 -    public function parseArguments()
@@ -5431,7 +5431,7 @@ index 9cc32888e1..0fa604ceec 100644
      {
          throw new BadMethodCallException('Buttons do not support form factories.');
 diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
-index 304105cbc2..8268ca39fe 100644
+index 40c0604ea4..34f7f441f2 100644
 --- a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
 +++ b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
 @@ -218,5 +218,5 @@ class CachingFactoryDecorator implements ChoiceListFactoryInterface, ResetInterf
@@ -5442,7 +5442,7 @@ index 304105cbc2..8268ca39fe 100644
      {
          $this->lists = [];
 diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
-index 9b6b830341..9c656316e4 100644
+index 5e4635870a..439bf4528d 100644
 --- a/src/Symfony/Component/Form/Command/DebugCommand.php
 +++ b/src/Symfony/Component/Form/Command/DebugCommand.php
 @@ -58,5 +58,5 @@ class DebugCommand extends Command
@@ -5556,24 +5556,24 @@ index 62cd0a42a7..55ab20aabc 100644
      {
          $dataToMergeInto = $event->getForm()->getNormData();
 diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
-index 4c06342e54..ccb381629d 100644
+index cec439754e..0ef6b26c3e 100644
 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
 +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
-@@ -54,5 +54,5 @@ class ResizeFormListener implements EventSubscriberInterface
+@@ -56,5 +56,5 @@ class ResizeFormListener implements EventSubscriberInterface
       * @return void
       */
 -    public function preSetData(FormEvent $event)
 +    public function preSetData(FormEvent $event): void
      {
          $form = $event->getForm();
-@@ -79,5 +79,5 @@ class ResizeFormListener implements EventSubscriberInterface
+@@ -81,5 +81,5 @@ class ResizeFormListener implements EventSubscriberInterface
       * @return void
       */
 -    public function preSubmit(FormEvent $event)
 +    public function preSubmit(FormEvent $event): void
      {
          $form = $event->getForm();
-@@ -112,5 +112,5 @@ class ResizeFormListener implements EventSubscriberInterface
+@@ -114,5 +114,5 @@ class ResizeFormListener implements EventSubscriberInterface
       * @return void
       */
 -    public function onSubmit(FormEvent $event)
@@ -5650,7 +5650,7 @@ index d710546407..5ff4dc9989 100644
      {
          parent::configureOptions($resolver);
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
-index b261f926bb..52634b0db7 100644
+index 291ede93ef..a4128a3880 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
 @@ -24,5 +24,5 @@ class CheckboxType extends AbstractType
@@ -5673,9 +5673,9 @@ index b261f926bb..52634b0db7 100644
 -    public function configureOptions(OptionsResolver $resolver)
 +    public function configureOptions(OptionsResolver $resolver): void
      {
-         $emptyData = fn (FormInterface $form, $viewData) => $viewData;
+         $emptyData = static fn (FormInterface $form, $viewData) => $viewData;
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
-index 9694ed750a..0a4187c162 100644
+index 05ef3b9656..1db0ce9039 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
 @@ -63,5 +63,5 @@ class ChoiceType extends AbstractType
@@ -5685,29 +5685,29 @@ index 9694ed750a..0a4187c162 100644
 +    public function buildForm(FormBuilderInterface $builder, array $options): void
      {
          $unknownValues = [];
-@@ -215,5 +215,5 @@ class ChoiceType extends AbstractType
+@@ -216,5 +216,5 @@ class ChoiceType extends AbstractType
      }
  
 -    public function buildView(FormView $view, FormInterface $form, array $options)
 +    public function buildView(FormView $view, FormInterface $form, array $options): void
      {
          $choiceTranslationDomain = $options['choice_translation_domain'];
-@@ -267,5 +267,5 @@ class ChoiceType extends AbstractType
+@@ -268,5 +268,5 @@ class ChoiceType extends AbstractType
      }
  
 -    public function finishView(FormView $view, FormInterface $form, array $options)
 +    public function finishView(FormView $view, FormInterface $form, array $options): void
      {
          if ($options['expanded']) {
-@@ -284,5 +284,5 @@ class ChoiceType extends AbstractType
+@@ -285,5 +285,5 @@ class ChoiceType extends AbstractType
      }
  
 -    public function configureOptions(OptionsResolver $resolver)
 +    public function configureOptions(OptionsResolver $resolver): void
      {
-         $emptyData = function (Options $options) {
+         $emptyData = static function (Options $options) {
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
-index 1654d379a8..66ea974d31 100644
+index ef02d8c434..091cc922e0 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
 @@ -25,5 +25,5 @@ class CollectionType extends AbstractType
@@ -5716,30 +5716,30 @@ index 1654d379a8..66ea974d31 100644
 -    public function buildForm(FormBuilderInterface $builder, array $options)
 +    public function buildForm(FormBuilderInterface $builder, array $options): void
      {
-         if ($options['allow_add'] && $options['prototype']) {
-@@ -55,5 +55,5 @@ class CollectionType extends AbstractType
+         $prototypeOptions = null;
+@@ -57,5 +57,5 @@ class CollectionType extends AbstractType
       * @return void
       */
 -    public function buildView(FormView $view, FormInterface $form, array $options)
 +    public function buildView(FormView $view, FormInterface $form, array $options): void
      {
          $view->vars = array_replace($view->vars, [
-@@ -71,5 +71,5 @@ class CollectionType extends AbstractType
+@@ -73,5 +73,5 @@ class CollectionType extends AbstractType
       * @return void
       */
 -    public function finishView(FormView $view, FormInterface $form, array $options)
 +    public function finishView(FormView $view, FormInterface $form, array $options): void
      {
          $prefixOffset = -2;
-@@ -105,5 +105,5 @@ class CollectionType extends AbstractType
+@@ -107,5 +107,5 @@ class CollectionType extends AbstractType
       * @return void
       */
 -    public function configureOptions(OptionsResolver $resolver)
 +    public function configureOptions(OptionsResolver $resolver): void
      {
-         $entryOptionsNormalizer = function (Options $options, $value) {
+         $entryOptionsNormalizer = static function (Options $options, $value) {
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
-index 6e205fcbc9..f99464a9e7 100644
+index 31538fc3c7..de208cdade 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
 @@ -37,5 +37,5 @@ class ColorType extends AbstractType
@@ -5749,7 +5749,7 @@ index 6e205fcbc9..f99464a9e7 100644
 +    public function buildForm(FormBuilderInterface $builder, array $options): void
      {
          if (!$options['html5']) {
-@@ -66,5 +66,5 @@ class ColorType extends AbstractType
+@@ -67,5 +67,5 @@ class ColorType extends AbstractType
       * @return void
       */
 -    public function configureOptions(OptionsResolver $resolver)
@@ -5757,7 +5757,7 @@ index 6e205fcbc9..f99464a9e7 100644
      {
          $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
-index b647284904..64566e5b64 100644
+index 6f872660a0..f352beb90d 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
 @@ -26,5 +26,5 @@ class CountryType extends AbstractType
@@ -5768,7 +5768,7 @@ index b647284904..64566e5b64 100644
      {
          $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
-index 1c0ac471b8..64e6dea662 100644
+index 89edc6f630..fc06bbb299 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
 @@ -26,5 +26,5 @@ class CurrencyType extends AbstractType
@@ -5779,7 +5779,7 @@ index 1c0ac471b8..64e6dea662 100644
      {
          $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
-index 0e4a7555a0..9f0cc46353 100644
+index 655ef6682f..0e525d09f6 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
 @@ -47,5 +47,5 @@ class DateIntervalType extends AbstractType
@@ -5802,9 +5802,9 @@ index 0e4a7555a0..9f0cc46353 100644
 -    public function configureOptions(OptionsResolver $resolver)
 +    public function configureOptions(OptionsResolver $resolver): void
      {
-         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+         $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
-index ae47519c53..18a007ba32 100644
+index a0a0c92fe0..0fffe46dfa 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
 @@ -51,5 +51,5 @@ class DateTimeType extends AbstractType
@@ -5827,9 +5827,9 @@ index ae47519c53..18a007ba32 100644
 -    public function configureOptions(OptionsResolver $resolver)
 +    public function configureOptions(OptionsResolver $resolver): void
      {
-         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+         $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
-index b08a4dd834..e889f1de28 100644
+index 5c81097e0e..573ed2d2d9 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
 @@ -44,5 +44,5 @@ class DateType extends AbstractType
@@ -5852,7 +5852,7 @@ index b08a4dd834..e889f1de28 100644
 -    public function configureOptions(OptionsResolver $resolver)
 +    public function configureOptions(OptionsResolver $resolver): void
      {
-         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+         $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php b/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
 index 64d01ee67a..0cd6cd3b79 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
@@ -5865,7 +5865,7 @@ index 64d01ee67a..0cd6cd3b79 100644
      {
          $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
-index 16d212ef0f..55960608f8 100644
+index 6e4b78251d..4e52e19cfc 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
 @@ -42,5 +42,5 @@ class FileType extends AbstractType
@@ -5896,7 +5896,7 @@ index 16d212ef0f..55960608f8 100644
      {
          $dataClass = null;
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
-index 560d1e2cb3..b683c2ef8d 100644
+index 82aa77f0a3..f3abe461c9 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
 @@ -42,5 +42,5 @@ class FormType extends BaseType
@@ -5964,7 +5964,7 @@ index a287b66b7c..12dc4a1f71 100644
      {
          $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
-index 0c6faafec6..8fac78ae1a 100644
+index eeb9e591a1..b0eb640a5f 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
 @@ -27,5 +27,5 @@ class LanguageType extends AbstractType
@@ -5975,7 +5975,7 @@ index 0c6faafec6..8fac78ae1a 100644
      {
          $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
-index 5086b0b0e6..662244cf46 100644
+index e98134febd..9f2662031e 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
 @@ -26,5 +26,5 @@ class LocaleType extends AbstractType
@@ -5986,7 +5986,7 @@ index 5086b0b0e6..662244cf46 100644
      {
          $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
-index aea35410c1..03a13b5a52 100644
+index 27c1dbb49b..24209ffc85 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
 @@ -28,5 +28,5 @@ class MoneyType extends AbstractType
@@ -6011,7 +6011,7 @@ index aea35410c1..03a13b5a52 100644
      {
          $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
-index 3ddfbfeb1c..309f8dd641 100644
+index 578991f9fd..16f39e873b 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
 @@ -27,5 +27,5 @@ class NumberType extends AbstractType
@@ -6188,7 +6188,7 @@ index 40e7580d80..18c58e30c0 100644
      {
          $view->vars['pattern'] = null;
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
-index a22f2122cd..7d5ff334a3 100644
+index cc734e50a9..c6b47264a8 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
 @@ -38,5 +38,5 @@ class TimeType extends AbstractType
@@ -6211,9 +6211,9 @@ index a22f2122cd..7d5ff334a3 100644
 -    public function configureOptions(OptionsResolver $resolver)
 +    public function configureOptions(OptionsResolver $resolver): void
      {
-         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+         $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
-index 0827fcfc5a..b3b56c1ce2 100644
+index a5d4bc61c0..b104414403 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
 @@ -29,5 +29,5 @@ class TimezoneType extends AbstractType
@@ -6303,7 +6303,7 @@ index 7c0f65b9a0..d79b4d30e6 100644
      {
          $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
-index f0d8f96467..3fa585b583 100644
+index 8027a41a99..9ffba28dac 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
 @@ -32,5 +32,5 @@ class WeekType extends AbstractType
@@ -6326,7 +6326,7 @@ index f0d8f96467..3fa585b583 100644
 -    public function configureOptions(OptionsResolver $resolver)
 +    public function configureOptions(OptionsResolver $resolver): void
      {
-         $compound = fn (Options $options) => 'single_text' !== $options['widget'];
+         $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 diff --git a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
 index eca450a165..72330772b9 100644
 --- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
@@ -6580,7 +6580,7 @@ index e2d4357622..ed84c8b4cf 100644
      {
          $form = $event->getForm();
 diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
-index 2abc466fe3..3534aa7744 100644
+index ea01d03699..e9c7e410af 100644
 --- a/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
 +++ b/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
 @@ -28,5 +28,5 @@ abstract class BaseValidatorExtension extends AbstractTypeExtension
@@ -6591,7 +6591,7 @@ index 2abc466fe3..3534aa7744 100644
      {
          // Make sure that validation groups end up as null, closure or array
 diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
-index 4602918c3a..5edcb58ec6 100644
+index 54eebaf63e..e6be9e5266 100644
 --- a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
 +++ b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
 @@ -41,5 +41,5 @@ class FormTypeValidatorExtension extends BaseValidatorExtension
@@ -6609,7 +6609,7 @@ index 4602918c3a..5edcb58ec6 100644
      {
          parent::configureOptions($resolver);
 diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
-index 2e2c21426a..b11c6159ad 100644
+index d41dc0168c..0cb2b3c6c8 100644
 --- a/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
 +++ b/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
 @@ -25,5 +25,5 @@ class RepeatedTypeValidatorExtension extends AbstractTypeExtension
@@ -6620,7 +6620,7 @@ index 2e2c21426a..b11c6159ad 100644
      {
          // Map errors to the first field
 diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
-index 70034135bf..246957f8f7 100644
+index b7a19ed26a..30c8b9e57c 100644
 --- a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
 +++ b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
 @@ -36,5 +36,5 @@ class UploadValidatorExtension extends AbstractTypeExtension
@@ -6937,7 +6937,7 @@ index 472437e465..1dfe39146b 100644
      {
          if ($this->client instanceof ResetInterface) {
 diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
-index de24e3b7fd..0aff3bbc60 100644
+index 065d9d727a..52990be628 100644
 --- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
 +++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
 @@ -562,5 +562,5 @@ trait HttpClientTrait
@@ -7070,7 +7070,7 @@ index 081f26a2d0..7ed43e2c07 100644
      {
          ksort($this->cacheControl);
 diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
-index 44d8d96d28..43124c0ea0 100644
+index 9d7012de35..545339d4ef 100644
 --- a/src/Symfony/Component/HttpFoundation/ParameterBag.php
 +++ b/src/Symfony/Component/HttpFoundation/ParameterBag.php
 @@ -64,5 +64,5 @@ class ParameterBag implements \IteratorAggregate, \Countable
@@ -9147,7 +9147,7 @@ index 4344a6f41f..c3ee27f8a5 100644
      {
          // prevent concurrency within the same connection
 diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
-index 7e573b3692..cfb2e038d5 100644
+index 7c749bfec0..f24cc1d51f 100644
 --- a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
 +++ b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php
 @@ -76,5 +76,5 @@ class DoctrineDbalStore implements PersistingStoreInterface
@@ -9314,7 +9314,7 @@ index ada843883c..afebb3f3d8 100644
      {
          $this->getCollection()->deleteOne([ // filter
 diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php
-index 85d0de78ea..7a0cca622e 100644
+index ec114c13c1..52832c3d05 100644
 --- a/src/Symfony/Component/Lock/Store/PdoStore.php
 +++ b/src/Symfony/Component/Lock/Store/PdoStore.php
 @@ -87,5 +87,5 @@ class PdoStore implements PersistingStoreInterface
@@ -9613,10 +9613,10 @@ index d8e6dd4ad9..f96aae262e 100644
      {
          $this->dispatchedMessages = [];
 diff --git a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
-index 13a97667b5..b37e71c7b9 100644
+index 4937c4b325..c60e198a4a 100644
 --- a/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
 +++ b/src/Symfony/Component/Messenger/Transport/InMemory/InMemoryTransport.php
-@@ -95,5 +95,5 @@ class InMemoryTransport implements TransportInterface, ResetInterface
+@@ -112,5 +112,5 @@ class InMemoryTransport implements TransportInterface, ResetInterface
       * @return void
       */
 -    public function reset()
@@ -9657,7 +9657,7 @@ index 97f5ded24d..05e3ed5202 100644
      {
          $this->ensureBodyValid();
 diff --git a/src/Symfony/Component/Mime/Header/AbstractHeader.php b/src/Symfony/Component/Mime/Header/AbstractHeader.php
-index faa5fd8b6f..16b7833b7d 100644
+index 122281127a..8a400918a9 100644
 --- a/src/Symfony/Component/Mime/Header/AbstractHeader.php
 +++ b/src/Symfony/Component/Mime/Header/AbstractHeader.php
 @@ -38,5 +38,5 @@ abstract class AbstractHeader implements HeaderInterface
@@ -9819,7 +9819,7 @@ index e3387dfe15..b88d942f05 100644
      {
          $this->suffixes[] = $suffix;
 diff --git a/src/Symfony/Component/Process/InputStream.php b/src/Symfony/Component/Process/InputStream.php
-index 25f574f703..c6042b4826 100644
+index 086f5a9edf..edacc344e9 100644
 --- a/src/Symfony/Component/Process/InputStream.php
 +++ b/src/Symfony/Component/Process/InputStream.php
 @@ -33,5 +33,5 @@ class InputStream implements \IteratorAggregate
@@ -9862,7 +9862,7 @@ index ef54a3d2b0..d084e5ba24 100644
      {
          if (null === $this->getCommandLine()) {
 diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
-index 843031f01e..cec83a3c5a 100644
+index c9125af216..bcd044de52 100644
 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
 +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
 @@ -123,5 +123,5 @@ class PropertyAccessor implements PropertyAccessorInterface
@@ -10185,45 +10185,45 @@ index e3fb17e81c..cd27f3e387 100644
      {
          $this->strictRequirements = $enabled;
 diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
-index 03d54d5909..f0219187b2 100644
+index 6da68c7594..57dd442aa2 100644
 --- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
 +++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
-@@ -97,5 +97,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -96,5 +96,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return void
       */
 -    public function setRouteAnnotationClass(string $class)
 +    public function setRouteAnnotationClass(string $class): void
      {
          $this->routeAnnotationClass = $class;
-@@ -149,5 +149,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -148,5 +148,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return void
       */
 -    protected function addRoute(RouteCollection $collection, object $annot, array $globals, \ReflectionClass $class, \ReflectionMethod $method)
 +    protected function addRoute(RouteCollection $collection, object $annot, array $globals, \ReflectionClass $class, \ReflectionMethod $method): void
      {
          if ($annot->getEnv() && $annot->getEnv() !== $this->env) {
-@@ -238,5 +238,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -237,5 +237,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return void
       */
 -    public function setResolver(LoaderResolverInterface $resolver)
 +    public function setResolver(LoaderResolverInterface $resolver): void
      {
      }
-@@ -251,5 +251,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -250,5 +250,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return string
       */
 -    protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method)
 +    protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method): string
      {
          $name = str_replace('\\', '_', $class->name).'_'.$method->name;
-@@ -266,5 +266,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -265,5 +265,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return array
       */
 -    protected function getGlobals(\ReflectionClass $class)
 +    protected function getGlobals(\ReflectionClass $class): array
      {
          $globals = $this->resetGlobals();
-@@ -351,5 +351,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -350,5 +350,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return Route
       */
 -    protected function createRoute(string $path, array $defaults, array $requirements, array $options, ?string $host, array $schemes, array $methods, ?string $condition)
@@ -10702,7 +10702,7 @@ index 054dd95728..e6704119b2 100644
      {
          return $this->authenticationToken;
 diff --git a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
-index 88804d6591..a991d35f46 100644
+index c95bae03b4..b16304c366 100644
 --- a/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
 +++ b/src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php
 @@ -38,5 +38,5 @@ class AccessDeniedException extends RuntimeException
@@ -11001,7 +11001,7 @@ index 3b7c5086f2..97fb99f0b5 100644
      {
          $this->response = $response;
 diff --git a/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php b/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
-index 7ee9f41fcd..d7c5312900 100644
+index 513b6494e5..c0211b6e39 100644
 --- a/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
 +++ b/src/Symfony/Component/Security/Http/EventListener/IsGrantedAttributeListener.php
 @@ -40,5 +40,5 @@ class IsGrantedAttributeListener implements EventSubscriberInterface
@@ -11200,6 +11200,17 @@ index 84a84ad1f3..6f66b6d32a 100644
 -    public function supportsDecoding(string $format);
 +    public function supportsDecoding(string $format): bool;
  }
+diff --git a/src/Symfony/Component/Serializer/Exception/PartialDenormalizationException.php b/src/Symfony/Component/Serializer/Exception/PartialDenormalizationException.php
+index b684fddb2f..ade2242791 100644
+--- a/src/Symfony/Component/Serializer/Exception/PartialDenormalizationException.php
++++ b/src/Symfony/Component/Serializer/Exception/PartialDenormalizationException.php
+@@ -29,5 +29,5 @@ class PartialDenormalizationException extends UnexpectedValueException
+      * @return mixed
+      */
+-    public function getData()
++    public function getData(): mixed
+     {
+         return $this->data;
 diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
 index aeee5ac680..4ac78f5458 100644
 --- a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
@@ -11265,7 +11276,7 @@ index fc6336ebdb..e13a834930 100644
      {
          if (1 > \func_num_args()) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
-index 7d138b0b26..03e28f9d20 100644
+index 58deea9f01..8fe0385cdc 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 @@ -215,5 +215,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
@@ -11290,7 +11301,7 @@ index 7d138b0b26..03e28f9d20 100644
      {
          if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
-index 75fe3a5cb1..a28dd40568 100644
+index 20f15becb2..b378cd8c38 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 @@ -139,10 +139,10 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
@@ -11306,21 +11317,21 @@ index 75fe3a5cb1..a28dd40568 100644
 +    public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
      {
          if (!isset($context['cache_key'])) {
-@@ -225,5 +225,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+@@ -226,5 +226,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
      }
  
 -    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null)
 +    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object
      {
          if ($this->classDiscriminatorResolver && $mapping = $this->classDiscriminatorResolver->getMappingForClass($class)) {
-@@ -287,5 +287,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+@@ -288,5 +288,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
       * @return string[]
       */
 -    abstract protected function extractAttributes(object $object, string $format = null, array $context = []);
 +    abstract protected function extractAttributes(object $object, string $format = null, array $context = []): array;
  
      /**
-@@ -294,15 +294,15 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+@@ -295,15 +295,15 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
       * @return mixed
       */
 -    abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []);
@@ -11340,7 +11351,7 @@ index 75fe3a5cb1..a28dd40568 100644
      {
          if (!isset($context['cache_key'])) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
-index 1d83b2da11..1c632f42bf 100644
+index 4edb70096d..8c844785db 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
 @@ -47,5 +47,5 @@ interface DenormalizerInterface
@@ -11350,7 +11361,7 @@ index 1d83b2da11..1c632f42bf 100644
 +    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed;
  
      /**
-@@ -64,5 +64,5 @@ interface DenormalizerInterface
+@@ -59,5 +59,5 @@ interface DenormalizerInterface
       * @return bool
       */
 -    public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */);
@@ -11358,10 +11369,10 @@ index 1d83b2da11..1c632f42bf 100644
  
      /**
 diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
-index 2719c8b52c..1112f7f3cc 100644
+index d92394834d..ede25327c9 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
-@@ -148,5 +148,5 @@ class GetSetMethodNormalizer extends AbstractObjectNormalizer
+@@ -145,5 +145,5 @@ class GetSetMethodNormalizer extends AbstractObjectNormalizer
       * @return void
       */
 -    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
@@ -11380,7 +11391,7 @@ index 40a4fa0e8c..a1e2749aae 100644
      {
          $this->normalizer = $normalizer;
 diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
-index d6d0707ff5..9953ad3005 100644
+index 40779de316..105cf99b06 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
 @@ -39,5 +39,5 @@ interface NormalizerInterface
@@ -11390,7 +11401,7 @@ index d6d0707ff5..9953ad3005 100644
 +    public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null;
  
      /**
-@@ -55,5 +55,5 @@ interface NormalizerInterface
+@@ -50,5 +50,5 @@ interface NormalizerInterface
       * @return bool
       */
 -    public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */);
@@ -11398,7 +11409,7 @@ index d6d0707ff5..9953ad3005 100644
  
      /**
 diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
-index 140e89c6a1..f77348252b 100644
+index dc5067dfb6..ae217b2071 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
 @@ -143,5 +143,5 @@ class ObjectNormalizer extends AbstractObjectNormalizer
@@ -11409,7 +11420,7 @@ index 140e89c6a1..f77348252b 100644
      {
          try {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
-index 645ba74290..d960bf4b20 100644
+index 56e5ebf740..78bfacef61 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
 @@ -185,5 +185,5 @@ class PropertyNormalizer extends AbstractObjectNormalizer
@@ -11691,7 +11702,7 @@ index 1baf9341e4..2e6d94b696 100644
      {
          if (!$container->hasDefinition('translation.extractor')) {
 diff --git a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
-index 9d4418d639..d1959f433d 100644
+index dd6ea3c831..faa71809ec 100644
 --- a/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
 +++ b/src/Symfony/Component/Translation/DependencyInjection/TranslatorPass.php
 @@ -22,5 +22,5 @@ class TranslatorPass implements CompilerPassInterface
@@ -12156,10 +12167,10 @@ index 94ad5eacab..7873a33c2b 100644
      {
          if (!$constraint instanceof AtLeastOneOf) {
 diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php
-index 3368a26c51..855dae6e01 100644
+index 54a4c140c9..3661f3206d 100644
 --- a/src/Symfony/Component/Validator/Constraints/BicValidator.php
 +++ b/src/Symfony/Component/Validator/Constraints/BicValidator.php
-@@ -59,5 +59,5 @@ class BicValidator extends ConstraintValidator
+@@ -67,5 +67,5 @@ class BicValidator extends ConstraintValidator
       * @return void
       */
 -    public function validate(mixed $value, Constraint $constraint)
@@ -12617,7 +12628,7 @@ index c6d111cfe3..fed053db79 100644
      {
          if (!$constraint instanceof Time) {
 diff --git a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
-index 20d81e8809..0d18cad247 100644
+index 21481a5afd..2d1cc4f5eb 100644
 --- a/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
 +++ b/src/Symfony/Component/Validator/Constraints/TimezoneValidator.php
 @@ -30,5 +30,5 @@ class TimezoneValidator extends ConstraintValidator
@@ -13058,52 +13069,52 @@ index 3120c3d919..0ac928f2ca 100644
      {
          foreach (['snapshot', 'association', 'typeClass'] as $k) {
 diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
-index c58e74a50a..dfd381cccf 100644
+index be5a642226..5ee13fc3ed 100644
 --- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
 +++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
-@@ -50,5 +50,5 @@ class ExceptionCaster
+@@ -51,5 +51,5 @@ class ExceptionCaster
       * @return array
       */
 -    public static function castError(\Error $e, array $a, Stub $stub, bool $isNested, int $filter = 0)
 +    public static function castError(\Error $e, array $a, Stub $stub, bool $isNested, int $filter = 0): array
      {
          return self::filterExceptionArray($stub->class, $a, "\0Error\0", $filter);
-@@ -58,5 +58,5 @@ class ExceptionCaster
+@@ -59,5 +59,5 @@ class ExceptionCaster
       * @return array
       */
 -    public static function castException(\Exception $e, array $a, Stub $stub, bool $isNested, int $filter = 0)
 +    public static function castException(\Exception $e, array $a, Stub $stub, bool $isNested, int $filter = 0): array
      {
          return self::filterExceptionArray($stub->class, $a, "\0Exception\0", $filter);
-@@ -66,5 +66,5 @@ class ExceptionCaster
+@@ -67,5 +67,5 @@ class ExceptionCaster
       * @return array
       */
 -    public static function castErrorException(\ErrorException $e, array $a, Stub $stub, bool $isNested)
 +    public static function castErrorException(\ErrorException $e, array $a, Stub $stub, bool $isNested): array
      {
          if (isset($a[$s = Caster::PREFIX_PROTECTED.'severity'], self::$errorTypes[$a[$s]])) {
-@@ -78,5 +78,5 @@ class ExceptionCaster
+@@ -79,5 +79,5 @@ class ExceptionCaster
       * @return array
       */
 -    public static function castThrowingCasterException(ThrowingCasterException $e, array $a, Stub $stub, bool $isNested)
 +    public static function castThrowingCasterException(ThrowingCasterException $e, array $a, Stub $stub, bool $isNested): array
      {
          $trace = Caster::PREFIX_VIRTUAL.'trace';
-@@ -99,5 +99,5 @@ class ExceptionCaster
+@@ -100,5 +100,5 @@ class ExceptionCaster
       * @return array
       */
 -    public static function castSilencedErrorContext(SilencedErrorContext $e, array $a, Stub $stub, bool $isNested)
 +    public static function castSilencedErrorContext(SilencedErrorContext $e, array $a, Stub $stub, bool $isNested): array
      {
          $sPrefix = "\0".SilencedErrorContext::class."\0";
-@@ -129,5 +129,5 @@ class ExceptionCaster
+@@ -130,5 +130,5 @@ class ExceptionCaster
       * @return array
       */
 -    public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, bool $isNested)
 +    public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, bool $isNested): array
      {
          if (!$isNested) {
-@@ -206,5 +206,5 @@ class ExceptionCaster
+@@ -207,5 +207,5 @@ class ExceptionCaster
       * @return array
       */
 -    public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, bool $isNested)
@@ -13661,31 +13672,31 @@ index 0cf42584a0..e2807c7001 100644
      {
          $a['current_byte_index'] = xml_get_current_byte_index($h);
 diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
-index 9df2b79f0a..fd9ed90066 100644
+index 6a746b88e3..4c0940bd31 100644
 --- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
 +++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
-@@ -236,5 +236,5 @@ abstract class AbstractCloner implements ClonerInterface
+@@ -237,5 +237,5 @@ abstract class AbstractCloner implements ClonerInterface
       * @return void
       */
 -    public function addCasters(array $casters)
 +    public function addCasters(array $casters): void
      {
          foreach ($casters as $type => $callback) {
-@@ -248,5 +248,5 @@ abstract class AbstractCloner implements ClonerInterface
+@@ -249,5 +249,5 @@ abstract class AbstractCloner implements ClonerInterface
       * @return void
       */
 -    public function setMaxItems(int $maxItems)
 +    public function setMaxItems(int $maxItems): void
      {
          $this->maxItems = $maxItems;
-@@ -258,5 +258,5 @@ abstract class AbstractCloner implements ClonerInterface
+@@ -259,5 +259,5 @@ abstract class AbstractCloner implements ClonerInterface
       * @return void
       */
 -    public function setMaxString(int $maxString)
 +    public function setMaxString(int $maxString): void
      {
          $this->maxString = $maxString;
-@@ -269,5 +269,5 @@ abstract class AbstractCloner implements ClonerInterface
+@@ -270,5 +270,5 @@ abstract class AbstractCloner implements ClonerInterface
       * @return void
       */
 -    public function setMinDepth(int $minDepth)
@@ -13722,7 +13733,7 @@ index 053a90972b..5876b02373 100644
      {
          if (-1 !== $depth) {
 diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
-index c3d848ec17..ba28ebcb11 100644
+index d04c199e67..8b962c311d 100644
 --- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
 +++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
 @@ -90,5 +90,5 @@ class CliDumper extends AbstractDumper
@@ -13795,14 +13806,14 @@ index c3d848ec17..ba28ebcb11 100644
 +    protected function dumpKey(Cursor $cursor): void
      {
          if (null !== $key = $cursor->hashKey) {
-@@ -561,5 +561,5 @@ class CliDumper extends AbstractDumper
+@@ -562,5 +562,5 @@ class CliDumper extends AbstractDumper
       * @return void
       */
 -    protected function dumpLine(int $depth, bool $endOfValue = false)
 +    protected function dumpLine(int $depth, bool $endOfValue = false): void
      {
          if ($this->colors) {
-@@ -572,5 +572,5 @@ class CliDumper extends AbstractDumper
+@@ -573,5 +573,5 @@ class CliDumper extends AbstractDumper
       * @return void
       */
 -    protected function endValue(Cursor $cursor)
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index e2223da1ab3d5..8a03b216e117d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -233,7 +233,9 @@
 use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\ProblemNormalizer;
 use Symfony\Component\Serializer\Normalizer\UnwrappingDenormalizer;
+use Symfony\Component\Serializer\SerializerAwareInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\String\LazyString;
 use Symfony\Component\String\Slugger\SluggerInterface;
@@ -1830,6 +1832,12 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             $container->removeDefinition('serializer.normalizer.mime_message');
         }
 
+        // compat with Symfony < 6.3
+        if (!is_subclass_of(ProblemNormalizer::class, SerializerAwareInterface::class)) {
+            $container->getDefinition('serializer.normalizer.problem')
+                ->setArguments(['%kernel.debug%']);
+        }
+
         $serializerLoaders = [];
         if (isset($config['enable_annotations']) && $config['enable_annotations']) {
             if ($container->getParameter('kernel.debug')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
index edf1987e32adc..6459dfa4442bd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
@@ -103,7 +103,7 @@
             ->tag('serializer.normalizer', ['priority' => -950])
 
         ->set('serializer.normalizer.problem', ProblemNormalizer::class)
-            ->args([param('kernel.debug')])
+            ->args([param('kernel.debug'), '$translator' => service('translator')->nullOnInvalid()])
             ->tag('serializer.normalizer', ['priority' => -890])
 
         ->set('serializer.denormalizer.unwrapping', UnwrappingDenormalizer::class)
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
index 26e89a9b9a26a..4afcdd5932ec1 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
@@ -136,11 +136,17 @@ private function checkTypeDeclarations(Definition $checkedDefinition, \Reflectio
         $envPlaceholderUniquePrefix = $this->container->getParameterBag() instanceof EnvPlaceholderParameterBag ? $this->container->getParameterBag()->getEnvPlaceholderUniquePrefix() : null;
 
         for ($i = 0; $i < $checksCount; ++$i) {
-            if (!$reflectionParameters[$i]->hasType() || $reflectionParameters[$i]->isVariadic()) {
+            $p = $reflectionParameters[$i];
+            if (!$p->hasType() || $p->isVariadic()) {
+                continue;
+            }
+            if (\array_key_exists($p->name, $values)) {
+                $i = $p->name;
+            } elseif (!\array_key_exists($i, $values)) {
                 continue;
             }
 
-            $this->checkType($checkedDefinition, $values[$i], $reflectionParameters[$i], $envPlaceholderUniquePrefix);
+            $this->checkType($checkedDefinition, $values[$i], $p, $envPlaceholderUniquePrefix);
         }
 
         if ($reflectionFunction->isVariadic() && ($lastParameter = end($reflectionParameters))->hasType()) {
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
index 99f68f71f931b..6b897c1eae966 100644
--- a/src/Symfony/Component/Serializer/CHANGELOG.md
+++ b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * Add `XmlEncoder::SAVE_OPTIONS` context option
  * Add `BackedEnumNormalizer::ALLOW_INVALID_VALUES` context option
  * Add method `getSupportedTypes(?string $format)` to `NormalizerInterface` and `DenormalizerInterface`
+ * Make `ProblemNormalizer` give details about `ValidationFailedException` and `PartialDenormalizationException`
  * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
  * Deprecate `CacheableSupportsMethodInterface` in favor of the new `getSupportedTypes(?string $format)` methods
 
diff --git a/src/Symfony/Component/Serializer/Exception/PartialDenormalizationException.php b/src/Symfony/Component/Serializer/Exception/PartialDenormalizationException.php
index fdb838be79cae..b684fddb2fd0d 100644
--- a/src/Symfony/Component/Serializer/Exception/PartialDenormalizationException.php
+++ b/src/Symfony/Component/Serializer/Exception/PartialDenormalizationException.php
@@ -16,20 +16,26 @@
  */
 class PartialDenormalizationException extends UnexpectedValueException
 {
-    private $data;
-    private $errors;
-
-    public function __construct($data, array $errors)
-    {
-        $this->data = $data;
-        $this->errors = $errors;
+    /**
+     * @param NotNormalizableValueException[] $errors
+     */
+    public function __construct(
+        private mixed $data,
+        private array $errors,
+    ) {
     }
 
+    /**
+     * @return mixed
+     */
     public function getData()
     {
         return $this->data;
     }
 
+    /**
+     * @return NotNormalizableValueException[]
+     */
     public function getErrors(): array
     {
         return $this->errors;
diff --git a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
index 9b39b727fe103..ffdbfebf176cd 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
@@ -68,6 +68,7 @@ public function normalize(mixed $object, string $format = null, array $context =
             $violationEntry = [
                 'propertyPath' => $propertyPath,
                 'title' => $violation->getMessage(),
+                'template' => $violation->getMessageTemplate(),
                 'parameters' => $violation->getParameters(),
             ];
             if (null !== $code = $violation->getCode()) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
index 74a8b66b10100..ab2b7e3e16c8d 100644
--- a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Mime\Header\UnstructuredHeader;
 use Symfony\Component\Mime\Message;
 use Symfony\Component\Mime\Part\AbstractPart;
+use Symfony\Component\Serializer\Exception\LogicException;
 use Symfony\Component\Serializer\SerializerAwareInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
@@ -30,10 +31,10 @@
  */
 final class MimeMessageNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface, CacheableSupportsMethodInterface
 {
-    private $serializer;
-    private $normalizer;
-    private $headerClassMap;
-    private $headersProperty;
+    private NormalizerInterface&DenormalizerInterface $serializer;
+    private PropertyNormalizer $normalizer;
+    private array $headerClassMap;
+    private \ReflectionProperty $headersProperty;
 
     public function __construct(PropertyNormalizer $normalizer)
     {
@@ -57,6 +58,9 @@ public function getSupportedTypes(?string $format): array
 
     public function setSerializer(SerializerInterface $serializer): void
     {
+        if (!$serializer instanceof NormalizerInterface || !$serializer instanceof DenormalizerInterface) {
+            throw new LogicException(sprintf('The passed serializer should implement both NormalizerInterface and DenormalizerInterface, "%s" given.', get_debug_type($serializer)));
+        }
         $this->serializer = $serializer;
         $this->normalizer->setSerializer($serializer);
     }
diff --git a/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php
index dc4dadd88baa3..fd23f3d6def2f 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php
@@ -12,7 +12,13 @@
 namespace Symfony\Component\Serializer\Normalizer;
 
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\PartialDenormalizationException;
+use Symfony\Component\Serializer\SerializerAwareInterface;
+use Symfony\Component\Serializer\SerializerAwareTrait;
+use Symfony\Component\Validator\Exception\ValidationFailedException;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Normalizes errors according to the API Problem spec (RFC 7807).
@@ -22,22 +28,19 @@
  * @author Kévin Dunglas <dunglas@gmail.com>
  * @author Yonel Ceruto <yonelceruto@gmail.com>
  */
-class ProblemNormalizer implements NormalizerInterface, CacheableSupportsMethodInterface
+class ProblemNormalizer implements NormalizerInterface, SerializerAwareInterface, CacheableSupportsMethodInterface
 {
+    use SerializerAwareTrait;
+
     public const TITLE = 'title';
     public const TYPE = 'type';
     public const STATUS = 'status';
 
-    private $debug;
-    private $defaultContext = [
-        self::TYPE => 'https://tools.ietf.org/html/rfc2616#section-10',
-        self::TITLE => 'An error occurred',
-    ];
-
-    public function __construct(bool $debug = false, array $defaultContext = [])
-    {
-        $this->debug = $debug;
-        $this->defaultContext = $defaultContext + $this->defaultContext;
+    public function __construct(
+        private bool $debug = false,
+        private array $defaultContext = [],
+        private ?TranslatorInterface $translator = null,
+    ) {
     }
 
     public function getSupportedTypes(?string $format): array
@@ -53,15 +56,46 @@ public function normalize(mixed $object, string $format = null, array $context =
             throw new InvalidArgumentException(sprintf('The object must implement "%s".', FlattenException::class));
         }
 
+        $data = [];
         $context += $this->defaultContext;
         $debug = $this->debug && ($context['debug'] ?? true);
+        $exception = $context['exception'] ?? null;
+        if ($exception instanceof HttpExceptionInterface) {
+            $exception = $exception->getPrevious();
+
+            if ($exception instanceof PartialDenormalizationException) {
+                $trans = $this->translator ? $this->translator->trans(...) : fn ($m, $p) => strtr($m, $p);
+                $template = 'This value should be of type {{ type }}.';
+                $data = [
+                    self::TYPE => 'https://symfony.com/errors/validation',
+                    'violations' => array_map(
+                        fn ($e) => [
+                            'propertyPath' => $e->getPath(),
+                            'title' => $trans($template, [
+                                '{{ type }}' => implode('|', $e->getExpectedTypes() ?? ['?']),
+                            ], 'validators'),
+                            'template' => $template,
+                            'parameter' => [
+                                '{{ type }}' => implode('|', $e->getExpectedTypes() ?? ['?']),
+                            ],
+                        ] + ($debug || $e->canUseMessageForUser() ? ['hint' => $e->getMessage()] : []),
+                        $exception->getErrors()
+                    ),
+                ];
+            } elseif ($exception instanceof ValidationFailedException
+                && $this->serializer instanceof NormalizerInterface
+                && $this->serializer->supportsNormalization($exception->getViolations(), $format, $context)
+            ) {
+                $data = $this->serializer->normalize($exception->getViolations(), $format, $context);
+            }
+        }
 
         $data = [
-            self::TYPE => $context['type'],
-            self::TITLE => $context['title'],
-            self::STATUS => $context['status'] ?? $object->getStatusCode(),
+            self::TYPE => $data[self::TYPE] ?? $context[self::TYPE] ?? 'https://tools.ietf.org/html/rfc2616#section-10',
+            self::TITLE => $data[self::TITLE] ?? $context[self::TITLE] ?? 'An error occurred',
+            self::STATUS => $context[self::STATUS] ?? $object->getStatusCode(),
             'detail' => $debug ? $object->getMessage() : $object->getStatusText(),
-        ];
+        ] + $data;
         if ($debug) {
             $data['class'] = $object->getClass();
             $data['trace'] = $object->getTrace();
diff --git a/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
index 738ece32e20f9..31cc37be907b4 100644
--- a/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
+use Symfony\Component\Serializer\Exception\LogicException;
 use Symfony\Component\Serializer\SerializerAwareInterface;
 use Symfony\Component\Serializer\SerializerAwareTrait;
 
@@ -37,7 +38,7 @@ public function getSupportedTypes(?string $format): array
         return ['*' => false];
     }
 
-    public function denormalize(mixed $data, string $class, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
     {
         $propertyPath = $context[self::UNWRAP_PATH];
         $context['unwrapped'] = true;
@@ -50,7 +51,11 @@ public function denormalize(mixed $data, string $class, string $format = null, a
             $data = $this->propertyAccessor->getValue($data, $propertyPath);
         }
 
-        return $this->serializer->denormalize($data, $class, $format, $context);
+        if (!$this->serializer instanceof DenormalizerInterface) {
+            throw new LogicException('Cannot unwrap path because the injected serializer is not a denormalizer.');
+        }
+
+        return $this->serializer->denormalize($data, $type, $format, $context);
     }
 
     public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php
index 4dd1779489c81..8e8df388d0ff0 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php
@@ -53,6 +53,7 @@ public function testNormalize()
                     [
                         'propertyPath' => 'd',
                         'title' => 'a',
+                        'template' => 'b',
                         'type' => 'urn:uuid:f',
                         'parameters' => [
                             'value' => 'foo',
@@ -61,6 +62,7 @@ public function testNormalize()
                     [
                         'propertyPath' => '4',
                         'title' => '1',
+                        'template' => '2',
                         'type' => 'urn:uuid:6',
                         'parameters' => [],
                     ],
@@ -75,9 +77,9 @@ public function testNormalizeWithNameConverter()
         $normalizer = new ConstraintViolationListNormalizer([], new CamelCaseToSnakeCaseNameConverter());
 
         $list = new ConstraintViolationList([
-            new ConstraintViolation('too short', 'a', [], 'c', 'shortDescription', ''),
+            new ConstraintViolation('too short', 'a', [], '3', 'shortDescription', ''),
             new ConstraintViolation('too long', 'b', [], '3', 'product.shortDescription', 'Lorem ipsum dolor sit amet'),
-            new ConstraintViolation('error', 'b', [], '3', '', ''),
+            new ConstraintViolation('error', 'c', [], '3', '', ''),
         ]);
 
         $expected = [
@@ -90,16 +92,19 @@ public function testNormalizeWithNameConverter()
                 [
                     'propertyPath' => 'short_description',
                     'title' => 'too short',
+                    'template' => 'a',
                     'parameters' => [],
                 ],
                 [
                     'propertyPath' => 'product.short_description',
                     'title' => 'too long',
+                    'template' => 'b',
                     'parameters' => [],
                 ],
                 [
                     'propertyPath' => '',
                     'title' => 'error',
+                    'template' => 'c',
                     'parameters' => [],
                 ],
             ],
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ProblemNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ProblemNormalizerTest.php
index 4a754ac5b7d6c..8cc506c6ef629 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ProblemNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ProblemNormalizerTest.php
@@ -13,7 +13,15 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+use Symfony\Component\Serializer\Exception\PartialDenormalizationException;
+use Symfony\Component\Serializer\Normalizer\Constra
10000
intViolationListNormalizer;
 use Symfony\Component\Serializer\Normalizer\ProblemNormalizer;
+use Symfony\Component\Serializer\Serializer;
+use Symfony\Component\Validator\ConstraintViolation;
+use Symfony\Component\Validator\ConstraintViolationList;
+use Symfony\Component\Validator\Exception\ValidationFailedException;
 
 class ProblemNormalizerTest extends TestCase
 {
@@ -45,4 +53,56 @@ public function testNormalize()
 
         $this->assertSame($expected, $this->normalizer->normalize(FlattenException::createFromThrowable(new \RuntimeException('Error'))));
     }
+
+    public function testNormalizePartialDenormalizationException()
+    {
+        $this->normalizer->setSerializer(new Serializer());
+
+        $expected = [
+            'type' => 'https://symfony.com/errors/validation',
+            'title' => 'An error occurred',
+            'status' => 422,
+            'detail' => 'Unprocessable Content',
+            'violations' => [
+                [
+                    'propertyPath' => 'foo',
+                    'title' => 'This value should be of type int.',
+                    'template' => 'This value should be of type {{ type }}.',
+                    'parameters' => [
+                        '{{ type }}' => 'int',
+                    ],
+                    'hint' => 'Invalid value',
+                ],
+            ],
+        ];
+
+        $exception = NotNormalizableValueException::createForUnexpectedDataType('Invalid value', null, ['int'], 'foo', true);
+        $exception = new PartialDenormalizationException('Validation Failed', [$exception]);
+        $exception = new HttpException(422, 'Validation Failed', $exception);
+        $this->assertSame($expected, $this->normalizer->normalize(FlattenException::createFromThrowable($exception), null, ['exception' => $exception]));
+    }
+
+    public function testNormalizeValidationFailedException()
+    {
+        $this->normalizer->setSerializer(new Serializer([new ConstraintViolationListNormalizer()]));
+
+        $expected = [
+            'type' => 'https://symfony.com/errors/validation',
+            'title' => 'Validation Failed',
+            'status' => 422,
+            'detail' => 'Unprocessable Content',
+            'violations' => [
+                [
+                    'propertyPath' => '',
+                    'title' => 'Invalid value',
+                    'template' => '',
+                    'parameters' => [],
+                ],
+            ],
+        ];
+
+        $exception = new ValidationFailedException('Validation Failed', new ConstraintViolationList([new ConstraintViolation('Invalid value', '', [], '', null, null)]));
+        $exception = new HttpException(422, 'Validation Failed', $exception);
+        $this->assertSame($expected, $this->normalizer->normalize(FlattenException::createFromThrowable($exception), null, ['exception' => $exception]));
+    }
 }

From 092d8896f30b4059443f74362da9fc8d6935b95e Mon Sep 17 00:00:00 2001
From: Alexis Lefebvre <alexislefebvre+github@gmail.com>
Date: Thu, 6 Apr 2023 17:57:49 +0200
Subject: [PATCH 377/475] UPGRADE-6.3.md: deprecate "@required"

---
 UPGRADE-6.3.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 8b44f06e2fb1b..4162bc23047ff 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -13,6 +13,7 @@ DependencyInjection
  * Deprecate `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`, use `inline_factories` and `inline_class_loader` instead
  * Deprecate undefined and numeric keys with `service_locator` config, use string aliases instead
  * Deprecate `#[MapDecorated]`, use `#[AutowireDecorated]` instead
+ * Deprecate the `@required` annotation, use the `Symfony\Contracts\Service\Attribute\Required` attribute instead
 
 DoctrineBridge
 --------------

From 7c5c12119a774b52dbc92c1874f3fd888469d2fd Mon Sep 17 00:00:00 2001
From: Tugdual Saunier <tugdual.saunier@gmail.com>
Date: Thu, 6 Apr 2023 14:58:35 -0400
Subject: [PATCH 378/475] [Scheduler] Allow messages from the
 SchedulerTransport to be rejected

Currently, when the processing of a scheduled message fails, Messenger will not be able to go on because the SchedulerTransport will throw an exception. More importantly, the original error will be swallowed by this one and not sent to the failure transport if one is configured. By allowing message rejection, Messenger will continue working as expected.

This is the first step to more changes regarding failure handling in ScheduledMessage processing.
---
 .../Component/Scheduler/Messenger/SchedulerTransport.php        | 2 +-
 .../Scheduler/Tests/Messenger/SchedulerTransportTest.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Scheduler/Messenger/SchedulerTransport.php b/src/Symfony/Component/Scheduler/Messenger/SchedulerTransport.php
index af2a8f9adc1b2..9625e8c41bba9 100644
--- a/src/Symfony/Component/Scheduler/Messenger/SchedulerTransport.php
+++ b/src/Symfony/Component/Scheduler/Messenger/SchedulerTransport.php
@@ -40,7 +40,7 @@ public function ack(Envelope $envelope): void
 
     public function reject(Envelope $envelope): void
     {
-        throw new LogicException(sprintf('Messages from "%s" must not be rejected.', __CLASS__));
+        // ignore
     }
 
     public function send(Envelope $envelope): Envelope
diff --git a/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php b/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php
index 2b31cb67062d1..09f980c07ba2f 100644
--- a/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php
@@ -52,7 +52,7 @@ public function testRejectException()
     {
         $transport = new SchedulerTransport($this->createMock(MessageGeneratorInterface::class));
 
-        $this->expectException(LogicException::class);
+        $this->expectNotToPerformAssertions();
         $transport->reject(new Envelope(new \stdClass()));
     }
 

From 967a3515a1d1d5204b5499520929adcb44893baf Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 7 Apr 2023 13:46:48 +0200
Subject: [PATCH 379/475] [Serializer] Fix tests

---
 .../Component/Serializer/Normalizer/ProblemNormalizer.php   | 6 ++++--
 .../Serializer/Tests/Normalizer/ProblemNormalizerTest.php   | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php
index fd23f3d6def2f..4161d0b1cb989 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ProblemNormalizer.php
@@ -68,6 +68,7 @@ public function normalize(mixed $object, string $format = null, array $context =
                 $template = 'This value should be of type {{ type }}.';
                 $data = [
                     self::TYPE => 'https://symfony.com/errors/validation',
+                    self::TITLE => 'Validation Failed',
                     'violations' => array_map(
                         fn ($e) => [
                             'propertyPath' => $e->getPath(),
@@ -75,13 +76,14 @@ public function normalize(mixed $object, string $format = null, array $context =
                                 '{{ type }}' => implode('|', $e->getExpectedTypes() ?? ['?']),
                             ], 'validators'),
                             'template' => $template,
-                            'parameter' => [
+                            'parameters' => [
                                 '{{ type }}' => implode('|', $e->getExpectedTypes() ?? ['?']),
                             ],
                         ] + ($debug || $e->canUseMessageForUser() ? ['hint' => $e->getMessage()] : []),
                         $exception->getErrors()
                     ),
                 ];
+                $data['detail'] = implode("\n", array_map(fn ($e) => $e['propertyPath'].': '.$e['title'], $data['violations']));
             } elseif ($exception instanceof ValidationFailedException
                 && $this->serializer instanceof NormalizerInterface
                 && $this->serializer->supportsNormalization($exception->getViolations(), $format, $context)
@@ -94,7 +96,7 @@ public function normalize(mixed $object, string $format = null, array $context =
             self::TYPE => $data[self::TYPE] ?? $context[self::TYPE] ?? 'https://tools.ietf.org/html/rfc2616#section-10',
             self::TITLE => $data[self::TITLE] ?? $context[self::TITLE] ?? 'An error occurred',
             self::STATUS => $context[self::STATUS] ?? $object->getStatusCode(),
-            'detail' => $debug ? $object->getMessage() : $object->getStatusText(),
+            'detail' => $data['detail'] ?? ($debug ? $object->getMessage() : $object->getStatusText()),
         ] + $data;
         if ($debug) {
             $data['class'] = $object->getClass();
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ProblemNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ProblemNormalizerTest.php
index 8cc506c6ef629..0937e66d86a26 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ProblemNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ProblemNormalizerTest.php
@@ -60,9 +60,9 @@ public function testNormalizePartialDenormalizationException()
 
         $expected = [
             'type' => 'https://symfony.com/errors/validation',
-            'title' => 'An error occurred',
+            'title' => 'Validation Failed',
             'status' => 422,
-            'detail' => 'Unprocessable Content',
+            'detail' => 'foo: This value should be of type int.',
             'violations' => [
                 [
                     'propertyPath' => 'foo',
@@ -90,7 +90,7 @@ public function testNormalizeValidationFailedException()
             'type' => 'https://symfony.com/errors/validation',
             'title' => 'Validation Failed',
             'status' => 422,
-            'detail' => 'Unprocessable Content',
+            'detail' => 'Invalid value',
             'violations' => [
                 [
                     'propertyPath' => '',

From c08780e0242b9c3f1768d5212a63e1ff831abcb3 Mon Sep 17 00:00:00 2001
From: Allison Guilhem <allison.guilhem@gmail.com>
Date: Mon, 3 Apr 2023 21:49:46 +0200
Subject: [PATCH 380/475] [DoctrineBridge] Deprecate passing Doctrine
 subscribers to ContainerAwareEventManager, use listeners instead

---
 UPGRADE-6.3.md                                |   1 +
 src/Symfony/Bridge/Doctrine/CHANGELOG.md      |   1 +
 .../Doctrine/ContainerAwareEventManager.php   |  24 +--
 ...gisterEventListenersAndSubscribersPass.php |   1 +
 .../Tests/ContainerAwareEventManagerTest.php  | 149 +++++++++++++-----
 ...erEventListenersAndSubscribersPassTest.php |  15 ++
 6 files changed, 141 insertions(+), 50 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 8b44f06e2fb1b..29aecd2fa4a6f 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -17,6 +17,7 @@ DependencyInjection
 DoctrineBridge
 --------------
 
+ * Deprecate passing Doctrine subscribers to `ContainerAwareEventManager` class, use listeners instead
  * Deprecate `DoctrineDbalCacheAdapterSchemaSubscriber` in favor of `DoctrineDbalCacheAdapterSchemaListener`
  * Deprecate `MessengerTransportDoctrineSchemaSubscriber` in favor of `MessengerTransportDoctrineSchemaListener`
  * Deprecate `RememberMeTokenProviderDoctrineSchemaSubscriber` in favor of `RememberMeTokenProviderDoctrineSchemaListener`
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
index 4c55f6e45ebae..93d7ac92b4ce1 100644
--- a/src/Symfony/Bridge/Doctrine/CHANGELOG.md
+++ b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 6.3
 ---
 
+ * Deprecate passing Doctrine subscribers to `ContainerAwareEventManager` class, use listeners instead
  * Add `AbstractSchemaListener`, `LockStoreSchemaListener` and `PdoSessionHandlerSchemaListener`
  * Deprecate `DoctrineDbalCacheAdapterSchemaSubscriber` in favor of `DoctrineDbalCacheAdapterSchemaListener`
  * Deprecate `MessengerTransportDoctrineSchemaSubscriber` in favor of `MessengerTransportDoctrineSchemaListener`
diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
index 566504e84912c..42cb71bfca07c 100644
--- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
+++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
@@ -29,19 +29,18 @@ class ContainerAwareEventManager extends EventManager
      * <event> => <listeners>
      */
     private array $listeners = [];
-    private array $subscribers;
     private array $initialized = [];
     private bool $initializedSubscribers = false;
     private array $methods = [];
     private ContainerInterface $container;
 
     /**
-     * @param list<string|EventSubscriber|array{string[], string|object}> $subscriberIds List of subscribers, subscriber ids, or [events, listener] tuples
+     * @param list<array{string[], string|object}> $listeners List of [events, listener] tuples
      */
-    public function __construct(ContainerInterface $container, array $subscriberIds = [])
+    public function __construct(ContainerInterface $container, array $listeners = [])
     {
         $this->container = $container;
-        $this->subscribers = $subscriberIds;
+        $this->listeners = $listeners;
     }
 
     public function dispatchEvent($eventName, EventArgs $eventArgs = null): void
@@ -182,17 +181,20 @@ private function initializeListeners(string $eventName): void
     private function initializeSubscribers(): void
     {
         $this->initializedSubscribers = true;
-        foreach ($this->subscribers as $subscriber) {
-            if (\is_array($subscriber)) {
-                $this->addEventListener(...$subscriber);
+        $listeners = $this->listeners;
+        $this->listeners = [];
+        foreach ($listeners as $listener) {
+            if (\is_array($listener)) {
+                $this->addEventListener(...$listener);
                 continue;
             }
-            if (\is_string($subscriber)) {
-                $subscriber = $this->container->get($subscriber);
+            if (\is_string($listener)) {
+                $listener = $this->container->get($listener);
             }
-            parent::addEventSubscriber($subscriber);
+            // throw new \InvalidArgumentException(sprintf('Using Doctrine subscriber "%s" is not allowed, declare it as a listener instead.', \is_object($listener) ? $listener::class : $listener));
+            trigger_deprecation('symfony/doctrine-bridge', '6.3', 'Using Doctrine subscribers as services is deprecated, declare listeners instead');
+            parent::addEventSubscriber($listener);
         }
-        $this->subscribers = [];
     }
 
     private function getHash(string|object $listener): string
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
index bf68ec0dcc109..16a37b524acc6 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -106,6 +106,7 @@ private function addTaggedServices(ContainerBuilder $container): array
                     $refs = $managerDef->getArguments()[1] ?? [];
                     $listenerRefs[$con][$id] = new Reference($id);
                     if ($subscriberTag === $tagName) {
+                        trigger_deprecation('symfony/doctrine-bridge', '6.3', 'Using Doctrine subscribers as services is deprecated, declare listeners instead');
                         $refs[] = $id;
                     } else {
                         $refs[] = [[$tag['event']], $id];
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php b/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
index 0ad18f0a66edd..f215f4c774034 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
@@ -32,22 +32,30 @@ protected function setUp(): void
 
     public function testDispatchEventRespectOrder()
     {
-        $this->evm = new ContainerAwareEventManager($this->container, ['sub1', [['foo'], 'list1'], 'sub2']);
+        $this->evm = new ContainerAwareEventManager($this->container, [[['foo'], 'list1'], [['foo'], 'list2']]);
 
         $this->container->set('list1', $listener1 = new MyListener());
+        $this->container->set('list2', $listener2 = new MyListener());
+
+        $this->assertSame([$listener1, $listener2], array_values($this->evm->getListeners('foo')));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testDispatchEventRespectOrderWithSubscribers()
+    {
+        $this->evm = new ContainerAwareEventManager($this->container, ['sub1', 'sub2']);
+
         $this->container->set('sub1', $subscriber1 = new MySubscriber(['foo']));
         $this->container->set('sub2', $subscriber2 = new MySubscriber(['foo']));
 
-        $this->assertSame([$subscriber1, $listener1, $subscriber2], array_values($this->evm->getListeners('foo')));
+        $this->expectDeprecation('Since symfony/doctrine-bridge 6.3: Using Doctrine subscribers as services is deprecated, declare listeners instead');
+        $this->assertSame([$subscriber1,  $subscriber2], array_values($this->evm->getListeners('foo')));
     }
 
     public function testDispatchEvent()
     {
-        $this->evm = new ContainerAwareEventManager($this->container, ['lazy4']);
-
-        $this->container->set('lazy4', $subscriber1 = new MySubscriber(['foo']));
-        $this->assertSame(0, $subscriber1->calledSubscribedEventsCount);
-
         $this->container->set('lazy1', $listener1 = new MyListener());
         $this->evm->addEventListener('foo', 'lazy1');
         $this->evm->addEventListener('foo', $listener2 = new MyListener());
@@ -57,16 +65,10 @@ public function testDispatchEvent()
         $this->container->set('lazy3', $listener5 = new MyListener());
         $this->evm->addEventListener('foo', $listener5 = new MyListener());
         $this->evm->addEventListener('bar', $listener5);
-        $this->evm->addEventSubscriber($subscriber2 = new MySubscriber(['bar']));
-
-        $this->assertSame(1, $subscriber2->calledSubscribedEventsCount);
 
         $this->evm->dispatchEvent('foo');
         $this->evm->dispatchEvent('bar');
 
-        $this->assertSame(1, $subscriber1->calledSubscribedEventsCount);
-        $this->assertSame(1, $subscriber2->calledSubscribedEventsCount);
-
         $this->assertSame(0, $listener1->calledByInvokeCount);
         $this->assertSame(1, $listener1->calledByEventNameCount);
         $this->assertSame(0, $listener2->calledByInvokeCount);
@@ -77,23 +79,46 @@ public function testDispatchEvent()
         $this->assertSame(0, $listener4->calledByEventNameCount);
         $this->assertSame(1, $listener5->calledByInvokeCount);
         $this->assertSame(1, $listener5->calledByEventNameCount);
-        $this->assertSame(0, $subscriber1->calledByInvokeCount);
-        $this->assertSame(1, $subscriber1->calledByEventNameCount);
-        $this->assertSame(1, $subscriber2->calledByInvokeCount);
-        $this->assertSame(0, $subscriber2->calledByEventNameCount);
     }
 
-    public function testAddEventListenerAndSubscriberAfterDispatchEvent()
+    /**
+     * @group legacy
+     */
+    public function testDispatchEventWithSubscribers()
     {
-        $this->evm = new ContainerAwareEventManager($this->container, ['lazy7']);
+        $this->evm = new ContainerAwareEventManager($this->container, ['lazy4']);
 
-        $this->container->set('lazy7', $subscriber1 = new MySubscriber(['foo']));
+        $this->container->set('lazy4', $subscriber1 = new MySubscriber(['foo']));
         $this->assertSame(0, $subscriber1->calledSubscribedEventsCount);
 
         $this->container->set('lazy1', $listener1 = new MyListener());
+        $this->expectDeprecation('Since symfony/doctrine-bridge 6.3: Using Doctrine subscribers as services is deprecated, declare listeners instead');
         $this->evm->addEventListener('foo', 'lazy1');
+        $this->evm->addEventListener('foo', $listener2 = new MyListener());
+        $this->evm->addEventSubscriber($subscriber2 = new MySubscriber(['bar']));
+
+        $this->assertSame(1, $subscriber2->calledSubscribedEventsCount);
+
+        $this->evm->dispatchEvent('foo');
+        $this->evm->dispatchEvent('bar');
+
         $this->assertSame(1, $subscriber1->calledSubscribedEventsCount);
+        $this->assertSame(1, $subscriber2->calledSubscribedEventsCount);
+
+        $this->assertSame(0, $listener1->calledByInvokeCount);
+        $this->assertSame(1, $listener1->calledByEventNameCount);
+        $this->assertSame(0, $listener2->calledByInvokeCount);
+        $this->assertSame(1, $listener2->calledByEventNameCount);
+        $this->assertSame(0, $subscriber1->calledByInvokeCount);
+        $this->assertSame(1, $subscriber1->calledByEventNameCount);
+        $this->assertSame(1, $subscriber2->calledByInvokeCount);
+        $this->assertSame(0, $subscriber2->calledByEventNameCount);
+    }
 
+    public function testAddEventListenerAfterDispatchEvent()
+    {
+        $this->container->set('lazy1', $listener1 = new MyListener());
+        $this->evm->addEventListener('foo', 'lazy1');
         $this->evm->addEventListener('foo', $listener2 = new MyListener());
         $this->container->set('lazy2', $listener3 = new MyListener());
         $this->evm->addEventListener('bar', 'lazy2');
@@ -101,16 +126,10 @@ public function testAddEventListenerAndSubscriberAfterDispatchEvent()
         $this->container->set('lazy3', $listener5 = new MyListener());
         $this->evm->addEventListener('foo', $listener5 = new MyListener());
         $this->evm->addEventListener('bar', $listener5);
-        $this->evm->addEventSubscriber($subscriber2 = new MySubscriber(['bar']));
-
-        $this->assertSame(1, $subscriber2->calledSubscribedEventsCount);
 
         $this->evm->dispatchEvent('foo');
         $this->evm->dispatchEvent('bar');
 
-        $this->assertSame(1, $subscriber1->calledSubscribedEventsCount);
-        $this->assertSame(1, $subscriber2->calledSubscribedEventsCount);
-
         $this->container->set('lazy4', $listener6 = new MyListener());
         $this->evm->addEventListener('foo', 'lazy4');
         $this->evm->addEventListener('foo', $listener7 = new MyListener());
@@ -120,19 +139,10 @@ public function testAddEventListenerAndSubscriberAfterDispatchEvent()
         $this->container->set('lazy6', $listener10 = new MyListener());
         $this->evm->addEventListener('foo', $listener10 = new MyListener());
         $this->evm->addEventListener('bar', $listener10);
-        $this->evm->addEventSubscriber($subscriber3 = new MySubscriber(['bar']));
-
-        $this->assertSame(1, $subscriber1->calledSubscribedEventsCount);
-        $this->assertSame(1, $subscriber2->calledSubscribedEventsCount);
-        $this->assertSame(1, $subscriber3->calledSubscribedEventsCount);
 
         $this->evm->dispatchEvent('foo');
         $this->evm->dispatchEvent('bar');
 
-        $this->assertSame(1, $subscriber1->calledSubscribedEventsCount);
-        $this->assertSame(1, $subscriber2->calledSubscribedEventsCount);
-        $this->assertSame(1, $subscriber3->calledSubscribedEventsCount);
-
         $this->assertSame(0, $listener1->calledByInvokeCount);
         $this->assertSame(2, $listener1->calledByEventNameCount);
         $this->assertSame(0, $listener2->calledByInvokeCount);
@@ -143,10 +153,6 @@ public function testAddEventListenerAndSubscriberAfterDispatchEvent()
         $this->assertSame(0, $listener4->calledByEventNameCount);
         $this->assertSame(2, $listener5->calledByInvokeCount);
         $this->assertSame(2, $listener5->calledByEventNameCount);
-        $this->assertSame(0, $subscriber1->calledByInvokeCount);
-        $this->assertSame(2, $subscriber1->calledByEventNameCount);
-        $this->assertSame(2, $subscriber2->calledByInvokeCount);
-        $this->assertSame(0, $subscriber2->calledByEventNameCount);
 
         $this->assertSame(0, $listener6->calledByInvokeCount);
         $this->assertSame(1, $listener6->calledByEventNameCount);
@@ -158,16 +164,81 @@ public function testAddEventListenerAndSubscriberAfterDispatchEvent()
         $this->assertSame(0, $listener9->calledByEventNameCount);
         $this->assertSame(1, $listener10->calledByInvokeCount);
         $this->assertSame(1, $listener10->calledByEventNameCount);
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testAddEventListenerAndSubscriberAfterDispatchEvent()
+    {
+        $this->evm = new ContainerAwareEventManager($this->container, ['lazy7']);
+
+        $this->container->set('lazy7', $subscriber1 = new MySubscriber(['foo']));
+        $this->assertSame(0, $subscriber1->calledSubscribedEventsCount);
+
+        $this->container->set('lazy1', $listener1 = new MyListener());
+        $this->expectDeprecation('Since symfony/doctrine-bridge 6.3: Using Doctrine subscribers as services is deprecated, declare listeners instead');
+        $this->evm->addEventListener('foo', 'lazy1');
+        $this->assertSame(1, $subscriber1->calledSubscribedEventsCount);
+
+        $this->evm->addEventSubscriber($subscriber2 = new MySubscriber(['bar']));
+
+        $this->assertSame(1, $subscriber2->calledSubscribedEventsCount);
+
+        $this->evm->dispatchEvent('foo');
+        $this->evm->dispatchEvent('bar');
+
+        $this->assertSame(1, $subscriber1->calledSubscribedEventsCount);
+        $this->assertSame(1, $subscriber2->calledSubscribedEventsCount);
+
+        $this->container->set('lazy6', $listener2 = new MyListener());
+        $this->evm->addEventListener('foo', $listener2 = new MyListener());
+        $this->evm->addEventListener('bar', $listener2);
+        $this->evm->addEventSubscriber($subscriber3 = new MySubscriber(['bar']));
+
+        $this->assertSame(1, $subscriber1->calledSubscribedEventsCount);
+        $this->assertSame(1, $subscriber2->calledSubscribedEventsCount);
+        $this->assertSame(1, $subscriber3->calledSubscribedEventsCount);
+
+        $this->evm->dispatchEvent('foo');
+        $this->evm->dispatchEvent('bar');
+
+        $this->assertSame(1, $subscriber1->calledSubscribedEventsCount);
+        $this->assertSame(1, $subscriber2->calledSubscribedEventsCount);
+        $this->assertSame(1, $subscriber3->calledSubscribedEventsCount);
+
+        $this->assertSame(0, $listener1->calledByInvokeCount);
+        $this->assertSame(2, $listener1->calledByEventNameCount);
+        $this->assertSame(0, $subscriber1->calledByInvokeCount);
+        $this->assertSame(2, $subscriber1->calledByEventNameCount);
+        $this->assertSame(2, $subscriber2->calledByInvokeCount);
+        $this->assertSame(0, $subscriber2->calledByEventNameCount);
+
+        $this->assertSame(1, $listener2->calledByInvokeCount);
+        $this->assertSame(1, $listener2->calledByEventNameCount);
         $this->assertSame(1, $subscriber3->calledByInvokeCount);
         $this->assertSame(0, $subscriber3->calledByEventNameCount);
     }
 
     public function testGetListenersForEvent()
+    {
+        $this->container->set('lazy', $listener1 = new MyListener());
+        $this->evm->addEventListener('foo', 'lazy');
+        $this->evm->addEventListener('foo', $listener2 = new MyListener());
+
+        $this->assertSame([$listener1, $listener2], array_values($this->evm->getListeners('foo')));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testGetListenersForEventWhenSubscribersArePresent()
     {
         $this->evm = new ContainerAwareEventManager($this->container, ['lazy2']);
 
         $this->container->set('lazy', $listener1 = new MyListener());
         $this->container->set('lazy2', $subscriber1 = new MySubscriber(['foo']));
+        $this->expectDeprecation('Since symfony/doctrine-bridge 6.3: Using Doctrine subscribers as services is deprecated, declare listeners instead');
         $this->evm->addEventListener('foo', 'lazy');
         $this->evm->addEventListener('foo', $listener2 = new MyListener());
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
index e6fd198920517..02cd5acf0365d 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\ContainerAwareEventManager;
 use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -22,6 +23,8 @@
 
 class RegisterEventListenersAndSubscribersPassTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     public function testExceptionOnAbstractTaggedSubscriber()
     {
         $this->expectException(\InvalidArgumentException::class);
@@ -195,6 +198,9 @@ public function testProcessEventListenersWithMultipleConnections()
         );
     }
 
+    /**
+     * @group legacy
+     */
     public function testProcessEventSubscribersWithMultipleConnections()
     {
         $container = $this->createBuilder(true);
@@ -232,6 +238,7 @@ public function testProcessEventSubscribersWithMultipleConnections()
             ])
         ;
 
+        $this->expectDeprecation('Since symfony/doctrine-bridge 6.3: Using Doctrine subscribers as services is deprecated, declare listeners instead');
         $this->process($container);
 
         $eventManagerDef = $container->getDefinition('doctrine.dbal.default_connection.event_manager');
@@ -279,6 +286,9 @@ public function testProcessEventSubscribersWithMultipleConnections()
         );
     }
 
+    /**
+     * @group legacy
+     */
     public function testProcessEventSubscribersWithPriorities()
     {
         $container = $this->createBuilder();
@@ -312,6 +322,7 @@ public function testProcessEventSubscribersWithPriorities()
             ])
         ;
 
+        $this->expectDeprecation('Since symfony/doctrine-bridge 6.3: Using Doctrine subscribers as services is deprecated, declare listeners instead');
         $this->process($container);
 
         $eventManagerDef = $container->getDefinition('doctrine.dbal.default_connection.event_manager');
@@ -341,6 +352,9 @@ public function testProcessEventSubscribersWithPriorities()
         );
     }
 
+    /**
+     * @group legacy
+     */
     public function testProcessEventSubscribersAndListenersWithPriorities()
     {
         $container = $this->createBuilder();
@@ -402,6 +416,7 @@ public function testProcessEventSubscribersAndListenersWithPriorities()
             ])
         ;
 
+        $this->expectDeprecation('Since symfony/doctrine-bridge 6.3: Using Doctrine subscribers as services is deprecated, declare listeners instead');
         $this->process($container);
 
         $eventManagerDef = $container->getDefinition('doctrine.dbal.default_connection.event_manager');

From b779b0003b9619ba066c23af9e9422d1e55d3571 Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Mon, 27 Mar 2023 20:06:57 +0200
Subject: [PATCH 381/475] Harmonize command formats and ensure autocompletion
 is same

---
 .../Bridge/Twig/Command/DebugCommand.php      | 11 ++++++---
 .../Bridge/Twig/Command/LintCommand.php       | 11 ++++++---
 .../Command/ConfigDebugCommand.php            |  2 +-
 .../Command/ConfigDumpReferenceCommand.php    | 14 ++++++-----
 .../Command/ContainerDebugCommand.php         | 10 +++++---
 .../Command/EventDispatcherDebugCommand.php   |  9 ++++++--
 .../Command/RouterDebugCommand.php            | 10 +++++---
 .../Component/Form/Command/DebugCommand.php   | 10 +++++---
 .../Translation/Command/XliffLintCommand.php  | 11 ++++++---
 .../Uid/Command/GenerateUlidCommand.php       | 23 +++++++++++--------
 .../Uid/Command/GenerateUuidCommand.php       |  4 ++--
 .../Component/Yaml/Command/LintCommand.php    | 11 ++++++---
 12 files changed, 84 insertions(+), 42 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
index cec031127ba85..fe581b5987419 100644
--- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -68,7 +68,7 @@ protected function configure()
             ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'The template name'),
                 new InputOption('filter', null, InputOption::VALUE_REQUIRED, 'Show details for all entries matching this filter'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (text or json)', 'text'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'text'),
             ])
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command outputs a list of twig functions,
@@ -107,7 +107,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         match ($input->getOption('format')) {
             'text' => $name ? $this->displayPathsText($io, $name) : $this->displayGeneralText($io, $filter),
             'json' => $name ? $this->displayPathsJson($io, $name) : $this->displayGeneralJson($io, $filter),
-            default => throw new InvalidArgumentException(sprintf('The format "%s" is not supported.', $input->getOption('format'))),
+            default => throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
         };
 
         return 0;
@@ -120,7 +120,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
         }
 
         if ($input->mustSuggestOptionValuesFor('format')) {
-            $suggestions->suggestValues(['text', 'json']);
+            $suggestions->suggestValues($this->getAvailableFormatOptions());
         }
     }
 
@@ -596,4 +596,9 @@ private function getFileLink(string $absolutePath): string
 
         return (string) $this->fileLinkFormatter->format($absolutePath, 1);
     }
+
+    private function getAvailableFormatOptions(): array
+    {
+        return ['text', 'json'];
+    }
 }
diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
index 05f6319b39e6c..fa8effc12a2e4 100644
--- a/src/Symfony/Bridge/Twig/Command/LintCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/LintCommand.php
@@ -54,7 +54,7 @@ public function __construct(
     protected function configure()
     {
         $this
-            ->addOption('format', null, InputOption::VALUE_REQUIRED, 'The output format')
+            ->addOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())))
             ->addOption('show-deprecations', null, InputOption::VALUE_NONE, 'Show deprecations as errors')
             ->addArgument('filename', InputArgument::IS_ARRAY, 'A file, a directory or "-" for reading from STDIN')
             ->setHelp(<<<'EOF'
@@ -178,7 +178,7 @@ private function display(InputInterface $input, OutputInterface $output, Symfony
             'txt' => $this->displayTxt($output, $io, $files),
             'json' => $this->displayJson($output, $files),
             'github' => $this->displayTxt($output, $io, $files, true),
-            default => throw new InvalidArgumentException(sprintf('The format "%s" is not supported.', $input->getOption('format'))),
+            default => throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
         };
     }
 
@@ -276,7 +276,12 @@ private function getContext(string $template, int $line, int $context = 3): arra
     public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
     {
         if ($input->mustSuggestOptionValuesFor('format')) {
-            $suggestions->suggestValues(['txt', 'json', 'github']);
+            $suggestions->suggestValues($this->getAvailableFormatOptions());
         }
     }
+
+    private function getAvailableFormatOptions(): array
+    {
+        return ['txt', 'json', 'github'];
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
index c8d4b2ca6e86a..8ddfc13af61f1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -61,7 +61,7 @@ protected function configure(): void
   <info>php %command.full_name% FrameworkBundle</info>
 
 The <info>--format</info> option specifies the format of the configuration,
-this is either "{$helpFormats}".
+these are "{$helpFormats}".
 
   <info>php %command.full_name% framework --format=json</info>
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
index 0d0a4837212bf..11a0668561a22 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
@@ -41,13 +41,16 @@ class ConfigDumpReferenceCommand extends AbstractConfigCommand
 {
     protected function configure(): void
     {
+        $commentedHelpFormats = array_map(static fn (string $format): string => sprintf('<comment>%s</comment>', $format), $this->getAvailableFormatOptions());
+        $helpFormats = implode('", "', $commentedHelpFormats);
+
         $this
             ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'The Bundle name or the extension alias'),
                 new InputArgument('path', InputArgument::OPTIONAL, 'The configuration option path'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (yaml or xml)', 'yaml'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'yaml'),
             ])
-            ->setHelp(<<<'EOF'
+            ->setHelp(<<<EOF
 The <info>%command.name%</info> command dumps the default configuration for an
 extension/bundle.
 
@@ -56,9 +59,8 @@ protected function configure(): void
   <info>php %command.full_name% framework</info>
   <info>php %command.full_name% FrameworkBundle</info>
 
-With the <info>--format</info> option specifies the format of the configuration,
-this is either <comment>yaml</comment> or <comment>xml</comment>.
-When the option is not provided, <comment>yaml</comment> is used.
+The <info>--format</info> option specifies the format of the configuration,
+these are "{$helpFormats}".
 
   <info>php %command.full_name% FrameworkBundle --format=xml</info>
 
@@ -145,7 +147,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 break;
             default:
                 $io->writeln($message);
-                throw new InvalidArgumentException('Only the yaml and xml formats are supported.');
+                throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions())));
         }
 
         $io->writeln(null === $path ? $dumper->dump($configuration, $extension->getNamespace()) : $dumper->dumpAtPath($configuration, $path));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
index f57b5a5ae89cd..300fae1b8aa79 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -52,7 +52,7 @@ protected function configure(): void
                 new InputOption('types', null, InputOption::VALUE_NONE, 'Display types (classes/interfaces) available in the container'),
                 new InputOption('env-var', null, InputOption::VALUE_REQUIRED, 'Display a specific environment variable used in the container'),
                 new InputOption('env-vars', null, InputOption::VALUE_NONE, 'Display environment variables used in the container'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw description'),
                 new InputOption('deprecations', null, InputOption::VALUE_NONE, 'Display deprecations generated when compiling and warming up the container'),
             ])
@@ -203,8 +203,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
     {
         if ($input->mustSuggestOptionValuesFor('format')) {
-            $helper = new DescriptorHelper();
-            $suggestions->suggestValues($helper->getFormats());
+            $suggestions->suggestValues($this->getAvailableFormatOptions());
 
             return;
         }
@@ -352,4 +351,9 @@ public function filterToServiceTypes(string $serviceId): bool
 
         return class_exists($serviceId) || interface_exists($serviceId, false);
     }
+
+    private function getAvailableFormatOptions(): array
+    {
+        return (new DescriptorHelper())->getFormats();
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php
index a6a51ec97ca68..1a74e86824548 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php
@@ -52,7 +52,7 @@ protected function configure(): void
             ->setDefinition([
                 new InputArgument('event', InputArgument::OPTIONAL, 'An event name or a part of the event name'),
                 new InputOption('dispatcher', null, InputOption::VALUE_REQUIRED, 'To view events of a specific event dispatcher', self::DEFAULT_DISPATCHER),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format  (txt, xml, json, or md)', 'txt'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw description'),
             ])
             ->setHelp(<<<'EOF'
@@ -138,7 +138,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
         }
 
         if ($input->mustSuggestOptionValuesFor('format')) {
-            $suggestions->suggestValues((new DescriptorHelper())->getFormats());
+            $suggestions->suggestValues($this->getAvailableFormatOptions());
         }
     }
 
@@ -155,4 +155,9 @@ private function searchForEvent(EventDispatcherInterface $dispatcher, string $ne
 
         return $output;
     }
+
+    private function getAvailableFormatOptions(): array
+    {
+        return (new DescriptorHelper())->getFormats();
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
index b88130d7a6a23..27d16e636d9c0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -56,7 +56,7 @@ protected function configure(): void
             ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'A route name'),
                 new InputOption('show-controllers', null, InputOption::VALUE_NONE, 'Show assigned controllers in overview'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw route(s)'),
             ])
             ->setHelp(<<<'EOF'
@@ -149,8 +149,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
         }
 
         if ($input->mustSuggestOptionValuesFor('format')) {
-            $helper = new DescriptorHelper();
-            $suggestions->suggestValues($helper->getFormats());
+            $suggestions->suggestValues($this->getAvailableFormatOptions());
         }
     }
 
@@ -165,4 +164,9 @@ private function findRouteContaining(string $name, RouteCollection $routes): Rou
 
         return $foundRoutes;
     }
+
+    private function getAvailableFormatOptions(): array
+    {
+        return (new DescriptorHelper())->getFormats();
+    }
 }
diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
index 5e4635870a8ef..4a142e2965e44 100644
--- a/src/Symfony/Component/Form/Command/DebugCommand.php
+++ b/src/Symfony/Component/Form/Command/DebugCommand.php
@@ -64,7 +64,7 @@ protected function configure()
                 new InputArgument('class', InputArgument::OPTIONAL, 'The form type class'),
                 new InputArgument('option', InputArgument::OPTIONAL, 'The form type option'),
                 new InputOption('show-deprecated', null, InputOption::VALUE_NONE, 'Display deprecated options in form types'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt or json)', 'txt'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
             ])
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command displays information about form types.
@@ -261,8 +261,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
         }
 
         if ($input->mustSuggestOptionValuesFor('format')) {
-            $helper = new DescriptorHelper();
-            $suggestions->suggestValues($helper->getFormats());
+            $suggestions->suggestValues($this->getAvailableFormatOptions());
         }
     }
 
@@ -283,4 +282,9 @@ private function completeOptions(string $class, CompletionSuggestions $suggestio
         $resolvedType = $this->formRegistry->getType($class);
         $suggestions->suggestValues($resolvedType->getOptionsResolver()->getDefinedOptions());
     }
+
+    private function getAvailableFormatOptions(): array
+    {
+        return (new DescriptorHelper())->getFormats();
+    }
 }
diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
index 73ddae5dcc2ef..91001c5644d27 100644
--- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php
+++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
@@ -57,7 +57,7 @@ protected function configure()
     {
         $this
             ->addArgument('filename', InputArgument::IS_ARRAY, 'A file, a directory or "-" for reading from STDIN')
-            ->addOption('format', null, InputOption::VALUE_REQUIRED, 'The output format')
+            ->addOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())))
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command lints an XLIFF file and outputs to STDOUT
 the first encountered syntax error.
@@ -160,7 +160,7 @@ private function display(SymfonyStyle $io, array $files)
             'txt' => $this->displayTxt($io, $files),
             'json' => $this->displayJson($io, $files),
             'github' => $this->displayTxt($io, $files, true),
-            default => throw new InvalidArgumentException(sprintf('The format "%s" is not supported.', $this->format)),
+            default => throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
         };
     }
 
@@ -268,7 +268,12 @@ private function getTargetLanguageFromFile(\DOMDocument $xliffContents): ?string
     public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
     {
         if ($input->mustSuggestOptionValuesFor('format')) {
-            $suggestions->suggestValues(['txt', 'json', 'github']);
+            $suggestions->suggestValues($this->getAvailableFormatOptions());
         }
     }
+
+    private function getAvailableFormatOptions(): array
+    {
+        return ['txt', 'json', 'github'];
+    }
 }
diff --git a/src/Symfony/Component/Uid/Command/GenerateUlidCommand.php b/src/Symfony/Component/Uid/Command/GenerateUlidCommand.php
index 9930b6397fa2c..596d8a08aaf54 100644
--- a/src/Symfony/Component/Uid/Command/GenerateUlidCommand.php
+++ b/src/Symfony/Component/Uid/Command/GenerateUlidCommand.php
@@ -25,12 +25,6 @@
 #[AsCommand(name: 'ulid:generate', description: 'Generate a ULID')]
 class GenerateUlidCommand extends Command
 {
-    private const FORMAT_OPTIONS = [
-        'base32',
-        'base58',
-        'rfc4122',
-    ];
-
     private UlidFactory $factory;
 
     public function __construct(UlidFactory $factory = null)
@@ -46,7 +40,7 @@ protected function configure(): void
             ->setDefinition([
                 new InputOption('time', null, InputOption::VALUE_REQUIRED, 'The ULID timestamp: a parsable date/time string'),
                 new InputOption('count', 'c', InputOption::VALUE_REQUIRED, 'The number of ULID to generate', 1),
-                new InputOption('format', 'f', InputOption::VALUE_REQUIRED, 'The ULID output format: base32, base58 or rfc4122', 'base32'),
+                new InputOption('format', 'f', InputOption::VALUE_REQUIRED, sprintf('The ULID output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'base32'),
             ])
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command generates a ULID.
@@ -85,10 +79,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $formatOption = $input->getOption('format');
 
-        if (\in_array($formatOption, self::FORMAT_OPTIONS)) {
+        if (\in_array($formatOption, $this->getAvailableFormatOptions())) {
             $format = 'to'.ucfirst($formatOption);
         } else {
-            $io->error(sprintf('Invalid format "%s", did you mean "base32", "base58" or "rfc4122"?', $input->getOption('format')));
+            $io->error(sprintf('Invalid format "%s", supported formats are "%s".', $formatOption, implode('", "', $this->getAvailableFormatOptions())));
 
             return 1;
         }
@@ -110,7 +104,16 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
     {
         if ($input->mustSuggestOptionValuesFor('format')) {
-            $suggestions->suggestValues(self::FORMAT_OPTIONS);
+            $suggestions->suggestValues($this->getAvailableFormatOptions());
         }
     }
+
+    private function getAvailableFormatOptions(): array
+    {
+        return [
+            'base32',
+            'base58',
+            'rfc4122',
+        ];
+    }
 }
diff --git a/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php b/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php
index b8b6a6cda7ec4..10924edf32af1 100644
--- a/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php
+++ b/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php
@@ -45,7 +45,7 @@ protected function configure(): void
                 new InputOption('namespace', null, InputOption::VALUE_REQUIRED, 'The UUID to use at the namespace for named-based UUIDs, predefined namespaces keywords "dns", "url", "oid" and "x500" are accepted'),
                 new InputOption('random-based', null, InputOption::VALUE_NONE, 'To generate a random-based UUID'),
                 new InputOption('count', 'c', InputOption::VALUE_REQUIRED, 'The number of UUID to generate', 1),
-                new InputOption('format', 'f', InputOption::VALUE_REQUIRED, 'The UUID output format: rfc4122, base58 or base32', 'rfc4122'),
+                new InputOption('format', 'f', InputOption::VALUE_REQUIRED, sprintf('The UUID output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'rfc4122'),
             ])
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> generates a UUID.
@@ -171,7 +171,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         if (\in_array($formatOption, $this->getAvailableFormatOptions())) {
             $format = 'to'.ucfirst($formatOption);
         } else {
-            $io->error(sprintf('Invalid format "%s", did you mean "base32", "base58" or "rfc4122"?', $formatOption));
+            $io->error(sprintf('Invalid format "%s", supported formats are "%s".', $formatOption, implode('", "', $this->getAvailableFormatOptions())));
 
             return 1;
         }
diff --git a/src/Symfony/Component/Yaml/Command/LintCommand.php b/src/Symfony/Component/Yaml/Command/LintCommand.php
index de11d48d0ffcf..95352ac174ff5 100644
--- a/src/Symfony/Component/Yaml/Command/LintCommand.php
+++ b/src/Symfony/Component/Yaml/Command/LintCommand.php
@@ -57,7 +57,7 @@ protected function configure()
     {
         $this
             ->addArgument('filename', InputArgument::IS_ARRAY, 'A file, a directory or "-" for reading from STDIN')
-            ->addOption('format', null, InputOption::VALUE_REQUIRED, 'The output format')
+            ->addOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())))
             ->addOption('exclude', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Path(s) to exclude')
             ->addOption('parse-tags', null, InputOption::VALUE_NEGATABLE, 'Parse custom tags', null)
             ->setHelp(<<<EOF
@@ -154,7 +154,7 @@ private function display(SymfonyStyle $io, array $files): int
             'txt' => $this->displayTxt($io, $files),
             'json' => $this->displayJson($io, $files),
             'github' => $this->displayTxt($io, $files, true),
-            default => throw new InvalidArgumentException(sprintf('The format "%s" is not supported.', $this->format)),
+            default => throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
         };
     }
 
@@ -265,7 +265,12 @@ private function isReadable(string $fileOrDirectory): bool
     public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
     {
         if ($input->mustSuggestOptionValuesFor('format')) {
-            $suggestions->suggestValues(['txt', 'json', 'github']);
+            $suggestions->suggestValues($this->getAvailableFormatOptions());
         }
     }
+
+    private function getAvailableFormatOptions(): array
+    {
+        return ['txt', 'json', 'github'];
+    }
 }

From b2828e99029c07bf9b42d85707466a39a2d631eb Mon Sep 17 00:00:00 2001
From: Tugdual Saunier <tugdual.saunier@gmail.com>
Date: Wed, 5 Apr 2023 14:55:21 -0400
Subject: [PATCH 382/475] [Serializer] Mark ObjectNormalizer as final for 7.0

---
 UPGRADE-6.3.md                                                  | 1 +
 src/Symfony/Component/Serializer/CHANGELOG.md                   | 1 +
 .../Component/Serializer/Normalizer/ObjectNormalizer.php        | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index f3245d6a9bbd4..3c6ffb56aa37a 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -112,3 +112,4 @@ Serializer
 
  * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
  * Deprecate `CacheableSupportsMethodInterface` in favor of the new `getSupportedTypes(?string $format)` methods
+ * The following Normalizer classes will become final in 7.0: `ObjectNormalizer`
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
index 6b897c1eae966..ba277a3870b31 100644
--- a/src/Symfony/Component/Serializer/CHANGELOG.md
+++ b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG
  * Make `ProblemNormalizer` give details about `ValidationFailedException` and `PartialDenormalizationException`
  * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
  * Deprecate `CacheableSupportsMethodInterface` in favor of the new `getSupportedTypes(?string $format)` methods
+ * The following Normalizer classes will become final in 7.0: `ObjectNormalizer`
 
 6.2
 ---
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index dc5067dfb6f4b..f4e50841e9c20 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -25,6 +25,8 @@
  * Converts between objects and arrays using the PropertyAccess component.
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 6.3
  */
 class ObjectNormalizer extends AbstractObjectNormalizer
 {

From 187c120cd04b7a21d7ce38cb121a2a1b923bc5b1 Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Mon, 27 Mar 2023 20:16:20 +0200
Subject: [PATCH 383/475] [BrowserKit] Improve the error message when
 `submitForm()` can't find the form

---
 .../Component/BrowserKit/AbstractBrowser.php    |  5 +++++
 .../BrowserKit/Tests/AbstractBrowserTest.php    | 17 ++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
index bf5ff90e5dd60..e95ec5b821d05 100644
--- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
+++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
@@ -333,6 +333,11 @@ public function submitForm(string $button, array $fieldValues = [], string $meth
         }
 
         $buttonNode = $this->crawler->selectButton($button);
+
+        if (0 === $buttonNode->count()) {
+            throw new \InvalidArgumentException(sprintf('There is no button with "%s" as its content, id, value or name.', $button));
+        }
+
         $form = $buttonNode->form($fieldValues, $method);
 
         return $this->submit($form, [], $serverParameters);
diff --git a/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
index 6944a3371e323..49ea2de9fa561 100644
--- a/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
@@ -350,15 +350,14 @@ public function testSubmitFormNotFound()
         $client->setNextResponse(new Response('<html><form action="/foo"><input type="submit" /></form></html>'));
         $client->request('GET', 'http://www.example.com/foo/foobar');
 
-        try {
-            $client->submitForm('Register', [
-                'username' => 'username',
-                'password' => 'password',
-            ], 'POST');
-            $this->fail('->submitForm() throws a \InvalidArgumentException if the form could not be found');
-        } catch (\Exception $e) {
-            $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->submitForm() throws a \InvalidArgumentException if the form could not be found');
-        }
+        $this->expectExceptionObject(
+            new \InvalidArgumentException('There is no button with "Register" as its content, id, value or name.')
+        );
+
+        $client->submitForm('Register', [
+            'username' => 'username',
+            'password' => 'password',
+        ], 'POST');
     }
 
     public function testSubmitPreserveAuth()

From cf0f9ab885598b3264dd27e6ddd233d921f55fbd Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 8 Apr 2023 18:52:58 +0200
Subject: [PATCH 384/475] [BrowserKit] Add proper exception hierarchy

---
 .../Component/BrowserKit/AbstractBrowser.php  | 21 +++++++++++--------
 src/Symfony/Component/BrowserKit/Cookie.php   | 11 ++++++----
 .../Component/BrowserKit/CookieJar.php        |  4 +++-
 .../Exception/BadMethodCallException.php      |  2 +-
 .../Exception/ExceptionInterface.php          | 21 +++++++++++++++++++
 .../Exception/InvalidArgumentException.php    | 16 ++++++++++++++
 .../BrowserKit/Exception/JsonException.php    |  2 +-
 .../BrowserKit/Exception/LogicException.php   | 16 ++++++++++++++
 .../BrowserKit/Exception/RuntimeException.php | 16 ++++++++++++++
 .../Exception/UnexpectedValueException.php    | 16 ++++++++++++++
 src/Symfony/Component/BrowserKit/History.php  | 14 +++++++------
 .../Component/BrowserKit/HttpBrowser.php      |  5 +++--
 .../BrowserKit/Tests/AbstractBrowserTest.php  | 11 ++++------
 .../Component/BrowserKit/Tests/CookieTest.php |  8 ++++---
 14 files changed, 129 insertions(+), 34 deletions(-)
 create mode 100644 src/Symfony/Component/BrowserKit/Exception/ExceptionInterface.php
 create mode 100644 src/Symfony/Component/BrowserKit/Exception/InvalidArgumentException.php
 create mode 100644 src/Symfony/Component/BrowserKit/Exception/LogicException.php
 create mode 100644 src/Symfony/Component/BrowserKit/Exception/RuntimeException.php
 create mode 100644 src/Symfony/Component/BrowserKit/Exception/UnexpectedValueException.php

diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
index e95ec5b821d05..df0484f75b313 100644
--- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
+++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
@@ -12,6 +12,9 @@
 namespace Symfony\Component\BrowserKit;
 
 use Symfony\Component\BrowserKit\Exception\BadMethodCallException;
+use Symfony\Component\BrowserKit\Exception\InvalidArgumentException;
+use Symfony\Component\BrowserKit\Exception\LogicException;
+use Symfony\Component\BrowserKit\Exception\RuntimeException;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\DomCrawler\Form;
 use Symfony\Component\DomCrawler\Link;
@@ -110,12 +113,12 @@ public function getMaxRedirects(): int
      *
      * @return void
      *
-     * @throws \RuntimeException When Symfony Process Component is not installed
+     * @throws LogicException When Symfony Process Component is not installed
      */
     public function insulate(bool $insulated = true)
     {
         if ($insulated && !class_exists(\Symfony\Component\Process\Process::class)) {
-            throw new \LogicException('Unable to isolate requests as the Symfony Process Component is not installed.');
+            throw new LogicException('Unable to isolate requests as the Symfony Process Component is not installed.');
         }
 
         $this->insulated = $insulated;
@@ -335,7 +338,7 @@ public function submitForm(string $button, array $fieldValues = [], string $meth
         $buttonNode = $this->crawler->selectButton($button);
 
         if (0 === $buttonNode->count()) {
-            throw new \InvalidArgumentException(sprintf('There is no button with "%s" as its content, id, value or name.', $button));
+            throw new InvalidArgumentException(sprintf('There is no button with "%s" as its content, id, value or name.', $button));
         }
 
         $form = $buttonNode->form($fieldValues, $method);
@@ -459,7 +462,7 @@ protected function doRequestInProcess(object $request)
         }
 
         if (!$process->isSuccessful() || !preg_match('/^O\:\d+\:/', $process->getOutput())) {
-            throw new \RuntimeException(sprintf('OUTPUT: %s ERROR OUTPUT
10000
: %s.', $process->getOutput(), $process->getErrorOutput()));
+            throw new RuntimeException(sprintf('OUTPUT: %s ERROR OUTPUT: %s.', $process->getOutput(), $process->getErrorOutput()));
         }
 
         return unserialize($process->getOutput());
@@ -477,11 +480,11 @@ abstract protected function doRequest(object $request);
      *
      * @param object $request An origin request instance
      *
-     * @throws \LogicException When this abstract class is not implemented
+     * @throws LogicException When this abstract class is not implemented
      */
     protected function getScript(object $request)
     {
-        throw new \LogicException('To insulate requests, you need to override the getScript() method.');
+        throw new LogicException('To insulate requests, you need to override the getScript() method.');
     }
 
     /**
@@ -556,18 +559,18 @@ public function reload(): Crawler
     /**
      * Follow redirects?
      *
-     * @throws \LogicException If request was not a redirect
+     * @throws LogicException If request was not a redirect
      */
     public function followRedirect(): Crawler
     {
         if (empty($this->redirect)) {
-            throw new \LogicException('The request was not redirected.');
+            throw new LogicException('The request was not redirected.');
         }
 
         if (-1 !== $this->maxRedirects) {
             if ($this->redirectCount > $this->maxRedirects) {
                 $this->redirectCount = 0;
-                throw new \LogicException(sprintf('The maximum number (%d) of redirections was reached.', $this->maxRedirects));
+                throw new LogicException(sprintf('The maximum number (%d) of redirections was reached.', $this->maxRedirects));
             }
         }
 
diff --git a/src/Symfony/Component/BrowserKit/Cookie.php b/src/Symfony/Component/BrowserKit/Cookie.php
index f23e4657c33fa..67579e3812de5 100644
--- a/src/Symfony/Component/BrowserKit/Cookie.php
+++ b/src/Symfony/Component/BrowserKit/Cookie.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\BrowserKit;
 
+use Symfony\Component\BrowserKit\Exception\InvalidArgumentException;
+use Symfony\Component\BrowserKit\Exception\UnexpectedValueException;
+
 /**
  * Cookie represents an HTTP cookie.
  *
@@ -74,7 +77,7 @@ public function __construct(string $name, ?string $value, string $expires = null
         if (null !== $expires) {
             $timestampAsDateTime = \DateTimeImmutable::createFromFormat('U', $expires);
             if (false === $timestampAsDateTime) {
-                throw new \UnexpectedValueException(sprintf('The cookie expiration time "%s" is not valid.', $expires));
+                throw new UnexpectedValueException(sprintf('The cookie expiration time "%s" is not valid.', $expires));
             }
 
             $this->expires = $timestampAsDateTime->format('U');
@@ -119,14 +122,14 @@ public function __toString(): string
     /**
      * Creates a Cookie instance from a Set-Cookie header value.
      *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function fromString(string $cookie, string $url = null): static
     {
         $parts = explode(';', $cookie);
 
         if (!str_contains($parts[0], '=')) {
-            throw new \InvalidArgumentException(sprintf('The cookie string "%s" is not valid.', $parts[0]));
+            throw new InvalidArgumentException(sprintf('The cookie string "%s" is not valid.', $parts[0]));
         }
 
         [$name, $value] = explode('=', array_shift($parts), 2);
@@ -145,7 +148,7 @@ public static function fromString(string $cookie, string $url = null): static
 
         if (null !== $url) {
             if ((false === $urlParts = parse_url($url)) || !isset($urlParts['host'])) {
-                throw new \InvalidArgumentException(sprintf('The URL "%s" is not valid.', $url));
+                throw new InvalidArgumentException(sprintf('The URL "%s" is not valid.', $url));
             }
 
             $values['domain'] = $urlParts['host'];
diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php
index 9753d305d93ea..f851f813630ef 100644
--- a/src/Symfony/Component/BrowserKit/CookieJar.php
+++ b/src/Symfony/Component/BrowserKit/CookieJar.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\BrowserKit;
 
+use Symfony\Component\BrowserKit\Exception\InvalidArgumentException;
+
 /**
  * CookieJar.
  *
@@ -129,7 +131,7 @@ public function updateFromSetCookie(array $setCookies, string $uri = null)
         foreach ($cookies as $cookie) {
             try {
                 $this->set(Cookie::fromString($cookie, $uri));
-            } catch (\InvalidArgumentException) {
+            } catch (InvalidArgumentException) {
                 // invalid cookies are just ignored
             }
         }
diff --git a/src/Symfony/Component/BrowserKit/Exception/BadMethodCallException.php b/src/Symfony/Component/BrowserKit/Exception/BadMethodCallException.php
index 8683b0a787d6e..8297145f561b2 100644
--- a/src/Symfony/Component/BrowserKit/Exception/BadMethodCallException.php
+++ b/src/Symfony/Component/BrowserKit/Exception/BadMethodCallException.php
@@ -11,6 +11,6 @@
 
 namespace Symfony\Component\BrowserKit\Exception;
 
-class BadMethodCallException extends \BadMethodCallException
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/src/Symfony/Component/BrowserKit/Exception/ExceptionInterface.php b/src/Symfony/Component/BrowserKit/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000000..b84c9ddb24ded
--- /dev/null
+++ b/src/Symfony/Component/BrowserKit/Exception/ExceptionInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\BrowserKit\Exception;
+
+/**
+ * Base ExceptionInterface for the BrowserKit component.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+interface ExceptionInterface extends \Throwable
+{
+}
diff --git a/src/Symfony/Component/BrowserKit/Exception/InvalidArgumentException.php b/src/Symfony/Component/BrowserKit/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000000..a1a5b59d4155e
--- /dev/null
+++ b/src/Symfony/Component/BrowserKit/Exception/InvalidArgumentException.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\BrowserKit\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/BrowserKit/Exception/JsonException.php b/src/Symfony/Component/BrowserKit/Exception/JsonException.php
index b62dbcbba3e54..3af64de0218a8 100644
--- a/src/Symfony/Component/BrowserKit/Exception/JsonException.php
+++ b/src/Symfony/Component/BrowserKit/Exception/JsonException.php
@@ -11,6 +11,6 @@
 
 namespace Symfony\Component\BrowserKit\Exception;
 
-class JsonException extends \JsonException
+class JsonException extends \JsonException implements ExceptionInterface
 {
 }
diff --git a/src/Symfony/Component/BrowserKit/Exception/LogicException.php b/src/Symfony/Component/BrowserKit/Exception/LogicException.php
new file mode 100644
index 0000000000000..4b55b08c241de
--- /dev/null
+++ b/src/Symfony/Component/BrowserKit/Exception/LogicException.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\BrowserKit\Exception;
+
+class LogicException extends \LogicException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/BrowserKit/Exception/RuntimeException.php b/src/Symfony/Component/BrowserKit/Exception/RuntimeException.php
new file mode 100644
index 0000000000000..0726ac1cd2c14
--- /dev/null
+++ b/src/Symfony/Component/BrowserKit/Exception/RuntimeException.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\BrowserKit\Exception;
+
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/BrowserKit/Exception/UnexpectedValueException.php b/src/Symfony/Component/BrowserKit/Exception/UnexpectedValueException.php
new file mode 100644
index 0000000000000..8665b21810481
--- /dev/null
+++ b/src/Symfony/Component/BrowserKit/Exception/UnexpectedValueException.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\BrowserKit\Exception;
+
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
+{
+}
diff --git a/src/Symfony/Component/BrowserKit/History.php b/src/Symfony/Component/BrowserKit/History.php
index 01f5e80382774..7fce4e32b0857 100644
--- a/src/Symfony/Component/BrowserKit/History.php
+++ b/src/Symfony/Component/BrowserKit/History.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\BrowserKit;
 
+use Symfony\Component\BrowserKit\Exception\LogicException;
+
 /**
  * History.
  *
@@ -55,12 +57,12 @@ public function isEmpty(): bool
     /**
      * Goes back in the history.
      *
-     * @throws \LogicException if the stack is already on the first page
+     * @throws LogicException if the stack is already on the first page
      */
     public function back(): Request
     {
         if ($this->position < 1) {
-            throw new \LogicException('You are already on the first page.');
+            throw new LogicException('You are already on the first page.');
         }
 
         return clone $this->stack[--$this->position];
@@ -69,12 +71,12 @@ public function back(): Request
     /**
      * Goes forward in the history.
      *
-     * @throws \LogicException if the stack is already on the last page
+     * @throws LogicException if the stack is already on the last page
      */
     public function forward(): Request
     {
         if ($this->position > \count($this->stack) - 2) {
-            throw new \LogicException('You are already on the last page.');
+            throw new LogicException('You are already on the last page.');
         }
 
         return clone $this->stack[++$this->position];
@@ -83,12 +85,12 @@ public function forward(): Request
     /**
      * Returns the current element in the history.
      *
-     * @throws \LogicException if the stack is empty
+     * @throws LogicException if the stack is empty
      */
     public function current(): Request
     {
         if (-1 === $this->position) {
-            throw new \LogicException('The page history is empty.');
+            throw new LogicException('The page history is empty.');
         }
 
         return clone $this->stack[$this->position];
diff --git a/src/Symfony/Component/BrowserKit/HttpBrowser.php b/src/Symfony/Component/BrowserKit/HttpBrowser.php
index 1e49b33163c53..4b61c86ec79e6 100644
--- a/src/Symfony/Component/BrowserKit/HttpBrowser.php
+++ b/src/Symfony/Component/BrowserKit/HttpBrowser.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\BrowserKit;
 
+use Symfony\Component\BrowserKit\Exception\LogicException;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\Mime\Part\AbstractPart;
 use Symfony\Component\Mime\Part\DataPart;
@@ -31,7 +32,7 @@ class HttpBrowser extends AbstractBrowser
     public function __construct(HttpClientInterface $client = null, History $history = null, CookieJar $cookieJar = null)
     {
         if (!$client && !class_exists(HttpClient::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s" as the HttpClient component is not installed. Try running "composer require symfony/http-client".', __CLASS__));
+            throw new LogicException(sprintf('You cannot use "%s" as the HttpClient component is not installed. Try running "composer require symfony/http-client".', __CLASS__));
         }
 
         $this->client = $client ?? HttpClient::create();
@@ -66,7 +67,7 @@ private function getBodyAndExtraHeaders(Request $request, array $headers): array
         }
 
         if (!class_exists(AbstractPart::class)) {
-            throw new \LogicException('You cannot pass non-empty bodies as the Mime component is not installed. Try running "composer require symfony/mime".');
+            throw new LogicException('You cannot pass non-empty bodies as the Mime component is not installed. Try running "composer require symfony/mime".');
         }
 
         if (null !== $content = $request->getContent()) {
diff --git a/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
index 49ea2de9fa561..dd449bea5e428 100644
--- a/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\BrowserKit\CookieJar;
 use Symfony\Component\BrowserKit\Exception\BadMethodCallException;
+use Symfony\Component\BrowserKit\Exception\InvalidArgumentException;
 use Symfony\Component\BrowserKit\History;
 use Symfony\Component\BrowserKit\Request;
 use Symfony\Component\BrowserKit\Response;
@@ -294,12 +295,8 @@ public function testClickLinkNotFound()
         $client->setNextResponse(new Response('<html><a href="/foo">foobar</a></html>'));
         $client->request('GET', 'http://www.example.com/foo/foobar');
 
-        try {
-            $client->clickLink('foo');
-            $this->fail('->clickLink() throws a \InvalidArgumentException if the link could not be found');
-        } catch (\Exception $e) {
-            $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->clickLink() throws a \InvalidArgumentException if the link could not be found');
-        }
+        $this->expectException(\InvalidArgumentException::class);
+        $client->clickLink('foo');
     }
 
     public function testClickForm()
@@ -351,7 +348,7 @@ public function testSubmitFormNotFound()
         $client->request('GET', 'http://www.example.com/foo/foobar');
 
         $this->expectExceptionObject(
-            new \InvalidArgumentException('There is no button with "Register" as its content, id, value or name.')
+            new InvalidArgumentException('There is no button with "Register" as its content, id, value or name.')
         );
 
         $client->submitForm('Register', [
diff --git a/src/Symfony/Component/BrowserKit/Tests/CookieTest.php b/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
index 3fdb756019d4c..5d42ceb8a73da 100644
--- a/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\BrowserKit\Cookie;
+use Symfony\Component\BrowserKit\Exception\InvalidArgumentException;
+use Symfony\Component\BrowserKit\Exception\UnexpectedValueException;
 
 class CookieTest extends TestCase
 {
@@ -104,7 +106,7 @@ public function testFromStringWithUrl()
 
     public function testFromStringThrowsAnExceptionIfCookieIsNotValid()
     {
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         Cookie::fromString('foo');
     }
 
@@ -117,7 +119,7 @@ public function testFromStringIgnoresInvalidExpiresDate()
 
     public function testFromStringThrowsAnExceptionIfUrlIsNotValid()
     {
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         Cookie::fromString('foo=bar', 'foobar');
     }
 
@@ -200,7 +202,7 @@ public function testIsExpired()
 
     public function testConstructException()
     {
-        $this->expectException(\UnexpectedValueException::class);
+        $this->expectException(UnexpectedValueException::class);
         $this->expectExceptionMessage('The cookie expiration time "string" is not valid.');
         new Cookie('foo', 'bar', 'string');
     }

From bf81d66ecd2ec7dffa0862778a53a0d31c667eac Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Fri, 3 Feb 2023 11:47:56 +0100
Subject: [PATCH 385/475] deprecate the $secret argument of the
 PersistentRememberMeHandler constructor

---
 UPGRADE-6.3.md                                |  5 +++
 .../security_authenticator_remember_me.php    |  1 -
 .../Bundle/SecurityBundle/composer.json       |  2 +-
 .../Component/Security/Http/CHANGELOG.md      |  1 +
 .../PersistentRememberMeHandler.php           | 39 ++++++++++++++++++-
 .../PersistentRememberMeHandlerTest.php       |  4 +-
 6 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 3c6ffb56aa37a..04f7f5a15a95b 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -96,6 +96,11 @@ Notifier
  * [BC BREAK] The following data providers for `TransportTestCase` are now static: `toStringProvider()`, `supportedMessagesProvider()` and `unsupportedMessagesProvider()`
  * [BC BREAK] The `TransportTestCase::createTransport()` method is now static
 
+Security
+--------
+
+ * Deprecate passing a secret as the 2nd argument to the constructor of `Symfony\Component\Security\Http\RememberMe\PersistentRememberMeHandler`
+
 SecurityBundle
 --------------
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator_remember_me.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator_remember_me.php
index 8304ed9b832da..b861d0de4199e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator_remember_me.php
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator_remember_me.php
@@ -50,7 +50,6 @@
             ->abstract()
             ->args([
                 abstract_arg('token provider'),
-                param('kernel.secret'),
                 abstract_arg('user provider'),
                 service('request_stack'),
                 abstract_arg('options'),
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
index 0272b63276cb8..c1b5ba239e269 100644
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -27,7 +27,7 @@
         "symfony/password-hasher": "^5.4|^6.0",
         "symfony/security-core": "^6.2",
         "symfony/security-csrf": "^5.4|^6.0",
-        "symfony/security-http": "^6.2.6"
+        "symfony/security-http": "^6.3"
     },
     "require-dev": {
         "doctrine/annotations": "^1.10.4|^2",
diff --git a/src/Symfony/Component/Security/Http/CHANGELOG.md b/src/Symfony/Component/Security/Http/CHANGELOG.md
index 418bd1f49244d..489da50312e83 100644
--- a/src/Symfony/Component/Security/Http/CHANGELOG.md
+++ b/src/Symfony/Component/Security/Http/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Add `RememberMeBadge` to `JsonLoginAuthenticator` and enable reading parameter in JSON request body
  * Add argument `$exceptionCode` to `#[IsGranted]`
+ * Deprecate passing a secret as the 2nd argument to the constructor of `Symfony\Component\Security\Http\RememberMe\PersistentRememberMeHandler`
 
 6.2
 ---
diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php
index d1046c55f5b8a..015f942900d23 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php
@@ -35,8 +35,45 @@ final class PersistentRememberMeHandler extends AbstractRememberMeHandler
     private TokenProviderInterface $tokenProvider;
     private ?TokenVerifierInterface $tokenVerifier;
 
-    public function __construct(TokenProviderInterface $tokenProvider, #[\SensitiveParameter] string $secret, UserProviderInterface $userProvider, RequestStack $requestStack, array $options, LoggerInterface $logger = null, TokenVerifierInterface $tokenVerifier = null)
+    /**
+     * @param UserProviderInterface       $userProvider
+     * @param RequestStack                $requestStack
+     * @param array                       $options
+     * @param LoggerInterface|null        $logger
+     * @param TokenVerifierInterface|null $tokenVerifier
+     */
+    public function __construct(TokenProviderInterface $tokenProvider, #[\SensitiveParameter] $userProvider, $requestStack, $options, $logger = null, $tokenVerifier = null)
     {
+        if (\is_string($userProvider)) {
+            trigger_deprecation('symfony/security-http', '6.3', 'Calling "%s()" with the secret as the second argument is deprecated. The argument will be dropped in 7.0.', __CLASS__);
+
+            $userProvider = $requestStack;
+            $requestStack = $options;
+            $options = $logger;
+            $logger = $tokenVerifier;
+            $tokenVerifier = \func_num_args() > 6 ? func_get_arg(6) : null;
+        }
+
+        if (!$userProvider instanceof UserProviderInterface) {
+            throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be an instance of "%s", "%s" given.', __CLASS__, UserProviderInterface::class, get_debug_type($userProvider)));
+        }
+
+        if (!$requestStack instanceof RequestStack) {
+            throw new \TypeError(sprintf('Argument 3 passed to "%s()" must be an instance of "%s", "%s" given.', __CLASS__, RequestStack::class, get_debug_type($userProvider)));
+        }
+
+        if (!\is_array($options)) {
+            throw new \TypeError(sprintf('Argument 4 passed to "%s()" must be an array, "%s" given.', __CLASS__, get_debug_type($userProvider)));
+        }
+
+        if (null !== $logger && !$logger instanceof LoggerInterface) {
+            throw new \TypeError(sprintf('Argument 5 passed to "%s()" must be an instance of "%s", "%s" given.', __CLASS__, LoggerInterface::class, get_debug_type($userProvider)));
+        }
+
+        if (null !== $tokenVerifier && !$tokenVerifier instanceof TokenVerifierInterface) {
+            throw new \TypeError(sprintf('Argument 6 passed to "%s()" must be an instance of "%s", "%s" given.', __CLASS__, TokenVerifierInterface::class, get_debug_type($userProvider)));
+        }
+
         parent::__construct($userProvider, $requestStack, $options, $logger);
 
         if (!$tokenVerifier && $tokenProvider instanceof TokenVerifierInterface) {
diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php
index 54ea303d37977..4c0ed6926f76c 100644
--- a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php
@@ -42,7 +42,7 @@ protected function setUp(): void
         $this->requestStack = new RequestStack();
         $this->request = Request::create('/login');
         $this->requestStack->push($this->request);
-        $this->handler = new PersistentRememberMeHandler($this->tokenProvider, 'secret', $this->userProvider, $this->requestStack, []);
+        $this->handler = new PersistentRememberMeHandler($this->tokenProvider, $this->userProvider, $this->requestStack, []);
     }
 
     public function testCreateRememberMeCookie()
@@ -104,7 +104,7 @@ public function testConsumeRememberMeCookieValid()
     public function testConsumeRememberMeCookieValidByValidatorWithoutUpdate()
     {
         $verifier = $this->createMock(TokenVerifierInterface::class);
-        $handler = new PersistentRememberMeHandler($this->tokenProvider, 'secret', $this->userProvider, $this->requestStack, [], null, $verifier);
+        $handler = new PersistentRememberMeHandler($this->tokenProvider, $this->userProvider, $this->requestStack, [], null, $verifier);
 
         $persistentToken = new PersistentToken(InMemoryUser::class, 'wouter', 'series1', 'tokenvalue', new \DateTime('30 seconds'));
 

From d976fc5ae953cd2ef1298f6f764381c63564ac33 Mon Sep 17 00:00:00 2001
From: Tugdual Saunier <tugdual.saunier@gmail.com>
Date: Wed, 5 Apr 2023 12:48:46 -0400
Subject: [PATCH 386/475] [Serializer] Marking some Normalizer classes as final

| Q             | A
| ------------- | ---
| Branch?       | 6.3 for features
| Bug fix?      | no
| New feature?  | no
| Deprecations? | yes
| Tickets       | https://github.com/symfony/symfony/pull/49291#pullrequestreview-1306165711
| License       | MIT
| Doc PR        | n/a

As mentioned in https://github.com/symfony/symfony/pull/49291#pullrequestreview-1306165711.
---
 UPGRADE-6.3.md                                       | 12 +++++++++++-
 src/Symfony/Component/Serializer/CHANGELOG.md        | 12 +++++++++++-
 .../Normalizer/ConstraintViolationListNormalizer.php |  2 ++
 .../Serializer/Normalizer/CustomNormalizer.php       |  2 ++
 .../Serializer/Normalizer/DataUriNormalizer.php      |  2 ++
 .../Serializer/Normalizer/DateIntervalNormalizer.php |  2 ++
 .../Serializer/Normalizer/DateTimeNormalizer.php     |  2 ++
 .../Serializer/Normalizer/DateTimeZoneNormalizer.php |  2 ++
 .../Serializer/Normalizer/GetSetMethodNormalizer.php |  2 ++
 .../Normalizer/JsonSerializableNormalizer.php        |  2 ++
 .../Serializer/Normalizer/PropertyNormalizer.php     |  2 ++
 11 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 04f7f5a15a95b..06928dde31914 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -117,4 +117,14 @@ Serializer
 
  * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
  * Deprecate `CacheableSupportsMethodInterface` in favor of the new `getSupportedTypes(?string $format)` methods
- * The following Normalizer classes will become final in 7.0: `ObjectNormalizer`
+ * The following Normalizer classes will become final in 7.0:
+   * `ConstraintViolationListNormalizer`
+   * `CustomNormalizer`
+   * `DataUriNormalizer`
+   * `DateIntervalNormalizer`
+   * `DateTimeNormalizer`
+   * `DateTimeZoneNormalizer`
+   * `GetSetMethodNormalizer`
+   * `JsonSerializableNormalizer`
+   * `ObjectNormalizer`
+   * `PropertyNormalizer`
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
index ba277a3870b31..622d4152e4ad6 100644
--- a/src/Symfony/Component/Serializer/CHANGELOG.md
+++ b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -10,7 +10,17 @@ CHANGELOG
  * Make `ProblemNormalizer` give details about `ValidationFailedException` and `PartialDenormalizationException`
  * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
  * Deprecate `CacheableSupportsMethodInterface` in favor of the new `getSupportedTypes(?string $format)` methods
- * The following Normalizer classes will become final in 7.0: `ObjectNormalizer`
+ * The following Normalizer classes will become final in 7.0:
+   * `ConstraintViolationListNormalizer`
+   * `CustomNormalizer`
+   * `DataUriNormalizer`
+   * `DateIntervalNormalizer`
+   * `DateTimeNormalizer`
+   * `DateTimeZoneNormalizer`
+   * `GetSetMethodNormalizer`
+   * `JsonSerializableNormalizer`
+   * `ObjectNormalizer`
+   * `PropertyNormalizer`
 
 6.2
 ---
diff --git a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
index ffdbfebf176cd..8816055a3c783 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
@@ -21,6 +21,8 @@
  *
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 6.3
  */
 class ConstraintViolationListNormalizer implements NormalizerInterface, CacheableSupportsMethodInterface
 {
diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
index 4c17c2552a069..dd64c9dcab193 100644
--- a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
@@ -16,6 +16,8 @@
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * @final since Symfony 6.3
  */
 class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface, CacheableSupportsMethodInterface
 {
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
index 9012f6f3aade2..ff07c1f30fe53 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -22,6 +22,8 @@
  * Denormalizes a data URI to a {@see \SplFileObject} object.
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 6.3
  */
 class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, CacheableSupportsMethodInterface
 {
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
index 616d500e76386..c9bc517727239 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
@@ -19,6 +19,8 @@
  * Denormalizes an interval string to an instance of {@see \DateInterval}.
  *
  * @author Jérôme Parmentier <jerome@prmntr.me>
+ *
+ * @final since Symfony 6.3
  */
 class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterface, CacheableSupportsMethodInterface
 {
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
index 2235b1ea504b6..43faf9ad15248 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
@@ -20,6 +20,8 @@
  * Denormalizes a date string to an instance of {@see \DateTime} or {@see \DateTimeImmutable}.
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 6.3
  */
 class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface, CacheableSupportsMethodInterface
 {
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php
index a7c26f1d490f6..472f64fc8b1bc 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php
@@ -19,6 +19,8 @@
  * Normalizes a {@see \DateTimeZone} object to a timezone string.
  *
  * @author Jérôme Desjardins <jewome62@gmail.com>
+ *
+ * @final since Symfony 6.3
  */
 class DateTimeZoneNormalizer implements NormalizerInterface, DenormalizerInterface, CacheableSupportsMethodInterface
 {
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
index d92394834de90..063d34ea59177 100644
--- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -33,6 +33,8 @@
  *
  * @author Nils Adermann <naderman@naderman.de>
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 6.3
  */
 class GetSetMethodNormalizer extends AbstractObjectNormalizer
 {
diff --git a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
index 841fca3196537..1c8bbfe4ae0da 100644
--- a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
@@ -18,6 +18,8 @@
  * A normalizer that uses an objects own JsonSerializable implementation.
  *
  * @author Fred Cox <mcfedr@gmail.com>
+ *
+ * @final since Symfony 6.3
  */
 class JsonSerializableNormalizer extends AbstractNormalizer
 {
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
index 56e5ebf740760..ec12db9bb20ac 100644
--- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -33,6 +33,8 @@
  *
  * @author Matthieu Napoli <matthieu@mnapoli.fr>
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 6.3
  */
 class PropertyNormalizer extends AbstractObjectNormalizer
 {

From c534f2f79b27e1666dd3684dce5977177a2e7848 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Tue, 11 Apr 2023 11:40:12 +0200
Subject: [PATCH 387/475] fix deprecations caused by ObjectNormalizer marked as
 final

---
 .../FormatAndContextAwareNormalizer.php       | 22 ++++++++++++++++
 .../Fixtures/StaticConstructorNormalizer.php  | 24 ++++++++++++++++--
 .../Tests/Normalizer/ObjectNormalizerTest.php | 25 ++++++-------------
 3 files changed, 51 insertions(+), 20 deletions(-)
 create mode 100644 src/Symfony/Component/Serializer/Tests/Fixtures/FormatAndContextAwareNormalizer.php

diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/FormatAndContextAwareNormalizer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/FormatAndContextAwareNormalizer.php
new file mode 100644
index 0000000000000..4042288450637
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/FormatAndContextAwareNormalizer.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+
+class FormatAndContextAwareNormalizer extends ObjectNormalizer
+{
+    protected function isAllowedAttribute($classOrObject, string $attribute, string $format = null, array $context = []): bool
+    {
+        return \in_array($attribute, ['foo', 'bar']) && 'foo_and_bar_included' === $format;
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/StaticConstructorNormalizer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/StaticConstructorNormalizer.php
index 44a367e92ff49..67ae0314484bd 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/StaticConstructorNormalizer.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/StaticConstructorNormalizer.php
@@ -11,13 +11,33 @@
 
 namespace Symfony\Component\Serializer\Tests\Fixtures;
 
-use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
 
 /**
  * @author Guilhem N. <egetick@gmail.com>
  */
-class StaticConstructorNormalizer extends ObjectNormalizer
+class StaticConstructorNormalizer extends AbstractObjectNormalizer
 {
+    public function getSupportedTypes(?string $format): array
+    {
+        return [StaticConstructorDummy::class];
+    }
+
+    protected function extractAttributes(object $object, string $format = null, array $context = [])
+    {
+        return get_object_vars($object);
+    }
+
+    protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
+    {
+        return $object->$attribute;
+    }
+
+    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
+    {
+        $object->$attribute = $value;
+    }
+
     protected function getConstructor(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes): ?\ReflectionMethod
     {
         if (is_a($class, StaticConstructorDummy::class, true)) {
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
index 47747c6dbf645..5eba0707c67ea 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -27,6 +27,7 @@
 use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;
 use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
 use Symfony\Component\Serializer\NameConverter\MetadataAwareNameConverter;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -36,6 +37,7 @@
 use Symfony\Component\Serializer\Tests\Fixtures\Annotations\GroupDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\CircularReferenceDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyPrivatePropertyWithoutGetter;
+use Symfony\Component\Serializer\Tests\Fixtures\FormatAndContextAwareNormalizer;
 use Symfony\Component\Serializer\Tests\Fixtures\OtherSerializedNameDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Php74Dummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Php74DummyPrivate;
@@ -742,6 +744,9 @@ public function testDoesntHaveIssuesWithUnionConstTypes()
         })::class)->foo);
     }
 
+    /**
+     * @group legacy
+     */
     public function testExtractAttributesRespectsFormat()
     {
         $normalizer = new FormatAndContextAwareNormalizer();
@@ -755,13 +760,13 @@ public function testExtractAttributesRespectsFormat()
 
     public function testExtractAttributesRespectsContext()
     {
-        $normalizer = new FormatAndContextAwareNormalizer();
+        $normalizer = new ObjectNormalizer();
 
         $data = new ObjectDummy();
         $data->setFoo('bar');
         $data->bar = 'foo';
 
-        $this->assertSame(['foo' => 'bar', 'bar' => 'foo'], $normalizer->normalize($data, null, ['include_foo_and_bar' => true]));
+        $this->assertSame(['foo' => 'bar', 'bar' => 'foo'], $normalizer->normalize($data, null, [AbstractNormalizer::ATTRIBUTES => ['foo', 'bar']]));
     }
 
     public function testDenormalizeFalsePseudoType()
@@ -1040,22 +1045,6 @@ public function __get($name)
     }
 }
 
-class FormatAndContextAwareNormalizer extends ObjectNormalizer
-{
-    protected function isAllowedAttribute($classOrObject, string $attribute, string $format = null, array $context = []): bool
-    {
-        if (\in_array($attribute, ['foo', 'bar']) && 'foo_and_bar_included' === $format) {
-            return true;
-        }
-
-        if (\in_array($attribute, ['foo', 'bar']) && isset($context['include_foo_and_bar']) && true === $context['include_foo_and_bar']) {
-            return true;
-        }
-
-        return false;
-    }
-}
-
 class DummyWithConstructorObject
 {
     private $id;

From 2371216d9349565f564a6fd8daecf323309f1e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sama=C3=ABl=20Villette?= <villette.samael@gmail.com>
Date: Mon, 3 Apr 2023 16:22:34 +0200
Subject: [PATCH 388/475] [TwigBridge][TwigBundle] Add current locale to
 `AppVariable`

---
 src/Symfony/Bridge/Twig/AppVariable.php        | 16 ++++++++++++++++
 src/Symfony/Bridge/Twig/CHANGELOG.md           |  5 +++++
 .../Bridge/Twig/Tests/AppVariableTest.php      | 18 ++++++++++++++++++
 src/Symfony/Bridge/Twig/composer.json          |  2 +-
 .../TwigBundle/Resources/config/twig.php       |  1 +
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php
index 6ce2278c53adb..8bfaa0a22c601 100644
--- a/src/Symfony/Bridge/Twig/AppVariable.php
+++ b/src/Symfony/Bridge/Twig/AppVariable.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Translation\LocaleSwitcher;
 
 /**
  * Exposes some Symfony parameters and services as an "app" global variable.
@@ -29,6 +30,7 @@ class AppVariable
     private RequestStack $requestStack;
     private string $environment;
     private bool $debug;
+    private LocaleSwitcher $localeSwitcher;
 
     /**
      * @return void
@@ -62,6 +64,11 @@ public function setDebug(bool $debug)
         $this->debug = $debug;
     }
 
+    public function setLocaleSwitcher(LocaleSwitcher $localeSwitcher): void
+    {
+        $this->localeSwitcher = $localeSwitcher;
+    }
+
     /**
      * Returns the current token.
      *
@@ -139,6 +146,15 @@ public function getDebug(): bool
         return $this->debug;
     }
 
+    public function getLocale(): string
+    {
+        if (!isset($this->localeSwitcher)) {
+            throw new \RuntimeException('The "app.locale" variable is not available.');
+        }
+
+        return $this->localeSwitcher->getLocale();
+    }
+
     /**
      * Returns some or all the existing flash messages:
      *  * getFlashes() returns all the flash messages
diff --git a/src/Symfony/Bridge/Twig/CHANGELOG.md b/src/Symfony/Bridge/Twig/CHANGELOG.md
index 8edc9b80190b4..9613d9a3fd6e0 100644
--- a/src/Symfony/Bridge/Twig/CHANGELOG.md
+++ b/src/Symfony/Bridge/Twig/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `AppVariable::getLocale()` to retrieve the current locale when using the `LocaleSwitcher`
+
 6.2
 ---
 
diff --git a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
index 219d47d1013d5..764eade4d9171 100644
--- a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Translation\LocaleSwitcher;
 
 class AppVariableTest extends TestCase
 {
@@ -104,6 +105,16 @@ public function testGetUser()
         $this->assertEquals($user, $this->appVariable->getUser());
     }
 
+    public function testGetLocale()
+    {
+        $localeSwitcher = $this->createMock(LocaleSwitcher::class);
+        $this->appVariable->setLocaleSwitcher($localeSwitcher);
+
+        $localeSwitcher->method('getLocale')->willReturn('fr');
+
+        self::assertEquals('fr', $this->appVariable->getLocale());
+    }
+
     public function testGetTokenWithNoToken()
     {
         $tokenStorage = $this->createMock(TokenStorageInterface::class);
@@ -156,6 +167,13 @@ public function testGetSessionWithRequestStackNotSet()
         $this->appVariable->getSession();
     }
 
+    public function testGetLocaleWithLocaleSwitcherNotSet()
+    {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('The "app.locale" variable is not available.');
+        $this->appVariable->getLocale();
+    }
+
     public function testGetFlashesWithNoRequest()
     {
         $this->setRequestStack(null);
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index fb2d040778471..c12ad614514e6 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -37,7 +37,7 @@
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/property-info": "^5.4|^6.0",
         "symfony/routing": "^5.4|^6.0",
-        "symfony/translation": "^5.4|^6.0",
+        "symfony/translation": "^6.1",
         "symfony/yaml": "^5.4|^6.0",
         "symfony/security-acl": "^2.8|^3.0",
         "symfony/security-core": "^5.4|^6.0",
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
index 00ed07c588e05..6525d875a5737 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
@@ -76,6 +76,7 @@
             ->call('setDebug', [param('kernel.debug')])
             ->call('setTokenStorage', [service('security.token_storage')->ignoreOnInvalid()])
             ->call('setRequestStack', [service('request_stack')->ignoreOnInvalid()])
+            ->call('setLocaleSwitcher', [service('translation.locale_switcher')->ignoreOnInvalid()])
 
         ->set('twig.template_iterator', TemplateIterator::class)
             ->args([service('kernel'), abstract_arg('Twig paths'), param('twig.default_path'), abstract_arg('File name pattern')])

From 5f29c8d649f8596d93de6038c89249fd00f6f252 Mon Sep 17 00:00:00 2001
From: Tugdual Saunier <tugdual.saunier@gmail.com>
Date: Tue, 11 Apr 2023 19:34:57 -0400
Subject: [PATCH 389/475] [SecurityBundle] Set request stateless if the
 attribute is not already defined

---
 src/Symfony/Bundle/SecurityBundle/CHANGELOG.md     |  2 +-
 .../Bundle/SecurityBundle/Security/FirewallMap.php |  2 +-
 .../Tests/Security/FirewallMapTest.php             | 14 ++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index f71cea472f7de..5944c0b138f08 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -5,7 +5,7 @@ CHANGELOG
 ---
 
  * Deprecate enabling bundle and not configuring it
- * Add `_stateless` attribute to the request when firewall is stateless
+ * Add `_stateless` attribute to the request when firewall is stateless and the attribute is not already set
  * Add `StatelessAuthenticatorFactoryInterface` for authenticators targeting `stateless` firewalls only and that don't require a user provider
  * Modify "icon.svg" to improve accessibility for blind/low vision users
  * Make `Security::login()` return the authenticator response
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
index d0151d10f9a28..6f1bdfcdd4892 100644
--- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
+++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -75,7 +75,7 @@ private function getFirewallContext(Request $request): ?FirewallContext
                 /** @var FirewallContext $context */
                 $context = $this->container->get($contextId);
 
-                if ($context->getConfig()?->isStateless()) {
+                if ($context->getConfig()?->isStateless() && !$request->attributes->has('_stateless')) {
                     $request->attributes->set('_stateless', true);
                 }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
index 4acad02e65225..fdf9c3d53a3c7 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php
@@ -57,10 +57,9 @@ public function testGetListenersWithInvalidParameter()
         $this->assertFalse($request->attributes->has('_stateless'));
     }
 
-    public function testGetListeners()
+    /** @dataProvider providesStatefulStatelessRequests */
+    public function testGetListeners(Request $request, bool $expectedState)
     {
-        $request = new Request();
-
         $firewallContext = $this->createMock(FirewallContext::class);
 
         $firewallConfig = new FirewallConfig('main', 'user_checker', null, true, true);
@@ -89,6 +88,13 @@ public function testGetListeners()
         $this->assertEquals([[$listener], $exceptionListener, $logoutListener], $firewallMap->getListeners($request));
         $this->assertEquals($firewallConfig, $firewallMap->getFirewallConfig($request));
         $this->assertEquals('security.firewall.map.context.foo', $request->attributes->get(self::ATTRIBUTE_FIREWALL_CONTEXT));
-        $this->assertTrue($request->attributes->get('_stateless'));
+        $this->assertEquals($expectedState, $request->attributes->get('_stateless'));
+    }
+
+    public static function providesStatefulStatelessRequests(): \Generator
+    {
+        yield [new Request(), true];
+        yield [new Request(attributes: ['_stateless' => false]), false];
+        yield [new Request(attributes: ['_stateless' => true]), true];
     }
 }

From b3ecd10dde723dba16987515e86e21093a388044 Mon Sep 17 00:00:00 2001
From: Matthias Pigulla <mp@webfactory.de>
Date: Wed, 12 Apr 2023 17:26:31 +0200
Subject: [PATCH 390/475] Update return type for
 NormalizableInterface::normalize to match NormalizerInterface::normalize

---
 .../Component/Serializer/Normalizer/NormalizableInterface.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
index d449a43065140..0bad9d183953d 100644
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
@@ -33,5 +33,5 @@ interface NormalizableInterface
      *                                        based on different output formats
      * @param array               $context    Options for normalizing this object
      */
-    public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = []): array|string|int|float|bool;
+    public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null;
 }

From 4ebb99450ade2ebff2bd2b63be5983f7db07c24c Mon Sep 17 00:00:00 2001
From: Nsbx <8930930+Nsbx@users.noreply.github.com>
Date: Wed, 12 Apr 2023 18:09:36 +0200
Subject: [PATCH 391/475] [Notifier] Add options to Telegram Bridge

---
 .../Notifier/Bridge/Telegram/CHANGELOG.md     |  1 +
 .../Notifier/Bridge/Telegram/README.md        | 29 +++++++
 .../Bridge/Telegram/TelegramOptions.php       | 32 ++++++++
 .../Bridge/Telegram/TelegramTransport.php     |  6 ++
 .../Telegram/Tests/TelegramTransportTest.php  | 81 +++++++++++++++++++
 5 files changed, 149 insertions(+)

diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/CHANGELOG.md b/src/Symfony/Component/Notifier/Bridge/Telegram/CHANGELOG.md
index ec7a2a9e8ba35..760d2bb44036a 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/CHANGELOG.md
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
 * Add support to answer callback queries
+* Add support for `sendPhoto` API method
 
 5.3
 ---
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/README.md b/src/Symfony/Component/Notifier/Bridge/Telegram/README.md
index a142a59dd7fe3..333b536c454a2 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/README.md
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/README.md
@@ -47,6 +47,35 @@ $chatMessage->options($telegramOptions);
 $chatter->send($chatMessage);
 ```
 
+Adding Photo to a Message
+-------------------------
+
+With a Telegram message, you can use the `TelegramOptions` class to add
+[message options](https://core.telegram.org/bots/api).
+
+```php
+use Symfony\Component\Notifier\Bridge\Telegram\Reply\Markup\Button\InlineKeyboardButton;
+use Symfony\Component\Notifier\Bridge\Telegram\Reply\Markup\InlineKeyboardMarkup;
+use Symfony\Component\Notifier\Bridge\Telegram\TelegramOptions;
+use Symfony\Component\Notifier\Message\ChatMessage;
+
+$chatMessage = new ChatMessage('Photo Caption');
+
+// Create Telegram options
+$telegramOptions = (new TelegramOptions())
+    ->chatId('@symfonynotifierdev')
+    ->parseMode('MarkdownV2')
+    ->disableWebPagePreview(true)
+    ->hasSpoiler(true)
+    ->protectContent(true)
+    ->photo('https://symfony.com/favicons/android-chrome-192x192.png');
+
+// Add the custom options to the chat message and send the message
+$chatMessage->options($telegramOptions);
+
+$chatter->send($chatMessage);
+```
+
 Updating Messages
 -----------------
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramOptions.php b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramOptions.php
index aa4604d378fb5..f794620de4a00 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramOptions.php
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramOptions.php
@@ -80,6 +80,38 @@ public function disableNotification(bool $bool): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
+    public function protectContent(bool $bool): static
+    {
+        $this->options['protect_content'] = $bool;
+
+        return $this;
+    }
+
+    /**
+     * Work only when photo option is defined.
+     *
+     * @return $this
+     */
+    public function hasSpoiler(bool $bool): static
+    {
+        $this->options['has_spoiler'] = $bool;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function photo(string $url): static
+    {
+        $this->options['photo'] = $url;
+
+        return $this;
+    }
+
     /**
      * @return $this
      */
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php
index a3f60009f30e9..ad8763371d5ad 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php
@@ -84,6 +84,11 @@ protected function doSend(MessageInterface $message): SentMessage
             $options['text'] = preg_replace('/([_*\[\]()~`>#+\-=|{}.!])/', '\\\\$1', $message->getSubject());
         }
 
+        if (isset($options['photo'])) {
+            $options['caption'] = $options['text'];
+            unset($options['text']);
+        }
+
         $endpoint = sprintf('https://%s/bot%s/%s', $this->getEndpoint(), $this->token, $this->getPath($options));
 
         $response = $this->client->request('POST', $endpoint, [
@@ -117,6 +122,7 @@ private function getPath(array $options): string
         return match (true) {
             isset($options['message_id']) => 'editMessageText',
             isset($options['callback_query_id']) => 'answerCallbackQuery',
+            isset($options['photo']) => 'sendPhoto',
             default => 'sendMessage',
         };
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php
index bdefee4a79c0e..83251aa4f9c29 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php
@@ -330,4 +330,85 @@ public function testSendWithMarkdownShouldEscapeSpecialCharacters()
 
         $transport->send(new ChatMessage('I contain special characters _ * [ ] ( ) ~ ` > # + - = | { } . ! to send.'));
     }
+
+    public function testSendPhotoWithOptions()
+    {
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects($this->exactly(2))
+            ->method('getStatusCode')
+            ->willReturn(200);
+
+        $content = <<<JSON
+            {
+                "ok": true,
+                "result": {
+                    "message_id": 1,
+                    "from": {
+                        "id": 12345678,
+                        "is_bot": true,
+                        "first_name": "YourBot",
+                        "username": "YourBot"
+                    },
+                    "chat": {
+                        "id": 1234567890,
+                        "first_name": "John",
+                        "last_name": "Doe",
+                        "username": "JohnDoe",
+                        "type": "private"
+                    },
+                    "date": 1459958199,
+                    "photo": [
+                        {
+                            "file_id": "ABCDEF",
+                            "file_unique_id" : "ABCDEF1",
+                            "file_size": 1378,
+                            "width": 90,
+                            "height": 51
+                        },
+                        {
+                            "file_id": "ABCDEF",
+                            "file_unique_id" : "ABCDEF2",
+                            "file_size": 19987,
+                            "width": 320,
+                            "height": 180
+                        }
+                    ],
+                    "caption": "Hello from Bot!"
+                }
+            }
+JSON;
+
+        $response->expects($this->once())
+            ->method('getContent')
+            ->willReturn($content)
+        ;
+
+        $expectedBody = [
+            'photo' => 'https://image.ur.l/',
+            'has_spoiler' => true,
+            'chat_id' => 'testChannel',
+            'parse_mode' => 'MarkdownV2',
+            'caption' => 'testMessage',
+        ];
+
+        $client = new MockHttpClient(function (string $method, string $url, array $options = []) use ($response, $expectedBody): ResponseInterface {
+            $this->assertStringEndsWith('/sendPhoto', $url);
+            $this->assertSame($expectedBody, json_decode($options['body'], true));
+
+            return $response;
+        });
+
+        $transport = self::createTransport($client, 'testChannel');
+
+        $messageOptions = new TelegramOptions();
+        $messageOptions
+            ->photo('https://image.ur.l/')
+            ->hasSpoiler(true)
+        ;
+
+        $sentMessage = $transport->send(new ChatMessage('testMessage', $messageOptions));
+
+        $this->assertEquals(1, $sentMessage->getMessageId());
+        $this->assertEquals('telegram://api.telegram.org?channel=testChannel', $sentMessage->getTransport());
+    }
 }

From 99a35f0fc32a7b5250aab5530129bae318c95209 Mon Sep 17 00:00:00 2001
From: Vincent Chalamon <vincentchalamon@protonmail.com>
Date: Mon, 21 Nov 2022 18:27:04 +0100
Subject: [PATCH 392/475] [Security] Add OidcUserInfoTokenHandler and OidcUser

---
 composer.json                                 |   5 +-
 .../Bundle/SecurityBundle/CHANGELOG.md        |   1 +
 .../AccessToken/OidcTokenHandlerFactory.php   |  89 +++++++++
 .../OidcUserInfoTokenHandlerFactory.php       |  77 ++++++++
 .../ServiceTokenHandlerFactory.php            |  41 ++++
 .../TokenHandlerFactoryInterface.php          |  38 ++++
 .../Security/Factory/AccessTokenFactory.php   |  59 +++++-
 .../Factory/SignatureAlgorithmFactory.php     |  51 +++++
 .../security_authenticator_access_token.php   |  21 ++
 .../Bundle/SecurityBundle/SecurityBundle.php  |   9 +-
 .../Factory/AccessTokenFactoryTest.php        | 102 +++++++++-
 .../Tests/Functional/AccessTokenTest.php      |  41 ++++
 .../app/AccessToken/config_oidc.yml           |  34 ++++
 .../Bundle/SecurityBundle/composer.json       |   8 +-
 .../Component/Security/Core/CHANGELOG.md      |   6 +
 .../Security/Core/Tests/User/OidcUserTest.php | 176 +++++++++++++++++
 .../AttributesBasedUserProviderInterface.php  |  32 +++
 .../Component/Security/Core/User/OidcUser.php | 184 ++++++++++++++++++
 .../Component/Security/Core/composer.json     |   1 +
 .../Exception/InvalidSignatureException.php   |  27 +++
 .../Oidc/Exception/MissingClaimException.php  |  27 +++
 .../AccessToken/Oidc/OidcTokenHandler.php     | 105 ++++++++++
 .../Http/AccessToken/Oidc/OidcTrait.php       |  53 +++++
 .../Oidc/OidcUserInfoTokenHandler.php         |  61 ++++++
 .../AccessTokenAuthenticator.php              |   2 +-
 .../Passport/Badge/UserBadge.php              |  15 +-
 .../Http/Authenticator/Passport/Passport.php  |  16 +-
 .../Component/Security/Http/CHANGELOG.md      |   4 +
 .../AccessToken/Oidc/OidcTokenHandlerTest.php | 173 ++++++++++++++++
 .../Oidc/OidcUserInfoTokenHandlerTest.php     |  87 +++++++++
 .../Component/Security/Http/composer.json     |   6 +-
 31 files changed, 1534 insertions(+), 17 deletions(-)
 create mode 100644 src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/OidcTokenHandlerFactory.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/OidcUserInfoTokenHandlerFactory.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/ServiceTokenHandlerFactory.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/TokenHandlerFactoryInterface.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SignatureAlgorithmFactory.php
 create mode 100644 src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AccessToken/config_oidc.yml
 create mode 100644 src/Symfony/Component/Security/Core/Tests/User/OidcUserTest.php
 create mode 100644 src/Symfony/Component/Security/Core/User/AttributesBasedUserProviderInterface.php
 create mode 100644 src/Symfony/Component/Security/Core/User/OidcUser.php
 create mode 100644 src/Symfony/Component/Security/Http/AccessToken/Oidc/Exception/InvalidSignatureException.php
 create mode 100644 src/Symfony/Component/Security/Http/AccessToken/Oidc/Exception/MissingClaimException.php
 create mode 100644 src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcTokenHandler.php
 create mode 100644 src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcTrait.php
 create mode 100644 src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcUserInfoTokenHandler.php
 create mode 100644 src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcTokenHandlerTest.php
 create mode 100644 src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcUserInfoTokenHandlerTest.php

diff --git a/composer.json b/composer.json
index 20ade09dbb979..3368c7d767858 100644
--- a/composer.json
+++ b/composer.json
@@ -150,9 +150,12 @@
         "symfony/phpunit-bridge": "^5.4|^6.0",
         "symfony/runtime": "self.version",
         "symfony/security-acl": "~2.8|~3.0",
+        "symfony/string": "^5.4|^6.0",
         "twig/cssinliner-extra": "^2.12|^3",
         "twig/inky-extra": "^2.12|^3",
-        "twig/markdown-extra": "^2.12|^3"
+        "twig/markdown-extra": "^2.12|^3",
+        "web-token/jwt-checker": "^3.1",
+        "web-token/jwt-signature-algorithm-ecdsa": "^3.1"
     },
     "conflict": {
         "ext-psr": "<1.1|>=2",
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
index f71cea472f7de..b41e3e6469d9b 100644
--- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
  * Make `Security::login()` return the authenticator response
  * Deprecate the `security.firewalls.logout.csrf_token_generator` config option, use `security.firewalls.logout.csrf_token_manager` instead
  * Make firewalls event dispatcher traceable on debug mode
+ * Add `TokenHandlerFactoryInterface`, `OidcUserInfoTokenHandlerFactory`, `OidcTokenHandlerFactory` and `ServiceTokenHandlerFactory` for `AccessTokenFactory`
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/OidcTokenHandlerFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/OidcTokenHandlerFactory.php
new file mode 100644
index 0000000000000..6f19f3845cb15
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/OidcTokenHandlerFactory.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\AccessToken;
+
+use Jose\Component\Core\Algorithm;
+use Jose\Component\Core\JWK;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SignatureAlgorithmFactory;
+use Symfony\Component\Config\Definition\Builder\NodeBuilder;
+use Symfony\Component\DependencyInjection\Chil
10000
dDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Configures a token handler for decoding and validating an OIDC token.
+ *
+ * @experimental
+ */
+class OidcTokenHandlerFactory implements TokenHandlerFactoryInterface
+{
+    public function create(ContainerBuilder $container, string $id, array|string $config): void
+    {
+        $tokenHandlerDefinition = $container->setDefinition($id, new ChildDefinition('security.access_token_handler.oidc'));
+        $tokenHandlerDefinition->replaceArgument(3, $config['claim']);
+        $tokenHandlerDefinition->replaceArgument(4, $config['audience']);
+
+        // Create the signature algorithm and the JWK
+        if (!ContainerBuilder::willBeAvailable('web-token/jwt-core', Algorithm::class, ['symfony/security-bundle'])) {
+            $container->register('security.access_token_handler.oidc.signature', 'stdClass')
+                ->addError('You cannot use the "oidc" token handler since "web-token/jwt-core" is not installed. Try running "web-token/jwt-core".');
+            $container->register('security.access_token_handler.oidc.jwk', 'stdClass')
+                ->addError('You cannot use the "oidc" token handler since "web-token/jwt-core" is not installed. Try running "web-token/jwt-core".');
+        } else {
+            $container->register('security.access_token_handler.oidc.signature', Algorithm::class)
+                ->setFactory([SignatureAlgorithmFactory::class, 'create'])
+                ->setArguments([$config['signature']['algorithm']]);
+            $container->register('security.access_token_handler.oidc.jwk', JWK::class)
+                ->setFactory([JWK::class, 'createFromJson'])
+                ->setArguments([$config['signature']['key']]);
+        }
+        $tokenHandlerDefinition->replaceArgument(0, new Reference('security.access_token_handler.oidc.signature'));
+        $tokenHandlerDefinition->replaceArgument(1, new Reference('security.access_token_handler.oidc.jwk'));
+    }
+
+    public function getKey(): string
+    {
+        return 'oidc';
+    }
+
+    public function addConfiguration(NodeBuilder $node): void
+    {
+        $node
+            ->arrayNode($this->getKey())
+                ->fixXmlConfig($this->getKey())
+                ->children()
+                    ->scalarNode('claim')
+                        ->info('Claim which contains the user identifier (e.g.: sub, email..).')
+                        ->defaultValue('sub')
+                    ->end()
+                    ->scalarNode('audience')
+                        ->info('Audience set in the token, for validation purpose.')
+                        ->defaultNull()
+                    ->end()
+                    ->arrayNode('signature')
+                        ->isRequired()
+                        ->children()
+                            ->scalarNode('algorithm')
+                                ->info('Algorithm used to sign the token.')
+                                ->isRequired()
+                            ->end()
+                            ->scalarNode('key')
+                                ->info('JSON-encoded JWK used to sign the token (must contain a "kty" key).')
+                                ->isRequired()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+    }
+}
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/OidcUserInfoTokenHandlerFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/OidcUserInfoTokenHandlerFactory.php
new file mode 100644
index 0000000000000..08b1019f2c210
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/OidcUserInfoTokenHandlerFactory.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\AccessToken;
+
+use Symfony\Component\Config\Definition\Builder\NodeBuilder;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpClient\HttpClient;
+
+/**
+ * Configures a token handler for an OIDC server.
+ *
+ * @experimental
+ */
+class OidcUserInfoTokenHandlerFactory implements TokenHandlerFactoryInterface
+{
+    public function create(ContainerBuilder $container, string $id, array|string $config): void
+    {
+        $tokenHandlerDefinition = $container->setDefinition($id, new ChildDefinition('security.access_token_handler.oidc_user_info'));
+        $tokenHandlerDefinition->replaceArgument(2, $config['claim']);
+
+        // Create the client service
+        if (!isset($config['client']['id'])) {
+            $clientDefinitionId = 'http_client.security.access_token_handler.oidc_user_info';
+            if (!ContainerBuilder::willBeAvailable('symfony/http-client', HttpClient::class, ['symfony/security-bundle'])) {
+                $container->register($clientDefinitionId, 'stdClass')
+                    ->addError('You cannot use the "oidc_user_info" token handler since the HttpClient component is not installed. Try running "composer require symfony/http-client".');
+            } else {
+                $container->register($clientDefinitionId, HttpClient::class)
+                    ->setFactory([HttpClient::class, 'create'])
+                    ->setArguments([$config['client']])
+                    ->addTag('http_client.client');
+            }
+        }
+
+        $tokenHandlerDefinition->replaceArgument(0, new Reference($config['client']['id'] ?? $clientDefinitionId));
+    }
+
+    public function getKey(): string
+    {
+        return 'oidc_user_info';
+    }
+
+    public function addConfiguration(NodeBuilder $node): void
+    {
+        $node
+            ->arrayNode($this->getKey())
+                ->fixXmlConfig($this->getKey())
+                ->children()
+                    ->scalarNode('claim')
+                        ->info('Claim which contains the user identifier (e.g.: sub, email..).')
+                        ->defaultValue('sub')
+                    ->end()
+                    ->arrayNode('client')
+                        ->info('HttpClient to call the OIDC server.')
+                        ->isRequired()
+                        ->beforeNormalization()
+                            ->ifString()
+                            ->then(static function ($v): array { return ['id' => $v]; })
+                        ->end()
+                        ->prototype('scalar')->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+    }
+}
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/ServiceTokenHandlerFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/ServiceTokenHandlerFactory.php
new file mode 100644
index 0000000000000..f38a70db99417
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/ServiceTokenHandlerFactory.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\AccessToken;
+
+use Symfony\Component\Config\Definition\Builder\NodeBuilder;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Configures a token handler from a service id.
+ *
+ * @see \Symfony\Bundle\SecurityBundle\Tests\DependencyInjection\Security\Factory\AccessTokenFactoryTest
+ *
+ * @experimental
+ */
+class ServiceTokenHandlerFactory implements TokenHandlerFactoryInterface
+{
+    public function create(ContainerBuilder $container, string $id, array|string $config): void
+    {
+        $container->setDefinition($id, new ChildDefinition($config));
+    }
+
+    public function getKey(): string
+    {
+        return 'id';
+    }
+
+    public function addConfiguration(NodeBuilder $node): void
+    {
+        $node->scalarNode($this->getKey())->end();
+    }
+}
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/TokenHandlerFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/TokenHandlerFactoryInterface.php
new file mode 100644
index 0000000000000..bfa9535e7544e
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/AccessToken/TokenHandlerFactoryInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\AccessToken;
+
+use Symfony\Component\Config\Definition\Builder\NodeBuilder;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Allows creating configurable token handlers.
+ *
+ * @experimental
+ */
+interface TokenHandlerFactoryInterface
+{
+    /**
+     * Creates a generic token handler service.
+     */
+    public function create(ContainerBuilder $container, string $id, array|string $config): void;
+
+    /**
+     * Gets a generic token handler configuration key.
+     */
+    public function getKey(): string;
+
+    /**
+     * Adds a generic token handler configuration.
+     */
+    public function addConfiguration(NodeBuilder $node): void;
+}
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
index a59a9a6f3ede0..28d0beda0997e 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
 
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\AccessToken\TokenHandlerFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -27,7 +29,10 @@ final class AccessTokenFactory extends AbstractFactory implements StatelessAuthe
 {
     private const PRIORITY = -40;
 
-    public function __construct()
+    /**
+     * @param array<array-key, TokenHandlerFactoryInterface> $tokenHandlerFactories
+     */
+    public function __construct(private readonly array $tokenHandlerFactories)
     {
         $this->options = [];
         $this->defaultFailureHandlerOptions = [];
@@ -40,7 +45,6 @@ public function addConfiguration(NodeDefinition $node): void
 
         $builder = $node->children();
         $builder
-            ->scalarNode('token_handler')->isRequired()->end()
             ->scalarNode('realm')->defaultNull()->end()
             ->arrayNode('token_extractors')
                 ->fixXmlConfig('token_extractors')
@@ -55,6 +59,38 @@ public function addConfiguration(NodeDefinition $node): void
                 ->scalarPrototype()->end()
             ->end()
         ;
+
+        $tokenHandlerNodeBuilder = $builder
+            ->arrayNode('token_handler')
+                ->example([
+                    'id' => 'App\Security\CustomTokenHandler',
+                ])
+
+                ->beforeNormalization()
+                    ->ifString()
+                    ->then(static function (string $v): array { return ['id' => $v]; })
+                ->end()
+
+                ->beforeNormalization()
+                    ->ifTrue(static function ($v) { return \is_array($v) && 1 < \count($v); })
+                    ->then(static function () { throw new InvalidConfigurationException('You cannot configure multiple token handlers.'); })
+                ->end()
+
+                // "isRequired" must be set otherwise the following custom validation is not called
+                ->isRequired()
+                ->beforeNormalization()
+                    ->ifTrue(static function ($v) { return \is_array($v) && !$v; })
+                    ->then(static function () { throw new InvalidConfigurationException('You must set a token handler.'); })
+                ->end()
+
+                ->children()
+        ;
+
+        foreach ($this->tokenHandlerFactories as $factory) {
+            $factory->addConfiguration($tokenHandlerNodeBuilder);
+        }
+
+        $tokenHandlerNodeBuilder->end();
     }
 
     public function getPriority(): int
@@ -73,10 +109,11 @@ public function createAuthenticator(ContainerBuilder $container, string $firewal
         $failureHandler = isset($config['failure_handler']) ? new Reference($this->createAuthenticationFailureHandler($container, $firewallName, $config)) : null;
         $authenticatorId = sprintf('security.authenticator.access_token.%s', $firewallName);
         $extractorId = $this->createExtractor($container, $firewallName, $config['token_extractors']);
+        $tokenHandlerId = $this->createTokenHandler($container, $firewallName, $config['token_handler'], $userProviderId);
 
         $container
             ->setDefinition($authenticatorId, new ChildDefinition('security.authenticator.access_token'))
-            ->replaceArgument(0, new Reference($config['token_handler']))
+            ->replaceArgument(0, new Reference($tokenHandlerId))
             ->replaceArgument(1, new Reference($extractorId))
             ->replaceArgument(2, $userProviderId ? new Reference($userProviderId) : null)
             ->replaceArgument(3, $successHandler)
@@ -110,4 +147,20 @@ private function createExtractor(ContainerBuilder $container, string $firewallNa
 
         return $extractorId;
     }
+
+    private function createTokenHandler(ContainerBuilder $container, string $firewallName, array $config, ?string $userProviderId): string
+    {
+        $key = array_keys($config)[0];
+        $id = sprintf('security.access_token_handler.%s', $firewallName);
+
+        foreach ($this->tokenHandlerFactories as $factory) {
+            if ($key !== $factory->getKey()) {
+                continue;
+            }
+
+            $factory->create($container, $id, $config[$key], $userProviderId);
+        }
+
+        return $id;
+    }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SignatureAlgorithmFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SignatureAlgorithmFactory.php
new file mode 100644
index 0000000000000..f9f876deff2bf
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SignatureAlgorithmFactory.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
+
+use Jose\Component\Core\Algorithm as SignatureAlgorithm;
+use Jose\Component\Signature\Algorithm;
+use Symfony\Component\Security\Core\Exception\InvalidArgumentException;
+use Symfony\Component\Security\Http\AccessToken\Oidc\OidcTokenHandler;
+
+/**
+ * Creates a signature algorithm for {@see OidcTokenHandler}.
+ *
+ * @experimental
+ */
+final class SignatureAlgorithmFactory
+{
+    public static function create(string $algorithm): SignatureAlgorithm
+    {
+        switch ($algorithm) {
+            case 'ES256':
+                if (!class_exists(Algorithm\ES256::class)) {
+                    throw new \LogicException('You cannot use the "ES256" signature algorithm since "web-token/jwt-signature-algorithm-ecdsa" is not installed. Try running "composer require web-token/jwt-signature-algorithm-ecdsa".');
+                }
+
+                return new Algorithm\ES256();
+            case 'ES384':
+                if (!class_exists(Algorithm\ES384::class)) {
+                    throw new \LogicException('You cannot use the "ES384" signature algorithm since "web-token/jwt-signature-algorithm-ecdsa" is not installed. Try running "composer require web-token/jwt-signature-algorithm-ecdsa".');
+                }
+
+                return new Algorithm\ES384();
+            case 'ES512':
+                if (!class_exists(Algorithm\ES512::class)) {
+                    throw new \LogicException('You cannot use the "ES512" signature algorithm since "web-token/jwt-signature-algorithm-ecdsa" is not installed. Try running "composer require web-token/jwt-signature-algorithm-ecdsa".');
+                }
+
+                return new Algorithm\ES512();
+            default:
+                throw new InvalidArgumentException(sprintf('Unsupported signature algorithm "%s". Only ES* algorithms are supported. If you want to use another algorithm, create your TokenHandler as a service.', $algorithm));
+        }
+    }
+}
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator_access_token.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator_access_token.php
index f1aea7cb2c3d1..fafe477d5bd23 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator_access_token.php
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator_access_token.php
@@ -14,6 +14,8 @@
 use Symfony\Component\Security\Http\AccessToken\ChainAccessTokenExtractor;
 use Symfony\Component\Security\Http\AccessToken\FormEncodedBodyExtractor;
 use Symfony\Component\Security\Http\AccessToken\HeaderAccessTokenExtractor;
+use Symfony\Component\Security\Http\AccessToken\Oidc\OidcTokenHandler;
+use Symfony\Component\Security\Http\AccessToken\Oidc\OidcUserInfoTokenHandler;
 use Symfony\Component\Security\Http\AccessToken\QueryAccessTokenExtractor;
 use Symfony\Component\Security\Http\Authenticator\AccessTokenAuthenticator;
 
@@ -40,5 +42,24 @@
             ->args([
                 abstract_arg('access token extractors'),
             ])
+
+        // OIDC
+        ->set('security.access_token_handler.oidc_user_info', OidcUserInfoTokenHandler::class)
+            ->abstract()
+            ->args([
+                abstract_arg('http client'),
+                service('logger')->nullOnInvalid(),
+                'sub',
+            ])
+
+        ->set('security.access_token_handler.oidc', OidcTokenHandler::class)
+            ->abstract()
+            ->args([
+                abstract_arg('signature algorithm'),
+                abstract_arg('jwk'),
+                service('logger')->nullOnInvalid(),
+                'sub',
+                null,
+            ])
     ;
 };
diff --git a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
index bf30dafbee612..2cbca705f93c1 100644
--- a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
+++ b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
@@ -23,6 +23,9 @@
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterTokenUsageTrackingPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\ReplaceDecoratedRememberMeHandlerPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\SortFirewallListenersPass;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\AccessToken\OidcTokenHandlerFactory;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\AccessToken\OidcUserInfoTokenHandlerFactory;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\AccessToken\ServiceTokenHandlerFactory;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AccessTokenFactory;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\CustomAuthenticatorFactory;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\FormLoginFactory;
@@ -74,7 +77,11 @@ public function build(ContainerBuilder $container)
         $extension->addAuthenticatorFactory(new CustomAuthenticatorFactory());
         $extension->addAuthenticatorFactory(new LoginThrottlingFactory());
         $extension->addAuthenticatorFactory(new LoginLinkFactory());
-        $extension->addAuthenticatorFactory(new AccessTokenFactory());
+        $extension->addAuthenticatorFactory(new AccessTokenFactory([
+            new ServiceTokenHandlerFactory(),
+            new OidcUserInfoTokenHandlerFactory(),
+            new OidcTokenHandlerFactory(),
+        ]));
 
         $extension->addUserProviderFactory(new InMemoryFactory());
         $extension->addUserProviderFactory(new LdapFactory());
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AccessTokenFactoryTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AccessTokenFactoryTest.php
index f31798113b75c..a9da80fbb40ba 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AccessTokenFactoryTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AccessTokenFactoryTest.php
@@ -12,6 +12,9 @@
 namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection\Security\Factory;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\AccessToken\OidcTokenHandlerFactory;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\AccessToken\OidcUserInfoTokenHandlerFactory;
+use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\AccessToken\ServiceTokenHandlerFactory;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AccessTokenFactory;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
@@ -29,7 +32,7 @@ public function testBasicServiceConfiguration()
             'token_extractors' => ['BAR', 'FOO'],
         ];
 
-        $factory = new AccessTokenFactory();
+        $factory = new AccessTokenFactory($this->createTokenHandlerFactories());
         $finalizedConfig = $this->processConfig($config, $factory);
 
         $factory->createAuthenticator($container, 'firewall1', $finalizedConfig, 'userprovider');
@@ -37,19 +40,99 @@ public function testBasicServiceConfiguration()
         $this->assertTrue($container->hasDefinition('security.authenticator.access_token.firewall1'));
     }
 
-    public function testDefaultServiceConfiguration()
+    public function testDefaultTokenHandlerConfiguration()
     {
         $container = new ContainerBuilder();
         $config = [
             'token_handler' => 'in_memory_token_handler_service_id',
         ];
 
-        $factory = new AccessTokenFactory();
+        $factory = new AccessTokenFactory($this->createTokenHandlerFactories());
         $finalizedConfig = $this->processConfig($config, $factory);
 
         $factory->createAuthenticator($container, 'firewall1', $finalizedConfig, 'userprovider');
 
         $this->assertTrue($container->hasDefinition('security.authenticator.access_token.firewall1'));
+        $this->assertTrue($container->hasDefinition('security.access_token_handler.firewall1'));
+    }
+
+    public function testIdTokenHandlerConfiguration()
+    {
+        $container = new ContainerBuilder();
+        $config = [
+            'token_handler' => ['id' => 'in_memory_token_handler_service_id'],
+        ];
+
+        $factory = new AccessTokenFactory($this->createTokenHandlerFactories());
+        $finalizedConfig = $this->processConfig($config, $factory);
+
+        $factory->createAuthenticator($container, 'firewall1', $finalizedConfig, 'userprovider');
+
+        $this->assertTrue($container->hasDefinition('security.authenticator.access_token.firewall1'));
+        $this->assertTrue($container->hasDefinition('security.access_token_handler.firewall1'));
+    }
+
+    public function testOidcUserInfoTokenHandlerConfigurationWithExistingClient()
+    {
+        $container = new ContainerBuilder();
+        $config = [
+            'token_handler' => ['oidc_user_info' => ['client' => 'oidc.client']],
+        ];
+
+        $factory = new AccessTokenFactory($this->createTokenHandlerFactories());
+        $finalizedConfig = $this->processConfig($config, $factory);
+
+        $factory->createAuthenticator($container, 'firewall1', $finalizedConfig, 'userprovider');
+
+        $this->assertTrue($container->hasDefinition('security.authenticator.access_token.firewall1'));
+        $this->assertTrue($container->hasDefinition('security.access_token_handler.firewall1'));
+        $this->assertFalse($container->hasDefinition('http_client.security.access_token_handler.oidc_user_info'));
+    }
+
+    public function testOidcUserInfoTokenHandlerConfigurationWithClientCreation()
+    {
+        $container = new ContainerBuilder();
+        $config = [
+            'token_handler' => ['oidc_user_info' => ['client' => ['base_uri' => 'https://www.example.com/realms/demo/protocol/openid-connect/userinfo']]],
+        ];
+
+        $factory = new AccessTokenFactory($this->createTokenHandlerFactories());
+        $finalizedConfig = $this->processConfig($config, $factory);
+
+        $factory->createAuthenticator($container, 'firewall1', $finalizedConfig, 'userprovider');
+
+        $this->assertTrue($container->hasDefinition('security.authenticator.access_token.firewall1'));
+        $this->assertTrue($container->hasDefinition('security.access_token_handler.firewall1'));
+        $this->assertTrue($container->hasDefinition('http_client.security.access_token_handler.oidc_user_info'));
+    }
+
+    public function testMultipleTokenHandlersSet()
+    {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('You cannot configure multiple token handlers.');
+
+        $config = [
+            'token_handler' => [
+                'id' => 'in_memory_token_handler_service_id',
+                'oidc_user_info' => ['client' => 'oidc.client'],
+            ],
+        ];
+
+        $factory = new AccessTokenFactory($this->createTokenHandlerFactories());
+        $this->processConfig($config, $factory);
+    }
+
+    public function testNoTokenHandlerSet()
+    {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('You must set a token handler.');
+
+        $config = [
+            'token_handler' => [],
+        ];
+
+        $factory = new AccessTokenFactory($this->createTokenHandlerFactories());
+        $this->processConfig($config, $factory);
     }
 
     public function testNoExtractorsDefined()
@@ -63,7 +146,7 @@ public function testNoExtractorsDefined()
             'token_extractors' => [],
         ];
 
-        $factory = new AccessTokenFactory();
+        $factory = new AccessTokenFactory($this->createTokenHandlerFactories());
         $this->processConfig($config, $factory);
     }
 
@@ -76,7 +159,7 @@ public function testNoHandlerDefined()
             'failure_handler' => 'failure_handler_service_id',
         ];
 
-        $factory = new AccessTokenFactory();
+        $factory = new AccessTokenFactory($this->createTokenHandlerFactories());
         $this->processConfig($config, $factory);
     }
 
@@ -90,4 +173,13 @@ private function processConfig(array $config, AccessTokenFactory $factory)
 
         return $node->finalize($normalizedConfig);
     }
+
+    private function createTokenHandlerFactories(): array
+    {
+        return [
+            new ServiceTokenHandlerFactory(),
+            new OidcUserInfoTokenHandlerFactory(),
+            new OidcTokenHandlerFactory(),
+        ];
+    }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AccessTokenTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AccessTokenTest.php
index 6ee313b9ffbbb..49d31cb664f5e 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AccessTokenTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AccessTokenTest.php
@@ -11,6 +11,11 @@
 
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
 
+use Jose\Component\Core\AlgorithmManager;
+use Jose\Component\Core\JWK;
+use Jose\Component\Signature\Algorithm\ES256;
+use Jose\Component\Signature\JWSBuilder;
+use Jose\Component\Signature\Serializer\CompactSerializer;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -327,4 +332,40 @@ public function testSelfContainedTokens()
         $this->assertSame(200, $response->getStatusCode());
         $this->assertSame(['message' => 'Welcome @dunglas!'], json_decode($response->getContent(), true));
     }
+
+    public function testOidcSuccess()
+    {
+        $time = time();
+        $claims = [
+            'iat' => $time,
+            'nbf' => $time,
+            'exp' => $time + 3600,
+            'iss' => 'https://www.example.com/',
+            'aud' => 'Symfony OIDC',
+            'sub' => 'e21bf182-1538-406e-8ccb-e25a17aba39f',
+            'username' => 'dunglas',
+        ];
+        $token = (new CompactSerializer())->serialize((new JWSBuilder(new AlgorithmManager([
+            new ES256(),
+        ])))->create()
+            ->withPayload(json_encode($claims))
+            // tip: use https://mkjwk.org/ to generate a JWK
+            ->addSignature(new JWK([
+                'kty' => 'EC',
+                'crv' => 'P-256',
+                'x' => '0QEAsI1wGI-dmYatdUZoWSRWggLEpyzopuhwk-YUnA4',
+                'y' => 'KYl-qyZ26HobuYwlQh-r0iHX61thfP82qqEku7i0woo',
+                'd' => 'iA_TV2zvftni_9aFAQwFO_9aypfJFCSpcCyevDvz220',
+            ]), ['alg' => 'ES256'])
+            ->build()
+        );
+
+        $client = $this->createClient(['test_case' => 'AccessToken', 'root_config' => 'config_oidc.yml']);
+        $client->request('GET', '/foo', [], [], ['HTTP_AUTHORIZATION' => sprintf('Bearer %s', $token)]);
+        $response = $client->getResponse();
+
+        $this->assertInstanceOf(Response::class, $response);
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame(['message' => 'Welcome @dunglas!'], json_decode($response->getContent(), true));
+    }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AccessToken/config_oidc.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AccessToken/config_oidc.yml
new file mode 100644
index 0000000000000..45802961a1a61
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AccessToken/config_oidc.yml
@@ -0,0 +1,34 @@
+imports:
+    - { resource: ./../config/framework.yml }
+
+framework:
+    http_method_override: false
+    serializer: ~
+
+security:
+    password_hashers:
+        Symfony\Component\Security\Core\User\InMemoryUser: plaintext
+
+    providers:
+        in_memory:
+            memory:
+                users:
+                    dunglas: { password: foo, roles: [ROLE_USER] }
+
+    firewalls:
+        main:
+            pattern: ^/
+            access_token:
+                token_handler:
+                    oidc:
+                        claim: 'username'
+                        audience: 'Symfony OIDC'
+                        signature:
+                            algorithm: 'ES256'
+                            # tip: use https://mkjwk.org/ to generate a JWK
+                            key: '{"kty":"EC","d":"iA_TV2zvftni_9aFAQwFO_9aypfJFCSpcCyevDvz220","crv":"P-256","x":"0QEAsI1wGI-dmYatdUZoWSRWggLEpyzopuhwk-YUnA4","y":"KYl-qyZ26HobuYwlQh-r0iHX61thfP82qqEku7i0woo"}'
+                token_extractors: 'header'
+                realm: 'My API'
+
+    access_control:
+        - { path: ^/foo, roles: ROLE_USER }
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
index c1b5ba239e269..8fb916cd27114 100644
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -48,7 +48,13 @@
         "symfony/twig-bridge": "^5.4|^6.0",
         "symfony/validator": "^5.4|^6.0",
         "symfony/yaml": "^5.4|^6.0",
-        "twig/twig": "^2.13|^3.0.4"
+        "twig/twig": "^2.13|^3.0.4",
+        "web-token/jwt-checker": "^3.1",
+        "web-token/jwt-signature-algorithm-hmac": "^3.1",
+        "web-token/jwt-signature-algorithm-ecdsa": "^3.1",
+        "web-token/jwt-signature-algorithm-rsa": "^3.1",
+        "web-token/jwt-signature-algorithm-eddsa": "^3.1",
+        "web-token/jwt-signature-algorithm-none": "^3.1"
     },
     "conflict": {
         "symfony/browser-kit": "<5.4",
diff --git a/src/Symfony/Component/Security/Core/CHANGELOG.md b/src/Symfony/Component/Security/Core/CHANGELOG.md
index 7ba95c0568113..b489556c919bb 100644
--- a/src/Symfony/Component/Security/Core/CHANGELOG.md
+++ b/src/Symfony/Component/Security/Core/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add `AttributesBasedUserProviderInterface` to allow `$attributes` optional argument on `loadUserByIdentifier`
+ * Add `OidcUser` with OIDC support for `OidcUserInfoTokenHandler`
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Security/Core/Tests/User/OidcUserTest.php b/src/Symfony/Component/Security/Core/Tests/User/OidcUserTest.php
new file mode 100644
index 0000000000000..7925628386c55
--- /dev/null
+++ b/src/Symfony/Component/Security/Core/Tests/User/OidcUserTest.php
@@ -0,0 +1,176 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\Tests\User;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Security\Core\User\OidcUser;
+
+class OidcUserTest extends TestCase
+{
+    public function testCannotCreateUserWithoutSubProperty()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('The "sub" claim cannot be empty.');
+
+        new OidcUser();
+    }
+
+    public function testCreateFullUserWithAdditionalClaimsUsingPositionalParameters()
+    {
+        $this->assertEquals(new OidcUser(
+            userIdentifier: 'john.doe',
+            roles: ['ROLE_USER', 'ROLE_ADMIN'],
+            sub: 'e21bf182-1538-406e-8ccb-e25a17aba39f',
+            name: 'John DOE',
+            givenName: 'John',
+            familyName: 'DOE',
+            middleName: 'Fitzgerald',
+            nickname: 'Johnny',
+            preferredUsername: 'john.doe',
+            profile: 'https://www.example.com/john-doe',
+            picture: 'https://www.example.com/pics/john-doe.jpg',
+            website: 'https://www.example.com',
+            email: 'john.doe@example.com',
+            emailVerified: true,
+            gender: 'male',
+            birthdate: '1980-05-15',
+            zoneinfo: 'Europe/Paris',
+            locale: 'fr-FR',
+            phoneNumber: '+33 (0) 6 12 34 56 78',
+            phoneNumberVerified: false,
+            address: [
+                'formatted' => '1 Rue des Moulins 75000 Paris - France',
+                'street_address' => '1 Rue des Moulins',
+                'locality' => 'Paris',
+                'region' => 'Île-de-France',
+                'postal_code' => '75000',
+                'country' => 'France',
+            ],
+            updatedAt: (new \DateTimeImmutable())->setTimestamp(1669628917),
+            additionalClaims: [
+                'impersonator' => [
+                    'username' => 'jane.doe@example.com',
+                ],
+                'customId' => 12345,
+            ],
+        ), new OidcUser(...[
+            'userIdentifier' => 'john.doe',
+            'roles' => ['ROLE_USER', 'ROLE_ADMIN'],
+            'sub' => 'e21bf182-1538-406e-8ccb-e25a17aba39f',
+            'name' => 'John DOE',
+            'givenName' => 'John',
+            'familyName' => 'DOE',
+            'middleName' => 'Fitzgerald',
+            'nickname' => 'Johnny',
+            'preferredUsername' => 'john.doe',
+            'profile' => 'https://www.example.com/john-doe',
+            'picture' => 'https://www.example.com/pics/john-doe.jpg',
+            'website' => 'https://www.example.com',
+            'email' => 'john.doe@example.com',
+            'emailVerified' => true,
+            'gender' => 'male',
+            'birthdate' => '1980-05-15',
+            'zoneinfo' => 'Europe/Paris',
+            'locale' => 'fr-FR',
+            'phoneNumber' => '+33 (0) 6 12 34 56 78',
+            'phoneNumberVerified' => false,
+            'address' => [
+                'formatted' => '1 Rue des Moulins 75000 Paris - France',
+                'street_address' => '1 Rue des Moulins',
+                'locality' => 'Paris',
+                'region' => 'Île-de-France',
+                'postal_code' => '75000',
+                'country' => 'France',
+            ],
+            'updatedAt' => (new \DateTimeImmutable())->setTimestamp(1669628917),
+            'impersonator' => [
+                'username' => 'jane.doe@example.com',
+            ],
+            'customId' => 12345,
+        ]));
+    }
+
+    public function testCreateFullUserWithAdditionalClaims()
+    {
+        $this->assertEquals(new OidcUser(
+            userIdentifier: 'john.doe',
+            roles: ['ROLE_USER', 'ROLE_ADMIN'],
+            sub: 'e21bf182-1538-406e-8ccb-e25a17aba39f',
+            name: 'John DOE',
+            givenName: 'John',
+            familyName: 'DOE',
+            middleName: 'Fitzgerald',
+            nickname: 'Johnny',
+            preferredUsername: 'john.doe',
+            profile: 'https://www.example.com/john-doe',
+            picture: 'https://www.example.com/pics/john-doe.jpg',
+            website: 'https://www.example.com',
+            email: 'john.doe@example.com',
+            emailVerified: true,
+            gender: 'male',
+            birthdate: '1980-05-15',
+            zoneinfo: 'Europe/Paris',
+            locale: 'fr-FR',
+            phoneNumber: '+33 (0) 6 12 34 56 78',
+            phoneNumberVerified: false,
+            address: [
+                'formatted' => '1 Rue des Moulins 75000 Paris - France',
+                'street_address' => '1 Rue des Moulins',
+                'locality' => 'Paris',
+                'region' => 'Île-de-France',
+                'postal_code' => '75000',
+                'country' => 'France',
+            ],
+            updatedAt: (new \DateTimeImmutable())->setTimestamp(1669628917),
+            additionalClaims: [
+                [
+                    'username' => 'jane.doe@example.com',
+                ],
+                12345,
+            ],
+        ), new OidcUser(
+            'john.doe',
+            ['ROLE_USER', 'ROLE_ADMIN'],
+            'e21bf182-1538-406e-8ccb-e25a17aba39f',
+            'John DOE',
+            'John',
+            'DOE',
+            'Fitzgerald',
+            'Johnny',
+            'john.doe',
+            'https://www.example.com/john-doe',
+            'https://www.example.com/pics/john-doe.jpg',
+            'https://www.example.com',
+            'john.doe@example.com',
+            true,
+            'male',
+            '1980-05-15',
+            'Europe/Paris',
+            'fr-FR',
+            '+33 (0) 6 12 34 56 78',
+            false,
+            [
+                'formatted' => '1 Rue des Moulins 75000 Paris - France',
+                'street_address' => '1 Rue des Moulins',
+                'locality' => 'Paris',
+                'region' => 'Île-de-France',
+                'postal_code' => '75000',
+                'country' => 'France',
+            ],
+            (new \DateTimeImmutable())->setTimestamp(1669628917),
+            [
+                'username' => 'jane.doe@example.com',
+            ],
+            12345
+        ));
+    }
+}
diff --git a/src/Symfony/Component/Security/Core/User/AttributesBasedUserProviderInterface.php b/src/Symfony/Component/Security/Core/User/AttributesBasedUserProviderInterface.php
new file mode 100644
index 0000000000000..10cbb434e342e
--- /dev/null
+++ b/src/Symfony/Component/Security/Core/User/AttributesBasedUserProviderInterface.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\User;
+
+use Symfony\Component\Security\Core\Exception\UserNotFoundException;
+
+/**
+ * Overrides UserProviderInterface to add an "attributes" argument on loadUserByIdentifier.
+ * This is particularly useful with self-contained access tokens.
+ *
+ * @experimental
+ */
+interface AttributesBasedUserProviderInterface extends UserProviderInterface
+{
+    /**
+     * Loads the user for the given user identifier (e.g. username or email) and attributes.
+     *
+     * This method must throw UserNotFoundException if the user is not found.
+     *
+     * @throws UserNotFoundException
+     */
+    public function loadUserByIdentifier(string $identifier, array $attributes = []): UserInterface;
+}
diff --git a/src/Symfony/Component/Security/Core/User/OidcUser.php b/src/Symfony/Component/Security/Core/User/OidcUser.php
new file mode 100644
index 0000000000000..eea433b53c26e
--- /dev/null
+++ b/src/Symfony/Component/Security/Core/User/OidcUser.php
@@ -0,0 +1,184 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\User;
+
+/**
+ * UserInterface implementation used by the access-token security workflow with an OIDC server.
+ *
+ * @experimental
+ */
+class OidcUser implements UserInterface
+{
+    private array $additionalClaims = [];
+
+    public function __construct(
+        private ?string $userIdentifier = null,
+        private array $roles = ['ROLE_USER'],
+
+        // Standard Claims (https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims)
+        private ?string $sub = null,
+        private ?string $name = null,
+        private ?string $givenName = null,
+        private ?string $familyName = null,
+        private ?string $middleName = null,
+        private ?string $nickname = null,
+        private ?string $preferredUsername = null,
+        private ?string $profile = null,
+        private ?string $picture = null,
+        private ?string $website = null,
+        private ?string $email = null,
+        private ?bool $emailVerified = null,
+        private ?string $gender = null,
+        private ?string $birthdate = null,
+        private ?string $zoneinfo = null,
+        private ?string $locale = null,
+        private ?string $phoneNumber = null,
+        private ?bool $phoneNumberVerified = null,
+        private ?array $address = null,
+        private ?\DateTimeInterface $updatedAt = null,
+
+        // Additional Claims (https://openid.net/specs/openid-connect-core-1_0.html#AdditionalClaims)
+        ...$additionalClaims
+    ) {
+        if (null === $sub || '' === $sub) {
+            throw new \InvalidArgumentException('The "sub" claim cannot be empty.');
+        }
+
+        $this->additionalClaims = $additionalClaims['additionalClaims'] ?? $additionalClaims;
+    }
+
+    /**
+     * OIDC or OAuth specs don't have any "role" notion.
+     *
+     * If you want to implement "roles" from your OIDC server,
+     * send a "roles" constructor argument to this object
+     * (e.g.: using a custom UserProvider).
+     */
+    public function getRoles(): array
+    {
+        return $this->roles;
+    }
+
+    public function getUserIdentifier(): string
+    {
+        return (string) ($this->userIdentifier ?? $this->getSub());
+    }
+
+    public function eraseCredentials()
+    {
+    }
+
+    public function getSub(): ?string
+    {
+        return $this->sub;
+    }
+
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+
+    public function getGivenName(): ?string
+    {
+        return $this->givenName;
+    }
+
+    public function getFamilyName(): ?string
+    {
+        return $this->familyName;
+    }
+
+    public function getMiddleName(): ?string
+    {
+        return $this->middleName;
+    }
+
+    public function getNickname(): ?string
+    {
+        return $this->nickname;
+    }
+
+    public function getPreferredUsername(): ?string
+    {
+        return $this->preferredUsername;
+    }
+
+    public function getProfile(): ?string
+    {
+        return $this->profile;
+    }
+
+    public function getPicture(): ?string
+    {
+        return $this->picture;
+    }
+
+    public function getWebsite(): ?string
+    {
+        return $this->website;
+    }
+
+    public function getEmail(): ?string
+    {
+        return $this->email;
+    }
+
+    public function getEmailVerified(): ?bool
+    {
+        return $this->emailVerified;
+    }
+
+    public function getGender(): ?string
+    {
+        return $this->gender;
+    }
+
+    public function getBirthdate(): ?string
+    {
+        return $this->birthdate;
+    }
+
+    public function getZoneinfo(): ?string
+    {
+        return $this->zoneinfo;
+    }
+
+    public function getLocale(): ?string
+    {
+        return $this->locale;
+    }
+
+    public function getPhoneNumber(): ?string
+    {
+        return $this->phoneNumber;
+    }
+
+    public function getphoneNumberVerified(): ?bool
+    {
+        return $this->phoneNumberVerified;
+    }
+
+    public function getAddress(): ?array
+    {
+        return $this->address;
+    }
+
+    public function getUpdatedAt(): ?\DateTimeInterface
+    {
+        return $this->updatedAt;
+    }
+
+    public function getAdditionalClaims(): array
+    {
+        return $this->additionalClaims;
+    }
+}
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
index 5f933534b29ce..8613e703564c0 100644
--- a/src/Symfony/Component/Security/Core/composer.json
+++ b/src/Symfony/Component/Security/Core/composer.json
@@ -29,6 +29,7 @@
         "symfony/expression-language": "^5.4|^6.0",
         "symfony/http-foundation": "^5.4|^6.0",
         "symfony/ldap": "^5.4|^6.0",
+        "symfony/string": "^5.4|^6.0",
         "symfony/translation": "^5.4|^6.0",
         "symfony/validator": "^5.4|^6.0",
         "psr/log": "^1|^2|^3"
diff --git a/src/Symfony/Component/Security/Http/AccessToken/Oidc/Exception/InvalidSignatureException.php b/src/Symfony/Component/Security/Http/AccessToken/Oidc/Exception/InvalidSignatureException.php
new file mode 100644
index 0000000000000..4eaf52ca7ba43
--- /dev/null
+++ b/src/Symfony/Component/Security/Http/AccessToken/Oidc/Exception/InvalidSignatureException.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\AccessToken\Oidc\Exception;
+
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
+
+/**
+ * This exception is thrown when the token signature is invalid.
+ *
+ * @experimental
+ */
+class InvalidSignatureException extends AuthenticationException
+{
+    public function getMessageKey(): string
+    {
+        return 'Invalid token signature.';
+    }
+}
diff --git a/src/Symfony/Component/Security/Http/AccessToken/Oidc/Exception/MissingClaimException.php b/src/Symfony/Component/Security/Http/AccessToken/Oidc/Exception/MissingClaimException.php
new file mode 100644
index 0000000000000..eed0b9d1c2896
--- /dev/null
+++ b/src/Symfony/Component/Security/Http/AccessToken/Oidc/Exception/MissingClaimException.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\AccessToken\Oidc\Exception;
+
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
+
+/**
+ * This exception is thrown when the user is invalid on the OIDC server (e.g.: "email" property is not in the scope).
+ *
+ * @experimental
+ */
+class MissingClaimException extends AuthenticationException
+{
+    public function getMessageKey(): string
+    {
+        return 'Missing claim.';
+    }
+}
diff --git a/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcTokenHandler.php b/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcTokenHandler.php
new file mode 100644
index 0000000000000..047cc3318e017
--- /dev/null
+++ b/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcTokenHandler.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\AccessToken\Oidc;
+
+use Jose\Component\Checker;
+use Jose\Component\Checker\ClaimCheckerManager;
+use Jose\Component\Core\Algorithm;
+use Jose\Component\Core\AlgorithmManager;
+use Jose\Component\Core\JWK;
+use Jose\Component\Signature\JWSTokenSupport;
+use Jose\Component\Signature\JWSVerifier;
+use Jose\Component\Signature\Serializer\CompactSerializer;
+use Jose\Component\Signature\Serializer\JWSSerializerManager;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Clock\NativeClock;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
+use Symfony\Component\Security\Http\AccessToken\AccessTokenHandlerInterface;
+use Symfony\Component\Security\Http\AccessToken\Oidc\Exception\InvalidSignatureException;
+use Symfony\Component\Security\Http\AccessToken\Oidc\Exception\MissingClaimException;
+use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
+
+/**
+ * The token handler decodes and validates the token, and retrieves the user identifier from it.
+ *
+ * @experimental
+ */
+final class OidcTokenHandler implements AccessTokenHandlerInterface
+{
+    use OidcTrait;
+
+    public function __construct(
+        private Algorithm $signatureAlgorithm,
+        private JWK $jwk,
+        private ?LoggerInterface $logger = null,
+        private string $claim = 'sub',
+        private ?string $audience = null
+    ) {
+    }
+
+    public function getUserBadgeFrom(string $accessToken): UserBadge
+    {
+        if (!class_exists(JWSVerifier::class) || !class_exists(Checker\HeaderCheckerManager::class)) {
+            throw new \LogicException('You cannot use the "oidc" token handler since "web-token/jwt-signature" and "web-token/jwt-checker" are not installed. Try running "composer require web-token/jwt-signature web-token/jwt-checker".');
+        }
+
+        try {
+            // Decode the token
+            $jwsVerifier = new JWSVerifier(new AlgorithmManager([$this->signatureAlgorithm]));
+            $serializerManager = new JWSSerializerManager([new CompactSerializer()]);
+            $jws = $serializerManager->unserialize($accessToken);
+            $claims = json_decode($jws->getPayload(), true);
+
+            // Verify the signature
+            if (!$jwsVerifier->verifyWithKey($jws, $this->jwk, 0)) {
+                throw new InvalidSignatureException();
+            }
+
+            // Verify the headers
+            $headerCheckerManager = new Checker\HeaderCheckerManager([
+                new Checker\AlgorithmChecker([$this->signatureAlgorithm->name()]),
+            ], [
+                new JWSTokenSupport(),
+            ]);
+            // if this check fails, an InvalidHeaderException is thrown
+            $headerCheckerManager->check($jws, 0);
+
+            // Verify the claims
+            $clock = class_exists(NativeClock::class) ? new NativeClock() : null;
+            $checkers = [
+                new Checker\IssuedAtChecker(0, false, $clock),
+                new Checker\NotBeforeChecker(0, false, $clock),
+                new Checker\ExpirationTimeChecker(0, false, $clock),
+            ];
+            if ($this->audience) {
+                $checkers[] = new Checker\AudienceChecker($this->audience);
+            }
+            $claimCheckerManager = new ClaimCheckerManager($checkers);
+            // if this check fails, an InvalidClaimException is thrown
+            $claimCheckerManager->check($claims);
+
+            if (empty($claims[$this->claim])) {
+                throw new MissingClaimException(sprintf('"%s" claim not found.', $this->claim));
+            }
+
+            // UserLoader argument can be overridden by a UserProvider on AccessTokenAuthenticator::authenticate
+            return new UserBadge($claims[$this->claim], fn () => $this->createUser($claims), $claims);
+        } catch (\Throwable $e) {
+            $this->logger?->error('An error while decoding and validating the token.', [
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString(),
+            ]);
+
+            throw new BadCredentialsException('Invalid credentials.', $e->getCode(), $e);
+        }
+    }
+}
diff --git a/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcTrait.php b/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcTrait.php
new file mode 100644
index 0000000000000..89d03409d9d6d
--- /dev/null
+++ b/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcTrait.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\AccessToken\Oidc;
+
+use Symfony\Component\Security\Core\User\OidcUser;
+
+use function Symfony\Component\String\u;
+
+/**
+ * Creates {@see OidcUser} from claims.
+ *
+ * @internal
+ */
+trait OidcTrait
+{
+    private function createUser(array $claims): OidcUser
+    {
+        if (!\function_exists(\Symfony\Component\String\u::class)) {
+            throw new \LogicException('You cannot use the "OidcUserInfoTokenHandler" since the String component is not installed. Try running "composer require symfony/string".');
+        }
+
+        foreach ($claims as $claim => $value) {
+            unset($claims[$claim]);
+            if ('' === $value || null === $value) {
+                continue;
+            }
+            $claims[u($claim)->camel()->toString()] = $value;
+        }
+
+        if (isset($claims['updatedAt']) && '' !== $claims['updatedAt']) {
+            $claims['updatedAt'] = (new \DateTimeImmutable())->setTimestamp($claims['updatedAt']);
+        }
+
+        if (\array_key_exists('emailVerified', $claims) && null !== $claims['emailVerified'] && '' !== $claims['emailVerified']) {
+            $claims['emailVerified'] = (bool) $claims['emailVerified'];
+        }
+
+        if (\array_key_exists('phoneNumberVerified', $claims) && null !== $claims['phoneNumberVerified'] && '' !== $claims['phoneNumberVerified']) {
+            $claims['phoneNumberVerified'] = (bool) $claims['phoneNumberVerified'];
+        }
+
+        return new OidcUser(...$claims);
+    }
+}
diff --git a/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcUserInfoTokenHandler.php b/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcUserInfoTokenHandler.php
new file mode 100644
index 0000000000000..d69775f192e20
--- /dev/null
+++ b/src/Symfony/Component/Security/Http/AccessToken/Oidc/OidcUserInfoTokenHandler.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\AccessToken\Oidc;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
+use Symfony\Component\Security\Http\AccessToken\AccessTokenHandlerInterface;
+use Symfony\Component\Security\Http\AccessToken\Oidc\Exception\MissingClaimException;
+use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * The token handler validates the token on the OIDC server and retrieves the user identifier.
+ *
+ * @experimental
+ */
+final class OidcUserInfoTokenHandler implements AccessTokenHandlerInterface
+{
+    use OidcTrait;
+
+    public function __construct(
+        private HttpClientInterface $client,
+        private ?LoggerInterface $logger = null,
+        private string $claim = 'sub'
+    ) {
+    }
+
+    public function getUserBadgeFrom(string $accessToken): UserBadge
+    {
+        try {
+            // Call the OIDC server to retrieve the user info
+            // If the token is invalid or expired, the OIDC server will return an error
+            $claims = $this->client->request('GET', '', [
+                'auth_bearer' => $accessToken,
+            ])->toArray();
+
+            if (empty($claims[$this->claim])) {
+                throw new MissingClaimException(sprintf('"%s" claim not found on OIDC server response.', $this->claim));
+            }
+
+            // UserLoader argument can be overridden by a UserProvider on AccessTokenAuthenticator::authenticate
+            return new UserBadge($claims[$this->claim], fn () => $this->createUser($claims), $claims);
+        } catch (\Throwable $e) {
+            $this->logger?->error('An error occurred on OIDC server.', [
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString(),
+            ]);
+
+            throw new BadCredentialsException('Invalid credentials.', $e->getCode(), $e);
+        }
+    }
+}
diff --git a/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php
index e88a04056e42b..c925e00050bed 100644
--- a/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php
+++ b/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php
@@ -59,7 +59,7 @@ public function authenticate(Request $request): Passport
         }
 
         $userBadge = $this->accessTokenHandler->getUserBadgeFrom($accessToken);
-        if (null === $userBadge->getUserLoader() && $this->userProvider) {
+        if ($this->userProvider) {
             $userBadge->setUserLoader($this->userProvider->loadUserByIdentifier(...));
         }
 
diff --git a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php
index 701ae6a2e7f76..14c8852a11e98 100644
--- a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php
+++ b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php
@@ -34,6 +34,7 @@ class UserBadge implements BadgeInterface
     /** @var callable|null */
     private $userLoader;
     private UserInterface $user;
+    private ?array $attributes;
 
     /**
      * Initializes the user badge.
@@ -48,7 +49,7 @@ class UserBadge implements BadgeInterface
      * is thrown). If this is not set, the default user provider will be used with
      * $userIdentifier as username.
      */
-    public function __construct(string $userIdentifier, callable $userLoader = null)
+    public function __construct(string $userIdentifier, callable $userLoader = null, array $attributes = null)
     {
         if (\strlen($userIdentifier) > self::MAX_USERNAME_LENGTH) {
             throw new BadCredentialsException('Username too long.');
@@ -56,6 +57,7 @@ public function __construct(string $userIdentifier, callable $userLoader = null)
 
         $this->userIdentifier = $userIdentifier;
         $this->userLoader = $userLoader;
+        $this->attributes = $attributes;
     }
 
     public function getUserIdentifier(): string
@@ -63,6 +65,11 @@ public function getUserIdentifier(): string
         return $this->userIdentifier;
     }
 
+    public function getAttributes(): ?array
+    {
+        return $this->attributes;
+    }
+
     /**
      * @throws AuthenticationException when the user cannot be found
      */
@@ -76,7 +83,11 @@ public function getUser(): UserInterface
             throw new \LogicException(sprintf('No user loader is configured, did you forget to register the "%s" listener?', UserProviderListener::class));
         }
 
-        $user = ($this->userLoader)($this->userIdentifier);
+        if (null === $this->getAttributes()) {
+            $user = ($this->userLoader)($this->userIdentifier);
+        } else {
+            $user = ($this->userLoader)($this->userIdentifier, $this->getAttributes());
+        }
 
         // No user has been found via the $this->userLoader callback
         if (null === $user) {
diff --git a/src/Symfony/Component/Security/Http/Authenticator/Passport/Passport.php b/src/Symfony/Component/Security/Http/Authenticator/Passport/Passport.php
index f6b5afa58f321..0158ee5ba5e8b 100644
--- a/src/Symfony/Component/Security/Http/Authenticator/Passport/Passport.php
+++ b/src/Symfony/Component/Security/Http/Authenticator/Passport/Passport.php
@@ -66,11 +66,23 @@ public function getUser(): UserInterface
      * This method replaces the current badge if it is already set on this
      * passport.
      *
+     * @param string|null $badgeFqcn A FQCN to which the badge should be mapped to. 
+     *                                                        This allows replacing a built-in badge by a custom one using
+     *.                                                        e.g. addBadge(new MyCustomUserBadge(), UserBadge::class)
+     *
      * @return $this
      */
-    public function addBadge(BadgeInterface $badge): static
+    public function addBadge(BadgeInterface $badge/* , string $badgeFqcn = null */): static
     {
-        $this->badges[$badge::class] = $badge;
+        $badgeFqcn = $badge::class;
+        if (2 === \func_num_args()) {
+            $badgeFqcn = func_get_arg(1);
+            if (!\is_string($badgeFqcn)) {
+                throw new \LogicException(sprintf('Second argument of "%s" must be a string.', __METHOD__));
+            }
+        }
+
+        $this->badges[$badgeFqcn] = $badge;
 
         return $this;
     }
diff --git a/src/Symfony/Component/Security/Http/CHANGELOG.md b/src/Symfony/Component/Security/Http/CHANGELOG.md
index 489da50312e83..47a8553486686 100644
--- a/src/Symfony/Component/Security/Http/CHANGELOG.md
+++ b/src/Symfony/Component/Security/Http/CHANGELOG.md
@@ -7,6 +7,10 @@ CHANGELOG
  * Add `RememberMeBadge` to `JsonLoginAuthenticator` and enable reading parameter in JSON request body
  * Add argument `$exceptionCode` to `#[IsGranted]`
  * Deprecate passing a secret as the 2nd argument to the constructor of `Symfony\Component\Security\Http\RememberMe\PersistentRememberMeHandler`
+ * Add `OidcUserInfoTokenHandler` and `OidcTokenHandler` with OIDC support for `AccessTokenAuthenticator`
+ * Add `attributes` optional array argument in `UserBadge`
+ * Call `UserBadge::userLoader` with attributes if the argument is set
+ * Allow to override badge fqcn on `Passport::addBadge`
 
 6.2
 ---
diff --git a/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcTokenHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcTokenHandlerTest.php
new file mode 100644
index 0000000000000..50cc3c7c15b14
--- /dev/null
+++ b/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcTokenHandlerTest.php
@@ -0,0 +1,173 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\Tests\AccessToken\Oidc;
+
+use Jose\Component\Core\AlgorithmManager;
+use Jose\Component\Core\JWK;

57AE
+use Jose\Component\Signature\Algorithm\ES256;
+use Jose\Component\Signature\JWSBuilder;
+use Jose\Component\Signature\Serializer\CompactSerializer;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
+use Symfony\Component\Security\Core\User\OidcUser;
+use Symfony\Component\Security\Http\AccessToken\Oidc\OidcTokenHandler;
+use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
+
+class OidcTokenHandlerTest extends TestCase
+{
+    private const AUDIENCE = 'Symfony OIDC';
+
+    /**
+     * @dataProvider getClaims
+     */
+    public function testGetsUserIdentifierFromSignedToken(string $claim, string $expected)
+    {
+        $time = time();
+        $claims = [
+            'iat' => $time,
+            'nbf' => $time,
+            'exp' => $time + 3600,
+            'iss' => 'https://www.example.com/',
+            'aud' => self::AUDIENCE,
+            'sub' => 'e21bf182-1538-406e-8ccb-e25a17aba39f',
+            'email' => 'foo@example.com',
+        ];
+        $token = $this->buildJWS(json_encode($claims));
+        $expectedUser = new OidcUser(...$claims);
+
+        $loggerMock = $this->createMock(LoggerInterface::class);
+        $loggerMock->expects($this->never())->method('error');
+
+        $userBadge = (new OidcTokenHandler(
+            new ES256(),
+            $this->getJWK(),
+            $loggerMock,
+            $claim,
+            self::AUDIENCE
+        ))->getUserBadgeFrom($token);
+        $actualUser = $userBadge->getUserLoader()();
+
+        $this->assertEquals(new UserBadge($expected, fn () => $expectedUser, $claims), $userBadge);
+        $this->assertInstanceOf(OidcUser::class, $actualUser);
+        $this->assertEquals($expectedUser, $actualUser);
+        $this->assertEquals($claims, $userBadge->getAttributes());
+        $this->assertEquals($claims['sub'], $actualUser->getUserIdentifier());
+    }
+
+    public function getClaims(): iterable
+    {
+        yield ['sub', 'e21bf182-1538-406e-8ccb-e25a17aba39f'];
+        yield ['email', 'foo@example.com'];
+    }
+
+    /**
+     * @dataProvider getInvalidTokens
+     */
+    public function testThrowsAnErrorIfTokenIsInvalid(string $token)
+    {
+        $this->expectException(BadCredentialsException::class);
+        $this->expectExceptionMessage('Invalid credentials.');
+
+        $loggerMock = $this->createMock(LoggerInterface::class);
+        $loggerMock->expects($this->once())->method('error');
+
+        (new OidcTokenHandler(
+            new ES256(),
+            $this->getJWK(),
+            $loggerMock,
+            'sub',
+            self::AUDIENCE
+        ))->getUserBadgeFrom($token);
+    }
+
+    public function getInvalidTokens(): iterable
+    {
+        // Invalid token
+        yield ['invalid'];
+        // Token is expired
+        yield [
+            $this->buildJWS(json_encode([
+                'iat' => time() - 3600,
+                'nbf' => time() - 3600,
+                'exp' => time() - 3590,
+                'iss' => 'https://www.example.com/',
+                'aud' => self::AUDIENCE,
+                'sub' => 'e21bf182-1538-406e-8ccb-e25a17aba39f',
+                'email' => 'foo@example.com',
+            ])),
+        ];
+        // Invalid audience
+        yield [
+            $this->buildJWS(json_encode([
+                'iat' => time(),
+                'nbf' => time(),
+                'exp' => time() + 3590,
+                'iss' => 'https://www.example.com/',
+                'aud' => 'invalid',
+                'sub' => 'e21bf182-1538-406e-8ccb-e25a17aba39f',
+                'email' => 'foo@example.com',
+            ])),
+        ];
+    }
+
+    public function testThrowsAnErrorIfUserPropertyIsMissing()
+    {
+        $this->expectException(BadCredentialsException::class);
+        $this->expectExceptionMessage('Invalid credentials.');
+
+        $loggerMock = $this->createMock(LoggerInterface::class);
+        $loggerMock->expects($this->once())->method('error');
+
+        $time = time();
+        $claims = [
+            'iat' => $time,
+            'nbf' => $time,
+            'exp' => $time + 3600,
+            'iss' => 'https://www.example.com/',
+            'aud' => self::AUDIENCE,
+            'sub' => 'e21bf182-1538-406e-8ccb-e25a17aba39f',
+        ];
+        $token = $this->buildJWS(json_encode($claims));
+
+        (new OidcTokenHandler(
+            new ES256(),
+            $this->getJWK(),
+            $loggerMock,
+            'email',
+            self::AUDIENCE
+        ))->getUserBadgeFrom($token);
+    }
+
+    private function buildJWS(string $payload): string
+    {
+        return (new CompactSerializer())->serialize((new JWSBuilder(new AlgorithmManager([
+            new ES256(),
+        ])))->create()
+            ->withPayload($payload)
+            ->addSignature($this->getJWK(), ['alg' => 'ES256'])
+            ->build()
+        );
+    }
+
+    private function getJWK(): JWK
+    {
+        // tip: use https://mkjwk.org/ to generate a JWK
+        return new JWK([
+            'kty' => 'EC',
+            'crv' => 'P-256',
+            'x' => '0QEAsI1wGI-dmYatdUZoWSRWggLEpyzopuhwk-YUnA4',
+            'y' => 'KYl-qyZ26HobuYwlQh-r0iHX61thfP82qqEku7i0woo',
+            'd' => 'iA_TV2zvftni_9aFAQwFO_9aypfJFCSpcCyevDvz220',
+        ]);
+    }
+}
diff --git a/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcUserInfoTokenHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcUserInfoTokenHandlerTest.php
new file mode 100644
index 0000000000000..3183ef0e397a1
--- /dev/null
+++ b/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcUserInfoTokenHandlerTest.php
@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\Tests\AccessToken\Oidc;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
+use Symfony\Component\Security\Core\User\OidcUser;
+use Symfony\Component\Security\Http\AccessToken\Oidc\OidcUserInfoTokenHandler;
+use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+class OidcUserInfoTokenHandlerTest extends TestCase
+{
+    /**
+     * @dataProvider getClaims
+     */
+    public function testGetsUserIdentifierFromOidcServerResponse(string $claim, string $expected)
+    {
+        $accessToken = 'a-secret-token';
+        $claims = [
+            'sub' => 'e21bf182-1538-406e-8ccb-e25a17aba39f',
+            'email' => 'foo@example.com',
+        ];
+        $expectedUser = new OidcUser(...$claims);
+
+        $responseMock = $this->createMock(ResponseInterface::class);
+        $responseMock->expects($this->once())
+            ->method('toArray')
+            ->willReturn($claims);
+
+        $clientMock = $this->createMock(HttpClientInterface::class);
+        $clientMock->expects($this->once())
+            ->method('request')->with('GET', '', ['auth_bearer' => $accessToken])
+            ->willReturn($responseMock);
+
+        $userBadge = (new OidcUserInfoTokenHandler($clientMock, null, $claim))->getUserBadgeFrom($accessToken);
+        $actualUser = $userBadge->getUserLoader()();
+
+        $this->assertEquals(new UserBadge($expected, fn () => $expectedUser, $claims), $userBadge);
+        $this->assertInstanceOf(OidcUser::class, $actualUser);
+        $this->assertEquals($expectedUser, $actualUser);
+        $this->assertEquals($claims, $userBadge->getAttributes());
+        $this->assertEquals($claims['sub'], $actualUser->getUserIdentifier());
+    }
+
+    public function getClaims(): iterable
+    {
+        yield ['sub', 'e21bf182-1538-406e-8ccb-e25a17aba39f'];
+        yield ['email', 'foo@example.com'];
+    }
+
+    public function testThrowsAnExceptionIfUserPropertyIsMissing()
+    {
+        $this->expectException(BadCredentialsException::class);
+        $this->expectExceptionMessage('Invalid credentials.');
+
+        $response = ['foo' => 'bar'];
+
+        $responseMock = $this->createMock(ResponseInterface::class);
+        $responseMock->expects($this->once())
+            ->method('toArray')
+            ->willReturn($response);
+
+        $clientMock = $this->createMock(HttpClientInterface::class);
+        $clientMock->expects($this->once())
+            ->method('request')->with('GET', '', ['auth_bearer' => 'a-secret-token'])
+            ->willReturn($responseMock);
+
+        $loggerMock = $this->createMock(LoggerInterface::class);
+        $loggerMock->expects($this->once())
+            ->method('error');
+
+        $handler = new OidcUserInfoTokenHandler($clientMock, $loggerMock);
+        $handler->getUserBadgeFrom('a-secret-token');
+    }
+}
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
index 94ccbdcd403d3..6fdea560a67c5 100644
--- a/src/Symfony/Component/Security/Http/composer.json
+++ b/src/Symfony/Component/Security/Http/composer.json
@@ -27,14 +27,18 @@
     "require-dev": {
         "symfony/cache": "^5.4|^6.0",
         "symfony/expression-language": "^5.4|^6.0",
+        "symfony/http-client-contracts": "^3.0",
         "symfony/rate-limiter": "^5.4|^6.0",
         "symfony/routing": "^5.4|^6.0",
         "symfony/security-csrf": "^5.4|^6.0",
         "symfony/translation": "^5.4|^6.0",
-        "psr/log": "^1|^2|^3"
+        "psr/log": "^1|^2|^3",
+        "web-token/jwt-checker": "^3.1",
+        "web-token/jwt-signature-algorithm-ecdsa": "^3.1"
     },
     "conflict": {
         "symfony/event-dispatcher": "<5.4.9|>=6,<6.0.9",
+        "symfony/http-client-contracts": "<3.0",
         "symfony/security-bundle": "<5.4",
         "symfony/security-csrf": "<5.4"
     },

From c050447fcfae256dd380e64e70d81ef9d4f10b84 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 14 Apr 2023 10:26:59 +0200
Subject: [PATCH 393/475] [Security] Fix OidcUser::eraseCredentials() signature

---
 src/Symfony/Component/Security/Core/User/OidcUser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Security/Core/User/OidcUser.php b/src/Symfony/Component/Security/Core/User/OidcUser.php
index eea433b53c26e..c88d34b772390 100644
--- a/src/Symfony/Component/Security/Core/User/OidcUser.php
+++ b/src/Symfony/Component/Security/Core/User/OidcUser.php
@@ -73,7 +73,7 @@ public function getUserIdentifier(): string
         return (string) ($this->userIdentifier ?? $this->getSub());
     }
 
-    public function eraseCredentials()
+    public function eraseCredentials(): void
     {
     }
 

From 31f51901c91a99b09eaa590e73eb3bf9689a8114 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 14 Apr 2023 10:36:06 +0200
Subject: [PATCH 394/475] Sync .github/expected-missing-return-types.diff

---
 .github/expected-missing-return-types.diff | 84 +++++++++++-----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index b9b26d6f7de28..c1888054786ce 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -108,7 +108,7 @@ index 83bfffaf27..acbd7e4bc7 100644
      {
          $this->updateValidatorMappingFiles($container, 'xml', 'xml');
 diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
-index bf68ec0dcc..509e5f1b0c 100644
+index 16a37b524a..24c2100206 100644
 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
 +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
 @@ -54,5 +54,5 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
@@ -354,31 +354,31 @@ index c1ce2898da..7a9bf04e18 100644
      {
          $this->clear();
 diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php
-index 6ce2278c53..27b05b5815 100644
+index 8bfaa0a22c..745ba6aff3 100644
 --- a/src/Symfony/Bridge/Twig/AppVariable.php
 +++ b/src/Symfony/Bridge/Twig/AppVariable.php
-@@ -34,5 +34,5 @@ class AppVariable
+@@ -36,5 +36,5 @@ class AppVariable
       * @return void
       */
 -    public function setTokenStorage(TokenStorageInterface $tokenStorage)
 +    public function setTokenStorage(TokenStorageInterface $tokenStorage): void
      {
          $this->tokenStorage = $tokenStorage;
-@@ -42,5 +42,5 @@ class AppVariable
+@@ -44,5 +44,5 @@ class AppVariable
       * @return void
       */
 -    public function setRequestStack(RequestStack $requestStack)
 +    public function setRequestStack(RequestStack $requestStack): void
      {
          $this->requestStack = $requestStack;
-@@ -50,5 +50,5 @@ class AppVariable
+@@ -52,5 +52,5 @@ class AppVariable
       * @return void
       */
 -    public function setEnvironment(string $environment)
 +    public function setEnvironment(string $environment): void
      {
          $this->environment = $environment;
-@@ -58,5 +58,5 @@ class AppVariable
+@@ -60,5 +60,5 @@ class AppVariable
       * @return void
       */
 -    public function setDebug(bool $debug)
@@ -386,7 +386,7 @@ index 6ce2278c53..27b05b5815 100644
      {
          $this->debug = $debug;
 diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
-index cec031127b..167f26d846 100644
+index fe581b5987..8109e7c68d 100644
 --- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php
 +++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
 @@ -63,5 +63,5 @@ class DebugCommand extends Command
@@ -397,7 +397,7 @@ index cec031127b..167f26d846 100644
      {
          $this
 diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
-index 05f6319b39..7f10935866 100644
+index fa8effc12a..deced50a90 100644
 --- a/src/Symfony/Bridge/Twig/Command/LintCommand.php
 +++ b/src/Symfony/Bridge/Twig/Command/LintCommand.php
 @@ -52,5 +52,5 @@ class LintCommand extends Command
@@ -670,17 +670,17 @@ index bda9ca9515..c0d1f91339 100644
      {
          if (!$container->hasParameter('workflow.has_guard_listeners')) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-index e2223da1ab..986e3e7922 100644
+index 716d648454..25be4a48a9 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-@@ -283,5 +283,5 @@ class FrameworkExtension extends Extension
+@@ -205,5 +205,5 @@ class FrameworkExtension extends Extension
       * @throws LogicException
       */
 -    public function load(array $configs, ContainerBuilder $container)
 +    public function load(array $configs, ContainerBuilder $container): void
      {
          $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
-@@ -2856,5 +2856,5 @@ class FrameworkExtension extends Extension
+@@ -2784,5 +2784,5 @@ class FrameworkExtension extends Extension
       * @return void
       */
 -    public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)
@@ -1060,10 +1060,10 @@ index 5077c6768d..bd741840f4 100644
      {
          return $this->logoutListener;
 diff --git a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
-index bf30dafbee..47fe692328 100644
+index 2cbca705f9..42cfdb0ff0 100644
 --- a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
 +++ b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
-@@ -57,5 +57,5 @@ class SecurityBundle extends Bundle
+@@ -60,5 +60,5 @@ class SecurityBundle extends Bundle
       * @return void
       */
 -    public function build(ContainerBuilder $container)
@@ -1195,7 +1195,7 @@ index cffea43c49..0645fbd756 100644
      {
          $this->packages[$name] = $package;
 diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
-index bf5ff90e5d..fe656cac5c 100644
+index e95ec5b821..3346019e13 100644
 --- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 +++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 @@ -64,5 +64,5 @@ abstract class AbstractBrowser
@@ -1240,35 +1240,35 @@ index bf5ff90e5d..fe656cac5c 100644
 +    public function setServerParameter(string $key, string $value): void
      {
          $this->server[$key] = $value;
-@@ -433,5 +433,5 @@ abstract class AbstractBrowser
+@@ -438,5 +438,5 @@ abstract class AbstractBrowser
       * @throws \RuntimeException When processing returns exit code
       */
 -    protected function doRequestInProcess(object $request)
 +    protected function doRequestInProcess(object $request): object
      {
          $deprecationsFile = tempnam(sys_get_temp_dir(), 'deprec');
-@@ -466,5 +466,5 @@ abstract class AbstractBrowser
+@@ -471,5 +471,5 @@ abstract class AbstractBrowser
       * @return object
       */
 -    abstract protected function doRequest(object $request);
 +    abstract protected function doRequest(object $request): object;
  
      /**
-@@ -485,5 +485,5 @@ abstract class AbstractBrowser
+@@ -490,5 +490,5 @@ abstract class AbstractBrowser
       * @return object
       */
 -    protected function filterRequest(Request $request)
 +    protected function filterRequest(Request $request): object
      {
          return $request;
-@@ -495,5 +495,5 @@ abstract class AbstractBrowser
+@@ -500,5 +500,5 @@ abstract class AbstractBrowser
       * @return Response
       */
 -    protected function filterResponse(object $response)
 +    protected function filterResponse(object $response): Response
      {
          return $response;
-@@ -620,5 +620,5 @@ abstract class AbstractBrowser
+@@ -625,5 +625,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function restart()
@@ -5442,7 +5442,7 @@ index 40c0604ea4..34f7f441f2 100644
      {
          $this->lists = [];
 diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
-index 5e4635870a..439bf4528d 100644
+index 4a142e2965..dd99014998 100644
 --- a/src/Symfony/Component/Form/Command/DebugCommand.php
 +++ b/src/Symfony/Component/Form/Command/DebugCommand.php
 @@ -58,5 +58,5 @@ class DebugCommand extends Command
@@ -5675,7 +5675,7 @@ index 291ede93ef..a4128a3880 100644
      {
          $emptyData = static fn (FormInterface $form, $viewData) => $viewData;
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
-index 05ef3b9656..1db0ce9039 100644
+index 5e5997ddf9..6ea20c57ab 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
 @@ -63,5 +63,5 @@ class ChoiceType extends AbstractType
@@ -5692,14 +5692,14 @@ index 05ef3b9656..1db0ce9039 100644
 +    public function buildView(FormView $view, FormInterface $form, array $options): void
      {
          $choiceTranslationDomain = $options['choice_translation_domain'];
-@@ -268,5 +268,5 @@ class ChoiceType extends AbstractType
+@@ -270,5 +270,5 @@ class ChoiceType extends AbstractType
      }
  
 -    public function finishView(FormView $view, FormInterface $form, array $options)
 +    public function finishView(FormView $view, FormInterface $form, array $options): void
      {
          if ($options['expanded']) {
-@@ -285,5 +285,5 @@ class ChoiceType extends AbstractType
+@@ -287,5 +287,5 @@ class ChoiceType extends AbstractType
      }
  
 -    public function configureOptions(OptionsResolver $resolver)
@@ -10958,7 +10958,7 @@ index bd9d98c65b..b12f3bbf51 100644
      {
          $this->options = array_merge($this->defaultOptions, $options);
 diff --git a/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php
-index e88a04056e..07493c5f20 100644
+index c925e00050..95d5bd4321 100644
 --- a/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php
 +++ b/src/Symfony/Component/Security/Http/Authenticator/AccessTokenAuthenticator.php
 @@ -99,5 +99,5 @@ class AccessTokenAuthenticator implements AuthenticatorInterface
@@ -11369,10 +11369,10 @@ index 4edb70096d..8c844785db 100644
  
      /**
 diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
-index d92394834d..ede25327c9 100644
+index 063d34ea59..fb10337d35 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
-@@ -145,5 +145,5 @@ class GetSetMethodNormalizer extends AbstractObjectNormalizer
+@@ -147,5 +147,5 @@ class GetSetMethodNormalizer extends AbstractObjectNormalizer
       * @return void
       */
 -    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
@@ -11409,10 +11409,10 @@ index 40779de316..105cf99b06 100644
  
      /**
 diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
-index dc5067dfb6..ae217b2071 100644
+index f4e50841e9..638dbdbff7 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
-@@ -143,5 +143,5 @@ class ObjectNormalizer extends AbstractObjectNormalizer
+@@ -145,5 +145,5
B41A
 @@ class ObjectNormalizer extends AbstractObjectNormalizer
       * @return void
       */
 -    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
@@ -11420,10 +11420,10 @@ index dc5067dfb6..ae217b2071 100644
      {
          try {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
-index 56e5ebf740..78bfacef61 100644
+index ec12db9bb2..d3b7f036a8 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
-@@ -185,5 +185,5 @@ class PropertyNormalizer extends AbstractObjectNormalizer
+@@ -187,5 +187,5 @@ class PropertyNormalizer extends AbstractObjectNormalizer
       * @return void
       */
 -    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
@@ -11658,7 +11658,7 @@ index 2c0ec722ee..ff3a7c7c85 100644
      {
          $this->messages[$domain] = [
 diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
-index 73ddae5dcc..f327362d39 100644
+index 91001c5644..cfeb6c1fdc 100644
 --- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php
 +++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
 @@ -54,5 +54,5 @@ class XliffLintCommand extends Command
@@ -12071,31 +12071,31 @@ index fe7da2e8f7..61d3632e2a 100644
 +    public function validate(mixed $value, Constraint $constraint): void;
  }
 diff --git a/src/Symfony/Component/Validator/ConstraintViolationList.php b/src/Symfony/Component/Validator/ConstraintViolationList.php
-index 0b98624509..4367f247fc 100644
+index 88f90a0cdb..fd6deb6eb1 100644
 --- a/src/Symfony/Component/Validator/ConstraintViolationList.php
 +++ b/src/Symfony/Component/Validator/ConstraintViolationList.php
-@@ -60,5 +60,5 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
+@@ -62,5 +62,5 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
       * @return void
       */
 -    public function add(ConstraintViolationInterface $violation)
 +    public function add(ConstraintViolationInterface $violation): void
      {
          $this->violations[] = $violation;
-@@ -68,5 +68,5 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
+@@ -70,5 +70,5 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
       * @return void
       */
 -    public function addAll(ConstraintViolationListInterface $otherList)
 +    public function addAll(ConstraintViolationListInterface $otherList): void
      {
          foreach ($otherList as $violation) {
-@@ -92,5 +92,5 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
+@@ -94,5 +94,5 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
       * @return void
       */
 -    public function set(int $offset, ConstraintViolationInterface $violation)
 +    public function set(int $offset, ConstraintViolationInterface $violation): void
      {
          $this->violations[$offset] = $violation;
-@@ -100,5 +100,5 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
+@@ -102,5 +102,5 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
       * @return void
       */
 -    public function remove(int $offset)
@@ -12103,31 +12103,31 @@ index 0b98624509..4367f247fc 100644
      {
          unset($this->violations[$offset]);
 diff --git a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
-index c6d2f0c306..a3a61916bb 100644
+index 1fdbf0bc3f..aad702453b 100644
 --- a/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
 +++ b/src/Symfony/Component/Validator/ConstraintViolationListInterface.php
-@@ -29,5 +29,5 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
+@@ -31,5 +31,5 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
       * @return void
       */
 -    public function add(ConstraintViolationInterface $violation);
 +    public function add(ConstraintViolationInterface $violation): void;
  
      /**
-@@ -36,5 +36,5 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
+@@ -38,5 +38,5 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
       * @return void
       */
 -    public function addAll(self $otherList);
 +    public function addAll(self $otherList): void;
  
      /**
-@@ -61,5 +61,5 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
+@@ -63,5 +63,5 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
       * @return void
       */
 -    public function set(int $offset, ConstraintViolationInterface $violation);
 +    public function set(int $offset, ConstraintViolationInterface $violation): void;
  
      /**
-@@ -70,4 +70,4 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
+@@ -72,4 +72,4 @@ interface ConstraintViolationListInterface extends \Traversable, \Countable, \Ar
       * @return void
       */
 -    public function remove(int $offset);
@@ -14084,7 +14084,7 @@ index c13c2814c3..782521afe1 100644
      {
          // Make sure all transitions for one place has unique name.
 diff --git a/src/Symfony/Component/Yaml/Command/LintCommand.php b/src/Symfony/Component/Yaml/Command/LintCommand.php
-index de11d48d0f..0d5590965f 100644
+index 95352ac174..df34364002 100644
 --- a/src/Symfony/Component/Yaml/Command/LintCommand.php
 +++ b/src/Symfony/Component/Yaml/Command/LintCommand.php
 @@ -54,5 +54,5 @@ class LintCommand extends Command

From e93b743ea726f525d068ca9a4d6b5cf96ef6d4aa Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 14 Apr 2023 11:08:15 +0200
Subject: [PATCH 395/475] Fix composer.json

---
 .github/workflows/unit-tests.yml | 2 +-
 composer.json                    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index dfdb38198ef0a..45a52e22cf3e0 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -141,7 +141,7 @@ jobs:
         run: |
           patch -sp1 < .github/expected-missing-return-types.diff
           git add .
-          composer install -q --optimize-autoloader
+          composer install -q --optimize-autoloader || composer install --optimize-autoloader
           SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php
           git checkout src/Symfony/Contracts/Service/ResetInterface.php
           SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php # ensure the script is idempotent
diff --git a/composer.json b/composer.json
index 3368c7d767858..25b14db4bc587 100644
--- a/composer.json
+++ b/composer.json
@@ -150,7 +150,6 @@
         "symfony/phpunit-bridge": "^5.4|^6.0",
         "symfony/runtime": "self.version",
         "symfony/security-acl": "~2.8|~3.0",
-        "symfony/string": "^5.4|^6.0",
         "twig/cssinliner-extra": "^2.12|^3",
         "twig/inky-extra": "^2.12|^3",
         "twig/markdown-extra": "^2.12|^3",

From d9f2365bb0b6986af06aa442e333273f955bf969 Mon Sep 17 00:00:00 2001
From: "alexandre.lassauge" <alexandre.lassauge@sensiolabs.com>
Date: Thu, 13 Apr 2023 13:52:27 +0200
Subject: [PATCH 396/475] [Serializer] Add missing return types

---
 .github/expected-missing-return-types.diff    | 105 +++++++-----------
 .../Serializer/Mapping/AttributeMetadata.php  |  25 +----
 .../Mapping/AttributeMetadataInterface.php    |  10 +-
 .../Serializer/Mapping/ClassMetadata.php      |  15 +--
 .../Mapping/ClassMetadataInterface.php        |   6 +-
 .../Normalizer/DenormalizerAwareInterface.php |   2 +
 .../Normalizer/NormalizerAwareInterface.php   |   2 +
 .../Serializer/SerializerAwareInterface.php   |   2 +
 8 files changed, 63 insertions(+), 104 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index c1888054786ce..4dedc93f7d598 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -11211,70 +11211,6 @@ index b684fddb2f..ade2242791 100644
 +    public function getData(): mixed
      {
          return $this->data;
-diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
-index aeee5ac680..4ac78f5458 100644
---- a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
-+++ b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
-@@ -98,5 +98,5 @@ class AttributeMetadata implements AttributeMetadataInterface
-      * @return void
-      */
--    public function addGroup(string $group)
-+    public function addGroup(string $group): void
-     {
-         if (!\in_array($group, $this->groups)) {
-@@ -113,5 +113,5 @@ class AttributeMetadata implements AttributeMetadataInterface
-      * @return void
-      */
--    public function setMaxDepth(?int $maxDepth)
-+    public function setMaxDepth(?int $maxDepth): void
-     {
-         $this->maxDepth = $maxDepth;
-@@ -126,5 +126,5 @@ class AttributeMetadata implements AttributeMetadataInterface
-      * @return void
-      */
--    public function setSerializedName(string $serializedName = null)
-+    public function setSerializedName(string $serializedName = null): void
-     {
-         if (1 > \func_num_args()) {
-@@ -153,5 +153,5 @@ class AttributeMetadata implements AttributeMetadataInterface
-      * @return void
-      */
--    public function setIgnore(bool $ignore)
-+    public function setIgnore(bool $ignore): void
-     {
-         $this->ignore = $ignore;
-@@ -218,5 +218,5 @@ class AttributeMetadata implements AttributeMetadataInterface
-      * @return void
-      */
--    public function merge(AttributeMetadataInterface $attributeMetadata)
-+    public function merge(AttributeMetadataInterface $attributeMetadata): void
-     {
-         foreach ($attributeMetadata->getGroups() as $group) {
-diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
-index fc6336ebdb..e13a834930 100644
---- a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
-+++ b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
-@@ -64,5 +64,5 @@ class ClassMetadata implements ClassMetadataInterface
-      * @return void
-      */
--    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata)
-+    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata): void
-     {
-         $this->attributesMetadata[$attributeMetadata->getName()] = $attributeMetadata;
-@@ -77,5 +77,5 @@ class ClassMetadata implements ClassMetadataInterface
-      * @return void
-      */
--    public function merge(ClassMetadataInterface $classMetadata)
-+    public function merge(ClassMetadataInterface $classMetadata): void
-     {
-         foreach ($classMetadata->getAttributesMetadata() as $attributeMetadata) {
-@@ -105,5 +105,5 @@ class ClassMetadata implements ClassMetadataInterface
-      * @return void
-      */
--    public function setClassDiscriminatorMapping(ClassDiscriminatorMapping $mapping = null)
-+    public function setClassDiscriminatorMapping(ClassDiscriminatorMapping $mapping = null): void
-     {
-         if (1 > \func_num_args()) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 index 58deea9f01..8fe0385cdc 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -11350,6 +11286,16 @@ index 20f15becb2..b378cd8c38 100644
 +    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
      {
          if (!isset($context['cache_key'])) {
+diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php
+index 48e8c3fb54..a71c3ea476 100644
+--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php
++++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php
+@@ -22,4 +22,4 @@ interface DenormalizerAwareInterface
+      * @return void
+      */
+-    public function setDenormalizer(DenormalizerInterface $denormalizer);
++    public function setDenormalizer(DenormalizerInterface $denormalizer): void;
+ }
 diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
 index 4edb70096d..8c844785db 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
@@ -11379,6 +11325,16 @@ index 063d34ea59..fb10337d35 100644
 +    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = []): void
      {
          $setter = 'set'.ucfirst($attribute);
+diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareInterface.php
+index 5f3deaa018..99de716dfb 100644
+--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareInterface.php
++++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareInterface.php
+@@ -22,4 +22,4 @@ interface NormalizerAwareInterface
+      * @return void
+      */
+-    public function setNormalizer(NormalizerInterface $normalizer);
++    public function setNormalizer(NormalizerInterface $normalizer): void;
+ }
 diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareTrait.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareTrait.php
 index 40a4fa0e8c..a1e2749aae 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareTrait.php
@@ -11430,6 +11386,16 @@ index ec12db9bb2..d3b7f036a8 100644
 +    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = []): void
      {
          try {
+diff --git a/src/Symfony/Component/Serializer/SerializerAwareInterface.php b/src/Symfony/Component/Serializer/SerializerAwareInterface.php
+index 4919436d94..24ff404aa4 100644
+--- a/src/Symfony/Component/Serializer/SerializerAwareInterface.php
++++ b/src/Symfony/Component/Serializer/SerializerAwareInterface.php
+@@ -22,4 +22,4 @@ interface SerializerAwareInterface
+      * @return void
+      */
+-    public function setSerializer(SerializerInterface $serializer);
++    public function setSerializer(SerializerInterface $serializer): void;
+ }
 diff --git a/src/Symfony/Component/Serializer/SerializerAwareTrait.php b/src/Symfony/Component/Serializer/SerializerAwareTrait.php
 index 1835568745..2b98fc11d6 100644
 --- a/src/Symfony/Component/Serializer/SerializerAwareTrait.php
@@ -11438,6 +11404,17 @@ index 1835568745..2b98fc11d6 100644
       * @return void
       */
 -    public function setSerializer(SerializerInterface $serializer)
++    public function setSerializer(SerializerInterface $serializer): void
+     {
+         $this->serializer = $serializer;
+diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
+index c32425b99e..ea8c3ba06e 100644
+--- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
++++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
+@@ -871,5 +871,5 @@ class ArrayDenormalizerDummy implements DenormalizerInterface, SerializerAwareIn
+     }
+ 
+-    public function setSerializer(SerializerInterface $serializer)
 +    public function setSerializer(SerializerInterface $serializer): void
      {
          $this->serializer = $serializer;
diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
index aeee5ac68053d..cb77b53d24286 100644
--- a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
+++ b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
@@ -94,10 +94,7 @@ public function getName(): string
         return $this->name;
     }
 
-    /**
-     * @return void
-     */
-    public function addGroup(string $group)
+    public function addGroup(string $group): void
     {
         if (!\in_array($group, $this->groups)) {
             $this->groups[] = $group;
@@ -109,10 +106,7 @@ public function getGroups(): array
         return $this->groups;
     }
 
-    /**
-     * @return void
-     */
-    public function setMaxDepth(?int $maxDepth)
+    public function setMaxDepth(?int $maxDepth): void
     {
         $this->maxDepth = $maxDepth;
     }
@@ -122,10 +116,7 @@ public function getMaxDepth(): ?int
         return $this->maxDepth;
     }
 
-    /**
-     * @return void
-     */
-    public function setSerializedName(string $serializedName = null)
+    public function setSerializedName(string $serializedName = null): void
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/serializer', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -149,10 +140,7 @@ public function getSerializedPath(): ?PropertyPath
         return $this->serializedPath;
     }
 
-    /**
-     * @return void
-     */
-    public function setIgnore(bool $ignore)
+    public function setIgnore(bool $ignore): void
     {
         $this->ignore = $ignore;
     }
@@ -214,10 +202,7 @@ public function setDenormalizationContextForGroups(array $context, array $groups
         }
     }
 
-    /**
-     * @return void
-     */
-    public function merge(AttributeMetadataInterface $attributeMetadata)
+    public function merge(AttributeMetadataInterface $attributeMetadata): void
     {
         foreach ($attributeMetadata->getGroups() as $group) {
             $this->addGroup($group);
diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php
index 67ca8d3c0631c..9d430602c50a0 100644
--- a/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php
+++ b/src/Symfony/Component/Serializer/Mapping/AttributeMetadataInterface.php
@@ -32,7 +32,7 @@ public function getName(): string;
     /**
      * Adds this attribute to the given group.
      */
-    public function addGroup(string $group);
+    public function addGroup(string $group): void;
 
     /**
      * Gets groups of this attribute.
@@ -44,7 +44,7 @@ public function getGroups(): array;
     /**
      * Sets the serialization max depth for this attribute.
      */
-    public function setMaxDepth(?int $maxDepth);
+    public function setMaxDepth(?int $maxDepth): void;
 
     /**
      * Gets the serialization max depth for this attribute.
@@ -54,7 +54,7 @@ public function getMaxDepth(): ?int;
     /**
      * Sets the serialization name for this attribute.
      */
-    public function setSerializedName(?string $serializedName);
+    public function setSerializedName(?string $serializedName): void;
 
     /**
      * Gets the serialization name for this attribute.
@@ -68,7 +68,7 @@ public function getSerializedPath(): ?PropertyPath;
     /**
      * Sets if this attribute must be ignored or not.
      */
-    public function setIgnore(bool $ignore);
+    public function setIgnore(bool $ignore): void;
 
     /**
      * Gets if this attribute is ignored or not.
@@ -78,7 +78,7 @@ public function isIgnored(): bool;
     /**
      * Merges an {@see AttributeMetadataInterface} with in the current one.
      */
-    public function merge(self $attributeMetadata);
+    public function merge(self $attributeMetadata): void;
 
     /**
      * Gets all the normalization contexts per group ("*" being the base context applied to all groups).
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
index fc6336ebdbab7..4a70ee0858b91 100644
--- a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
+++ b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
@@ -60,10 +60,7 @@ public function getName(): string
         return $this->name;
     }
 
-    /**
-     * @return void
-     */
-    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata)
+    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata): void
     {
         $this->attributesMetadata[$attributeMetadata->getName()] = $attributeMetadata;
     }
@@ -73,10 +70,7 @@ public function getAttributesMetadata(): array
         return $this->attributesMetadata;
     }
 
-    /**
-     * @return void
-     */
-    public function merge(ClassMetadataInterface $classMetadata)
+    public function merge(ClassMetadataInterface $classMetadata): void
     {
         foreach ($classMetadata->getAttributesMetadata() as $attributeMetadata) {
             if (isset($this->attributesMetadata[$attributeMetadata->getName()])) {
@@ -101,10 +95,7 @@ public function getClassDiscriminatorMapping(): ?ClassDiscriminatorMapping
         return $this->classDiscriminatorMapping;
     }
 
-    /**
-     * @return void
-     */
-    public function setClassDiscriminatorMapping(ClassDiscriminatorMapping $mapping = null)
+    public function setClassDiscriminatorMapping(ClassDiscriminatorMapping $mapping = null): void
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/serializer', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php
index 14ab4bb417347..b19cb1a462068 100644
--- a/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php
+++ b/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php
@@ -32,7 +32,7 @@ public function getName(): string;
     /**
      * Adds an {@link AttributeMetadataInterface}.
      */
-    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata);
+    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata): void;
 
     /**
      * Gets the list of {@link AttributeMetadataInterface}.
@@ -44,7 +44,7 @@ public function getAttributesMetadata(): array;
     /**
      * Merges a {@link ClassMetadataInterface} in the current one.
      */
-    public function merge(self $classMetadata);
+    public function merge(self $classMetadata): void;
 
     /**
      * Returns a {@link \ReflectionClass} instance for this class.
@@ -53,5 +53,5 @@ public function getReflectionClass(): \ReflectionClass;
 
     public function getClassDiscriminatorMapping(): ?ClassDiscriminatorMapping;
 
-    public function setClassDiscriminatorMapping(?ClassDiscriminatorMapping $mapping);
+    public function setClassDiscriminatorMapping(?ClassDiscriminatorMapping $mapping): void;
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php
index f88df1bec6827..48e8c3fb542ed 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php
@@ -18,6 +18,8 @@ interface DenormalizerAwareInterface
 {
     /**
      * Sets the owning Denormalizer object.
+     *
+     * @return void
      */
     public function setDenormalizer(DenormalizerInterface $denormalizer);
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareInterface.php
index 08865a3f1e395..5f3deaa018e84 100644
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareInterface.php
@@ -18,6 +18,8 @@ interface NormalizerAwareInterface
 {
     /**
      * Sets the owning Normalizer object.
+     *
+     * @return void
      */
     public function setNormalizer(NormalizerInterface $normalizer);
 }
diff --git a/src/Symfony/Component/Serializer/SerializerAwareInterface.php b/src/Symfony/Component/Serializer/SerializerAwareInterface.php
index 4811fc9667d5f..4919436d94362 100644
--- a/src/Symfony/Component/Serializer/SerializerAwareInterface.php
+++ b/src/Symfony/Component/Serializer/SerializerAwareInterface.php
@@ -18,6 +18,8 @@ interface SerializerAwareInterface
 {
     /**
      * Sets the owning Serializer object.
+     *
+     * @return void
      */
     public function setSerializer(SerializerInterface $serializer);
 }

From d987093a538c70fc4a2d01b046913a2820341699 Mon Sep 17 00:00:00 2001
From: Konstantin Myakshin <molodchick@gmail.com>
Date: Sat, 28 Jan 2023 11:37:55 +0200
Subject: [PATCH 397/475] [HttpKernel] Create Attributes `#[MapRequestPayload]`
 and `#[MapQueryString]` to map Request input to typed objects

---
 .../Compiler/UnusedTagsPass.php               |   1 +
 .../FrameworkExtension.php                    |  11 +-
 .../FrameworkBundle/Resources/config/web.php  |   8 +
 .../Tests/Functional/ApiAttributesTest.php    | 416 ++++++++++++++++++
 .../app/ApiAttributesTest/bundles.php         |  16 +
 .../app/ApiAttributesTest/config.yml          |   8 +
 .../app/ApiAttributesTest/routing.yml         |   7 +
 .../Bundle/FrameworkBundle/composer.json      |   4 +-
 .../HttpKernel/Attribute/MapQueryString.php   |  30 ++
 .../Attribute/MapRequestPayload.php           |  30 ++
 src/Symfony/Component/HttpKernel/CHANGELOG.md |   2 +
 .../RequestPayloadValueResolver.php           | 127 ++++++
 .../RequestPayloadValueResolverTest.php       | 167 +++++++
 .../Component/HttpKernel/composer.json        |   5 +-
 src/Symfony/Component/Serializer/CHANGELOG.md |   1 +
 .../Exception/UnsupportedFormatException.php  |  19 +
 .../Component/Serializer/Serializer.php       |   6 +-
 17 files changed, 851 insertions(+), 7 deletions(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ApiAttributesTest.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ApiAttributesTest/bundles.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ApiAttributesTest/config.yml
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ApiAttributesTest/routing.yml
 create mode 100644 src/Symfony/Component/HttpKernel/Attribute/MapQueryString.php
 create mode 100644 src/Symfony/Component/HttpKernel/Attribute/MapRequestPayload.php
 create mode 100644 src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
 create mode 100644 src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
 create mode 100644 src/Symfony/Component/Serializer/Exception/UnsupportedFormatException.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
index 7fa0fb289005a..9da5b91bb3bb0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -46,6 +46,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'container.stack',
         'controller.argument_value_resolver',
         'controller.service_arguments',
+        'controller.targeted_value_resolver',
         'data_collector',
         'event_dispatcher.dispatcher',
         'form.type',
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 716d648454435..db536027e86c6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -157,6 +157,7 @@
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\ProblemNormalizer;
 use Symfony\Component\Serializer\Normalizer\UnwrappingDenormalizer;
+use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\SerializerAwareInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\String\LazyString;
@@ -357,11 +358,19 @@ public function load(array $configs, ContainerBuilder $container)
         $container->getDefinition('exception_listener')->replaceArgument(3, $config['exceptions']);
 
         if ($this->readConfigEnabled('serializer', $container, $config['serializer'])) {
-            if (!class_exists(\Symfony\Component\Serializer\Serializer::class)) {
+            if (!class_exists(Serializer::class)) {
                 throw new LogicException('Serializer support cannot be enabled as the Serializer component is not installed. Try running "composer require symfony/serializer-pack".');
             }
 
             $this->registerSerializerConfiguration($config['serializer'], $container, $loader);
+        } else {
+            $container->register('.argument_resolver.request_payload.no_serializer', Serializer::class)
+                ->addError('You can neither use "#[MapRequestPayload]" nor "#[MapQueryString]" since the Serializer component is not '
+                    .(class_exists(Serializer::class) ? 'enabled. Try setting "framework.serializer" to true.' : 'installed. Try running "composer require symfony/serializer-pack".')
+                );
+
+            $container->getDefinition('argument_resolver.request_payload')
+                ->replaceArgument(0, new Reference('.argument_resolver.request_payload.no_serializer', ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE));
         }
 
         if ($propertyInfoEnabled) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
index 8c6b5a9ba966d..1a41a60fe1ddd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
@@ -17,6 +17,7 @@
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DateTimeValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestPayloadValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\ServiceValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\SessionValueResolver;
@@ -61,6 +62,13 @@
             ])
             ->tag('controller.argument_value_resolver', ['priority' => 100, 'name' => DateTimeValueResolver::class])
 
+        ->set('argument_resolver.request_payload', RequestPayloadValueResolver::class)
+            ->args([
+                service('serializer'),
+                service('validator')->nullOnInvalid(),
+            ])
+            ->tag('controller.targeted_value_resolver', ['name' => RequestPayloadValueResolver::class])
+
         ->set('argument_resolver.request_attribute', RequestAttributeValueResolver::class)
             ->tag('controller.argument_value_resolver', ['priority' => 100, 'name' => RequestAttributeValueResolver::class])
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ApiAttributesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ApiAttributesTest.php
new file mode 100644
index 0000000000000..207edcf7aa707
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ApiAttributesTest.php
@@ -0,0 +1,416 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Attribute\MapQueryString;
+use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;
+use Symfony\Component\Validator\Constraints as Assert;
+
+class ApiAttributesTest extends AbstractWebTestCase
+{
+    /**
+     * @dataProvider mapQueryStringProvider
+     */
+    public function testMapQueryString(array $query, string $expectedResponse, int $expectedStatusCode)
+    {
+        $client = self::createClient(['test_case' => 'ApiAttributesTest']);
+
+        $client->request('GET', '/map-query-string.json', $query);
+
+        $response = $client->getResponse();
+        if ($expectedResponse) {
+            self::assertJsonStringEqualsJsonString($expectedResponse, $response->getContent());
+        } else {
+            self::assertEmpty($response->getContent());
+        }
+        self::assertSame($expectedStatusCode, $response->getStatusCode());
+    }
+
+    public static function mapQueryStringProvider(): iterable
+    {
+        yield 'empty' => [
+            'query' => [],
+            'expectedResponse' => '',
+            'expectedStatusCode' => 204,
+        ];
+
+        yield 'valid' => [
+            'query' => ['filter' => ['status' => 'approved', 'quantity' => '4']],
+            'expectedResponse' => <<<'JSON'
+                {
+                    "filter": {
+                        "status": "approved",
+                        "quantity": 4
+                    }
+                }
+                JSON,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'invalid' => [
+            'query' => ['filter' => ['status' => 'approved', 'quantity' => '200']],
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 404,
+                    "detail": "filter.quantity: This value should be less than 10.",
+                    "violations": [
+                        {
+                            "propertyPath": "filter.quantity",
+                            "title": "This value should be less than 10.",
+                            "template": "This value should be less than {{ compared_value }}.",
+                            "parameters": {
+                                "{{ value }}": "200",
+                                "{{ compared_value }}": "10",
+                                "{{ compared_value_type }}": "int"
+                            },
+                            "type": "urn:uuid:079d7420-2d13-460c-8756-de810eeb37d2"
+                        }
+                    ]
+                }
+                JSON,
+            'expectedStatusCode' => 404,
+        ];
+    }
+
+    /**
+     * @dataProvider mapRequestPayloadProvider
+     */
+    public function testMapRequestPayload(string $format, array $parameters, ?string $content, string $expectedResponse, int $expectedStatusCode)
+    {
+        $client = self::createClient(['test_case' => 'ApiAttributesTest']);
+
+        [$acceptHeader, $assertion] = [
+            'html' => ['text/html', self::assertStringContainsString(...)],
+            'json' => ['application/json', self::assertJsonStringEqualsJsonString(...)],
+            'xml' => ['text/xml', self::assertXmlStringEqualsXmlString(...)],
+            'dummy' => ['application/dummy', self::assertStringContainsString(...)],
+        ][$format];
+
+        $client->request(
+            'POST',
+            '/map-request-body.'.$format,
+            $parameters,
+            [],
+            ['HTTP_ACCEPT' => $acceptHeader, 'CONTENT_TYPE' => $acceptHeader],
+            $content
+        );
+
+        $response = $client->getResponse();
+        $responseContent = $response->getContent();
+
+        if ($expectedResponse) {
+            $assertion($expectedResponse, $responseContent);
+        } else {
+            self::assertSame('', $responseContent);
+        }
+
+        self::assertSame($expectedStatusCode, $response->getStatusCode());
+    }
+
+    public static function mapRequestPayloadProvider(): iterable
+    {
+        yield 'empty' => [
+            'format' => 'json',
+            'parameters' => [],
+            'content' => '',
+            'expectedResponse' => '',
+            'expectedStatusCode' => 204,
+        ];
+
+        yield 'valid json' => [
+            'format' => 'json',
+            'parameters' => [],
+            'content' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false
+                }
+                JSON,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false
+                }
+                JSON,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'malformed json' => [
+            'format' => 'json',
+            'parameters' => [],
+            'content' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false,
+                }
+                JSON,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/tools.ietf.org\/html\/rfc2616#section-10",
+                    "title": "An error occurred",
+                    "status": 400,
+                    "detail": "Bad Request"
+                }
+                JSON,
+            'expectedStatusCode' => 400,
+        ];
+
+        yield 'unsupported format' => [
+            'format' => 'dummy',
+            'parameters' => [],
+            'content' => 'Hello',
+            'expectedResponse' => '415 Unsupported Media Type',
+            'expectedStatusCode' => 415,
+        ];
+
+        yield 'valid xml' => [
+            'format' => 'xml',
+            'parameters' => [],
+            'content' => <<<'XML'
+                <request>
+                    <comment>Hello everyone!</comment>
+                    <approved>true</approved>
+                </request>
+                XML,
+            'expectedResponse' => <<<'XML'
+                <response>
+                    <comment>Hello everyone!</comment>
+                    <approved>1</approved>
+                </response>
+                XML,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'invalid type' => [
+            'format' => 'json',
+            'parameters' => [],
+            'content' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": "string instead of bool"
+                }
+                JSON,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 422,
+                    "detail": "approved: This value should be of type bool.",
+                    "violations": [
+                        {
+                            "propertyPath": "approved",
+                            "title": "This value should be of type bool.",
+                            "template": "This value should be of type {{ type }}.",
+                            "parameters": {
+                                "{{ type }}": "bool"
+                            }
+                        }
+                    ]
+                }
+                JSON,
+            'expectedStatusCode' => 422,
+        ];
+
+        yield 'validation error json' => [
+            'format' => 'json',
+            'parameters' => [],
+            'content' => <<<'JSON'
+                {
+                    "comment": "",
+                    "approved": true
+                }
+                JSON,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 422,
+                    "detail": "comment: This value should not be blank.\ncomment: This value is too short. It should have 10 characters or more.",
+                    "violations": [
+                        {
+                            "propertyPath": "comment",
+                            "title": "This value should not be blank.",
+                            "template": "This value should not be blank.",
+                            "parameters": {
+                                "{{ value }}": "\"\""
+                            },
+                            "type": "urn:uuid:c1051bb4-d103-4f74-8988-acbcafc7fdc3"
+                        },
+                        {
+                            "propertyPath": "comment",
+                            "title": "This value is too short. It should have 10 characters or more.",
+                            "template": "This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.",
+                            "parameters": {
+                                "{{ value }}": "\"\"",
+                                "{{ limit }}": "10"
+                            },
+                            "type": "urn:uuid:9ff3fdc4-b214-49db-8718-39c315e33d45"
+                        }
+                    ]
+                }
+                JSON,
+            'expectedStatusCode' => 422,
+        ];
+
+        yield 'validation error xml' => [
+            'format' => 'xml',
+            'parameters' => [],
+            'content' => <<<'XML'
+                <request>
+                    <comment>H</comment>
+                    <approved>false</approved>
+                </request>
+                XML,
+            'expectedResponse' => <<<'XML'
+                <?xml version="1.0"?>
+                <response>
+                    <type>https://symfony.com/errors/validation</type>
+                    <title>Validation Failed</title>
+                    <status>422</status>
+                    <detail>comment: This value is too short. It should have 10 characters or more.</detail>
+                    <violations>
+                        <propertyPath>comment</propertyPath>
+                        <title>This value is too short. It should have 10 characters or more.</title>
+                        <template>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</template>
+                        <parameters>
+                            <item key="{{ value }}">"H"</item>
+                            <item key="{{ limit }}">10</item>
+                        </parameters>
+                        <type>urn:uuid:9ff3fdc4-b214-49db-8718-39c315e33d45</type>
+                    </violations>
+                </response>
+                XML,
+            'expectedStatusCode' => 422,
+        ];
+
+        yield 'valid input' => [
+            'format' => 'json',
+            'input' => ['comment' => 'Hello everyone!', 'approved' => '0'],
+            'content' => null,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false
+                }
+                JSON,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'validation error input' => [
+            'format' => 'json',
+            'input' => ['comment' => '', 'approved' => '1'],
+            'content' => null,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 422,
+                    "detail": "comment: This value should not be blank.\ncomment: This value is too short. It should have 10 characters or more.",
+                    "violations": [
+                        {
+                            "propertyPath": "comment",
+                            "title": "This value should not be blank.",
+                            "template": "This value should not be blank.",
+                            "parameters": {
+                                "{{ value }}": "\"\""
+                            },
+                            "type": "urn:uuid:c1051bb4-d103-4f74-8988-acbcafc7fdc3"
+                        },
+                        {
+                            "propertyPath": "comment",
+                            "title": "This value is too short. It should have 10 characters or more.",
+                            "template": "This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.",
+                            "parameters": {
+                                "{{ value }}": "\"\"",
+                                "{{ limit }}": "10"
F438

+                            },
+                            "type": "urn:uuid:9ff3fdc4-b214-49db-8718-39c315e33d45"
+                        }
+                    ]
+                }
+                JSON,
+            'expectedStatusCode' => 422,
+        ];
+    }
+}
+
+class WithMapQueryStringController
+{
+    public function __invoke(#[MapQueryString] ?QueryString $query): Response
+    {
+        if (!$query) {
+            return new Response('', Response::HTTP_NO_CONTENT);
+        }
+
+        return new JsonResponse(
+            ['filter' => ['status' => $query->filter->status, 'quantity' => $query->filter->quantity]],
+        );
+    }
+}
+
+class WithMapRequestPayloadController
+{
+    public function __invoke(#[MapRequestPayload] ?RequestBody $body, Request $request): Response
+    {
+        if ('json' === $request->getPreferredFormat('json')) {
+            if (!$body) {
+                return new Response('', Response::HTTP_NO_CONTENT);
+            }
+
+            return new JsonResponse(['comment' => $body->comment, 'approved' => $body->approved]);
+        }
+
+        return new Response(
+            <<<XML
+            <response>
+                <comment>{$body->comment}</comment>
+                <approved>{$body->approved}</approved>
+            </response>
+            XML
+        );
+    }
+}
+
+class QueryString
+{
+    public function __construct(
+        #[Assert\Valid]
+        public readonly Filter $filter,
+    ) {
+    }
+}
+
+class Filter
+{
+    public function __construct(
+        public readonly string $status,
+        #[Assert\LessThan(10)]
+        public readonly int $quantity,
+    ) {
+    }
+}
+
+class RequestBody
+{
+    public function __construct(
+        #[Assert\NotBlank]
+        #[Assert\Length(min: 10)]
+        public readonly string $comment,
+        public readonly bool $approved,
+    ) {
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ApiAttributesTest/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ApiAttributesTest/bundles.php
new file mode 100644
index 0000000000000..13ab9fddee4a6
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ApiAttributesTest/bundles.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+
+return [
+    new FrameworkBundle(),
+];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ApiAttributesTest/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ApiAttributesTest/config.yml
new file mode 100644
index 0000000000000..8b218d48cbb06
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ApiAttributesTest/config.yml
@@ -0,0 +1,8 @@
+imports:
+    - { resource: ../config/default.yml }
+
+framework:
+    serializer:
+        enabled: true
+    validation: true
+    property_info: { enabled: true }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ApiAttributesTest/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ApiAttributesTest/routing.yml
new file mode 100644
index 0000000000000..9ec40e1708c2b
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ApiAttributesTest/routing.yml
@@ -0,0 +1,7 @@
+map_query_string:
+    path: /map-query-string.{_format}
+    controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\WithMapQueryStringController
+
+map_request_body:
+    path: /map-request-body.{_format}
+    controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\WithMapRequestPayloadController
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 795e8bca67153..a7e31039452dc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -57,7 +57,7 @@
         "symfony/scheduler": "^6.3",
         "symfony/security-bundle": "^5.4|^6.0",
         "symfony/semaphore": "^5.4|^6.0",
-        "symfony/serializer": "^6.1",
+        "symfony/serializer": "^6.3",
         "symfony/stopwatch": "^5.4|^6.0",
         "symfony/string": "^5.4|^6.0",
         "symfony/translation": "^6.2.8",
@@ -90,7 +90,7 @@
         "symfony/mime": "<6.2",
         "symfony/property-info": "<5.4",
         "symfony/property-access": "<5.4",
-        "symfony/serializer": "<6.1",
+        "symfony/serializer": "<6.3",
         "symfony/security-csrf": "<5.4",
         "symfony/security-core": "<5.4",
         "symfony/stopwatch": "<5.4",
diff --git a/src/Symfony/Component/HttpKernel/Attribute/MapQueryString.php b/src/Symfony/Component/HttpKernel/Attribute/MapQueryString.php
new file mode 100644
index 0000000000000..411937a4f04fc
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Attribute/MapQueryString.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Attribute;
+
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestPayloadValueResolver;
+
+/**
+ * Controller parameter tag to map the query string of the request to typed object and validate it.
+ *
+ * @author Konstantin Myakshin <molodchick@gmail.com>
+ */
+#[\Attribute(\Attribute::TARGET_PARAMETER)]
+class MapQueryString extends ValueResolver
+{
+    public function __construct(
+        public readonly array $context = [],
+        string $resolver = RequestPayloadValueResolver::class,
+    ) {
+        parent::__construct($resolver);
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Attribute/MapRequestPayload.php b/src/Symfony/Component/HttpKernel/Attribute/MapRequestPayload.php
new file mode 100644
index 0000000000000..1fdb9d67db5d4
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Attribute/MapRequestPayload.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Attribute;
+
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestPayloadValueResolver;
+
+/**
+ * Controller parameter tag to map the request content to typed object and validate it.
+ *
+ * @author Konstantin Myakshin <molodchick@gmail.com>
+ */
+#[\Attribute(\Attribute::TARGET_PARAMETER)]
+class MapRequestPayload extends ValueResolver
+{
+    public function __construct(
+        public readonly array $context = [],
+        string $resolver = RequestPayloadValueResolver::class,
+    ) {
+        parent::__construct($resolver);
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index b3fbb240d4a65..22b0a0d52bd1c 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -11,6 +11,8 @@ CHANGELOG
  * Add `#[WithLogLevel]` for defining log levels for exceptions
  * Add `skip_response_headers` to the `HttpCache` options
  * Introduce targeted value resolvers with `#[ValueResolver]` and `#[AsTargetedValueResolver]`
+ * Add `#[MapRequestPayload]` to map and validate request payload from `Request::getContent()` or `Request::$request->all()` to typed objects
+ * Add `#[MapQueryString]` to map and validate request query string from `Request::$query->all()` to typed objects
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
new file mode 100644
index 0000000000000..d35b2c750420a
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
@@ -0,0 +1,127 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Attribute\MapQueryString;
+use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;
+use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\Serializer\Exception\NotEncodableValueException;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
+use Symfony\Component\Serializer\Exception\PartialDenormalizationException;
+use Symfony\Component\Serializer\Exception\UnsupportedFormatException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\ConstraintViolationInterface;
+use Symfony\Component\Validator\Exception\ValidationFailedException;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+/**
+ * @author Konstantin Myakshin <molodchick@gmail.com>
+ */
+final class RequestPayloadValueResolver implements ValueResolverInterface
+{
+    /**
+     * @see \Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer::DISABLE_TYPE_ENFORCEMENT
+     * @see DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS
+     */
+    private const CONTEXT_DENORMALIZE = [
+        'disable_type_enforcement' => true,
+        'collect_denormalization_errors' => true,
+    ];
+
+    /**
+     * @see DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS
+     */
+    private const CONTEXT_DESERIALIZE = [
+        'collect_denormalization_errors' => true,
+    ];
+
+    public function __construct(
+        private readonly SerializerInterface&DenormalizerInterface $serializer,
+        private readonly ?ValidatorInterface $validator,
+    ) {
+    }
+
+    public function resolve(Request $request, ArgumentMetadata $argument): iterable
+    {
+        $payloadMappers = [
+            MapQueryString::class => ['mapQueryString', Response::HTTP_NOT_FOUND],
+            MapRequestPayload::class => ['mapRequestPayload', Response::HTTP_UNPROCESSABLE_ENTITY],
+        ];
+
+        foreach ($payloadMappers as $mappingAttribute => [$payloadMapper, $validationFailedCode]) {
+            if (!$attributes = $argument->getAttributesOfType($mappingAttribute, ArgumentMetadata::IS_INSTANCEOF)) {
+                continue;
+            }
+
+            if (!$type = $argument->getType()) {
+                throw new \LogicException(sprintf('Could not resolve the "$%s" controller argument: argument should be typed.', $argument->getName()));
+            }
+
+            try {
+                $payload = $this->$payloadMapper($request, $type, $attributes[0]);
+            } catch (PartialDenormalizationException $e) {
+                throw new HttpException($validationFailedCode, implode("\n", array_map(static fn (NotNormalizableValueException $e) => $e->getMessage(), $e->getErrors())), $e);
+            }
+
+            if (null !== $payload && \count($violations = $this->validator?->validate($payload) ?? [])) {
+                throw new HttpException($validationFailedCode, implode("\n", array_map(static fn (ConstraintViolationInterface $e) => $e->getMessage(), iterator_to_array($violations))), new ValidationFailedException($payload, $violations));
+            }
+
+            if (null !== $payload || $argument->isNullable()) {
+                return [$payload];
+            }
+        }
+
+        return [];
+    }
+
+    private function mapQueryString(Request $request, string $type, MapQueryString $attribute): ?object
+    {
+        if (!$data = $request->query->all()) {
+            return null;
+        }
+
+        return $this->serializer->denormalize($data, $type, null, self::CONTEXT_DENORMALIZE + $attribute->context);
+    }
+
+    private function mapRequestPayload(Request $request, string $type, MapRequestPayload $attribute): ?object
+    {
+        if ($data = $request->request->all()) {
+            return $this->serializer->denormalize($data, $type, null, self::CONTEXT_DENORMALIZE + $attribute->context);
+        }
+
+        if ('' === $data = $request->getContent()) {
+            return null;
+        }
+
+        if (null === $format = $request->getContentTypeFormat()) {
+            throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, 'Unsupported format.');
+        }
+
+        if ('form' === $format) {
+            throw new HttpException(Response::HTTP_BAD_REQUEST, 'Request payload contains invalid "form" data.');
+        }
+
+        try {
+            return $this->serializer->deserialize($data, $type, $format, self::CONTEXT_DESERIALIZE + $attribute->context);
+        } catch (UnsupportedFormatException $e) {
+            throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, sprintf('Unsupported format: "%s".', $format), $e);
+        } catch (NotEncodableValueException $e) {
+            throw new HttpException(Response::HTTP_BAD_REQUEST, sprintf('Request payload contains invalid "%s" data.', $format), $e);
+        }
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
new file mode 100644
index 0000000000000..07da5cbe647d7
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
@@ -0,0 +1,167 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Attribute\MapQueryString;
+use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestPayloadValueResolver;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+use Symfony\Component\Serializer\Serializer;
+use Symfony\Component\Validator\ConstraintViolation;
+use Symfony\Component\Validator\ConstraintViolationList;
+use Symfony\Component\Validator\Exception\ValidationFailedException;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+class RequestPayloadValueResolverTest extends TestCase
+{
+    public function testNotTypedArgument()
+    {
+        $resolver = new RequestPayloadValueResolver(
+            new Serializer(),
+            $this->createMock(ValidatorInterface::class),
+        );
+
+        $argument = new ArgumentMetadata('notTyped', null, false, false, null, false, [
+            MapRequestPayload::class => new MapRequestPayload(),
+        ]);
+        $request = Request::create('/', 'POST', server: ['HTTP_CONTENT_TYPE' => 'application/json']);
+
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Could not resolve the "$notTyped" controller argument: argument should be typed.');
+
+        $resolver->resolve($request, $argument);
+    }
+
+    public function testValidationNotPassed()
+    {
+        $content = '{"price": 50}';
+        $payload = new RequestPayload(50);
+        $serializer = new Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()]);
+
+        $validator = $this->createMock(ValidatorInterface::class);
+        $validator->expects($this->once())
+            ->method('validate')
+            ->with($payload)
+            ->willReturn(new ConstraintViolationList([new ConstraintViolation('Test', null, [], '', null, '')]));
+
+        $resolver = new RequestPayloadValueResolver($serializer, $validator);
+
+        $argument = new ArgumentMetadata('invalid', RequestPayload::class, false, false, null, false, [
+            MapRequestPayload::class => new MapRequestPayload(),
+        ]);
+        $request = Request::create('/', 'POST', server: ['CONTENT_TYPE' => 'application/json'], content: $content);
+
+        try {
+            $resolver->resolve($request, $argument);
+            $this->fail(sprintf('Expected "%s" to be thrown.', HttpException::class));
+        } catch (HttpException $e) {
+            $this->assertInstanceOf(ValidationFailedException::class, $e->getPrevious());
+        }
+    }
+
+    public function testUnsupportedMedia()
+    {
+        $serializer = new Serializer();
+
+        $resolver = new RequestPayloadValueResolver($serializer, null);
+
+        $argument = new ArgumentMetadata('invalid', \stdClass::class, false, false, null, false, [
+            MapRequestPayload::class => new MapRequestPayload(),
+        ]);
+        $request = Request::create('/', 'POST', server: ['CONTENT_TYPE' => 'foo/bar'], content: 'foo-bar');
+
+        try {
+            $resolver->resolve($request, $argument);
+
+            $this->fail(sprintf('Expected "%s" to be thrown.', HttpException::class));
+        } catch (HttpException $e) {
+            $this->assertSame(415, $e->getStatusCode());
+        }
+    }
+
+    public function testRequestContentValidationPassed()
+    {
+        $content = '{"price": 50}';
+        $payload = new RequestPayload(50);
+        $serializer = new Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()]);
+
+        $validator = $this->createMock(ValidatorInterface::class);
+        $validator->expects($this->once())
+            ->method('validate')
+            ->willReturn(new ConstraintViolationList());
+
+        $resolver = new RequestPayloadValueResolver($serializer, $validator);
+
+        $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, false, [
+            MapRequestPayload::class => new MapRequestPayload(),
+        ]);
+        $request = Request::create('/', 'POST', server: ['CONTENT_TYPE' => 'application/json'], content: $content);
+
+        $this->assertEquals($payload, $resolver->resolve($request, $argument)[0]);
+    }
+
+    public function testQueryStringValidationPassed()
+    {
+        $payload = new RequestPayload(50);
+        $query = ['price' => '50'];
+
+        $serializer = new Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()]);
+
+        $validator = $this->createMock(ValidatorInterface::class);
+        $validator->expects($this->once())
+            ->method('validate')
+            ->willReturn(new ConstraintViolationList());
+
+        $resolver = new RequestPayloadValueResolver($serializer, $validator);
+
+        $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, false, [
+            MapQueryString::class => new MapQueryString(),
+        ]);
+        $request = Request::create('/', 'GET', $query);
+
+        $this->assertEquals($payload, $resolver->resolve($request, $argument)[0]);
+    }
+
+    public function testRequestInputValidationPassed()
+    {
+        $input = ['price' => '50'];
+        $payload = new RequestPayload(50);
+
+        $serializer = new Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()]);
+
+        $validator = $this->createMock(ValidatorInterface::class);
+        $validator->expects($this->once())
+            ->method('validate')
+            ->willReturn(new ConstraintViolationList());
+
+        $resolver = new RequestPayloadValueResolver($serializer, $validator);
+
+        $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, false, [
+            MapRequestPayload::class => new MapRequestPayload(),
+        ]);
+        $request = Request::create('/', 'POST', $input);
+
+        $this->assertEquals($payload, $resolver->resolve($request, $argument)[0]);
+    }
+}
+
+class RequestPayload
+{
+    public function __construct(public readonly float $price)
+    {
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 04b6c09677f90..c75d116794bb8 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -20,7 +20,7 @@
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/error-handler": "^6.3",
         "symfony/event-dispatcher": "^5.4|^6.0",
-        "symfony/http-foundation": "^5.4.21|^6.2.7",
+        "symfony/http-foundation": "^6.2.7",
         "symfony/polyfill-ctype": "^1.8",
         "psr/log": "^1|^2|^3"
     },
@@ -36,11 +36,14 @@
         "symfony/finder": "^5.4|^6.0",
         "symfony/http-client-contracts": "^2.5|^3",
         "symfony/process": "^5.4|^6.0",
+        "symfony/property-access": "^5.4|^6.0",
         "symfony/routing": "^5.4|^6.0",
+        "symfony/serializer": "^6.3",
         "symfony/stopwatch": "^5.4|^6.0",
         "symfony/translation": "^5.4|^6.0",
         "symfony/translation-contracts": "^2.5|^3",
         "symfony/uid": "^5.4|^6.0",
+        "symfony/validator": "^5.4|^6.0",
         "psr/cache": "^1.0|^2.0|^3.0",
         "twig/twig": "^2.13|^3.0.4"
     },
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
index 622d4152e4ad6..7c2dd31143551 100644
--- a/src/Symfony/Component/Serializer/CHANGELOG.md
+++ b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Add `XmlEncoder::SAVE_OPTIONS` context option
  * Add `BackedEnumNormalizer::ALLOW_INVALID_VALUES` context option
+ * Add `UnsupportedFormatException` which is thrown when there is no decoder for a given format
  * Add method `getSupportedTypes(?string $format)` to `NormalizerInterface` and `DenormalizerInterface`
  * Make `ProblemNormalizer` give details about `ValidationFailedException` and `PartialDenormalizationException`
  * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
diff --git a/src/Symfony/Component/Serializer/Exception/UnsupportedFormatException.php b/src/Symfony/Component/Serializer/Exception/UnsupportedFormatException.php
new file mode 100644
index 0000000000000..9b87bcc5b1258
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Exception/UnsupportedFormatException.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Exception;
+
+/**
+ * @author Konstantin Myakshin <molodchick@gmail.com>
+ */
+class UnsupportedFormatException extends NotEncodableValueException
+{
+}
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
index ea219f40351bb..e79ca7ba78412 100644
--- a/src/Symfony/Component/Serializer/Serializer.php
+++ b/src/Symfony/Component/Serializer/Serializer.php
@@ -19,9 +19,9 @@
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Exception\PartialDenormalizationException;
+use Symfony\Component\Serializer\Exception\UnsupportedFormatException;
 use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
 use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
 use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
@@ -124,7 +124,7 @@ public function __construct(array $normalizers = [], array $encoders = [])
     final public function serialize(mixed $data, string $format, array $context = []): string
     {
         if (!$this->supportsEncoding($format, $context)) {
-            throw new NotEncodableValueException(sprintf('Serialization for the format "%s" is not supported.', $format));
+            throw new UnsupportedFormatException(sprintf('Serialization for the format "%s" is not supported.', $format));
         }
 
         if ($this->encoder->needsNormalization($format, $context)) {
@@ -137,7 +137,7 @@ final public function serialize(mixed $data, string $format, array $context = []
     final public function deserialize(mixed $data, string $type, string $format, array $context = []): mixed
     {
         if (!$this->supportsDecoding($format, $context)) {
-            throw new NotEncodableValueException(sprintf('Deserialization for the format "%s" is not supported.', $format));
+            throw new UnsupportedFormatException(sprintf('Deserialization for the format "%s" is not supported.', $format));
         }
 
         $data = $this->decode($data, $format, $context);

From 2b5980dbca0974bec6e9951cd0812b11b8e3cfd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Fr=C3=A9mont?= <lc.fremont@gmail.com>
Date: Fri, 9 Dec 2022 12:07:40 +0100
Subject: [PATCH 398/475] [Serializer] Add Debug command

---
 .../FrameworkExtension.php                    |   2 +
 .../Resources/config/console.php              |   7 ++
 .../Serializer/Command/DebugCommand.php       | 113 ++++++++++++++++++
 .../Tests/Command/DebugCommandTest.php        |  92 ++++++++++++++
 .../Serializer/Tests/Dummy/DummyClassOne.php  |  33 +++++
 .../Component/Serializer/composer.json        |   1 +
 6 files changed, 248 insertions(+)
 create mode 100644 src/Symfony/Component/Serializer/Command/DebugCommand.php
 create mode 100644 src/Symfony/Component/Serializer/Tests/Command/DebugCommandTest.php
 create mode 100644 src/Symfony/Component/Serializer/Tests/Dummy/DummyClassOne.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index db536027e86c6..36622ee23d604 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -371,6 +371,8 @@ public function load(array $configs, ContainerBuilder $container)
 
             $container->getDefinition('argument_resolver.request_payload')
                 ->replaceArgument(0, new Reference('.argument_resolver.request_payload.no_serializer', ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE));
+
+            $container->removeDefinition('console.command.serializer_debug');
         }
 
         if ($propertyInfoEnabled) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
index 732a7bae49707..bfe7e3bc10b40 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
@@ -50,6 +50,7 @@
 use Symfony\Component\Messenger\Command\StatsCommand;
 use Symfony\Component\Messenger\Command\StopWorkersCommand;
 use Symfony\Component\Scheduler\Command\DebugCommand as SchedulerDebugCommand;
+use Symfony\Component\Serializer\Command\DebugCommand as SerializerDebugCommand;
 use Symfony\Component\Translation\Command\TranslationPullCommand;
 use Symfony\Component\Translation\Command\TranslationPushCommand;
 use Symfony\Component\Translation\Command\XliffLintCommand;
@@ -239,6 +240,12 @@
             ])
             ->tag('console.command')
 
+        ->set('console.command.serializer_debug', SerializerDebugCommand::class)
+            ->args([
+                service('serializer.mapping.class_metadata_factory'),
+            ])
+            ->tag('console.command')
+
         ->set('console.command.translation_debug', TranslationDebugCommand::class)
             ->args([
                 service('translator'),
diff --git a/src/Symfony/Component/Serializer/Command/DebugCommand.php b/src/Symfony/Component/Serializer/Command/DebugCommand.php
new file mode 100644
index 0000000000000..13873dd1f9978
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Command/DebugCommand.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Command;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\Dumper;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
+
+/**
+ * A console command to debug Serializer information.
+ *
+ * @author Loïc Frémont <lc.fremont@gmail.com>
+ */
+#[AsCommand(name: 'debug:serializer', description: 'Display serialization information for classes')]
+class DebugCommand extends Command
+{
+    public function __construct(private readonly ClassMetadataFactoryInterface $serializer)
+    {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->addArgument('class', InputArgument::REQUIRED, 'A fully qualified class name')
+            ->setHelp("The <info>%command.name% 'App\Entity\Dummy'</info> command dumps the serializer groups for the dummy class.")
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $class = $input->getArgument('class');
+
+        if (!class_exists($class)) {
+            $io = new SymfonyStyle($input, $output);
+            $io->error(sprintf('Class "%s" was not found.', $class));
+
+            return Command::FAILURE;
+        }
+
+        $this->dumpSerializerDataForClass($input, $output, $class);
+
+        return Command::SUCCESS;
+    }
+
+    private function dumpSerializerDataForClass(InputInterface $input, OutputInterface $output, string $class): void
+    {
+        $io = new SymfonyStyle($input, $output);
+        $title = sprintf('<info>%s</info>', $class);
+        $rows = [];
+        $dump = new Dumper($output);
+
+        $classMetadata = $this->serializer->getMetadataFor($class);
+
+        foreach ($this->getAttributesData($classMetadata) as $propertyName => $data) {
+            $rows[] = [
+                $propertyName,
+                $dump($data),
+            ];
+        }
+
+        if (!$rows) {
+            $io->section($title);
+            $io->text('No Serializer data were found for this class.');
+
+            return;
+        }
+
+        $io->section($title);
+
+        $table = new Table($output);
+        $table->setHeaders(['Property', 'Options']);
+        $table->setRows($rows);
+        $table->render();
+    }
+
+    /**
+     * @return array<string, array<string, mixed>>
+     */
+    private function getAttributesData(ClassMetadataInterface $classMetadata): array
+    {
+        $data = [];
+
+        foreach ($classMetadata->getAttributesMetadata() as $attributeMetadata) {
+            $data[$attributeMetadata->getName()] = [
+                'groups' => $attributeMetadata->getGroups(),
+                'maxDepth' => $attributeMetadata->getMaxDepth(),
+                'serializedName' => $attributeMetadata->getSerializedName(),
+                'ignore' => $attributeMetadata->isIgnored(),
+                'normalizationContexts' => $attributeMetadata->getNormalizationContexts(),
+                'denormalizationContexts' => $attributeMetadata->getDenormalizationContexts(),
+            ];
+        }
+
+        return $data;
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Serializer/Tests/Command/DebugCommandTest.php
new file mode 100644
index 0000000000000..a92e73f335dca
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Command/DebugCommandTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Serializer\Command\DebugCommand;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
+use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Serializer\Tests\Dummy\DummyClassOne;
+
+/**
+ * @author Loïc Frémont <lc.fremont@gmail.com>
+ */
+class DebugCommandTest extends TestCase
+{
+    public function testOutputWithClassArgument()
+    {
+        $command = new DebugCommand(new ClassMetadataFactory(new AnnotationLoader()));
+
+        $tester = new CommandTester($command);
+        $tester->execute(['class' => DummyClassOne::class], ['decorated' => false]);
+
+        $this->assertSame(<<<TXT
+
+            Symfony\Component\Serializer\Tests\Dummy\DummyClassOne
+            ------------------------------------------------------
+
+            +----------+-------------------------------------+
+            | Property | Options                             |
+            +----------+-------------------------------------+
+            | code     | [                                   |
+            |          |   "groups" => [                     |
+            |          |     "book:read",                    |
+            |          |     "book:write"                    |
+            |          |   ],                                |
+            |          |   "maxDepth" => 1,                  |
+            |          |   "serializedName" => "identifier", |
+            |          |   "ignore" => true,                 |
+            |          |   "normalizationContexts" => [      |
+            |          |     "*" => [                        |
+            |          |       "groups" => [                 |
+            |          |         "book:read"                 |
+            |          |       ]                             |
+            |          |     ]                               |
+            |          |   ],                                |
+            |          |   "denormalizationContexts" => [    |
+            |          |     "*" => [                        |
+            |          |       "groups" => [                 |
+            |          |         "book:write"                |
+            |          |       ]                             |
+            |          |     ]                               |
+            |          |   ]                                 |
+            |          | ]                                   |
+            | name     | [                                   |
+            |          |   "groups" => [],                   |
+            |          |   "maxDepth" => null,               |
+            |          |   "serializedName" => null,         |
+            |          |   "ignore" => false,                |
+            |          |   "normalizationContexts" => [],    |
+            |          |   "denormalizationContexts" => []   |
+            |          | ]                                   |
+            +----------+-------------------------------------+
+
+            TXT,
+            $tester->getDisplay(true),
+        );
+    }
+
+    public function testOutputWithInvalidClassArgument()
+    {
+        $serializer = $this->createMock(ClassMetadataFactoryInterface::class);
+
+        $command = new DebugCommand($serializer);
+
+        $tester = new CommandTester($command);
+        $tester->execute(['class' => 'App\\NotFoundResource'], ['decorated' => false]);
+
+        $this->assertStringContainsString('[ERROR] Class "App\NotFoundResource" was not found.', $tester->getDisplay(true)
+        );
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Dummy/DummyClassOne.php b/src/Symfony/Component/Serializer/Tests/Dummy/DummyClassOne.php
new file mode 100644
index 0000000000000..67e80d2c6e409
--- /dev/null
+++ b/src/Symfony/Component/Serializer/Tests/Dummy/DummyClassOne.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Dummy;
+
+use Symfony\Component\Serializer\Annotation\Context;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Serializer\Annotation\Ignore;
+use Symfony\Component\Serializer\Annotation\MaxDepth;
+use Symfony\Component\Serializer\Annotation\SerializedName;
+
+class DummyClassOne
+{
+    #[MaxDepth(1)]
+    #[Groups(['book:read', 'book:write'])]
+    #[SerializedName('identifier')]
+    #[Ignore]
+    #[Context(
+        normalizationContext: ['groups' => ['book:read']],
+        denormalizationContext: ['groups' => ['book:write']],
+    )]
+    public string $code;
+
+    public string $name;
+}
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
index 8b17ca6ea3cfa..c78f0246cf7bd 100644
--- a/src/Symfony/Component/Serializer/composer.json
+++ b/src/Symfony/Component/Serializer/composer.json
@@ -24,6 +24,7 @@
         "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0",
         "symfony/cache": "^5.4|^6.0",
         "symfony/config": "^5.4|^6.0",
+        "symfony/console": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
         "symfony/error-handler": "^5.4|^6.0",
         "symfony/filesystem": "^5.4|^6.0",

From 17a8f9288feca324e743953d50d2a6910d0b9dd0 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Fri, 27 Jan 2023 16:33:40 +0100
Subject: [PATCH 399/475] [HttpKernel] Allow injecting query parameters in
 controllers by typing them with `#[MapQueryParameter]` attribute

---
 .../Attribute/MapQueryParameter.php           |  34 +++
 src/Symfony/Component/HttpKernel/CHANGELOG.md |   1 +
 .../QueryParameterValueResolver.php           |  98 ++++++++
 .../QueryParameterValueResolverTest.php       | 223 ++++++++++++++++++
 4 files changed, 356 insertions(+)
 create mode 100644 src/Symfony/Component/HttpKernel/Attribute/MapQueryParameter.php
 create mode 100644 src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php
 create mode 100644 src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/QueryParameterValueResolverTest.php

diff --git a/src/Symfony/Component/HttpKernel/Attribute/MapQueryParameter.php b/src/Symfony/Component/HttpKernel/Attribute/MapQueryParameter.php
new file mode 100644
index 0000000000000..63ea1dd7266a9
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Attribute/MapQueryParameter.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Attribute;
+
+/**
+ * Can be used to pass a query parameter to a controller argument.
+ *
+ * @author Ruud Kamphuis <ruud@ticketswap.com>
+ */
+#[\Attribute(\Attribute::TARGET_PARAMETER)]
+final class MapQueryParameter
+{
+    /**
+     * @see https://php.net/filter.filters.validate for filter, flags and options
+     *
+     * @param string|null $name The name of the query parameter. If null, the name of the argument in the controller will be used.
+     */
+    public function __construct(
+        public ?string $name = null,
+        public ?int $filter = null,
+        public int $flags = 0,
+        public array $options = [],
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 22b0a0d52bd1c..838a62cefea95 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG
  * Introduce targeted value resolvers with `#[ValueResolver]` and `#[AsTargetedValueResolver]`
  * Add `#[MapRequestPayload]` to map and validate request payload from `Request::getContent()` or `Request::$request->all()` to typed objects
  * Add `#[MapQueryString]` to map and validate request query string from `Request::$query->all()` to typed objects
+ * Add `#[MapQueryParameter]` to map and validate individual query parameters to controller arguments
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php
new file mode 100644
index 0000000000000..b5521b8859e0e
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php
@@ -0,0 +1,98 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Attribute\MapQueryParameter;
+use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * @author Ruud Kamphuis <ruud@ticketswap.com>
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+final class QueryParameterValueResolver implements ValueResolverInterface
+{
+    public function resolve(Request $request, ArgumentMetadata $argument): array
+    {
+        if (!$attribute = $argument->getAttributesOfType(MapQueryParameter::class)[0] ?? null) {
+            return [];
+        }
+
+        $name = $attribute->name ?? $argument->getName();
+        if (!$request->query->has($name)) {
+            if ($argument->isNullable() || $argument->hasDefaultValue()) {
+                return [];
+            }
+
+            throw new NotFoundHttpException(sprintf('Missing query parameter "%s".', $name));
+        }
+
+        $value = $request->query->all()[$name];
+
+        if (null === $attribute->filter && 'array' === $argument->getType()) {
+            if (!$argument->isVariadic()) {
+                return [(array) $value];
+            }
+
+            $filtered = array_values(array_filter((array) $value, \is_array(...)));
+
+            if ($filtered !== $value && !($attribute->flags & \FILTER_NULL_ON_FAILURE)) {
+                throw new NotFoundHttpException(sprintf('Invalid query parameter "%s".', $name));
+            }
+
+            return $filtered;
+        }
+
+        $options = [
+            'flags' => $attribute->flags | \FILTER_NULL_ON_FAILURE,
+            'options' => $attribute->options,
+        ];
+
+        if ('array' === $argument->getType() || $argument->isVariadic()) {
+            $value = (array) $value;
+            $options['flags'] |= \FILTER_REQUIRE_ARRAY;
+        }
+
+        $filter = match ($argument->getType()) {
+            'array' => \FILTER_DEFAULT,
+            'string' => \FILTER_DEFAULT,
+            'int' => \FILTER_VALIDATE_INT,
+            'float' => \FILTER_VALIDATE_FLOAT,
+            'bool' => \FILTER_VALIDATE_BOOL,
+            default => throw new \LogicException(sprintf('#[MapQueryParameter] cannot be used on controller argument "%s$%s" of type "%s"; one of array, string, int, float or bool should be used.', $argument->isVariadic() ? '...' : '', $argument->getName(), $argument->getType() ?? 'mixed'))
+        };
+
+        $value = filter_var($value, $attribute->filter ?? $filter, $options);
+
+        if (null === $value && !($attribute->flags & \FILTER_NULL_ON_FAILURE)) {
+            throw new NotFoundHttpException(sprintf('Invalid query parameter "%s".', $name));
+        }
+
+        if (!\is_array($value)) {
+            return [$value];
+        }
+
+        $filtered = array_filter($value, static fn ($v) => null !== $v);
+
+        if ($argument->isVariadic()) {
+            $filtered = array_values($filtered);
+        }
+
+        if ($filtered !== $value && !($attribute->flags & \FILTER_NULL_ON_FAILURE)) {
+            throw new NotFoundHttpException(sprintf('Invalid query parameter "%s".', $name));
+        }
+
+        return $argument->isVariadic() ? $filtered : [$filtered];
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/QueryParameterValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/QueryParameterValueResolverTest.php
new file mode 100644
index 0000000000000..539aaac78ee65
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/QueryParameterValueResolverTest.php
@@ -0,0 +1,223 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Attribute\MapQueryParameter;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\QueryParameterValueResolver;
+use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class QueryParameterValueResolverTest extends TestCase
+{
+    private ValueResolverInterface $resolver;
+
+    protected function setUp(): void
+    {
+        $this->resolver = new QueryParameterValueResolver();
+    }
+
+    /**
+     * @dataProvider provideTestResolve
+     */
+    public function testResolve(Request $request, ArgumentMetadata $metadata, array $expected, string $exceptionClass = null, string $exceptionMessage = null)
+    {
+        if ($exceptionMessage) {
+            self::expectException($exceptionClass);
+            self::expectExceptionMessage($exceptionMessage);
+        }
+
+        self::assertSame($expected, $this->resolver->resolve($request, $metadata));
+    }
+
+    /**
+     * @return iterable<string, array{
+     *   Request,
+     *   ArgumentMetadata,
+     *   array<mixed>,
+     *   null|class-string<\Exception>,
+     *   null|string
+     * }>
+     */
+    public static function provideTestResolve(): iterable
+    {
+        yield 'parameter found and array' => [
+            Request::create('/', 'GET', ['ids' => ['1', '2']]),
+            new ArgumentMetadata('ids', 'array', false, false, false, attributes: [new MapQueryParameter()]),
+            [['1', '2']],
+            null,
+        ];
+        yield 'parameter found and array variadic' => [
+            Request::create('/', 'GET', ['ids' => [['1', '2'], ['2']]]),
+            new ArgumentMetadata('ids', 'array', true, false, false, attributes: [new MapQueryParameter()]),
+            [['1', '2'], ['2']],
+            null,
+        ];
+        yield 'parameter found and string' => [
+            Request::create('/', 'GET', ['firstName' => 'John']),
+            new ArgumentMetadata('firstName', 'string', false, false, false, attributes: [new MapQueryParameter()]),
+            ['John'],
+            null,
+        ];
+        yield 'parameter found and string variadic' => [
+            Request::create('/', 'GET', ['ids' => ['1', '2']]),
+            new ArgumentMetadata('ids', 'string', true, false, false, attributes: [new MapQueryParameter()]),
+            ['1', '2'],
+            null,
+        ];
+        yield 'parameter found and string with regexp filter that matches' => [
+            Request::create('/', 'GET', ['firstName' => 'John']),
+            new ArgumentMetadata('firstName', 'string', false, false, false, attributes: [new MapQueryParameter(filter: \FILTER_VALIDATE_REGEXP, flags: \FILTER_NULL_ON_FAILURE, options: ['regexp' => '/John/'])]),
+            ['John'],
+            null,
+        ];
+        yield 'parameter found and string with regexp filter that falls back to null on failure' => [
+            Request::create('/', 'GET', ['firstName' => 'Fabien']),
+            new ArgumentMetadata('firstName', 'string', false, false, false, attributes: [new MapQueryParameter(filter: \FILTER_VALIDATE_REGEXP, flags: \FILTER_NULL_ON_FAILURE, options: ['regexp' => '/John/'])]),
+            [null],
+            null,
+        ];
+        yield 'parameter found and string with regexp filter that does not match' => [
+            Request::create('/', 'GET', ['firstName' => 'Fabien']),
+            new ArgumentMetadata('firstName', 'string', false, false, false, attributes: [new MapQueryParameter(filter: \FILTER_VALIDATE_REGEXP, options: ['regexp' => '/John/'])]),
+            [],
+            NotFoundHttpException::class,
+            'Invalid query parameter "firstName".',
+        ];
+        yield 'parameter found and string variadic with regexp filter that matches' => [
+            Request::create('/', 'GET', ['firstName' => ['John', 'John']]),
+            new ArgumentMetadata('firstName', 'string', true, false, false, attributes: [new MapQueryParameter(filter: \FILTER_VALIDATE_REGEXP, flags: \FILTER_NULL_ON_FAILURE, options: ['regexp' => '/John/'])]),
+            ['John', 'John'],
+            null,
+        ];
+        yield 'parameter found and string variadic with regexp filter that falls back to null on failure' => [
+            Request::create('/', 'GET', ['firstName' => ['John', 'Fabien']]),
+            new ArgumentMetadata('firstName', 'string', true, false, false, attributes: [new MapQueryParameter(filter: \FILTER_VALIDATE_REGEXP, flags: \FILTER_NULL_ON_FAILURE, options: ['regexp' => '/John/'])]),
+            ['John'],
+            null,
+        ];
+        yield 'parameter found and string variadic with regexp filter that does not match' => [
+            Request::create('/', 'GET', ['firstName' => ['Fabien']]),
+            new ArgumentMetadata('firstName', 'string', true, false, false, attributes: [new MapQueryParameter(filter: \FILTER_VALIDATE_REGEXP, options: ['regexp' => '/John/'])]),
+            [],
+            NotFoundHttpException::class,
+            'Invalid query parameter "firstName".',
+        ];
+        yield 'parameter found and integer' => [
+            Request::create('/', 'GET', ['age' => 123]),
+            new ArgumentMetadata('age', 'int', false, false, false, attributes: [new MapQueryParameter()]),
+            [123],
+            null,
+        ];
+        yield 'parameter found and integer variadic' => [
+            Request::create('/', 'GET', ['age' => [123, 222]]),
+            new ArgumentMetadata('age', 'int', true, false, false, attributes: [new MapQueryParameter()]),
+            [123, 222],
+            null,
+        ];
+        yield 'parameter found and float' => [
+            Request::create('/', 'GET', ['price' => 10.99]),
+            new ArgumentMetadata('price', 'float', false, false, false, attributes: [new MapQueryParameter()]),
+            [10.99],
+            null,
+        ];
+        yield 'parameter found and float variadic' => [
+            Request::create('/', 'GET', ['price' => [10.99, 5.99]]),
+            new ArgumentMetadata('price', 'float', true, false, false, attributes: [new MapQueryParameter()]),
+            [10.99, 5.99],
+            null,
+        ];
+        yield 'parameter found and boolean yes' => [
+            Request::create('/', 'GET', ['isVerified' => 'yes']),
+            new ArgumentMetadata('isVerified', 'bool', false, false, false, attributes: [new MapQueryParameter()]),
+            [true],
+            null,
+        ];
+        yield 'parameter found and boolean yes variadic' => [
+            Request::create('/', 'GET', ['isVerified' => ['yes', 'yes']]),
+            new ArgumentMetadata('isVerified', 'bool', true, false, false, attributes: [new MapQueryParameter()]),
+            [true, true],
+            null,
+        ];
+        yield 'parameter found and boolean true' => [
+            Request::create('/', 'GET', ['isVerified' => 'true']),
+            new ArgumentMetadata('isVerified', 'bool', false, false, false, attributes: [new MapQueryParameter()]),
+            [true],
+            null,
+        ];
+        yield 'parameter found and boolean 1' => [
+            Request::create('/', 'GET', ['isVerified' => '1']),
+            new ArgumentMetadata('isVerified', 'bool', false, false, false, attributes: [new MapQueryParameter()]),
+            [true],
+            null,
+        ];
+        yield 'parameter found and boolean no' => [
+            Request::create('/', 'GET', ['isVerified' => 'no']),
+            new ArgumentMetadata('isVerified', 'bool', false, false, false, attributes: [new MapQueryParameter()]),
+            [false],
+            null,
+        ];
+        yield 'parameter found and boolean invalid' => [
+            Request::create('/', 'GET', ['isVerified' => 'whatever']),
+            new ArgumentMetadata('isVerified', 'bool', false, false, false, attributes: [new MapQueryParameter()]),
+            [],
+            NotFoundHttpException::class,
+            'Invalid query parameter "isVerified".',
+        ];
+
+        yield 'parameter not found but nullable' => [
+            Request::create('/', 'GET'),
+            new ArgumentMetadata('firstName', 'string', false, false, false, true, [new MapQueryParameter()]),
+            [],
+            null,
+        ];
+
+        yield 'parameter not found but optional' => [
+            Request::create('/', 'GET'),
+            new ArgumentMetadata('firstName', 'string', false, true, false, attributes: [new MapQueryParameter()]),
+            [],
+            null,
+        ];
+
+        yield 'parameter not found' => [
+            Request::create('/', 'GET'),
+            new ArgumentMetadata('firstName', 'string', false, false, false, attributes: [new MapQueryParameter()]),
+            [],
+            NotFoundHttpException::class,
+            'Missing query parameter "firstName".',
+        ];
+
+        yield 'unsupported type' => [
+            Request::create('/', 'GET', ['standardClass' => 'test']),
+            new ArgumentMetadata('standardClass', \stdClass::class, false, false, false, attributes: [new MapQueryParameter()]),
+            [],
+            \LogicException::class,
+            '#[MapQueryParameter] cannot be used on controller argument "$standardClass" of type "stdClass"; one of array, string, int, float or bool should be used.',
+        ];
+        yield 'unsupported type variadic' => [
+            Request::create('/', 'GET', ['standardClass' => 'test']),
+            new ArgumentMetadata('standardClass', \stdClass::class, true, false, false, attributes: [new MapQueryParameter()]),
+            [],
+            \LogicException::class,
+            '#[MapQueryParameter] cannot be used on controller argument "...$standardClass" of type "stdClass"; one of array, string, int, float or bool should be used.',
+        ];
+    }
+
+    public function testSkipWhenNoAttribute()
+    {
+        $metadata = new ArgumentMetadata('firstName', 'string', false, true, false);
+
+        self::assertSame([], $this->resolver->resolve(Request::create('/'), $metadata));
+    }
+}

From bd7c669c89f43dcea42606e542b184847fabdcaf Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 23 Feb 2023 15:34:23 +0100
Subject: [PATCH 400/475] Register QueryParameterValueResolver as
 "controller.targeted_value_resolver"

---
 .../DependencyInjection/Compiler/UnusedTagsPass.php         | 1 +
 src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php | 4 ++++
 .../Component/HttpKernel/Attribute/MapQueryParameter.php    | 6 +++++-
 .../ArgumentResolver/QueryParameterValueResolver.php        | 2 ++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
index 9da5b91bb3bb0..11b83394c702e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -45,6 +45,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'container.service_subscriber',
         'container.stack',
         'controller.argument_value_resolver',
+        'controller.targeted_value_resolver',
         'controller.service_arguments',
         'controller.targeted_value_resolver',
         'data_collector',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
index 1a41a60fe1ddd..db904f871c535 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
@@ -16,6 +16,7 @@
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\BackedEnumValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DateTimeValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\QueryParameterValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestPayloadValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestValueResolver;
@@ -90,6 +91,9 @@
         ->set('argument_resolver.variadic', VariadicValueResolver::class)
             ->tag('controller.argument_value_resolver', ['priority' => -150, 'name' => VariadicValueResolver::class])
 
+        ->set('argument_resolver.query_parameter_value_resolver', QueryParameterValueResolver::class)
+            ->tag('controller.targeted_value_resolver', ['name' => QueryParameterValueResolver::class])
+
         ->set('response_listener', ResponseListener::class)
             ->args([
                 param('kernel.charset'),
diff --git a/src/Symfony/Component/HttpKernel/Attribute/MapQueryParameter.php b/src/Symfony/Component/HttpKernel/Attribute/MapQueryParameter.php
index 63ea1dd7266a9..f83e331e4118f 100644
--- a/src/Symfony/Component/HttpKernel/Attribute/MapQueryParameter.php
+++ b/src/Symfony/Component/HttpKernel/Attribute/MapQueryParameter.php
@@ -11,13 +11,15 @@
 
 namespace Symfony\Component\HttpKernel\Attribute;
 
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\QueryParameterValueResolver;
+
 /**
  * Can be used to pass a query parameter to a controller argument.
  *
  * @author Ruud Kamphuis <ruud@ticketswap.com>
  */
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
-final class MapQueryParameter
+final class MapQueryParameter extends ValueResolver
 {
     /**
      * @see https://php.net/filter.filters.validate for filter, flags and options
@@ -29,6 +31,8 @@ public function __construct(
         public ?int $filter = null,
         public int $flags = 0,
         public array $options = [],
+        string $resolver = QueryParameterValueResolver::class,
     ) {
+        parent::__construct($resolver);
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php
index b5521b8859e0e..f2e4bee812d79 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/QueryParameterValueResolver.php
@@ -62,6 +62,8 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
         if ('array' === $argument->getType() || $argument->isVariadic()) {
             $value = (array) $value;
             $options['flags'] |= \FILTER_REQUIRE_ARRAY;
+        } else {
+            $options['flags'] |= \FILTER_REQUIRE_SCALAR;
         }
 
         $filter = match ($argument->getType()) {

From 208df61f65d3250040a21ab5077e5ad9d3cf1310 Mon Sep 17 00:00:00 2001
From: "alexandre.lassauge" <alexandre.lassauge@sensiolabs.com>
Date: Wed, 12 Apr 2023 14:15:41 +0200
Subject: [PATCH 401/475] [VarDumper] Add missing return types

---
 .github/expected-missing-return-types.diff    | 223 +++++++++++++-----
 .../DataCollector/DumpDataCollector.php       |   4 +-
 .../Tests/EventListener/DumpListenerTest.php  |   2 +-
 .../Component/VarDumper/Caster/ClassStub.php  |   3 +
 .../VarDumper/Caster/ExceptionCaster.php      |   3 +
 .../Component/VarDumper/Caster/LinkStub.php   |   2 +-
 .../Compon
10000
ent/VarDumper/Caster/StubCaster.php |   3 +
 .../Component/VarDumper/Cloner/Data.php       |   2 +-
 .../VarDumper/Cloner/DumperInterface.php      |   8 +
 .../Component/VarDumper/Dumper/CliDumper.php  |   2 +-
 .../VarDumper/Dumper/ContextualizedDumper.php |   4 +-
 .../VarDumper/Dumper/DataDumperInterface.php  |   4 +
 .../Component/VarDumper/Dumper/HtmlDumper.php |  28 ++-
 .../VarDumper/Dumper/ServerDumper.php         |   6 +-
 .../Component/VarDumper/Server/Connection.php |   4 +-
 src/Symfony/Component/VarDumper/VarDumper.php |   2 +
 16 files changed, 229 insertions(+), 71 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index 4dedc93f7d598..e55e87698d0af 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -648,10 +648,10 @@ index 6e7669a710..27517d34ae 100644
      {
          if (!$container->hasDefinition('test.private_services_locator')) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
-index 7fa0fb2890..49bcc6dfd9 100644
+index 9da5b91bb3..d7acf8040b 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
-@@ -107,5 +107,5 @@ class UnusedTagsPass implements CompilerPassInterface
+@@ -108,5 +108,5 @@ class UnusedTagsPass implements CompilerPassInterface
       * @return void
       */
 -    public function process(ContainerBuilder $container)
@@ -670,17 +670,17 @@ index bda9ca9515..c0d1f91339 100644
      {
          if (!$container->hasParameter('workflow.has_guard_listeners')) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-index 716d648454..25be4a48a9 100644
+index 36622ee23d..cd6a609053 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
-@@ -205,5 +205,5 @@ class FrameworkExtension extends Extension
+@@ -206,5 +206,5 @@ class FrameworkExtension extends Extension
       * @throws LogicException
       */
 -    public function load(array $configs, ContainerBuilder $container)
 +    public function load(array $configs, ContainerBuilder $container): void
      {
          $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
-@@ -2784,5 +2784,5 @@ class FrameworkExtension extends Extension
+@@ -2795,5 +2795,5 @@ class FrameworkExtension extends Extension
       * @return void
       */
 -    public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)
@@ -1195,80 +1195,80 @@ index cffea43c49..0645fbd756 100644
      {
          $this->packages[$name] = $package;
 diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
-index e95ec5b821..3346019e13 100644
+index df0484f75b..503d7bd126 100644
 --- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 +++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
-@@ -64,5 +64,5 @@ abstract class AbstractBrowser
+@@ -67,5 +67,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function followRedirects(bool $followRedirects = true)
 +    public function followRedirects(bool $followRedirects = true): void
      {
          $this->followRedirects = $followRedirects;
-@@ -74,5 +74,5 @@ abstract class AbstractBrowser
+@@ -77,5 +77,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function followMetaRefresh(bool $followMetaRefresh = true)
 +    public function followMetaRefresh(bool $followMetaRefresh = true): void
      {
          $this->followMetaRefresh = $followMetaRefresh;
-@@ -92,5 +92,5 @@ abstract class AbstractBrowser
+@@ -95,5 +95,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function setMaxRedirects(int $maxRedirects)
 +    public function setMaxRedirects(int $maxRedirects): void
      {
          $this->maxRedirects = $maxRedirects < 0 ? -1 : $maxRedirects;
-@@ -113,5 +113,5 @@ abstract class AbstractBrowser
-      * @throws \RuntimeException When Symfony Process Component is not installed
+@@ -116,5 +116,5 @@ abstract class AbstractBrowser
+      * @throws LogicException When Symfony Process Component is not installed
       */
 -    public function insulate(bool $insulated = true)
 +    public function insulate(bool $insulated = true): void
      {
          if ($insulated && !class_exists(\Symfony\Component\Process\Process::class)) {
-@@ -127,5 +127,5 @@ abstract class AbstractBrowser
+@@ -130,5 +130,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function setServerParameters(array $server)
 +    public function setServerParameters(array $server): void
      {
          $this->server = array_merge([
-@@ -139,5 +139,5 @@ abstract class AbstractBrowser
+@@ -142,5 +142,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function setServerParameter(string $key, string $value)
 +    public function setServerParameter(string $key, string $value): void
      {
          $this->server[$key] = $value;
-@@ -438,5 +438,5 @@ abstract class AbstractBrowser
+@@ -441,5 +441,5 @@ abstract class AbstractBrowser
       * @throws \RuntimeException When processing returns exit code
       */
 -    protected function doRequestInProcess(object $request)
 +    protected function doRequestInProcess(object $request): object
      {
          $deprecationsFile = tempnam(sys_get_temp_dir(), 'deprec');
-@@ -471,5 +471,5 @@ abstract class AbstractBrowser
+@@ -474,5 +474,5 @@ abstract class AbstractBrowser
       * @return object
       */
 -    abstract protected function doRequest(object $request);
 +    abstract protected function doRequest(object $request): object;
  
      /**
-@@ -490,5 +490,5 @@ abstract class AbstractBrowser
+@@ -493,5 +493,5 @@ abstract class AbstractBrowser
       * @return object
       */
 -    protected function filterRequest(Request $request)
 +    protected function filterRequest(Request $request): object
      {
          return $request;
-@@ -500,5 +500,5 @@ abstract class AbstractBrowser
+@@ -503,5 +503,5 @@ abstract class AbstractBrowser
       * @return Response
       */
 -    protected function filterResponse(object $response)
 +    protected function filterResponse(object $response): Response
      {
          return $response;
-@@ -625,5 +625,5 @@ abstract class AbstractBrowser
+@@ -628,5 +628,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function restart()
@@ -1276,45 +1276,45 @@ index e95ec5b821..3346019e13 100644
      {
          $this->cookieJar->clear();
 diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php
-index 9753d305d9..081d621068 100644
+index f851f81363..311a9f4eee 100644
 --- a/src/Symfony/Component/BrowserKit/CookieJar.php
 +++ b/src/Symfony/Component/BrowserKit/CookieJar.php
-@@ -24,5 +24,5 @@ class CookieJar
+@@ -26,5 +26,5 @@ class CookieJar
       * @return void
       */
 -    public function set(Cookie $cookie)
 +    public function set(Cookie $cookie): void
      {
          $this->cookieJar[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
-@@ -71,5 +71,5 @@ class CookieJar
+@@ -73,5 +73,5 @@ class CookieJar
       * @return void
       */
 -    public function expire(string $name, ?string $path = '/', string $domain = null)
 +    public function expire(string $name, ?string $path = '/', string $domain = null): void
      {
          $path ??= '/';
-@@ -101,5 +101,5 @@ class CookieJar
+@@ -103,5 +103,5 @@ class CookieJar
       * @return void
       */
 -    public function clear()
 +    public function clear(): void
      {
          $this->cookieJar = [];
-@@ -113,5 +113,5 @@ class CookieJar
+@@ -115,5 +115,5 @@ class CookieJar
       * @return void
       */
 -    public function updateFromSetCookie(array $setCookies, string $uri = null)
 +    public function updateFromSetCookie(array $setCookies, string $uri = null): void
      {
          $cookies = [];
-@@ -141,5 +141,5 @@ class CookieJar
+@@ -143,5 +143,5 @@ class CookieJar
       * @return void
       */
 -    public function updateFromResponse(Response $response, string $uri = null)
 +    public function updateFromResponse(Response $response, string $uri = null): void
      {
          $this->updateFromSetCookie($response->getHeader('Set-Cookie', false), $uri);
-@@ -215,5 +215,5 @@ class CookieJar
+@@ -217,5 +217,5 @@ class CookieJar
       * @return void
       */
 -    public function flushExpiredCookies()
@@ -1322,17 +1322,17 @@ index 9753d305d9..081d621068 100644
      {
          foreach ($this->cookieJar as $domain => $pathCookies) {
 diff --git a/src/Symfony/Component/BrowserKit/History.php b/src/Symfony/Component/BrowserKit/History.php
-index 01f5e80382..20c3349c14 100644
+index 7fce4e32b0..a7f192c5e3 100644
 --- a/src/Symfony/Component/BrowserKit/History.php
 +++ b/src/Symfony/Component/BrowserKit/History.php
-@@ -27,5 +27,5 @@ class History
+@@ -29,5 +29,5 @@ class History
       * @return void
       */
 -    public function clear()
 +    public function clear(): void
      {
          $this->stack = [];
-@@ -38,5 +38,5 @@ class History
+@@ -40,5 +40,5 @@ class History
       * @return void
       */
 -    public function add(Request $request)
@@ -12879,6 +12879,17 @@ index 22026f46a7..52b1ef696b 100644
 +    public static function castEnvelope(\AMQPEnvelope $c, array $a, Stub $stub, bool $isNested, int $filter = 0): array
      {
          $prefix = Caster::PREFIX_VIRTUAL;
+diff --git a/src/Symfony/Component/VarDumper/Caster/ClassStub.php b/src/Symfony/Component/VarDumper/Caster/ClassStub.php
+index 86b44dd2ab..4df5e7c284 100644
+--- a/src/Symfony/Component/VarDumper/Caster/ClassStub.php
++++ b/src/Symfony/Component/VarDumper/Caster/ClassStub.php
+@@ -89,5 +89,5 @@ class ClassStub extends ConstStub
+      * @return mixed
+      */
+-    public static function wrapCallable(mixed $callable)
++    public static function wrapCallable(mixed $callable): mixed
+     {
+         if (\is_object($callable) || !\is_callable($callable)) {
 diff --git a/src/Symfony/Component/VarDumper/Caster/DOMCaster.php b/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
 index d2d3fc1294..c28829f4e2 100644
 --- a/src/Symfony/Component/VarDumper/Caster/DOMCaster.php
@@ -13046,7 +13057,7 @@ index 3120c3d919..0ac928f2ca 100644
      {
          foreach (['snapshot', 'association', 'typeClass'] as $k) {
 diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
-index be5a642226..5ee13fc3ed 100644
+index 02efb1b023..1634f14b80 100644
 --- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
 +++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
 @@ -51,5 +51,5 @@ class ExceptionCaster
@@ -13098,6 +13109,13 @@ index be5a642226..5ee13fc3ed 100644
 +    public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, bool $isNested): array
      {
          if (!$isNested) {
+@@ -293,5 +293,5 @@ class ExceptionCaster
+      * @return array
+      */
+-    public static function castFlattenException(FlattenException $e, array $a, Stub $stub, bool $isNested)
++    public static function castFlattenException(FlattenException $e, array $a, Stub $stub, bool $isNested): array
+     {
+         if ($isNested) {
 diff --git a/src/Symfony/Component/VarDumper/Caster/FiberCaster.php b/src/Symfony/Component/VarDumper/Caster/FiberCaster.php
 index b797dbd634..ce8deb48d5 100644
 --- a/src/Symfony/Component/VarDumper/Caster/FiberCaster.php
@@ -13549,7 +13567,7 @@ index ea86cb4988..9b84f08439 100644
      {
          $map = [];
 diff --git a/src/Symfony/Component/VarDumper/Caster/StubCaster.php b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
-index 3fef05696f..2ed2fd10cb 100644
+index 4b93ff76f6..f65026281e 100644
 --- a/src/Symfony/Component/VarDumper/Caster/StubCaster.php
 +++ b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
 @@ -26,5 +26,5 @@ class StubCaster
@@ -13559,21 +13577,28 @@ index 3fef05696f..2ed2fd10cb 100644
 +    public static function castStub(Stub $c, array $a, Stub $stub, bool $isNested): array
      {
          if ($isNested) {
-@@ -55,5 +55,5 @@ class StubCaster
+@@ -50,5 +50,5 @@ class StubCaster
+      * @return array
+      */
+-    public static function castCutArray(CutArrayStub $c, array $a, Stub $stub, bool $isNested)
++    public static function castCutArray(CutArrayStub $c, array $a, Stub $stub, bool $isNested): array
+     {
+         return $isNested ? $c->preservedSubset : $a;
+@@ -58,5 +58,5 @@ class StubCaster
       * @return array
       */
 -    public static function cutInternals($obj, array $a, Stub $stub, bool $isNested)
 +    public static function cutInternals($obj, array $a, Stub $stub, bool $isNested): array
      {
          if ($isNested) {
-@@ -69,5 +69,5 @@ class StubCaster
+@@ -72,5 +72,5 @@ class StubCaster
       * @return array
       */
 -    public static function castEnum(EnumStub $c, array $a, Stub $stub, bool $isNested)
 +    public static function castEnum(EnumStub $c, array $a, Stub $stub, bool $isNested): array
      {
          if ($isNested) {
-@@ -95,5 +95,5 @@ class StubCaster
+@@ -98,5 +98,5 @@ class StubCaster
       * @return array
       */
 -    public static function castScalar(ScalarStub $scalarStub, array $a, Stub $stub)
@@ -13681,7 +13706,7 @@ index 6a746b88e3..4c0940bd31 100644
      {
          $this->minDepth = $minDepth;
 diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
-index 056b3dfb6a..fea14d593b 100644
+index 64b595d992..5b3bea6366 100644
 --- a/src/Symfony/Component/VarDumper/Cloner/Data.php
 +++ b/src/Symfony/Component/VarDumper/Cloner/Data.php
 @@ -266,5 +266,5 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
@@ -13691,6 +13716,37 @@ index 056b3dfb6a..fea14d593b 100644
 +    public function dump(DumperInterface $dumper): void
      {
          $refs = [0];
+diff --git a/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php b/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php
+index 4c5b315b60..a737e71755 100644
+--- a/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php
++++ b/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php
+@@ -24,5 +24,5 @@ interface DumperInterface
+      * @return void
+      */
+-    public function dumpScalar(Cursor $cursor, string $type, string|int|float|bool|null $value);
++    public function dumpScalar(Cursor $cursor, string $type, string|int|float|bool|null $value): void;
+ 
+     /**
+@@ -35,5 +35,5 @@ interface DumperInterface
+      * @return void
+      */
+-    public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut);
++    public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut): void;
+ 
+     /**
+@@ -46,5 +46,5 @@ interface DumperInterface
+      * @return void
+      */
+-    public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild);
++    public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild): void;
+ 
+     /**
+@@ -58,4 +58,4 @@ interface DumperInterface
+      * @return void
+      */
+-    public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut);
++    public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut): void;
+ }
 diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
 index 053a90972b..5876b02373 100644
 --- a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
@@ -13710,7 +13766,7 @@ index 053a90972b..5876b02373 100644
      {
          if (-1 !== $depth) {
 diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
-index d04c199e67..8b962c311d 100644
+index c337bfed8d..be74450f6b 100644
 --- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
 +++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
 @@ -90,5 +90,5 @@ class CliDumper extends AbstractDumper
@@ -13798,73 +13854,122 @@ index d04c199e67..8b962c311d 100644
      {
          if (-1 === $cursor->hashType) {
 diff --git a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
-index a2e8f8c7b2..5561bc167f 100644
+index 84cfb42595..06cb77d8cb 100644
 --- a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
 +++ b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
 @@ -35,5 +35,5 @@ class ContextualizedDumper implements DataDumperInterface
-      * @return void
+      * @return string|null
       */
 -    public function dump(Data $data)
-+    public function dump(Data $data): void
++    public function dump(Data $data): ?string
      {
          $context = $data->getContext();
+diff --git a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php b/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php
+index e080aff05d..a59bb4d8bd 100644
+--- a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php
++++ b/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php
+@@ -25,4 +25,4 @@ interface DataDumperInterface
+      * @return string|null
+      */
+-    public function dump(Data $data);
++    public function dump(Data $data): ?string;
+ }
 diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
-index 91539daaad..be8c4b5550 100644
+index 7ed141e261..f9dda0f800 100644
 --- a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
 +++ b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
-@@ -83,5 +83,5 @@ class HtmlDumper extends CliDumper
-     }
- 
+@@ -86,5 +86,5 @@ class HtmlDumper extends CliDumper
+      * @return void
+      */
 -    public function setStyles(array $styles)
 +    public function setStyles(array $styles): void
      {
          $this->headerIsDumped = false;
-@@ -103,5 +103,5 @@ class HtmlDumper extends CliDumper
-      * @param array $displayOptions A map of display options to customize the behavior
+@@ -95,5 +95,5 @@ class HtmlDumper extends CliDumper
+      * @return void
+      */
+-    public function setTheme(string $themeName)
++    public function setTheme(string $themeName): void
+     {
+         if (!isset(static::$themes[$themeName])) {
+@@ -111,5 +111,5 @@ class HtmlDumper extends CliDumper
+      * @return void
       */
 -    public function setDisplayOptions(array $displayOptions)
 +    public function setDisplayOptions(array $displayOptions): void
      {
          $this->headerIsDumped = false;
-@@ -774,5 +774,5 @@ EOHTML
-     }
- 
+@@ -122,5 +122,5 @@ class HtmlDumper extends CliDumper
+      * @return void
+      */
+-    public function setDumpHeader(?string $header)
++    public function setDumpHeader(?string $header): void
+     {
+         $this->dumpHeader = $header;
+@@ -132,5 +132,5 @@ class HtmlDumper extends CliDumper
+      * @return void
+      */
+-    public function setDumpBoundaries(string $prefix, string $suffix)
++    public function setDumpBoundaries(string $prefix, string $suffix): void
+     {
+         $this->dumpPrefix = $prefix;
+@@ -152,5 +152,5 @@ class HtmlDumper extends CliDumper
+      * @return string
+      */
+-    protected function getDumpHeader()
++    protected function getDumpHeader(): string
+     {
+         $this->headerIsDumped = $this->outputStream ?? $this->lineDumper;
+@@ -791,5 +791,5 @@ EOHTML
+      * @return void
+      */
 -    public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut)
 +    public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut): void
      {
          if ('' === $str && isset($cursor->attr['img-data'], $cursor->attr['content-type'])) {
-@@ -789,5 +789,5 @@ EOHTML
-     }
- 
+@@ -809,5 +809,5 @@ EOHTML
+      * @return void
+      */
 -    public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild)
 +    public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild): void
      {
          if (Cursor::HASH_OBJECT === $type) {
-@@ -817,5 +817,5 @@ EOHTML
-     }
- 
+@@ -840,5 +840,5 @@ EOHTML
+      * @return void
+      */
 -    public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut)
 +    public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut): void
      {
          $this->dumpEllipsis($cursor, $hasChild, $cut);
-@@ -924,5 +924,5 @@ EOHTML
-     }
- 
+@@ -950,5 +950,5 @@ EOHTML
+      * @return void
+      */
 -    protected function dumpLine(int $depth, bool $endOfValue = false)
 +    protected function dumpLine(int $depth, bool $endOfValue = false): void
      {
          if (-1 === $this->lastDepth) {
 diff --git a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
-index 546490d9ae..f7fed41e4d 100644
+index 98c2149330..2e85547efb 100644
 --- a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
 +++ b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
 @@ -45,5 +45,5 @@ class ServerDumper implements DataDumperInterface
-      * @return void
+      * @return string|null
       */
 -    public function dump(Data $data)
-+    public function dump(Data $data): void
++    public function dump(Data $data): ?string
      {
          if (!$this->connection->write($data) && $this->wrappedDumper) {
+diff --git a/src/Symfony/Component/VarDumper/VarDumper.php b/src/Symfony/Component/VarDumper/VarDumper.php
+index 2e1dad116c..abe2b0b229 100644
+--- a/src/Symfony/Component/VarDumper/VarDumper.php
++++ b/src/Symfony/Component/VarDumper/VarDumper.php
+@@ -43,5 +43,5 @@ class VarDumper
+      * @return mixed
+      */
+-    public static function dump(mixed $var/* , string $label = null */)
++    public static function dump(mixed $var/* , string $label = null */): mixed
+     {
+         $label = 2 <= \func_num_args() ? func_get_arg(1) : null;
 diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
 index ae12ec414a..971280f868 100644
 --- a/src/Symfony/Component/VarExporter/Internal/Exporter.php
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
index 5738a85144d23..dc7aae68cc62e 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -68,7 +68,7 @@ public function __clone()
         $this->clonesIndex = ++$this->clonesCount;
     }
 
-    public function dump(Data $data): void
+    public function dump(Data $data): ?string
     {
         $this->stopwatch?->start('dump');
 
@@ -91,6 +91,8 @@ public function dump(Data $data): void
         ++$this->dataCount;
 
         $this->stopwatch?->stop('dump');
+
+        return null;
     }
 
     public function collect(Request $request, Response $response, \Throwable $exception = null): void
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php
index 440c3faabc895..355c8d6fc0431 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php
@@ -74,7 +74,7 @@ public function cloneVar($var): Data
 
 class MockDumper implements DataDumperInterface
 {
-    public function dump(Data $data)
+    public function dump(Data $data): ?string
     {
         echo '+'.$data->getValue();
     }
diff --git a/src/Symfony/Component/VarDumper/Caster/ClassStub.php b/src/Symfony/Component/VarDumper/Caster/ClassStub.php
index f27a17ce46e2e..86b44dd2abef2 100644
--- a/src/Symfony/Component/VarDumper/Caster/ClassStub.php
+++ b/src/Symfony/Component/VarDumper/Caster/ClassStub.php
@@ -85,6 +85,9 @@ public function __construct(string $identifier, callable|array|string $callable
         }
     }
 
+    /**
+     * @return mixed
+     */
     public static function wrapCallable(mixed $callable)
     {
         if (\is_object($callable) || !\is_callable($callable)) {
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
index be5a642226a19..02efb1b023d9d 100644
--- a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -289,6 +289,9 @@ public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, boo
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castFlattenException(FlattenException $e, array $a, Stub $stub, bool $isNested)
     {
         if ($isNested) {
diff --git a/src/Symfony/Component/VarDumper/Caster/LinkStub.php b/src/Symfony/Component/VarDumper/Caster/LinkStub.php
index 4113e3a2781dc..df95f8b0efa78 100644
--- a/src/Symfony/Component/VarDumper/Caster/LinkStub.php
+++ b/src/Symfony/Component/VarDumper/Caster/LinkStub.php
@@ -60,7 +60,7 @@ public function __construct(string $label, int $line = 0, string $href = null)
         }
     }
 
-    private function getComposerRoot(string $file, bool &$inVendor)
+    private function getComposerRoot(string $file, bool &$inVendor): string|false
     {
         if (!isset(self::$vendorRoots)) {
             self::$vendorRoots = [];
diff --git a/src/Symfony/Component/VarDumper/Caster/StubCaster.php b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
index 3fef05696f038..4b93ff76f626f 100644
--- a/src/Symfony/Component/VarDumper/Caster/StubCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
@@ -46,6 +46,9 @@ public static function castStub(Stub $c, array $a, Stub $stub, bool $isNested)
         return $a;
     }
 
+    /**
+     * @return array
+     */
     public static function castCutArray(CutArrayStub $c, array $a, Stub $stub, bool $isNested)
     {
         return $isNested ? $c->preservedSubset : $a;
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
index 056b3dfb6a153..64b595d99287d 100644
--- a/src/Symfony/Component/VarDumper/Cloner/Data.php
+++ b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -414,7 +414,7 @@ private function dumpChildren(DumperInterface $dumper, Cursor $parentCursor, arr
         return $hashCut;
     }
 
-    private function getStub(mixed $item)
+    private function getStub(mixed $item): mixed
     {
         if (!$item || !\is_array($item)) {
             return $item;
diff --git a/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php b/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php
index 61d02d2406d66..4c5b315b6036a 100644
--- a/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php
+++ b/src/Symfony/Component/VarDumper/Cloner/DumperInterface.php
@@ -20,6 +20,8 @@ interface DumperInterface
 {
     /**
      * Dumps a scalar value.
+     *
+     * @return void
      */
     public function dumpScalar(Cursor $cursor, string $type, string|int|float|bool|null $value);
 
@@ -29,6 +31,8 @@ public function dumpScalar(Cursor $cursor, string $type, string|int|float|bool|n
      * @param string $str The string being dumped
      * @param bool   $bin Whether $str is UTF-8 or binary encoded
      * @param int    $cut The number of characters $str has been cut by
+     *
+     * @return void
      */
     public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut);
 
@@ -38,6 +42,8 @@ public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut);
      * @param int             $type     A Cursor::HASH_* const for the type of hash
      * @param string|int|null $class    The object class, resource type or array count
      * @param bool            $hasChild When the dump of the hash has child item
+     *
+     * @return void
      */
     public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild);
 
@@ -48,6 +54,8 @@ public function enterHash(Cursor $cursor, int $type, string|int|null $class, boo
      * @param string|int|null $class    The object class, resource type or array count
      * @param bool            $hasChild When the dump of the hash has child item
      * @param int             $cut      The number of items the hash has been cut by
+     *
+     * @return void
      */
     public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut);
 }
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
index d04c199e67b54..c337bfed8d659 100644
--- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -648,7 +648,7 @@ private function isWindowsTrueColor(): bool
         return $result;
     }
 
-    private function getSourceLink(string $file, int $line)
+    private function getSourceLink(string $file, int $line): string|false
     {
         if ($fmt = $this->displayOptions['fileLinkFormat']) {
             return \is_string($fmt) ? strtr($fmt, ['%f' => $file, '%l' => $line]) : ($fmt->format($file, $line) ?: 'file://'.$file.'#L'.$line);
diff --git a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
index a2e8f8c7b24da..84cfb4259583c 100644
--- a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php
@@ -32,7 +32,7 @@ public function __construct(DataDumperInterface $wrappedDumper, array $contextPr
     }
 
     /**
-     * @return void
+     * @return string|null
      */
     public function dump(Data $data)
     {
@@ -41,6 +41,6 @@ public function dump(Data $data)
             $context[$contextProvider::class] = $contextProvider->getContext();
         }
 
-        $this->wrappedDumper->dump($data->withContext($context));
+        return $this->wrappedDumper->dump($data->withContext($context));
     }
 }
diff --git a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php b/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php
index b173bccf38916..e080aff05d5b5 100644
--- a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php
+++ b/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php
@@ -20,5 +20,9 @@
  */
 interface DataDumperInterface
 {
+
+    /**
+     * @return string|null
+     */
     public function dump(Data $data);
 }
diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
index 91539daaada52..7ed141e261ab7 100644
--- a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
@@ -82,12 +82,18 @@ public function __construct($output = null, string $charset = null, int $flags =
         $this->styles = static::$themes['dark'] ?? self::$themes['dark'];
     }
 
+    /**
+     * @return void
+     */
     public function setStyles(array $styles)
     {
         $this->headerIsDumped = false;
         $this->styles = $styles + $this->styles;
     }
 
+    /**
+     * @return void
+     */
     public function setTheme(string $themeName)
     {
         if (!isset(static::$themes[$themeName])) {
@@ -101,6 +107,8 @@ public function setTheme(string $themeName)
      * Configures display options.
      *
      * @param array $displayOptions A map of display options to customize the behavior
+     *
+     * @return void
      */
     public function setDisplayOptions(array $displayOptions)
     {
@@ -110,6 +118,8 @@ public function setDisplayOptions(array $displayOptions)
 
     /**
      * Sets an HTML header that will be dumped once in the output stream.
+     *
+     * @return void
      */
     public function setDumpHeader(?string $header)
     {
@@ -118,6 +128,8 @@ public function setDumpHeader(?string $header)
 
     /**
      * Sets an HTML prefix and suffix that will encapse every single dump.
+     *
+     * @return void
      */
     public function setDumpBoundaries(string $prefix, string $suffix)
     {
@@ -136,6 +148,8 @@ public function dump(Data $data, $output = null, array $extraDisplayOptions = []
 
     /**
      * Dumps the HTML header.
+     *
+     * @return string
      */
     protected function getDumpHeader()
     {
@@ -773,6 +787,9 @@ function showCurrent(state)
         return $this->dumpHeader = preg_replace('/\s+/', ' ', $line).'</style>'.$this->dumpHeader;
     }
 
+    /**
+     * @return void
+     */
     public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut)
     {
         if ('' === $str && isset($cursor->attr['img-data'], $cursor->attr['content-type'])) {
@@ -788,6 +805,9 @@ public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut)
         }
     }
 
+    /**
+     * @return void
+     */
     public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild)
     {
         if (Cursor::HASH_OBJECT === $type) {
@@ -816,6 +836,9 @@ public function enterHash(Cursor $cursor, int $type, string|int|null $class, boo
         }
     }
 
+    /**
+     * @return void
+     */
     public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut)
     {
         $this->dumpEllipsis($cursor, $hasChild, $cut);
@@ -923,6 +946,9 @@ protected function style(string $style, string $value, array $attr = []): string
         return $v;
     }
 
+    /**
+     * @return void
+     */
     protected function dumpLine(int $depth, bool $endOfValue = false)
     {
         if (-1 === $this->lastDepth) {
@@ -950,7 +976,7 @@ protected function dumpLine(int $depth, bool $endOfValue = false)
         AbstractDumper::dumpLine($depth);
     }
 
-    private function getSourceLink(string $file, int $line)
+    private function getSourceLink(string $file, int $line): string|false
     {
         $options = $this->extraDisplayOptions + $this->displayOptions;
 
diff --git a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
index 546490d9aeb07..98c2149330106 100644
--- a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php
@@ -42,12 +42,14 @@ public function getContextProviders(): array
     }
 
     /**
-     * @return void
+     * @return string|null
      */
     public function dump(Data $data)
     {
         if (!$this->connection->write($data) && $this->wrappedDumper) {
-            $this->wrappedDumper->dump($data);
+            return $this->wrappedDumper->dump($data);
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Component/VarDumper/Server/Connection.php b/src/Symfony/Component/VarDumper/Server/Connection.php
index 692752deafb40..e5e62508343ed 100644
--- a/src/Symfony/Component/VarDumper/Server/Connection.php
+++ b/src/Symfony/Component/VarDumper/Server/Connection.php
@@ -83,13 +83,13 @@ public function write(Data $data): bool
     }
 
     /**
-     * @psalm-return false|resource
+     * @return resource|null
      */
     private function createSocket()
     {
         set_error_handler(fn () => true);
         try {
-            return stream_socket_client($this->host, $errno, $errstr, 3, \STREAM_CLIENT_CONNECT | \STREAM_CLIENT_ASYNC_CONNECT);
+            return stream_socket_client($this->host, $errno, $errstr, 3, \STREAM_CLIENT_CONNECT | \STREAM_CLIENT_ASYNC_CONNECT) ?: null;
         } finally {
             restore_error_handler();
         }
diff --git a/src/Symfony/Component/VarDumper/VarDumper.php b/src/Symfony/Component/VarDumper/VarDumper.php
index 7c160166a9788..2e1dad116cdd9 100644
--- a/src/Symfony/Component/VarDumper/VarDumper.php
+++ b/src/Symfony/Component/VarDumper/VarDumper.php
@@ -39,6 +39,8 @@ class VarDumper
 
     /**
      * @param string|null $label
+     *
+     * @return mixed
      */
     public static function dump(mixed $var/* , string $label = null */)
     {

From fd527db5dcc0d5d9a5f90c30de95d96bbafbddb7 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 14 Apr 2023 14:13:08 +0200
Subject: [PATCH 402/475] cs fix

---
 src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php b/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php
index e080aff05d5b5..df05b6af57e5a 100644
--- a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php
+++ b/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php
@@ -20,7 +20,6 @@
  */
 interface DataDumperInterface
 {
-
     /**
      * @return string|null
      */

From 09f0049801c7229580f97e6ce9e67d50e5eb035a Mon Sep 17 00:00:00 2001
From: Cyb0rk <>
Date: Sun, 26 Mar 2023 22:18:14 +0200
Subject: [PATCH 403/475] [Mime] Added getDispostion() to TextPart to get
 current content disposition.

---
 src/Symfony/Component/Mime/CHANGELOG.md      | 1 +
 src/Symfony/Component/Mime/Part/TextPart.php | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/src/Symfony/Component/Mime/CHANGELOG.md b/src/Symfony/Component/Mime/CHANGELOG.md
index 3676f8a82ef42..395226c76bcbb 100644
--- a/src/Symfony/Component/Mime/CHANGELOG.md
+++ b/src/Symfony/Component/Mime/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Support detection of related parts if `Content-Id` is used instead of the name
+ * Add `TextPart::getDispostion()`
 
 6.2
 ---
diff --git a/src/Symfony/Component/Mime/Part/TextPart.php b/src/Symfony/Component/Mime/Part/TextPart.php
index bddca0a2b474f..3b1eb8d82204a 100644
--- a/src/Symfony/Component/Mime/Part/TextPart.php
+++ b/src/Symfony/Component/Mime/Part/TextPart.php
@@ -96,6 +96,14 @@ public function setDisposition(string $disposition): static
         return $this;
     }
 
+    /**
+     * @return ?string null or one of attachment, inline, or form-data
+     */
+    public function getDisposition(): ?string
+    {
+        return $this->disposition;
+    }
+
     /**
      * Sets the name of the file (used by FormDataPart).
      *

From 686aaf400dd1fde8ccec33e6d17c0c447a0ee8ff Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 14 Apr 2023 19:23:57 +0200
Subject: [PATCH 404/475] Fix test

---
 .../HttpKernel/Tests/EventListener/DumpListenerTest.php         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php
index 355c8d6fc0431..b73c799c59a44 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/DumpListenerTest.php
@@ -77,5 +77,7 @@ class MockDumper implements DataDumperInterface
     public function dump(Data $data): ?string
     {
         echo '+'.$data->getValue();
+
+        return null;
     }
 }

From fef4883385007b458d78535bb71048ddad2ee715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Thu, 2 Mar 2023 16:42:33 +0100
Subject: [PATCH 405/475] [HttpKernel] Merge PartialDenormalizationException
 errors and validation errors together

---
 .../FrameworkBundle/Resources/config/web.php  |  1 +
 .../RequestPayloadValueResolver.php           | 47 ++++++++++++++-----
 .../RequestPayloadValueResolverTest.php       | 32 +++++++++++--
 .../Component/HttpKernel/composer.json        |  2 +-
 4 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
index 1a41a60fe1ddd..852303b1368da 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
@@ -66,6 +66,7 @@
             ->args([
                 service('serializer'),
                 service('validator')->nullOnInvalid(),
+                service('translator')->nullOnInvalid(),
             ])
             ->tag('controller.targeted_value_resolver', ['name' => RequestPayloadValueResolver::class])
 
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
index d35b2c750420a..8d346685223d1 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
@@ -19,14 +19,15 @@
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Serializer\Exception\NotEncodableValueException;
-use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Exception\PartialDenormalizationException;
 use Symfony\Component\Serializer\Exception\UnsupportedFormatException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Validator\ConstraintViolationInterface;
+use Symfony\Component\Validator\ConstraintViolation;
+use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Exception\ValidationFailedException;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * @author Konstantin Myakshin <molodchick@gmail.com>
@@ -51,7 +52,8 @@ final class RequestPayloadValueResolver implements ValueResolverInterface
 
     public function __construct(
         private readonly SerializerInterface&DenormalizerInterface $serializer,
-        private readonly ?ValidatorInterface $validator,
+        private readonly ?ValidatorInterface $validator = null,
+        private readonly ?TranslatorInterface $translator = null,
     ) {
     }
 
@@ -71,14 +73,37 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
                 throw new \LogicException(sprintf('Could not resolve the "$%s" controller argument: argument should be typed.', $argument->getName()));
             }
 
-            try {
-                $payload = $this->$payloadMapper($request, $type, $attributes[0]);
-            } catch (PartialDenormalizationException $e) {
-                throw new HttpException($validationFailedCode, implode("\n", array_map(static fn (NotNormalizableValueException $e) => $e->getMessage(), $e->getErrors())), $e);
-            }
-
-            if (null !== $payload && \count($violations = $this->validator?->validate($payload) ?? [])) {
-                throw new HttpException($validationFailedCode, implode("\n", array_map(static fn (ConstraintViolationInterface $e) => $e->getMessage(), iterator_to_array($violations))), new ValidationFailedException($payload, $violations));
+            if ($this->validator) {
+                $violations = new ConstraintViolationList();
+                try {
+                    $payload = $this->$payloadMapper($request, $type, $attributes[0]);
+                } catch (PartialDenormalizationException $e) {
+                    $trans = $this->translator ? $this->translator->trans(...) : fn ($m, $p) => strtr($m, $p);
+                    foreach ($e->getErrors() as $error) {
+                        $parameters = ['{{ type }}' => implode('|', $error->getExpectedTypes())];
+                        if ($error->canUseMessageForUser()) {
+                            $parameters['hint'] = $error->getMessage();
+                        }
+                        $template = 'This value should be of type {{ type }}.';
+                        $message = $trans($template, $parameters, 'validators');
+                        $violations->add(new ConstraintViolation($message, $template, $parameters, null, $error->getPath(), null));
+                    }
+                    $payload = $e->getData();
+                }
+
+                if (null !== $payload) {
+                    $violations->addAll($this->validator->validate($payload));
+                }
+
+                if (\count($violations)) {
+                    throw new HttpException($validationFailedCode, implode("\n", array_map(static fn ($e) => $e->getMessage(), iterator_to_array($violations))), new ValidationFailedException($payload, $violations));
+                }
+            } else {
+                try {
+                    $payload = $this->$payloadMapper($request, $type, $attributes[0]);
+                } catch (PartialDenormalizationException $e) {
+                    throw new HttpException($validationFailedCode, implode("\n", array_map(static fn ($e) => $e->getMessage(), $e->getErrors())), $e);
+                }
             }
 
             if (null !== $payload || $argument->isNullable()) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
index 07da5cbe647d7..7725be5ffb970 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
@@ -19,6 +19,7 @@
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Exception\PartialDenormalizationException;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Validator\ConstraintViolation;
@@ -46,9 +47,29 @@ public function testNotTypedArgument()
         $resolver->resolve($request, $argument);
     }
 
+    public function testWithoutValidatorAndCouldNotDenormalize()
+    {
+        $content = '{"price": 50, "title": ["not a string"]}';
+        $serializer = new Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()]);
+
+        $resolver = new RequestPayloadValueResolver($serializer);
+
+        $argument = new ArgumentMetadata('invalid', RequestPayload::class, false, false, null, false, [
+            MapRequestPayload::class => new MapRequestPayload(),
+        ]);
+        $request = Request::create('/', 'POST', server: ['CONTENT_TYPE' => 'application/json'], content: $content);
+
+        try {
+            $resolver->resolve($request, $argument);
+            $this->fail(sprintf('Expected "%s" to be thrown.', HttpException::class));
+        } catch (HttpException $e) {
+            $this->assertInstanceOf(PartialDenormalizationException::class, $e->getPrevious());
+        }
+    }
+
     public function testValidationNotPassed()
     {
-        $content = '{"price": 50}';
+        $content = '{"price": 50, "title": ["not a string"]}';
         $payload = new RequestPayload(50);
         $serializer = new Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()]);
 
@@ -69,7 +90,10 @@ public function testValidationNotPassed()
             $resolver->resolve($request, $argument);
             $this->fail(sprintf('Expected "%s" to be thrown.', HttpException::class));
         } catch (HttpException $e) {
-            $this->assertInstanceOf(ValidationFailedException::class, $e->getPrevious());
+            $validationFailedException = $e->getPrevious();
+            $this->assertInstanceOf(ValidationFailedException::class, $validationFailedException);
+            $this->assertSame('This value should be of type unknown.', $validationFailedException->getViolations()[0]->getMessage());
+            $this->assertSame('Test', $validationFailedException->getViolations()[1]->getMessage());
         }
     }
 
@@ -77,7 +101,7 @@ public function testUnsupportedMedia()
     {
         $serializer = new Serializer();
 
-        $resolver = new RequestPayloadValueResolver($serializer, null);
+        $resolver = new RequestPayloadValueResolver($serializer);
 
         $argument = new ArgumentMetadata('invalid', \stdClass::class, false, false, null, false, [
             MapRequestPayload::class => new MapRequestPayload(),
@@ -161,6 +185,8 @@ public function testRequestInputValidationPassed()
 
 class RequestPayload
 {
+    public string $title;
+
     public function __construct(public readonly float $price)
     {
     }
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index c75d116794bb8..da2891820aab8 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -36,7 +36,7 @@
         "symfony/finder": "^5.4|^6.0",
         "symfony/http-client-contracts": "^2.5|^3",
         "symfony/process": "^5.4|^6.0",
-        "symfony/property-access": "^5.4|^6.0",
+        "symfony/property-access": "^5.4.5|^6.0.5",
         "symfony/routing": "^5.4|^6.0",
         "symfony/serializer": "^6.3",
         "symfony/stopwatch": "^5.4|^6.0",

From a51fa5600ba48665af3e6ebed6894af62757d11a Mon Sep 17 00:00:00 2001
From: Benjamin Georgeault <bgeorgeault@wedgesama.fr>
Date: Sun, 16 Apr 2023 08:19:24 +0200
Subject: [PATCH 406/475] [Validator] Add new parameter for translation on
 Length constraint: current value length.

---
 .../Tests/Functional/ApiAttributesTest.php    |  7 ++-
 src/Symfony/Component/Validator/CHANGELOG.md  |  1 +
 .../Validator/Constraints/LengthValidator.php |  2 +
 .../Tests/Constraints/LengthValidatorTest.php | 56 +++++++++++--------
 4 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ApiAttributesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ApiAttributesTest.php
index 207edcf7aa707..96b6d0ee98e14 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ApiAttributesTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ApiAttributesTest.php
@@ -256,7 +256,8 @@ public static function mapRequestPayloadProvider(): iterable
                             "template": "This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.",
                             "parameters": {
                                 "{{ value }}": "\"\"",
-                                "{{ limit }}": "10"
+                                "{{ limit }}": "10",
+                                "{{ value_length }}": "0"
                             },
                             "type": "urn:uuid:9ff3fdc4-b214-49db-8718-39c315e33d45"
                         }
@@ -289,6 +290,7 @@ public static function mapRequestPayloadProvider(): iterable
                         <parameters>
                             <item key="{{ value }}">"H"</item>
                             <item key="{{ limit }}">10</item>
+                            <item key="{{ value_length }}">1</item>
                         </parameters>
                         <type>urn:uuid:9ff3fdc4-b214-49db-8718-39c315e33d45</type>
                     </violations>
@@ -336,7 +338,8 @@ public static function mapRequestPayloadProvider(): iterable
                             "template": "This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.",
                             "parameters": {
                                 "{{ value }}": "\"\"",
-                                "{{ limit }}": "10"
+                                "{{ limit }}": "10",
+                                "{{ value_length }}": "0"
                             },
                             "type": "urn:uuid:9ff3fdc4-b214-49db-8718-39c315e33d45"
                         }
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
index 980001af05f71..262bf3a08e05f 100644
--- a/src/Symfony/Component/Validator/CHANGELOG.md
+++ b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -12,6 +12,7 @@ CHANGELOG
  * Add the `countUnit` option to the `Length` constraint to allow counting the string length either by code points (like before, now the default setting `Length::COUNT_CODEPOINTS`), bytes (`Length::COUNT_BYTES`) or graphemes (`Length::COUNT_GRAPHEMES`)
  * Add the `filenameMaxLength` option to the `File` constraint
  * Add the `exclude` option to the `Cascade` constraint
+ * Add the `value_length` parameter to `Length` constraint
 
 6.2
 ---
diff --git a/src/Symfony/Component/Validator/Constraints/LengthValidator.php b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
index f70adf1cba13c..c92fca0d59858 100644
--- a/src/Symfony/Component/Validator/Constraints/LengthValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
@@ -77,6 +77,7 @@ public function validate(mixed $value, Constraint $constraint)
             $this->context->buildViolation($exactlyOptionEnabled ? $constraint->exactMessage : $constraint->maxMessage)
                 ->setParameter('{{ value }}', $this->formatValue($stringValue))
                 ->setParameter('{{ limit }}', $constraint->max)
+                ->setParameter('{{ value_length }}', $length)
                 ->setInvalidValue($value)
                 ->setPlural((int) $constraint->max)
                 ->setCode($exactlyOptionEnabled ? Length::NOT_EQUAL_LENGTH_ERROR : Length::TOO_LONG_ERROR)
@@ -91,6 +92,7 @@ public function validate(mixed $value, Constraint $constraint)
             $this->context->buildViolation($exactlyOptionEnabled ? $constraint->exactMessage : $constraint->minMessage)
                 ->setParameter('{{ value }}', $this->formatValue($stringValue))
                 ->setParameter('{{ limit }}', $constraint->min)
+                ->setParameter('{{ value_length }}', $length)
                 ->setInvalidValue($value)
                 ->setPlural((int) $constraint->min)
                 ->setCode($exactlyOptionEnabled ? Length::NOT_EQUAL_LENGTH_ERROR : Length::TOO_SHORT_ERROR)
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
index 96d7959992a79..000b9d900c690 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
@@ -40,6 +40,7 @@ public function testEmptyStringIsInvalid()
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '""')
             ->setParameter('{{ limit }}', $limit)
+            ->setParameter('{{ value_length }}', 0)
             ->setInvalidValue('')
             ->setPlural($limit)
             ->setCode(Length::NOT_EQUAL_LENGTH_ERROR)
@@ -55,14 +56,14 @@ public function testExpectsStringCompatibleType()
     public static function getThreeOrLessCharacters()
     {
         return [
-            [12],
-            ['12'],
-            ['üü'],
-            ['éé'],
-            [123],
-            ['123'],
-            ['üüü'],
-            ['ééé'],
+            [12, 2],
+            ['12', 2],
+            ['üü', 2],
+            ['éé', 2],
+            [123, 3],
+            ['123', 3],
+            ['üüü', 3],
+            ['ééé', 3],
         ];
     }
 
@@ -79,14 +80,14 @@ public static function getFourCharacters()
     public static function getFiveOrMoreCharacters()
     {
         return [
-            [12345],
-            ['12345'],
-            ['üüüüü'],
-            ['ééééé'],
-            [123456],
-            ['123456'],
-            ['üüüüüü'],
-            ['éééééé'],
+            [12345, 5],
+            ['12345', 5],
+            ['üüüüü', 5],
+            ['ééééé', 5],
+            [123456, 6],
+            ['123456', 6],
+            ['üüüüüü', 6],
+            ['éééééé', 6],
         ];
     }
 
@@ -183,7 +184,7 @@ public function testValidBytesValues()
     /**
      * @dataProvider getThreeOrLessCharacters
      */
-    public function testInvalidValuesMin($value)
+    public function testInvalidValuesMin($value, $valueLength)
     {
         $constraint = new Length([
             'min' => 4,
@@ -195,6 +196,7 @@ public function testInvalidValuesMin($value)
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'.$value.'"')
             ->setParameter('{{ limit }}', 4)
+            ->setParameter('{{ value_length }}', $valueLength)
             ->setInvalidValue($value)
             ->setPlural(4)
             ->setCode(Length::TOO_SHORT_ERROR)
@@ -204,7 +206,7 @@ public function testInvalidValuesMin($value)
     /**
      * @dataProvider getThreeOrLessCharacters
      */
-    public function testInvalidValuesMinNamed($value)
+    public function testInvalidValuesMinNamed($value, $valueLength)
     {
         $constraint = new Length(min: 4, minMessage: 'myMessage');
 
@@ -213,6 +215,7 @@ public function testInvalidValuesMinNamed($value)
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'.$value.'"')
             ->setParameter('{{ limit }}', 4)
+            ->setParameter('{{ value_length }}', $valueLength)
             ->setInvalidValue($value)
             ->setPlural(4)
             ->setCode(Length::TOO_SHORT_ERROR)
@@ -222,7 +225,7 @@ public function testInvalidValuesMinNamed($value)
     /**
      * @dataProvider getFiveOrMoreCharacters
      */
-    public function testInvalidValuesMax($value)
+    public function testInvalidValuesMax($value, $valueLength)
     {
         $constraint = new Length([
             'max' => 4,
@@ -234,6 +237,7 @@ public function testInvalidValuesMax($value)
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'.$value.'"')
             ->setParameter('{{ limit }}', 4)
+            ->setParameter('{{ value_length }}', $valueLength)
             ->setInvalidValue($value)
             ->setPlural(4)
             ->setCode(Length::TOO_LONG_ERROR)
@@ -243,7 +247,7 @@ public function testInvalidValuesMax($value)
     /**
      * @dataProvider getFiveOrMoreCharacters
      */
-    public function testInvalidValuesMaxNamed($value)
+    public function testInvalidValuesMaxNamed($value, $valueLength)
     {
         $constraint = new Length(max: 4, maxMessage: 'myMessage');
 
@@ -252,6 +256,7 @@ public function testInvalidValuesMaxNamed($value)
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'.$value.'"')
             ->setParameter('{{ limit }}', 4)
+            ->setParameter('{{ value_length }}', $valueLength)
             ->setInvalidValue($value)
             ->setPlural(4)
             ->setCode(Length::TOO_LONG_ERROR)
@@ -261,7 +266,7 @@ public function testInvalidValuesMaxNamed($value)
     /**
      * @dataProvider getThreeOrLessCharacters
      */
-    public function testInvalidValuesExactLessThanFour($value)
+    public function testInvalidValuesExactLessThanFour($value, $valueLength)
     {
         $constraint = new Length([
             'min' => 4,
@@ -274,6 +279,7 @@ public function testInvalidValuesExactLessThanFour($value)
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'.$value.'"')
             ->setParameter('{{ limit }}', 4)
+            ->setParameter('{{ value_length }}', $valueLength)
             ->setInvalidValue($value)
             ->setPlural(4)
             ->setCode(Length::NOT_EQUAL_LENGTH_ERROR)
@@ -283,7 +289,7 @@ public function testInvalidValuesExactLessThanFour($value)
     /**
      * @dataProvider getThreeOrLessCharacters
      */
-    public function testInvalidValuesExactLessThanFourNamed($value)
+    public function testInvalidValuesExactLessThanFourNamed($value, $valueLength)
     {
         $constraint = new Length(exactly: 4, exactMessage: 'myMessage');
 
@@ -292,6 +298,7 @@ public function testInvalidValuesExactLessThanFourNamed($value)
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'.$value.'"')
             ->setParameter('{{ limit }}', 4)
+            ->setParameter('{{ value_length }}', $valueLength)
             ->setInvalidValue($value)
             ->setPlural(4)
             ->setCode(Length::NOT_EQUAL_LENGTH_ERROR)
@@ -301,7 +308,7 @@ public function testInvalidValuesExactLessThanFourNamed($value)
     /**
      * @dataProvider getFiveOrMoreCharacters
      */
-    public function testInvalidValuesExactMoreThanFour($value)
+    public function testInvalidValuesExactMoreThanFour($value, $valueLength)
     {
         $constraint = new Length([
             'min' => 4,
@@ -314,6 +321,7 @@ public function testInvalidValuesExactMoreThanFour($value)
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'.$value.'"')
             ->setParameter('{{ limit }}', 4)
+            ->setParameter('{{ value_length }}', $valueLength)
             ->setInvalidValue($value)
             ->setPlural(4)
             ->setCode(Length::NOT_EQUAL_LENGTH_ERROR)
@@ -355,6 +363,7 @@ public function testInvalidValuesExactDefaultCountUnitWithGraphemeInput()
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'."A\u{0300}".'"')
             ->setParameter('{{ limit }}', 1)
+            ->setParameter('{{ value_length }}', 2)
             ->setInvalidValue("A\u{0300}")
             ->setPlural(1)
             ->setCode(Length::NOT_EQUAL_LENGTH_ERROR)
@@ -370,6 +379,7 @@ public function testInvalidValuesExactBytesCountUnitWithGraphemeInput()
         $this->buildViolation('myMessage')
             ->setParameter('{{ value }}', '"'."A\u{0300}".'"')
             ->setParameter('{{ limit }}', 1)
+            ->setParameter('{{ value_length }}', 3)
             ->setInvalidValue("A\u{0300}")
             ->setPlural(1)
             ->setCode(Length::NOT_EQUAL_LENGTH_ERROR)

From ccd5bb96884f194d001fcfb3afcdcd19868a5ffd Mon Sep 17 00:00:00 2001
From: Nadim AL ABDOU <nadim.alabdou@gmail.com>
Date: Sun, 16 Apr 2023 17:19:24 +0200
Subject: [PATCH 407/475] [Routing] Convert BackedEnums passed as controller
 action parameters to their value

---
 .../Routing/Loader/AnnotationClassLoader.php     |  6 +++++-
 .../DefaultValueController.php                   | 16 ++++++++++++++++
 .../AttributeFixtures/DefaultValueController.php | 12 ++++++++++++
 .../Loader/AnnotationClassLoaderTestCase.php     |  4 +++-
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
index 6da68c7594544..b06c649885b56 100644
--- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -208,7 +208,11 @@ protected function addRoute(RouteCollection $collection, object $annot, array $g
             }
             foreach ($paths as $locale => $path) {
                 if (preg_match(sprintf('/\{%s(?:<.*?>)?\}/', preg_quote($param->name)), $path)) {
-                    $defaults[$param->name] = $param->getDefaultValue();
+                    if (\is_scalar($defaultValue = $param->getDefaultValue()) || null === $defaultValue) {
+                        $defaults[$param->name] = $defaultValue;
+                    } elseif ($defaultValue instanceof \BackedEnum) {
+                        $defaults[$param->name] = $defaultValue->value;
+                    }
                     break;
                 }
             }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/DefaultValueController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/DefaultValueController.php
index f7e38c290d2e7..c5e0c20d356e1 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/DefaultValueController.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/DefaultValueController.php
@@ -3,6 +3,8 @@
 namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
 
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Tests\Fixtures\Enum\TestIntBackedEnum;
+use Symfony\Component\Routing\Tests\Fixtures\Enum\TestStringBackedEnum;
 

10000
 class DefaultValueController
 {
@@ -20,4 +22,18 @@ public function action($default = 'value')
     public function hello(string $name = 'World')
     {
     }
+
+    /**
+     * @Route("/enum/{default}", name="string_enum_action")
+     */
+    public function stringEnumAction(TestStringBackedEnum $default = TestStringBackedEnum::Diamonds)
+    {
+    }
+
+    /**
+     * @Route("/enum/{default<\d+>}", name="int_enum_action")
+     */
+    public function intEnumAction(TestIntBackedEnum $default = TestIntBackedEnum::Diamonds)
+    {
+    }
 }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/DefaultValueController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/DefaultValueController.php
index 5bbfb0126dd2b..4d0df50698c22 100644
--- a/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/DefaultValueController.php
+++ b/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/DefaultValueController.php
@@ -3,6 +3,8 @@
 namespace Symfony\Component\Routing\Tests\Fixtures\AttributeFixtures;
 
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Tests\Fixtures\Enum\TestIntBackedEnum;
+use Symfony\Component\Routing\Tests\Fixtures\Enum\TestStringBackedEnum;
 
 class DefaultValueController
 {
@@ -18,4 +20,14 @@ public function action($default = 'value')
     public function hello(string $name = 'World')
     {
     }
+
+    #[Route(path: '/enum/{default}', name: 'string_enum_action')]
+    public function stringEnumAction(TestStringBackedEnum $default = TestStringBackedEnum::Diamonds)
+    {
+    }
+
+    #[Route(path: '/enum/{default<\d+>}', name: 'int_enum_action')]
+    public function intEnumAction(TestIntBackedEnum $default = TestIntBackedEnum::Diamonds)
+    {
+    }
 }
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTestCase.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTestCase.php
index b717d19609794..62a1d423441eb 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTestCase.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTestCase.php
@@ -104,11 +104,13 @@ public function testLocalizedPathRoutesWithExplicitPathPropety()
     public function testDefaultValuesForMethods()
     {
         $routes = $this->loader->load($this->getNamespace().'\DefaultValueController');
-        $this->assertCount(3, $routes);
+        $this->assertCount(5, $routes);
         $this->assertEquals('/{default}/path', $routes->get('action')->getPath());
         $this->assertEquals('value', $routes->get('action')->getDefault('default'));
         $this->assertEquals('Symfony', $routes->get('hello_with_default')->getDefault('name'));
         $this->assertEquals('World', $routes->get('hello_without_default')->getDefault('name'));
+        $this->assertEquals('diamonds', $routes->get('string_enum_action')->getDefault('default'));
+        $this->assertEquals(20, $routes->get('int_enum_action')->getDefault('default'));
     }
 
     public function testMethodActionControllers()

From 82d61d0b6b8b4e7bf6cb8766d9c82a3973b04739 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 17 Apr 2023 09:05:30 +0200
Subject: [PATCH 408/475] [Security] Fix OIDC-related test cases

---
 .../Tests/Functional/AccessTokenTest.php      |  3 +++
 .../AccessToken/Oidc/OidcTokenHandlerTest.php | 19 +++++++++++--------
 .../Oidc/OidcUserInfoTokenHandlerTest.php     |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AccessTokenTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AccessTokenTest.php
index 49d31cb664f5e..8ca49ccc1430c 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AccessTokenTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/AccessTokenTest.php
@@ -333,6 +333,9 @@ public function testSelfContainedTokens()
         $this->assertSame(['message' => 'Welcome @dunglas!'], json_decode($response->getContent(), true));
     }
 
+    /**
+     * @requires extension openssl
+     */
     public function testOidcSuccess()
     {
         $time = time();
diff --git a/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcTokenHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcTokenHandlerTest.php
index 50cc3c7c15b14..d9fa14f0b8ff5 100644
--- a/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcTokenHandlerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcTokenHandlerTest.php
@@ -23,6 +23,9 @@
 use Symfony\Component\Security\Http\AccessToken\Oidc\OidcTokenHandler;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
 
+/**
+ * @requires extension openssl
+ */
 class OidcTokenHandlerTest extends TestCase
 {
     private const AUDIENCE = 'Symfony OIDC';
@@ -64,7 +67,7 @@ public function testGetsUserIdentifierFromSignedToken(string $claim, string $exp
         $this->assertEquals($claims['sub'], $actualUser->getUserIdentifier());
     }
 
-    public function getClaims(): iterable
+    public static function getClaims(): iterable
     {
         yield ['sub', 'e21bf182-1538-406e-8ccb-e25a17aba39f'];
         yield ['email', 'foo@example.com'];
@@ -90,13 +93,13 @@ public function testThrowsAnErrorIfTokenIsInvalid(string $token)
         ))->getUserBadgeFrom($token);
     }
 
-    public function getInvalidTokens(): iterable
+    public static function getInvalidTokens(): iterable
     {
         // Invalid token
         yield ['invalid'];
         // Token is expired
         yield [
-            $this->buildJWS(json_encode([
+            self::buildJWS(json_encode([
                 'iat' => time() - 3600,
                 'nbf' => time() - 3600,
                 'exp' => time() - 3590,
@@ -108,7 +111,7 @@ public function getInvalidTokens(): iterable
         ];
         // Invalid audience
         yield [
-            $this->buildJWS(json_encode([
+            self::buildJWS(json_encode([
                 'iat' => time(),
                 'nbf' => time(),
                 'exp' => time() + 3590,
@@ -141,25 +144,25 @@ public function testThrowsAnErrorIfUserPropertyIsMissing()
 
         (new OidcTokenHandler(
             new ES256(),
-            $this->getJWK(),
+            self::getJWK(),
             $loggerMock,
             'email',
             self::AUDIENCE
         ))->getUserBadgeFrom($token);
     }
 
-    private function buildJWS(string $payload): string
+    private static function buildJWS(string $payload): string
     {
         return (new CompactSerializer())->serialize((new JWSBuilder(new AlgorithmManager([
             new ES256(),
         ])))->create()
             ->withPayload($payload)
-            ->addSignature($this->getJWK(), ['alg' => 'ES256'])
+            ->addSignature(self::getJWK(), ['alg' => 'ES256'])
             ->build()
         );
     }
 
-    private function getJWK(): JWK
+    private static function getJWK(): JWK
     {
         // tip: use https://mkjwk.org/ to generate a JWK
         return new JWK([
diff --git a/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcUserInfoTokenHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcUserInfoTokenHandlerTest.php
index 3183ef0e397a1..3b96174a0d63e 100644
--- a/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcUserInfoTokenHandlerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/AccessToken/Oidc/OidcUserInfoTokenHandlerTest.php
@@ -54,7 +54,7 @@ public function testGetsUserIdentifierFromOidcServerResponse(string $claim, stri
         $this->assertEquals($claims['sub'], $actualUser->getUserIdentifier());
     }
 
-    public function getClaims(): iterable
+    public static function getClaims(): iterable
     {
         yield ['sub', 'e21bf182-1538-406e-8ccb-e25a17aba39f'];
         yield ['email', 'foo@example.com'];

From 6c1f39a73fe8b02b5d5c73fc60efb1829e2a0f47 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 13 Apr 2023 19:22:41 +0200
Subject: [PATCH 409/475] [HttpKernel] Don't use eval() to render ESI/SSI

---
 .../HttpCache/AbstractSurrogate.php           |  4 ++++
 .../Component/HttpKernel/HttpCache/Esi.php    | 16 ++++++----------
 .../HttpKernel/HttpCache/HttpCache.php        | 16 +++++++++++++++-
 .../Component/HttpKernel/HttpCache/Ssi.php    | 14 ++++++--------
 .../HttpKernel/Tests/HttpCache/EsiTest.php    | 19 ++++++++++++-------
 .../HttpKernel/Tests/HttpCache/SsiTest.php    |  9 ++++++---
 6 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
index f158cca3f9a9a..ce34979bbd2a0 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
@@ -24,6 +24,10 @@
 abstract class AbstractSurrogate implements SurrogateInterface
 {
     protected $contentTypes;
+
+    /**
+     * @deprecated since Symfony 6.3
+     */
     protected $phpEscapeMap = [
         ['<?', '<%', '<s', '<S'],
         ['<?php echo "<?"; ?>', '<?php echo "<%"; ?>', '<?php echo "<s"; ?>', '<?php echo "<S"; ?>'],
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
index 4730b33c132f1..d1761ccaaeb5a 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
@@ -74,8 +74,10 @@ public function process(Request $request, Response $response): Response
         $content = preg_replace('#<esi\:remove>.*?</esi\:remove>#s', '', $content);
         $content = preg_replace('#<esi\:comment[^>]+>#s', '', $content);
 
+        static $cookie;
+        $cookie = hash('xxh128', $cookie ??= random_bytes(16), true);
+        $boundary = base64_encode($cookie);
         $chunks = preg_split('#<esi\:include\s+(.*?)\s*(?:/|</esi\:include)>#', $content, -1, \PREG_SPLIT_DELIM_CAPTURE);
-        $chunks[0] = str_replace($this->phpEscapeMap[0], $this->phpEscapeMap[1], $chunks[0]);
 
         $i = 1;
         while (isset($chunks[$i])) {
@@ -89,16 +91,10 @@ public function process(Request $request, Response $response): Response
                 throw new \RuntimeException('Unable to process an ESI tag without a "src" attribute.');
             }
 
-            $chunks[$i] = sprintf('<?php echo $this->surrogate->handle($this, %s, %s, %s) ?>'."\n",
-                var_export($options['src'], true),
-                var_export($options['alt'] ?? '', true),
-                isset($options['onerror']) && 'continue' === $options['onerror'] ? 'true' : 'false'
-            );
-            ++$i;
-            $chunks[$i] = str_replace($this->phpEscapeMap[0], $this->phpEscapeMap[1], $chunks[$i]);
-            ++$i;
+            $chunks[$i] = $boundary.$options['src']."\n".($options['alt'] ?? '')."\n".('continue' === ($options['onerror'] ?? ''))."\n";
+            $i += 2;
         }
-        $content = implode('', $chunks);
+        $content = $boundary.implode('', $chunks).$boundary;
 
         $response->setContent($content);
         $response->headers->set('X-Body-Eval', 'ESI');
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
index f17c07c071f9c..374fba8af5441 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -641,7 +641,21 @@ private function restoreResponseBody(Request $request, Response $response): void
             if ($response->headers->has('X-Body-File')) {
                 include $response->headers->get('X-Body-File');
             } else {
-                eval('; ?>'.$response->getContent().'<?php ;');
+                $content = $response->getContent();
+
+                if (substr($content, -24) === $boundary = substr($content, 0, 24)) {
+                    $j = strpos($content, $boundary, 24);
+                    echo substr($content, 24, $j - 24);
+                    $i = $j + 24;
+
+                    while (false !== $j = strpos($content, $boundary, $i)) {
+                        [$uri, $alt, $ignoreErrors, $part] = explode("\n", substr($content, $i, $j - $i), 4);
+                        $i = $j + 24;
+
+                        echo $this->surrogate->handle($this, $uri, $alt, $ignoreErrors);
+                        echo $part;
+                    }
+                }
             }
 
             $response->setContent(ob_get_clean());
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
index bde72914a7adc..45a95552649ac 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Ssi.php
@@ -56,8 +56,10 @@ public function process(Request $request, Response $response): Response
         // we don't use a proper XML parser here as we can have SSI tags in a plain text response
         $content = $response->getContent();
 
+        static $cookie;
+        $cookie = hash('xxh128', $cookie ??= random_bytes(16), true);
+        $boundary = base64_encode($cookie);
         $chunks = preg_split('#<!--\#include\s+(.*?)\s*-->#', $content, -1, \PREG_SPLIT_DELIM_CAPTURE);
-        $chunks[0] = str_replace($this->phpEscapeMap[0], $this->phpEscapeMap[1], $chunks[0]);
 
         $i = 1;
         while (isset($chunks[$i])) {
@@ -71,14 +73,10 @@ public function process(Request $request, Response $response): Response
                 throw new \RuntimeException('Unable to process an SSI tag without a "virtual" attribute.');
             }
 
-            $chunks[$i] = sprintf('<?php echo $this->surrogate->handle($this, %s, \'\', false) ?>'."\n",
-                var_export($options['virtual'], true)
-            );
-            ++$i;
-            $chunks[$i] = str_replace($this->phpEscapeMap[0], $this->phpEscapeMap[1], $chunks[$i]);
-            ++$i;
+            $chunks[$i] = $boundary.$options['virtual']."\n\n\n";
+            $i += 2;
         }
-        $content = implode('', $chunks);
+        $content = $boundary.implode('', $chunks).$boundary;
 
         $response->setContent($content);
         $response->headers->set('X-Body-Eval', 'SSI');
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
index 290bd94bdcb97..e876f28189087 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
@@ -102,7 +102,7 @@ public function testMultilineEsiRemoveTagsAreRemoved()
         $response = new Response(' Keep this'." And this");
         $this->assertSame($response, $esi->process($request, $response));
 
-        $this->assertEquals(' Keep this And this', $response->getContent());
+        $this->assertEquals(' Keep this And this', substr($response->getContent(), 24, -24));
     }
 
     public function testCommentTagsAreRemoved()
@@ -113,7 +113,7 @@ public function testCommentTagsAreRemoved()
         $response = new Response(' Keep this');
         $this->assertSame($response, $esi->process($request, $response));
 
-        $this->assertEquals(' Keep this', $response->getContent());
+        $this->assertEquals(' Keep this', substr($response->getContent(), 24, -24));
     }
 
     public function testProcess()
@@ -124,23 +124,27 @@ public function testProcess()
         $response = new Response('foo <!-- bad ESI request: bad ESI request -->');
         $this->assertSame($response, $esi->process($request, $response));
 
-        $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'...\', \'alt\', true) ?>'."\n", $response->getContent());
+        $content = explode(substr($response->getContent(), 0, 24), $response->getContent());
+        $this->assertSame(['', 'foo ', "...\nalt\n1\n", ''], $content);
         $this->assertEquals('ESI', $response->headers->get('x-body-eval'));
 
         $response = new Response('foo <!-- bad ESI request: bad ESI request -->');
         $this->assertSame($response, $esi->process($request, $response));
 
-        $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'foo\\\'\', \'bar\\\'\', true) ?>'."\n", $response->getContent());
+        $content = explode(substr($response->getContent(), 0, 24), $response->getContent());
+        $this->assertSame(['', 'foo ', "foo'\nbar'\n1\n", ''], $content);
 
         $response = new Response('foo <!-- bad ESI request: bad ESI request -->');
         $this->assertSame($response, $esi->process($request, $response));
 
-        $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'...\', \'\', false) ?>'."\n", $response->getContent());
+        $content = explode(substr($response->getContent(), 0, 24), $response->getContent());
+        $this->assertSame(['', 'foo ', "...\n\n\n", ''], $content);
 
         $response = new Response('foo <!-- bad ESI request: bad ESI request -->');
         $this->assertSame($response, $esi->process($request, $response));
 
-        $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'...\', \'\', false) ?>'."\n", $response->getContent());
+        $content = explode(substr($response->getContent(), 0, 24), $response->getContent());
+        $this->assertSame(['', 'foo ', "...\n\n\n", ''], $content);
     }
 
     public function testProcessEscapesPhpTags()
@@ -151,7 +155,8 @@ public function testProcessEscapesPhpTags()
         $response = new Response('<?php <? <% <script language=php>');
         $this->assertSame($response, $esi->process($request, $response));
 
-        $this->assertEquals('<?php echo "<?"; ?>php <?php echo "<?"; ?> <?php echo "<%"; ?> <?php echo "<s"; ?>cript language=php>', $response->getContent());
+        $content = explode(substr($response->getContent(), 0, 24), $response->getContent());
+        $this->assertSame(['', '<?php <? <% <script language=php>', ''], $content);
     }
 
     public function testProcessWhenNoSrcInAnEsi()
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
index a1f1f1593d3f3..97cc8fccd03d0 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
@@ -101,13 +101,15 @@ public function testProcess()
         $response = new Response('foo <!--#include virtual="..." -->');
         $ssi->process($request, $response);
 
-        $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'...\', \'\', false) ?>'."\n", $response->getContent());
+        $content = explode(substr($response->getContent(), 0, 24), $response->getContent());
+        $this->assertSame(['', 'foo ', "...\n\n\n", ''], $content);
         $this->assertEquals('SSI', $response->headers->get('x-body-eval'));
 
         $response = new Response('foo <!--#include virtual="foo\'" -->');
         $ssi->process($request, $response);
 
-        $this->assertEquals("foo <?php echo \$this->surrogate->handle(\$this, 'foo\\'', '', false) ?>\n", $response->getContent());
+        $content = explode(substr($response->getContent(), 0, 24), $response->getContent());
+        $this->assertSame(['', 'foo ', "foo'\n\n\n", ''], $content);
     }
 
     public function testProcessEscapesPhpTags()
@@ -118,7 +120,8 @@ public function testProcessEscapesPhpTags()
         $response = new Response('<?php <? <% <script language=php>');
         $ssi->process($request, $response);
 
-        $this->assertEquals('<?php echo "<?"; ?>php <?php echo "<?"; ?> <?php echo "<%"; ?> <?php echo "<s"; ?>cript language=php>', $response->getContent());
+        $content = explode(substr($response->getContent(), 0, 24), $response->getContent());
+        $this->assertSame(['', '<?php <? <% <script language=php>', ''], $content);
     }
 
     public function testProcessWhenNoSrcInAnSsi()

From 1c3fe3c0656fcbec1dc09467631cfb9b0ff0a978 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 17 Apr 2023 15:24:34 +0200
Subject: [PATCH 410/475] [Notifier] Fix PagerDutyTransport

---
 .../Notifier/Bridge/PagerDuty/PagerDutyTransport.php          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransport.php b/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransport.php
index 4e69b12c1c808..b01697d24c2c6 100644
--- a/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyTransport.php
@@ -27,6 +27,8 @@
  */
 final class PagerDutyTransport extends AbstractTransport
 {
+    protected const HOST = 'events.pagerduty.com';
+
     public function __construct(#[\SensitiveParameter] private readonly string $token, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
     {
         parent::__construct($client, $dispatcher);
@@ -56,7 +58,7 @@ protected function doSend(MessageInterface $message = null): SentMessage
         $body['payload']['summary'] = $message->getContent();
         $body['payload']['source'] = $message->getSubject();
 
-        $response = $this->client->request('POST', 'https://events.pagerduty.com/v2/enqueue', [
+        $response = $this->client->request('POST', 'https://'.$this->getEndpoint().'/v2/enqueue', [
             'headers' => [
                 'Accept' => 'application/json',
                 'Authorization' => $this->token,

From 193a7f59eb5f1670ac3ac1f908e1b59daa247e8d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 18 Apr 2023 16:08:04 +0200
Subject: [PATCH 411/475] Fix tests

---
 .../DependencyInjection/Compiler/UnusedTagsPass.php              | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
index 11b83394c702e..9da5b91bb3bb0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -45,7 +45,6 @@ class UnusedTagsPass implements CompilerPassInterface
         'container.service_subscriber',
         'container.stack',
         'controller.argument_value_resolver',
-        'controller.targeted_value_resolver',
         'controller.service_arguments',
         'controller.targeted_value_resolver',
         'data_collector',

From de6a74cb2224a73d77bf0c6ae63e054b01bcb60e Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 7 Apr 2023 11:59:56 +0200
Subject: [PATCH 412/475] [Intl] Allow compressing emoji and data maps

---
 .github/workflows/intl-data-tests.yml         |  9 ++
 src/Symfony/Component/Intl/CHANGELOG.md       |  1 +
 .../Data/Bundle/Reader/PhpBundleReader.php    |  5 ++
 .../Component/Intl/Resources/bin/compress     | 29 +++++++
 .../Component/Intl/Resources/emoji/build.php  |  4 +-
 .../Transliterator/EmojiTransliterator.php    | 11 ++-
 .../Component/Intl/Util/GzipStreamWrapper.php | 83 +++++++++++++++++++
 7 files changed, 137 insertions(+), 5 deletions(-)
 create mode 100755 src/Symfony/Component/Intl/Resources/bin/compress
 create mode 100644 src/Symfony/Component/Intl/Util/GzipStreamWrapper.php

diff --git a/.github/workflows/intl-data-tests.yml b/.github/workflows/intl-data-tests.yml
index 58e1aa80ae0bd..c0e56036fff6c 100644
--- a/.github/workflows/intl-data-tests.yml
+++ b/.github/workflows/intl-data-tests.yml
@@ -79,3 +79,12 @@ jobs:
 
       - name: Run intl-data tests
         run: ./phpunit --group intl-data -v
+
+      - name: Test with compressed data
+        run: |
+          [ -f src/Symfony/Component/Intl/Resources/data/locales/en.php ]
+          [ ! -f src/Symfony/Component/Intl/Resources/data/locales/en.php.gz ]
+          src/Symfony/Component/Intl/Resources/bin/compress
+          [ ! -f src/Symfony/Component/Intl/Resources/data/locales/en.php ]
+          [ -f src/Symfony/Component/Intl/Resources/data/locales/en.php.gz ]
+          ./phpunit src/Symfony/Component/Intl
diff --git a/src/Symfony/Component/Intl/CHANGELOG.md b/src/Symfony/Component/Intl/CHANGELOG.md
index 3a84dd3d42d56..1af3e900b6fb7 100644
--- a/src/Symfony/Component/Intl/CHANGELOG.md
+++ b/src/Symfony/Component/Intl/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add the special `strip` locale to `EmojiTransliterator` to strip all emojis from a string
+ * Add `compress` script to compress the `Resources/data` directory when disk space matters
 
 6.2
 ---
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/PhpBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/PhpBundleReader.php
index 9f5bee4e7ade2..2d179be2d696c 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Reader/PhpBundleReader.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/PhpBundleReader.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Intl\Data\Bundle\Reader;
 
 use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException;
+use Symfony\Component\Intl\Util\GzipStreamWrapper;
 
 /**
  * Reads .php resource bundles.
@@ -31,6 +32,10 @@ public function read(string $path, string $locale): mixed
             throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
         }
 
+        if (is_file($fileName.'.gz')) {
+            return GzipStreamWrapper::require($fileName.'.gz');
+        }
+
         if (!is_file($fileName)) {
             throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
         }
diff --git a/src/Symfony/Component/Intl/Resources/bin/compress b/src/Symfony/Component/Intl/Resources/bin/compress
new file mode 100755
index 0000000000000..e786bd2a041c9
--- /dev/null
+++ b/src/Symfony/Component/Intl/Resources/bin/compress
@@ -0,0 +1,29 @@
+#!/usr/bin/env php
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if ('cli' !== PHP_SAPI) {
+    throw new Exception('This script must be run from the command line.');
+}
+if (!extension_loaded('zlib')) {
+    throw new Exception('This script requires the zlib extension.');
+}
+
+foreach (glob(dirname(__DIR__).'/data/*/*.php') as $file) {
+    if ('meta.php' === basename($file)) {
+        continue;
+    }
+
+    $data = file_get_contents($file);
+    file_put_contents('compress.zlib://'.$file.'.gz', $data);
+
+    unlink($file.(filesize($file.'.gz') >= strlen($data) ? '.gz' : ''));
+}
diff --git a/src/Symfony/Component/Intl/Resources/emoji/build.php b/src/Symfony/Component/Intl/Resources/emoji/build.php
index f69eaa5f17bb3..3647326e034d0 100755
--- a/src/Symfony/Component/Intl/Resources/emoji/build.php
+++ b/src/Symfony/Component/Intl/Resources/emoji/build.php
@@ -19,9 +19,9 @@
 Builder::cleanTarget();
 $emojisCodePoints = Builder::getEmojisCodePoints();
 Builder::saveRules(Builder::buildRules($emojisCodePoints));
+Builder::saveRules(Builder::buildStripRules($emojisCodePoints));
 Builder::saveRules(Builder::buildGitHubRules($emojisCodePoints));
 Builder::saveRules(Builder::buildSlackRules($emojisCodePoints));
-Builder::saveRules(Builder::buildStripRules($emojisCodePoints));
 
 final class Builder
 {
@@ -178,7 +178,7 @@ public static function buildStripRules(array $emojisCodePoints): iterable
             $maps[$codePointsCount][$emoji] = '';
         }
 
-        return ['strip' => self::createRules($maps)];
+        return ['emoji-strip' => self::createRules($maps)];
     }
 
     public static function cleanTarget(): void
diff --git a/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php b/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
index bb52943ecabe2..0702fa43b2fca 100644
--- a/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
+++ b/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Intl\Transliterator;
 
+use Symfony\Component\Intl\Util\GzipStreamWrapper;
+
 if (!class_exists(\Transliterator::class)) {
     throw new \LogicException(sprintf('You cannot use the "%s\EmojiTransliterator" class as the "intl" extension is not installed. See https://php.net/intl.', __NAMESPACE__));
 } else {
@@ -40,7 +42,8 @@ public static function create(string $id, int $direction = self::FORWARD): self
                 $id = self::REVERSEABLE_IDS[$id];
             }
 
-            if (!preg_match('/^[a-z0-9@_\\.\\-]*$/', $id) || !is_file(\dirname(__DIR__)."/Resources/data/transliterator/emoji/{$id}.php")) {
+            $file = \dirname(__DIR__)."/Resources/data/transliterator/emoji/{$id}.php";
+            if (!preg_match('/^[a-z0-9@_\\.\\-]*$/', $id) || !is_file($file) && !is_file($file .= '.gz')) {
                 \Transliterator::create($id); // Populate intl_get_error_*()
 
                 throw new \IntlException(intl_get_error_message(), intl_get_error_code());
@@ -57,7 +60,7 @@ public static function create(string $id, int $direction = self::FORWARD): self
                 $instance = unserialize(sprintf('O:%d:"%s":1:{s:2:"id";s:%d:"%s";}', \strlen(self::class), self::class, \strlen($id), $id));
             }
 
-            $instance->map = $maps[$id] ??= require \dirname(__DIR__)."/Resources/data/transliterator/emoji/{$id}.php";
+            $instance->map = $maps[$id] ??= str_ends_with($file, '.gz') ? GzipStreamWrapper::require($file) : require $file;
 
             return $instance;
         }
@@ -86,7 +89,9 @@ public static function listIDs(): array
             }
 
             foreach (scandir(\dirname(__DIR__).'/Resources/data/transliterator/emoji/') as $file) {
-                if (str_ends_with($file, '.php')) {
+                if (str_ends_with($file, '.php.gz')) {
+                    $ids[] = substr($file, 0, -7);
+                } elseif (str_ends_with($file, '.php')) {
                     $ids[] = substr($file, 0, -4);
                 }
             }
diff --git a/src/Symfony/Component/Intl/Util/GzipStreamWrapper.php b/src/Symfony/Component/Intl/Util/GzipStreamWrapper.php
new file mode 100644
index 0000000000000..e5e30bbadbf3b
--- /dev/null
+++ b/src/Symfony/Component/Intl/Util/GzipStreamWrapper.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Intl\Util;
+
+/**
+ * @internal
+ */
+class GzipStreamWrapper
+{
+    /** @var resource|null */
+    public $context;
+
+    /** @var resource */
+    private $handle;
+    private string $path;
+
+    public static function require(string $path): array
+    {
+        if (!\extension_loaded('zlib')) {
+            throw new \LogicException(sprintf('The "zlib" extension is required to load the "%s/%s" map, please enable it in your php.ini file.', basename(\dirname($path)), basename($path)));
+        }
+
+        if (!\function_exists('opcache_is_script_cached') || !@opcache_is_script_cached($path)) {
+            stream_wrapper_unregister('file');
+            stream_wrapper_register('file', self::class);
+        }
+
+        return require $path;
+    }
+
+    public function stream_open(string $path, string $mode): bool
+    {
+        stream_wrapper_restore('file');
+        $this->path = $path;
+
+        return false !== $this->handle = fopen('compress.zlib://'.$path, $mode);
+    }
+
+    public function stream_read(int $count): string|false
+    {
+        return fread($this->handle, $count);
+    }
+
+    public function stream_eof(): bool
+    {
+        return feof($this->handle);
+    }
+
+    public function stream_set_option(int $option, int $arg1, int $arg2): bool
+    {
+        return match ($option) {
+            \STREAM_OPTION_BLOCKING => stream_set_blocking($this->handle, $arg1),
+            \STREAM_OPTION_READ_TIMEOUT => stream_set_timeout($this->handle, $arg1, $arg2),
+            \STREAM_OPTION_WRITE_BUFFER => 0 === stream_set_write_buffer($this->handle, $arg2),
+            default => false,
+        };
+    }
+
+    public function stream_stat(): array|false
+    {
+        if (!$stat = stat($this->path)) {
+            return false;
+        }
+
+        $h = fopen($this->path, 'r');
+        fseek($h, -4, \SEEK_END);
+        $size = unpack('V', fread($h, 4));
+        fclose($h);
+
+        $stat[7] = $stat['size'] = end($size);
+
+        return $stat;
+    }
+}

From 722bd9914b574a94697d0148620c0a769530e8d8 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Tue, 18 Apr 2023 16:31:35 +0200
Subject: [PATCH 413/475] [BrowserKit][HttpClient] Update the value of some
 user agents to comply with the RFC 9110 specification

---
 UPGRADE-6.3.md                                   | 13 +++++++++++++
 .../Component/BrowserKit/AbstractBrowser.php     |  2 +-
 .../BrowserKit/Tests/AbstractBrowserTest.php     | 12 ++++++------
 .../BrowserKit/Tests/HttpBrowserTest.php         |  2 +-
 .../Component/HttpClient/AmpHttpClient.php       |  2 +-
 .../Component/HttpClient/CurlHttpClient.php      |  2 +-
 .../Component/HttpClient/NativeHttpClient.php    |  2 +-
 .../HttpClientDataCollectorTest.php              | 16 ++++++++--------
 8 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 06928dde31914..1687c3cec8b03 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -1,6 +1,12 @@
 UPGRADE FROM 6.2 to 6.3
 =======================
 
+BrowserKit
+----------
+
+ * The default user agent has been renamed from `Symfony BrowserKit` to `SymfonyBrowserKit`
+   to comply with the RFC 9110 specification
+
 Console
 -------
 
@@ -60,6 +66,13 @@ FrameworkBundle
  * Deprecate the `notifier.logger_notification_listener` service, use the `notifier.notification_logger_listener` service instead
  * Deprecate the `Http\Client\HttpClient` service, use `Psr\Http\Client\ClientInterface` instead
 
+HttpClient
+----------
+
+ * The default user agents have been renamed from `Symfony HttpClient/Amp`, `Symfony HttpClient/Curl`
+   and `Symfony HttpClient/Native` to `SymfonyHttpClient (Amp)`, `SymfonyHttpClient (Curl)`
+   and `SymfonyHttpClient (Native)` respectively to comply with the RFC 9110 specification
+
 HttpFoundation
 --------------
 
diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
index df0484f75b313..fd3ab66f41470 100644
--- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
+++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
@@ -132,7 +132,7 @@ public function insulate(bool $insulated = true)
     public function setServerParameters(array $server)
     {
         $this->server = array_merge([
-            'HTTP_USER_AGENT' => 'Symfony BrowserKit',
+            'HTTP_USER_AGENT' => 'SymfonyBrowserKit',
         ], $server);
     }
 
diff --git a/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
index dd449bea5e428..1948f8c0a555d 100644
--- a/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
@@ -508,7 +508,7 @@ public function testFollowRedirectWithHeaders()
     {
         $headers = [
             'HTTP_HOST' => 'www.example.com',
-            'HTTP_USER_AGENT' => 'Symfony BrowserKit',
+            'HTTP_USER_AGENT' => 'SymfonyBrowserKit',
             'CONTENT_TYPE' => 'application/vnd.custom+xml',
             'HTTPS' => false,
         ];
@@ -535,7 +535,7 @@ public function testFollowRedirectWithPort()
     {
         $headers = [
             'HTTP_HOST' => 'www.example.com:8080',
-            'HTTP_USER_AGENT' => 'Symfony BrowserKit',
+            'HTTP_USER_AGENT' => 'SymfonyBrowserKit',
             'HTTPS' => false,
             'HTTP_REFERER' => 'http://www.example.com:8080/',
         ];
@@ -755,7 +755,7 @@ public function testGetServerParameter()
     {
         $client = $this->getBrowser();
         $this->assertSame('', $client->getServerParameter('HTTP_HOST'));
-        $this->assertSame('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
+        $this->assertSame('SymfonyBrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
         $this->assertSame('testvalue', $client->getServerParameter('testkey', 'testvalue'));
     }
 
@@ -764,7 +764,7 @@ public function testSetServerParameter()
         $client = $this->getBrowser();
 
         $this->assertSame('', $client->getServerParameter('HTTP_HOST'));
-        $this->assertSame('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
+        $this->assertSame('SymfonyBrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
 
         $client->setServerParameter('HTTP_HOST', 'testhost');
         $this->assertSame('testhost', $client->getServerParameter('HTTP_HOST'));
@@ -778,7 +778,7 @@ public function testSetServerParameterInRequest()
         $client = $this->getBrowser();
 
         $this->assertSame('', $client->getServerParameter('HTTP_HOST'));
-        $this->assertSame('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
+        $this->assertSame('SymfonyBrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
 
         $client->request('GET', 'https://www.example.com/https/www.example.com', [], [], [
             'HTTP_HOST' => 'testhost',
@@ -788,7 +788,7 @@ public function testSetServerParameterInRequest()
         ]);
 
         $this->assertSame('', $client->getServerParameter('HTTP_HOST'));
-        $this->assertSame('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
+        $this->assertSame('SymfonyBrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
 
         $this->assertSame('https://www.example.com/https/www.example.com', $client->getRequest()->getUri());
 
diff --git a/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
index 44f61289d8d6a..c9f548fafd2a8 100644
--- a/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
@@ -42,7 +42,7 @@ public function testRequestHeaders(array $requestArguments, array $expectedArgum
 
     public static function validContentTypes()
     {
-        $defaultHeaders = ['user-agent' => 'Symfony BrowserKit', 'host' => 'example.com'];
+        $defaultHeaders = ['user-agent' => 'SymfonyBrowserKit', 'host' => 'example.com'];
         yield 'GET/HEAD' => [
             ['GET', 'http://example.com/', ['key' => 'value']],
             ['GET', 'http://example.com/', ['headers' => $defaultHeaders, 'body' => '', 'max_redirects' => 0]],
diff --git a/src/Symfony/Component/HttpClient/AmpHttpClient.php b/src/Symfony/Component/HttpClient/AmpHttpClient.php
index b22f2175c1541..29ee315637e87 100644
--- a/src/Symfony/Component/HttpClient/AmpHttpClient.php
+++ b/src/Symfony/Component/HttpClient/AmpHttpClient.php
@@ -98,7 +98,7 @@ public function request(string $method, string $url, array $options = []): Respo
         }
 
         if (!isset($options['normalized_headers']['user-agent'])) {
-            $options['headers'][] = 'User-Agent: Symfony HttpClient/Amp';
+            $options['headers'][] = 'User-Agent: SymfonyHttpClient (Amp)';
         }
 
         if (0 < $options['max_duration']) {
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
index c99217646a62b..df8c6c886ce2b 100644
--- a/src/Symfony/Component/HttpClient/CurlHttpClient.php
+++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -93,7 +93,7 @@ public function request(string $method, string $url, array $options = []): Respo
         $url = implode('', $url);
 
         if (!isset($options['normalized_headers']['user-agent'])) {
-            $options['headers'][] = 'User-Agent: Symfony HttpClient/Curl';
+            $options['headers'][] = 'User-Agent: SymfonyHttpClient (Curl)';
         }
 
         $curlopts = [
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
index 23e1b3f0fe936..6999ae7406d23 100644
--- a/src/Symfony/Component/HttpClient/NativeHttpClient.php
+++ b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -191,7 +191,7 @@ public function request(string $method, string $url, array $options = []): Respo
         $this->logger?->info(sprintf('Request: "%s %s"', $method, implode('', $url)));
 
         if (!isset($options['normalized_headers']['user-agent'])) {
-            $options['headers'][] = 'User-Agent: Symfony HttpClient/Native';
+            $options['headers'][] = 'User-Agent: SymfonyHttpClient (Native)';
         }
 
         if (0 < $options['max_duration']) {
diff --git a/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php b/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
index 7641d54164d58..99c93c14def3a 100755
--- a/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
@@ -193,7 +193,7 @@ public static function provideCurlRequests(): iterable
   --url %1$shttp://localhost:8057/json%1$s \\
   --header %1$sAccept: */*%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: Symfony HttpClient/Native%1$s',
+  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s',
         ];
         yield 'GET with base uri' => [
             [
@@ -209,7 +209,7 @@ public static function provideCurlRequests(): iterable
   --url %1$shttp://localhost:8057/json/1%1$s \\
   --header %1$sAccept: */*%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: Symfony HttpClient/Native%1$s',
+  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s',
         ];
         yield 'GET with resolve' => [
             [
@@ -229,7 +229,7 @@ public static function provideCurlRequests(): iterable
   --url %1$shttp://localhost:8057/json%1$s \\
   --header %1$sAccept: */*%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: Symfony HttpClient/Native%1$s',
+  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s',
         ];
         yield 'POST with string body' => [
             [
@@ -247,7 +247,7 @@ public static function provideCurlRequests(): iterable
   --header %1$sContent-Length: 9%1$s \\
   --header %1$sContent-Type: application/x-www-form-urlencoded%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: Symfony HttpClient/Native%1$s \\
+  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s \\
   --data %1$sfoobarbaz%1$s',
         ];
         yield 'POST with array body' => [
@@ -285,7 +285,7 @@ public function __toString(): string
   --header %1$sContent-Type: application/x-www-form-urlencoded%1$s \\
   --header %1$sContent-Length: 211%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: Symfony HttpClient/Native%1$s \\
+  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s \\
   --data %1$sfoo=fooval%1$s --data %1$sbar=barval%1$s --data %1$sbaz=bazval%1$s --data %1$sfoobar[baz]=bazval%1$s --data %1$sfoobar[qux]=quxval%1$s --data %1$sbazqux[0]=bazquxval1%1$s --data %1$sbazqux[1]=bazquxval2%1$s --data %1$sobject[fooprop]=foopropval%1$s --data %1$sobject[barprop]=barpropval%1$s --data %1$stostring=tostringval%1$s',
         ];
 
@@ -312,7 +312,7 @@ public function __toString(): string
   --url %1$shttp://localhost:8057/?foo=fooval&bar=newbarval&foobar[baz]=bazval&foobar[qux]=quxval&bazqux[0]=bazquxval1&bazqux[1]=bazquxval2%1$s \\
   --header %1$sAccept: */*%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: Symfony HttpClient/Native%1$s',
+  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s',
             ];
             yield 'POST with json' => [
                 [
@@ -336,7 +336,7 @@ public function __toString(): string
   --header %1$sAccept: */*%1$s \\
   --header %1$sContent-Length: 120%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: Symfony HttpClient/Native%1$s \\
+  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s \\
   --data %1$s{"foo":{"bar":"baz","qux":[1.1,1.0],"fred":["\u003Cfoo\u003E","\u0027bar\u0027","\u0022baz\u0022","\u0026blong\u0026"]}}%1$s',
             ];
         }
@@ -368,7 +368,7 @@ public function testItDoesNotFollowRedirectionsWhenGeneratingCurlCommands()
   --header %1$sAccept: */*%1$s \\
   --header %1$sAuthorization: Basic Zm9vOmJhcg==%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: Symfony HttpClient/Native%1$s', '\\' === \DIRECTORY_SEPARATOR ? '"' : "'"), $curlCommand
+  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s', '\\' === \DIRECTORY_SEPARATOR ? '"' : "'"), $curlCommand
         );
     }
 

From 93008ee39b1a1ae50258b49adca2db1ec29d26f4 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Wed, 19 Apr 2023 11:03:56 +0200
Subject: [PATCH 414/475] [Form] Don't render seconds for HTML5 date pickers
 unless "with_seconds" is explicitly set

---
 .../AbstractBootstrap3LayoutTestCase.php      |  2 +-
 src/Symfony/Bridge/Twig/composer.json         |  4 ++--
 src/Symfony/Component/Form/CHANGELOG.md       |  1 +
 ...ateTimeToHtml5LocalDateTimeTransformer.php |  8 ++++++-
 .../Form/Extension/Core/Type/DateTimeType.php | 11 ++++++---
 .../Form/Extension/Core/Type/TimeType.php     |  8 +++++--
 .../Form/Tests/AbstractLayoutTestCase.php     |  2 +-
 ...imeToHtml5LocalDateTimeTransformerTest.php | 24 +++++++++++--------
 .../Extension/Core/Type/DateTimeTypeTest.php  | 10 ++++----
 src/Symfony/Component/Form/composer.json      |  2 +-
 10 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
index ae66650b83646..af4880ef3b6a1 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
@@ -1753,7 +1753,7 @@ public function testDateTimeWithWidgetSingleText()
     [@type="datetime-local"]
     [@name="name"]
     [@class="my&class form-control"]
-    [@value="2011-02-03T04:05:06"]
+    [@value="2011-02-03T04:05"]
 '
         );
     }
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index c12ad614514e6..cd0ad795594f0 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -28,7 +28,7 @@
         "symfony/asset": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
         "symfony/finder": "^5.4|^6.0",
-        "symfony/form": "^6.2.7",
+        "symfony/form": "^6.3",
         "symfony/html-sanitizer": "^6.1",
         "symfony/http-foundation": "^5.4|^6.0",
         "symfony/http-kernel": "^6.2",
@@ -57,7 +57,7 @@
         "phpdocumentor/reflection-docblock": "<3.2.2",
         "phpdocumentor/type-resolver": "<1.4.0",
         "symfony/console": "<5.4",
-        "symfony/form": "<6.2.7",
+        "symfony/form": "<6.3",
         "symfony/http-foundation": "<5.4",
         "symfony/http-kernel": "<6.2",
         "symfony/mime": "<6.2",
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index cf21889169afe..f07efb05d4005 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 6.3
 ---
 
+ * Don't render seconds for HTML5 date pickers unless "with_seconds" is explicitly set
  * Add a `placeholder_attr` option to `ChoiceType`
 
 6.2
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformer.php
index 40cd1b89df64f..a59ad9cb72aa3 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformer.php
@@ -23,6 +23,12 @@
 class DateTimeToHtml5LocalDateTimeTransformer extends BaseDateTimeTransformer
 {
     public const HTML5_FORMAT = 'Y-m-d\\TH:i:s';
+    public const HTML5_FORMAT_NO_SECONDS = 'Y-m-d\\TH:i';
+
+    public function __construct(string $inputTimezone = null, string $outputTimezone = null, private bool $withSeconds = false)
+    {
+        parent::__construct($inputTimezone, $outputTimezone);
+    }
 
     /**
      * Transforms a \DateTime into a local date and time string.
@@ -54,7 +60,7 @@ public function transform(mixed $dateTime): string
             $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
         }
 
-        return $dateTime->format(self::HTML5_FORMAT);
+        return $dateTime->format($this->withSeconds ? self::HTML5_FORMAT : self::HTML5_FORMAT_NO_SECONDS);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
index a0a0c92fe01e4..7a52acc720efd 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -79,7 +79,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             if (self::HTML5_FORMAT === $pattern) {
                 $builder->addViewTransformer(new DateTimeToHtml5LocalDateTimeTransformer(
                     $options['model_timezone'],
-                    $options['view_timezone']
+                    $options['view_timezone'],
+                    $options['with_seconds']
                 ));
             } else {
                 $builder->addViewTransformer(new DateTimeToLocalizedStringTransformer(
@@ -218,8 +219,12 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             // adding the HTML attribute step if not already defined.
             // Otherwise the browser will not display and so not send the seconds
             // therefore the value will always be considered as invalid.
-            if ($options['with_seconds'] && !isset($view->vars['attr']['step'])) {
-                $view->vars['attr']['step'] = 1;
+            if (!isset($view->vars['attr']['step'])) {
+                if ($options['with_seconds']) {
+                    $view->vars['attr']['step'] = 1;
+                } elseif (!$options['with_minutes']) {
+                    $view->vars['attr']['step'] = 3600;
+                }
             }
         }
     }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index cc734e50a9b36..249c229957b04 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -231,8 +231,12 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             // adding the HTML attribute step if not already defined.
             // Otherwise the browser will not display and so not send the seconds
             // therefore the value will always be considered as invalid.
-            if ($options['with_seconds'] && !isset($view->vars['attr']['step'])) {
-                $view->vars['attr']['step'] = 1;
+            if (!isset($view->vars['attr']['step'])) {
+                if ($options['with_seconds']) {
+                    $view->vars['attr']['step'] = 1;
+                } elseif (!$options['with_minutes']) {
+                    $view->vars['attr']['step'] = 3600;
+                }
             }
         }
     }
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
index 744212d1f4086..098e971ec62d6 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
@@ -1523,7 +1523,7 @@ public function testDateTimeWithWidgetSingleText()
             '/input
     [@type="datetime-local"]
     [@name="name"]
-    [@value="2011-02-03T04:05:06"]
+    [@value="2011-02-03T04:05"]
 '
         );
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
index 8dffb13e2f927..bcea2b829616e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
@@ -23,12 +23,16 @@ class DateTimeToHtml5LocalDateTimeTransformerTest extends BaseDateTimeTransforme
     public static function transformProvider()
     {
         return [
-            ['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06'],
-            ['UTC', 'UTC', null, ''],
-            ['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:06 America/New_York', '2010-02-03T17:05:06'],
-            ['America/New_York', 'Asia/Hong_Kong', null, ''],
-            ['UTC', 'Asia/Hong_Kong', '2010-02-03 04:05:06 UTC', '2010-02-03T12:05:06'],
-            ['America/New_York', 'UTC', '2010-02-03 04:05:06 America/New_York', '2010-02-03T09:05:06'],
+            ['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06', true],
+            ['UTC', 'UTC', null, '', true],
+            ['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:06 America/New_York', '2010-02-03T17:05:06', true],
+            ['America/New_York', 'Asia/Hong_Kong', null, '', true],
+            ['UTC', 'Asia/Hong_Kong', '2010-02-03 04:05:06 UTC', '2010-02-03T12:05:06', true],
+            ['America/New_York', 'UTC', '2010-02-03 04:05:06 America/New_York', '2010-02-03T09:05:06', true],
+            ['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05', false],
+            ['America/New_York', 'Asia/Hong_Kong', '2010-02-03 04:05:06 America/New_York', '2010-02-03T17:05', false],
+            ['UTC', 'Asia/Hong_Kong', '2010-02-03 04:05:06 UTC', '2010-02-03T12:05', false],
+            ['America/New_York', 'UTC', '2010-02-03 04:05:06 America/New_York', '2010-02-03T09:05', false],
         ];
     }
 
@@ -55,9 +59,9 @@ public static function reverseTransformProvider()
     /**
      * @dataProvider transformProvider
      */
-    public function testTransform($fromTz, $toTz, $from, $to)
+    public function testTransform($fromTz, $toTz, $from, $to, bool $withSeconds)
     {
-        $transformer = new DateTimeToHtml5LocalDateTimeTransformer($fromTz, $toTz);
+        $transformer = new DateTimeToHtml5LocalDateTimeTransformer($fromTz, $toTz, $withSeconds);
 
         $this->assertSame($to, $transformer->transform(null !== $from ? new \DateTime($from) : null));
     }
@@ -65,9 +69,9 @@ public function testTransform($fromTz, $toTz, $from, $to)
     /**
      * @dataProvider transformProvider
      */
-    public function testTransformDateTimeImmutable($fromTz, $toTz, $from, $to)
+    public function testTransformDateTimeImmutable($fromTz, $toTz, $from, $to, bool $withSeconds)
     {
-        $transformer = new DateTimeToHtml5LocalDateTimeTransformer($fromTz, $toTz);
+        $transformer = new DateTimeToHtml5LocalDateTimeTransformer($fromTz, $toTz, $withSeconds);
 
         $this->assertSame($to, $transformer->transform(null !== $from ? new \DateTimeImmutable($from) : null));
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
index e30bd416a880e..e7ffc24fa76c1 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -252,7 +252,7 @@ public function testSubmitDifferentTimezonesDateTime()
         $outputTime->setTimezone(new \DateTimeZone('America/New_York'));
 
         $this->assertEquals($outputTime, $form->getData());
-        $this->assertEquals('2010-06-02T03:04:00', $form->getViewData());
+        $this->assertEquals('2010-06-02T03:04', $form->getViewData());
     }
 
     public function testSubmitDifferentTimezonesDateTimeImmutable()
@@ -272,7 +272,7 @@ public function testSubmitDifferentTimezonesDateTimeImmutable()
 
         $this->assertInstanceOf(\DateTimeImmutable::class, $form->getData());
         $this->assertEquals($outputTime, $form->getData());
-        $this->assertEquals('2010-06-02T03:04:00', $form->getViewData());
+        $this->assertEquals('2010-06-02T03:04', $form->getViewData());
     }
 
     public function testSubmitStringSingleText()
@@ -287,7 +287,7 @@ public function testSubmitStringSingleText()
         $form->submit('2010-06-02T03:04:00');
 
         $this->assertEquals('2010-06-02 03:04:00', $form->getData());
-        $this->assertEquals('2010-06-02T03:04:00', $form->getViewData());
+        $this->assertEquals('2010-06-02T03:04', $form->getViewData());
     }
 
     public function testSubmitStringSingleTextWithSeconds()
@@ -709,10 +709,10 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa
     public static function provideEmptyData()
     {
         $expectedData = \DateTime::createFromFormat('Y-m-d H:i', '2018-11-11 21:23');
-        $lazyEmptyData = static fn (FormInterface $form) => $form->getConfig()->getCompound() ? ['date' => ['year' => '2018', 'month' => '11', 'day' => '11'], 'time' => ['hour' => '21', 'minute' => '23']] : '2018-11-11T21:23:00';
+        $lazyEmptyData = static fn (FormInterface $form) => $form->getConfig()->getCompound() ? ['date' => ['year' => '2018', 'month' => '11', 'day' => '11'], 'time' => ['hour' => '21', 'minute' => '23']] : '2018-11-11T21:23';
 
         return [
-            'Simple field' => ['single_text', '2018-11-11T21:23:00', $expectedData],
+            'Simple field' => ['single_text', '2018-11-11T21:23', $expectedData],
             'Compound text field' => ['text', ['date' => ['year' => '2018', 'month' => '11', 'day' => '11'], 'time' => ['hour' => '21', 'minute' => '23']], $expectedData],
             'Compound choice field' => ['choice', ['date' => ['year' => '2018', 'month' => '11', 'day' => '11'], 'time' => ['hour' => '21', 'minute' => '23']], $expectedData],
             'Simple field lazy' => ['single_text', $lazyEmptyData, $expectedData],
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
index 5512aa4d18136..df506d699bbf7 100644
--- a/src/Symfony/Component/Form/composer.json
+++ b/src/Symfony/Component/Form/composer.json
@@ -53,7 +53,7 @@
         "symfony/http-kernel": "<5.4",
         "symfony/translation": "<5.4",
         "symfony/translation-contracts": "<2.5",
-        "symfony/twig-bridge": "<5.4.21|>=6,<6.2.7"
+        "symfony/twig-bridge": "<6.3"
     },
     "suggest": {
         "symfony/validator": "For form validation.",

From f4348ea927dcdd40bcdd9f396a23862c2a899153 Mon Sep 17 00:00:00 2001
From: MrYamous <matt.lempereur@gmail.com>
Date: Sun, 12 Mar 2023 00:50:02 +0100
Subject: [PATCH 415/475] deprecate not configuring widget option for DateType,
 DateTimeType, TimeType

---
 .../Component/Form/Extension/Core/Type/DateTimeType.php    | 7 ++++++-
 .../Component/Form/Extension/Core/Type/DateType.php        | 7 ++++++-
 .../Component/Form/Extension/Core/Type/TimeType.php        | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
index 7a52acc720efd..8bd6ec471aa66 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -248,7 +248,12 @@ public function configureOptions(OptionsResolver $resolver)
             'view_timezone' => null,
             'format' => self::HTML5_FORMAT,
             'date_format' => null,
-            'widget' => null,
+            'widget' => function (Options $options) {
+                trigger_deprecation('symfony/form', '6.3', 'Not configuring the "widget" option is deprecated. It will default to "single_text" in Symfony 7.0.');
+
+                return null;
+                // return 'single_text';
+            },
             'date_widget' => $dateWidget,
             'time_widget' => $timeWidget,
             'with_minutes' => true,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
index 5c81097e0efbc..3d01546f95e1e 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -260,7 +260,12 @@ public function configureOptions(OptionsResolver $resolver)
             'years' => range((int) date('Y') - 5, (int) date('Y') + 5),
             'months' => range(1, 12),
             'days' => range(1, 31),
-            'widget' => 'choice',
+            'widget' => function (Options $options) {
+                trigger_deprecation('symfony/form', '6.3', 'Not configuring the "widget" option explicitly is deprecated, its default value will change to "single_text" in 7.0.');
+
+                return 'choice';
+                // return 'single_text';
+            },
             'input' => 'datetime',
             'format' => $format,
             'model_timezone' => null,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index 249c229957b04..cad07d9299c4e 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -312,7 +312,12 @@ public function configureOptions(OptionsResolver $resolver)
             'hours' => range(0, 23),
             'minutes' => range(0, 59),
             'seconds' => range(0, 59),
-            'widget' => 'choice',
+            'widget' => function (Options $options) {
+                trigger_deprecation('symfony/form', '6.3', 'Not configuring the "widget" option explicitly is deprecated, its default value will change to "single_text" in 7.0.');
+
+                return 'choice';
+                // return 'single_text';
+            },
             'input' => 'datetime',
             'input_format' => 'H:i:s',
             'with_minutes' => true,

From 1ca33e704620cdb8f5bed2c47efc1b79d2cccc2e Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 18 Apr 2023 23:21:31 +0200
Subject: [PATCH 416/475] [Form] Fix deprecation layer

---
 UPGRADE-6.3.md                                |  5 ++
 ...ractBootstrap3HorizontalLayoutTestCase.php |  2 +-
 .../AbstractBootstrap3LayoutTestCase.php      | 12 ++++-
 ...ractBootstrap4HorizontalLayoutTestCase.php |  2 +-
 .../AbstractBootstrap4LayoutTestCase.php      |  2 +-
 ...ractBootstrap5HorizontalLayoutTestCase.php |  2 +-
 .../AbstractBootstrap5LayoutTestCase.php      | 10 ++++
 src/Symfony/Component/Form/CHANGELOG.md       |  1 +
 .../Form/Extension/Core/Type/DateTimeType.php | 49 +++++++------------
 .../Form/Extension/Core/Type/DateType.php     |  5 +-
 .../Form/Extension/Core/Type/TimeType.php     |  5 +-
 .../Form/Tests/AbstractLayoutTestCase.php     | 16 ++++--
 .../Extension/Core/CoreExtensionTest.php      |  2 +-
 .../Extension/Core/Type/BirthdayTypeTest.php  |  1 +
 .../Extension/Core/Type/DateTimeTypeTest.php  | 23 +++++++--
 .../Extension/Core/Type/DateTypeTest.php      | 39 +++++++++++++--
 .../Extension/Core/Type/TimeTypeTest.php      | 45 ++++++++++++++++-
 .../BirthdayTypeValidatorExtensionTest.php    |  2 +-
 .../DateTimeTypeValidatorExtensionTest.php    |  2 +-
 .../Type/DateTypeValidatorExtensionTest.php   |  2 +-
 .../Type/TimeTypeValidatorExtensionTest.php   |  2 +-
 21 files changed, 170 insertions(+), 59 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index 1687c3cec8b03..a05514396074c 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -29,6 +29,11 @@ DoctrineBridge
  * Deprecate `MessengerTransportDoctrineSchemaSubscriber` in favor of `MessengerTransportDoctrineSchemaListener`
  * Deprecate `RememberMeTokenProviderDoctrineSchemaSubscriber` in favor of `RememberMeTokenProviderDoctrineSchemaListener`
 
+Form
+----
+
+ * Deprecate not configuring the "widget" option of
10000
 date/time form types, it will default to "single_text" in v7
+
 FrameworkBundle
 ---------------
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTestCase.php
index e79b0c3141e9e..3a4104bb6adbd 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTestCase.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3HorizontalLayoutTestCase.php
@@ -15,7 +15,7 @@ abstract class AbstractBootstrap3HorizontalLayoutTestCase extends AbstractBootst
 {
     public function testLabelOnForm()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType');
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, ['widget' => 'choice']);
         $view = $form->createView();
         $this->renderWidget($view, ['label' => 'foo']);
         $html = $this->renderLabel($view);
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
index af4880ef3b6a1..969e3c7803216 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
@@ -19,7 +19,7 @@ abstract class AbstractBootstrap3LayoutTestCase extends AbstractLayoutTestCase
 {
     public function testLabelOnForm()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType');
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, ['widget' => 'choice']);
         $view = $form->createView();
         $this->renderWidget($view, ['label' => 'foo']);
         $html = $this->renderLabel($view);
@@ -1561,6 +1561,7 @@ public function testDateTime()
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', [
             'input' => 'string',
             'with_seconds' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1598,6 +1599,7 @@ public function testDateTimeWithPlaceholderGlobal()
             'input' => 'string',
             'placeholder' => 'Change&Me',
             'required' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1637,6 +1639,7 @@ public function testDateTimeWithHourAndMinute()
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', $data, [
             'input' => 'array',
             'required' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1674,6 +1677,7 @@ public function testDateTimeWithSeconds()
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', [
             'input' => 'string',
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1907,6 +1911,7 @@ public function testBirthDay()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType', '2000-02-03', [
             'input' => 'string',
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1937,6 +1942,7 @@ public function testBirthDayWithPlaceholder()
             'input' => 'string',
             'placeholder' => '',
             'required' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -2465,6 +2471,7 @@ public function testTime()
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
             'input' => 'string',
             'with_seconds' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -2492,6 +2499,7 @@ public function testTimeWithSeconds()
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
             'input' => 'string',
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -2579,6 +2587,7 @@ public function testTimeWithPlaceholderGlobal()
             'input' => 'string',
             'placeholder' => 'Change&Me',
             'required' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -2606,6 +2615,7 @@ public function testTimeWithPlaceholderOnYear()
             'input' => 'string',
             'required' => false,
             'placeholder' => ['hour' => 'Change&Me'],
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTestCase.php
index ce8a733665854..723559ee3d985 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTestCase.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTestCase.php
@@ -47,7 +47,7 @@ public function testRow()
 
     public function testLabelOnForm()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType');
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, ['widget' => 'choice']);
         $view = $form->createView();
         $this->renderWidget($view, ['label' => 'foo']);
         $html = $this->renderLabel($view);
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTestCase.php
index 08b4bbe78c965..781d1c92cf92f 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTestCase.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTestCase.php
@@ -57,7 +57,7 @@ public function testRow()
 
     public function testLabelOnForm()
     {
-        $form = $this->factory->createNamed('name', DateType::class);
+        $form = $this->factory->createNamed('name', DateType::class, null, ['widget' => 'choice']);
         $view = $form->createView();
         $this->renderWidget($view, ['label' => 'foo']);
         $html = $this->renderLabel($view);
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTestCase.php
index 428d5a435dfae..1c02f9e10207c 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTestCase.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5HorizontalLayoutTestCase.php
@@ -86,7 +86,7 @@ public function testRowWithCustomClass()
 
     public function testLabelOnForm()
     {
-        $form = $this->factory->createNamed('name', DateType::class);
+        $form = $this->factory->createNamed('name', DateType::class, null, ['widget' => 'choice']);
         $view = $form->createView();
         $this->renderWidget($view, ['label' => 'foo']);
         $html = $this->renderLabel($view);
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTestCase.php
index 1057dc775c272..630663a60da2a 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTestCase.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap5LayoutTestCase.php
@@ -1006,6 +1006,7 @@ public function testDateTime()
         $form = $this->factory->createNamed('name', DateTimeType::class, date('Y').'-02-03 04:05:06', [
             'input' => 'string',
             'with_seconds' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1059,6 +1060,7 @@ public function testDateTimeWithPlaceholderGlobal()
             'input' => 'string',
             'placeholder' => 'Change&Me',
             'required' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1112,6 +1114,7 @@ public function testDateTimeWithHourAndMinute()
         $form = $this->factory->createNamed('name', DateTimeType::class, $data, [
             'input' => 'array',
             'required' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1163,6 +1166,7 @@ public function testDateTimeWithSeconds()
         $form = $this->factory->createNamed('name', DateTimeType::class, date('Y').'-02-03 04:05:06', [
             'input' => 'string',
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1387,6 +1391,7 @@ public function testBirthDay()
     {
         $form = $this->factory->createNamed('name', BirthdayType::class, '2000-02-03', [
             'input' => 'string',
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1421,6 +1426,7 @@ public function testBirthDayWithPlaceholder()
             'input' => 'string',
             'placeholder' => '',
             'required' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1598,6 +1604,7 @@ public function testTime()
         $form = $this->factory->createNamed('name', TimeType::class, '04:05:06', [
             'input' => 'string',
             'with_seconds' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1631,6 +1638,7 @@ public function testTimeWithSeconds()
         $form = $this->factory->createNamed('name', TimeType::class, '04:05:06', [
             'input' => 'string',
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1714,6 +1722,7 @@ public function testTimeWithPlaceholderGlobal()
             'input' => 'string',
             'placeholder' => 'Change&Me',
             'required' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
@@ -1747,6 +1756,7 @@ public function testTimeWithPlaceholderOnYear()
             'input' => 'string',
             'required' => false,
             'placeholder' => ['hour' => 'Change&Me'],
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index f07efb05d4005..1ff39c9726070 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Don't render seconds for HTML5 date pickers unless "with_seconds" is explicitly set
  * Add a `placeholder_attr` option to `ChoiceType`
+ * Deprecate not configuring the "widget" option of date/time form types, it will default to "single_text" in v7
 
 6.2
 ---
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
index 8bd6ec471aa66..32c58447cdfb2 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -148,18 +148,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $timeOptions['label'] = false;
             }
 
-            if (null !== $options['date_widget']) {
-                $dateOptions['widget'] = $options['date_widget'];
-            }
+            $dateOptions['widget'] = $options['date_widget'] ?? $options['widget'] ?? 'choice';
+            $timeOptions['widget'] = $options['time_widget'] ?? $options['widget'] ?? 'choice';
 
             if (null !== $options['date_label']) {
                 $dateOptions['label'] = $options['date_label'];
             }
 
-            if (null !== $options['time_widget']) {
-                $timeOptions['widget'] = $options['time_widget'];
-            }
-
             if (null !== $options['time_label']) {
                 $timeOptions['label'] = $options['time_label'];
             }
@@ -236,26 +231,15 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 
-        // Defaults to the value of "widget"
-        $dateWidget = static fn (Options $options) => 'single_text' === $options['widget'] ? null : $options['widget'];
-
-        // Defaults to the value of "widget"
-        $timeWidget = static fn (Options $options) => 'single_text' === $options['widget'] ? null : $options['widget'];
-
         $resolver->setDefaults([
             'input' => 'datetime',
             'model_timezone' => null,
             'view_timezone' => null,
             'format' => self::HTML5_FORMAT,
             'date_format' => null,
-            'widget' => function (Options $options) {
-                trigger_deprecation('symfony/form', '6.3', 'Not configuring the "widget" option is deprecated. It will default to "single_text" in Symfony 7.0.');
-
-                return null;
-                // return 'single_text';
-            },
-            'date_widget' => $dateWidget,
-            'time_widget' => $timeWidget,
+            'widget' => null,
+            'date_widget' => null,
+            'time_widget' => null,
             'with_minutes' => true,
             'with_seconds' => false,
             'html5' => true,
@@ -325,19 +309,20 @@ public function configureOptions(OptionsResolver $resolver)
 
             return $dateFormat;
         });
-        $resolver->setNormalizer('date_widget', static function (Options $options, $dateWidget) {
-            if (null !== $dateWidget && 'single_text' === $options['widget']) {
-                throw new LogicException(sprintf('Cannot use the "date_widget" option of the "%s" when the "widget" option is set to "single_text".', self::class));
-            }
-
-            return $dateWidget;
-        });
-        $resolver->setNormalizer('time_widget', static function (Options $options, $timeWidget) {
-            if (null !== $timeWidget && 'single_text' === $options['widget']) {
-                throw new LogicException(sprintf('Cannot use the "time_widget" option of the "%s" when the "widget" option is set to "single_text".', self::class));
+        $resolver->setNormalizer('widget', static function (Options $options, $widget) {
+            if ('single_text' === $widget) {
+                if (null !== $options['date_widget']) {
+                    throw new LogicException(sprintf('Cannot use the "date_widget" option of the "%s" when the "widget" option is set to "single_text".', self::class));
+                }
+                if (null !== $options['time_widget']) {
+                    throw new LogicException(sprintf('Cannot use the "time_widget" option of the "%s" when the "widget" option is set to "single_text".', self::class));
+                }
+            } elseif (null === $widget && null === $options['date_widget'] && null === $options['time_widget']) {
+                trigger_deprecation('symfony/form', '6.3', 'Not configuring the "widget" option of form type "datetime" is deprecated. It will default to "single_text" in Symfony 7.0.');
+                // return 'single_text';
             }
 
-            return $timeWidget;
+            return $widget;
         });
         $resolver->setNormalizer('html5', static function (Options $options, $html5) {
             if ($html5 && self::HTML5_FORMAT !== $options['format']) {
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
index 3d01546f95e1e..5c079f137dd8d 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -260,11 +260,10 @@ public function configureOptions(OptionsResolver $resolver)
             'years' => range((int) date('Y') - 5, (int) date('Y') + 5),
             'months' => range(1, 12),
             'days' => range(1, 31),
-            'widget' => function (Options $options) {
-                trigger_deprecation('symfony/form', '6.3', 'Not configuring the "widget" option explicitly is deprecated, its default value will change to "single_text" in 7.0.');
+            'widget' => static function (Options $options) {
+                trigger_deprecation('symfony/form', '6.3', 'Not configuring the "widget" option of form type "date" is deprecated. It will default to "single_text" in Symfony 7.0.');
 
                 return 'choice';
-                // return 'single_text';
             },
             'input' => 'datetime',
             'format' => $format,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index cad07d9299c4e..c7d5276960831 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -312,11 +312,10 @@ public function configureOptions(OptionsResolver $resolver)
             'hours' => range(0, 23),
             'minutes' => range(0, 59),
             'seconds' => range(0, 59),
-            'widget' => function (Options $options) {
-                trigger_deprecation('symfony/form', '6.3', 'Not configuring the "widget" option explicitly is deprecated, its default value will change to "single_text" in 7.0.');
+            'widget' => static function (Options $options) {
+                trigger_deprecation('symfony/form', '6.3', 'Not configuring the "widget" option of form type "time" is deprecated. It will default to "single_text" in Symfony 7.0.');
 
                 return 'choice';
-                // return 'single_text';
             },
             'input' => 'datetime',
             'input_format' => 'H:i:s',
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
index 098e971ec62d6..33799bfcc13bf 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
@@ -175,7 +175,7 @@ public function testLabelWithoutTranslation()
 
     public function testLabelOnForm()
     {
-        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType');
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', null, ['widget' => 'choice']);
         $view = $form->createView();
         $this->renderWidget($view, ['label' => 'foo']);
         $html = $this->renderLabel($view);
@@ -1327,6 +1327,7 @@ public function testDateTime()
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', [
             'input' => 'string',
             'with_seconds' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), [],
@@ -1367,6 +1368,7 @@ public function testDateTimeWithPlaceholderGlobal()
             'input' => 'string',
             'placeholder' => 'Change&Me',
             'required' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), [],
@@ -1408,6 +1410,7 @@ public function testDateTimeWithHourAndMinute()
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', $data, [
             'input' => 'array',
             'required' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), [],
@@ -1447,6 +1450,7 @@ public function testDateTimeWithSeconds()
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', [
             'input' => 'string',
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), [],
@@ -1654,7 +1658,7 @@ public function testDateSingleText()
     public function testDateErrorBubbling()
     {
         $form = $this->factory->createNamedBuilder('form', 'Symfony\Component\Form\Extension\Core\Type\FormType')
-            ->add('date', 'Symfony\Component\Form\Extension\Core\Type\DateType')
+            ->add('date', 'Symfony\Component\Form\Extension\Core\Type\DateType', ['widget' => 'choice'])
             ->getForm();
         $form->get('date')->addError(new FormError('[trans]Error![/trans]'));
         $view = $form->createView();
@@ -1667,6 +1671,7 @@ public function testBirthDay()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\BirthdayType', '2000-02-03', [
             'input' => 'string',
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), [],
@@ -1693,6 +1698,7 @@ public function testBirthDayWithPlaceholder()
             'input' => 'string',
             'placeholder' => '',
             'required' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), [],
@@ -2127,6 +2133,7 @@ public function testTime()
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
             'input' => 'string',
             'with_seconds' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), [],
@@ -2151,6 +2158,7 @@ public function testTimeWithSeconds()
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TimeType', '04:05:06', [
             'input' => 'string',
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), [],
@@ -2230,6 +2238,7 @@ public function testTimeWithPlaceholderGlobal()
             'input' => 'string',
             'placeholder' => 'Change&Me',
             'required' => false,
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), [],
@@ -2255,6 +2264,7 @@ public function testTimeWithPlaceholderOnYear()
             'input' => 'string',
             'required' => false,
             'placeholder' => ['hour' => 'Change&Me'],
+            'widget' => 'choice',
         ]);
 
         $this->assertWidgetMatchesXpath($form->createView(), [],
@@ -2277,7 +2287,7 @@ public function testTimeWithPlaceholderOnYear()
     public function testTimeErrorBubbling()
     {
         $form = $this->factory->createNamedBuilder('form', 'Symfony\Component\Form\Extension\Core\Type\FormType')
-            ->add('time', 'Symfony\Component\Form\Extension\Core\Type\TimeType')
+            ->add('time', 'Symfony\Component\Form\Extension\Core\Type\TimeType', ['widget' => 'choice'])
             ->getForm();
         $form->get('time')->addError(new FormError('[trans]Error![/trans]'));
         $view = $form->createView();
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/CoreExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/CoreExtensionTest.php
index ff85149e21c63..91b1e75086324 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/CoreExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/CoreExtensionTest.php
@@ -24,7 +24,7 @@ public function testTransformationFailuresAreConvertedIntoFormErrors()
             ->getFormFactory();
 
         $form = $formFactory->createBuilder()
-            ->add('foo', 'Symfony\Component\Form\Extension\Core\Type\DateType')
+            ->add('foo', 'Symfony\Component\Form\Extension\Core\Type\DateType', ['widget' => 'choice'])
             ->getForm();
         $form->submit('foo');
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php
index 47028ac014a75..0484571411804 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php
@@ -25,6 +25,7 @@ public function testSetInvalidYearsOption()
         $this->expectException(InvalidOptionsException::class);
         $this->factory->create(static::TESTED_TYPE, null, [
             'years' => 'bad value',
+            'widget' => 'choice',
         ]);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
index e7ffc24fa76c1..a2058596eeeee 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -330,7 +330,7 @@ public function testInitializeWithDateTime()
     {
         // Throws an exception if "data_class" option is not explicitly set
         // to null in the type
-        $this->assertInstanceOf(FormInterface::class, $this->factory->create(static::TESTED_TYPE, new \DateTime()));
+        $this->assertInstanceOf(FormInterface::class, $this->factory->create(static::TESTED_TYPE, new \DateTime(), ['widget' => 'choice']));
     }
 
     public function testSingleTextWidgetShouldUseTheRightInputType()
@@ -348,6 +348,7 @@ public function testPassDefaultPlaceholderToViewIfNotRequired()
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
             'with_seconds' => true,
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -364,6 +365,7 @@ public function testPassNoPlaceholderToViewIfRequired()
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => true,
             'with_seconds' => true,
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -380,6 +382,7 @@ public function testPassPlaceholderAsString()
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'placeholder' => 'Empty',
             'with_seconds' => true,
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -403,6 +406,7 @@ public function testPassPlaceholderAsArray()
                 'second' => 'Empty second',
             ],
             'with_seconds' => true,
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -425,6 +429,7 @@ public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
                 'second' => 'Empty second',
             ],
             'with_seconds' => true,
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -447,6 +452,7 @@ public function testPassPlaceholderAsPartialArrayAddNullIfRequired()
                 'second' => 'Empty second',
             ],
             'with_seconds' => true,
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -536,7 +542,7 @@ public function testSingleTextWidgetWithCustomNonHtml5Format()
     public function testDateTypeChoiceErrorsBubbleUp()
     {
         $error = new FormError('Invalid!');
-        $form = $this->factory->create(static::TESTED_TYPE, null);
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['widget' => 'choice']);
 
         $form['date']->addError($error);
 
@@ -549,6 +555,7 @@ public function testDateTypeSingleTextErrorsBubbleUp()
         $error = new FormError('Invalid!');
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'date_widget' => 'single_text',
+            'time_widget' => 'choice',
         ]);
 
         $form['date']->addError($error);
@@ -560,7 +567,7 @@ public function testDateTypeSingleTextErrorsBubbleUp()
     public function testTimeTypeChoiceErrorsBubbleUp()
     {
         $error = new FormError('Invalid!');
-        $form = $this->factory->create(static::TESTED_TYPE, null);
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['widget' => 'choice']);
 
         $form['time']->addError($error);
 
@@ -573,6 +580,7 @@ public function testTimeTypeSingleTextErrorsBubbleUp()
         $error = new FormError('Invalid!');
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'time_widget' => 'single_text',
+            'date_widget' => 'choice',
         ]);
 
         $form['time']->addError($error);
@@ -585,6 +593,7 @@ public function testPassDefaultChoiceTranslationDomain()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -602,6 +611,7 @@ public function testPassChoiceTranslationDomainAsString()
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'choice_translation_domain' => 'messages',
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -623,6 +633,7 @@ public function testPassChoiceTranslationDomainAsArray()
                 'second' => 'test',
             ],
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -675,6 +686,7 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = [], $expectedDat
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'empty_data' => $emptyData,
+            'widget' => 'choice',
         ]);
         $form->submit(null);
 
@@ -735,4 +747,9 @@ public function testSubmitStringWithCustomInputFormat()
 
         $this->assertSame('14/01/2018 21:29:00 +00:00', $form->getData());
     }
+
+    protected function getTestOptions(): array
+    {
+        return ['widget' => 'choice'];
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
index 0527e48904664..abda1a6c071f2 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -50,6 +50,7 @@ public function testInvalidInputOption()
         $this->expectException(InvalidOptionsException::class);
         $this->factory->create(static::TESTED_TYPE, null, [
             'input' => 'fake_input',
+            'widget' => 'choice',
         ]);
     }
 
@@ -379,6 +380,7 @@ public function testDatePatternWithFormatOption($format, $pattern)
     {
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => $format,
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -416,6 +418,7 @@ public function testThrowExceptionIfFormatDoesNotContainYearMonthAndDay()
         $this->factory->create(static::TESTED_TYPE, null, [
             'months' => [6, 7],
             'format' => 'yy',
+            'widget' => 'choice',
         ]);
     }
 
@@ -435,6 +438,7 @@ public function testThrowExceptionIfFormatIsNoConstant()
         $this->expectException(InvalidOptionsException::class);
         $this->factory->create(static::TESTED_TYPE, null, [
             'format' => 105,
+            'widget' => 'choice',
         ]);
     }
 
@@ -443,6 +447,7 @@ public function testThrowExceptionIfFormatIsInvalid()
         $this->expectException(InvalidOptionsException::class);
         $this->factory->create(static::TESTED_TYPE, null, [
             'format' => [],
+            'widget' => 'choice',
         ]);
     }
 
@@ -451,6 +456,7 @@ public function testThrowExceptionIfYearsIsInvalid()
         $this->expectException(InvalidOptionsException::class);
         $this->factory->create(static::TESTED_TYPE, null, [
             'years' => 'bad value',
+            'widget' => 'choice',
         ]);
     }
 
@@ -459,6 +465,7 @@ public function testThrowExceptionIfMonthsIsInvalid()
         $this->expectException(InvalidOptionsException::class);
         $this->factory->create(static::TESTED_TYPE, null, [
             'months' => 'bad value',
+            'widget' => 'choice',
         ]);
     }
 
@@ -467,6 +474,7 @@ public function testThrowExceptionIfDaysIsInvalid()
         $this->expectException(InvalidOptionsException::class);
         $this->factory->create(static::TESTED_TYPE, null, [
             'days' => 'bad value',
+            'widget' => 'choice',
         ]);
     }
 
@@ -523,6 +531,7 @@ public function testYearsOption()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'years' => [2010, 2011],
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -539,6 +548,7 @@ public function testMonthsOption()
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'months' => [6, 7],
             'format' => \IntlDateFormatter::SHORT,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -559,6 +569,7 @@ public function testMonthsOptionShortFormat()
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'months' => [1, 4],
             'format' => 'dd.MMM.yy',
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -579,6 +590,7 @@ public function testMonthsOptionLongFormat()
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'months' => [1, 4],
             'format' => 'dd.MMMM.yy',
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -598,6 +610,7 @@ public function testMonthsOptionLongFormatWithDifferentTimezone()
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'months' => [1, 4],
             'format' => 'dd.MMMM.yy',
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -612,6 +625,7 @@ public function testIsDayWithinRangeReturnsTrueIfWithin()
         \Locale::setDefault('en');
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'days' => [6, 7],
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -679,7 +693,7 @@ public function testPassDatePatternToView()
 
         \Locale::setDefault('de_AT');
 
-        $view = $this->factory->create(static::TESTED_TYPE)
+        $view = $this->factory->create(static::TESTED_TYPE, null, ['widget' => 'choice'])
             ->createView();
 
         $this->assertSame('{{ day }}{{ month }}{{ year }}', $view->vars['date_pattern']);
@@ -694,6 +708,7 @@ public function testPassDatePatternToViewDifferentFormat()
 
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => \IntlDateFormatter::LONG,
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -704,6 +719,7 @@ public function testPassDatePatternToViewDifferentPattern()
     {
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => 'MMyyyydd',
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -714,6 +730,7 @@ public function testPassDatePatternToViewDifferentPatternWithSeparators()
     {
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'format' => 'MM*yyyy*dd',
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -740,6 +757,7 @@ public function testDatePatternFormatWithQuotedStrings()
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             // EEEE, d 'de' MMMM 'de' y
             'format' => \IntlDateFormatter::FULL,
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -760,7 +778,7 @@ public function testInitializeWithDateTime()
     {
         // Throws an exception if "data_class" option is not explicitly set
         // to null in the type
-        $this->assertInstanceOf(FormInterface::class, $this->factory->create(static::TESTED_TYPE, new \DateTime()));
+        $this->assertInstanceOf(FormInterface::class, $this->factory->create(static::TESTED_TYPE, new \DateTime(), ['widget' => 'choice']));
     }
 
     public function testSingleTextWidgetShouldUseTheRightInputType()
@@ -777,6 +795,7 @@ public function testPassDefaultPlaceholderToViewIfNotRequired()
     {
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -789,6 +808,7 @@ public function testPassNoPlaceholderToViewIfRequired()
     {
         $view = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => true,
+            'widget' => 'choice',
         ])
             ->createView();
 
@@ -800,6 +820,7 @@ public function testPassNoPlaceholderToViewIfRequired()
     public function testPassPlaceholderAsString()
     {
         $view = $this->factory->create(static::TESTED_TYPE, null, [
+            'widget' => 'choice',
             'placeholder' => 'Empty',
         ])
             ->createView();
@@ -812,6 +833,7 @@ public function testPassPlaceholderAsString()
     public function testPassPlaceholderAsArray()
     {
         $view = $this->factory->create(static::TESTED_TYPE, null, [
+            'widget' => 'choice',
             'placeholder' => [
                 'year' => 'Empty year',
                 'month' => 'Empty month',
@@ -828,6 +850,7 @@ public function testPassPlaceholderAsArray()
     public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
     {
         $view = $this->factory->create(static::TESTED_TYPE, null, [
+            'widget' => 'choice',
             'required' => false,
             'placeholder' => [
                 'year' => 'Empty year',
@@ -844,6 +867,7 @@ public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
     public function testPassPlaceholderAsPartialArrayAddNullIfRequired()
     {
         $view = $this->factory->create(static::TESTED_TYPE, null, [
+            'widget' => 'choice',
             'required' => true,
             'placeholder' => [
                 'year' => 'Empty year',
@@ -956,6 +980,7 @@ public function testDayErrorsBubbleUp($widget)
     public function testYears()
     {
         $view = $this->factory->create(static::TESTED_TYPE, null, [
+            'widget' => 'choice',
             'years' => [1900, 2000, 2040],
         ])
             ->createView();
@@ -970,7 +995,7 @@ public function testYears()
 
     public function testPassDefaultChoiceTranslationDomain()
     {
-        $form = $this->factory->create(static::TESTED_TYPE);
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['widget' => 'choice']);
 
         $view = $form->createView();
         $this->assertFalse($view['year']->vars['choice_translation_domain']);
@@ -981,6 +1006,7 @@ public function testPassDefaultChoiceTranslationDomain()
     public function testPassChoiceTranslationDomainAsString()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'widget' => 'choice',
             'choice_translation_domain' => 'messages',
         ]);
 
@@ -993,6 +1019,7 @@ public function testPassChoiceTranslationDomainAsString()
     public function testPassChoiceTranslationDomainAsArray()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'widget' => 'choice',
             'choice_translation_domain' => [
                 'year' => 'foo',
                 'day' => 'test',
@@ -1025,6 +1052,7 @@ public function testSubmitNullWithSingleText()
     public function testSubmitNullUsesDefaultEmptyData($emptyData = [], $expectedData = null)
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'widget' => 'choice',
             'empty_data' => $emptyData,
         ]);
         $form->submit(null);
@@ -1083,4 +1111,9 @@ public function testSubmitStringWithCustomInputFormat()
 
         $this->assertSame('14/01/2018', $form->getData());
     }
+
+    protected function getTestOptions(): array
+    {
+        return ['widget' => 'choice'];
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
index cfc3e979a0565..4ed930bbd5381 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -28,6 +28,7 @@ public function testSubmitDateTime()
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'datetime',
+            'widget' => 'choice',
         ]);
 
         $input = [
@@ -49,6 +50,7 @@ public function testSubmitDateTimeImmutable()
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'datetime_immutable',
+            'widget' => 'choice',
         ]);
 
         $input = [
@@ -71,6 +73,7 @@ public function testSubmitString()
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'string',
+            'widget' => 'choice',
         ]);
 
         $input = [
@@ -106,6 +109,7 @@ public function testSubmitTimestamp()
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'timestamp',
+            'widget' => 'choice',
         ]);
 
         $input = [
@@ -127,6 +131,7 @@ public function testSubmitArray()
             'model_timezone' => 'UTC',
             'view_timezone' => 'UTC',
             'input' => 'array',
+            'widget' => 'choice',
         ]);
 
         $input = [
@@ -288,6 +293,7 @@ public function testPreSetDataDifferentTimezones()
             'input' => 'datetime',
             'with_seconds' => true,
             'reference_date' => new \DateTimeImmutable('2019-01-01', new \DateTimeZone('UTC')),
+            'widget' => 'choice',
         ]);
         $form->setData(new \DateTime('2022-01-01 15:09:10', new \DateTimeZone('UTC')));
 
@@ -307,6 +313,7 @@ public function testPreSetDataDifferentTimezonesDuringDaylightSavingTime()
             'input' => 'datetime',
             'with_seconds' => true,
             'reference_date' => new \DateTimeImmutable('2019-07-12', new \DateTimeZone('UTC')),
+            'widget' => 'choice',
         ]);
         $form->setData(new \DateTime('2022-04-29 15:09:10', new \DateTimeZone('UTC')));
 
@@ -358,6 +365,7 @@ public function testSubmitDifferentTimezones()
             'input' => 'datetime',
             'with_seconds' => true,
             'reference_date' => new \DateTimeImmutable('2019-01-01', new \DateTimeZone('UTC')),
+            'widget' => 'choice',
         ]);
         $form->submit([
             'hour' => '16',
@@ -376,6 +384,7 @@ public function testSubmitDifferentTimezonesDuringDaylightSavingTime()
             'input' => 'datetime',
             'with_seconds' => true,
             'reference_date' => new \DateTimeImmutable('2019-07-12', new \DateTimeZone('UTC')),
+            'widget' => 'choice',
         ]);
         $form->submit([
             'hour' => '16',
@@ -456,6 +465,7 @@ public function testSetDataWithoutMinutes()
             'view_timezone' => 'UTC',
             'input' => 'datetime',
             'with_minutes' => false,
+            'widget' => 'choice',
         ]);
 
         $form->setData(new \DateTime('03:04:05 UTC'));
@@ -470,6 +480,7 @@ public function testSetDataWithSeconds()
             'view_timezone' => 'UTC',
             'input' => 'datetime',
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $form->setData(new \DateTime('03:04:05 UTC'));
@@ -485,6 +496,7 @@ public function testSetDataDifferentTimezones()
             'input' => 'string',
             'with_seconds' => true,
             'reference_date' => new \DateTimeImmutable('2013-01-01 00:00:00', new \DateTimeZone('America/New_York')),
+            'widget' => 'choice',
         ]);
 
         $dateTime = new \DateTime('2013-01-01 12:04:05');
@@ -512,6 +524,7 @@ public function testSetDataDifferentTimezonesDateTime()
             'input' => 'datetime',
             'with_seconds' => true,
             'reference_date' => new \DateTimeImmutable('now', new \DateTimeZone('America/New_York')),
+            'widget' => 'choice',
         ]);
 
         $dateTime = new \DateTime('12:04:05');
@@ -540,6 +553,7 @@ public function testSetDataDifferentTimezonesDuringDaylightSavingTime()
             'input' => 'datetime',
             'with_seconds' => true,
             'reference_date' => new \DateTimeImmutable('2019-07-12', new \DateTimeZone('UTC')),
+            'widget' => 'choice',
         ]);
 
         $form->setData(new \DateTime('2019-07-24 14:09:10', new \DateTimeZone('UTC')));
@@ -557,6 +571,7 @@ public function testSetDataDifferentTimezonesWithoutReferenceDate()
             'view_timezone' => 'Europe/Berlin',
             'input' => 'datetime',
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $form->setData(new \DateTime('2019-07-24 14:09:10', new \DateTimeZone('UTC')));
@@ -568,6 +583,7 @@ public function testHoursOption()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'hours' => [6, 7],
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -582,6 +598,7 @@ public function testIsMinuteWithinRangeReturnsTrueIfWithin()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'minutes' => [6, 7],
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -597,6 +614,7 @@ public function testIsSecondWithinRangeReturnsTrueIfWithin()
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'seconds' => [6, 7],
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -733,7 +751,7 @@ public function testInitializeWithDateTime()
     {
         // Throws an exception if "data_class" option is not explicitly set
         // to null in the type
-        $this->assertInstanceOf(FormInterface::class, $this->factory->create(static::TESTED_TYPE, new \DateTime()));
+        $this->assertInstanceOf(FormInterface::class, $this->factory->create(static::TESTED_TYPE, new \DateTime(), ['widget' => 'choice']));
     }
 
     public function testSingleTextWidgetShouldUseTheRightInputType()
@@ -789,6 +807,7 @@ public function testPassDefaultPlaceholderToViewIfNotRequired()
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => false,
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -802,6 +821,7 @@ public function testPassNoPlaceholderToViewIfRequired()
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'required' => true,
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -815,6 +835,7 @@ public function testPassPlaceholderAsString()
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'placeholder' => 'Empty',
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -832,6 +853,7 @@ public function testPassPlaceholderAsArray()
                 'second' => 'Empty second',
             ],
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -849,6 +871,7 @@ public function testPassPlaceholderAsPartialArrayAddEmptyIfNotRequired()
                 'second' => 'Empty second',
             ],
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -866,6 +889,7 @@ public function testPassPlaceholderAsPartialArrayAddNullIfRequired()
                 'second' => 'Empty second',
             ],
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -934,6 +958,7 @@ public function testInitializeWithSecondsAndWithoutMinutes()
         $this->factory->create(static::TESTED_TYPE, null, [
             'with_minutes' => false,
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
     }
 
@@ -942,6 +967,7 @@ public function testThrowExceptionIfHoursIsInvalid()
         $this->expectException(InvalidOptionsException::class);
         $this->factory->create(static::TESTED_TYPE, null, [
             'hours' => 'bad value',
+            'widget' => 'choice',
         ]);
     }
 
@@ -950,6 +976,7 @@ public function testThrowExceptionIfMinutesIsInvalid()
         $this->expectException(InvalidOptionsException::class);
         $this->factory->create(static::TESTED_TYPE, null, [
             'minutes' => 'bad value',
+            'widget' => 'choice',
         ]);
     }
 
@@ -958,6 +985,7 @@ public function testThrowExceptionIfSecondsIsInvalid()
         $this->expectException(InvalidOptionsException::class);
         $this->factory->create(static::TESTED_TYPE, null, [
             'seconds' => 'bad value',
+            'widget' => 'choice',
         ]);
     }
 
@@ -968,6 +996,7 @@ public function testReferenceDateTimezoneMustMatchModelTimezone()
             'model_timezone' => 'UTC',
             'view_timezone' => 'Europe/Berlin',
             'reference_date' => new \DateTimeImmutable('now', new \DateTimeZone('Europe/Berlin')),
+            'widget' => 'choice',
         ]);
     }
 
@@ -976,6 +1005,7 @@ public function testModelTimezoneDefaultToReferenceDateTimezoneIfProvided()
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'view_timezone' => 'Europe/Berlin',
             'reference_date' => new \DateTimeImmutable('now', new \DateTimeZone('Europe/Berlin')),
+            'widget' => 'choice',
         ]);
 
         $this->assertSame('Europe/Berlin', $form->getConfig()->getOption('model_timezone'));
@@ -985,6 +1015,7 @@ public function testViewTimezoneDefaultsToModelTimezoneIfProvided()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'Europe/Berlin',
+            'widget' => 'choice',
         ]);
 
         $this->assertSame('Europe/Berlin', $form->getConfig()->getOption('view_timezone'));
@@ -992,7 +1023,7 @@ public function testViewTimezoneDefaultsToModelTimezoneIfProvided()
 
     public function testPassDefaultChoiceTranslationDomain()
     {
-        $form = $this->factory->create(static::TESTED_TYPE);
+        $form = $this->factory->create(static::TESTED_TYPE, null, ['widget' => 'choice']);
 
         $view = $form->createView();
         $this->assertFalse($view['hour']->vars['choice_translation_domain']);
@@ -1004,6 +1035,7 @@ public function testPassChoiceTranslationDomainAsString()
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'choice_translation_domain' => 'messages',
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -1020,6 +1052,7 @@ public function testPassChoiceTranslationDomainAsArray()
                 'second' => 'test',
             ],
             'with_seconds' => true,
+            'widget' => 'choice',
         ]);
 
         $view = $form->createView();
@@ -1039,6 +1072,7 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = [], $expectedDat
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'empty_data' => $emptyData,
+            'widget' => 'choice',
         ]);
         $form->submit(null);
 
@@ -1055,6 +1089,7 @@ public function testArrayTimeWithReferenceDoesNotUseReferenceTimeOnZero()
             'view_timezone' => 'Europe/Berlin',
             'reference_date' => new \DateTimeImmutable('01-01-2021 12:34:56', new \DateTimeZone('UTC')),
             'input' => 'array',
+            'widget' => 'choice',
         ]);
 
         $input = [
@@ -1082,6 +1117,7 @@ public function testArrayTimeWithReferenceDoesUseReferenceDateOnModelTransform()
             'view_timezone' => 'Europe/Berlin',
             'reference_date' => new \DateTimeImmutable('01-05-2021 12:34:56', new \DateTimeZone('UTC')),
             'input' => 'array',
+            'widget' => 'choice',
         ]);
 
         $this->assertSame($input, $form->getData());
@@ -1124,4 +1160,9 @@ public static function provideEmptyData()
             'Compound choice field lazy' => ['choice', $lazyEmptyData, $expectedData],
         ];
     }
+
+    protected function getTestOptions(): array
+    {
+        return ['widget' => 'choice'];
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BirthdayTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BirthdayTypeValidatorExtensionTest.php
index 7ef39bde14d13..9fb1e2421926d 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BirthdayTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BirthdayTypeValidatorExtensionTest.php
@@ -20,7 +20,7 @@ class BirthdayTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 
     protected function createForm(array $options = [])
     {
-        return $this->factory->create(BirthdayType::class, null, $options);
+        return $this->factory->create(BirthdayType::class, null, $options + ['widget' => 'choice']);
     }
 
     public function testInvalidMessage()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTimeTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTimeTypeValidatorExtensionTest.php
index a8206e40c322b..df601ab8702b4 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTimeTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTimeTypeValidatorExtensionTest.php
@@ -20,7 +20,7 @@ class DateTimeTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 
     protected function createForm(array $options = [])
     {
-        return $this->factory->create(DateTimeType::class, null, $options);
+        return $this->factory->create(DateTimeType::class, null, $options + ['widget' => 'choice']);
     }
 
     public function testInvalidMessage()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTypeValidatorExtensionTest.php
index 32594430dc5d8..163fe91fd0bb4 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTypeValidatorExtensionTest.php
@@ -20,7 +20,7 @@ class DateTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 
     protected function createForm(array $options = [])
     {
-        return $this->factory->create(DateType::class, null, $options);
+        return $this->factory->create(DateType::class, null, $options + ['widget' => 'choice']);
     }
 
     public function testInvalidMessage()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TimeTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TimeTypeValidatorExtensionTest.php
index 09893b98a1e1e..ab85366e17e13 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TimeTypeValidatorExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TimeTypeValidatorExtensionTest.php
@@ -20,7 +20,7 @@ class TimeTypeValidatorExtensionTest extends BaseValidatorExtensionTestCase
 
     protected function createForm(array $options = [])
     {
-        return $this->factory->create(TimeType::class, null, $options);
+        return $this->factory->create(TimeType::class, null, $options + ['widget' => 'choice']);
     }
 
     public function testInvalidMessage()

From 7ff739a0ef2f779db365688dfc6cd9e4ce3f680d Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Fri, 11 Mar 2022 23:40:38 +0100
Subject: [PATCH 417/475] [Serializer] Add types to private and internal
 properties

---
 .../DependencyInjection/MainConfiguration.php |  4 +--
 .../Security/Factory/AccessTokenFactory.php   |  2 +-
 .../Form/ChoiceList/View/ChoiceGroupView.php  |  2 +-
 .../Serializer/Annotation/Context.php         |  6 ++--
 .../Annotation/DiscriminatorMap.php           |  4 +--
 .../Serializer/Annotation/Groups.php          |  2 +-
 .../Serializer/Annotation/MaxDepth.php        |  2 +-
 .../Serializer/Annotation/SerializedName.php  |  2 +-
 .../CompiledClassMetadataCacheWarmer.php      | 20 ++++---------
 .../Serializer/Encoder/ChainDecoder.php       | 13 ++++++---
 .../Serializer/Encoder/ChainEncoder.php       | 13 ++++++---
 .../Serializer/Encoder/CsvEncoder.php         |  2 +-
 .../Serializer/Encoder/JsonDecode.php         |  2 +-
 .../Serializer/Encoder/JsonEncode.php         |  2 +-
 .../Serializer/Encoder/XmlEncoder.php         |  2 +-
 .../Serializer/Encoder/YamlEncoder.php        |  6 ++--
 .../Exception/ExtraAttributesException.php    | 10 +++----
 .../NotNormalizableValueException.php         | 17 ++++++-----
 .../Extractor/ObjectPropertyListExtractor.php |  8 ++---
 .../Serializer/Mapping/AttributeMetadata.php  | 20 +++++--------
 .../ClassDiscriminatorFromClassMetadata.php   | 12 +++-----
 .../Mapping/ClassDiscriminatorMapping.php     | 15 +++++-----
 .../Serializer/Mapping/ClassMetadata.php      | 13 +++------
 .../Mapping/ClassMetadataInterface.php        |  2 +-
 .../Factory/CacheClassMetadataFactory.php     | 19 ++++--------
 .../Mapping/Factory/ClassMetadataFactory.php  | 12 ++++----
 .../Factory/CompiledClassMetadataFactory.php  | 13 ++++-----
 .../Mapping/Loader/AnnotationLoader.php       |  8 ++---
 .../Serializer/Mapping/Loader/LoaderChain.php |  6 +---
 .../Mapping/Loader/XmlFileLoader.php          |  2 +-
 .../Mapping/Loader/YamlFileLoader.php         |  6 ++--
 .../CamelCaseToSnakeCaseNameConverter.php     | 11 +++----
 .../MetadataAwareNameConverter.php            | 29 +++++++++++--------
 .../Normalizer/AbstractObjectNormalizer.php   | 28 +++++++++---------
 .../ConstraintViolationListNormalizer.php     | 11 +++----
 .../Normalizer/DataUriNormalizer.php          | 11 ++-----
 .../Normalizer/DateIntervalNormalizer.php     |  2 +-
 .../Normalizer/DateTimeNormalizer.php         |  2 +-
 .../Normalizer/MimeMessageNormalizer.php      |  4 +--
 .../Normalizer/ObjectNormalizer.php           |  7 +++--
 .../Serializer/Normalizer/UidNormalizer.php   |  2 +-
 .../Normalizer/UnwrappingDenormalizer.php     |  2 +-
 .../Component/Serializer/Serializer.php       | 23 ++++++++++-----
 43 files changed, 173 insertions(+), 206 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index c6ba45edc2e47..e982fc1871940 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -40,7 +40,7 @@ class MainConfiguration implements ConfigurationInterface
     private array $userProviderFactories;
 
     /**
-     * @param array<array-key, AuthenticatorFactoryInterface> $factories
+     * @param array<AuthenticatorFactoryInterface> $factories
      */
     public function __construct(array $factories, array $userProviderFactories)
     {
@@ -173,7 +173,7 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode): void
     }
 
     /**
-     * @param array<array-key, AuthenticatorFactoryInterface> $factories
+     * @param array<AuthenticatorFactoryInterface> $factories
      */
     private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $factories): void
     {
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
index 28d0beda0997e..04e419cd82d6b 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AccessTokenFactory.php
@@ -30,7 +30,7 @@ final class AccessTokenFactory extends AbstractFactory implements StatelessAuthe
     private const PRIORITY = -40;
 
     /**
-     * @param array<array-key, TokenHandlerFactoryInterface> $tokenHandlerFactories
+     * @param array<TokenHandlerFactoryInterface> $tokenHandlerFactories
      */
     public function __construct(private readonly array $tokenHandlerFactories)
     {
diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
index 453601a6f7221..64fe3baec3829 100644
--- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
+++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
@@ -26,7 +26,7 @@ class ChoiceGroupView implements \IteratorAggregate
     /**
      * Creates a new choice group view.
      *
-     * @param array<array-key, ChoiceGroupView|ChoiceView> $choices the choice views in the group
+     * @param array<ChoiceGroupView|ChoiceView> $choices the choice views in the group
      */
     public function __construct(string $label, array $choices = [])
     {
diff --git a/src/Symfony/Component/Serializer/Annotation/Context.php b/src/Symfony/Component/Serializer/Annotation/Context.php
index 908825047b001..e3878c7be5992 100644
--- a/src/Symfony/Component/Serializer/Annotation/Context.php
+++ b/src/Symfony/Component/Serializer/Annotation/Context.php
@@ -33,9 +33,9 @@ class Context
      * @throws InvalidArgumentException
      */
     public function __construct(
-        private array $context = [],
-        private array $normalizationContext = [],
-        private array $denormalizationContext = [],
+        private readonly array $context = [],
+        private readonly array $normalizationContext = [],
+        private readonly array $denormalizationContext = [],
         string|array $groups = [],
     ) {
         if (!$context && !$normalizationContext && !$denormalizationContext) {
diff --git a/src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php b/src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php
index 2606a1e4f20b4..8e9ebb830250a 100644
--- a/src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php
+++ b/src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php
@@ -26,8 +26,8 @@
 class DiscriminatorMap
 {
     public function __construct(
-        private string $typeProperty,
-        private array $mapping,
+        private readonly string $typeProperty,
+        private readonly array $mapping,
     ) {
         if (empty($typeProperty)) {
             throw new InvalidArgumentException(sprintf('Parameter "typeProperty" of annotation "%s" cannot be empty.', static::class));
diff --git a/src/Symfony/Component/Serializer/Annotation/Groups.php b/src/Symfony/Component/S
10000
erializer/Annotation/Groups.php
index 2069d678c91b2..5b16f567c3547 100644
--- a/src/Symfony/Component/Serializer/Annotation/Groups.php
+++ b/src/Symfony/Component/Serializer/Annotation/Groups.php
@@ -28,7 +28,7 @@ class Groups
     /**
      * @var string[]
      */
-    private array $groups;
+    private readonly array $groups;
 
     /**
      * @param string|string[] $groups
diff --git a/src/Symfony/Component/Serializer/Annotation/MaxDepth.php b/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
index 43785b292a4fb..36afff6a7490c 100644
--- a/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
+++ b/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
@@ -25,7 +25,7 @@
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
 class MaxDepth
 {
-    public function __construct(private int $maxDepth)
+    public function __construct(private readonly int $maxDepth)
     {
         if ($maxDepth <= 0) {
             throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a positive integer.', static::class));
diff --git a/src/Symfony/Component/Serializer/Annotation/SerializedName.php b/src/Symfony/Component/Serializer/Annotation/SerializedName.php
index b6c6027e8568e..74df79cd27ea7 100644
--- a/src/Symfony/Component/Serializer/Annotation/SerializedName.php
+++ b/src/Symfony/Component/Serializer/Annotation/SerializedName.php
@@ -25,7 +25,7 @@
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
 final class SerializedName
 {
-    public function __construct(private string $serializedName)
+    public function __construct(private readonly string $serializedName)
     {
         if ('' === $serializedName) {
             throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a non-empty string.', self::class));
diff --git a/src/Symfony/Component/Serializer/CacheWarmer/CompiledClassMetadataCacheWarmer.php b/src/Symfony/Component/Serializer/CacheWarmer/CompiledClassMetadataCacheWarmer.php
index 565320af97b69..a43e9b4080cdb 100644
--- a/src/Symfony/Component/Serializer/CacheWarmer/CompiledClassMetadataCacheWarmer.php
+++ b/src/Symfony/Component/Serializer/CacheWarmer/CompiledClassMetadataCacheWarmer.php
@@ -21,20 +21,12 @@
  */
 final class CompiledClassMetadataCacheWarmer implements CacheWarmerInterface
 {
-    private $classesToCompile;
-
-    private $classMetadataFactory;
-
-    private $classMetadataFactoryCompiler;
-
-    private $filesystem;
-
-    public function __construct(array $classesToCompile, ClassMetadataFactoryInterface $classMetadataFactory, ClassMetadataFactoryCompiler $classMetadataFactoryCompiler, Filesystem $filesystem)
-    {
-        $this->classesToCompile = $classesToCompile;
-        $this->classMetadataFactory = $classMetadataFactory;
-        $this->classMetadataFactoryCompiler = $classMetadataFactoryCompiler;
-        $this->filesystem = $filesystem;
+    public function __construct(
+        private readonly array $classesToCompile,
+        private readonly ClassMetadataFactoryInterface $classMetadataFactory,
+        private readonly ClassMetadataFactoryCompiler $classMetadataFactoryCompiler,
+        private readonly Filesystem $filesystem,
+    ) {
     }
 
     public function warmUp(string $cacheDir): array
diff --git a/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php b/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
index 469affdaa4434..f1b0cd2e267a3 100644
--- a/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
@@ -24,12 +24,17 @@
  */
 class ChainDecoder implements ContextAwareDecoderInterface
 {
-    private array $decoders = [];
+    /**
+     * @var array<string, array-key>
+     */
     private array $decoderByFormat = [];
 
-    public function __construct(array $decoders = [])
-    {
-        $this->decoders = $decoders;
+    /**
+     * @param array<DecoderInterface> $decoders
+     */
+    public function __construct(
+        private readonly array $decoders = []
+    ) {
     }
 
     final public function decode(string $data, string $format, array $context = []): mixed
diff --git a/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php b/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
index 14aea51575ec5..731cfc6019df4 100644
--- a/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
@@ -25,12 +25,17 @@
  */
 class ChainEncoder implements ContextAwareEncoderInterface
 {
-    private array $encoders = [];
+    /**
+     * @var array<string, array-key>
+     */
     private array $encoderByFormat = [];
 
-    public function __construct(array $encoders = [])
-    {
-        $this->encoders = $encoders;
+    /**
+     * @param array<EncoderInterface> $encoders
+     */
+    public function __construct(
+        private readonly array $encoders = []
+    ) {
     }
 
     final public function encode(mixed $data, string $format, array $context = []): string
diff --git a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
index d8cc6e3f33afb..dc952b2e00e5c 100644
--- a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
@@ -38,7 +38,7 @@ class CsvEncoder implements EncoderInterface, DecoderInterface
 
     private const FORMULAS_START_CHARACTERS = ['=', '-', '+', '@', "\t", "\r"];
 
-    private $defaultContext = [
+    private array $defaultContext = [
         self::DELIMITER_KEY => ',',
         self::ENCLOSURE_KEY => '"',
         self::ESCAPE_CHAR_KEY => '',
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
index 059ed79273948..f17267fc95a6d 100644
--- a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
+++ b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
@@ -34,7 +34,7 @@ class JsonDecode implements DecoderInterface
      */
     public const RECURSION_DEPTH = 'json_decode_recursion_depth';
 
-    private $defaultContext = [
+    private array $defaultContext = [
         self::ASSOCIATIVE => false,
         self::OPTIONS => 0,
         self::RECURSION_DEPTH => 512,
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
index 2f7c8157562e6..3e0ddced38a63 100644
--- a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
+++ b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -25,7 +25,7 @@ class JsonEncode implements EncoderInterface
      */
     public const OPTIONS = 'json_encode_options';
 
-    private $defaultContext = [
+    private array $defaultContext = [
         self::OPTIONS => \JSON_PRESERVE_ZERO_FRACTION,
     ];
 
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index 965683c899fde..4b6f68921f42e 100644
--- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -59,7 +59,7 @@ class XmlEncoder implements EncoderInterface, DecoderInterface, NormalizationAwa
     public const TYPE_CAST_ATTRIBUTES = 'xml_type_cast_attributes';
     public const VERSION = 'xml_version';
 
-    private $defaultContext = [
+    private array $defaultContext = [
         self::AS_COLLECTION => false,
         self::DECODER_IGNORED_NODE_TYPES => [\XML_PI_NODE, \XML_COMMENT_NODE],
         self::ENCODER_IGNORED_NODE_TYPES => [],
diff --git a/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php b/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
index 8d559a57b90d5..031a3105e4582 100644
--- a/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
@@ -42,9 +42,9 @@ class YamlEncoder implements EncoderInterface, DecoderInterface
     public const YAML_INDENT = 'yaml_indent';
     public const YAML_FLAGS = 'yaml_flags';
 
-    private $dumper;
-    private $parser;
-    private $defaultContext = [
+    private readonly Dumper $dumper;
+    private readonly Parser $parser;
+    private array $defaultContext = [
         self::YAML_INLINE => 0,
         self::YAML_INDENT => 0,
         self::YAML_FLAGS => 0,
diff --git a/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php b/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php
index 22fcc87b86775..d681de419cf8c 100644
--- a/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php
+++ b/src/Symfony/Component/Serializer/Exception/ExtraAttributesException.php
@@ -18,14 +18,12 @@
  */
 class ExtraAttributesException extends RuntimeException
 {
-    private $extraAttributes;
-
-    public function __construct(array $extraAttributes, \Throwable $previous = null)
-    {
+    public function __construct(
+        private readonly array $extraAttributes,
+        \Throwable $previous = null,
+    ) {
         $msg = sprintf('Extra attributes are not allowed ("%s" %s unknown).', implode('", "', $extraAttributes), \count($extraAttributes) > 1 ? 'are' : 'is');
 
-        $this->extraAttributes = $extraAttributes;
-
         parent::__construct($msg, 0, $previous);
     }
 
diff --git a/src/Symfony/Component/Serializer/Exception/NotNormalizableValueException.php b/src/Symfony/Component/Serializer/Exception/NotNormalizableValueException.php
index e601e5043e2e9..148c60ada4e1c 100644
--- a/src/Symfony/Component/Serializer/Exception/NotNormalizableValueException.php
+++ b/src/Symfony/Component/Serializer/Exception/NotNormalizableValueException.php
@@ -16,17 +16,18 @@
  */
 class NotNormalizableValueException extends UnexpectedValueException
 {
-    private $currentType;
-    private $expectedTypes;
-    private $path;
-    private $useMessageForUser = false;
+    private ?string $currentType = null;
+    private ?array $expectedTypes = null;
+    private ?string $path = null;
+    private bool $useMessageForUser = false;
 
     /**
-     * @param bool $useMessageForUser If the message passed to this exception is something that can be shown
-     *                                safely to your user. In other words, avoid catching other exceptions and
-     *                                passing their message directly to this class.
+     * @param string[] $expectedTypes
+     * @param bool     $useMessageForUser If the message passed to this exception is something that can be shown
+     *                                    safely to your user. In other words, avoid catching other exceptions and
+     *                                    passing their message directly to this class.
      */
-    public static function createForUnexpectedDataType(string $message, $data, array $expectedTypes, string $path = null, bool $useMessageForUser = false, int $code = 0, \Throwable $previous = null): self
+    public static function createForUnexpectedDataType(string $message, mixed $data, array $expectedTypes, string $path = null, bool $useMessageForUser = false, int $code = 0, \Throwable $previous = null): self
     {
         $self = new self($message, $code, $previous);
 
diff --git a/src/Symfony/Component/Serializer/Extractor/ObjectPropertyListExtractor.php b/src/Symfony/Component/Serializer/Extractor/ObjectPropertyListExtractor.php
index 9b73446273726..c237e13a76344 100644
--- a/src/Symfony/Component/Serializer/Extractor/ObjectPropertyListExtractor.php
+++ b/src/Symfony/Component/Serializer/Extractor/ObjectPropertyListExtractor.php
@@ -18,18 +18,18 @@
  */
 final class ObjectPropertyListExtractor implements ObjectPropertyListExtractorInterface
 {
-    private $propertyListExtractor;
-    private $objectClassResolver;
+    private PropertyListExtractorInterface $propertyListExtractor;
+    private \Closure $objectClassResolver;
 
     public function __construct(PropertyListExtractorInterface $propertyListExtractor, callable $objectClassResolver = null)
     {
         $this->propertyListExtractor = $propertyListExtractor;
-        $this->objectClassResolver = $objectClassResolver;
+        $this->objectClassResolver = ($objectClassResolver ?? 'get_class')(...);
     }
 
     public function getProperties(object $object, array $context = []): ?array
     {
-        $class = $this->objectClassResolver ? ($this->objectClassResolver)($object) : $object::class;
+        $class = ($this->objectClassResolver)($object);
 
         return $this->propertyListExtractor->getProperties($class, $context);
     }
diff --git a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
index cb77b53d24286..c77d07e5e38d3 100644
--- a/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
+++ b/src/Symfony/Component/Serializer/Mapping/AttributeMetadata.php
@@ -23,32 +23,28 @@ class AttributeMetadata implements AttributeMetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link getName()} instead.
      */
-    public $name;
+    public string $name;
 
     /**
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
      *           {@link getGroups()} instead.
      */
-    public $groups = [];
+    public array $groups = [];
 
     /**
-     * @var int|null
-     *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
      *           {@link getMaxDepth()} instead.
      */
-    public $maxDepth;
+    public ?int $maxDepth = null;
 
     /**
-     * @var string|null
-     *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
      *           {@link getSerializedName()} instead.
      */
-    public $serializedName;
+    public ?string $serializedName = null;
 
     /**
      * @internal This property is public in order to reduce the size of the
@@ -58,13 +54,11 @@ class AttributeMetadata implements AttributeMetadataInterface
     public ?PropertyPath $serializedPath = null;
 
     /**
-     * @var bool
-     *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
      *           {@link isIgnored()} instead.
      */
-    public $ignore = false;
+    public bool $ignore = false;
 
     /**
      * @var array[] Normalization contexts per group name ("*" applies to all groups)
@@ -73,7 +67,7 @@ class AttributeMetadata implements AttributeMetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link getNormalizationContexts()} instead.
      */
-    public $normalizationContexts = [];
+    public array $normalizationContexts = [];
 
     /**
      * @var array[] Denormalization contexts per group name ("*" applies to all groups)
@@ -82,7 +76,7 @@ class AttributeMetadata implements AttributeMetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link getDenormalizationContexts()} instead.
      */
-    public $denormalizationContexts = [];
+    public array $denormalizationContexts = [];
 
     public function __construct(string $name)
     {
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php
index 708d58e03d2d2..d6f4bbe67f896 100644
--- a/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php
+++ b/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorFromClassMetadata.php
@@ -18,15 +18,11 @@
  */
 class ClassDiscriminatorFromClassMetadata implements ClassDiscriminatorResolverInterface
 {
-    /**
-     * @var ClassMetadataFactoryInterface
-     */
-    private $classMetadataFactory;
-    private $mappingForMappedObjectCache = [];
+    private array $mappingForMappedObjectCache = [];
 
-    public function __construct(ClassMetadataFactoryInterface $classMetadataFactory)
-    {
-        $this->classMetadataFactory = $classMetadataFactory;
+    public function __construct(
+        private readonly ClassMetadataFactoryInterface $classMetadataFactory,
+    ) {
     }
 
     public function getMappingForClass(string $class): ?ClassDiscriminatorMapping
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorMapping.php b/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorMapping.php
index c21d777ec8c9c..260575a411599 100644
--- a/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorMapping.php
+++ b/src/Symfony/Component/Serializer/Mapping/ClassDiscriminatorMapping.php
@@ -16,14 +16,13 @@
  */
 class ClassDiscriminatorMapping
 {
-    private $typeProperty;
-    private $typesMapping;
-
-    public function __construct(string $typeProperty, array $typesMapping = [])
-    {
-        $this->typeProperty = $typeProperty;
-        $this->typesMapping = $typesMapping;
-
+    /**
+     * @param array<string, string> $typesMapping
+     */
+    public function __construct(
+        private readonly string $typeProperty,
+        private array $typesMapping = [],
+    ) {
         uasort($this->typesMapping, static function (string $a, string $b): int {
             if (is_a($a, $b, true)) {
                 return -1;
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
index 4a70ee0858b91..bcec5bf969e7d 100644
--- a/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
+++ b/src/Symfony/Component/Serializer/Mapping/ClassMetadata.php
@@ -21,7 +21,7 @@ class ClassMetadata implements ClassMetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link getName()} instead.
      */
-    public $name;
+    public string $name;
 
     /**
      * @var AttributeMetadataInterface[]
@@ -30,21 +30,16 @@ class ClassMetadata implements ClassMetadataInterface
      *           class' serialized representation. Do not access it. Use
      *           {@link getAttributesMetadata()} instead.
      */
-    public $attributesMetadata = [];
+    public array $attributesMetadata = [];
 
-    /**
-     * @var \ReflectionClass
-     */
-    private $reflClass;
+    private ?\ReflectionClass $reflClass = null;
 
     /**
-     * @var ClassDiscriminatorMapping|null
-     *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
      *           {@link getClassDiscriminatorMapping()} instead.
      */
-    public $classDiscriminatorMapping;
+    public ?ClassDiscriminatorMapping $classDiscriminatorMapping;
 
     /**
      * Constructs a metadata for the given class.
diff --git a/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php b/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php
index b19cb1a462068..3f380d2ff19d2 100644
--- a/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php
+++ b/src/Symfony/Component/Serializer/Mapping/ClassMetadataInterface.php
@@ -37,7 +37,7 @@ public function addAttributeMetadata(AttributeMetadataInterface $attributeMetada
     /**
      * Gets the list of {@link AttributeMetadataInterface}.
      *
-     * @return AttributeMetadataInterface[]
+     * @return array<string, AttributeMetadataInterface>
      */
     public function getAttributesMetadata(): array;
 
diff --git a/src/Symfony/Component/Serializer/Mapping/Factory/CacheClassMetadataFactory.php b/src/Symfony/Component/Serializer/Mapping/Factory/CacheClassMetadataFactory.php
index c3adbeec136d8..61c2fb6069913 100644
--- a/src/Symfony/Component/Serializer/Mapping/Factory/CacheClassMetadataFactory.php
+++ b/src/Symfony/Component/Serializer/Mapping/Factory/CacheClassMetadataFactory.php
@@ -24,21 +24,14 @@ class CacheClassMetadataFactory implements ClassMetadataFactoryInterface
     use ClassResolverTrait;
 
     /**
-     * @var ClassMetadataFactoryInterface
+     * @var array<string, ClassMetadataInterface>
      */
-    private $decorated;
+    private array $loadedClasses = [];
 
-    /**
-     * @var CacheItemPoolInterface
-     */
-    private $cacheItemPool;
-
-    private $loadedClasses = [];
-
-    public function __construct(ClassMetadataFactoryInterface $decorated, CacheItemPoolInterface $cacheItemPool)
-    {
-        $this->decorated = $decorated;
-        $this->cacheItemPool = $cacheItemPool;
+    public function __construct(
+        private readonly ClassMetadataFactoryInterface $decorated,
+        private readonly CacheItemPoolInterface $cacheItemPool,
+    ) {
     }
 
     public function getMetadataFor(string|object $value): ClassMetadataInterface
diff --git a/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php b/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php
index 9b2cf1cb7cbaa..fc5b2e71e5c16 100644
--- a/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php
+++ b/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php
@@ -24,16 +24,14 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
 {
     use ClassResolverTrait;
 
-    private $loader;
-
     /**
-     * @var array
+     * @var array<string, ClassMetadataInterface>
      */
-    private $loadedClasses;
+    private array $loadedClasses;
 
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
+    public function __construct(
+        private readonly LoaderInterface $loader,
+    ) {
     }
 
     public function getMetadataFor(string|object $value): ClassMetadataInterface
diff --git a/src/Symfony/Component/Serializer/Mapping/Factory/CompiledClassMetadataFactory.php b/src/Symfony/Component/Serializer/Mapping/Factory/CompiledClassMetadataFactory.php
index 670a935875d94..f4d41c1e68194 100644
--- a/src/Symfony/Component/Serializer/Mapping/Factory/CompiledClassMetadataFactory.php
+++ b/src/Symfony/Component/Serializer/Mapping/Factory/CompiledClassMetadataFactory.php
@@ -21,14 +21,14 @@
  */
 final class CompiledClassMetadataFactory implements ClassMetadataFactoryInterface
 {
-    private $compiledClassMetadata = [];
+    private array $compiledClassMetadata = [];
 
-    private $loadedClasses = [];
+    private array $loadedClasses = [];
 
-    private $classMetadataFactory;
-
-    public function __construct(string $compiledClassMetadataFile, ClassMetadataFactoryInterface $classMetadataFactory)
-    {
+    public function __construct(
+        string $compiledClassMetadataFile,
+        private readonly ClassMetadataFactoryInterface $classMetadataFactory,
+    ) {
         if (!file_exists($compiledClassMetadataFile)) {
             throw new \RuntimeException("File \"{$compiledClassMetadataFile}\" could not be found.");
         }
@@ -39,7 +39,6 @@ public function __construct(string $compiledClassMetadataFile, ClassMetadataFact
         }
 
         $this->compiledClassMetadata = $compiledClassMetadata;
-        $this->classMetadataFactory = $classMetadataFactory;
     }
 
     public function getMetadataFor(string|object $value): ClassMetadataInterface
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php
index cfcee8bd5013d..6d03511cf57e2 100644
--- a/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php
+++ b/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php
@@ -43,11 +43,9 @@ class AnnotationLoader implements LoaderInterface
         Context::class,
     ];
 
-    private $reader;
-
-    public function __construct(Reader $reader = null)
-    {
-        $this->reader = $reader;
+    public function __construct(
+        private readonly ?Reader $reader = null,
+    ) {
     }
 
     public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php b/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php
index c25f5fa967d9d..e93a0a7b0a7e2 100644
--- a/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php
+++ b/src/Symfony/Component/Serializer/Mapping/Loader/LoaderChain.php
@@ -27,8 +27,6 @@
  */
 class LoaderChain implements LoaderInterface
 {
-    private $loaders;
-
     /**
      * Accepts a list of LoaderInterface instances.
      *
@@ -36,15 +34,13 @@ class LoaderChain implements LoaderInterface
      *
      * @throws MappingException If any of the loaders does not implement LoaderInterface
      */
-    public function __construct(array $loaders)
+    public function __construct(private readonly array $loaders)
     {
         foreach ($loaders as $loader) {
             if (!$loader instanceof LoaderInterface) {
                 throw new MappingException(sprintf('Class "%s" is expected to implement LoaderInterface.', get_debug_type($loader)));
             }
         }
-
-        $this->loaders = $loaders;
     }
 
     public function loadClassMetadata(ClassMetadataInterface $metadata): bool
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
index ebaa4655dcc89..b36fb871d8f3a 100644
--- a/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/Serializer/Mapping/Loader/XmlFileLoader.php
@@ -31,7 +31,7 @@ class XmlFileLoader extends FileLoader
      *
      * @var \SimpleXMLElement[]|null
      */
-    private $classes;
+    private ?array $classes = null;
 
     public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool
     {
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
index fd73864fdabe0..d47ad74301e66 100644
--- a/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
@@ -27,14 +27,12 @@
  */
 class YamlFileLoader extends FileLoader
 {
-    private $yamlParser;
+    private ?Parser $yamlParser = null;
 
     /**
      * An array of YAML class descriptions.
-     *
-     * @var array
      */
-    private $classes;
+    private ?array $classes = null;
 
     public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool
     {
diff --git a/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php b/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
index de34f5b57d2c9..ab6f99e13e0eb 100644
--- a/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
+++ b/src/Symfony/Component/Serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
@@ -18,17 +18,14 @@
  */
 class CamelCaseToSnakeCaseNameConverter implements NameConverterInterface
 {
-    private $attributes;
-    private $lowerCamelCase;
-
     /**
      * @param array|null $attributes     The list of attributes to rename or null for all attributes
      * @param bool       $lowerCamelCase Use lowerCamelCase style
      */
-    public function __construct(array $attributes = null, bool $lowerCamelCase = true)
-    {
-        $this->attributes = $attributes;
-        $this->lowerCamelCase = $lowerCamelCase;
+    public function __construct(
+        private ?array $attributes = null,
+        private bool $lowerCamelCase = true,
+    ) {
     }
 
     public function normalize(string $propertyName): string
diff --git a/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php b/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php
index 881d334bd94f2..0c97e227c47b0 100644
--- a/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php
+++ b/src/Symfony/Component/Serializer/NameConverter/MetadataAwareNameConverter.php
@@ -20,23 +20,25 @@
  */
 final class MetadataAwareNameConverter implements AdvancedNameConverterInterface
 {
-    private $metadataFactory;
-
     /**
-     * @var NameConverterInterface|AdvancedNameConverterInterface|null
+     * @var array<string, array<string, string|null>>
      */
-    private $fallbackNameConverter;
-
-    private static $normalizeCache = [];
+    private static array $normalizeCache = [];
 
-    private static $denormalizeCache = [];
+    /**
+     * @var array<string, array<string, string|null>>
+     */
+    private static array $denormalizeCache = [];
 
-    private static $attributesMetadataCache = [];
+    /**
+     * @var array<string, array<string, string>>
+     */
+    private static array $attributesMetadataCache = [];
 
-    public function __construct(ClassMetadataFactoryInterface $metadataFactory, NameConverterInterface $fallbackNameConverter = null)
-    {
-        $this->metadataFactory = $metadataFactory;
-        $this->fallbackNameConverter = $fallbackNameConverter;
+    public function __construct(
+        private readonly ClassMetadataFactoryInterface $metadataFactory,
+        private readonly ?NameConverterInterface $fallbackNameConverter = null,
+    ) {
     }
 
     public function normalize(string $propertyName, string $class = null, string $format = null, array $context = []): string
@@ -104,6 +106,9 @@ private function denormalizeFallback(string $propertyName, string $class = null,
         return $this->fallbackNameConverter ? $this->fallbackNameConverter->denormalize($propertyName, $class, $format, $context) : $propertyName;
     }
 
+    /**
+     * @return array<string, string>
+     */
     private function getCacheValueForAttributesMetadata(string $class, array $context): array
     {
         if (!$this->metadataFactory->hasMetadataFor($class)) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 6f87c7d0a8ed1..88e3c3ea120bd 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -105,19 +105,23 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
      */
     public const PRESERVE_EMPTY_OBJECTS = 'preserve_empty_objects';
 
-    private $propertyTypeExtractor;
-    private $typesCache = [];
-    private $attributesCache = [];
-
-    private $objectClassResolver;
+    private array $typesCache = [];
+    private array $attributesCache = [];
+    private readonly \Closure $objectClassResolver;
 
     /**
      * @var ClassDiscriminatorResolverInterface|null
      */
     protected $classDiscriminatorResolver;
 
-    public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, callable $objectClassResolver = null, array $defaultContext = [])
-    {
+    public function __construct(
+        ClassMetadataFactoryInterface $classMetadataFactory = null,
+        NameConverterInterface $nameConverter = null,
+        private ?PropertyTypeExtractorInterface $propertyTypeExtractor = null,
+        ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null,
+        callable $objectClassResolver = null,
+        array $defaultContext = [],
+    ) {
         parent::__construct($classMetadataFactory, $nameConverter, $defaultContext);
 
         if (isset($this->defaultContext[self::MAX_DEPTH_HANDLER]) && !\is_callable($this->defaultContext[self::MAX_DEPTH_HANDLER])) {
@@ -126,13 +130,11 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
 
         $this->defaultContext[self::EXCLUDE_FROM_CACHE_KEY] = array_merge($this->defaultContext[self::EXCLUDE_FROM_CACHE_KEY] ?? [], [self::CIRCULAR_REFERENCE_LIMIT_COUNTERS]);
 
-        $this->propertyTypeExtractor = $propertyTypeExtractor;
-
         if (null === $classDiscriminatorResolver && null !== $classMetadataFactory) {
             $classDiscriminatorResolver = new ClassDiscriminatorFromClassMetadata($classMetadataFactory);
         }
         $this->classDiscriminatorResolver = $classDiscriminatorResolver;
-        $this->objectClassResolver = $objectClassResolver;
+        $this->objectClassResolver = ($objectClassResolver ?? 'get_class')(...);
     }
 
     /**
@@ -158,7 +160,7 @@ public function normalize(mixed $object, string $format = null, array $context =
         $data = [];
         $stack = [];
         $attributes = $this->getAttributes($object, $format, $context);
-        $class = $this->objectClassResolver ? ($this->objectClassResolver)($object) : $object::class;
+        $class = ($this->objectClassResolver)($object);
         $classMetadata = $this->classMetadataFactory?->getMetadataFor($class);
         $attributesMetadata = $this->classMetadataFactory?->getMetadataFor($class)->getAttributesMetadata();
         if (isset($context[self::MAX_DEPTH_HANDLER])) {
@@ -251,7 +253,7 @@ protected function instantiateObject(array &$data, string $class, array &$contex
      */
     protected function getAttributes(object $object, ?string $format, array $context): array
     {
-        $class = $this->objectClassResolver ? ($this->objectClassResolver)($object) : $object::class;
+        $class = ($this->objectClassResolver)($object);
         $key = $class.'-'.$context['cache_key'];
 
         if (isset($this->attributesCache[$key])) {
@@ -321,7 +323,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
 
         $reflectionClass = new \ReflectionClass($type);
         $object = $this->instantiateObject($normalizedData, $type, $context, $reflectionClass, $allowedAttributes, $format);
-        $resolvedClass = $this->objectClassResolver ? ($this->objectClassResolver)($object) : $object::class;
+        $resolvedClass = ($this->objectClassResolver)($object);
 
         $nestedAttributes = $this->getNestedAttributes($resolvedClass);
         $nestedData = [];
diff --git a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
index 8816055a3c783..1fdf8420dbb9a 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
@@ -32,13 +32,10 @@ class ConstraintViolationListNormalizer implements NormalizerInterface, Cacheabl
     public const TYPE = 'type';
     public const PAYLOAD_FIELDS = 'payload_fields';
 
-    private $defaultContext;
-    private $nameConverter;
-
-    public function __construct(array $defaultContext = [], NameConverterInterface $nameConverter = null)
-    {
-        $this->defaultContext = $defaultContext;
-        $this->nameConverter = $nameConverter;
+    public function __construct(
+        private readonly array $defaultContext = [],
+        private readonly ?NameConverterInterface $nameConverter = null,
+    ) {
     }
 
     public function getSupportedTypes(?string $format): array
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
index ff07c1f30fe53..1bcf81f9ba892 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -33,10 +33,7 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface, C
         File::class => true,
     ];
 
-    /**
-     * @var MimeTypeGuesserInterface|null
-     */
-    private $mimeTypeGuesser;
+    private readonly ?MimeTypeGuesserInterface $mimeTypeGuesser;
 
     public function __construct(MimeTypeGuesserInterface $mimeTypeGuesser = null)
     {
@@ -150,11 +147,7 @@ private function getMimeType(\SplFileInfo $object): string
             return $object->getMimeType();
         }
 
-        if ($this->mimeTypeGuesser && $mimeType = $this->mimeTypeGuesser->guessMimeType($object->getPathname())) {
-            return $mimeType;
-        }
-
-        return 'application/octet-stream';
+        return $this->mimeTypeGuesser?->guessMimeType($object->getPathname()) ?: 'application/octet-stream';
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
index c9bc517727239..3cf5b887f9dbe 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php
@@ -26,7 +26,7 @@ class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterfa
 {
     public const FORMAT_KEY = 'dateinterval_format';
 
-    private $defaultContext = [
+    private array $defaultContext = [
         self::FORMAT_KEY => '%rP%yY%mM%dDT%hH%iM%sS',
     ];
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
index b8d9ea2354573..aa7988d37ed55 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
@@ -28,7 +28,7 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface,
     public const FORMAT_KEY = 'datetime_format';
     public const TIMEZONE_KEY = 'datetime_timezone';
 
-    private $defaultContext = [
+    private array $defaultContext = [
         self::FORMAT_KEY => \DateTime::RFC3339,
         self::TIMEZONE_KEY => null,
     ];
diff --git a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
index 272495e68c012..4bf6f42c29460 100644
--- a/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php
@@ -32,13 +32,11 @@
 final class MimeMessageNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface, CacheableSupportsMethodInterface
 {
     private NormalizerInterface&DenormalizerInterface $serializer;
-    private PropertyNormalizer $normalizer;
     private array $headerClassMap;
     private \ReflectionProperty $headersProperty;
 
-    public function __construct(PropertyNormalizer $normalizer)
+    public function __construct(private readonly PropertyNormalizer $normalizer)
     {
-        $this->normalizer = $normalizer;
         $this->headerClassMap = (new \ReflectionClassConstant(Headers::class, 'HEADER_CLASS_MAP'))->getValue();
         $this->headersProperty = new \ReflectionProperty(Headers::class, 'headers');
     }
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index f4e50841e9c20..357c36426e50a 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -32,9 +32,10 @@ class ObjectNormalizer extends AbstractObjectNormalizer
 {
     protected $propertyAccessor;
 
-    private $discriminatorCache = [];
+    /** @var array<string, string|null> */
+    private array $discriminatorCache = [];
 
-    private $objectClassResolver;
+    private readonly \Closure $objectClassResolver;
 
     public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyAccessorInterface $propertyAccessor = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, callable $objectClassResolver = null, array $defaultContext = [])
     {
@@ -46,7 +47,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
 
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
 
-        $this->objectClassResolver = $objectClassResolver ?? fn ($class) => \is_object($class) ? $class::class : $class;
+        $this->objectClassResolver = ($objectClassResolver ?? static fn ($class) => \is_object($class) ? $class::class : $class)(...);
     }
 
     public function getSupportedTypes(?string $format): array
diff --git a/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php
index 40559ec0b04e2..0dfeae7b83fd8 100644
--- a/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/UidNormalizer.php
@@ -32,7 +32,7 @@ final class UidNormalizer implements NormalizerInterface, DenormalizerInterface,
         self::NORMALIZATION_FORMAT_RFC4122,
     ];
 
-    private $defaultContext = [
+    private array $defaultContext = [
         self::NORMALIZATION_FORMAT_KEY => self::NORMALIZATION_FORMAT_CANONICAL,
     ];
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php b/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
index 31cc37be907b4..3708b1a08a78e 100644
--- a/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/UnwrappingDenormalizer.php
@@ -26,7 +26,7 @@ final class UnwrappingDenormalizer implements DenormalizerInterface, SerializerA
 
     public const UNWRAP_PATH = 'unwrap_path';
 
-    private $propertyAccessor;
+    private readonly PropertyAccessorInterface $propertyAccessor;
 
     public function __construct(PropertyAccessorInterface $propertyAccessor = null)
     {
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
index e79ca7ba78412..c83da01fbe1f1 100644
--- a/src/Symfony/Component/Serializer/Serializer.php
+++ b/src/Symfony/Component/Serializer/Serializer.php
@@ -62,25 +62,33 @@ class Serializer implements SerializerInterface, ContextAwareNormalizerInterface
     ];
 
     /**
-     * @var Encoder\ChainEncoder
+     * @var ChainEncoder
      */
     protected $encoder;
 
     /**
-     * @var Encoder\ChainDecoder
+     * @var ChainDecoder
      */
     protected $decoder;
 
-    private $normalizers = [];
-    private $denormalizerCache = [];
-    private $normalizerCache = [];
+    /**
+     * @var array<string, array<string, array<bool>>>
+     */
+    private array $denormalizerCache = [];
+
+    /**
+     * @var array<string, array<string, array<bool>>>
+     */
+    private array $normalizerCache = [];
 
     /**
      * @param array<NormalizerInterface|DenormalizerInterface> $normalizers
      * @param array<EncoderInterface|DecoderInterface>         $encoders
      */
-    public function __construct(array $normalizers = [], array $encoders = [])
-    {
+    public function __construct(
+        private array $normalizers = [],
+        array $encoders = [],
+    ) {
         foreach ($normalizers as $normalizer) {
             if ($normalizer instanceof SerializerAwareInterface) {
                 $normalizer->setSerializer($this);
@@ -98,7 +106,6 @@ public function __construct(array $normalizers = [], array $encoders = [])
                 throw new InvalidArgumentException(sprintf('The class "%s" neither implements "%s" nor "%s".', get_debug_type($normalizer), NormalizerInterface::class, DenormalizerInterface::class));
             }
         }
-        $this->normalizers = $normalizers;
 
         $decoders = [];
         $realEncoders = [];

From 7a77b3a5d7ede82dce3e5defed03f028d94993c9 Mon Sep 17 00:00:00 2001
From: MatTheCat <math.lechat@gmail.com>
Date: Sun, 19 Mar 2023 14:07:18 +0100
Subject: [PATCH 418/475] [HttpKernel] Collect data from every event dispatcher

---
 .../Resources/config/collectors.php           |   2 +-
 .../views/Collector/events.html.twig          | 129 ++++++++++--------
 .../Bundle/WebProfilerBundle/composer.json    |   2 +-
 src/Symfony/Component/HttpKernel/CHANGELOG.md |   1 +
 .../DataCollector/EventDataCollector.php      |  72 ++++++----
 5 files changed, 116 insertions(+), 90 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.php
index abf9ded5e5949..df218013a2315 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.php
@@ -47,7 +47,7 @@
 
         ->set('data_collector.events', EventDataCollector::class)
             ->args([
-                service('debug.event_dispatcher')->ignoreOnInvalid(),
+                tagged_iterator('event_dispatcher.dispatcher', 'name'),
                 service('request_stack')->ignoreOnInvalid(),
             ])
             ->tag('data_collector', ['template' => '@WebProfiler/Collector/events.html.twig', 'id' => 'events', 'priority' => 290])
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig
index 8dadefa661745..d1255b7745f1b 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig
@@ -8,76 +8,85 @@
 {% endblock %}
 
 {% block panel %}
-    <h2>Event Dispatcher</h2>
+    <h2>Dispatched Events</h2>
 
-    {% if collector.calledlisteners is empty %}
-        <div class="empty empty-panel">
-            <p>No events have been recorded. Check that debugging is enabled in the kernel.</p>
-        </div>
-    {% else %}
-        <div class="sf-tabs">
+    <div class="sf-tabs">
+        {% for dispatcherName, dispatcherData in collector.data %}
             <div class="tab">
-                <h3 class="tab-title">Called Listeners <span class="badge">{{ collector.calledlisteners|length }}</span></h3>
-
-                <div class="tab-content">
-                    {{ _self.render_table(collector.calledlisteners) }}
-                </div>
-            </div>
-
-            <div class="tab">
-                <h3 class="tab-title">Not Called Listeners <span class="badge">{{ collector.notcalledlisteners|length }}</span></h3>
+                <h3 class="tab-title">{{ dispatcherName }}</h3>
                 <div class="tab-content">
-                    {% if collector.notcalledlisteners is empty %}
-                        <div class="empty">
-                            <p>
-                                <strong>There are no uncalled listeners</strong>.
-                            </p>
-                            <p>
-                                All listeners were called for this request or an error occurred
-                                when trying to collect uncalled listeners (in which case check the
-                                logs to get more information).
-                            </p>
+                    {% if dispatcherData['called_listeners'] is empty %}
+                        <div class="empty empty-panel">
+                            <p>No events have been recorded. Check that debugging is enabled in the kernel.</p>
                         </div>
                     {% else %}
-                        {{ _self.render_table(collector.notcalledlisteners) }}
-                    {% endif %}
-                </div>
-            </div>
+                        <div class="sf-tabs">
+                            <div class="tab">
+                                <h3 class="tab-title">Called Listeners <span class="badge">{{ dispatcherData['called_listeners']|length }}</span></h3>
 
-            <div class="tab">
-                <h3 class="tab-title">Orphaned Events <span class="badge">{{ collector.orphanedEvents|length }}</span></h3>
-                <div class="tab-content">
-                    {% if collector.orphanedEvents is empty %}
-                        <div class="empty">
-                            <p>
-                                <strong>There are no orphaned events</strong>.
-                            </p>
-                            <p>
-                                All dispatched events were handled or an error occurred
-                                when trying to collect orphaned events (in which case check the
-                                logs to get more information).
-                            </p>
+                                <div class="tab-content">
+                                    {{ _self.render_table(dispatcherData['called_listeners']) }}
+                                </div>
+                            </div>
+
+                            <div class="tab">
+                                <h3 class="tab-title">Not Called Listeners <span class="badge">{{ dispatcherData['not_called_listeners']|length }}</span></h3>
+                                <div class="tab-content">
+                                    {% if dispatcherData['not_called_listeners'] is empty %}
+                                        <div class="empty">
+                                            <p>
+                                                <strong>There are no uncalled listeners</strong>.
+                                            </p>
+                                            <p>
+                                                All listeners were called for this request or an error occurred
+                                                when trying to collect uncalled listeners (in which case check the
+                                                logs to get more information).
+                                            </p>
+                                        </div>
+                                    {% else %}
+                                        {{ _self.render_table(dispatcherData['not_called_listeners']) }}
+                                    {% endif %}
+                                </div>
+                            </div>
+
+                            <div class="tab">
+                                <h3 class="tab-title">Orphaned Events <span class="badge">{{ dispatcherData['orphaned_events']|length }}</span></h3>
+                                <div class="tab-content">
+                                    {% if dispatcherData['orphaned_events'] is empty %}
+                                        <div class="empty">
+                                            <p>
+                                                <strong>There are no orphaned events</strong>.
+                                            </p>
+                                            <p>
+                                                All dispatched events were handled or an error occurred
+                                                when trying to collect orphaned events (in which case check the
+                                                logs to get more information).
+                                            </p>
+                                        </div>
+                                    {% else %}
+                                        <table>
+                                            <thead>
+                                                <tr>
+                                                    <th>Event</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                {% for event in dispatcherData['orphaned_events'] %}
+                                                    <tr>
+                                                        <td class="font-normal">{{ event }}</td>
+                                                    </tr>
+                                                {% endfor %}
+                                            </tbody>
+                                        </table>
+                                    {% endif %}
+                                </div>
+                            </div>
                         </div>
-                    {% else %}
-                        <table>
-                            <thead>
-                                <tr>
-                                    <th>Event</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for event in collector.orphanedEvents %}
-                                    <tr>
-                                        <td class="font-normal">{{ event }}</td>
-                                    </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
                     {% endif %}
                 </div>
             </div>
-        </div>
-    {% endif %}
+        {% endfor %}
+    </div>
 {% endblock %}
 
 {% macro render_table(listeners) %}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
index 58e1081f245bb..97af49029bedc 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/composer.json
+++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -19,7 +19,7 @@
         "php": ">=8.1",
         "symfony/config": "^5.4|^6.0",
         "symfony/framework-bundle": "^5.4|^6.0",
-        "symfony/http-kernel": "^6.1",
+        "symfony/http-kernel": "^6.3",
         "symfony/routing": "^5.4|^6.0",
         "symfony/twig-bundle": "^5.4|^6.0",
         "twig/twig": "^2.13|^3.0.4"
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index 838a62cefea95..8aceb90c862f7 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG
  * Add `#[MapRequestPayload]` to map and validate request payload from `Request::getContent()` or `Request::$request->all()` to typed objects
  * Add `#[MapQueryString]` to map and validate request query string from `Request::$query->all()` to typed objects
  * Add `#[MapQueryParameter]` to map and validate individual query parameters to controller arguments
+ * Collect data from every event dispatcher
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
index 944d24c42c6da..8c0eefdf39b6b 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php
@@ -28,76 +28,92 @@
  */
 class EventDataCollector extends DataCollector implements LateDataCollectorInterface
 {
-    private ?EventDispatcherInterface $dispatcher;
-    private ?RequestStack $requestStack;
+    /** @var iterable<EventDispatcherInterface> */
+    private iterable $dispatchers;
     private ?Request $currentRequest = null;
 
-    public function __construct(EventDispatcherInterface $dispatcher = null, RequestStack $requestStack = null)
-    {
-        $this->dispatcher = $dispatcher;
+    /**
+     * @param iterable<EventDispatcherInterface>|EventDispatcherInterface|null $dispatchers
+     */
+    public function __construct(
+        iterable|EventDispatcherInterface $dispatchers = null,
+        private ?RequestStack $requestStack = null,
+        private string $defaultDispatcher = 'event_dispatcher',
+    ) {
+        if ($dispatchers instanceof EventDispatcherInterface) {
+            $dispatchers = [$this->defaultDispatcher => $dispatchers];
+        }
+        $this->dispatchers = $dispatchers ?? [];
         $this->requestStack = $requestStack;
     }
 
     public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         $this->currentRequest = $this->requestStack && $this->requestStack->getMainRequest() !== $request ? $request : null;
-        $this->data = [
-            'called_listeners' => [],
-            'not_called_listeners' => [],
-            'orphaned_events' => [],
-        ];
+        $this->data = [];
     }
 
     public function reset(): void
     {
         $this->data = [];
 
-        if ($this->dispatcher instanceof ResetInterface) {
-            $this->dispatcher->reset();
+        foreach ($this->dispatchers as $dispatcher) {
+            if ($dispatcher instanceof ResetInterface) {
+                $dispatcher->reset();
+            }
         }
     }
 
     public function lateCollect(): void
     {
-        if ($this->dispatcher instanceof TraceableEventDispatcher) {
-            $this->setCalledListeners($this->dispatcher->getCalledListeners($this->currentRequest));
-            $this->setNotCalledListeners($this->dispatcher->getNotCalledListeners($this->currentRequest));
-            $this->setOrphanedEvents($this->dispatcher->getOrphanedEvents($this->currentRequest));
+        foreach ($this->dispatchers as $name => $dispatcher) {
+            if (!$dispatcher instanceof TraceableEventDispatcher) {
+                continue;
+            }
+
+            $this->setCalledListeners($dispatcher->getCalledListeners($this->currentRequest), $name);
+            $this->setNotCalledListeners($dispatcher->getNotCalledListeners($this->currentRequest), $name);
+            $this->setOrphanedEvents($dispatcher->getOrphanedEvents($this->currentRequest), $name);
         }
 
         $this->data = $this->cloneVar($this->data);
     }
 
+    public function getData(): array|Data
+    {
+        return $this->data;
+    }
+
     /**
      * @see TraceableEventDispatcher
      */
-    public function setCalledListeners(array $listeners): void
+    public function setCalledListeners(array $listeners, string $dispatcher = null): void
     {
-        $this->data['called_listeners'] = $listeners;
+        $this->data[$dispatcher ?? $this->defaultDispatcher]['called_listeners'] = $listeners;
     }
 
     /**
      * @see TraceableEventDispatcher
      */
-    public function getCalledListeners(): array|Data
+    public function getCalledListeners(string $dispatcher = null): array|Data
     {
-        return $this->data['called_listeners'];
+        return $this->data[$dispatcher ?? $this->defaultDispatcher]['called_listeners'] ?? [];
     }
 
     /**
      * @see TraceableEventDispatcher
      */
-    public function setNotCalledListeners(array $listeners): void
+    public function setNotCalledListeners(array $listeners, string $dispatcher = null): void
     {
-        $this->data['not_called_listeners'] = $listeners;
+        $this->data[$dispatcher ?? $this->defaultDispatcher]['not_called_listeners'] = $listeners;
     }
 
     /**
      * @see TraceableEventDispatcher
      */
-    public function getNotCalledListeners(): array|Data
+    public function getNotCalledListeners(string $dispatcher = null): array|Data
     {
-        return $this->data['not_called_listeners'];
+        return $this->data[$dispatcher ?? $this->defaultDispatcher]['not_called_listeners'] ?? [];
     }
 
     /**
@@ -105,17 +121,17 @@ public function getNotCalledListeners(): array|Data
      *
      * @see TraceableEventDispatcher
      */
-    public function setOrphanedEvents(array $events): void
+    public function setOrphanedEvents(array $events, string $dispatcher = null): void
     {
-        $this->data['orphaned_events'] = $events;
+        $this->data[$dispatcher ?? $this->defaultDispatcher]['orphaned_events'] = $events;
     }
 
     /**
      * @see TraceableEventDispatcher
      */
-    public function getOrphanedEvents(): array|Data
+    public function getOrphanedEvents(string $dispatcher = null): array|Data
     {
-        return $this->data['orphaned_events'];
+        return $this->data[$dispatcher ?? $this->defaultDispatcher]['orphaned_events'] ?? [];
     }
 
     public function getName(): string

From b63ad4025ffbc4f1e513dd34650a34a50712afe4 Mon Sep 17 00:00:00 2001
From: Benjamin Zaslavsky <benjamin.zaslavsky@gmail.com>
Date: Fri, 24 Mar 2023 20:01:28 +0100
Subject: [PATCH 419/475] [HttpClient] Allow using multiple base_uri as array
 for retries

---
 src/Symfony/Component/HttpClient/CHANGELOG.md |   1 +
 .../HttpClient/RetryableHttpClient.php        |  36 ++++++-
 .../Tests/RetryableHttpClientTest.php         | 100 ++++++++++++++++++
 3 files changed, 135 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
index 51683c591745b..104e4d3247774 100644
--- a/src/Symfony/Component/HttpClient/CHANGELOG.md
+++ b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * Add `UriTemplateHttpClient` to use URI templates as specified in the RFC 6570
  * Add `ServerSentEvent::getArrayData()` to get the Server-Sent Event's data decoded as an array when it's a JSON payload
+ * Allow array of urls as `base_uri` option value in `RetryableHttpClient` to retry on a new url each time
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpClient/RetryableHttpClient.php b/src/Symfony/Component/HttpClient/RetryableHttpClient.php
index 2fc429489c268..1a6ec7d35e63f 100644
--- a/src/Symfony/Component/HttpClient/RetryableHttpClient.php
+++ b/src/Symfony/Component/HttpClient/RetryableHttpClient.php
@@ -35,6 +35,7 @@ class RetryableHttpClient implements HttpClientInterface, ResetInterface
     private RetryStrategyInterface $strategy;
     private int $maxRetries;
     private LoggerInterface $logger;
+    private array $baseUris = [];
 
     /**
      * @param int $maxRetries The maximum number of times to retry
@@ -47,13 +48,34 @@ public function __construct(HttpClientInterface $client, RetryStrategyInterface
         $this->logger = $logger ?? new NullLogger();
     }
 
+    public function withOptions(array $options): static
+    {
+        if (\array_key_exists('base_uri', $options)) {
+            if (\is_array($options['base_uri'])) {
+                $this->baseUris = $options['base_uri'];
+                unset($options['base_uri']);
+            } else {
+                $this->baseUris = [];
+            }
+        }
+
+        $clone = clone $this;
+        $clone->client = $this->client->withOptions($options);
+
+        return $clone;
+    }
+
     public function request(string $method, string $url, array $options = []): ResponseInterface
     {
+        $baseUris = \array_key_exists('base_uri', $options) ? $options['base_uri'] : $this->baseUris;
+        $baseUris = \is_array($baseUris) ? $baseUris : [];
+        $options = self::shiftBaseUri($options, $baseUris);
+
         if ($this->maxRetries <= 0) {
             return new AsyncResponse($this->client, $method, $url, $options);
         }
 
-        return new AsyncResponse($this->client, $method, $url, $options, function (ChunkInterface $chunk, AsyncContext $context) use ($method, $url, $options) {
+        return new AsyncResponse($this->client, $method, $url, $options, function (ChunkInterface $chunk, AsyncContext $context) use ($method, $url, $options, &$baseUris) {
             static $retryCount = 0;
             static $content = '';
             static $firstChunk;
@@ -127,7 +149,7 @@ public function request(string $method, string $url, array $options = []): Respo
             ]);
 
             $context->setInfo('retry_count', $retryCount);
-            $context->replaceRequest($method, $url, $options);
+            $context->replaceRequest($method, $url, self::shiftBaseUri($options, $baseUris));
             $context->pause($delay / 1000);
 
             if ($retryCount >= $this->maxRetries) {
@@ -168,4 +190,14 @@ private function passthru(AsyncContext $context, ?ChunkInterface $firstChunk, st
 
         yield $lastChunk;
     }
+
+    private static function shiftBaseUri(array $options, array &$baseUris): array
+    {
+        if ($baseUris) {
+            $baseUri = 1 < \count($baseUris) ? array_shift($baseUris) : current($baseUris);
+            $options['base_uri'] = \is_array($baseUri) ? $baseUri[array_rand($baseUri)] : $baseUri;
+        }
+
+        return $options;
+    }
 }
diff --git a/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php
index cf2af1560c345..b32601aefc5a5 100644
--- a/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php
@@ -244,4 +244,104 @@ public function testRetryOnErrorAssertContent()
         self::assertSame('Test out content', $response->getContent());
         self::assertSame('Test out content', $response->getContent(), 'Content should be buffered');
     }
+
+    public function testRetryWithMultipleBaseUris()
+    {
+        $client = new RetryableHttpClient(
+            new MockHttpClient([
+                new MockResponse('', ['http_code' => 500]),
+            
10000
    new MockResponse('Hit on second uri', ['http_code' => 200]),
+            ]),
+            new GenericRetryStrategy([500], 0),
+            1
+        );
+
+        $response = $client->request('GET', 'foo-bar', [
+            'base_uri' => [
+                'http://example.com/a/',
+                'http://example.com/b/',
+            ],
+        ]);
+
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('http://example.com/b/foo-bar', $response->getInfo('url'));
+    }
+
+    public function testMultipleBaseUrisAsOptions()
+    {
+        $client = new RetryableHttpClient(
+            new MockHttpClient([
+                new MockResponse('', ['http_code' => 500]),
+                new MockResponse('Hit on second uri', ['http_code' => 200]),
+            ]),
+            new GenericRetryStrategy([500], 0),
+            1
+        );
+
+        $client = $client->withOptions([
+            'base_uri' => [
+                'http://example.com/a/',
+                'http://example.com/b/',
+            ],
+        ]);
+
+        $response = $client->request('GET', 'foo-bar');
+
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('http://example.com/b/foo-bar', $response->getInfo('url'));
+    }
+
+    public function testRetryWithMultipleBaseUrisShufflesNestedArray()
+    {
+        $client = new RetryableHttpClient(
+            new MockHttpClient([
+                new MockResponse('', ['http_code' => 500]),
+                new MockResponse('Hit on second uri', ['http_code' => 200]),
+            ]),
+            new GenericRetryStrategy([500], 0),
+            1
+        );
+
+        $response = $client->request('GET', 'foo-bar', [
+            'base_uri' => [
+                'http://example.com/a/',
+                [
+                    'http://example.com/b/',
+                    'http://example.com/c/',
+                ],
+                'http://example.com/d/',
+            ],
+        ]);
+
+        self::assertSame(200, $response->getStatusCode());
+        self::assertMatchesRegularExpression('#^http://example.com/(b|c)/foo-bar$#', $response->getInfo('url'));
+    }
+
+    public function testRetryWithMultipleBaseUrisPreservesNonNestedOrder()
+    {
+        $client = new RetryableHttpClient(
+            new MockHttpClient([
+                new MockResponse('', ['http_code' => 500]),
+                new MockResponse('', ['http_code' => 500]),
+                new MockResponse('', ['http_code' => 500]),
+                new MockResponse('Hit on second uri', ['http_code' => 200]),
+            ]),
+            new GenericRetryStrategy([500], 0),
+            3
+        );
+
+        $response = $client->request('GET', 'foo-bar', [
+            'base_uri' => [
+                'http://example.com/a/',
+                [
+                    'http://example.com/b/',
+                    'http://example.com/c/',
+                ],
+                'http://example.com/d/',
+            ],
+        ]);
+
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('http://example.com/d/foo-bar', $response->getInfo('url'));
+    }
 }

From bd5a4caef48003a3b3284df7ac0b06837b85bd40 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Wed, 19 Apr 2023 18:04:53 +0200
Subject: [PATCH 420/475] [HttpClient] Improve MockHttpClient exception message

---
 .../Component/HttpClient/MockHttpClient.php   |  2 +-
 .../HttpClient/Tests/MockHttpClientTest.php   | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpClient/MockHttpClient.php b/src/Symfony/Component/HttpClient/MockHttpClient.php
index fecba0ee56ddb..b49fa4bbe8d74 100644
--- a/src/Symfony/Component/HttpClient/MockHttpClient.php
+++ b/src/Symfony/Component/HttpClient/MockHttpClient.php
@@ -72,7 +72,7 @@ public function request(string $method, string $url, array $options = []): Respo
         } elseif (\is_callable($this->responseFactory)) {
             $response = ($this->responseFactory)($method, $url, $options);
         } elseif (!$this->responseFactory->valid()) {
-            throw new TransportException('The response factory iterator passed to MockHttpClient is empty.');
+            throw new TransportException($this->requestsCount ? 'No more response left in the response factory iterator passed to MockHttpClient: the number of requests exceeds the number of responses.' : 'The response factory iterator passed to MockHttpClient is empty.');
         } else {
             $responseFactory = $this->responseFactory->current();
             $response = \is_callable($responseFactory) ? $responseFactory($method, $url, $options) : $responseFactory;
diff --git a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
index e244c32526222..fe015fb1f09ab 100644
--- a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
@@ -527,4 +527,23 @@ public function testCancelingMockResponseExecutesOnProgressWithUpdatedInfo()
 
         $this->assertTrue($canceled);
     }
+
+    public function testEmptyResponseFactory()
+    {
+        $this->expectException(TransportException::class);
+        $this->expectExceptionMessage('The response factory iterator passed to MockHttpClient is empty.');
+
+        $client = new MockHttpClient([]);
+        $client->request('GET', 'https://example.com');
+    }
+
+    public function testMoreRequestsThanResponseFactoryResponses()
+    {
+        $this->expectException(TransportException::class);
+        $this->expectExceptionMessage('No more response left in the response factory iterator passed to MockHttpClient: the number of requests exceeds the number of responses.');
+
+        $client = new MockHttpClient([new MockResponse()]);
+        $client->request('GET', 'https://example.com');
+        $client->request('GET', 'https://example.com');
+    }
 }

From 068fb4dc3a255f5d61407123b18a9ec49cae273f Mon Sep 17 00:00:00 2001
From: Renan <renan-sub@protonmail.com>
Date: Sun, 16 Apr 2023 16:23:00 +0200
Subject: [PATCH 421/475] [HttpKernel] Enhance MapRequestPayload adding format
 and validation group

apply feedbacks

revert argument type

better properties name

attempt to fix CI

static providers
---
 .../Attribute/MapRequestPayload.php           |   5 +-
 .../RequestPayloadValueResolver.php           |  18 +-
 .../RequestPayloadValueResolverTest.php       | 190 ++++++++++++++++++
 .../Component/HttpKernel/composer.json        |   2 +-
 4 files changed, 206 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Attribute/MapRequestPayload.php b/src/Symfony/Component/HttpKernel/Attribute/MapRequestPayload.php
index 1fdb9d67db5d4..f02414343f0d1 100644
--- a/src/Symfony/Component/HttpKernel/Attribute/MapRequestPayload.php
+++ b/src/Symfony/Component/HttpKernel/Attribute/MapRequestPayload.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\Attribute;
 
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestPayloadValueResolver;
+use Symfony\Component\Validator\Constraints\GroupSequence;
 
 /**
  * Controller parameter tag to map the request content to typed object and validate it.
@@ -22,7 +23,9 @@
 class MapRequestPayload extends ValueResolver
 {
     public function __construct(
-        public readonly array $context = [],
+        public readonly array|string|null $acceptFormat = null,
+        public readonly array $serializationContext = [],
+        public readonly string|GroupSequence|array|null $validationGroups = null,
         string $resolver = RequestPayloadValueResolver::class,
     ) {
         parent::__construct($resolver);
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
index 8d346685223d1..f73c9a58d6ee6 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
@@ -92,7 +92,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
                 }
 
                 if (null !== $payload) {
-                    $violations->addAll($this->validator->validate($payload));
+                    $violations->addAll($this->validator->validate($payload, null, $attributes[0]->validationGroups ?? null));
                 }
 
                 if (\count($violations)) {
@@ -125,24 +125,28 @@ private function mapQueryString(Request $request, string $type, MapQueryString $
 
     private function mapRequestPayload(Request $request, string $type, MapRequestPayload $attribute): ?object
     {
+        if (null === $format = $request->getContentTypeFormat()) {
+            throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, 'Unsupported format.');
+        }
+
+        if ($attribute->acceptFormat && !\in_array($format, (array) $attribute->acceptFormat, true)) {
+            throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, sprintf('Unsupported format, expects "%s", but "%s" given.', implode('", "', (array) $attribute->acceptFormat), $format));
+        }
+
         if ($data = $request->request->all()) {
-            return $this->serializer->denormalize($data, $type, null, self::CONTEXT_DENORMALIZE + $attribute->context);
+            return $this->serializer->denormalize($data, $type, null, self::CONTEXT_DENORMALIZE + $attribute->serializationContext);
         }
 
         if ('' === $data = $request->getContent()) {
             return null;
         }
 
-        if (null === $format = $request->getContentTypeFormat()) {
-            throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, 'Unsupported format.');
-        }
-
         if ('form' === $format) {
             throw new HttpException(Response::HTTP_BAD_REQUEST, 'Request payload contains invalid "form" data.');
         }
 
         try {
-            return $this->serializer->deserialize($data, $type, $format, self::CONTEXT_DESERIALIZE + $attribute->context);
+            return $this->serializer->deserialize($data, $type, $format, self::CONTEXT_DESERIALIZE + $attribute->serializationContext);
         } catch (UnsupportedFormatException $e) {
             throw new HttpException(Response::HTTP_UNSUPPORTED_MEDIA_TYPE, sprintf('Unsupported format: "%s".', $format), $e);
         } catch (NotEncodableValueException $e) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
index 7725be5ffb970..078ee02a216f8 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
@@ -19,13 +19,16 @@
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Encoder\XmlEncoder;
 use Symfony\Component\Serializer\Exception\PartialDenormalizationException;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Component\Serializer\Serializer;
+use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Exception\ValidationFailedException;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Component\Validator\ValidatorBuilder;
 
 class RequestPayloadValueResolverTest extends TestCase
 {
@@ -181,10 +184,197 @@ public function testRequestInputValidationPassed()
 
         $this->assertEquals($payload, $resolver->resolve($request, $argument)[0]);
     }
+
+    /**
+     * @dataProvider provideMatchedFormatContext
+     */
+    public function testAcceptFormatPassed(mixed $acceptFormat, string $contentType, string $content)
+    {
+        $encoders = ['json' => new JsonEncoder(), 'xml' => new XmlEncoder()];
+        $serializer = new Serializer([new ObjectNormalizer()], $encoders);
+        $validator = (new ValidatorBuilder())->getValidator();
+        $resolver = new RequestPayloadValueResolver($serializer, $validator);
+
+        $request = Request::create('/', 'POST', server: ['CONTENT_TYPE' => $contentType], content: $content);
+
+        $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, false, [
+            MapRequestPayload::class => new MapRequestPayload(acceptFormat: $acceptFormat),
+        ]);
+
+        $resolved = $resolver->resolve($request, $argument);
+
+        $this->assertCount(1, $resolved);
+        $this->assertEquals(new RequestPayload(50), $resolved[0]);
+    }
+
+    public static function provideMatchedFormatContext(): iterable
+    {
+        yield 'configure with json as string, sends json' => [
+            'acceptFormat' => 'json',
+            'contentType' => 'application/json',
+            'content' => '{"price": 50}',
+        ];
+
+        yield 'configure with json as array, sends json' => [
+            'acceptFormat' => ['json'],
+            'contentType' => 'application/json',
+            'content' => '{"price": 50}',
+        ];
+
+        yield 'configure with xml as string, sends xml' => [
+            'acceptFormat' => 'xml',
+            'contentType' => 'application/xml',
+            'content' => '<?xml version="1.0"?><request><price>50</price></request>',
+        ];
+
+        yield 'configure with xml as array, sends xml' => [
+            'acceptFormat' => ['xml'],
+            'contentType' => 'application/xml',
+            'content' => '<?xml version="1.0"?><request><price>50</price></request>',
+        ];
+
+        yield 'configure with json or xml, sends json' => [
+            'acceptFormat' => ['json', 'xml'],
+            'contentType' => 'application/json',
+            'content' => '{"price": 50}',
+        ];
+
+        yield 'configure with json or xml, sends xml' => [
+            'acceptFormat' => ['json', 'xml'],
+            'contentType' => 'application/xml',
+            'content' => '<?xml version="1.0"?><request><price>50</price></request>',
+        ];
+    }
+
+    /**
+     * @dataProvider provideMismatchedFormatContext
+     */
+    public function testAcceptFormatNotPassed(mixed $acceptFormat, string $contentType, string $content, string $expectedExceptionMessage)
+    {
+        $serializer = new Serializer([new ObjectNormalizer()]);
+        $validator = (new ValidatorBuilder())->getValidator();
+        $resolver = new RequestPayloadValueResolver($serializer, $validator);
+
+        $request = Request::create('/', 'POST', server: ['CONTENT_TYPE' => $contentType], content: $content);
+
+        $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, false, [
+            MapRequestPayload::class => new MapRequestPayload(acceptFormat: $acceptFormat),
+        ]);
+
+        try {
+            $resolver->resolve($request, $argument);
+
+            $this->fail(sprintf('Expected "%s" to be thrown.', HttpException::class));
+        } catch (HttpException $e) {
+            $this->assertSame(415, $e->getStatusCode());
+            $this->assertSame($expectedExceptionMessage, $e->getMessage());
+        }
+    }
+
+    public static function provideMismatchedFormatContext(): iterable
+    {
+        yield 'configure with json as string, sends xml' => [
+            'acceptFormat' => 'json',
+            'contentType' => 'application/xml',
+            'content' => '<?xml version="1.0"?><request><price>50</price></request>',
+            'expectedExceptionMessage' => 'Unsupported format, expects "json", but "xml" given.',
+        ];
+
+        yield 'configure with json as array, sends xml' => [
+            'acceptFormat' => ['json'],
+            'contentType' => 'application/xml',
+            'content' => '<?xml version="1.0"?><request><price>50</price></request>',
+            'expectedExceptionMessage' => 'Unsupported format, expects "json", but "xml" given.',
+        ];
+
+        yield 'configure with xml as string, sends json' => [
+            'acceptFormat' => 'xml',
+            'contentType' => 'application/json',
+            'content' => '{"price": 50}',
+            'expectedExceptionMessage' => 'Unsupported format, expects "xml", but "json" given.',
+        ];
+
+        yield 'configure with xml as array, sends json' => [
+            'acceptFormat' => ['xml'],
+            'contentType' => 'application/json',
+            'content' => '{"price": 50}',
+            'expectedExceptionMessage' => 'Unsupported format, expects "xml", but "json" given.',
+        ];
+
+        yield 'configure with json or xml, sends jsonld' => [
+            'acceptFormat' => ['json', 'xml'],
+            'contentType' => 'application/ld+json',
+            'content' => '{"@context": "https://schema.org", "@type": "FakeType", "price": 50}',
+            'expectedExceptionMessage' => 'Unsupported format, expects "json", "xml", but "jsonld" given.',
+        ];
+    }
+
+    /**
+     * @dataProvider provideValidationGroupsOnManyTypes
+     */
+    public function testValidationGroupsPassed(mixed $groups)
+    {
+        $input = ['price' => '50', 'title' => 'A long title, so the validation passes'];
+
+        $payload = new RequestPayload(50);
+        $payload->title = 'A long title, so the validation passes';
+
+        $serializer = new Serializer([new ObjectNormalizer()]);
+        $validator = (new ValidatorBuilder())->enableAnnotationMapping()->getValidator();
+        $resolver = new RequestPayloadValueResolver($serializer, $validator);
+
+        $request = Request::create('/', 'POST', $input);
+
+        $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, false, [
+            MapRequestPayload::class => new MapRequestPayload(validationGroups: $groups),
+        ]);
+
+        $resolved = $resolver->resolve($request, $argument);
+
+        $this->assertCount(1, $resolved);
+        $this->assertEquals($payload, $resolved[0]);
+    }
+
+    /**
+     * @dataProvider provideValidationGroupsOnManyTypes
+     */
+    public function testValidationGroupsNotPassed(mixed $groups)
+    {
+        $input = ['price' => '50', 'title' => 'Too short'];
+
+        $serializer = new Serializer([new ObjectNormalizer()]);
+        $validator = (new ValidatorBuilder())->enableAnnotationMapping()->getValidator();
+        $resolver = new RequestPayloadValueResolver($serializer, $validator);
+
+        $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, false, [
+            MapRequestPayload::class => new MapRequestPayload(validationGroups: $groups),
+        ]);
+        $request = Request::create('/', 'POST', $input);
+
+        try {
+            $resolver->resolve($request, $argument);
+            $this->fail(sprintf('Expected "%s" to be thrown.', HttpException::class));
+        } catch (HttpException $e) {
+            $validationFailedException = $e->getPrevious();
+            $this->assertInstanceOf(ValidationFailedException::class, $validationFailedException);
+            $this->assertSame('title', $validationFailedException->getViolations()[0]->getPropertyPath());
+            $this->assertSame('This value is too short. It should have 10 characters or more.', $validationFailedException->getViolations()[0]->getMessage());
+        }
+    }
+
+    public static function provideValidationGroupsOnManyTypes(): iterable
+    {
+        yield 'validation group as string' => ['strict'];
+
+        yield 'validation group as array' => [['strict']];
+
+        yield 'validation group as GroupSequence' => [new Assert\GroupSequence(['strict'])];
+    }
 }
 
 class RequestPayload
 {
+    #[Assert\Length(min: 10, groups: ['strict'])]
     public string $title;
 
     public function __construct(public readonly float $price)
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index da2891820aab8..2ebafd4ededf7 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -43,7 +43,7 @@
         "symfony/translation": "^5.4|^6.0",
         "symfony/translation-contracts": "^2.5|^3",
         "symfony/uid": "^5.4|^6.0",
-        "symfony/validator": "^5.4|^6.0",
+        "symfony/validator": "^6.3",
         "psr/cache": "^1.0|^2.0|^3.0",
         "twig/twig": "^2.13|^3.0.4"
     },

From eaf6f8ce3e216af51b6d87e82a19c74e1b6cbf0d Mon Sep 17 00:00:00 2001
From: mfettig <fettigms@gmail.com>
Date: Fri, 24 Mar 2023 15:07:33 -0400
Subject: [PATCH 422/475] [Cache] Support Redis cluster connections with
 predis/predis:^2.0

---
 composer.json                                          |  2 +-
 src/Symfony/Component/Cache/CHANGELOG.md               |  1 +
 src/Symfony/Component/Cache/Traits/RedisTrait.php      | 10 ++++++----
 src/Symfony/Component/Cache/composer.json              |  2 +-
 .../Handler/PredisClusterSessionHandlerTest.php        |  5 ++++-
 src/Symfony/Component/HttpFoundation/composer.json     |  2 +-
 src/Symfony/Component/Lock/composer.json               |  2 +-
 src/Symfony/Component/Semaphore/composer.json          |  2 +-
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 25b14db4bc587..38dc3d5d70bf4 100644
--- a/composer.json
+++ b/composer.json
@@ -143,7 +143,7 @@
         "php-http/httplug": "^1.0|^2.0",
         "phpdocumentor/reflection-docblock": "^5.2",
         "phpstan/phpdoc-parser": "^1.0",
-        "predis/predis": "~1.1",
+        "predis/predis": "^1.1|^2.0",
         "psr/http-client": "^1.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",
         "symfony/mercure-bundle": "^0.3",
diff --git a/src/Symfony/Component/Cache/CHANGELOG.md b/src/Symfony/Component/Cache/CHANGELOG.md
index 635a9408176b9..57646c2bc875f 100644
--- a/src/Symfony/Component/Cache/CHANGELOG.md
+++ b/src/Symfony/Component/Cache/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add support for Relay PHP extension for Redis
+ * Updates to allow Redis cluster connections using predis/predis:^2.0
 
 6.1
 ---
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index 03bc5ba6242de..33ae696eac46c 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -15,6 +15,8 @@
 use Predis\Connection\Aggregate\ClusterInterface;
 use Predis\Connection\Aggregate\RedisCluster;
 use Predis\Connection\Aggregate\ReplicationInterface;
+use Predis\Connection\Cluster\ClusterInterface as Predis2ClusterInterface;
+use Predis\Connection\Cluster\RedisCluster as Predis2RedisCluster;
 use Predis\Response\ErrorInterface;
 use Predis\Response\Status;
 use Relay\Relay;
@@ -376,7 +378,7 @@ protected function doFetch(array $ids): iterable
 
         $result = [];
 
-        if ($this->redis instanceof \Predis\ClientInterface && $this->redis->getConnection() instanceof ClusterInterface) {
+        if ($this->redis instanceof \Predis\ClientInterface && ($this->redis->getConnection() instanceof ClusterInterface || $this->redis->getConnection() instanceof Predis2ClusterInterface)) {
             $values = $this->pipeline(function () use ($ids) {
                 foreach ($ids as $id) {
                     yield 'get' => [$id];
@@ -476,7 +478,7 @@ protected function doDelete(array $ids): bool
             return true;
         }
 
-        if ($this->redis instanceof \Predis\ClientInterface && $this->redis->getConnection() instanceof ClusterInterface) {
+        if ($this->redis instanceof \Predis\ClientInterface && ($this->redis->getConnection() instanceof ClusterInterface || $this->redis->getConnection() instanceof Predis2ClusterInterface)) {
             static $del;
             $del ??= (class_exists(UNLINK::class) ? 'unlink' : 'del');
 
@@ -534,7 +536,7 @@ private function pipeline(\Closure $generator, object $redis = null): \Generator
         $ids = [];
         $redis ??= $this->redis;
 
-        if ($redis instanceof \RedisCluster || ($redis instanceof \Predis\ClientInterface && $redis->getConnection() instanceof RedisCluster)) {
+        if ($redis instanceof \RedisCluster || ($redis instanceof \Predis\ClientInterface && ($redis->getConnection() instanceof RedisCluster || $redis->getConnection() instanceof Predis2RedisCluster))) {
             // phpredis & predis don't support pipelining with RedisCluster
             // see https://github.com/phpredis/phpredis/blob/develop/cluster.markdown#pipelining
             // see https://github.com/nrk/predis/issues/267#issuecomment-123781423
@@ -596,7 +598,7 @@ private function getHosts(): array
         $hosts = [$this->redis];
         if ($this->redis instanceof \Predis\ClientInterface) {
             $connection = $this->redis->getConnection();
-            if ($connection instanceof ClusterInterface && $connection instanceof \Traversable) {
+            if (($connection instanceof ClusterInterface || $connection instanceof Predis2ClusterInterface) && $connection instanceof \Traversable) {
                 $hosts = [];
                 foreach ($connection as $c) {
                     $hosts[] = new \Predis\Client($c);
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
index 764b1c0fcea81..35eae21746ad0 100644
--- a/src/Symfony/Component/Cache/composer.json
+++ b/src/Symfony/Component/Cache/composer.json
@@ -31,7 +31,7 @@
     "require-dev": {
         "cache/integration-tests": "dev-master",
         "doctrine/dbal": "^2.13.1|^3.0",
-        "predis/predis": "^1.1",
+        "predis/predis": "^1.1|^2.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",
         "symfony/config": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php
index fd4a13bef5fdf..492487766b2f5 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php
@@ -20,6 +20,9 @@ class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCas
 {
     protected function createRedisClient(string $host): Client
     {
-        return new Client([array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379])]);
+        return new Client(
+            [array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379])],
+            ['cluster' => 'redis']
+        );
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
index 944029655a181..245cde53f4f3b 100644
--- a/src/Symfony/Component/HttpFoundation/composer.json
+++ b/src/Symfony/Component/HttpFoundation/composer.json
@@ -23,7 +23,7 @@
     },
     "require-dev": {
         "doctrine/dbal": "^2.13.1|^3.0",
-        "predis/predis": "~1.0",
+        "predis/predis": "^1.1|^2.0",
         "symfony/cache": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
         "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4",
diff --git a/src/Symfony/Component/Lock/composer.json b/src/Symfony/Component/Lock/composer.json
index c0034f311a685..80a76a1b00c5f 100644
--- a/src/Symfony/Component/Lock/composer.json
+++ b/src/Symfony/Component/Lock/composer.json
@@ -22,7 +22,7 @@
     },
     "require-dev": {
         "doctrine/dbal": "^2.13|^3.0",
-        "predis/predis": "~1.0"
+        "predis/predis": "^1.1|^2.0"
     },
     "conflict": {
         "doctrine/dbal": "<2.13",
diff --git a/src/Symfony/Component/Semaphore/composer.json b/src/Symfony/Component/Semaphore/composer.json
index ef30494122109..8266c9fcc32bb 100644
--- a/src/Symfony/Component/Semaphore/composer.json
+++ b/src/Symfony/Component/Semaphore/composer.json
@@ -24,7 +24,7 @@
         "psr/log": "^1|^2|^3"
     },
     "require-dev": {
-        "predis/predis": "~1.0"
+        "predis/predis": "^1.1|^2.0"
     },
     "conflict": {
         "symfony/cache": "<6.2"

From e4a6365a453eef09f8d5d822601393c980b58b8f Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Mon, 17 Apr 2023 18:33:34 +0200
Subject: [PATCH 423/475] [HttpClient] Add JsonMockResponse

---
 src/Symfony/Component/HttpClient/CHANGELOG.md |  1 +
 .../HttpClient/Response/JsonMockResponse.php  | 30 +++++++
 .../Tests/Response/JsonMockResponseTest.php   | 88 +++++++++++++++++++
 3 files changed, 119 insertions(+)
 create mode 100644 src/Symfony/Component/HttpClient/Response/JsonMockResponse.php
 create mode 100644 src/Symfony/Component/HttpClient/Tests/Response/JsonMockResponseTest.php

diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
index 104e4d3247774..bea825477ea2d 100644
--- a/src/Symfony/Component/HttpClient/CHANGELOG.md
+++ b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * Add `UriTemplateHttpClient` to use URI templates as specified in the RFC 6570
  * Add `ServerSentEvent::getArrayData()` to get the Server-Sent Event's data decoded as an array when it's a JSON payload
  * Allow array of urls as `base_uri` option value in `RetryableHttpClient` to retry on a new url each time
+ * Add `JsonMockResponse`, a `MockResponse` shortcut that automatically encodes the passed body to JSON and sets the content type to `application/json` by default
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpClient/Response/JsonMockResponse.php b/src/Symfony/Component/HttpClient/Response/JsonMockResponse.php
new file mode 100644
index 0000000000000..17c17cf68fb34
--- /dev/null
+++ b/src/Symfony/Component/HttpClient/Response/JsonMockResponse.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpClient\Response;
+
+use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
+
+class JsonMockResponse extends MockResponse
+{
+    public function __construct(mixed $body = [], array $info = [])
+    {
+        try {
+            $json = json_encode($body, \JSON_THROW_ON_ERROR);
+        } catch (\JsonException $e) {
+            throw new InvalidArgumentException('JSON encoding failed: '.$e->getMessage(), $e->getCode());
+        }
+
+        $info['response_headers']['content-type'] ??= 'application/json';
+
+        parent::__construct($json, $info);
+    }
+}
diff --git a/src/Symfony/Component/HttpClient/Tests/Response/JsonMockResponseTest.php b/src/Symfony/Component/HttpClient/Tests/Response/JsonMockResponseTest.php
new file mode 100644
index 0000000000000..b371c08cf4241
--- /dev/null
+++ b/src/Symfony/Component/HttpClient/Tests/Response/JsonMockResponseTest.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpClient\Tests\Response;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\JsonMockResponse;
+
+final class JsonMockResponseTest extends TestCase
+{
+    public function testDefaults()
+    {
+        $client = new MockHttpClient(new JsonMockResponse());
+        $response = $client->request('GET', 'https://symfony.com');
+
+        $this->assertSame([], $response->toArray());
+        $this->assertSame('application/json', $response->getHeaders()['content-type'][0]);
+    }
+
+    public function testInvalidBody()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('JSON encoding failed: Malformed UTF-8 characters, possibly incorrectly encoded');
+
+        new JsonMockResponse("\xB1\x31");
+    }
+
+    public function testJsonEncodeArray()
+    {
+        $client = new MockHttpClient(new JsonMockResponse([
+            'foo' => 'bar',
+            'ccc' => 123,
+        ]));
+        $response = $client->request('GET', 'https://symfony.com');
+
+        $this->assertSame([
+            'foo' => 'bar',
+            'ccc' => 123,
+        ], $response->toArray());
+        $this->assertSame('application/json', $response->getHeaders()['content-type'][0]);
+    }
+
+    public function testJsonEncodeString()
+    {
+        $client = new MockHttpClient(new JsonMockResponse('foobarccc'));
+        $response = $client->request('GET', 'https://symfony.com');
+
+        $this->assertSame('"foobarccc"', $response->getContent());
+        $this->assertSame('application/json', $response->getHeaders()['content-type'][0]);
+    }
+
+    /**
+     * @dataProvider responseHeadersProvider
+     */
+    public function testResponseHeaders(string $expectedContentType, array $responseHeaders)
+    {
+        $client = new MockHttpClient(new JsonMockResponse([
+            'foo' => 'bar',
+        ], [
+            'response_headers' => $responseHeaders,
+            'http_code' => 201,
+        ]));
+        $response = $client->request('GET', 'https://symfony.com');
+
+        $this->assertSame($expectedContentType, $response->getHeaders()['content-type'][0]);
+        $this->assertSame(201, $response->getStatusCode());
+    }
+
+    public static function responseHeadersProvider(): array
+    {
+        return [
+            ['application/json', []],
+            ['application/json', ['x-foo' => 'ccc']],
+            ['application/problem+json', ['content-type' => 'application/problem+json']],
+            ['application/problem+json', ['x-foo' => 'ccc', 'content-type' => 'application/problem+json']],
+        ];
+    }
+}

From 3ef14101c94f31673a293f70a8a0c888b1f43d9f Mon Sep 17 00:00:00 2001
From: Oleh Korneliuk <oleh.korneliuk@gmail.com>
Date: Thu, 20 Apr 2023 12:33:20 +0300
Subject: [PATCH 424/475] [Security] Added error code to `UserPassword`
 constraint

---
 .../Constraints/UserPasswordValidatorTestCase.php         | 2 ++
 .../Security/Core/Validator/Constraints/UserPassword.php  | 6 ++++++
 .../Core/Validator/Constraints/UserPasswordValidator.php  | 8 ++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTestCase.php b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTestCase.php
index 3a810def8fa00..e3f71b703a2f7 100644
--- a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTestCase.php
+++ b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTestCase.php
@@ -87,6 +87,7 @@ public function testPasswordIsNotValid(UserPassword $constraint)
         $this->validator->validate('secret', $constraint);
 
         $this->buildViolation('myMessage')
+            ->setCode(UserPassword::INVALID_PASSWORD_ERROR)
             ->assertRaised();
     }
 
@@ -109,6 +110,7 @@ public function testEmptyPasswordsAreNotValid($password)
         $this->validator->validate($password, $constraint);
 
         $this->buildViolation('myMessage')
+            ->setCode(UserPassword::INVALID_PASSWORD_ERROR)
             ->assertRaised();
     }
 
diff --git a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php
index f7be4bb6e8ab1..b1a340c86e520 100644
--- a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php
+++ b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPassword.php
@@ -20,6 +20,12 @@
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class UserPassword extends Constraint
 {
+    public const INVALID_PASSWORD_ERROR = '2d2a8bb4-ddc8-45e4-9b0f-8670d3a3e290';
+
+    protected const ERROR_NAMES = [
+        self::INVALID_PASSWORD_ERROR => 'INVALID_PASSWORD_ERROR',
+    ];
+
     public $message = 'This value should be the user\'s current password.';
     public $service = 'security.validator.user_password';
 
diff --git a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
index 8fd2205a9d78d..41670b27e0aea 100644
--- a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
+++ b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
@@ -41,7 +41,9 @@ public function validate(mixed $password, Constraint $constraint)
         }
 
         if (null === $password || '' === $password) {
-            $this->context->addViolation($constraint->message);
+            $this->context->buildViolation($constraint->message)
+                ->setCode(UserPassword::INVALID_PASSWORD_ERROR)
+                ->addViolation();
 
             return;
         }
@@ -59,7 +61,9 @@ public function validate(mixed $password, Constraint $constraint)
         $hasher = $this->hasherFactory->getPasswordHasher($user);
 
         if (null === $user->getPassword() || !$hasher->verify($user->getPassword(), $password, $user instanceof LegacyPasswordAuthenticatedUserInterface ? $user->getSalt() : null)) {
-            $this->context->addViolation($constraint->message);
+            $this->context->buildViolation($constraint->message)
+                ->setCode(UserPassword::INVALID_PASSWORD_ERROR)
+                ->addViolation();
         }
     }
 }

From 33abe5048047e687e03cb4a6b11785429c713053 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 20 Apr 2023 13:20:21 +0200
Subject: [PATCH 425/475] [RemoteEvent] Cleanup some leftover

---
 src/Symfony/Component/Webhook/Client/RequestParser.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Symfony/Component/Webhook/Client/RequestParser.php b/src/Symfony/Component/Webhook/Client/RequestParser.php
index 08e4ab9626bfb..ec1c0e6ba7556 100644
--- a/src/Symfony/Component/Webhook/Client/RequestParser.php
+++ b/src/Symfony/Component/Webhook/Client/RequestParser.php
@@ -45,17 +45,14 @@ protected function getRequestMatcher(): RequestMatcherInterface
 
     protected function doParse(Request $request, string $secret): RemoteEvent
     {
-        // $body = $this->bodyParser->parse($request, $secret);
         $body = $request->toArray();
 
-        // $this->headerParser->validate($request, $secret);
         foreach ([$this->signatureHeaderName, $this->eventHeaderName, $this->idHeaderName] as $header) {
             if (!$request->headers->has($header)) {
                 throw new RejectWebhookException(406, sprintf('Missing "%s" HTTP request signature header.', $header));
             }
         }
 
-        // $this->signatureParser->validate($request, $secret);
         $this->validateSignature($request->headers, $request->getContent(), $secret);
 
         return new RemoteEvent(

From 9745982a3cf8f302dc400306add99b57be9f502b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 2 Apr 2023 23:55:19 +0200
Subject: [PATCH 426/475] [HttpClient] Support file uploads by nesting resource
 streams in option "body"

---
 src/Symfony/Component/HttpClient/CHANGELOG.md |   1 +
 .../Component/HttpClient/HttpClientTrait.php  | 127 ++++++++++++++++--
 .../HttpClient/Tests/HttpClientTraitTest.php  |  89 ++++++++++++
 3 files changed, 207 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/HttpClient/CHANGELOG.md b/src/Symfony/Component/HttpClient/CHANGELOG.md
index bea825477ea2d..7cd69191c5411 100644
--- a/src/Symfony/Component/HttpClient/CHANGELOG.md
+++ b/src/Symfony/Component/HttpClient/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Add `ServerSentEvent::getArrayData()` to get the Server-Sent Event's data decoded as an array when it's a JSON payload
  * Allow array of urls as `base_uri` option value in `RetryableHttpClient` to retry on a new url each time
  * Add `JsonMockResponse`, a `MockResponse` shortcut that automatically encodes the passed body to JSON and sets the content type to `application/json` by default
+ * Support file uploads by nesting resource streams in option "body"
 
 6.2
 ---
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
index e263d7cfa55ec..c767ca81aac01 100644
--- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
+++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -13,6 +13,9 @@
 
 use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
 use Symfony\Component\HttpClient\Exception\TransportException;
+use Symfony\Component\HttpClient\Response\StreamableInterface;
+use Symfony\Component\HttpClient\Response\StreamWrapper;
+use Symfony\Component\Mime\MimeTypes;
 
 /**
  * Provides the common logic from writing HttpClientInterface implementations.
@@ -94,11 +97,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
         }
 
         if (isset($options['body'])) {
-            if (\is_array($options['body']) && (!isset($options['normalized_headers']['content-type'][0]) || !str_contains($options['normalized_headers']['content-type'][0], 'application/x-www-form-urlencoded'))) {
-                $options['normalized_headers']['content-type'] = ['Content-Type: application/x-www-form-urlencoded'];
-            }
-
-            $options['body'] = self::normalizeBody($options['body']);
+            $options['body'] = self::normalizeBody($options['body'], $options['normalized_headers']);
 
             if (\is_string($options['body'])
                 && (string) \strlen($options['body']) !== substr($h = $options['normalized_headers']['content-length'][0] ?? '', 16)
@@ -313,21 +312,129 @@ private static function normalizeHeaders(array $headers): array
      *
      * @throws InvalidArgumentException When an invalid body is passed
      */
-    private static function normalizeBody($body)
+    private static function normalizeBody($body, array &$normalizedHeaders = [])
     {
         if (\is_array($body)) {
-            array_walk_recursive($body, $caster = static function (&$v) use (&$caster) {
-                if (\is_object($v)) {
+            static $cookie;
+
+            $streams = [];
+            array_walk_recursive($body, $caster = static function (&$v) use (&$caster, &$streams, &$cookie) {
+                if (\is_resource($v) || $v instanceof StreamableInterface) {
+                    $cookie = hash('xxh128', $cookie ??= random_bytes(8), true);
+                    $k = substr(strtr(base64_encode($cookie), '+/', '-_'), 0, -2);
+                    $streams[$k] = $v instanceof StreamableInterface ? $v->toStream(false) : $v;
+                    $v = $k;
+                } elseif (\is_object($v)) {
                     if ($vars = get_object_vars($v)) {
                         array_walk_recursive($vars, $caster);
                         $v = $vars;
-                    } elseif (method_exists($v, '__toString')) {
+                    } elseif ($v instanceof \Stringable) {
                         $v = (string) $v;
                     }
                 }
             });
 
-            return http_build_query($body, '', '&');
+            $body = http_build_query($body, '', '&');
+
+            if ('' === $body || !$streams && !str_contains($normalizedHeaders['content-type'][0] ?? '', 'multipart/form-data')) {
+                if (!str_contains($normalizedHeaders['content-type'][0] ?? '', 'application/x-www-form-urlencoded')) {
+                    $normalizedHeaders['content-type'] = ['Content-Type: application/x-www-form-urlencoded'];
+                }
+
+                return $body;
+            }
+
+            if (preg_match('{multipart/form-data; boundary=(?|"([^"\r\n]++)"|([-!#$%&\'*+.^_`|~_A-Za-z0-9]++))}', $normalizedHeaders['content-type'][0] ?? '', $boundary)) {
+                $boundary = $boundary[1];
+            } else {
+                $boundary = substr(strtr(base64_encode($cookie ??= random_bytes(8)), '+/', '-_'), 0, -2);
+                $normalizedHeaders['content-type'] = ['Content-Type: multipart/form-data; boundary='.$boundary];
+            }
+
+            $body = explode('&', $body);
+            $contentLength = 0;
+
+            foreach ($body as $i => $part) {
+                [$k, $v] = explode('=', $part, 2);
+                $part = ($i ? "\r\n" : '')."--{$boundary}\r\n";
+                $k = str_replace(['"', "\r", "\n"], ['%22', '%0D', '%0A'], urldecode($k)); // see WHATWG HTML living standard
+
+                if (!isset($streams[$v])) {
+                    $part .= "Content-Disposition: form-data; name=\"{$k}\"\r\n\r\n".urldecode($v);
+                    $contentLength += 0 <= $contentLength ? \strlen($part) : 0;
+                    $body[$i] = [$k, $part, null];
+                    continue;
+                }
+                $v = $streams[$v];
+
+                if (!\is_array($m = @stream_get_meta_data($v))) {
+                    throw new TransportException(sprintf('Invalid "%s" resource found in body part "%s".', get_resource_type($v), $k));
+                }
+                if (feof($v)) {
+                    throw new TransportException(sprintf('Uploaded stream ended for body part "%s".', $k));
+                }
+
+                $m += stream_context_get_options($v)['http'] ?? [];
+                $filename = basename($m['filename'] ?? $m['uri'] ?? 'unknown');
+                $filename = str_replace(['"', "\r", "\n"], ['%22', '%0D', '%0A'], $filename);
+                $contentType = $m['content_type'] ?? null;
+
+                if (($headers = $m['wrapper_data'] ?? []) instanceof StreamWrapper) {
+                    $hasContentLength = false;
+                    $headers = $headers->getResponse()->getInfo('response_headers');
+                } elseif ($hasContentLength = 0 < $h = fstat($v)['size'] ?? 0) {
+                    $contentLength += 0 <= $contentLength ? $h : 0;
+                }
+
+                foreach (\is_array($headers) ? $headers : [] as $h) {
+                    if (\is_string($h) && 0 === stripos($h, 'Content-Type: ')) {
+                        $contentType ??= substr($h, 14);
+                    } elseif (!$hasContentLength && \is_string($h) && 0 === stripos($h, 'Content-Length: ')) {
+                        $hasContentLength = true;
+                        $contentLength += 0 <= $contentLength ? substr($h, 16) : 0;
+                    } elseif (\is_string($h) && 0 === stripos($h, 'Content-Encoding: ')) {
+                        $contentLength = -1;
+                    }
+                }
+
+                if (!$hasContentLength) {
+                    $contentLength = -1;
+                }
+                if (null === $contentType && 'plainfile' === ($m['wrapper_type'] ?? null) && isset($m['uri'])) {
+                    $mimeTypes = class_exists(MimeTypes::class) ? MimeTypes::getDefault() : false;
+                    $contentType = $mimeTypes ? $mimeTypes->guessMimeType($m['uri']) : null;
+                }
+                $contentType ??= 'application/octet-stream';
+
+                $part .= "Content-Disposition: form-data; name=\"{$k}\"; filename=\"{$filename}\"\r\n";
+                $part .= "Content-Type: {$contentType}\r\n\r\n";
+
+                $contentLength += 0 <= $contentLength ? \strlen($part) : 0;
+                $body[$i] = [$k, $part, $v];
+            }
+
+            $body[++$i] = ['', "\r\n--{$boundary}--\r\n", null];
+
+            if (0 < $contentLength) {
+                $normalizedHeaders['content-length'] = ['Content-Length: '.($contentLength += \strlen($body[$i][1]))];
+            }
+
+            $body = static function ($size) use ($body) {
+                foreach ($body as $i => [$k, $part, $h]) {
+                    unset($body[$i]);
+
+                    yield $part;
+
+                    while (null !== $h && !feof($h)) {
+                        if (false === $part = fread($h, $size)) {
+                            throw new TransportException(sprintf('Error while reading uploaded stream for body part "%s".', $k));
+                        }
+
+                        yield $part;
+                    }
+                }
+                $h = null;
+            };
         }
 
         if (\is_string($body)) {
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
index 3d8d7559d9bf4..eaf393ba0cc84 100644
--- a/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
+use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\HttpClient\HttpClientTrait;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -68,6 +69,94 @@ public function testPrepareRequestWithBodyIsArray()
         $this->assertContains('Content-Type: application/x-www-form-urlencoded; charset=utf-8', $options['headers']);
     }
 
+    public function testNormalizeBodyMultipart()
+    {
+        $file = fopen('php://memory', 'r+');
+        stream_context_set_option($file, ['http' => [
+            'filename' => 'test.txt',
+            'content_type' => 'text/plain',
+        ]]);
+        fwrite($file, 'foobarbaz');
+        rewind($file);
+
+        $headers = [
+            'content-type' => ['Content-Type: multipart/form-data; boundary=ABCDEF'],
+        ];
+        $body = [
+            'foo[]' => 'bar',
+            'bar' => [
+                $file,
+            ],
+        ];
+
+        $body = self::normalizeBody($body, $headers);
+
+        $result = '';
+        while ('' !== $data = $body(self::$CHUNK_SIZE)) {
+            $result .= $data;
+        }
+
+        $expected = <<<'EOF'
+            --ABCDEF
+            Content-Disposition: form-data; name="foo[]"
+
+            bar
+            --ABCDEF
+            Content-Disposition: form-data; name="bar[0]"; filename="test.txt"
+            Content-Type: text/plain
+
+            foobarbaz
+            --ABCDEF--
+
+            EOF;
+        $expected = str_replace("\n", "\r\n", $expected);
+
+        $this->assertSame($expected, $result);
+    }
+
+    /**
+     * @group network
+     *
+     * @dataProvider provideNormalizeBodyMultipartForwardStream
+     */
+    public function testNormalizeBodyMultipartForwardStream($stream)
+    {
+        $body = [
+            'logo' => $stream,
+        ];
+
+        $headers = [];
+        $body = self::normalizeBody($body, $headers);
+
+        $result = '';
+        while ('' !== $data = $body(self::$CHUNK_SIZE)) {
+            $result .= $data;
+        }
+
+        $this->assertSame(1, preg_match('/^Content-Type: multipart\/form-data; boundary=(?<boundary>.+)$/', $headers['content-type'][0], $matches));
+        $this->assertSame('Content-Length: 3086', $headers['content-length'][0]);
+        $this->assertSame(3086, \strlen($result));
+
+        $expected = <<<EOF
+            --{$matches['boundary']}
+            Content-Disposition: form-data; name="logo"; filename="1f44d.png"
+            Content-Type: image/png
+
+            %A
+            --{$matches['boundary']}--
+
+            EOF;
+        $expected = str_replace("\n", "\r\n", $expected);
+
+        $this->assertStringMatchesFormat($expected, $result);
+    }
+
+    public static function provideNormalizeBodyMultipartForwardStream()
+    {
+        yield 'native' => [fopen('https://github.githubassets.com/images/icons/emoji/unicode/1f44d.png', 'r')];
+        yield 'symfony' => [HttpClient::create()->request('GET', 'https://github.githubassets.com/images/icons/emoji/unicode/1f44d.png')->toStream()];
+    }
+
     /**
      * @dataProvider provideResolveUrl
      */

From 21ea8624fcf933d132d4de05a764a28d6ac01e66 Mon Sep 17 00:00:00 2001
From: Daniel Burger <48986191+danielburger1337@users.noreply.github.com>
Date: Wed, 19 Apr 2023 22:43:24 +0200
Subject: [PATCH 427/475] [HttpFoundation] Clear IpUtils cache to prevent
 memory leaks

---
 .../Component/HttpFoundation/IpUtils.php      | 56 +++++++++++++------
 .../HttpFoundation/Tests/IpUtilsTest.php      | 19 +++++++
 2 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php
index 2106f61d98d8e..ceab620c2f560 100644
--- a/src/Symfony/Component/HttpFoundation/IpUtils.php
+++ b/src/Symfony/Component/HttpFoundation/IpUtils.php
@@ -75,23 +75,23 @@ public static function checkIp(string $requestIp, string|array $ips): bool
     public static function checkIp4(string $requestIp, string $ip): bool
     {
         $cacheKey = $requestIp.'-'.$ip.'-v4';
-        if (isset(self::$checkedIps[$cacheKey])) {
-            return self::$checkedIps[$cacheKey];
+        if (null !== $cacheValue = self::getCacheResult($cacheKey)) {
+            return $cacheValue;
         }
 
         if (!filter_var($requestIp, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4)) {
-            return self::$checkedIps[$cacheKey] = false;
+            return self::setCacheResult($cacheKey, false);
         }
 
         if (str_contains($ip, '/')) {
             [$address, $netmask] = explode('/', $ip, 2);
 
             if ('0' === $netmask) {
-                return self::$checkedIps[$cacheKey] = false !== filter_var($address, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4);
+                return self::setCacheResult($cacheKey, false !== filter_var($address, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4));
             }
 
             if ($netmask < 0 || $netmask > 32) {
-                return self::$checkedIps[$cacheKey] = false;
+                return self::setCacheResult($cacheKey, false);
             }
         } else {
             $address = $ip;
@@ -99,10 +99,10 @@ public static function checkIp4(string $requestIp, string $ip): bool
         }
 
         if (false === ip2long($address)) {
-            return self::$checkedIps[$cacheKey] = false;
+            return self::setCacheResult($cacheKey, false);
         }
 
-        return self::$checkedIps[$cacheKey] = 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask);
+        return self::setCacheResult($cacheKey, 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask));
     }
 
     /**
@@ -120,8 +120,8 @@ public static function checkIp4(string $requestIp, string $ip): bool
     public static function checkIp6(string $requestIp, string $ip): bool
     {
         $cacheKey = $requestIp.'-'.$ip.'-v6';
-        if (isset(self::$checkedIps[$cacheKey])) {
-            return self::$checkedIps[$cacheKey];
+        if (null !== $cacheValue = self::getCacheResult($cacheKey)) {
+            return $cacheValue;
         }
 
         if (!((\extension_loaded('sockets') && \defined('AF_INET6')) || @inet_pton('::1'))) {
@@ -130,14 +130,14 @@ public static function checkIp6(string $requestIp, string $ip): bool
 
         // Check to see if we were given a IP4 $requestIp or $ip by mistake
         if (!filter_var($requestIp, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
-            return self::$checkedIps[$cacheKey] = false;
+            return self::setCacheResult($cacheKey, false);
         }
 
         if (str_contains($ip, '/')) {
             [$address, $netmask] = explode('/', $ip, 2);
 
             if (!filter_var($address, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
-                return self::$checkedIps[$cacheKey] = false;
+                return self::setCacheResult($cacheKey, false);
             }
 
             if ('0' === $netmask) {
@@ -145,11 +145,11 @@ public static function checkIp6(string $requestIp, string $ip): bool
             }
 
             if ($netmask < 1 || $netmask > 128) {
-                return self::$checkedIps[$cacheKey] = false;
+                return self::setCacheResult($cacheKey, false);
             }
         } else {
             if (!filter_var($ip, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
-                return self::$checkedIps[$cacheKey] = false;
+                return self::setCacheResult($cacheKey, false);
             }
 
             $address = $ip;
@@ -160,7 +160,7 @@ public static function checkIp6(string $requestIp, string $ip): bool
         $bytesTest = unpack('n*', @inet_pton($requestIp));
 
         if (!$bytesAddr || !$bytesTest) {
-            return self::$checkedIps[$cacheKey] = false;
+            return self::setCacheResult($cacheKey, false);
         }
 
         for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {
@@ -168,11 +168,11 @@ public static function checkIp6(string $requestIp, string $ip): bool
             $left = ($left <= 16) ? $left : 16;
             $mask = ~(0xFFFF >> $left) & 0xFFFF;
             if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) {
-                return self::$checkedIps[$cacheKey] = false;
+                return self::setCacheResult($cacheKey, false);
             }
         }
 
-        return self::$checkedIps[$cacheKey] = true;
+        return self::setCacheResult($cacheKey, true);
     }
 
     /**
@@ -214,4 +214,28 @@ public static function isPrivateIp(string $requestIp): bool
     {
         return self::checkIp($requestIp, self::PRIVATE_SUBNETS);
     }
+
+    private static function getCacheResult(string $cacheKey): ?bool
+    {
+        if (isset(self::$checkedIps[$cacheKey])) {
+            // Move the item last in cache (LRU)
+            $value = self::$checkedIps[$cacheKey];
+            unset(self::$checkedIps[$cacheKey]);
+            self::$checkedIps[$cacheKey] = $value;
+
+            return self::$checkedIps[$cacheKey];
+        }
+
+        return null;
+    }
+
+    private static function setCacheResult(string $cacheKey, bool $result): bool
+    {
+        if (1000 < \count(self::$checkedIps)) {
+            // stop memory leak if there are many keys
+            self::$checkedIps = \array_slice(self::$checkedIps, 500, null, true);
+        }
+
+        return self::$checkedIps[$cacheKey] = $result;
+    }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
index 014d272cd9a01..8f6b869a19498 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
@@ -200,4 +200,23 @@ public static function getIsPrivateIpData(): array
             ['2606:4700:20::681a:e06',  false],
         ];
     }
+
+    public function testCacheSizeLimit()
+    {
+        $ref = new \ReflectionClass(IpUtils::class);
+
+        /** @var array */
+        $checkedIps = $ref->getStaticPropertyValue('checkedIps');
+        $this->assertIsArray($checkedIps);
+
+        $maxCheckedIps = 1000;
+
+        for ($i = 1; $i < $maxCheckedIps * 1.5; ++$i) {
+            $ip = '192.168.1.'.str_pad((string) $i, 3, '0');
+
+            IpUtils::checkIp4($ip, '127.0.0.1');
+        }
+
+        $this->assertLessThan($maxCheckedIps, \count($checkedIps));
+    }
 }

From 4a0a439933a86c555a02f9733b451cb57389d332 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Mon, 6 Mar 2023 10:01:30 -0500
Subject: [PATCH 428/475] [HttpFoundation] add `Request::getPayload()`

---
 src/Symfony/Component/HttpFoundation/CHANGELOG.md     |  3 ++-
 src/Symfony/Component/HttpFoundation/Request.php      |  8 ++++++++
 .../Component/HttpFoundation/Tests/RequestTest.php    | 11 +++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index b40e8c7e79a0c..a98d23d9d1094 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -10,7 +10,8 @@ CHANGELOG
  * Create migration for session table when pdo handler is used
  * Add support for Relay PHP extension for Redis
  * The `Response::sendHeaders()` method now takes an optional HTTP status code as parameter, allowing to send informational responses such as Early Hints responses (103 status code)
- * Add `IpUtils::isPrivateIp`
+ * Add `IpUtils::isPrivateIp()`
+ * Add `Request::getPayload(): InputBag`
  * Deprecate conversion of invalid values in `ParameterBag::getInt()` and `ParameterBag::getBoolean()`,
  * Deprecate ignoring invalid values when using `ParameterBag::filter()`, unless flag `FILTER_NULL_ON_FAILURE` is set
 
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 17eb95829cba1..a6650c49a308c 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1504,6 +1504,14 @@ public function getContent(bool $asResource = false)
         return $this->content;
     }
 
+    /**
+     * Gets the decoded form or json request body.
+     */
+    public function getPayload(): InputBag
+    {
+        return $this->request->count() ? clone $this->request : new InputBag($this->toArray());
+    }
+
     /**
      * Gets the request body decoded as array, typically from a JSON payload.
      *
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index 2de9b5aebb158..5e8df28bb5713 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1300,6 +1300,17 @@ public function testToArray()
         $this->assertEquals(['foo' => 'bar'], $req->toArray());
     }
 
+    public function testGetPayload()
+    {
+        $req = new Request([], [], [], [], [], [], json_encode(['foo' => 'bar']));
+        $this->assertSame(['foo' => 'bar'], $req->getPayload()->all());
+        $req->getPayload()->set('new', 'key');
+        $this->assertSame(['foo' => 'bar'], $req->getPayload()->all());
+
+        $req = new Request([], ['foo' => 'bar'], [], [], [], [], json_encode(['baz' => 'qux']));
+        $this->assertSame(['foo' => 'bar'], $req->getPayload()->all());
+    }
+
     /**
      * @dataProvider provideOverloadedMethods
      */

From 8ab5c4abf215f624631a73d83cf83bff315ac835 Mon Sep 17 00:00:00 2001
From: Konstantin Myakshin <molodchick@gmail.com>
Date: Fri, 7 Apr 2023 00:38:27 +0300
Subject: [PATCH 429/475] [Security][HttpKernel] Create Controller Argument
 Resolver for Security Token

---
 .../Resources/config/security.php             |   7 ++
 .../Component/Security/Http/CHANGELOG.md      |   1 +
 .../Controller/SecurityTokenValueResolver.php |  50 +++++++++
 .../SecurityTokenValueResolverTest.php        | 105 ++++++++++++++++++
 4 files changed, 163 insertions(+)
 create mode 100644 src/Symfony/Component/Security/Http/Controller/SecurityTokenValueResolver.php
 create mode 100644 src/Symfony/Component/Security/Http/Tests/Controller/SecurityTokenValueResolverTest.php

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.php
index fa7c0fe37e8eb..27cc0ce51e9c3 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.php
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.php
@@ -42,6 +42,7 @@
 use Symfony\Component\Security\Core\User\MissingUserProvider;
 use Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
+use Symfony\Component\Security\Http\Controller\SecurityTokenValueResolver;
 use Symfony\Component\Security\Http\Controller\UserValueResolver;
 use Symfony\Component\Security\Http\EventListener\IsGrantedAttributeListener;
 use Symfony\Component\Security\Http\Firewall;
@@ -102,6 +103,12 @@
             ])
             ->tag('controller.argument_value_resolver', ['priority' => 120, 'name' => UserValueResolver::class])
 
+        ->set('security.security_token_value_resolver', SecurityTokenValueResolver::class)
+            ->args([
+                service('security.token_storage'),
+            ])
+            ->tag('controller.argument_value_resolver', ['priority' => 120, 'name' => SecurityTokenValu
10000
eResolver::class])
+
         // Authentication related services
         ->set('security.authentication.trust_resolver', AuthenticationTrustResolver::class)
 
diff --git a/src/Symfony/Component/Security/Http/CHANGELOG.md b/src/Symfony/Component/Security/Http/CHANGELOG.md
index 47a8553486686..bf7e55312eb9a 100644
--- a/src/Symfony/Component/Security/Http/CHANGELOG.md
+++ b/src/Symfony/Component/Security/Http/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
  * Add `attributes` optional array argument in `UserBadge`
  * Call `UserBadge::userLoader` with attributes if the argument is set
  * Allow to override badge fqcn on `Passport::addBadge`
+ * Add `SecurityTokenValueResolver` to inject token as controller argument
 
 6.2
 ---
diff --git a/src/Symfony/Component/Security/Http/Controller/SecurityTokenValueResolver.php b/src/Symfony/Component/Security/Http/Controller/SecurityTokenValueResolver.php
new file mode 100644
index 0000000000000..23c482b1e18a1
--- /dev/null
+++ b/src/Symfony/Component/Security/Http/Controller/SecurityTokenValueResolver.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\Controller;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+
+/**
+ * @author Konstantin Myakshin <molodchick@gmail.com>
+ */
+final class SecurityTokenValueResolver implements ValueResolverInterface
+{
+    public function __construct(private readonly TokenStorageInterface $tokenStorage)
+    {
+    }
+
+    /**
+     * @return TokenInterface[]
+     */
+    public function resolve(Request $request, ArgumentMetadata $argument): array
+    {
+        if (!($type = $argument->getType()) || (TokenInterface::class !== $type && !is_subclass_of($type, TokenInterface::class))) {
+            return [];
+        }
+
+        if (null !== $token = $this->tokenStorage->getToken()) {
+            return [$token];
+        }
+
+        if ($argument->isNullable()) {
+            return [];
+        }
+
+        throw new HttpException(Response::HTTP_UNAUTHORIZED, 'A security token is required but the token storage is empty.');
+    }
+}
diff --git a/src/Symfony/Component/Security/Http/Tests/Controller/SecurityTokenValueResolverTest.php b/src/Symfony/Component/Security/Http/Tests/Controller/SecurityTokenValueResolverTest.php
new file mode 100644
index 0000000000000..08c6231031b8a
--- /dev/null
+++ b/src/Symfony/Component/Security/Http/Tests/Controller/SecurityTokenValueResolverTest.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Http\Tests\Controller;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
+use Symfony\Component\Security\Core\User\InMemoryUser;
+use Symfony\Component\Security\Http\Controller\SecurityTokenValueResolver;
+
+class SecurityTokenValueResolverTest extends TestCase
+{
+    public function testResolveSucceedsWithTokenInterface()
+    {
+        $user = new InMemoryUser('username', 'password');
+        $token = new UsernamePasswordToken($user, 'provider');
+        $tokenStorage = new TokenStorage();
+        $tokenStorage->setToken($token);
+
+        $resolver = new SecurityTokenValueResolver($tokenStorage);
+        $metadata = new ArgumentMetadata('foo', TokenInterface::class, false, false, null);
+
+        $this->assertSame([$token], $resolver->resolve(Request::create('/'), $metadata));
+    }
+
+    public function testResolveSucceedsWithSubclassType()
+    {
+        $user = new InMemoryUser('username', 'password');
+        $token = new UsernamePasswordToken($user, 'provider');
+        $tokenStorage = new TokenStorage();
+        $tokenStorage->setToken($token);
+
+        $resolver = new SecurityTokenValueResolver($tokenStorage);
+        $metadata = new ArgumentMetadata('foo', UsernamePasswordToken::class, false, false, null, false);
+
+        $this->assertSame([$token], $resolver->resolve(Request::create('/'), $metadata));
+    }
+
+    public function testResolveSucceedsWithNullableParamAndNoToken()
+    {
+        $tokenStorage = new TokenStorage();
+        $resolver = new SecurityTokenValueResolver($tokenStorage);
+        $metadata = new ArgumentMetadata('foo', TokenInterface::class, false, false, null, true);
+
+        $this->assertSame([], $resolver->resolve(Request::create('/'), $metadata));
+    }
+
+    public function testResolveThrowsUnauthenticatedWithNoToken()
+    {
+        $tokenStorage = new TokenStorage();
+        $resolver = new SecurityTokenValueResolver($tokenStorage);
+        $metadata = new ArgumentMetadata('foo', UsernamePasswordToken::class, false, false, null, false);
+
+        $this->expectException(HttpException::class);
+        $this->expectExceptionMessage('A security token is required but the token storage is empty.');
+
+        $resolver->resolve(Request::create('/'), $metadata);
+    }
+
+    public function testIntegration()
+    {
+        $user = new InMemoryUser('username', 'password');
+        $token = new UsernamePasswordToken($user, 'provider');
+        $tokenStorage = new TokenStorage();
+        $tokenStorage->setToken($token);
+
+        $argumentResolver = new ArgumentResolver(null, [new SecurityTokenValueResolver($tokenStorage)]);
+        $this->assertSame([$token], $argumentResolver->getArguments(Request::create('/'), static function (TokenInterface $token) {}));
+    }
+
+    public function testIntegrationNoToken()
+    {
+        $tokenStorage = new TokenStorage();
+
+        $argumentResolver = new ArgumentResolver(null, [new SecurityTokenValueResolver($tokenStorage), new DefaultValueResolver()]);
+        $this->assertSame([null], $argumentResolver->getArguments(Request::create('/'), static function (?TokenInterface $token) {}));
+    }
+
+    public function testIntegrationNonNullablwWithNoToken()
+    {
+        $tokenStorage = new TokenStorage();
+
+        $argumentResolver = new ArgumentResolver(null, [new SecurityTokenValueResolver($tokenStorage), new DefaultValueResolver()]);
+
+        $this->expectException(HttpException::class);
+        $this->expectExceptionMessage('A security token is required but the token storage is empty.');
+
+        $argumentResolver->getArguments(Request::create('/'), static function (TokenInterface $token) {});
+    }
+}

From 29035b411f0d80105313ae5779f6aff52731ca1d Mon Sep 17 00:00:00 2001
From: Guillaume VDP <vdp.guillaume@gmail.com>
Date: Mon, 27 Mar 2023 14:27:54 +0200
Subject: [PATCH 430/475] [Workflow] Adding more return types

---
 .github/expected-missing-return-types.diff    | 150 ++++++++++++------
 .../Component/Workflow/Event/Event.php        |   3 +
 .../MarkingStore/MarkingStoreInterface.php    |   2 +
 .../Workflow/Metadata/GetMetadataTrait.php    |   3 +
 .../Metadata/MetadataStoreInterface.php       |   2 +
 .../Tests/Dumper/GraphvizDumperTest.php       |  12 +-
 .../Tests/Dumper/MermaidDumperTest.php        |   2 +-
 .../Tests/Dumper/PlantUmlDumperTest.php       |   6 +-
 .../Tests/EventListener/GuardListenerTest.php |   4 +-
 .../MarkingStore/MethodMarkingStoreTest.php   |   2 +-
 .../Component/Workflow/Tests/RegistryTest.php |   3 +-
 .../Component/Workflow/Tests/Subject.php      |   4 +-
 .../InstanceOfSupportStrategyTest.php         |   3 +-
 .../Workflow/Tests/WorkflowBuilderTrait.php   |   8 +-
 .../Component/Workflow/Tests/WorkflowTest.php |   6 +-
 .../DefinitionValidatorInterface.php          |   2 +
 16 files changed, 138 insertions(+), 74 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index e55e87698d0af..b692e58f295fa 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -1195,7 +1195,7 @@ index cffea43c49..0645fbd756 100644
      {
          $this->packages[$name] = $package;
 diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
-index df0484f75b..503d7bd126 100644
+index fd3ab66f41..56dc6251b8 100644
 --- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 +++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 @@ -67,5 +67,5 @@ abstract class AbstractBrowser
@@ -2695,7 +2695,7 @@ index 8ebc84376b..4af2691707 100644
      {
          if ($output instanceof SymfonyStyle) {
 diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
-index 7d31794be3..1c311aded2 100644
+index 26be690473..c248d4819b 100644
 --- a/src/Symfony/Component/Console/Helper/Table.php
 +++ b/src/Symfony/Component/Console/Helper/Table.php
 @@ -193,5 +193,5 @@ class Table
@@ -3575,10 +3575,10 @@ index 3f070dcc0c..aa0e5186bf 100644
      {
          foreach ($container->findTaggedServiceIds('auto_alias') as $serviceId => $tags) {
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
-index a68d19ea30..f88c9046e7 100644
+index 9d9250b9f9..4f78f4ddeb 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
 +++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
-@@ -61,5 +61,5 @@ class AutowirePass extends AbstractRecursivePass
+@@ -62,5 +62,5 @@ class AutowirePass extends AbstractRecursivePass
       * @return void
       */
 -    public function process(ContainerBuilder $container)
@@ -5203,7 +5203,7 @@ index 241725b9c5..420932897f 100644
      {
          $token = $this->current;
 diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
-index f7b839898f..32fa8eac6d 100644
+index a47ce66216..168f345e93 100644
 --- a/src/Symfony/Component/Filesystem/Filesystem.php
 +++ b/src/Symfony/Component/Filesystem/Filesystem.php
 @@ -37,5 +37,5 @@ class Filesystem
@@ -5707,7 +5707,7 @@ index 5e5997ddf9..6ea20c57ab 100644
      {
          $emptyData = static function (Options $options) {
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
-index ef02d8c434..091cc922e0 100644
+index 0216e61dd5..0ca3eebc0b 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
 @@ -25,5 +25,5 @@ class CollectionType extends AbstractType
@@ -5716,22 +5716,22 @@ index ef02d8c434..091cc922e0 100644
 -    public function buildForm(FormBuilderInterface $builder, array $options)
 +    public function buildForm(FormBuilderInterface $builder, array $options): void
      {
-         $prototypeOptions = null;
-@@ -57,5 +57,5 @@ class CollectionType extends AbstractType
+         $resizePrototypeOptions = null;
+@@ -58,5 +58,5 @@ class CollectionType extends AbstractType
       * @return void
       */
 -    public function buildView(FormView $view, FormInterface $form, array $options)
 +    public function buildView(FormView $view, FormInterface $form, array $options): void
      {
          $view->vars = array_replace($view->vars, [
-@@ -73,5 +73,5 @@ class CollectionType extends AbstractType
+@@ -74,5 +74,5 @@ class CollectionType extends AbstractType
       * @return void
       */
 -    public function finishView(FormView $view, FormInterface $form, array $options)
 +    public function finishView(FormView $view, FormInterface $form, array $options): void
      {
          $prefixOffset = -2;
-@@ -107,5 +107,5 @@ class CollectionType extends AbstractType
+@@ -108,5 +108,5 @@ class CollectionType extends AbstractType
       * @return void
       */
 -    public function configureOptions(OptionsResolver $resolver)
@@ -5804,7 +5804,7 @@ index 655ef6682f..0e525d09f6 100644
      {
          $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
-index a0a0c92fe0..0fffe46dfa 100644
+index 32c58447cd..ec35f6ee41 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
 @@ -51,5 +51,5 @@ class DateTimeType extends AbstractType
@@ -5814,7 +5814,7 @@ index a0a0c92fe0..0fffe46dfa 100644
 +    public function buildForm(FormBuilderInterface $builder, array $options): void
      {
          $parts = ['year', 'month', 'day', 'hour'];
-@@ -204,5 +204,5 @@ class DateTimeType extends AbstractType
+@@ -200,5 +200,5 @@ class DateTimeType extends AbstractType
       * @return void
       */
 -    public function buildView(FormView $view, FormInterface $form, array $options)
@@ -5829,7 +5829,7 @@ index a0a0c92fe0..0fffe46dfa 100644
      {
          $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
-index 5c81097e0e..573ed2d2d9 100644
+index 5c079f137d..e511dbb0c6 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
 @@ -44,5 +44,5 @@ class DateType extends AbstractType
@@ -6188,7 +6188,7 @@ index 40e7580d80..18c58e30c0 100644
      {
          $view->vars['pattern'] = null;
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
-index cc734e50a9..c6b47264a8 100644
+index c7d5276960..25d2444547 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
 @@ -38,5 +38,5 @@ class TimeType extends AbstractType
@@ -6205,7 +6205,7 @@ index cc734e50a9..c6b47264a8 100644
 +    public function buildView(FormView $view, FormInterface $form, array $options): void
      {
          $view->vars = array_replace($view->vars, [
-@@ -241,5 +241,5 @@ class TimeType extends AbstractType
+@@ -245,5 +245,5 @@ class TimeType extends AbstractType
       * @return void
       */
 -    public function configureOptions(OptionsResolver $resolver)
@@ -6937,10 +6937,10 @@ index 472437e465..1dfe39146b 100644
      {
          if ($this->client instanceof ResetInterface) {
 diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
-index 065d9d727a..52990be628 100644
+index c767ca81aa..51313be49f 100644
 --- a/src/Symfony/Component/HttpClient/HttpClientTrait.php
 +++ b/src/Symfony/Component/HttpClient/HttpClientTrait.php
-@@ -562,5 +562,5 @@ trait HttpClientTrait
+@@ -669,5 +669,5 @@ trait HttpClientTrait
       * @return string
       */
 -    private static function removeDotSegments(string $path)
@@ -6948,7 +6948,7 @@ index 065d9d727a..52990be628 100644
      {
          $result = '';
 diff --git a/src/Symfony/Component/HttpClient/MockHttpClient.php b/src/Symfony/Component/HttpClient/MockHttpClient.php
-index 9b8305e418..9ab577f6e8 100644
+index 5d8a2dccff..300c56dc6d 100644
 --- a/src/Symfony/Component/HttpClient/MockHttpClient.php
 +++ b/src/Symfony/Component/HttpClient/MockHttpClient.php
 @@ -110,5 +110,5 @@ class MockHttpClient implements HttpClientInterface, ResetInterface
@@ -6970,10 +6970,10 @@ index a87171d2ca..cec8a6f027 100644
      {
          if ($this->client instanceof ResetInterface) {
 diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
-index 78958f1ae0..a9fe288e4b 100644
+index d29b1a34e7..1779a080d0 100644
 --- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
 +++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
-@@ -355,5 +355,5 @@ class BinaryFileResponse extends Response
+@@ -362,5 +362,5 @@ class BinaryFileResponse extends Response
       * @return void
       */
 -    public static function trustXSendfileTypeHeader()
@@ -7102,7 +7102,7 @@ index 9d7012de35..545339d4ef 100644
      {
          unset($this->parameters[$key]);
 diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
-index 17eb95829c..9d234147b5 100644
+index a6650c49a3..2d5eb50ab4 100644
 --- a/src/Symfony/Component/HttpFoundation/Request.php
 +++ b/src/Symfony/Component/HttpFoundation/Request.php
 @@ -267,5 +267,5 @@ class Request
@@ -7189,7 +7189,7 @@ index 17eb95829c..9d234147b5 100644
 +    public function setLocale(string $locale): void
      {
          $this->setPhpDefaultLocale($this->locale = $locale);
-@@ -1892,5 +1892,5 @@ class Request
+@@ -1900,5 +1900,5 @@ class Request
       * @return void
       */
 -    protected static function initializeFormats()
@@ -8348,17 +8348,17 @@ index 47027233a7..2be5cfc7de 100644
      {
          $this->fragmentPath = $path;
 diff --git a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
-index f158cca3f9..bf5533dce7 100644
+index ce34979bbd..27d49f6a8c 100644
 --- a/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
 +++ b/src/Symfony/Component/HttpKernel/HttpCache/AbstractSurrogate.php
-@@ -59,5 +59,5 @@ abstract class AbstractSurrogate implements SurrogateInterface
+@@ -63,5 +63,5 @@ abstract class AbstractSurrogate implements SurrogateInterface
       * @return void
       */
 -    public function addSurrogateCapability(Request $request)
 +    public function addSurrogateCapability(Request $request): void
      {
          $current = $request->headers->get('Surrogate-Capability');
-@@ -108,5 +108,5 @@ abstract class AbstractSurrogate implements SurrogateInterface
+@@ -112,5 +112,5 @@ abstract class AbstractSurrogate implements SurrogateInterface
       * @return void
       */
 -    protected function removeFromControl(Response $response)
@@ -8366,7 +8366,7 @@ index f158cca3f9..bf5533dce7 100644
      {
          if (!$response->headers->has('Surrogate-Control')) {
 diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
-index 4730b33c13..da8fdccfaa 100644
+index d1761ccaae..dfdf0f4e7c 100644
 --- a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
 +++ b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
 @@ -36,5 +36,5 @@ class Esi extends AbstractSurrogate
@@ -8377,7 +8377,7 @@ index 4730b33c13..da8fdccfaa 100644
      {
          if (str_contains($response->getContent(), 'strictRequirements = $enabled;
 diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
-index 6da68c7594..57dd442aa2 100644
+index b06c649885..e98945cb7d 100644
 --- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
 +++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
 @@ -96,5 +96,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
@@ -10202,28 +10202,28 @@ index 6da68c7594..57dd442aa2 100644
 +    protected function addRoute(RouteCollection $collection, object $annot, array $globals, \ReflectionClass $class, \ReflectionMethod $method): void
      {
          if ($annot->getEnv() && $annot->getEnv() !== $this->env) {
-@@ -237,5 +237,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -241,5 +241,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return void
       */
 -    public function setResolver(LoaderResolverInterface $resolver)
 +    public function setResolver(LoaderResolverInterface $resolver): void
      {
      }
-@@ -250,5 +250,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -254,5 +254,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return string
       */
 -    protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method)
 +    protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method): string
      {
          $name = str_replace('\\', '_', $class->name).'_'.$method->name;
-@@ -265,5 +265,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -269,5 +269,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return array
       */
 -    protected function getGlobals(\ReflectionClass $class)
 +    protected function getGlobals(\ReflectionClass $class): array
      {
          $globals = $this->resetGlobals();
-@@ -350,5 +350,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+@@ -354,5 +354,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
       * @return Route
       */
 -    protected function createRoute(string $path, array $defaults, array $requirements, array $options, ?string $host, array $schemes, array $methods, ?string $condition)
@@ -10857,7 +10857,7 @@ index ec90d413fa..9f1401aa91 100644
  
      /**
 diff --git a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
-index 8fd2205a9d..5d5a72ac41 100644
+index 41670b27e0..cb36ae79c6 100644
 --- a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
 +++ b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
 @@ -35,5 +35,5 @@ class UserPasswordValidator extends ConstraintValidator
@@ -11162,7 +11162,7 @@ index 0e0f551876..1ab8bc9577 100644
      {
          $script = '
 diff --git a/src/Symfony/Component/Serializer/Annotation/MaxDepth.php b/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
-index 43785b292a..df3453cedb 100644
+index 36afff6a74..e371533b95 100644
 --- a/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
 +++ b/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
 @@ -36,5 +36,5 @@ class MaxDepth
@@ -11212,7 +11212,7 @@ index b684fddb2f..ade2242791 100644
      {
          return $this->data;
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
-index 58deea9f01..8fe0385cdc 100644
+index 856aefbe98..3517fff8da 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 @@ -215,5 +215,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
@@ -11237,10 +11237,10 @@ index 58deea9f01..8fe0385cdc 100644
      {
          if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
-index 20f15becb2..b378cd8c38 100644
+index 88e3c3ea12..c0597d0177 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
-@@ -139,10 +139,10 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+@@ -141,10 +141,10 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
       * @param array $context
       */
 -    public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */)
@@ -11253,21 +11253,21 @@ index 20f15becb2..b378cd8c38 100644
 +    public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
      {
          if (!isset($context['cache_key'])) {
-@@ -226,5 +226,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+@@ -227,5 +227,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
      }
  
 -    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null)
 +    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object
      {
          if ($this->classDiscriminatorResolver && $mapping = $this->classDiscriminatorResolver->getMappingForClass($class)) {
-@@ -288,5 +288,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+@@ -289,5 +289,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
       * @return string[]
       */
 -    abstract protected function extractAttributes(object $object, string $format = null, array $context = []);
 +    abstract protected function extractAttributes(object $object, string $format = null, array $context = []): array;
  
      /**
-@@ -295,15 +295,15 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+@@ -296,15 +296,15 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
       * @return mixed
       */
 -    abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []);
@@ -11365,10 +11365,10 @@ index 40779de316..105cf99b06 100644
  
      /**
 diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
-index f4e50841e9..638dbdbff7 100644
+index 357c36426e..f4423f47f4 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
-@@ -145,5 +145,5 @@ class ObjectNormalizer extends AbstractObjectNormalizer
+@@ -146,5 +146,5 @@ class ObjectNormalizer extends AbstractObjectNormalizer
       * @return void
       */
 -    protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = [])
@@ -11408,10 +11408,10 @@ index 1835568745..2b98fc11d6 100644
      {
          $this->serializer = $serializer;
 diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
-index c32425b99e..ea8c3ba06e 100644
+index df0b6121ea..7441f9fd6e 100644
 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
 +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
-@@ -871,5 +871,5 @@ class ArrayDenormalizerDummy implements DenormalizerInterface, SerializerAwareIn
+@@ -896,5 +896,5 @@ class ArrayDenormalizerDummy implements DenormalizerInterface, SerializerAwareIn
      }
  
 -    public function setSerializer(SerializerInterface $serializer)
@@ -12020,7 +12020,7 @@ index d53bbb196f..4eecf85f8e 100644
      {
          return self::PROPERTY_CONSTRAINT;
 diff --git a/src/Symfony/Component/Validator/ConstraintValidator.php b/src/Symfony/Component/Validator/ConstraintValidator.php
-index 3a3da8da82..db923387a5 100644
+index 8fa522314f..a4c0c5ec64 100644
 --- a/src/Symfony/Component/Validator/ConstraintValidator.php
 +++ b/src/Symfony/Component/Validator/ConstraintValidator.php
 @@ -40,5 +40,5 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface
@@ -12484,7 +12484,7 @@ index 4706c33569..909308a8b8 100644
      {
          if (!$constraint instanceof Language) {
 diff --git a/src/Symfony/Component/Validator/Constraints/LengthValidator.php b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
-index f70adf1cba..acc026ae38 100644
+index c92fca0d59..3f6c7e3997 100644
 --- a/src/Symfony/Component/Validator/Constraints/LengthValidator.php
 +++ b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
 @@ -25,5 +25,5 @@ class LengthValidator extends ConstraintValidator
@@ -13865,10 +13865,10 @@ index 84cfb42595..06cb77d8cb 100644
      {
          $context = $data->getContext();
 diff --git a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php b/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php
-index e080aff05d..a59bb4d8bd 100644
+index df05b6af57..024fb95d2f 100644
 --- a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php
 +++ b/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php
-@@ -25,4 +25,4 @@ interface DataDumperInterface
+@@ -24,4 +24,4 @@ interface DataDumperInterface
       * @return string|null
       */
 -    public function dump(Data $data);
@@ -13993,7 +13993,7 @@ index f665f6ee15..429db33d19 100644
      {
          $propertyScopes = [];
 diff --git a/src/Symfony/Component/Workflow/Event/Event.php b/src/Symfony/Component/Workflow/Event/Event.php
-index cd7fab7896..b340eba38e 100644
+index 5cd31e9154..2cd76d904b 100644
 --- a/src/Symfony/Component/Workflow/Event/Event.php
 +++ b/src/Symfony/Component/Workflow/Event/Event.php
 @@ -42,5 +42,5 @@ class Event extends BaseEvent
@@ -14024,6 +14024,13 @@ index cd7fab7896..b340eba38e 100644
 +    public function getWorkflowName(): string
      {
          return $this->workflow->getName();
+@@ -79,5 +79,5 @@ class Event extends BaseEvent
+      * @return mixed
+      */
+-    public function getMetadata(string $key, string|Transition|null $subject)
++    public function getMetadata(string $key, string|Transition|null $subject): mixed
+     {
+         return $this->workflow->getMetadataStore()->getMetadata($key, $subject);
 diff --git a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php b/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
 index 8d82824eb0..fab7b30160 100644
 --- a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php
@@ -14132,6 +14139,37 @@ index 95a83f0cfd..84e568b939 100644
 +    public function getPlaces(): array
      {
          return $this->places;
+diff --git a/src/Symfony/Component/Workflow/MarkingStore/MarkingStoreInterface.php b/src/Symfony/Component/Workflow/MarkingStore/MarkingStoreInterface.php
+index 7547a7f43b..c6b23fdf8a 100644
+--- a/src/Symfony/Component/Workflow/MarkingStore/MarkingStoreInterface.php
++++ b/src/Symfony/Component/Workflow/MarkingStore/MarkingStoreInterface.php
+@@ -35,4 +35,4 @@ interface MarkingStoreInterface
+      * @return void
+      */
+-    public function setMarking(object $subject, Marking $marking, array $context = []);
++    public function setMarking(object $subject, Marking $marking, array $context = []): void;
+ }
+diff --git a/src/Symfony/Component/Workflow/Metadata/GetMetadataTrait.php b/src/Symfony/Component/Workflow/Metadata/GetMetadataTrait.php
+index 286e2f8605..50762970ed 100644
+--- a/src/Symfony/Component/Workflow/Metadata/GetMetadataTrait.php
++++ b/src/Symfony/Component/Workflow/Metadata/GetMetadataTrait.php
+@@ -22,5 +22,5 @@ trait GetMetadataTrait
+      * @return mixed
+      */
+-    public function getMetadata(string $key, string|Transition $subject = null)
++    public function getMetadata(string $key, string|Transition $subject = null): mixed
+     {
+         if (null === $subject) {
+diff --git a/src/Symfony/Component/Workflow/Metadata/MetadataStoreInterface.php b/src/Symfony/Component/Workflow/Metadata/MetadataStoreInterface.php
+index 9acd540dcc..495573aec4 100644
+--- a/src/Symfony/Component/Workflow/Metadata/MetadataStoreInterface.php
++++ b/src/Symfony/Component/Workflow/Metadata/MetadataStoreInterface.php
+@@ -38,4 +38,4 @@ interface MetadataStoreInterface
+      * @return mixed
+      */
+-    public function getMetadata(string $key, string|Transition $subject = null);
++    public function getMetadata(string $key, string|Transition $subject = null): mixed;
+ }
 diff --git a/src/Symfony/Component/Workflow/Registry.php b/src/Symfony/Component/Workflow/Registry.php
 index 287d8b750f..9462747d84 100644
 --- a/src/Symfony/Component/Workflow/Registry.php
@@ -14143,6 +14181,16 @@ index 287d8b750f..9462747d84 100644
 +    public function addWorkflow(WorkflowInterface $workflow, WorkflowSupportStrategyInterface $supportStrategy): void
      {
          $this->workflows[] = [$workflow, $supportStrategy];
+diff --git a/src/Symfony/Component/Workflow/Validator/DefinitionValidatorInterface.php b/src/Symfony/Component/Workflow/Validator/DefinitionValidatorInterface.php
+index c9717b7beb..427e4d2ce9 100644
+--- a/src/Symfony/Component/Workflow/Validator/DefinitionValidatorInterface.php
++++ b/src/Symfony/Component/Workflow/Validator/DefinitionValidatorInterface.php
+@@ -26,4 +26,4 @@ interface DefinitionValidatorInterface
+      * @throws InvalidDefinitionException on invalid definition
+      */
+-    public function validate(Definition $definition, string $name);
++    public function validate(Definition $definition, string $name): void;
+ }
 diff --git a/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php b/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php
 index 20afc8d937..ef56c02882 100644
 --- a/src/Symfony/Component/Workflow/Validator/StateMachineValidator.php
diff --git a/src/Symfony/Component/Workflow/Event/Event.php b/src/Symfony/Component/Workflow/Event/Event.php
index cd7fab7896b20..5cd31e9154017 100644
--- a/src/Symfony/Component/Workflow/Event/Event.php
+++ b/src/Symfony/Component/Workflow/Event/Event.php
@@ -75,6 +75,9 @@ public function getWorkflowName()
         return $this->workflow->getName();
     }
 
+    /**
+     * @return mixed
+     */
     public function getMetadata(string $key, string|Transition|null $subject)
     {
         return $this->workflow->getMetadataStore()->getMetadata($key, $subject);
diff --git a/src/Symfony/Component/Workflow/MarkingStore/MarkingStoreInterface.php b/src/Symfony/Component/Workflow/MarkingStore/MarkingStoreInterface.php
index 99cb72c7cec71..7547a7f43b721 100644
--- a/src/Symfony/Component/Workflow/MarkingStore/MarkingStoreInterface.php
+++ b/src/Symfony/Component/Workflow/MarkingStore/MarkingStoreInterface.php
@@ -31,6 +31,8 @@ public function getMarking(object $subject): Marking;
 
     /**
      * Sets a Marking to a subject.
+     *
+     * @return void
      */
     public function setMarking(object $subject, Marking $marking, array $context = []);
 }
diff --git a/src/Symfony/Component/Workflow/Metadata/GetMetadataTrait.php b/src/Symfony/Component/Workflow/Metadata/GetMetadataTrait.php
index 9eddfd8b4be03..286e2f8605b2d 100644
--- a/src/Symfony/Component/Workflow/Metadata/GetMetadataTrait.php
+++ b/src/Symfony/Component/Workflow/Metadata/GetMetadataTrait.php
@@ -18,6 +18,9 @@
  */
 trait GetMetadataTrait
 {
+    /**
+     * @return mixed
+     */
     public function getMetadata(string $key, string|Transition $subject = null)
     {
         if (null === $subject) {
diff --git a/src/Symfony/Component/Workflow/Metadata/MetadataStoreInterface.php b/src/Symfony/Component/Workflow/Metadata/MetadataStoreInterface.php
index 8b2886f2f648e..9acd540dcc60d 100644
--- a/src/Symfony/Component/Workflow/Metadata/MetadataStoreInterface.php
+++ b/src/Symfony/Component/Workflow/Metadata/MetadataStoreInterface.php
@@ -34,6 +34,8 @@ public function getTransitionMetadata(Transition $transition): array;
      * @param string|Transition|null $subject Use null to get workflow metadata
      *                                        Use a string (the place name) to get place metadata
      *                                        Use a Transition instance to get transition metadata
+     *
+     * @return mixed
      */
     public function getMetadata(string $key, string|Transition $subject = null);
 }
diff --git a/src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php b/src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php
index f18868fcc3b41..ff38822d2235a 100644
--- a/src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php
+++ b/src/Symfony/Component/Workflow/Tests/Dumper/GraphvizDumperTest.php
@@ -47,7 +47,7 @@ public function testDumpWithMarking($definition, $marking, $expected)
         $this->assertEquals($expected, $dump);
     }
 
-    public static function provideWorkflowDefinitionWithMarking()
+    public static function provideWorkflowDefinitionWithMarking(): \Generator
     {
         yield [
             self::createComplexWorkflowDefinition(),
@@ -62,13 +62,13 @@ public static function provideWorkflowDefinitionWithMarking()
         ];
     }
 
-    public static function provideWorkflowDefinitionWithoutMarking()
+    public static function provideWorkflowDefinitionWithoutMarking(): \Generator
     {
         yield [self::createComplexWorkflowDefinition(), self::provideComplexWorkflowDumpWithoutMarking()];
         yield [self::createSimpleWorkflowDefinition(), self::provideSimpleWorkflowDumpWithoutMarking()];
     }
 
-    public static function createComplexWorkflowDefinitionDumpWithMarking()
+    public static function createComplexWorkflowDefinitionDumpWithMarking(): string
     {
         return 'digraph workflow {
   ratio="compress" rankdir="LR"
@@ -106,7 +106,7 @@ public static function createComplexWorkflowDefinitionDumpWithMarking()
 ';
     }
 
-    public static function createSimpleWorkflowDumpWithMarking()
+    public static function createSimpleWorkflowDumpWithMarking(): string
     {
         return 'digraph workflow {
   ratio="compress" rankdir="LR"
@@ -126,7 +126,7 @@ public static function createSimpleWorkflowDumpWithMarking()
 ';
     }
 
-    public static function provideComplexWorkflowDumpWithoutMarking()
+    public static function provideComplexWorkflowDumpWithoutMarking(): string
     {
         return 'digraph workflow {
   ratio="compress" rankdir="LR"
@@ -164,7 +164,7 @@ public static function provideComplexWorkflowDumpWithoutMarking()
 ';
     }
 
-    public static function provideSimpleWorkflowDumpWithoutMarking()
+    public static function provideSimpleWorkflowDumpWithoutMarking(): string
     {
         return 'digraph workflow {
   ratio="compress" rankdir="LR"
diff --git a/src/Symfony/Component/Workflow/Tests/Dumper/MermaidDumperTest.php b/src/Symfony/Component/Workflow/Tests/Dumper/MermaidDumperTest.php
index 93c1e339486ee..01b5638b2745b 100644
--- a/src/Symfony/Component/Workflow/Tests/Dumper/MermaidDumperTest.php
+++ b/src/Symfony/Component/Workflow/Tests/Dumper/MermaidDumperTest.php
@@ -146,7 +146,7 @@ public static function provideWorkflowDefinitionWithoutMarking(): array
         ];
     }
 
-    public static function provideWorkflowWithReservedWords()
+    public static function provideWorkflowWithReservedWords(): array
     {
         $builder = new DefinitionBuilder();
 
diff --git a/src/Symfony/Component/Workflow/Tests/Dumper/PlantUmlDumperTest.php b/src/Symfony/Component/Workflow/Tests/Dumper/PlantUmlDumperTest.php
index 6af7809ae0ad5..6e1b30340a2c2 100644
--- a/src/Symfony/Component/Workflow/Tests/Dumper/PlantUmlDumperTest.php
+++ b/src/Symfony/Component/Workflow/Tests/Dumper/PlantUmlDumperTest.php
@@ -36,7 +36,7 @@ public function testDumpWorkflowWithoutMarking($definition, $marking, $expectedF
         $this->assertStringEqualsFile($file, $dump);
     }
 
-    public static function provideWorkflowDefinitionWithoutMarking()
+    public static function provideWorkflowDefinitionWithoutMarking(): \Generator
     {
         yield [self::createSimpleWorkflowDefinition(), null, 'simple-workflow-nomarking', 'SimpleDiagram'];
         yield [self::createComplexWorkflowDefinition(), null, 'complex-workflow-nomarking', 'ComplexDiagram'];
@@ -59,7 +59,7 @@ public function testDumpStateMachineWithoutMarking($definition, $marking, $expec
         $this->assertStringEqualsFile($file, $dump);
     }
 
-    public static function provideStateMachineDefinitionWithoutMarking()
+    public static function provideStateMachineDefinitionWithoutMarking(): \Generator
     {
         yield [static::createComplexStateMachineDefinition(), null, 'complex-state-machine-nomarking', 'SimpleDiagram'];
         $marking = new Marking(['c' => 1, 'e' => 1]);
@@ -94,7 +94,7 @@ public function testDumpWorkflowWithSpacesInTheStateNamesAndDescription()
         $this->assertStringEqualsFile($file, $dump);
     }
 
-    private function getFixturePath($name, $transitionType)
+    private function getFixturePath($name, $transitionType): string
     {
         return __DIR__.'/../fixtures/puml/'.$transitionType.'/'.$name.'.puml';
     }
diff --git a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
index 26004dfdd728c..a5ff6a01c86fa 100644
--- a/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
+++ b/src/Symfony/Component/Workflow/Tests/EventListener/GuardListenerTest.php
@@ -143,7 +143,7 @@ public function testGuardExpressionBlocks()
         $this->assertTrue($event->isBlocked());
     }
 
-    private function createEvent(Transition $transition = null)
+    private function createEvent(Transition $transition = null): GuardEvent
     {
         $subject = new Subject();
         $transition ??= new Transition('name', 'from', 'to');
@@ -171,7 +171,7 @@ private function configureAuthenticationChecker($isUsed, $granted = true)
         ;
     }
 
-    private function configureValidator($isUsed, $valid = true)
+    private function configureValidator($isUsed, $valid = true): void
     {
         if (!$isUsed) {
             $this->validator
diff --git a/src/Symfony/Component/Workflow/Tests/MarkingStore/MethodMarkingStoreTest.php b/src/Symfony/Component/Workflow/Tests/MarkingStore/MethodMarkingStoreTest.php
index 4691e119cf9e0..34dbd3bd2d24f 100644
--- a/src/Symfony/Component/Workflow/Tests/MarkingStore/MethodMarkingStoreTest.php
+++ b/src/Symfony/Component/Workflow/Tests/MarkingStore/MethodMarkingStoreTest.php
@@ -111,7 +111,7 @@ public function testGetMarkingWithUninitializedProperty2()
         $markingStore->getMarking($subject);
     }
 
-    private function createValueObject(string $markingValue)
+    private function createValueObject(string $markingValue): object
     {
         return new class($markingValue) {
             /** @var string */
diff --git a/src/Symfony/Component/Workflow/Tests/RegistryTest.php b/src/Symfony/Component/Workflow/Tests/RegistryTest.php
index cf3ee8c14a924..eb9e83b5027b1 100644
--- a/src/Symfony/Component/Workflow/Tests/RegistryTest.php
+++ b/src/Symfony/Component/Workflow/Tests/RegistryTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Workflow\Tests;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Workflow\Definition;
 use Symfony\Component\Workflow\Exception\InvalidArgumentException;
@@ -108,7 +109,7 @@ public function testAllWithNoMatch()
         $this->assertCount(0, $workflows);
     }
 
-    private function createWorkflowSupportStrategy($supportedClassName)
+    private function createWorkflowSupportStrategy($supportedClassName): MockObject&WorkflowSupportStrategyInterface
     {
         $strategy = $this->createMock(WorkflowSupportStrategyInterface::class);
         $strategy->expects($this->any())->method('supports')
diff --git a/src/Symfony/Component/Workflow/Tests/Subject.php b/src/Symfony/Component/Workflow/Tests/Subject.php
index dd63da99d5f9c..6dd76e1ec51b7 100644
--- a/src/Symfony/Component/Workflow/Tests/Subject.php
+++ b/src/Symfony/Component/Workflow/Tests/Subject.php
@@ -22,12 +22,12 @@ public function __construct($marking = null)
         $this->context = [];
     }
 
-    public function getMarking()
+    public function getMarking(): string|array|null
     {
         return $this->marking;
     }
 
-    public function setMarking($marking, array $context = [])
+    public function setMarking($marking, array $context = []): void
     {
         $this->marking = $marking;
         $this->context = $context;
diff --git a/src/Symfony/Component/Workflow/Tests/SupportStrategy/InstanceOfSupportStrategyTest.php b/src/Symfony/Component/Workflow/Tests/SupportStrategy/InstanceOfSupportStrategyTest.php
index 8a5c300ade3e0..48a455e5a6189 100644
--- a/src/Symfony/Component/Workflow/Tests/SupportStrategy/InstanceOfSupportStrategyTest.php
+++ b/src/Symfony/Component/Workflow/Tests/SupportStrategy/InstanceOfSupportStrategyTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Workflow\Tests\SupportStrategy;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Workflow\SupportStrategy\InstanceOfSupportStrategy;
 use Symfony\Component\Workflow\Workflow;
@@ -31,7 +32,7 @@ public function testSupportsIfNotClassInstance()
         $this->assertFalse($strategy->supports($this->createWorkflow(), new Subject1()));
     }
 
-    private function createWorkflow()
+    private function createWorkflow(): MockObject&Workflow
     {
         return $this->getMockBuilder(Workflow::class)
             ->disableOriginalConstructor()
diff --git a/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php b/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php
index ae812324c6395..07a589e47b04b 100644
--- a/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php
+++ b/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php
@@ -17,7 +17,7 @@
 
 trait WorkflowBuilderTrait
 {
-    private static function createComplexWorkflowDefinition()
+    private static function createComplexWorkflowDefinition(): Definition
     {
         $places = range('a', 'g');
 
@@ -52,7 +52,7 @@ private static function createComplexWorkflowDefinition()
         //           +----+                          +----+     +----+     +----+
     }
 
-    private static function createSimpleWorkflowDefinition()
+    private static function createSimpleWorkflowDefinition(): Definition
     {
         $places = range('a', 'c');
 
@@ -87,7 +87,7 @@ private static function createSimpleWorkflowDefinition()
         // +---+     +----+     +---+     +----+     +---+
     }
 
-    private static function createWorkflowWithSameNameTransition()
+    private static function createWorkflowWithSameNameTransition(): Definition
     {
         $places = range('a', 'c');
 
@@ -115,7 +115,7 @@ private static function createWorkflowWithSameNameTransition()
         //   +--------------------------------------------------------------------+
     }
 
-    private static function createComplexStateMachineDefinition()
+    private static function createComplexStateMachineDefinition(): Definition
     {
         $places = ['a', 'b', 'c', 'd'];
 
diff --git a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
index d5f81b55d59c4..2b3d1ec078bac 100644
--- a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
+++ b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
@@ -427,14 +427,16 @@ public function testApplyWithEventDispatcher()
         $this->assertSame($eventNameExpected, $eventDispatcher->dispatchedEvents);
     }
 
-    public static function provideApplyWithEventDispatcherForAnnounceTests()
+    public static function provideApplyWithEventDispatcherForAnnounceTests(): \Generator
     {
         yield [false, [Workflow::DISABLE_ANNOUNCE_EVENT => true]];
         yield [true, [Workflow::DISABLE_ANNOUNCE_EVENT => false]];
         yield [true, []];
     }
 
-    /** @dataProvider provideApplyWithEventDispatcherForAnnounceTests */
+    /**
+     * @dataProvider provideApplyWithEventDispatcherForAnnounceTests
+     */
     public function testApplyWithEventDispatcherForAnnounce(bool $fired, array $context)
     {
         $definition = $this->createComplexWorkflowDefinition();
diff --git a/src/Symfony/Component/Workflow/Validator/DefinitionValidatorInterface.php b/src/Symfony/Component/Workflow/Validator/DefinitionValidatorInterface.php
index f02f582074f1d..c9717b7bebd96 100644
--- a/src/Symfony/Component/Workflow/Validator/DefinitionValidatorInterface.php
+++ b/src/Symfony/Component/Workflow/Validator/DefinitionValidatorInterface.php
@@ -21,6 +21,8 @@
 interface DefinitionValidatorInterface
 {
     /**
+     * @return void
+     *
      * @throws InvalidDefinitionException on invalid definition
      */
     public function validate(Definition $definition, string $name);

From c97a551ae33e45b60201ad7ceaed95a4b482fcc0 Mon Sep 17 00:00:00 2001
From: "Roland Franssen :)" <franssen.roland@gmail.com>
Date: Thu, 20 Apr 2023 18:25:57 +0200
Subject: [PATCH 431/475] Update Request.php

---
 src/Symfony/Component/HttpFoundation/Request.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index a6650c49a308c..cf7e56f13eb2f 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -89,6 +89,8 @@ class Request
     /**
      * Request body parameters ($_POST).
      *
+     * @see getPayload() for portability between content types
+     *
      * @var InputBag
      */
     public $request;
@@ -1515,6 +1517,8 @@ public function getPayload(): InputBag
     /**
      * Gets the request body decoded as array, typically from a JSON payload.
      *
+     * @see getPayload() for portability between content types
+     *
      * @throws JsonException When the body cannot be decoded to an array
      */
     public function toArray(): array

From 8aad8b91ebb0d78c4840e665248e31f6e668036b Mon Sep 17 00:00:00 2001
From: Renan <renan-sub@protonmail.com>
Date: Thu, 20 Apr 2023 19:12:47 +0200
Subject: [PATCH 432/475] [HttpKernel] Enhance MapQueryString adding validation
 group

---
 .../HttpKernel/Attribute/MapQueryString.php   |  4 +-
 .../RequestPayloadValueResolver.php           |  2 +-
 .../RequestPayloadValueResolverTest.php       | 43 +++++++++++++++----
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Attribute/MapQueryString.php b/src/Symfony/Component/HttpKernel/Attribute/MapQueryString.php
index 411937a4f04fc..f3717b31d0628 100644
--- a/src/Symfony/Component/HttpKernel/Attribute/MapQueryString.php
+++ b/src/Symfony/Component/HttpKernel/Attribute/MapQueryString.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\Attribute;
 
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestPayloadValueResolver;
+use Symfony\Component\Validator\Constraints\GroupSequence;
 
 /**
  * Controller parameter tag to map the query string of the request to typed object and validate it.
@@ -22,7 +23,8 @@
 class MapQueryString extends ValueResolver
 {
     public function __construct(
-        public readonly array $context = [],
+        public readonly array $serializationContext = [],
+        public readonly string|GroupSequence|array|null $validationGroups = null,
         string $resolver = RequestPayloadValueResolver::class,
     ) {
         parent::__construct($resolver);
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
index f73c9a58d6ee6..89a07c19f5ca9 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
@@ -120,7 +120,7 @@ private function mapQueryString(Request $request, string $type, MapQueryString $
             return null;
         }
 
-        return $this->serializer->denormalize($data, $type, null, self::CONTEXT_DENORMALIZE + $attribute->context);
+        return $this->serializer->denormalize($data, $type, null, self::CONTEXT_DENORMALIZE + $attribute->serializationContext);
     }
 
     private function mapRequestPayload(Request $request, string $type, MapRequestPayload $attribute): ?object
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
index 078ee02a216f8..ecfaa3e0f621d 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php
@@ -15,6 +15,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\MapQueryString;
 use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;
+use Symfony\Component\HttpKernel\Attribute\ValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestPayloadValueResolver;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -312,7 +313,7 @@ public static function provideMismatchedFormatContext(): iterable
     /**
      * @dataProvider provideValidationGroupsOnManyTypes
      */
-    public function testValidationGroupsPassed(mixed $groups)
+    public function testValidationGroupsPassed(string $method, ValueResolver $attribute)
     {
         $input = ['price' => '50', 'title' => 'A long title, so the validation passes'];
 
@@ -323,10 +324,10 @@ public function testValidationGroupsPassed(mixed $groups)
         $validator = (new ValidatorBuilder())->enableAnnotationMapping()->getValidator();
         $resolver = new RequestPayloadValueResolver($serializer, $validator);
 
-        $request = Request::create('/', 'POST', $input);
+        $request = Request::create('/', $method, $input);
 
         $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, false, [
-            MapRequestPayload::class => new MapRequestPayload(validationGroups: $groups),
+            $attribute::class => $attribute,
         ]);
 
         $resolved = $resolver->resolve($request, $argument);
@@ -338,7 +339,7 @@ public function testValidationGroupsPassed(mixed $groups)
     /**
      * @dataProvider provideValidationGroupsOnManyTypes
      */
-    public function testValidationGroupsNotPassed(mixed $groups)
+    public function testValidationGroupsNotPassed(string $method, ValueResolver $attribute)
     {
         $input = ['price' => '50', 'title' => 'Too short'];
 
@@ -347,9 +348,9 @@ public function testValidationGroupsNotPassed(mixed $groups)
         $resolver = new RequestPayloadValueResolver($serializer, $validator);
 
         $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, false, [
-            MapRequestPayload::class => new MapRequestPayload(validationGroups: $groups),
+            $attribute::class => $attribute,
         ]);
-        $request = Request::create('/', 'POST', $input);
+        $request = Request::create('/', $method, $input);
 
         try {
             $resolver->resolve($request, $argument);
@@ -364,11 +365,35 @@ public function testValidationGroupsNotPassed(mixed $groups)
 
     public static function provideValidationGroupsOnManyTypes(): iterable
     {
-        yield 'validation group as string' => ['strict'];
+        yield 'request payload with validation group as string' => [
+            'POST',
+            new MapRequestPayload(validationGroups: 'strict'),
+        ];
 
-        yield 'validation group as array' => [['strict']];
+        yield 'request payload with validation group as array' => [
+            'POST',
+            new MapRequestPayload(validationGroups: ['strict']),
+        ];
+
+        yield 'request payload with validation group as GroupSequence' => [
+            'POST',
+            new MapRequestPayload(validationGroups: new Assert\GroupSequence(['strict'])),
+        ];
 
-        yield 'validation group as GroupSequence' => [new Assert\GroupSequence(['strict'])];
+        yield 'query with validation group as string' => [
+            'GET',
+            new MapQueryString(validationGroups: 'strict'),
+        ];
+
+        yield 'query with validation group as array' => [
+            'GET',
+            new MapQueryString(validationGroups: ['strict']),
+        ];
+
+        yield 'query with validation group as GroupSequence' => [
+            'GET',
+            new MapQueryString(validationGroups: new Assert\GroupSequence(['strict'])),
+        ];
     }
 }
 

From 172b1f7277a6f399b73810350d6da7e589bdacd3 Mon Sep 17 00:00:00 2001
From: Markus Staab <m.staab@complex-it.de>
Date: Fri, 21 Apr 2023 10:47:07 +0200
Subject: [PATCH 433/475] [Config] Improve GlobResource performance

---
 src/Symfony/Component/Config/Resource/GlobResource.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
index fc4f5ec3b6e1a..fb490660b2832 100644
--- a/src/Symfony/Component/Config/Resource/GlobResource.php
+++ b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -97,7 +97,7 @@ public function __wakeup(): void
 
     public function getIterator(): \Traversable
     {
-        if (!file_exists($this->prefix) || (!$this->recursive && '' === $this->pattern)) {
+        if ((!$this->recursive && '' === $this->pattern) || !file_exists($this->prefix)) {
             return;
         }
 
@@ -148,7 +148,7 @@ public function getIterator(): \Traversable
                     } while ($prefix !== $dirPath && $dirPath !== $normalizedPath = \dirname($dirPath));
                 }
 
-                if (is_file($path) && (null === $regex || preg_match($regex, substr(str_replace('\\', '/', $path), $prefixLen)))) {
+                if ((null === $regex || preg_match($regex, substr(str_replace('\\', '/', $path), $prefixLen))) && is_file($path)) {
                     yield $path => new \SplFileInfo($path);
                 }
                 if (!is_dir($path)) {
@@ -165,7 +165,7 @@ public function getIterator(): \Traversable
                     new \RecursiveCallbackFilterIterator(
                         new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
                         fn (\SplFileInfo $file, $path) => !isset($this->excludedPrefixes[$path = str_replace('\\', '/', $path)])
-                            && (null === $regex || $file->isDir() || preg_match($regex, substr($path, $prefixLen)))
+                            && (null === $regex || preg_match($regex, substr($path, $prefixLen)) || $file->isDir())
                             && '.' !== $file->getBasename()[0]
                     ),
                     \RecursiveIteratorIterator::LEAVES_ONLY

From 66dd1adeae172a111d8f0e1eced4393fcfcb5b4f Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Fri, 21 Apr 2023 13:07:28 +0200
Subject: [PATCH 434/475] Add the void return type in Lock interfaces

---
 .../Component/Lock/BlockingSharedLockStoreInterface.php   | 2 ++
 src/Symfony/Component/Lock/BlockingStoreInterface.php     | 2 ++
 src/Symfony/Component/Lock/LockInterface.php              | 4 ++++
 src/Symfony/Component/Lock/PersistingStoreInterface.php   | 6 ++++++
 src/Symfony/Component/Lock/SharedLockStoreInterface.php   | 2 ++
 src/Symfony/Component/Lock/Tests/LockTest.php             | 8 +++-----
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Lock/BlockingSharedLockStoreInterface.php b/src/Symfony/Component/Lock/BlockingSharedLockStoreInterface.php
index 8fd9cbef1aedf..6929206c4249b 100644
--- a/src/Symfony/Component/Lock/BlockingSharedLockStoreInterface.php
+++ b/src/Symfony/Component/Lock/BlockingSharedLockStoreInterface.php
@@ -21,6 +21,8 @@ interface BlockingSharedLockStoreInterface extends SharedLockStoreInterface
     /**
      * Waits until a key becomes free for reading, then stores the resource.
      *
+     * @return void
+     *
      * @throws LockConflictedException
      */
     public function waitAndSaveRead(Key $key);
diff --git a/src/Symfony/Component/Lock/BlockingStoreInterface.php b/src/Symfony/Component/Lock/BlockingStoreInterface.php
index 15efaa2bdf6fa..8a84272a8bd87 100644
--- a/src/Symfony/Component/Lock/BlockingStoreInterface.php
+++ b/src/Symfony/Component/Lock/BlockingStoreInterface.php
@@ -21,6 +21,8 @@ interface BlockingStoreInterface extends PersistingStoreInterface
     /**
      * Waits until a key becomes free, then stores the resource.
      *
+     * @return void
+     *
      * @throws LockConflictedException
      */
     public function waitAndSave(Key $key);
diff --git a/src/Symfony/Component/Lock/LockInterface.php b/src/Symfony/Component/Lock/LockInterface.php
index 2ed18c0523c1c..8ff806497c16b 100644
--- a/src/Symfony/Component/Lock/LockInterface.php
+++ b/src/Symfony/Component/Lock/LockInterface.php
@@ -36,6 +36,8 @@ public function acquire(bool $blocking = false): bool;
      *
      * @param float|null $ttl Maximum expected lock duration in seconds
      *
+     * @return void
+     *
      * @throws LockConflictedException If the lock is acquired by someone else
      * @throws LockAcquiringException  If the lock cannot be refreshed
      */
@@ -49,6 +51,8 @@ public function isAcquired(): bool;
     /**
      * Release the lock.
      *
+     * @return void
+     *
      * @throws LockReleasingException If the lock cannot be released
      */
     public function release();
diff --git a/src/Symfony/Component/Lock/PersistingStoreInterface.php b/src/Symfony/Component/Lock/PersistingStoreInterface.php
index 7aea4991cf849..10af48c5e676f 100644
--- a/src/Symfony/Component/Lock/PersistingStoreInterface.php
+++ b/src/Symfony/Component/Lock/PersistingStoreInterface.php
@@ -23,6 +23,8 @@ interface PersistingStoreInterface
     /**
      * Stores the resource if it's not locked by someone else.
      *
+     * @return void
+     *
      * @throws LockAcquiringException
      * @throws LockConflictedException
      */
@@ -31,6 +33,8 @@ public function save(Key $key);
     /**
      * Removes a resource from the storage.
      *
+     * @return void
+     *
      * @throws LockReleasingException
      */
     public function delete(Key $key);
@@ -45,6 +49,8 @@ public function exists(Key $key): bool;
      *
      * @param float $ttl amount of seconds to keep the lock in the store
      *
+     * @return void
+     *
      * @throws LockConflictedException
      */
     public function putOffExpiration(Key $key, float $ttl);
diff --git a/src/Symfony/Component/Lock/SharedLockStoreInterface.php b/src/Symfony/Component/Lock/SharedLockStoreInterface.php
index 6b093a8513095..8246152493542 100644
--- a/src/Symfony/Component/Lock/SharedLockStoreInterface.php
+++ b/src/Symfony/Component/Lock/SharedLockStoreInterface.php
@@ -21,6 +21,8 @@ interface SharedLockStoreInterface extends PersistingStoreInterface
     /**
      * Stores the resource if it's not locked for reading by someone else.
      *
+     * @return void
+     *
      * @throws LockConflictedException
      */
     public function saveRead(Key $key);
diff --git a/src/Symfony/Component/Lock/Tests/LockTest.php b/src/Symfony/Component/Lock/Tests/LockTest.php
index 898442f3fb67a..247864e3922ec 100644
--- a/src/Symfony/Component/Lock/Tests/LockTest.php
+++ b/src/Symfony/Component/Lock/Tests/LockTest.php
@@ -472,16 +472,14 @@ public function testAcquireReadTwiceWithExpiration()
             private $keys = [];
             private $initialTtl = 30;
 
-            public function save(Key $key)
+            public function save(Key $key): void
             {
                 $key->reduceLifetime($this->initialTtl);
                 $this->keys[spl_object_hash($key)] = $key;
                 $this->checkNotExpired($key);
-
-                return true;
             }
 
-            public function delete(Key $key)
+            public function delete(Key $key): void
             {
                 unset($this->keys[spl_object_hash($key)]);
             }
@@ -491,7 +489,7 @@ public function exists(Key $key): bool
                 return isset($this->keys[spl_object_hash($key)]);
             }
 
-            public function putOffExpiration(Key $key, $ttl)
+            public function putOffExpiration(Key $key, $ttl): void
             {
                 $key->reduceLifetime($ttl);
               
10000
  $this->checkNotExpired($key);

From 78a4d29c621143ca9a684e1be77ccf1188404138 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Fri, 21 Apr 2023 13:12:22 +0200
Subject: [PATCH 435/475] Add the void return type in Semaphore interfaces

---
 .github/expected-missing-return-types.diff    | 70 +++++++++++++++----
 .../Semaphore/PersistingStoreInterface.php    |  6 ++
 .../Semaphore/SemaphoreInterface.php          |  4 ++
 3 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index b692e58f295fa..66cc1cf352437 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -7102,94 +7102,94 @@ index 9d7012de35..545339d4ef 100644
      {
          unset($this->parameters[$key]);
 diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
-index a6650c49a3..2d5eb50ab4 100644
+index cf7e56f13e..e07d5fab79 100644
 --- a/src/Symfony/Component/HttpFoundation/Request.php
 +++ b/src/Symfony/Component/HttpFoundation/Request.php
-@@ -267,5 +267,5 @@ class Request
+@@ -269,5 +269,5 @@ class Request
       * @return void
       */
 -    public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null)
 +    public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null): void
      {
          $this->request = new InputBag($request);
-@@ -427,5 +427,5 @@ class Request
+@@ -429,5 +429,5 @@ class Request
       * @return void
       */
 -    public static function setFactory(?callable $callable)
 +    public static function setFactory(?callable $callable): void
      {
          self::$requestFactory = $callable;
-@@ -533,5 +533,5 @@ class Request
+@@ -535,5 +535,5 @@ class Request
       * @return void
       */
 -    public function overrideGlobals()
 +    public function overrideGlobals(): void
      {
          $this->server->set('QUERY_STRING', static::normalizeQueryString(http_build_query($this->query->all(), '', '&')));
-@@ -575,5 +575,5 @@ class Request
+@@ -577,5 +577,5 @@ class Request
       * @return void
       */
 -    public static function setTrustedProxies(array $proxies, int $trustedHeaderSet)
 +    public static function setTrustedProxies(array $proxies, int $trustedHeaderSet): void
      {
          self::$trustedProxies = array_reduce($proxies, function ($proxies, $proxy) {
-@@ -618,5 +618,5 @@ class Request
+@@ -620,5 +620,5 @@ class Request
       * @return void
       */
 -    public static function setTrustedHosts(array $hostPatterns)
 +    public static function setTrustedHosts(array $hostPatterns): void
      {
          self::$trustedHostPatterns = array_map(fn ($hostPattern) => sprintf('{%s}i', $hostPattern), $hostPatterns);
-@@ -666,5 +666,5 @@ class Request
+@@ -668,5 +668,5 @@ class Request
       * @return void
       */
 -    public static function enableHttpMethodParameterOverride()
 +    public static function enableHttpMethodParameterOverride(): void
      {
          self::$httpMethodParameterOverride = true;
-@@ -753,5 +753,5 @@ class Request
+@@ -755,5 +755,5 @@ class Request
       * @return void
       */
 -    public function setSession(SessionInterface $session)
 +    public function setSession(SessionInterface $session): void
      {
          $this->session = $session;
-@@ -1176,5 +1176,5 @@ class Request
+@@ -1178,5 +1178,5 @@ class Request
       * @return void
       */
 -    public function setMethod(string $method)
 +    public function setMethod(string $method): void
      {
          $this->method = null;
-@@ -1299,5 +1299,5 @@ class Request
+@@ -1301,5 +1301,5 @@ class Request
       * @return void
       */
 -    public function setFormat(?string $format, string|array $mimeTypes)
 +    public function setFormat(?string $format, string|array $mimeTypes): void
      {
          if (null === static::$formats) {
-@@ -1331,5 +1331,5 @@ class Request
+@@ -1333,5 +1333,5 @@ class Request
       * @return void
       */
 -    public function setRequestFormat(?string $format)
 +    public function setRequestFormat(?string $format): void
      {
          $this->format = $format;
-@@ -1363,5 +1363,5 @@ class Request
+@@ -1365,5 +1365,5 @@ class Request
       * @return void
       */
 -    public function setDefaultLocale(string $locale)
 +    public function setDefaultLocale(string $locale): void
      {
          $this->defaultLocale = $locale;
-@@ -1385,5 +1385,5 @@ class Request
+@@ -1387,5 +1387,5 @@ class Request
       * @return void
       */
 -    public function setLocale(string $locale)
 +    public function setLocale(string $locale): void
      {
          $this->setPhpDefaultLocale($this->locale = $locale);
-@@ -1900,5 +1900,5 @@ class Request
+@@ -1904,5 +1904,5 @@ class Request
       * @return void
       */
 -    protected static function initializeFormats()
@@ -11136,6 +11136,48 @@ index 880a4eaa22..dd3da4ca7b 100644
 -    public function onAuthentication(Request $request, TokenInterface $token);
 +    public function onAuthentication(Request $request, TokenInterface $token): void;
  }
+diff --git a/src/Symfony/Component/Semaphore/PersistingStoreInterface.php b/src/Symfony/Component/Semaphore/PersistingStoreInterface.php
+index a7e4774f8d..daf487422f 100644
+--- a/src/Symfony/Component/Semaphore/PersistingStoreInterface.php
++++ b/src/Symfony/Component/Semaphore/PersistingStoreInterface.php
+@@ -29,5 +29,5 @@ interface PersistingStoreInterface
+      * @throws SemaphoreAcquiringException
+      */
+-    public function save(Key $key, float $ttlInSecond);
++    public function save(Key $key, float $ttlInSecond): void;
+ 
+     /**
+@@ -38,5 +38,5 @@ interface PersistingStoreInterface
+      * @throws SemaphoreReleasingException
+      */
+-    public function delete(Key $key);
++    public function delete(Key $key): void;
+ 
+     /**
+@@ -52,4 +52,4 @@ interface PersistingStoreInterface
+      * @throws SemaphoreExpiredException
+      */
+-    public function putOffExpiration(Key $key, float $ttlInSecond);
++    public function putOffExpiration(Key $key, float $ttlInSecond): void;
+ }
+diff --git a/src/Symfony/Component/Semaphore/SemaphoreInterface.php b/src/Symfony/Component/Semaphore/SemaphoreInterface.php
+index 0f295a057d..7d803a9bc3 100644
+--- a/src/Symfony/Component/Semaphore/SemaphoreInterface.php
++++ b/src/Symfony/Component/Semaphore/SemaphoreInterface.php
+@@ -38,5 +38,5 @@ interface SemaphoreInterface
+      * @throws SemaphoreExpiredException If the semaphore has expired
+      */
+-    public function refresh(float $ttlInSecond = null);
++    public function refresh(float $ttlInSecond = null): void;
+ 
+     /**
+@@ -52,5 +52,5 @@ interface SemaphoreInterface
+      * @throws SemaphoreReleasingException If the semaphore cannot be released
+      */
+-    public function release();
++    public function release(): void;
+ 
+     public function isExpired(): bool;
 diff --git a/src/Symfony/Component/Semaphore/Store/RedisStore.php b/src/Symfony/Component/Semaphore/Store/RedisStore.php
 index 0e0f551876..1ab8bc9577 100644
 --- a/src/Symfony/Component/Semaphore/Store/RedisStore.php
diff --git a/src/Symfony/Component/Semaphore/PersistingStoreInterface.php b/src/Symfony/Component/Semaphore/PersistingStoreInterface.php
index 11e2789a2843f..a7e4774f8d18a 100644
--- a/src/Symfony/Component/Semaphore/PersistingStoreInterface.php
+++ b/src/Symfony/Component/Semaphore/PersistingStoreInterface.php
@@ -24,6 +24,8 @@ interface PersistingStoreInterface
     /**
      * Stores the resource if the semaphore is not full.
      *
+     * @return void
+     *
      * @throws SemaphoreAcquiringException
      */
     public function save(Key $key, float $ttlInSecond);
@@ -31,6 +33,8 @@ public function save(Key $key, float $ttlInSecond);
     /**
      * Removes a resource from the storage.
      *
+     * @return void
+     *
      * @throws SemaphoreReleasingException
      */
     public function delete(Key $key);
@@ -43,6 +47,8 @@ public function exists(Key $key): bool;
     /**
      * Extends the TTL of a resource.
      *
+     * @return void
+     *
      * @throws SemaphoreExpiredException
      */
     public function putOffExpiration(Key $key, float $ttlInSecond);
diff --git a/src/Symfony/Component/Semaphore/SemaphoreInterface.php b/src/Symfony/Component/Semaphore/SemaphoreInterface.php
index 42cf0db73a6c8..0f295a057da52 100644
--- a/src/Symfony/Component/Semaphore/SemaphoreInterface.php
+++ b/src/Symfony/Component/Semaphore/SemaphoreInterface.php
@@ -33,6 +33,8 @@ public function acquire(): bool;
     /**
      * Increase the duration of an acquired semaphore.
      *
+     * @return void
+     *
      * @throws SemaphoreExpiredException If the semaphore has expired
      */
     public function refresh(float $ttlInSecond = null);
@@ -45,6 +47,8 @@ public function isAcquired(): bool;
     /**
      * Release the semaphore.
      *
+     * @return void
+     *
      * @throws SemaphoreReleasingException If the semaphore cannot be released
      */
     public function release();

From c7eab24d2013b4e358b9327a0fe151f5ecc045e3 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Fri, 21 Apr 2023 13:07:28 +0200
Subject: [PATCH 436/475] Add the void return type in Lock interfaces

---
 .github/expected-missing-return-types.diff    | 100 +++++++++++++++---
 .../Lock/BlockingSharedLockStoreInterface.php |   2 +
 .../Component/Lock/BlockingStoreInterface.php |   2 +
 src/Symfony/Component/Lock/LockInterface.php  |   4 +
 .../Lock/PersistingStoreInterface.php         |   6 ++
 .../Lock/SharedLockStoreInterface.php         |   2 +
 src/Symfony/Component/Lock/Tests/LockTest.php |   8 +-
 7 files changed, 105 insertions(+), 19 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index b692e58f295fa..5b898a39ea2c6 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -7102,94 +7102,94 @@ index 9d7012de35..545339d4ef 100644
      {
          unset($this->parameters[$key]);
 diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
-index a6650c49a3..2d5eb50ab4 100644
+index cf7e56f13e..e07d5fab79 100644
 --- a/src/Symfony/Component/HttpFoundation/Request.php
 +++ b/src/Symfony/Component/HttpFoundation/Request.php
-@@ -267,5 +267,5 @@ class Request
+@@ -269,5 +269,5 @@ class Request
       * @return void
       */
 -    public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null)
 +    public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null): void
      {
          $this->request = new InputBag($request);
-@@ -427,5 +427,5 @@ class Request
+@@ -429,5 +429,5 @@ class Request
       * @return void
       */
 -    public static function setFactory(?callable $callable)
 +    public static function setFactory(?callable $callable): void
      {
          self::$requestFactory = $callable;
-@@ -533,5 +533,5 @@ class Request
+@@ -535,5 +535,5 @@ class Request
       * @return void
       */
 -    public function overrideGlobals()
 +    public function overrideGlobals(): void
      {
          $this->server->set('QUERY_STRING', static::normalizeQueryString(http_build_query($this->query->all(), '', '&')));
-@@ -575,5 +575,5 @@ class Request
+@@ -577,5 +577,5 @@ class Request
       * @return void
       */
 -    public static function setTrustedProxies(array $proxies, int $trustedHeaderSet)
 +    public static function setTrustedProxies(array $proxies, int $trustedHeaderSet): void
      {
          self::$trustedProxies = array_reduce($proxies, function ($proxies, $proxy) {
-@@ -618,5 +618,5 @@ class Request
+@@ -620,5 +620,5 @@ class Request
       * @return void
       */
 -    public static function setTrustedHosts(array $hostPatterns)
 +    public static function setTrustedHosts(array $hostPatterns): void
      {
          self::$trustedHostPatterns = array_map(fn ($hostPattern) => sprintf('{%s}i', $hostPattern), $hostPatterns);
-@@ -666,5 +666,5 @@ class Request
+@@ -668,5 +668,5 @@ class Request
       * @return void
       */
 -    public static function enableHttpMethodParameterOverride()
 +    public static function enableHttpMethodParameterOverride(): void
      {
          self::$httpMethodParameterOverride = true;
-@@ -753,5 +753,5 @@ class Request
+@@ -755,5 +755,5 @@ class Request
       * @return void
       */
 -    public function setSession(SessionInterface $session)
 +    public function setSession(SessionInterface $session): void
      {
          $this->session = $session;
-@@ -1176,5 +1176,5 @@ class Request
+@@ -1178,5 +1178,5 @@ class Request
       * @return void
       */
 -    public function setMethod(string $method)
 +    public function setMethod(string $method): void
      {
          $this->method = null;
-@@ -1299,5 +1299,5 @@ class Request
+@@ -1301,5 +1301,5 @@ class Request
       * @return void
       */
 -    public function setFormat(?string $format, string|array $mimeTypes)
 +    public function setFormat(?string $format, string|array $mimeTypes): void
      {
          if (null === static::$formats) {
-@@ -1331,5 +1331,5 @@ class Request
+@@ -1333,5 +1333,5 @@ class Request
       * @return void
       */
 -    public function setRequestFormat(?string $format)
 +    public function setRequestFormat(?string $format): void
      {
          $this->format = $format;
-@@ -1363,5 +1363,5 @@ class Request
+@@ -1365,5 +1365,5 @@ class Request
       * @return void
       */
 -    public function setDefaultLocale(string $locale)
 +    public function setDefaultLocale(string $locale): void
      {
          $this->defaultLocale = $locale;
-@@ -1385,5 +1385,5 @@ class Request
+@@ -1387,5 +1387,5 @@ class Request
       * @return void
       */
 -    public function setLocale(string $locale)
 +    public function setLocale(string $locale): void
      {
          $this->setPhpDefaultLocale($this->locale = $locale);
-@@ -1900,5 +1900,5 @@ class Request
+@@ -1904,5 +1904,5 @@ class Request
       * @return void
       */
 -    protected static function initializeFormats()
@@ -9050,6 +9050,26 @@ index 7e535ebde1..ebb3df9b2b 100644
 +    public function onCheckPassport(CheckPassportEvent $event): void
      {
          $passport = $event->getPassport();
+diff --git a/src/Symfony/Component/Lock/BlockingSharedLockStoreInterface.php b/src/Symfony/Component/Lock/BlockingSharedLockStoreInterface.php
+index 6929206c42..f2494e1061 100644
+--- a/src/Symfony/Component/Lock/BlockingSharedLockStoreInterface.php
++++ b/src/Symfony/Component/Lock/BlockingSharedLockStoreInterface.php
+@@ -26,4 +26,4 @@ interface BlockingSharedLockStoreInterface extends SharedLockStoreInterface
+      * @throws LockConflictedException
+      */
+-    public function waitAndSaveRead(Key $key);
++    public function waitAndSaveRead(Key $key): void;
+ }
+diff --git a/src/Symfony/Component/Lock/BlockingStoreInterface.php b/src/Symfony/Component/Lock/BlockingStoreInterface.php
+index 8a84272a8b..e22fac0538 100644
+--- a/src/Symfony/Component/Lock/BlockingStoreInterface.php
++++ b/src/Symfony/Component/Lock/BlockingStoreInterface.php
+@@ -26,4 +26,4 @@ interface BlockingStoreInterface extends PersistingStoreInterface
+      * @throws LockConflictedException
+      */
+-    public function waitAndSave(Key $key);
++    public function waitAndSave(Key $key): void;
+ }
 diff --git a/src/Symfony/Component/Lock/LockFactory.php b/src/Symfony/Component/Lock/LockFactory.php
 index 125b6eae50..ac327e8981 100644
 --- a/src/Symfony/Component/Lock/LockFactory.php
@@ -9068,6 +9088,58 @@ index 125b6eae50..ac327e8981 100644
 +    public function createLockFromKey(Key $key, ?float $ttl = 300.0, bool $autoRelease = true): SharedLockInterface
      {
          $lock = new Lock($key, $this->store, $ttl, $autoRelease);
+diff --git a/src/Symfony/Component/Lock/LockInterface.php b/src/Symfony/Component/Lock/LockInterface.php
+index 8ff806497c..991252e453 100644
+--- a/src/Symfony/Component/Lock/LockInterface.php
++++ b/src/Symfony/Component/Lock/LockInterface.php
+@@ -42,5 +42,5 @@ interface LockInterface
+      * @throws LockAcquiringException  If the lock cannot be refreshed
+      */
+-    public function refresh(float $ttl = null);
++    public function refresh(float $ttl = null): void;
+ 
+     /**
+@@ -56,5 +56,5 @@ interface LockInterface
+      * @throws LockReleasingException If the lock cannot be released
+      */
+-    public function release();
++    public function release(): void;
+ 
+     public function isExpired(): bool;
+diff --git a/src/Symfony/Component/Lock/PersistingStoreInterface.php b/src/Symfony/Component/Lock/PersistingStoreInterface.php
+index 10af48c5e6..392446a56a 100644
+--- a/src/Symfony/Component/Lock/PersistingStoreInterface.php
++++ b/src/Symfony/Component/Lock/PersistingStoreInterface.php
+@@ -29,5 +29,5 @@ interface PersistingStoreInterface
+      * @throws LockConflictedException
+      */
+-    public function save(Key $key);
++    public function save(Key $key): void;
+ 
+     /**
+@@ -38,5 +38,5 @@ interface PersistingStoreInterface
+      * @throws LockReleasingException
+      */
+-    public function delete(Key $key);
++    public function delete(Key $key): void;
+ 
+     /**
+@@ -54,4 +54,4 @@ interface PersistingStoreInterface
+      * @throws LockConflictedException
+      */
+-    public function putOffExpiration(Key $key, float $ttl);
++    public function putOffExpiration(Key $key, float $ttl): void;
+ }
+diff --git a/src/Symfony/Component/Lock/SharedLockStoreInterface.php b/src/Symfony/Component/Lock/SharedLockStoreInterface.php
+index 8246152493..1814a18bca 100644
+--- a/src/Symfony/Component/Lock/SharedLockStoreInterface.php
++++ b/src/Symfony/Component/Lock/SharedLockStoreInterface.php
+@@ -26,4 +26,4 @@ interface SharedLockStoreInterface extends PersistingStoreInterface
+      * @throws LockConflictedException
+      */
+-    public function saveRead(Key $key);
++    public function saveRead(Key $key): void;
+ }
 diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php
 index 9087874c29..5cfd87c4ad 100644
 --- a/src/Symfony/Component/Lock/Store/CombinedStore.php
diff --git a/src/Symfony/Component/Lock/BlockingSharedLockStoreInterface.php b/src/Symfony/Component/Lock/BlockingSharedLockStoreInterface.php
index 8fd9cbef1aedf..6929206c4249b 100644
--- a/src/Symfony/Component/Lock/BlockingSharedLockStoreInterface.php
+++ b/src/Symfony/Component/Lock/BlockingSharedLockStoreInterface.php
@@ -21,6 +21,8 @@ interface BlockingSharedLockStoreInterface extends SharedLockStoreInterface
     /**
      * Waits until a key becomes free for reading, then stores the resource.
      *
+     * @return void
+     *
      * @throws LockConflictedException
      */
     public function waitAndSaveRead(Key $key);
diff --git a/src/Symfony/Component/Lock/BlockingStoreInterface.php b/src/Symfony/Component/Lock/BlockingStoreInterface.php
index 15efaa2bdf6fa..8a84272a8bd87 100644
--- a/src/Symfony/Component/Lock/BlockingStoreInterface.php
+++ b/src/Symfony/Component/Lock/BlockingStoreInterface.php
@@ -21,6 +21,8 @@ interface BlockingStoreInterface extends PersistingStoreInterface
     /**
      * Waits until a key becomes free, then stores the resource.
      *
+     * @return void
+     *
      * @throws LockConflictedException
      */
     public function waitAndSave(Key $key);
diff --git a/src/Symfony/Component/Lock/LockInterface.php b/src/Symfony/Component/Lock/LockInterface.php
index 2ed18c0523c1c..8ff806497c16b 100644
--- a/src/Symfony/Component/Lock/LockInterface.php
+++ b/src/Symfony/Component/Lock/LockInterface.php
@@ -36,6 +36,8 @@ public function acquire(bool $blocking = false): bool;
      *
      * @param float|null $ttl Maximum expected lock duration in seconds
      *
+     * @return void
+     *
      * @throws LockConflictedException If the lock is acquired by someone else
      * @throws LockAcquiringException  If the lock cannot be refreshed
      */
@@ -49,6 +51,8 @@ public function isAcquired(): bool;
     /**
      * Release the lock.
      *
+     * @return void
+     *
      * @throws LockReleasingException If the lock cannot be released
      */
     public function release();
diff --git a/src/Symfony/Component/Lock/PersistingStoreInterface.php b/src/Symfony/Component/Lock/PersistingStoreInterface.php
index 7aea4991cf849..10af48c5e676f 100644
--- a/src/Symfony/Component/Lock/PersistingStoreInterface.php
+++ b/src/Symfony/Component/Lock/PersistingStoreInterface.php
@@ -23,6 +23,8 @@ interface PersistingStoreInterface
     /**
      * Stores the resource if it's not locked by someone else.
      *
+     * @return void
+     *
      * @throws LockAcquiringException
      * @throws LockConflictedException
      */
@@ -31,6 +33,8 @@ public function save(Key $key);
     /**
      * Removes a resource from the storage.
      *
+     * @return void
+     *
      * @throws LockReleasingException
      */
     public function delete(Key $key);
@@ -45,6 +49,8 @@ public function exists(Key $key): bool;
      *
      * @param float $ttl amount of seconds to keep the lock in the store
      *
+     * @return void
+     *
      * @throws LockConflictedException
      */
     public function putOffExpiration(Key $key, float $ttl);
diff --git a/src/Symfony/Component/Lock/SharedLockStoreInterface.php b/src/Symfony/Component/Lock/SharedLockStoreInterface.php
index 6b093a8513095..8246152493542 100644
--- a/src/Symfony/Component/Lock/SharedLockStoreInterface.php
+++ b/src/Symfony/Component/Lock/SharedLockStoreInterface.php
@@ -21,6 +21,8 @@ interface SharedLockStoreInterface extends PersistingStoreInterface
     /**
      * Stores the resource if it's not locked for reading by someone else.
      *
+     * @return void
+     *
      * @throws LockConflictedException
      */
     public function saveRead(Key $key);
diff --git a/src/Symfony/Component/Lock/Tests/LockTest.php b/src/Symfony/Component/Lock/Tests/LockTest.php
index 898442f3fb67a..247864e3922ec 100644
--- a/src/Symfony/Component/Lock/Tests/LockTest.php
+++ b/src/Symfony/Component/Lock/Tests/LockTest.php
@@ -472,16 +472,14 @@ public function testAcquireReadTwiceWithExpiration()
             private $keys = [];
             private $initialTtl = 30;
 
-            public function save(Key $key)
+            public function save(Key $key): void
             {
                 $key->reduceLifetime($this->initialTtl);
                 $this->keys[spl_object_hash($key)] = $key;
                 $this->checkNotExpired($key);
-
-                return true;
             }
 
-            public function delete(Key $key)
+            public function delete(Key $key): void
             {
                 unset($this->keys[spl_object_hash($key)]);
             }
@@ -491,7 +489,7 @@ public function exists(Key $key): bool
                 return isset($this->keys[spl_object_hash($key)]);
             }
 
-            public function putOffExpiration(Key $key, $ttl)
+            public function putOffExpiration(Key $key, $ttl): void
             {
                 $key->reduceLifetime($ttl);
                 $this->checkNotExpired($key);

From f5d874ebce777c1e1d5adea0c2c94fb47d62f42c Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 21 Apr 2023 13:34:45 +0200
Subject: [PATCH 437/475] [RemoteEvent] Fix ConsumerInterface usage

---
 .../RemoteEvent/Messenger/ConsumeRemoteEventHandler.php      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventHandler.php b/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventHandler.php
index daa7f4d8d9fda..699de06ffff07 100644
--- a/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventHandler.php
+++ b/src/Symfony/Component/RemoteEvent/Messenger/ConsumeRemoteEventHandler.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\RemoteEvent\Messenger;
 
 use Psr\Container\ContainerInterface;
+use Symfony\Component\RemoteEvent\Consumer\ConsumerInterface;
 use Symfony\Component\RemoteEvent\Exception\LogicException;
 
 /**
@@ -33,6 +34,10 @@ public function __invoke(ConsumeRemoteEventMessage $message): void
         }
         $consumer = $this->consumers->get($message->getType());
 
+        if (!$consumer instanceof ConsumerInterface) {
+            throw new LogicException(sprintf('The consumer "%s" for message of type "%s" must implement "%s".', get_debug_type($consumer), $message->getType(), ConsumerInterface::class));
+        }
+
         $consumer->consume($message->getEvent());
     }
 }

From 93d0caa668971a6a142378e7cffb20dfbea90b91 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Fri, 21 Apr 2023 13:22:31 +0200
Subject: [PATCH 438/475] Fix the semaphore tests

The save method of the store is not meant to return a boolean.
---
 .../Component/Semaphore/Tests/SemaphoreFactoryTest.php      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Semaphore/Tests/SemaphoreFactoryTest.php b/src/Symfony/Component/Semaphore/Tests/SemaphoreFactoryTest.php
index 8f42009aefc00..7cb387db7fe00 100644
--- a/src/Symfony/Component/Semaphore/Tests/SemaphoreFactoryTest.php
+++ b/src/Symfony/Component/Semaphore/Tests/SemaphoreFactoryTest.php
@@ -35,8 +35,7 @@ public function testCreateSemaphore()
                 $keys[] = $key;
 
                 return true;
-            }))
-            ->willReturn(true);
+            }));
 
         $logger = $this->createMock(LoggerInterface::class);
         $factory = new SemaphoreFactory($store);
@@ -64,8 +63,7 @@ public function testCreateSemaphoreFromKey()
                 $keys[] = $key;
 
                 return true;
-            }))
-            ->willReturn(true);
+            }));
 
         $logger = $this->createMock(LoggerInterface::class);
         $factory = new SemaphoreFactory($store);

From d96c0f0635d30afbce34ef0314858b4e0c1e8913 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Fri, 21 Apr 2023 13:39:34 +0200
Subject: [PATCH 439/475] Add the void return type in the Translation
 interfaces

---
 .github/expected-missing-return-types.diff    | 127 ++++++++++++++++++
 .../Translation/Dumper/DumperInterface.php    |   2 +
 .../Extractor/ExtractorInterface.php          |   4 +
 .../Translation/Extractor/PhpExtractor.php    |   6 +
 .../Translation/MessageCatalogueInterface.php |  12 ++
 .../Translation/MetadataAwareInterface.php    |   4 +
 .../Reader/TranslationReaderInterface.php     |   2 +
 .../Writer/TranslationWriterInterface.php     |   2 +
 8 files changed, 159 insertions(+)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index f4522440572d7..2e89221b1e90a 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -11825,6 +11825,16 @@ index 8f54752590..cefb1e1b80 100644
 +    public function setCsvControl(string $delimiter = ';', string $enclosure = '"'): void
      {
          $this->delimiter = $delimiter;
+diff --git a/src/Symfony/Component/Translation/Dumper/DumperInterface.php b/src/Symfony/Component/Translation/Dumper/DumperInterface.php
+index 6bf42931ef..60f12bcda3 100644
+--- a/src/Symfony/Component/Translation/Dumper/DumperInterface.php
++++ b/src/Symfony/Component/Translation/Dumper/DumperInterface.php
+@@ -29,4 +29,4 @@ interface DumperInterface
+      * @return void
+      */
+-    public function dump(MessageCatalogue $messages, array $options = []);
++    public function dump(MessageCatalogue $messages, array $options = []): void;
+ }
 diff --git a/src/Symfony/Component/Translation/Dumper/FileDumper.php b/src/Symfony/Component/Translation/Dumper/FileDumper.php
 index ed2c278aaf..0722e1c160 100644
 --- a/src/Symfony/Component/Translation/Dumper/FileDumper.php
@@ -11884,6 +11894,41 @@ index d36f7f385a..dbaeceee09 100644
 +    public function extract(string|iterable $directory, MessageCatalogue $catalogue): void
      {
          foreach ($this->extractors as $extractor) {
+diff --git a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php b/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
+index 642130af75..c9ae2693a4 100644
+--- a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
++++ b/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
+@@ -29,5 +29,5 @@ interface ExtractorInterface
+      * @return void
+      */
+-    public function extract(string|iterable $resource, MessageCatalogue $catalogue);
++    public function extract(string|iterable $resource, MessageCatalogue $catalogue): void;
+ 
+     /**
+@@ -36,4 +36,4 @@ interface ExtractorInterface
+      * @return void
+      */
+-    public function setPrefix(string $prefix);
++    public function setPrefix(string $prefix): void;
+ }
+diff --git a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
+index 6b59c7cacc..50c1eba7c6 100644
+--- a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
++++ b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
+@@ -136,5 +136,5 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
+      * @return void
+      */
+-    public function extract(string|iterable $resource, MessageCatalogue $catalog)
++    public function extract(string|iterable $resource, MessageCatalogue $catalog): void
+     {
+         $files = $this->extractFiles($resource);
+@@ -149,5 +149,5 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
+      * @return void
+      */
+-    public function setPrefix(string $prefix)
++    public function setPrefix(string $prefix): void
+     {
+         $this->prefix = $prefix;
 diff --git a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
 index 7f2f96be64..266c7f48c9 100644
 --- a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
@@ -11980,6 +12025,68 @@ index 379d947ce7..effc8dab3d 100644
 +    public function deleteCatalogueMetadata(string $key = '', string $domain = 'messages'): void
      {
          if (!$domain) {
+diff --git a/src/Symfony/Component/Translation/MessageCatalogueInterface.php b/src/Symfony/Component/Translation/MessageCatalogueInterface.php
+index ed819f1554..27c279768a 100644
+--- a/src/Symfony/Component/Translation/MessageCatalogueInterface.php
++++ b/src/Symfony/Component/Translation/MessageCatalogueInterface.php
+@@ -49,5 +49,5 @@ interface MessageCatalogueInterface
+      * @return void
+      */
+-    public function set(string $id, string $translation, string $domain = 'messages');
++    public function set(string $id, string $translation, string $domain = 'messages'): void;
+ 
+     /**
+@@ -83,5 +83,5 @@ interface MessageCatalogueInterface
+      * @return void
+      */
+-    public function replace(array $messages, string $domain = 'messages');
++    public function replace(array $messages, string $domain = 'messages'): void;
+ 
+     /**
+@@ -93,5 +93,5 @@ interface MessageCatalogueInterface
+      * @return void
+      */
+-    public function add(array $messages, string $domain = 'messages');
++    public function add(array $messages, string $domain = 'messages'): void;
+ 
+     /**
+@@ -102,5 +102,5 @@ interface MessageCatalogueInterface
+      * @return void
+      */
+-    public function addCatalogue(self $catalogue);
++    public function addCatalogue(self $catalogue): void;
+ 
+     /**
+@@ -112,5 +112,5 @@ interface MessageCatalogueInterface
+      * @return void
+      */
+-    public function addFallbackCatalogue(self $catalogue);
++    public function addFallbackCatalogue(self $catalogue): void;
+ 
+     /**
+@@ -131,4 +131,4 @@ interface MessageCatalogueInterface
+      * @return void
+      */
+-    public function addResource(ResourceInterface $resource);
++    public function addResource(ResourceInterface $resource): void;
+ }
+diff --git a/src/Symfony/Component/Translation/MetadataAwareInterface.php b/src/Symfony/Component/Translation/MetadataAwareInterface.php
+index 39e5326c37..5775c04ed5 100644
+--- a/src/Symfony/Component/Translation/MetadataAwareInterface.php
++++ b/src/Symfony/Component/Translation/MetadataAwareInterface.php
+@@ -35,5 +35,5 @@ interface MetadataAwareInterface
+      * @return void
+      */
+-    public function setMetadata(string $key, mixed $value, string $domain = 'messages');
++    public function setMetadata(string $key, mixed $value, string $domain = 'messages'): void;
+ 
+     /**
+@@ -45,4 +45,4 @@ interface MetadataAwareInterface
+      * @return void
+      */
+-    public function deleteMetadata(string $key = '', string $domain = 'messages');
++    public function deleteMetadata(string $key = '', string $domain = 'messages'): void;
+ }
 diff --git a/src/Symfony/Component/Translation/Reader/TranslationReader.php b/src/Symfony/Component/Translation/Reader/TranslationReader.php
 index 01408d4dcd..cd49c7a920 100644
 --- a/src/Symfony/Component/Translation/Reader/TranslationReader.php
@@ -11998,6 +12105,16 @@ index 01408d4dcd..cd49c7a920 100644
 +    public function read(string $directory, MessageCatalogue $catalogue): void
      {
          if (!is_dir($directory)) {
+diff --git a/src/Symfony/Component/Translation/Reader/TranslationReaderInterface.php b/src/Symfony/Component/Translation/Reader/TranslationReaderInterface.php
+index ea74dc23ff..29888cdafc 100644
+--- a/src/Symfony/Component/Translation/Reader/TranslationReaderInterface.php
++++ b/src/Symfony/Component/Translation/Reader/TranslationReaderInterface.php
+@@ -26,4 +26,4 @@ interface TranslationReaderInterface
+      * @return void
+      */
+-    public function read(string $directory, MessageCatalogue $catalogue);
++    public function read(string $directory, MessageCatalogue $catalogue): void;
+ }
 diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
 index 132138e922..22f4a060a1 100644
 --- a/src/Symfony/Component/Translation/Translator.php
@@ -12083,6 +12200,16 @@ index 61e03cb0ea..46dc804662 100644
 +    public function write(MessageCatalogue $catalogue, string $format, array $options = []): void
      {
          if (!isset($this->dumpers[$format])) {
+diff --git a/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php b/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php
+index 5ebb9794a6..aef89e88e7 100644
+--- a/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php
++++ b/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php
+@@ -32,4 +32,4 @@ interface TranslationWriterInterface
+      * @throws InvalidArgumentException
+      */
+-    public function write(MessageCatalogue $catalogue, string $format, array $options = []);
++    public function write(MessageCatalogue $catalogue, string $format, array $options = []): void;
+ }
 diff --git a/src/Symfony/Component/Validator/Command/DebugCommand.php b/src/Symfony/Component/Validator/Command/DebugCommand.php
 index acb00d7242..37cc40a06f 100644
 --- a/src/Symfony/Component/Validator/Command/DebugCommand.php
diff --git a/src/Symfony/Component/Translation/Dumper/DumperInterface.php b/src/Symfony/Component/Translation/Dumper/DumperInterface.php
index 7cdaef5151c8a..6bf42931ef01e 100644
--- a/src/Symfony/Component/Translation/Dumper/DumperInterface.php
+++ b/src/Symfony/Component/Translation/Dumper/DumperInterface.php
@@ -25,6 +25,8 @@ interface DumperInterface
      * Dumps the message catalogue.
      *
      * @param array $options Options that are used by the dumper
+     *
+     * @return void
      */
     public function dump(MessageCatalogue $messages, array $options = []);
 }
diff --git a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php b/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
index b76a7f20ba67d..642130af75ff1 100644
--- a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
+++ b/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
@@ -25,11 +25,15 @@ interface ExtractorInterface
      * Extracts translation messages from files, a file or a directory to the catalogue.
      *
      * @param string|iterable<string> $resource Files, a file or a directory
+     *
+     * @return void
      */
     public function extract(string|iterable $resource, MessageCatalogue $catalogue);
 
     /**
      * Sets the prefix that should be used for new found messages.
+     *
+     * @return void
      */
     public function setPrefix(string $prefix);
 }
diff --git a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
index b7cd38789e762..6b59c7cacc41a 100644
--- a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
+++ b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
@@ -132,6 +132,9 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
         ],
     ];
 
+    /**
+     * @return void
+     */
     public function extract(string|iterable $resource, MessageCatalogue $catalog)
     {
         $files = $this->extractFiles($resource);
@@ -142,6 +145,9 @@ public function extract(string|iterable $resource, MessageCatalogue $catalog)
         }
     }
 
+    /**
+     * @return void
+     */
     public function setPrefix(string $prefix)
     {
         $this->prefix = $prefix;
diff --git a/src/Symfony/Component/Translation/MessageCatalogueInterface.php b/src/Symfony/Component/Translation/MessageCatalogueInterface.php
index 7663db30c3a3e..ed819f1554a8e 100644
--- a/src/Symfony/Component/Translation/MessageCatalogueInterface.php
+++ b/src/Symfony/Component/Translation/MessageCatalogueInterface.php
@@ -45,6 +45,8 @@ public function all(string $domain = null): array;
      * @param string $id          The message id
      * @param string $translation The messages translation
      * @param string $domain      The domain name
+     *
+     * @return void
      */
     public function set(string $id, string $translation, string $domain = 'messages');
 
@@ -77,6 +79,8 @@ public function get(string $id, string $domain = 'messages'): string;
      *
      * @param array  $messages An array of translations
      * @param string $domain   The domain name
+     *
+     * @return void
      */
     public function replace(array $messages, string $domain = 'messages');
 
@@ -85,6 +89,8 @@ public function replace(array $messages, string $domain = 'messages');
      *
      * @param array  $messages An array of translations
      * @param string $domain   The domain name
+     *
+     * @return void
      */
     public function add(array $messages, string $domain = 'messages');
 
@@ -92,6 +98,8 @@ public function add(array $messages, string $domain = 'messages');
      * Merges translations from the given Catalogue into the current one.
      *
      * The two catalogues must have the same locale.
+     *
+     * @return void
      */
     public function addCatalogue(self $catalogue);
 
@@ -100,6 +108,8 @@ public function addCatalogue(self $catalogue);
      * only when the translation does not exist.
      *
      * This is used to provide default translations when they do not exist for the current locale.
+     *
+     * @return void
      */
     public function addFallbackCatalogue(self $catalogue);
 
@@ -117,6 +127,8 @@ public function getResources(): array;
 
     /**
      * Adds a resource for this collection.
+     *
+     * @return void
      */
     public function addResource(ResourceInterface $resource);
 }
diff --git a/src/Symfony/Component/Translation/MetadataAwareInterface.php b/src/Symfony/Component/Translation/MetadataAwareInterface.php
index 5753b817ac37f..39e5326c37d92 100644
--- a/src/Symfony/Component/Translation/MetadataAwareInterface.php
+++ b/src/Symfony/Component/Translation/MetadataAwareInterface.php
@@ -31,6 +31,8 @@ public function getMetadata(string $key = '', string $domain = 'messages'): mixe
 
     /**
      * Adds metadata to a message domain.
+     *
+     * @return void
      */
     public function setMetadata(string $key, mixed $value, string $domain = 'messages');
 
@@ -39,6 +41,8 @@ public function setMetadata(string $key, mixed $value, string $domain = 'message
      *
      * Passing an empty domain will delete all metadata. Passing an empty key will
      * delete all metadata for the given domain.
+     *
+     * @return void
      */
     public function deleteMetadata(string $key = '', string $domain = 'messages');
 }
diff --git a/src/Symfony/Component/Translation/Reader/TranslationReaderInterface.php b/src/Symfony/Component/Translation/Reader/TranslationReaderInterface.php
index bc37204f95cb7..ea74dc23ffee6 100644
--- a/src/Symfony/Component/Translation/Reader/TranslationReaderInterface.php
+++ b/src/Symfony/Component/Translation/Reader/TranslationReaderInterface.php
@@ -22,6 +22,8 @@ interface TranslationReaderInterface
 {
     /**
      * Reads translation messages from a directory to the catalogue.
+     *
+     * @return void
      */
     public function read(string $directory, MessageCatalogue $catalogue);
 }
diff --git a/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php b/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php
index 43213097e34ff..5ebb9794a6c0a 100644
--- a/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php
+++ b/src/Symfony/Component/Translation/Writer/TranslationWriterInterface.php
@@ -27,6 +27,8 @@ interface TranslationWriterInterface
      * @param string $format  The format to use to dump the messages
      * @param array  $options Options that are passed to the dumper
      *
+     * @return void
+     *
      * @throws InvalidArgumentException
      */
     public function write(MessageCatalogue $catalogue, string $format, array $options = []);

From 08cb39e754e19cd0455a6b82fc0f97dba5bcff39 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Fri, 21 Apr 2023 14:08:46 +0200
Subject: [PATCH 440/475] Fix tests for the Lock component

---
 src/Symfony/Component/Lock/Tests/LockFactoryTest.php | 6 ++----
 src/Symfony/Component/Lock/Tests/LockTest.php        | 8 +++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Lock/Tests/LockFactoryTest.php b/src/Symfony/Component/Lock/Tests/LockFactoryTest.php
index 2437f905b5d8f..22a13fb06b03e 100644
--- a/src/Symfony/Component/Lock/Tests/LockFactoryTest.php
+++ b/src/Symfony/Component/Lock/Tests/LockFactoryTest.php
@@ -35,8 +35,7 @@ public function testCreateLock()
                 $keys[] = $key;
 
                 return true;
-            }))
-            ->willReturn(true);
+            }));
 
         $logger = $this->createMock(LoggerInterface::class);
         $factory = new LockFactory($store);
@@ -65,8 +64,7 @@ public function testCreateLockFromKey()
                 $keys[] = $key;
 
                 return true;
-            }))
-            ->willReturn(true);
+            }));
 
         $logger = $this->createMock(LoggerInterface::class);
         $factory = new LockFactory($store);
diff --git a/src/Symfony/Component/Lock/Tests/LockTest.php b/src/Symfony/Component/Lock/Tests/LockTest.php
index 247864e3922ec..f5b28f245d9ce 100644
--- a/src/Symfony/Component/Lock/Tests/LockTest.php
+++ b/src/Symfony/Component/Lock/Tests/LockTest.php
@@ -516,16 +516,14 @@ public function testAcquireTwiceWithExpiration()
             private $keys = [];
             private $initialTtl = 30;
 
-            public function save(Key $key)
+            public function save(Key $key): void
             {
                 $key->reduceLifetime($this->initialTtl);
                 $this->keys[spl_object_hash($key)] = $key;
                 $this->checkNotExpired($key);
-
-                return true;
             }
 
-            public function delete(Key $key)
+            public function delete(Key $key): void
             {
                 unset($this->keys[spl_object_hash($key)]);
             }
@@ -535,7 +533,7 @@ public function exists(Key $key): bool
                 return isset($this->keys[spl_object_hash($key)]);
             }
 
-            public function putOffExpiration(Key $key, $ttl)
+            public function putOffExpiration(Key $key, $ttl): void
             {
                 $key->reduceLifetime($ttl);
                 $this->checkNotExpired($key);

From d86c42e3b242bede5a7b2e2f3dab101df0217c4c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 21 Apr 2023 15:48:36 +0200
Subject: [PATCH 441/475] [DependencyInjection] Fix support for empty env vars

---
 .../Component/DependencyInjection/EnvVarProcessor.php      | 4 ++--
 .../DependencyInjection/Tests/EnvVarProcessorTest.php      | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
index 44b8a312e2994..57df918f3a02e 100644
--- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -149,7 +149,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
             || false === ($env = $env ?? getenv($name) ?? false) // null is a possible value because of thread safety issues
         ) {
             foreach ($this->loadedVars as $vars) {
-                if (false !== ($env = ($vars[$name] ?? false)) && '' !== $env) {
+                if (false !== ($env = ($vars[$name] ?? $env)) && '' !== $env) {
                     break;
                 }
             }
@@ -167,7 +167,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
                             continue;
                         }
                         $this->loadedVars[] = $vars = $loader->loadEnvVars();
-                        if (false !== ($env = ($vars[$name] ?? false)) && '' !== $env) {
+                        if (false !== ($env = ($vars[$name] ?? $env)) && '' !== $env) {
                             $ended = false;
                             break;
                         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
index 2992b1c6951e2..b24f84267d659 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -727,6 +727,7 @@ public static function validCsv()
     public function testEnvLoader()
     {
         $_ENV['BAZ_ENV_LOADER'] = '';
+        $_ENV['BUZ_ENV_LOADER'] = '';
 
         $loaders = function () {
             yield new class() implements EnvVarLoaderInterface {
@@ -751,7 +752,7 @@ public function loadEnvVars(): array
             };
         };
 
-        $processor = new EnvVarProcessor(new Container(), $loaders());
+        $processor = new EnvVarProcessor(new Container(), new RewindableGenerator($loaders, 2));
 
         $result = $processor->getEnv('string', 'FOO_ENV_LOADER', function () {});
         $this->assertSame('123', $result);
@@ -762,10 +763,14 @@ public function loadEnvVars(): array
         $result = $processor->getEnv('string', 'BAZ_ENV_LOADER', function () {});
         $this->assertSame('567', $result);
 
+        $result = $processor->getEnv('string', 'BUZ_ENV_LOADER', function () {});
+        $this->assertSame('', $result);
+
         $result = $processor->getEnv('string', 'FOO_ENV_LOADER', function () {});
         $this->assertSame('123', $result); // check twice
 
         unset($_ENV['BAZ_ENV_LOADER']);
+        unset($_ENV['BUZ_ENV_LOADER']);
     }
 
     public function testCircularEnvLoader()

From 22edd84808270aae26b72d38294dc06dacfb3f08 Mon Sep 17 00:00:00 2001
From: Artyum Petrov <17199757+artyuum@users.noreply.github.com>
Date: Thu, 20 Apr 2023 19:24:19 +0400
Subject: [PATCH 442/475] Add "composer require..." in all exception messages
 when needed

---
 src/Symfony/Bridge/Doctrine/composer.json       |  8 --------
 .../Bridge/Monolog/Command/ServerLogCommand.php |  2 +-
 src/Symfony/Bridge/Monolog/composer.json        |  5 -----
 src/Symfony/Bridge/PhpUnit/composer.json        |  3 ---
 .../Bridge/Twig/Mime/NotificationEmail.php      |  4 ++--
 src/Symfony/Bridge/Twig/composer.json           | 17 -----------------
 src/Symfony/Bundle/DebugBundle/composer.json    |  4 ----
 .../Controller/TemplateController.php           |  2 +-
 .../Bundle/FrameworkBundle/KernelBrowser.php    |  2 +-
 .../Tests/Controller/TemplateControllerTest.php |  2 +-
 .../Bundle/FrameworkBundle/composer.json        | 10 ----------
 src/Symfony/Component/Asset/composer.json       |  3 ---
 .../Component/BrowserKit/AbstractBrowser.php    |  2 +-
 src/Symfony/Component/BrowserKit/composer.json  |  3 ---
 .../Component/Config/Resource/GlobResource.php  |  2 +-
 src/Symfony/Component/Config/composer.json      |  3 ---
 .../Component/Console/Command/LockableTrait.php |  2 +-
 src/Symfony/Component/Console/composer.json     |  6 ------
 .../DependencyInjection/Dumper/PhpDumper.php    |  2 +-
 .../DependencyInjection/Dumper/YamlDumper.php   |  2 +-
 .../Loader/YamlFileLoader.php                   |  2 +-
 .../Component/DependencyInjection/composer.json |  6 ------
 src/Symfony/Component/DomCrawler/composer.json  |  3 ---
 src/Symfony/Component/Dotenv/Dotenv.php         |  2 +-
 .../Component/EventDispatcher/composer.json     |  4 ----
 src/Symfony/Component/Form/composer.json        |  6 ------
 .../HttpFoundation/ExpressionRequestMatcher.php |  2 +-
 .../Component/HttpFoundation/composer.json      |  3 ---
 src/Symfony/Component/HttpKernel/composer.json  |  6 ------
 .../Exception/UnsupportedSchemeException.php    |  2 +-
 .../UnsupportedSchemeExceptionTest.php          |  2 +-
 src/Symfony/Component/Messenger/composer.json   |  3 ---
 src/Symfony/Component/Mime/Address.php          |  2 +-
 .../Exception/UnsupportedSchemeException.php    |  2 +-
 .../UnsupportedSchemeExceptionTest.php          |  2 +-
 .../Component/PropertyAccess/composer.json      |  3 ---
 .../Component/PropertyInfo/composer.json        |  6 ------
 src/Symfony/Component/RateLimiter/composer.json |  3 ---
 .../Matcher/Dumper/CompiledUrlMatcherDumper.php |  2 +-
 .../Component/Routing/Matcher/UrlMatcher.php    |  2 +-
 src/Symfony/Component/Routing/composer.json     |  6 ------
 .../Scheduler/Trigger/CronExpressionTrigger.php |  2 +-
 .../Component/Security/Core/composer.json       |  8 --------
 .../Component/Security/Csrf/composer.json       |  3 ---
 .../Component/Security/Http/composer.json       |  4 ----
 src/Symfony/Component/Serializer/composer.json  |  9 ---------
 src/Symfony/Component/Templating/composer.json  |  3 ---
 .../Exception/UnsupportedSchemeException.php    |  2 +-
 .../UnsupportedSchemeExceptionTest.php          |  2 +-
 src/Symfony/Component/Translation/composer.json |  6 ------
 .../Constraints/AbstractComparison.php          |  2 +-
 .../Component/Validator/Constraints/Bic.php     |  2 +-
 .../Validator/Constraints/BicValidator.php      |  2 +-
 .../Component/Validator/Constraints/Email.php   |  2 +-
 .../Validator/Constraints/EmailValidator.php    |  2 +-
 .../Validator/Constraints/Expression.php        |  2 +-
 .../Component/Validator/Constraints/Range.php   |  2 +-
 src/Symfony/Component/Validator/composer.json   | 12 ------------
 src/Symfony/Component/VarDumper/composer.json   |  5 -----
 src/Symfony/Component/WebLink/composer.json     |  3 ---
 .../EventListener/ExpressionLanguage.php        |  2 +-
 src/Symfony/Component/Yaml/composer.json        |  3 ---
 src/Symfony/Contracts/Cache/composer.json       |  3 ---
 .../Contracts/EventDispatcher/composer.json     |  3 ---
 src/Symfony/Contracts/HttpClient/composer.json  |  3 ---
 src/Symfony/Contracts/Service/composer.json     |  3 ---
 src/Symfony/Contracts/Translation/composer.json |  3 ---
 src/Symfony/Contracts/composer.json             |  7 -------
 68 files changed, 32 insertions(+), 221 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 59ee51bcb8b1a..98721385f4e5e 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -68,14 +68,6 @@
         "symfony/security-core": "<6.0",
         "symfony/validator": "<5.4"
     },
-    "suggest": {
-        "symfony/form": "",
-        "symfony/validator": "",
-        "symfony/property-info": "",
-        "doctrine/data-fixtures": "",
-        "doctrine/dbal": "",
-        "doctrine/orm": ""
-    },
     "autoload": {
         "psr-4": { "Symfony\\Bridge\\Doctrine\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
index 9975c46cba9f0..5210e8eefafd5 100644
--- a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
+++ b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
@@ -83,7 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $filter = $input->getOption('filter');
         if ($filter) {
             if (!class_exists(ExpressionLanguage::class)) {
-                throw new LogicException('Package "symfony/expression-language" is required to use the "filter" option.');
+                throw new LogicException('Package "symfony/expression-language" is required to use the "filter" option. Try running "composer require symfony/expression-language".');
             }
             $this->el = new ExpressionLanguage();
         }
diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json
index 8fc06d8ece4e8..ca8b92ae601f5 100644
--- a/src/Symfony/Bridge/Monolog/composer.json
+++ b/src/Symfony/Bridge/Monolog/composer.json
@@ -35,11 +35,6 @@
         "symfony/http-foundation": "<5.4",
         "symfony/security-core": "<6.0"
     },
-    "suggest": {
-        "symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel.",
-        "symfony/console": "For the possibility to show log messages in console commands depending on verbosity settings.",
-        "symfony/var-dumper": "For using the debugging handlers like the console handler or the log server handler."
-     },
     "autoload": {
         "psr-4": { "Symfony\\Bridge\\Monolog\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
index 75fce743284aa..77c408dc14ff2 100644
--- a/src/Symfony/Bridge/PhpUnit/composer.json
+++ b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -25,9 +25,6 @@
         "symfony/error-handler": "^5.4|^6.0",
         "symfony/polyfill-php81": "^1.27"
     },
-    "suggest": {
-        "symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
-    },
     "conflict": {
         "phpunit/phpunit": "<7.5|9.1.2"
     },
diff --git a/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php
index e9681df41c432..5bd54e64463e5 100644
--- a/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php
+++ b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php
@@ -54,7 +54,7 @@ public function __construct(Headers $headers = null, AbstractPart $body = null)
         }
 
         if ($missingPackages) {
-            throw new \LogicException(sprintf('You cannot use "%s" if the "%s" Twig extension%s not available; try running "%s".', static::class, implode('" and "', $missingPackages), \count($missingPackages) > 1 ? 's are' : ' is', 'composer require '.implode(' ', array_keys($missingPackages))));
+            throw new \LogicException(sprintf('You cannot use "%s" if the "%s" Twig extension%s not available. Try running "%s".', static::class, implode('" and "', $missingPackages), \count($missingPackages) > 1 ? 's are' : ' is', 'composer require '.implode(' ', array_keys($missingPackages))));
         }
 
         parent::__construct($headers, $body);
@@ -88,7 +88,7 @@ public function markAsPublic(): static
     public function markdown(string $content): static
     {
         if (!class_exists(MarkdownExtension::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s" if the Markdown Twig extension is not available; try running "composer require twig/markdown-extra".', __METHOD__));
+            throw new \LogicException(sprintf('You cannot use "%s" if the Markdown Twig extension is not available. Try running "composer require twig/markdown-extra".', __METHOD__));
         }
 
         $this->context['markdown'] = true;
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index cd0ad795594f0..8cf462fea5938 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -64,23 +64,6 @@
         "symfony/translation": "<5.4",
         "symfony/workflow": "<5.4"
     },
-    "suggest": {
-        "symfony/finder": "",
-        "symfony/asset": "For using the AssetExtension",
-        "symfony/form": "For using the FormExtension",
-        "symfony/html-sanitizer": "For using the HtmlSanitizerExtension",
-        "symfony/http-kernel": "For using the HttpKernelExtension",
-        "symfony/routing": "For using the RoutingExtension",
-        "symfony/translation": "For using the TranslationExtension",
-        "symfony/yaml": "For using the YamlExtension",
-        "symfony/security-core": "For using the SecurityExtension",
-        "symfony/security-csrf": "For using the CsrfExtension",
-        "symfony/security-http": "For using the LogoutUrlExtension",
-        "symfony/stopwatch": "For using the StopwatchExtension",
-        "symfony/var-dumper": "For using the DumpExtension",
-        "symfony/expression-language": "For using the ExpressionExtension",
-        "symfony/web-link": "For using the WebLinkExtension"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Bridge\\Twig\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json
index 619db7d66feed..3b7607c7d39f7 100644
--- a/src/Symfony/Bundle/DebugBundle/composer.json
+++ b/src/Symfony/Bundle/DebugBundle/composer.json
@@ -31,10 +31,6 @@
         "symfony/config": "<5.4",
         "symfony/dependency-injection": "<5.4"
     },
-    "suggest": {
-        "symfony/config": "For service container configuration",
-        "symfony/dependency-injection": "For using as a service from the container"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\DebugBundle\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
index 3d754bb7d0b1e..437458a499255 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
@@ -43,7 +43,7 @@ public function __construct(Environment $twig = null)
     public function templateAction(string $template, int $maxAge = null, int $sharedAge = null, bool $private = null, array $context = [], int $statusCode = 200): Response
     {
         if (null === $this->twig) {
-            throw new \LogicException('You cannot use the TemplateController if the Twig Bundle is not available.');
+            throw new \LogicException('You cannot use the TemplateController if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".');
         }
 
         $response = new Response($this->twig->render($template, $context), $statusCode);
diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
index 1f484c1b84515..0379be8f5bc97 100644
--- a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
+++ b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
@@ -114,7 +114,7 @@ public function enableReboot()
     public function loginUser(object $user, string $firewallContext = 'main'): static
     {
         if (!interface_exists(UserInterface::class)) {
-            throw new \LogicException(sprintf('"%s" requires symfony/security-core to be installed.', __METHOD__));
+            throw new \LogicException(sprintf('"%s" requires symfony/security-core to be installed. Try running "composer require symfony/security-core".', __METHOD__));
         }
 
         if (!$user instanceof UserInterface) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
index e567342ecf4c9..f558333f36a40 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
@@ -35,7 +35,7 @@ public function testTwig()
     public function testNoTwig()
     {
         $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('You cannot use the TemplateController if the Twig Bundle is not available.');
+        $this->expectExceptionMessage('You cannot use the TemplateController if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".');
         $controller = new TemplateController();
 
         $controller->templateAction('mytemplate')->getContent();
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index a7e31039452dc..e17a3a4c5cda9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -101,16 +101,6 @@
         "symfony/web-profiler-bundle": "<5.4",
         "symfony/workflow": "<5.4"
     },
-    "suggest": {
-        "ext-apcu": "For best performance of the system caches",
-        "symfony/console": "For using the console commands",
-        "symfony/form": "For using forms",
-        "symfony/serializer": "For using the serializer service",
-        "symfony/validator": "For using validation",
-        "symfony/yaml": "For using the debug:config and lint:yaml commands",
-        "symfony/property-info": "For using the property_info service",
-        "symfony/web-link": "For using web links, features such as preloading, prefetching or prerendering"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Asset/composer.json b/src/Symfony/Component/Asset/composer.json
index 4759be09b3571..81208037abb67 100644
--- a/src/Symfony/Component/Asset/composer.json
+++ b/src/Symfony/Component/Asset/composer.json
@@ -18,9 +18,6 @@
     "require": {
         "php": ">=8.1"
     },
-    "suggest": {
-        "symfony/http-foundation": ""
-    },
     "require-dev": {
         "symfony/http-client": "^5.4|^6.0",
         "symfony/http-foundation": "^5.4|^6.0",
diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
index fd3ab66f41470..3725a107d246f 100644
--- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
+++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
@@ -118,7 +118,7 @@ public function getMaxRedirects(): int
     public function insulate(bool $insulated = true)
     {
         if ($insulated && !class_exists(\Symfony\Component\Process\Process::class)) {
-            throw new LogicException('Unable to isolate requests as the Symfony Process Component is not installed.');
+            throw new LogicException('Unable to isolate requests as the Symfony Process Component is not installed. Try running "composer require symfony/process".');
         }
 
         $this->insulated = $insulated;
diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json
index 357064ec006c9..53e5fcb0a9984 100644
--- a/src/Symfony/Component/BrowserKit/composer.json
+++ b/src/Symfony/Component/BrowserKit/composer.json
@@ -25,9 +25,6 @@
         "symfony/mime": "^5.4|^6.0",
         "symfony/process": "^5.4|^6.0"
     },
-    "suggest": {
-        "symfony/process": ""
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\BrowserKit\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
index fb490660b2832..2aedc84b3e33c 100644
--- a/src/Symfony/Com
10000
ponent/Config/Resource/GlobResource.php
+++ b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -183,7 +183,7 @@ public function getIterator(): \Traversable
         }
 
         if (!class_exists(Finder::class)) {
-            throw new \LogicException('Extended glob patterns cannot be used as the Finder component is not installed, try running "composer require symfony/finder".');
+            throw new \LogicException('Extended glob patterns cannot be used as the Finder component is not installed. Try running "composer require symfony/finder".');
         }
 
         yield from (new Finder())
diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json
index 9896bcc4d5d1b..a4b72c36a1ba1 100644
--- a/src/Symfony/Component/Config/composer.json
+++ b/src/Symfony/Component/Config/composer.json
@@ -32,9 +32,6 @@
         "symfony/finder": "<5.4",
         "symfony/service-contracts": "<2.5"
     },
-    "suggest": {
-        "symfony/yaml": "To use the yaml reference dumper"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Config\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Console/Command/LockableTrait.php b/src/Symfony/Component/Console/Command/LockableTrait.php
index 67923a9e81881..c5de40dc0d965 100644
--- a/src/Symfony/Component/Console/Command/LockableTrait.php
+++ b/src/Symfony/Component/Console/Command/LockableTrait.php
@@ -32,7 +32,7 @@ trait LockableTrait
     private function lock(string $name = null, bool $blocking = false): bool
     {
         if (!class_exists(SemaphoreStore::class)) {
-            throw new LogicException('To enable the locking feature you must install the symfony/lock component.');
+            throw new LogicException('To enable the locking feature you must install the symfony/lock component. Try running "composer require symfony/lock".');
         }
 
         if (null !== $this->lock) {
diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
index f6168c80cae2e..c34421299e534 100644
--- a/src/Symfony/Component/Console/composer.json
+++ b/src/Symfony/Component/Console/composer.json
@@ -34,12 +34,6 @@
     "provide": {
         "psr/log-implementation": "1.0|2.0|3.0"
     },
-    "suggest": {
-        "symfony/event-dispatcher": "",
-        "symfony/lock": "",
-        "symfony/process": "",
-        "psr/log": "For using the console logger"
-    },
     "conflict": {
         "symfony/dependency-injection": "<5.4",
         "symfony/dotenv": "<5.4",
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index c8f1ebd2b1635..f147a644fa422 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -2155,7 +2155,7 @@ private function getExpressionLanguage(): ExpressionLanguage
     {
         if (!isset($this->expressionLanguage)) {
             if (!class_exists(\Symfony\Component\ExpressionLanguage\ExpressionLanguage::class)) {
-                throw new LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
+                throw new LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed. Try running "composer require symfony/expression-language".');
             }
             $providers = $this->container->getExpressionLanguageProviders();
             $this->expressionLanguage = new ExpressionLanguage(null, $providers, function ($arg) {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
index 82789ae7ee52d..802b49a466bab 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -45,7 +45,7 @@ class YamlDumper extends Dumper
     public function dump(array $options = []): string
     {
         if (!class_exists(YmlDumper::class)) {
-            throw new LogicException('Unable to dump the container as the Symfony Yaml Component is not installed.');
+            throw new LogicException('Unable to dump the container as the Symfony Yaml Component is not installed. Try running "composer require symfony/yaml".');
         }
 
         $this->dumper ??= new YmlDumper();
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 61bf6b0f7ef1c..62acf55404dbf 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -759,7 +759,7 @@ private function parseCallable(mixed $callable, string $parameter, string $id, s
     protected function loadFile(string $file): ?array
     {
         if (!class_exists(\Symfony\Component\Yaml\Parser::class)) {
-            throw new RuntimeException('Unable to load YAML config files as the Symfony Yaml Component is not installed.');
+            throw new RuntimeException('Unable to load YAML config files as the Symfony Yaml Component is not installed. Try running "composer require symfony/yaml".');
         }
 
         if (!stream_is_local($file)) {
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index 1b2a5150d58da..e0e44e38da5d0 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -27,12 +27,6 @@
         "symfony/config": "^6.1",
         "symfony/expression-language": "^5.4|^6.0"
     },
-    "suggest": {
-        "symfony/yaml": "",
-        "symfony/config": "",
-        "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
-        "symfony/expression-language": "For using expressions in service container configuration"
-    },
     "conflict": {
         "ext-psr": "<1.1|>=2",
         "symfony/config": "<6.1",
diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json
index 7915eb1b8a71e..5de7d32c5d687 100644
--- a/src/Symfony/Component/DomCrawler/composer.json
+++ b/src/Symfony/Component/DomCrawler/composer.json
@@ -24,9 +24,6 @@
     "require-dev": {
         "symfony/css-selector": "^5.4|^6.0"
     },
-    "suggest": {
-        "symfony/css-selector": ""
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\DomCrawler\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
index 2a8b4412c0282..7d2fdfe00a182 100644
--- a/src/Symfony/Component/Dotenv/Dotenv.php
+++ b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -443,7 +443,7 @@ private function resolveCommands(string $value, array $loadedVars): string
             }
 
             if (!class_exists(Process::class)) {
-                throw new \LogicException('Resolving commands requires the Symfony Process component.');
+                throw new \LogicException('Resolving commands requires the Symfony Process component. Try running "composer require symfony/process".');
             }
 
             $process = Process::fromShellCommandline('echo '.$matches[0]);
diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json
index 925a92028a0ef..287037822d04d 100644
--- a/src/Symfony/Component/EventDispatcher/composer.json
+++ b/src/Symfony/Component/EventDispatcher/composer.json
@@ -37,10 +37,6 @@
         "psr/event-dispatcher-implementation": "1.0",
         "symfony/event-dispatcher-implementation": "2.0|3.0"
     },
-    "suggest": {
-        "symfony/dependency-injection": "",
-        "symfony/http-kernel": ""
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
index df506d699bbf7..1401929459a35 100644
--- a/src/Symfony/Component/Form/composer.json
+++ b/src/Symfony/Component/Form/composer.json
@@ -55,12 +55,6 @@
         "symfony/translation-contracts": "<2.5",
         "symfony/twig-bridge": "<6.3"
     },
-    "suggest": {
-        "symfony/validator": "For form validation.",
-        "symfony/security-core": "For hashing users passwords.",
-        "symfony/security-csrf": "For protecting forms against CSRF attacks.",
-        "symfony/twig-bridge": "For templating with Twig."
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Form\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php b/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
index b09c167cff448..fe65e920d92c0 100644
--- a/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
@@ -41,7 +41,7 @@ public function setExpression(ExpressionLanguage $language, Expression|string $e
     public function matches(Request $request): bool
     {
         if (!isset($this->language)) {
-            throw new \LogicException('Unable to match the request as the expression language is not available.');
+            throw new \LogicException('Unable to match the request as the expression language is not available. Try running "composer require symfony/expression-language".');
         }
 
         return $this->language->evaluate($this->expression, [
diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json
index 245cde53f4f3b..248bcbb163c39 100644
--- a/src/Symfony/Component/HttpFoundation/composer.json
+++ b/src/Symfony/Component/HttpFoundation/composer.json
@@ -34,9 +34,6 @@
     "conflict": {
         "symfony/cache": "<6.2"
     },
-    "suggest" : {
-        "symfony/mime": "To use the file extension guesser"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
index 2ebafd4ededf7..7ba8f3d5cad2c 100644
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@@ -68,12 +68,6 @@
         "symfony/validator": "<5.4",
         "twig/twig": "<2.13"
     },
-    "suggest": {
-        "symfony/browser-kit": "",
-        "symfony/config": "",
-        "symfony/console": "",
-        "symfony/dependency-injection": ""
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\HttpKernel\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php
index a1dc2515756ce..b0612b23808fe 100644
--- a/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php
@@ -74,7 +74,7 @@ public function __construct(Dsn $dsn, string $name = null, array $supported = []
         }
         $package = self::SCHEME_TO_PACKAGE_MAP[$provider] ?? null;
         if ($package && !class_exists($package['class'])) {
-            parent::__construct(sprintf('Unable to send emails via "%s" as the bridge is not installed; try running "composer require %s".', $provider, $package['package']));
+            parent::__construct(sprintf('Unable to send emails via "%s" as the bridge is not installed. Try running "composer require %s".', $provider, $package['package']));
 
             return;
         }
diff --git a/src/Symfony/Component/Mailer/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Mailer/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 53c283fb65c62..5dcf0f1bbfd7c 100644
--- a/src/Symfony/Component/Mailer/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Mailer/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -58,7 +58,7 @@ public function testMessageWhereSchemeIsPartOfSchemeToPackageMap(string $scheme,
         $dsn = new Dsn($scheme, 'localhost');
 
         $this->assertSame(
-            sprintf('Unable to send emails via "%s" as the bridge is not installed; try running "composer require %s".', $scheme, $package),
+            sprintf('Unable to send emails via "%s" as the bridge is not installed. Try running "composer require %s".', $scheme, $package),
             (new UnsupportedSchemeException($dsn))->getMessage()
         );
     }
diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json
index e544bea1b1a96..d70b4ed087b79 100644
--- a/src/Symfony/Component/Messenger/composer.json
+++ b/src/Symfony/Component/Messenger/composer.json
@@ -42,9 +42,6 @@
         "symfony/http-kernel": "<5.4",
         "symfony/serializer": "<5.4"
     },
-    "suggest": {
-        "enqueue/messenger-adapter": "For using the php-enqueue library as a transport."
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Messenger\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Mime/Address.php b/src/Symfony/Component/Mime/Address.php
index dabdc3ee32e37..ce57f77ee9b7c 100644
--- a/src/Symfony/Component/Mime/Address.php
+++ b/src/Symfony/Component/Mime/Address.php
@@ -42,7 +42,7 @@ final class Address
     public function __construct(string $address, string $name = '')
     {
         if (!class_exists(EmailValidator::class)) {
-            throw new LogicException(sprintf('The "%s" class cannot be used as it needs "%s"; try running "composer require egulias/email-validator".', __CLASS__, EmailValidator::class));
+            throw new LogicException(sprintf('The "%s" class cannot be used as it needs "%s". Try running "composer require egulias/email-validator".', __CLASS__, EmailValidator::class));
         }
 
         self::$validator ??= new EmailValidator();
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
index 49a9ce0f7c36e..5b8cb22b82682 100644
--- a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -285,7 +285,7 @@ public function __construct(Dsn $dsn, string $name = null, array $supported = []
         }
         $package = self::SCHEME_TO_PACKAGE_MAP[$provider] ?? null;
         if ($package && !class_exists($package['class'])) {
-            parent::__construct(sprintf('Unable to send notification via "%s" as the bridge is not installed; try running "composer require %s".', $provider, $package['package']));
+            parent::__construct(sprintf('Unable to send notification via "%s" as the bridge is not installed. Try running "composer require %s".', $provider, $package['package']));
 
             return;
         }
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 528c41b5435d9..74176133ee2ae 100644
--- a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -100,7 +100,7 @@ public function testMessageWhereSchemeIsPartOfSchemeToPackageMap(string $scheme,
         $dsn = new Dsn(sprintf('%s://localhost', $scheme));
 
         $this->assertSame(
-            sprintf('Unable to send notification via "%s" as the bridge is not installed; try running "composer require %s".', $scheme, $package),
+            sprintf('Unable to send notification via "%s" as the bridge is not installed. Try running "composer require %s".', $scheme, $package),
             (new UnsupportedSchemeException($dsn))->getMessage()
         );
     }
diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json
index 02a38ba7900cb..9ebea39817c2c 100644
--- a/src/Symfony/Component/PropertyAccess/composer.json
+++ b/src/Symfony/Component/PropertyAccess/composer.json
@@ -23,9 +23,6 @@
     "require-dev": {
         "symfony/cache": "^5.4|^6.0"
     },
-    "suggest": {
-        "psr/cache-implementation": "To cache access methods."
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\PropertyAccess\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json
index f2e7957a84d54..81ad458d73f6c 100644
--- a/src/Symfony/Component/PropertyInfo/composer.json
+++ b/src/Symfony/Component/PropertyInfo/composer.json
@@ -39,12 +39,6 @@
         "phpdocumentor/type-resolver": "<1.5.1",
         "symfony/dependency-injection": "<5.4"
     },
-    "suggest": {
-        "psr/cache-implementation": "To cache results",
-        "symfony/doctrine-bridge": "To use Doctrine metadata",
-        "phpdocumentor/reflection-docblock": "To use the PHPDoc",
-        "symfony/serializer": "To use Serializer metadata"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\PropertyInfo\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/RateLimiter/composer.json b/src/Symfony/Component/RateLimiter/composer.json
index 5eae321e8856f..fe260da91799e 100644
--- a/src/Symfony/Component/RateLimiter/composer.json
+++ b/src/Symfony/Component/RateLimiter/composer.json
@@ -23,9 +23,6 @@
         "psr/cache": "^1.0|^2.0|^3.0",
         "symfony/lock": "^5.4|^6.0"
     },
-    "suggest": {
-        "symfony/lock": "For preventing race conditions in rate limiters"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\RateLimiter\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
index af5969f771ca2..e92a5ea3d7823 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
@@ -447,7 +447,7 @@ private function getExpressionLanguage(): ExpressionLanguage
     {
         if (!isset($this->expressionLanguage)) {
             if (!class_exists(ExpressionLanguage::class)) {
-                throw new \LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
+                throw new \LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed. Try running "composer require symfony/expression-language".');
             }
             $this->expressionLanguage = new ExpressionLanguage(null, $this->expressionLanguageProviders);
         }
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
index a0b439a1f47e0..062be150b8941 100644
--- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
+++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -259,7 +259,7 @@ protected function getExpressionLanguage()
     {
         if (null === $this->expressionLanguage) {
             if (!class_exists(ExpressionLanguage::class)) {
-                throw new \LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
+                throw new \LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed. Try running "composer require symfony/expression-language".');
             }
             $this->expressionLanguage = new ExpressionLanguage(null, $this->expressionLanguageProviders);
         }
diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json
index b0de1fc8a8256..2405632b57d0a 100644
--- a/src/Symfony/Component/Routing/composer.json
+++ b/src/Symfony/Component/Routing/composer.json
@@ -33,12 +33,6 @@
         "symfony/dependency-injection": "<5.4",
         "symfony/yaml": "<5.4"
     },
-    "suggest": {
-        "symfony/http-foundation": "For using a Symfony Request object",
-        "symfony/config": "For using the all-in-one router or any loader",
-        "symfony/yaml": "For using the YAML loader",
-        "symfony/expression-language": "For using expression matching"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Routing\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
index 3a53bbc2c1a43..ad25fc4c3515a 100644
--- a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
@@ -36,7 +36,7 @@ public function __toString(): string
     public static function fromSpec(string $expression = '* * * * *'): self
     {
         if (!class_exists(CronExpression::class)) {
-            throw new LogicException(sprintf('You cannot use "%s" as the "cron expression" package is not installed; try running "composer require dragonmantank/cron-expression".', __CLASS__));
+            throw new LogicException(sprintf('You cannot use "%s" as the "cron expression" package is not installed. Try running "composer require dragonmantank/cron-expression".', __CLASS__));
         }
 
         return new self(new CronExpression($expression));
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
index 8613e703564c0..48dd96f948991 100644
--- a/src/Symfony/Component/Security/Core/composer.json
+++ b/src/Symfony/Component/Security/Core/composer.json
@@ -41,14 +41,6 @@
         "symfony/ldap": "<5.4",
         "symfony/validator": "<5.4"
     },
-    "suggest": {
-        "psr/container-implementation": "To instantiate the Security class",
-        "symfony/event-dispatcher": "",
-        "symfony/http-foundation": "",
-        "symfony/validator": "For using the user password constraint",
-        "symfony/expression-language": "For using the expression voter",
-        "symfony/ldap": "For using LDAP integration"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Security\\Core\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Security/Csrf/composer.json b/src/Symfony/Component/Security/Csrf/composer.json
index a4a595b4929bb..06380a6ec7612 100644
--- a/src/Symfony/Component/Security/Csrf/composer.json
+++ b/src/Symfony/Component/Security/Csrf/composer.json
@@ -25,9 +25,6 @@
     "conflict": {
         "symfony/http-foundation": "<5.4"
     },
-    "suggest": {
-        "symfony/http-foundation": "For using the class SessionTokenStorage."
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Security\\Csrf\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
index 6fdea560a67c5..b3c688147e9ea 100644
--- a/src/Symfony/Component/Security/Http/composer.json
+++ b/src/Symfony/Component/Security/Http/composer.json
@@ -42,10 +42,6 @@
         "symfony/security-bundle": "<5.4",
         "symfony/security-csrf": "<5.4"
     },
-    "suggest": {
-        "symfony/security-csrf": "For using tokens to protect authentication/logout attempts",
-        "symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Security\\Http\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
index c78f0246cf7bd..4c59800bdb88d 100644
--- a/src/Symfony/Component/Serializer/composer.json
+++ b/src/Symfony/Component/Serializer/composer.json
@@ -50,15 +50,6 @@
         "symfony/uid": "<5.4",
         "symfony/yaml": "<5.4"
     },
-    "suggest": {
-        "psr/cache-implementation": "For using the metadata cache.",
-        "symfony/property-info": "To deserialize relations.",
-        "symfony/yaml": "For using the default YAML mapping loader.",
-        "symfony/config": "For using the XML mapping loader.",
-        "symfony/property-access": "For using the ObjectNormalizer.",
-        "symfony/mime": "For using a MIME type guesser within the DataUriNormalizer.",
-        "symfony/var-exporter": "For using the metadata compiler."
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Serializer\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Templating/composer.json b/src/Symfony/Component/Templating/composer.json
index 8e7984cd05e98..cd402b2451e5a 100644
--- a/src/Symfony/Component/Templating/composer.json
+++ b/src/Symfony/Component/Templating/composer.json
@@ -22,9 +22,6 @@
     "require-dev": {
         "psr/log": "^1|^2|^3"
     },
-    "suggest": {
-        "psr/log-implementation": "For using debug logging in loaders"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Templating\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php
index 7fbaa8f04d08f..f09488e144e72 100644
--- a/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php
+++ b/src/Symfony/Component/Translation/Exception/UnsupportedSchemeException.php
@@ -39,7 +39,7 @@ public function __construct(Dsn $dsn, string $name = null, array $supported = []
         }
         $package = self::SCHEME_TO_PACKAGE_MAP[$provider] ?? null;
         if ($package && !class_exists($package['class'])) {
-            parent::__construct(sprintf('Unable to synchronize translations via "%s" as the provider is not installed; try running "composer require %s".', $provider, $package['package']));
+            parent::__construct(sprintf('Unable to synchronize translations via "%s" as the provider is not installed. Try running "composer require %s".', $provider, $package['package']));
 
             return;
         }
diff --git a/src/Symfony/Component/Translation/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Translation/Tests/Exception/UnsupportedSchemeExceptionTest.php
index 2eb022ec4bbaf..0fabbcb9cb76a 100644
--- a/src/Symfony/Component/Translation/Tests/Exception/UnsupportedSchemeExceptionTest.php
+++ b/src/Symfony/Component/Translation/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -42,7 +42,7 @@ public function testMessageWhereSchemeIsPartOfSchemeToPackageMap(string $scheme,
         $dsn = new Dsn(sprintf('%s://localhost', $scheme));
 
         $this->assertSame(
-            sprintf('Unable to synchronize translations via "%s" as the provider is not installed; try running "composer require %s".', $scheme, $package),
+            sprintf('Unable to synchronize translations via "%s" as the provider is not installed. Try running "composer require %s".', $scheme, $package),
             (new UnsupportedSchemeException($dsn))->getMessage()
         );
     }
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
index 9b22806bd7d7f..17edae6461c0d 100644
--- a/src/Symfony/Component/Translation/composer.json
+++ b/src/Symfony/Component/Translation/composer.json
@@ -48,12 +48,6 @@
     "provide": {
         "symfony/translation-implementation": "2.3|3.0"
     },
-    "suggest": {
-        "nikic/php-parser": "To use PhpAstExtractor",
-        "symfony/config": "",
-        "symfony/yaml": "",
-        "psr/log-implementation": "To use logging capability in translator"
-    },
     "autoload": {
         "files": [ "Resources/functions.php" ],
         "psr-4": { "Symfony\\Component\\Translation\\": "" },
diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparison.php b/src/Symfony/Component/Validator/Constraints/AbstractComparison.php
index a249d0ebddf20..d13031793fb6a 100644
--- a/src/Symfony/Component/Validator/Constraints/AbstractComparison.php
+++ b/src/Symfony/Component/Validator/Constraints/AbstractComparison.php
@@ -50,7 +50,7 @@ public function __construct(mixed $value = null, string $propertyPath = null, st
         }
 
         if (null !== $this->propertyPath && !class_exists(PropertyAccess::class)) {
-            throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "propertyPath" option.', static::class));
+            throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "propertyPath" option. Try running "composer require symfony/property-access".', static::class));
         }
     }
 
diff --git a/src/Symfony/Component/Validator/Constraints/Bic.php b/src/Symfony/Component/Validator/Constraints/Bic.php
index dad4258dc0b60..855ab348db8da 100644
--- a/src/Symfony/Component/Validator/Constraints/Bic.php
+++ b/src/Symfony/Component/Validator/Constraints/Bic.php
@@ -69,7 +69,7 @@ public function __construct(array $options = null, string $message = null, strin
         }
 
         if (null !== $this->ibanPropertyPath && !class_exists(PropertyAccess::class)) {
-            throw new LogicException(sprintf('The "symfony/property-access" component is required to use the "%s" constraint with the "ibanPropertyPath" option.', self::class));
+            throw new LogicException(sprintf('The "symfony/property-access" component is required to use the "%s" constraint with the "ibanPropertyPath" option. Try running "composer require symfony/property-access".', self::class));
         }
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php
index 54a4c140c9260..ca0ed331c1b9c 100644
--- a/src/Symfony/Component/Validator/Constraints/BicValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/BicValidator.php
@@ -159,7 +159,7 @@ private function getPropertyAccessor(): PropertyAccessor
     {
         if (null === $this->propertyAccessor) {
             if (!class_exists(PropertyAccess::class)) {
-                throw new LogicException('Unable to use property path as the Symfony PropertyAccess component is not installed.');
+                throw new LogicException('Unable to use property path as the Symfony PropertyAccess component is not installed. Try running "composer require symfony/property-access".');
             }
             $this->propertyAccessor = PropertyAccess::createPropertyAccessor();
         }
diff --git a/src/Symfony/Component/Validator/Constraints/Email.php b/src/Symfony/Component/Validator/Constraints/Email.php
index c7205ec1f00f6..46928894f3b83 100644
--- a/src/Symfony/Component/Validator/Constraints/Email.php
+++ b/src/Symfony/Component/Validator/Constraints/Email.php
@@ -78,7 +78,7 @@ public function __construct(
         }
 
         if (self::VALIDATION_MODE_STRICT === $this->mode && !class_exists(StrictEmailValidator::class)) {
-            throw new LogicException(sprintf('The "egulias/email-validator" component is required to use the "%s" constraint in strict mode.', __CLASS__));
+            throw new LogicException(sprintf('The "egulias/email-validator" component is required to use the "%s" constraint in strict mode. Try running "composer require egulias/email-validator".', __CLASS__));
         }
 
         if (null !== $this->normalizer && !\is_callable($this->normalizer)) {
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
index 90f7727c2294b..8c0ff7730855b 100644
--- a/src/Symfony/Component/Validator/Constraints/EmailValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -79,7 +79,7 @@ public function validate(mixed $value, Constraint $constraint)
 
         if (null === $constraint->mode) {
             if (Email::VALIDATION_MODE_STRICT === $this->defaultMode && !class_exists(EguliasEmailValidator::class)) {
-                throw new LogicException(sprintf('The "egulias/email-validator" component is required to make the "%s" constraint default to strict mode.', Email::class));
+                throw new LogicException(sprintf('The "egulias/email-validator" component is required to make the "%s" constraint default to strict mode. Try running "composer require egulias/email-validator".', Email::class));
             }
 
             $constraint->mode = $this->defaultMode;
diff --git a/src/Symfony/Component/Validator/Constraints/Expression.php b/src/Symfony/Component/Validator/Constraints/Expression.php
index 089b4f8903e57..cdf3e50067d5f 100644
--- a/src/Symfony/Component/Validator/Constraints/Expression.php
+++ b/src/Symfony/Component/Validator/Constraints/Expression.php
@@ -52,7 +52,7 @@ public function __construct(
         bool $negate = null,
     ) {
         if (!class_exists(ExpressionLanguage::class)) {
-            throw new LogicException(sprintf('The "symfony/expression-language" component is required to use the "%s" constraint.', __CLASS__));
+            throw new LogicException(sprintf('The "symfony/expression-language" component is required to use the "%s" constraint. Try running "composer require symfony/expression-language".', __CLASS__));
         }
 
         if (\is_array($expression)) {
diff --git a/src/Symfony/Component/Validator/Constraints/Range.php b/src/Symfony/Component/Validator/Constraints/Range.php
index ca5cba3c985ae..c4ae8b7648ccc 100644
--- a/src/Symfony/Component/Validator/Constraints/Range.php
+++ b/src/Symfony/Component/Validator/Constraints/Range.php
@@ -92,7 +92,7 @@ public function __construct(
         }
 
         if ((null !== $this->minPropertyPath || null !== $this->maxPropertyPath) && !class_exists(PropertyAccess::class)) {
-            throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "minPropertyPath" or "maxPropertyPath" option.', static::class));
+            throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "minPropertyPath" or "maxPropertyPath" option. Try running "composer require symfony/property-access".', static::class));
         }
 
         if (null !== $this->min && null !== $this->max && ($minMessage || $maxMessage)) {
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index 7e90c5238c127..6d87bca7c763d 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -54,18 +54,6 @@
         "symfony/translation": "<5.4",
         "symfony/yaml": "<5.4"
     },
-    "suggest": {
-        "psr/cache-implementation": "For using the mapping cache.",
-        "symfony/http-foundation": "",
-        "symfony/intl": "",
-        "symfony/translation": "For translating validation errors.",
-        "symfony/yaml": "",
-        "symfony/config": "",
-        "egulias/email-validator": "Strict (RFC compliant) email validation",
-        "symfony/property-access": "For accessing properties within comparison constraints",
-        "symfony/property-info": "To automatically add NotNull and Type constraints",
-        "symfony/expression-language": "For using the Expression validator and the ExpressionLanguageSyntax constraints"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Validator\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json
index 71ec64c0de917..0c81f0da2ad4d 100644
--- a/src/Symfony/Component/VarDumper/composer.json
+++ b/src/Symfony/Component/VarDumper/composer.json
@@ -30,11 +30,6 @@
         "phpunit/phpunit": "<5.4.3",
         "symfony/console": "<5.4"
     },
-    "suggest": {
-        "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
-        "ext-intl": "To show region name in time zone dump",
-        "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
-    },
     "autoload": {
         "files": [ "Resources/functions/dump.php" ],
         "psr-4": { "Symfony\\Component\\VarDumper\\": "" },
diff --git a/src/Symfony/Component/WebLink/composer.json b/src/Symfony/Component/WebLink/composer.json
index 34a2a35559718..cf13539db0758 100644
--- a/src/Symfony/Component/WebLink/composer.json
+++ b/src/Symfony/Component/WebLink/composer.json
@@ -22,9 +22,6 @@
         "php": ">=8.1",
         "psr/link": "^1.1|^2.0"
     },
-    "suggest": {
-        "symfony/http-kernel": ""
-    },
     "require-dev": {
         "symfony/http-kernel": "^5.4|^6.0"
     },
diff --git a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
index ab5ea511105c8..82fe1651522ca 100644
--- a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
+++ b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
@@ -33,7 +33,7 @@ protected function registerFunctions()
 
         $this->register('is_valid', fn ($object = 'null', $groups = 'null') => sprintf('0 === count($validator->validate(%s, null, %s))', $object, $groups), function (array $variables, $object = null, $groups = null) {
             if (!$variables['validator'] instanceof ValidatorInterface) {
-                throw new RuntimeException('"is_valid" cannot be used as the Validator component is not installed.');
+                throw new RuntimeException('"is_valid" cannot be used as the Validator component is not installed. Try running "composer require symfony/validator".');
             }
 
             $errors = $variables['validator']->validate($object, null, $groups);
diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json
index 839314bf51395..019776cef9dba 100644
--- a/src/Symfony/Component/Yaml/composer.json
+++ b/src/Symfony/Component/Yaml/composer.json
@@ -25,9 +25,6 @@
     "conflict": {
         "symfony/console": "<5.4"
     },
-    "suggest": {
-        "symfony/console": "For validating YAML files using the lint command"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Yaml\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json
index 770e20eaa8e7b..79a1d2dd1416e 100644
--- a/src/Symfony/Contracts/Cache/composer.json
+++ b/src/Symfony/Contracts/Cache/composer.json
@@ -19,9 +19,6 @@
         "php": ">=8.1",
         "psr/cache": "^3.0"
     },
-    "suggest": {
-        "symfony/cache-implementation": ""
-    },
     "autoload": {
         "psr-4": { "Symfony\\Contracts\\Cache\\": "" }
     },
diff --git a/src/Symfony/Contracts/EventDispatcher/composer.json b/src/Symfony/Contracts/EventDispatcher/composer.json
index 89d7cec96c7ae..4b6a136add482 100644
--- a/src/Symfony/Contracts/EventDispatcher/composer.json
+++ b/src/Symfony/Contracts/EventDispatcher/composer.json
@@ -19,9 +19,6 @@
         "php": ">=8.1",
         "psr/event-dispatcher": "^1"
     },
-    "suggest": {
-        "symfony/event-dispatcher-implementation": ""
-    },
     "autoload": {
         "psr-4": { "Symfony\\Contracts\\EventDispatcher\\": "" }
     },
diff --git a/src/Symfony/Contracts/HttpClient/composer.json b/src/Symfony/Contracts/HttpClient/composer.json
index 61eac1e2fae69..0c2102fd3cff6 100644
--- a/src/Symfony/Contracts/HttpClient/composer.json
+++ b/src/Symfony/Contracts/HttpClient/composer.json
@@ -18,9 +18,6 @@
     "require": {
         "php": ">=8.1"
     },
-    "suggest": {
-        "symfony/http-client-implementation": ""
-    },
     "autoload": {
         "psr-4": { "Symfony\\Contracts\\HttpClient\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json
index 36b0d95e77484..a2530e9aa9095 100644
--- a/src/Symfony/Contracts/Service/composer.json
+++ b/src/Symfony/Contracts/Service/composer.json
@@ -22,9 +22,6 @@
     "conflict": {
         "ext-psr": "<1.1|>=2"
     },
-    "suggest": {
-        "symfony/service-implementation": ""
-    },
     "autoload": {
         "psr-4": { "Symfony\\Contracts\\Service\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Contracts/Translation/composer.json b/src/Symfony/Contracts/Translation/composer.json
index 3454800a8e0bd..49e6dc7ffc919 100644
--- a/src/Symfony/Contracts/Translation/composer.json
+++ b/src/Symfony/Contracts/Translation/composer.json
@@ -18,9 +18,6 @@
     "require": {
         "php": ">=8.1"
     },
-    "suggest": {
-        "symfony/translation-implementation": ""
-    },
     "autoload": {
         "psr-4": { "Symfony\\Contracts\\Translation\\": "" },
         "exclude-from-classmap": [
diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json
index 031ad79a772ad..a165e44844c71 100644
--- a/src/Symfony/Contracts/composer.json
+++ b/src/Symfony/Contracts/composer.json
@@ -35,13 +35,6 @@
         "symfony/service-contracts": "self.version",
         "symfony/translation-contracts": "self.version"
     },
-    "suggest": {
-        "symfony/cache-implementation": "",
-        "symfony/event-dispatcher-implementation": "",
-        "symfony/http-client-implementation": "",
-        "symfony/service-implementation": "",
-        "symfony/translation-implementation": ""
-    },
     "autoload": {
         "psr-4": { "Symfony\\Contracts\\": "" },
         "files": [ "Deprecation/function.php" ],

From c9888ca809e3e13b68c07380bc7d4ec2141728f5 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 21 Apr 2023 16:42:22 +0200
Subject: [PATCH 443/475] [Webhook] Rename AbstractRequestParserTest

---
 .../Mailgun/Tests/Webhook/MailgunRequestParserTest.php     | 4 ++--
 .../Postmark/Tests/Webhook/PostmarkRequestParserTest.php   | 4 ++--
 .../Twilio/Tests/Webhook/TwilioRequestParserTest.php       | 4 ++--
 ...estParserTest.php => AbstractRequestParserTestCase.php} | 7 ++++++-
 4 files changed, 12 insertions(+), 7 deletions(-)
 rename src/Symfony/Component/Webhook/Test/{AbstractRequestParserTest.php => AbstractRequestParserTestCase.php} (93%)

diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/MailgunRequestParserTest.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/MailgunRequestParserTest.php
index d037dcc60b7f5..f9dc73a4c6e37 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/MailgunRequestParserTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Webhook/MailgunRequestParserTest.php
@@ -14,9 +14,9 @@
 use Symfony\Component\Mailer\Bridge\Mailgun\RemoteEvent\MailgunPayloadConverter;
 use Symfony\Component\Mailer\Bridge\Mailgun\Webhook\MailgunRequestParser;
 use Symfony\Component\Webhook\Client\RequestParserInterface;
-use Symfony\Component\Webhook\Test\AbstractRequestParserTest;
+use Symfony\Component\Webhook\Test\AbstractRequestParserTestCase;
 
-class MailgunRequestParserTest extends AbstractRequestParserTest
+class MailgunRequestParserTest extends AbstractRequestParserTestCase
 {
     protected function createRequestParser(): RequestParserInterface
     {
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/PostmarkRequestParserTest.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/PostmarkRequestParserTest.php
index 3a135060b440d..3048a1720ed7d 100644
--- a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/PostmarkRequestParserTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Webhook/PostmarkRequestParserTest.php
@@ -14,9 +14,9 @@
 use Symfony\Component\Mailer\Bridge\Postmark\RemoteEvent\PostmarkPayloadConverter;
 use Symfony\Component\Mailer\Bridge\Postmark\Webhook\PostmarkRequestParser;
 use Symfony\Component\Webhook\Client\RequestParserInterface;
-use Symfony\Component\Webhook\Test\AbstractRequestParserTest;
+use Symfony\Component\Webhook\Test\AbstractRequestParserTestCase;
 
-class PostmarkRequestParserTest extends AbstractRequestParserTest
+class PostmarkRequestParserTest extends AbstractRequestParserTestCase
 {
     protected function createRequestParser(): RequestParserInterface
     {
diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/TwilioRequestParserTest.php b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/TwilioRequestParserTest.php
index 41e0bd2d8ac42..8a9d2ed78a37c 100644
--- a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/TwilioRequestParserTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/Webhook/TwilioRequestParserTest.php
@@ -14,9 +14,9 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Notifier\Bridge\Twilio\Webhook\TwilioRequestParser;
 use Symfony\Component\Webhook\Client\RequestParserInterface;
-use Symfony\Component\Webhook\Test\AbstractRequestParserTest;
+use Symfony\Component\Webhook\Test\AbstractRequestParserTestCase;
 
-class TwilioRequestParserTest extends AbstractRequestParserTest
+class TwilioRequestParserTest extends AbstractRequestParserTestCase
 {
     protected function createRequestParser(): RequestParserInterface
     {
diff --git a/src/Symfony/Component/Webhook/Test/AbstractRequestParserTest.php b/src/Symfony/Component/Webhook/Test/AbstractRequestParserTestCase.php
similarity index 93%
rename from src/Symfony/Component/Webhook/Test/AbstractRequestParserTest.php
rename to src/Symfony/Component/Webhook/Test/AbstractRequestParserTestCase.php
index 6fa3760c3cf10..e8cafb1c975b7 100644
--- a/src/Symfony/Component/Webhook/Test/AbstractRequestParserTest.php
+++ b/src/Symfony/Component/Webhook/Test/AbstractRequestParserTestCase.php
@@ -16,7 +16,12 @@
 use Symfony\Component\RemoteEvent\RemoteEvent;
 use Symfony\Component\Webhook\Client\RequestParserInterface;
 
-abstract class AbstractRequestParserTest extends TestCase
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @experimental in 6.3
+ */
+abstract class AbstractRequestParserTestCase extends TestCase
 {
     /**
      * @dataProvider getPayloads

From e4d320310853497153b78158b43d6c3d2d32c9ae Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Fri, 21 Apr 2023 17:26:16 +0200
Subject: [PATCH 444/475] [BrowserKit, HttpClient] Minor updates in the default
 user agents

---
 UPGRADE-6.3.md                                   | 10 ++--------
 .../Component/BrowserKit/AbstractBrowser.php     |  2 +-
 .../BrowserKit/Tests/AbstractBrowserTest.php     | 12 ++++++------
 .../BrowserKit/Tests/HttpBrowserTest.php         |  2 +-
 .../Component/HttpClient/AmpHttpClient.php       |  2 +-
 .../Component/HttpClient/CurlHttpClient.php      |  2 +-
 .../Component/HttpClient/NativeHttpClient.php    |  2 +-
 .../HttpClientDataCollectorTest.php              | 16 ++++++++--------
 8 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index a05514396074c..9e56453437888 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -1,12 +1,6 @@
 UPGRADE FROM 6.2 to 6.3
 =======================
 
-BrowserKit
-----------
-
- * The default user agent has been renamed from `Symfony BrowserKit` to `SymfonyBrowserKit`
-   to comply with the RFC 9110 specification
-
 Console
 -------
 
@@ -75,8 +69,8 @@ HttpClient
 ----------
 
  * The default user agents have been renamed from `Symfony HttpClient/Amp`, `Symfony HttpClient/Curl`
-   and `Symfony HttpClient/Native` to `SymfonyHttpClient (Amp)`, `SymfonyHttpClient (Curl)`
-   and `SymfonyHttpClient (Native)` respectively to comply with the RFC 9110 specification
+   and `Symfony HttpClient/Native` to `Symfony HttpClient (Amp)`, `Symfony HttpClient (Curl)`
+   and `Symfony HttpClient (Native)` respectively to comply with the RFC 9110 specification
 
 HttpFoundation
 --------------
diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
index 3725a107d246f..c6014ca81eeac 100644
--- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
+++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
@@ -132,7 +132,7 @@ public function insulate(bool $insulated = true)
     public function setServerParameters(array $server)
     {
         $this->server = array_merge([
-            'HTTP_USER_AGENT' => 'SymfonyBrowserKit',
+            'HTTP_USER_AGENT' => 'Symfony BrowserKit',
         ], $server);
     }
 
diff --git a/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
index 1948f8c0a555d..dd449bea5e428 100644
--- a/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/AbstractBrowserTest.php
@@ -508,7 +508,7 @@ public function testFollowRedirectWithHeaders()
     {
         $headers = [
             'HTTP_HOST' => 'www.example.com',
-            'HTTP_USER_AGENT' => 'SymfonyBrowserKit',
+            'HTTP_USER_AGENT' => 'Symfony BrowserKit',
             'CONTENT_TYPE' => 'application/vnd.custom+xml',
             'HTTPS' => false,
         ];
@@ -535,7 +535,7 @@ public function testFollowRedirectWithPort()
     {
         $headers = [
             'HTTP_HOST' => 'www.example.com:8080',
-            'HTTP_USER_AGENT' => 'SymfonyBrowserKit',
+            'HTTP_USER_AGENT' => 'Symfony BrowserKit',
             'HTTPS' => false,
             'HTTP_REFERER' => 'http://www.example.com:8080/',
         ];
@@ -755,7 +755,7 @@ public function testGetServerParameter()
     {
         $client = $this->getBrowser();
         $this->assertSame('', $client->getServerParameter('HTTP_HOST'));
-        $this->assertSame('SymfonyBrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
+        $this->assertSame('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
         $this->assertSame('testvalue', $client->getServerParameter('testkey', 'testvalue'));
     }
 
@@ -764,7 +764,7 @@ public function testSetServerParameter()
         $client = $this->getBrowser();
 
         $this->assertSame('', $client->getServerParameter('HTTP_HOST'));
-        $this->assertSame('SymfonyBrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
+        $this->assertSame('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
 
         $client->setServerParameter('HTTP_HOST', 'testhost');
         $this->assertSame('testhost', $client->getServerParameter('HTTP_HOST'));
@@ -778,7 +778,7 @@ public function testSetServerParameterInRequest()
         $client = $this->getBrowser();
 
         $this->assertSame('', $client->getServerParameter('HTTP_HOST'));
-        $this->assertSame('SymfonyBrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
+        $this->assertSame('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
 
         $client->request('GET', 'https://www.example.com/https/www.example.com', [], [], [
             'HTTP_HOST' => 'testhost',
@@ -788,7 +788,7 @@ public function testSetServerParameterInRequest()
         ]);
 
         $this->assertSame('', $client->getServerParameter('HTTP_HOST'));
-        $this->assertSame('SymfonyBrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
+        $this->assertSame('Symfony BrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
 
         $this->assertSame('https://www.example.com/https/www.example.com', $client->getRequest()->getUri());
 
diff --git a/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
index c9f548fafd2a8..44f61289d8d6a 100644
--- a/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
@@ -42,7 +42,7 @@ public function testRequestHeaders(array $requestArguments, array $expectedArgum
 
     public static function validContentTypes()
     {
-        $defaultHeaders = ['user-agent' => 'SymfonyBrowserKit', 'host' => 'example.com'];
+        $defaultHeaders = ['user-agent' => 'Symfony BrowserKit', 'host' => 'example.com'];
         yield 'GET/HEAD' => [
             ['GET', 'http://example.com/', ['key' => 'value']],
             ['GET', 'http://example.com/', ['headers' => $defaultHeaders, 'body' => '', 'max_redirects' => 0]],
diff --git a/src/Symfony/Component/HttpClient/AmpHttpClient.php b/src/Symfony/Component/HttpClient/AmpHttpClient.php
index 29ee315637e87..94d8fa414ee45 100644
--- a/src/Symfony/Component/HttpClient/AmpHttpClient.php
+++ b/src/Symfony/Component/HttpClient/AmpHttpClient.php
@@ -98,7 +98,7 @@ public function request(string $method, string $url, array $options = []): Respo
         }
 
         if (!isset($options['normalized_headers']['user-agent'])) {
-            $options['headers'][] = 'User-Agent: SymfonyHttpClient (Amp)';
+            $options['headers'][] = 'User-Agent: Symfony HttpClient (Amp)';
         }
 
         if (0 < $options['max_duration']) {
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
index df8c6c886ce2b..5c19ed0bf1e69 100644
--- a/src/Symfony/Component/HttpClient/CurlHttpClient.php
+++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -93,7 +93,7 @@ public function request(string $method, string $url, array $options = []): Respo
         $url = implode('', $url);
 
         if (!isset($options['normalized_headers']['user-agent'])) {
-            $options['headers'][] = 'User-Agent: SymfonyHttpClient (Curl)';
+            $options['headers'][] = 'User-Agent: Symfony HttpClient (Curl)';
         }
 
         $curlopts = [
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
index 6999ae7406d23..e4a2b0c28c67e 100644
--- a/src/Symfony/Component/HttpClient/NativeHttpClient.php
+++ b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -191,7 +191,7 @@ public function request(string $method, string $url, array $options = []): Respo
         $this->logger?->info(sprintf('Request: "%s %s"', $method, implode('', $url)));
 
         if (!isset($options['normalized_headers']['user-agent'])) {
-            $options['headers'][] = 'User-Agent: SymfonyHttpClient (Native)';
+            $options['headers'][] = 'User-Agent: Symfony HttpClient (Native)';
         }
 
         if (0 < $options['max_duration']) {
diff --git a/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php b/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
index 99c93c14def3a..7a9f22cab1e9e 100755
--- a/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
@@ -193,7 +193,7 @@ public static function provideCurlRequests(): iterable
   --url %1$shttp://localhost:8057/json%1$s \\
   --header %1$sAccept: */*%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s',
+  --header %1$sUser-Agent: Symfony HttpClient (Native)%1$s',
         ];
         yield 'GET with base uri' => [
             [
@@ -209,7 +209,7 @@ public static function provideCurlRequests(): iterable
   --url %1$shttp://localhost:8057/json/1%1$s \\
   --header %1$sAccept: */*%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s',
+  --header %1$sUser-Agent: Symfony HttpClient (Native)%1$s',
         ];
         yield 'GET with resolve' => [
             [
@@ -229,7 +229,7 @@ public static function provideCurlRequests(): iterable
   --url %1$shttp://localhost:8057/json%1$s \\
   --header %1$sAccept: */*%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s',
+  --header %1$sUser-Agent: Symfony HttpClient (Native)%1$s',
         ];
         yield 'POST with string body' => [
             [
@@ -247,7 +247,7 @@ public static function provideCurlRequests(): iterable
   --header %1$sContent-Length: 9%1$s \\
   --header %1$sContent-Type: application/x-www-form-urlencoded%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s \\
+  --header %1$sUser-Agent: Symfony HttpClient (Native)%1$s \\
   --data %1$sfoobarbaz%1$s',
         ];
         yield 'POST with array body' => [
@@ -285,7 +285,7 @@ public function __toString(): string
   --header %1$sContent-Type: application/x-www-form-urlencoded%1$s \\
   --header %1$sContent-Length: 211%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s \\
+  --header %1$sUser-Agent: Symfony HttpClient (Native)%1$s \\
   --data %1$sfoo=fooval%1$s --data %1$sbar=barval%1$s --data %1$sbaz=bazval%1$s --data %1$sfoobar[baz]=bazval%1$s --data %1$sfoobar[qux]=quxval%1$s --data %1$sbazqux[0]=bazquxval1%1$s --data %1$sbazqux[1]=bazquxval2%1$s --data %1$sobject[fooprop]=foopropval%1$s --data %1$sobject[barprop]=barpropval%1$s --data %1$stostring=tostringval%1$s',
         ];
 
@@ -312,7 +312,7 @@ public function __toString(): string
   --url %1$shttp://localhost:8057/?foo=fooval&bar=newbarval&foobar[baz]=bazval&foobar[qux]=quxval&bazqux[0]=bazquxval1&bazqux[1]=bazquxval2%1$s \\
   --header %1$sAccept: */*%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s',
+  --header %1$sUser-Agent: Symfony HttpClient (Native)%1$s',
             ];
             yield 'POST with json' => [
                 [
@@ -336,7 +336,7 @@ public function __toString(): string
   --header %1$sAccept: */*%1$s \\
   --header %1$sContent-Length: 120%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s \\
+  --header %1$sUser-Agent: Symfony HttpClient (Native)%1$s \\
   --data %1$s{"foo":{"bar":"baz","qux":[1.1,1.0],"fred":["\u003Cfoo\u003E","\u0027bar\u0027","\u0022baz\u0022","\u0026blong\u0026"]}}%1$s',
             ];
         }
@@ -368,7 +368,7 @@ public function testItDoesNotFollowRedirectionsWhenGeneratingCurlCommands()
   --header %1$sAccept: */*%1$s \\
   --header %1$sAuthorization: Basic Zm9vOmJhcg==%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
-  --header %1$sUser-Agent: SymfonyHttpClient (Native)%1$s', '\\' === \DIRECTORY_SEPARATOR ? '"' : "'"), $curlCommand
+  --header %1$sUser-Agent: Symfony HttpClient (Native)%1$s', '\\' === \DIRECTORY_SEPARATOR ? '"' : "'"), $curlCommand
         );
     }
 

From 43d028d5ba2bc6cd4dd28ea1ac6823437572a1b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?THERAGE=20K=C3=A9vin?= <therage.kevin@gmail.com>
Date: Mon, 27 Mar 2023 14:28:52 +0200
Subject: [PATCH 445/475] [Serializer] Fix MissingConstructorArgumentsException
 returning missing argument one by one

---
 UPGRADE-6.3.md                                |  1 -
 src/Symfony/Component/Serializer/CHANGELOG.md |  1 -
 .../MissingConstructorArgumentException.php   | 41 -------------------
 .../MissingConstructorArgumentsException.php  | 34 +++++++--------
 .../Normalizer/AbstractNormalizer.php         | 35 +++++++++-------
 .../Normalizer/AbstractObjectNormalizer.php   | 14 +++----
 .../ConstructorArgumentsTestTrait.php         | 11 +++--
 7 files changed, 49 insertions(+), 88 deletions(-)
 delete mode 100644 src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentException.php

diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
index a05514396074c..5600e12873e47 100644
--- a/UPGRADE-6.3.md
+++ b/UPGRADE-6.3.md
@@ -133,7 +133,6 @@ Validator
 Serializer
 ----------
 
- * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
  * Deprecate `CacheableSupportsMethodInterface` in favor of the new `getSupportedTypes(?string $format)` methods
  * The following Normalizer classes will become final in 7.0:
    * `ConstraintViolationListNormalizer`
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
index 7c2dd31143551..692226968f2c0 100644
--- a/src/Symfony/Component/Serializer/CHANGELOG.md
+++ b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -9,7 +9,6 @@ CHANGELOG
  * Add `UnsupportedFormatException` which is thrown when there is no decoder for a given format
  * Add method `getSupportedTypes(?string $format)` to `NormalizerInterface` and `DenormalizerInterface`
  * Make `ProblemNormalizer` give details about `ValidationFailedException` and `PartialDenormalizationException`
- * Deprecate `MissingConstructorArgumentsException` in favor of `MissingConstructorArgumentException`
  * Deprecate `CacheableSupportsMethodInterface` in favor of the new `getSupportedTypes(?string $format)` methods
  * The following Normalizer classes will become final in 7.0:
    * `ConstraintViolationListNormalizer`
diff --git a/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentException.php b/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentException.php
deleted file mode 100644
index 3fdfaf605869e..0000000000000
--- a/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentException.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Serializer\Exception;
-
-class MissingConstructorArgumentException extends MissingConstructorArgumentsException
-{
-    private string $class;
-    private string $missingArgument;
-
-    /**
-     * @param class-string $class
-     */
-    public function __construct(string $class, string $missingArgument, int $code = 0, \Throwable $previous = null)
-    {
-        $this->class = $class;
-        $this->missingArgument = $missingArgument;
-
-        $message = sprintf('Cannot create an instance of "%s" from serialized data because its constructor requires parameter "%s" to be present.', $class, $missingArgument);
-
-        parent::__construct($message, $code, $previous, [$missingArgument]);
-    }
-
-    public function getClass(): string
-    {
-        return $this->class;
-    }
-
-    public function getMissingArgument(): string
-    {
-        return $this->missingArgument;
-    }
-}
diff --git a/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentsException.php b/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentsException.php
index a5a71d00cf62a..ee8fcb5dc22e5 100644
--- a/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentsException.php
+++ b/src/Symfony/Component/Serializer/Exception/MissingConstructorArgumentsException.php
@@ -12,37 +12,37 @@
 namespace Symfony\Component\Serializer\Exception;
 
 /**
- * @deprecated since Symfony 6.3, use {@see MissingConstructorArgumentException} instead
- *
  * @author Maxime VEBER <maxime.veber@nekland.fr>
  */
 class MissingConstructorArgumentsException extends RuntimeException
 {
     /**
-     * @var string[]
+     * @param string[]          $missingArguments
+     * @param class-string|null $class
      */
-    private $missingArguments;
-
-    public function __construct(string $message, int $code = 0, \Throwable $previous = null, array $missingArguments = [])
-    {
-        if (!$this instanceof MissingConstructorArgumentException) {
-            trigger_deprecation('symfony/serializer', '6.3', 'The "%s" class is deprecated, use "%s" instead.', __CLASS__, MissingConstructorArgumentException::class);
-        }
-
-        $this->missingArguments = $missingArguments;
-
+    public function __construct(
+        string $message,
+        int $code = 0,
+        \Throwable $previous = null,
+        private array $missingArguments = [],
+        private ?string $class = null,
+    ) {
         parent::__construct($message, $code, $previous);
     }
 
     /**
-     * @deprecated since Symfony 6.3, use {@see MissingConstructorArgumentException::getMissingArgument()} instead
-     *
      * @return string[]
      */
     public function getMissingConstructorArguments(): array
     {
-        trigger_deprecation('symfony/serializer', '6.3', 'The "%s()" method is deprecated, use "%s::getMissingArgument()" instead.', __METHOD__, MissingConstructorArgumentException::class);
-
         return $this->missingArguments;
     }
+
+    /**
+     * @return class-string|null
+     */
+    public function getClass(): ?string
+    {
+        return $this->class;
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer
10000
/AbstractNormalizer.php
index 856aefbe985bc..61b14a1a8008f 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Serializer\Exception\CircularReferenceException;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Exception\MissingConstructorArgumentException;
+use Symfony\Component\Serializer\Exception\MissingConstructorArgumentsException;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Exception\RuntimeException;
 use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
@@ -313,7 +313,7 @@ protected function getConstructor(array &$data, string $class, array &$context,
      * @return object
      *
      * @throws RuntimeException
-     * @throws MissingConstructorArgumentException
+     * @throws MissingConstructorArgumentsException
      */
     protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null)
     {
@@ -332,7 +332,7 @@ protected function instantiateObject(array &$data, string $class, array &$contex
             }
 
             $constructorParameters = $constructor->getParameters();
-
+            $missingConstructorArguments = [];
             $params = [];
             foreach ($constructorParameters as $constructorParameter) {
                 $paramName = $constructorParameter->name;
@@ -386,7 +386,8 @@ protected function instantiateObject(array &$data, string $class, array &$contex
                     $params[] = null;
                 } else {
                     if (!isset($context['not_normalizable_value_exceptions'])) {
-                        throw new MissingConstructorArgumentException($class, $constructorParameter->name);
+                        $missingConstructorArguments[] = $constructorParameter->name;
+                        continue;
                     }
 
                     $exception = NotNormalizableValueException::createForUnexpectedDataType(
@@ -402,19 +403,23 @@ protected function instantiateObject(array &$data, string $class, array &$contex
                 }
             }
 
-            if ($constructor->isConstructor()) {
-                try {
-                    return $reflectionClass->newInstanceArgs($params);
-                } catch (\TypeError $e) {
-                    if (!isset($context['not_normalizable_value_exceptions'])) {
-                        throw $e;
-                    }
+            if ($missingConstructorArguments) {
+                throw new MissingConstructorArgumentsException(sprintf('Cannot create an instance of "%s" from serialized data because its constructor requires the following parameters to be present : "$%s".', $class, implode('", "$', $missingConstructorArguments)), 0, null, $missingConstructorArguments, $class);
+            }
 
-                    return $reflectionClass->newInstanceWithoutConstructor();
-                }
-            } else {
+            if (!$constructor->isConstructor()) {
                 return $constructor->invokeArgs(null, $params);
             }
+
+            try {
+                return $reflectionClass->newInstanceArgs($params);
+            } catch (\TypeError $e) {
+                if (!isset($context['not_normalizable_value_exceptions'])) {
+                    throw $e;
+                }
+
+                return $reflectionClass->newInstanceWithoutConstructor();
+            }
         }
 
         return new $class();
@@ -438,7 +443,7 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara
             }
         } catch (\ReflectionException $e) {
             throw new RuntimeException(sprintf('Could not determine the class of the parameter "%s".', $parameterName), 0, $e);
-        } catch (MissingConstructorArgumentException $e) {
+        } catch (MissingConstructorArgumentsException $e) {
             if (!$parameter->getType()->allowsNull()) {
                 throw $e;
             }
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 88e3c3ea120bd..16b2bb70af3fc 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -22,7 +22,7 @@
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
 use Symfony\Component\Serializer\Exception\ExtraAttributesException;
 use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Exception\MissingConstructorArgumentException;
+use Symfony\Component\Serializer\Exception\MissingConstructorArgumentsException;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
@@ -419,7 +419,7 @@ abstract protected function setAttributeValue(object $object, string $attribute,
      *
      * @throws NotNormalizableValueException
      * @throws ExtraAttributesException
-     * @throws MissingConstructorArgumentException
+     * @throws MissingConstructorArgumentsException
      * @throws LogicException
      */
     private function validateAndDenormalize(array $types, string $currentClass, string $attribute, mixed $data, ?string $format, array $context): mixed
@@ -427,7 +427,7 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
         $expectedTypes = [];
         $isUnionType = \count($types) > 1;
         $extraAttributesException = null;
-        $missingConstructorArgumentException = null;
+        $missingConstructorArgumentsException = null;
         foreach ($types as $type) {
             if (null === $data && $type->isNullable()) {
                 return null;
@@ -567,12 +567,12 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
                 }
 
                 $extraAttributesException ??= $e;
-            } catch (MissingConstructorArgumentException $e) {
+            } catch (MissingConstructorArgumentsException $e) {
                 if (!$isUnionType) {
                     throw $e;
                 }
 
-                $missingConstructorArgumentException ??= $e;
+                $missingConstructorArgumentsException ??= $e;
             }
         }
 
@@ -580,8 +580,8 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
             throw $extraAttributesException;
         }
 
-        if ($missingConstructorArgumentException) {
-            throw $missingConstructorArgumentException;
+        if ($missingConstructorArgumentsException) {
+            throw $missingConstructorArgumentsException;
         }
 
         if ($context[self::DISABLE_TYPE_ENFORCEMENT] ?? $this->defaultContext[self::DISABLE_TYPE_ENFORCEMENT] ?? false) {
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php
index 9489136be2cb9..928ded512e935 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ConstructorArgumentsTestTrait.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Serializer\Tests\Normalizer\Features;
 
-use Symfony\Component\Serializer\Exception\MissingConstructorArgumentException;
+use Symfony\Component\Serializer\Exception\MissingConstructorArgumentsException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Tests\Fixtures\NotSerializedConstructorArgumentDummy;
 
@@ -62,14 +62,13 @@ public function testConstructorWithMissingData()
         ];
 
         $normalizer = $this->getDenormalizerForConstructArguments();
-
         try {
             $normalizer->denormalize($data, ConstructorArgumentsObject::class);
-            self::fail(sprintf('Failed asserting that exception of type "%s" is thrown.', MissingConstructorArgumentException::class));
-        } catch (MissingConstructorArgumentException $e) {
-            self::assertSame(sprintf('Cannot create an instance of "%s" from serialized data because its constructor requires parameter "bar" to be present.', ConstructorArgumentsObject::class), $e->getMessage());
+            self::fail(sprintf('Failed asserting that exception of type "%s" is thrown.', MissingConstructorArgumentsException::class));
+        } catch (MissingConstructorArgumentsException $e) {
+            self::assertSame(sprintf('Cannot create an instance of "%s" from serialized data because its constructor requires the following parameters to be present : "$bar", "$baz".', ConstructorArgumentsObject::class), $e->getMessage());
             self::assertSame(ConstructorArgumentsObject::class, $e->getClass());
-            self::assertSame('bar', $e->getMissingArgument());
+            self::assertSame(['bar', 'baz'], $e->getMissingConstructorArguments());
         }
     }
 }

From aea85f5bf7f6250a64b0cbef600e9778a28a8542 Mon Sep 17 00:00:00 2001
From: andreyserdjuk <3006342+andreyserdjuk@users.noreply.github.com>
Date: Fri, 21 Apr 2023 12:55:21 +0200
Subject: [PATCH 446/475] [DependencyInjection] More predictable
 EnvVarProcessor CSV empty string parsing

---
 src/Symfony/Component/DependencyInjection/EnvVarProcessor.php   | 2 +-
 .../Component/DependencyInjection/Tests/EnvVarProcessorTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
index 44b8a312e2994..2e0922ef18db1 100644
--- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -313,7 +313,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): mixed
         }
 
         if ('csv' === $prefix) {
-            return str_getcsv($env, ',', '"', '');
+            return '' === $env ? [] : str_getcsv($env, ',', '"', '');
         }
 
         if ('trim' === $prefix) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
index 2992b1c6951e2..c3d25cf36faec 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -714,7 +714,7 @@ public static function validCsv()
 CSV;
 
         return [
-            ['', [null]],
+            ['', []],
             [',', ['', '']],
             ['1', ['1']],
             ['1,2," 3 "', ['1', '2', ' 3 ']],

From 0ce4e854f754eeee7905932ec3ae861d95c57af3 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Fri, 21 Apr 2023 16:55:28 -0400
Subject: [PATCH 447/475] [Scheduler] add basic `SchedulerTest`

---
 .../Scheduler/Tests/SchedulerTest.php         | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 src/Symfony/Component/Scheduler/Tests/SchedulerTest.php

diff --git a/src/Symfony/Component/Scheduler/Tests/SchedulerTest.php b/src/Symfony/Component/Scheduler/Tests/SchedulerTest.php
new file mode 100644
index 0000000000000..9f5a96cd43397
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/SchedulerTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Scheduler\RecurringMessage;
+use Symfony\Component\Scheduler\Schedule;
+use Symfony\Component\Scheduler\Scheduler;
+
+class SchedulerTest extends TestCase
+{
+    public function testCanRunAndStop()
+    {
+        $handler = new Handler();
+        $schedule = (new Schedule())->add(RecurringMessage::every('1 millisecond', new Message()));
+        $scheduler = new Scheduler([Message::class => $handler], [$schedule]);
+        $handler->scheduler = $scheduler;
+
+        $scheduler->run(['sleep' => 0]);
+
+        $this->assertSame(3, $handler->count);
+    }
+}
+
+class Message
+{
+}
+
+class Handler
+{
+    public int $count = 0;
+    public Scheduler $scheduler;
+
+    public function __invoke(Message $message): void
+    {
+        if (3 === ++$this->count) {
+            $this->scheduler->stop();
+        }
+    }
+}

From 29ea86040d5d47f5e5814e393f849a6ccdb33532 Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Sat, 18 Feb 2023 13:05:04 +0100
Subject: [PATCH 448/475] Add CI check ensuring interfaces have return types

---
 .github/expected-missing-return-types.diff    | 212 +++++++++++++++---
 .github/patch-types.php                       |  34 ++-
 .github/workflows/unit-tests.yml              |   5 +
 .../Console/Output/OutputInterface.php        |   2 +
 .../ViolationMapperInterface.php              |   2 +
 .../Compiler/BundleCompilerInterface.php      |   2 +
 .../Bundle/Writer/BundleWriterInterface.php   |   3 +
 .../Ldap/Adapter/ConnectionInterface.php      |   2 +
 src/Symfony/Component/Ldap/LdapInterface.php  |   2 +
 .../Component/Mime/Header/HeaderInterface.php |  11 +
 .../PropertyAccessorInterface.php             |   2 +
 .../ConfigurableRequirementsInterface.php     |   2 +
 .../Routing/RequestContextAwareInterface.php  |   2 +
 .../Normalizer/DenormalizableInterface.php    |   2 +
 .../Serializer/Tests/Fixtures/Dummy.php       |   2 +-
 .../Templating/Helper/HelperInterface.php     |   2 +
 .../Templating/StreamingEngineInterface.php   |   2 +
 .../Templating/Tests/DelegatingEngineTest.php |   7 +-
 .../CatalogueMetadataAwareInterface.php       |   4 +
 19 files changed, 264 insertions(+), 36 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index 2e89221b1e90a..92a388e798b4c 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -278,7 +278,7 @@ index bf8a5feb9f..e346c8b17c 100644
      {
          $this->registry->getManagerForClass($object::class)?->initializeObject($object);
 diff --git a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
-index 9975c46cba..c7bbad69b2 100644
+index 5210e8eefa..0e842abb76 100644
 --- a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
 +++ b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
 @@ -54,5 +54,5 @@ class ServerLogCommand extends Command
@@ -717,7 +717,7 @@ index 3ab28a1f81..2ace764149 100644
      {
          $loader->load(function (ContainerBuilder $container) use ($loader) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
-index 1f484c1b84..67dba6fc40 100644
+index 0379be8f5b..568f30f72d 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
 @@ -77,5 +77,5 @@ class KernelBrowser extends HttpKernelBrowser
@@ -1195,7 +1195,7 @@ index cffea43c49..0645fbd756 100644
      {
          $this->packages[$name] = $package;
 diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
-index fd3ab66f41..56dc6251b8 100644
+index c6014ca81e..c0d4cf84bb 100644
 --- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 +++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 @@ -67,5 +67,5 @@ abstract class AbstractBrowser
@@ -1395,7 +1395,7 @@ index dfffb3bd13..e4384af6cc 100644
      {
          // connect if we are not yet
 diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
-index d104530c0d..a1845d3ae9 100644
+index 6e4e1dffa3..bab8a91ca4 100644
 --- a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
 +++ b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
 @@ -58,5 +58,5 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
@@ -3093,7 +3093,7 @@ index 29761351f9..0a599c6042 100644
      {
          if (!is_iterable($messages)) {
 diff --git a/src/Symfony/Component/Console/Output/OutputInterface.php b/src/Symfony/Component/Console/Output/OutputInterface.php
-index f5ab9182f6..c4b59f487a 100644
+index fb1557720f..8b31dee20c 100644
 --- a/src/Symfony/Component/Console/Output/OutputInterface.php
 +++ b/src/Symfony/Component/Console/Output/OutputInterface.php
 @@ -40,5 +40,5 @@ interface OutputInterface
@@ -3117,7 +3117,14 @@ index f5ab9182f6..c4b59f487a 100644
 +    public function setVerbosity(int $level): void;
  
      /**
-@@ -97,5 +97,5 @@ interface OutputInterface
+@@ -89,5 +89,5 @@ interface OutputInterface
+      * @return void
+      */
+-    public function setDecorated(bool $decorated);
++    public function setDecorated(bool $decorated): void;
+ 
+     /**
+@@ -99,5 +99,5 @@ interface OutputInterface
       * @return void
       */
 -    public function setFormatter(OutputFormatterInterface $formatter);
@@ -6641,6 +6648,16 @@ index 2f2ccefd30..689a6d5cab 100644
 +    public function mapViolation(ConstraintViolation $violation, FormInterface $form, bool $allowNonSynchronized = false): void
      {
          $this->allowNonSynchronized = $allowNonSynchronized;
+diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
+index a72d41df9e..6a58a1bddc 100644
+--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
++++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
+@@ -28,4 +28,4 @@ interface ViolationMapperInterface
+      * @return void
+      */
+-    public function mapViolation(ConstraintViolation $violation, FormInterface $form, bool $allowNonSynchronized = false);
++    public function mapViolation(ConstraintViolation $violation, FormInterface $form, bool $allowNonSynchronized = false): void;
+ }
 diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
 index 9fed3d1a0a..5cd4eb5f16 100644
 --- a/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -6981,7 +6998,7 @@ index d29b1a34e7..1779a080d0 100644
      {
          self::$trustXSendfileTypeHeader = true;
 diff --git a/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php b/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
-index b09c167cff..93d1a8cac5 100644
+index fe65e920d9..6a78e6e779 100644
 --- a/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
 +++ b/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
 @@ -33,5 +33,5 @@ class ExpressionRequestMatcher extends RequestMatcher
@@ -8848,6 +8865,26 @@ index 341ef73c4d..805391d171 100644
 -    public function terminate(Request $request, Response $response);
 +    public function terminate(Request $request, Response $response): void;
  }
+diff --git a/src/Symfony/Component/Intl/Data/Bundle/Compiler/BundleCompilerInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Compiler/BundleCompilerInterface.php
+index db2c6b8bbc..16f0cc14c5 100644
+--- a/src/Symfony/Component/Intl/Data/Bundle/Compiler/BundleCompilerInterface.php
++++ b/src/Symfony/Component/Intl/Data/Bundle/Compiler/BundleCompilerInterface.php
+@@ -27,4 +27,4 @@ interface BundleCompilerInterface
+      * @return void
+      */
+-    public function compile(string $sourcePath, string $targetDir);
++    public function compile(string $sourcePath, string $targetDir): void;
+ }
+diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php
+index cb9e76fd09..fc86193476 100644
+--- a/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php
++++ b/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php
+@@ -24,4 +24,4 @@ interface BundleWriterInterface
+      * @return void
+      */
+-    public function write(string $path, string $locale, mixed $data);
++    public function write(string $path, string $locale, mixed $data): void;
+ }
 diff --git a/src/Symfony/Component/Intl/Util/IntlTestHelper.php b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
 index d22f2e6953..1dcdcdf4ea 100644
 --- a/src/Symfony/Component/Intl/Util/IntlTestHelper.php
@@ -8891,6 +8928,16 @@ index 7c85f09258..369b3fb239 100644
 +    protected function configureOptions(OptionsResolver $resolver): void
      {
          $resolver->setDefaults([
+diff --git a/src/Symfony/Component/Ldap/Adapter/ConnectionInterface.php b/src/Symfony/Component/Ldap/Adapter/ConnectionInterface.php
+index 93d13c831d..5701c2ff67 100644
+--- a/src/Symfony/Component/Ldap/Adapter/ConnectionInterface.php
++++ b/src/Symfony/Component/Ldap/Adapter/ConnectionInterface.php
+@@ -35,4 +35,4 @@ interface ConnectionInterface
+      * @return void
+      */
+-    public function bind(string $dn = null, #[\SensitiveParameter] string $password = null);
++    public function bind(string $dn = null, #[\SensitiveParameter] string $password = null): void;
+ }
 diff --git a/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php b/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
 index 9b356b10b2..68942b21dc 100644
 --- a/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
@@ -9039,6 +9086,17 @@ index 0d008d8ecd..96b07b4845 100644
 +    public function removeAttribute(string $name): void
      {
          unset($this->attributes[$name]);
+diff --git a/src/Symfony/Component/Ldap/LdapInterface.php b/src/Symfony/Component/Ldap/LdapInterface.php
+index 60628cd74e..49fd392918 100644
+--- a/src/Symfony/Component/Ldap/LdapInterface.php
++++ b/src/Symfony/Component/Ldap/LdapInterface.php
+@@ -33,5 +33,5 @@ interface LdapInterface
+      * @return void
+      */
+-    public function bind(string $dn = null, #[\SensitiveParameter] string $password = null);
++    public function bind(string $dn = null, #[\SensitiveParameter] string $password = null): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php b/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php
 index 7e535ebde1..ebb3df9b2b 100644
 --- a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php
@@ -9753,6 +9811,38 @@ index 122281127a..8a400918a9 100644
 +    public function setMaxLineLength(int $lineLength): void
      {
          $this->lineLength = $lineLength;
+diff --git a/src/Symfony/Component/Mime/Header/HeaderInterface.php b/src/Symfony/Component/Mime/Header/HeaderInterface.php
+index 5bc4162c30..7a4e822fe1 100644
+--- a/src/Symfony/Component/Mime/Header/HeaderInterface.php
++++ b/src/Symfony/Component/Mime/Header/HeaderInterface.php
+@@ -26,5 +26,5 @@ interface HeaderInterface
+      * @return void
+      */
+-    public function setBody(mixed $body);
++    public function setBody(mixed $body): void;
+ 
+     /**
+@@ -38,5 +38,5 @@ interface HeaderInterface
+      * @return void
+      */
+-    public function setCharset(string $charset);
++    public function setCharset(string $charset): void;
+ 
+     public function getCharset(): ?string;
+@@ -45,5 +45,5 @@ interface HeaderInterface
+      * @return void
+      */
+-    public function setLanguage(string $lang);
++    public function setLanguage(string $lang): void;
+ 
+     public function getLanguage(): ?string;
+@@ -54,5 +54,5 @@ interface HeaderInterface
+      * @return void
+      */
+-    public function setMaxLineLength(int $lineLength);
++    public function setMaxLineLength(int $lineLength): void;
+ 
+     public function getMaxLineLength(): int;
 diff --git a/src/Symfony/Component/Mime/Header/UnstructuredHeader.php b/src/Symfony/Component/Mime/Header/UnstructuredHeader.php
 index 61c06d8f50..883293f6e0 100644
 --- a/src/Symfony/Component/Mime/Header/UnstructuredHeader.php
@@ -9944,6 +10034,17 @@ index c9125af216..bcd044de52 100644
 +    public function setValue(object|array &$objectOrArray, string|PropertyPathInterface $propertyPath, mixed $value): void
      {
          if (\is_object($objectOrArray) && false === strpbrk((string) $propertyPath, '.[')) {
+diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php b/src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
+index 8336df4d72..f6948564a9 100644
+--- a/src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
++++ b/src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
+@@ -46,5 +46,5 @@ interface PropertyAccessorInterface
+      * @return void
+      */
+-    public function setValue(object|array &$objectOrArray, string|PropertyPathInterface $propertyPath, mixed $value);
++    public function setValue(object|array &$objectOrArray, string|PropertyPathInterface $propertyPath, mixed $value): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
 index a0154bd7ce..70c0d942e2 100644
 --- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
@@ -10238,6 +10339,17 @@ index edbecc1f0e..6f07800fad 100644
 +    public function process(ContainerBuilder $container): void
      {
          if (false === $container->hasDefinition('routing.resolver')) {
+diff --git a/src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php b/src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php
+index cbbbf04595..985bd682f4 100644
+--- a/src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php
++++ b/src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php
+@@ -44,5 +44,5 @@ interface ConfigurableRequirementsInterface
+      * @return void
+      */
+-    public function setStrictRequirements(?bool $enabled);
++    public function setStrictRequirements(?bool $enabled): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
 index e3fb17e81c..cd27f3e387 100644
 --- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -10353,7 +10465,7 @@ index bde72c0eb0..3d6813e1d4 100644
      {
          if (!\is_array($config)) {
 diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
-index af5969f771..3f737c0104 100644
+index e92a5ea3d7..4a0af31349 100644
 --- a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
 +++ b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
 @@ -54,5 +54,5 @@ EOF;
@@ -10382,7 +10494,7 @@ index 417f156415..75d770d852 100644
      {
          $this->request = $request;
 diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
-index a0b439a1f4..ecf1c21e44 100644
+index 062be150b8..7c925fbbdb 100644
 --- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
 +++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
 @@ -66,5 +66,5 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
@@ -10399,6 +10511,17 @@ index a0b439a1f4..ecf1c21e44 100644
 +    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider): void
      {
          $this->expressionLanguageProviders[] = $provider;
+diff --git a/src/Symfony/Component/Routing/RequestContextAwareInterface.php b/src/Symfony/Component/Routing/RequestContextAwareInterface.php
+index 04acbdc800..eedb53c594 100644
+--- a/src/Symfony/Component/Routing/RequestContextAwareInterface.php
++++ b/src/Symfony/Component/Routing/RequestContextAwareInterface.php
+@@ -19,5 +19,5 @@ interface RequestContextAwareInterface
+      * @return void
+      */
+-    public function setContext(RequestContext $context);
++    public function setContext(RequestContext $context): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
 index f244e62bed..a5e918317c 100644
 --- a/src/Symfony/Component/Routing/RouteCollection.php
@@ -11019,7 +11142,7 @@ index c6ffa45279..734e29fdf5 100644
      {
          $this->options = array_merge($this->defaultOptions, $options);
 diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
-index bd9d98c65b..b12f3bbf51 100644
+index cb7c23b9c8..afa54c74ea 100644
 --- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
 +++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
 @@ -69,5 +69,5 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
@@ -11326,7 +11449,7 @@ index b684fddb2f..ade2242791 100644
      {
          return $this->data;
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
-index 856aefbe98..3517fff8da 100644
+index 61b14a1a80..f745caaada 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 @@ -215,5 +215,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
@@ -11344,14 +11467,14 @@ index 856aefbe98..3517fff8da 100644
      {
          $ignoredAttributes = $context[self::IGNORED_ATTRIBUTES] ?? $this->defaultContext[self::IGNORED_ATTRIBUTES];
 @@ -316,5 +316,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
-      * @throws MissingConstructorArgumentException
+      * @throws MissingConstructorArgumentsException
       */
 -    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null)
 +    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object
      {
          if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
-index 88e3c3ea12..c0597d0177 100644
+index 16b2bb70af..e1a7dd2df1 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 @@ -141,10 +141,10 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
@@ -11400,6 +11523,16 @@ index 88e3c3ea12..c0597d0177 100644
 +    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
      {
          if (!isset($context['cache_key'])) {
+diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
+index 503f3cb518..78f48e086d 100644
+--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
++++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
+@@ -37,4 +37,4 @@ interface DenormalizableInterface
+      * @return void
+      */
+-    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, string $format = null, array $context = []);
++    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, string $format = null, array $context = []): void;
+ }
 diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php
 index 48e8c3fb54..a71c3ea476 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php
@@ -11609,7 +11742,7 @@ index 537e8e584c..bf5c5aea70 100644
      {
          $this->charset = $charset;
 diff --git a/src/Symfony/Component/Templating/Helper/HelperInterface.php b/src/Symfony/Component/Templating/Helper/HelperInterface.php
-index 5dade65db5..db0d0a00ea 100644
+index 8377f14467..f40e02ae77 100644
 --- a/src/Symfony/Component/Templating/Helper/HelperInterface.php
 +++ b/src/Symfony/Component/Templating/Helper/HelperInterface.php
 @@ -24,5 +24,5 @@ interface HelperInterface
@@ -11618,6 +11751,13 @@ index 5dade65db5..db0d0a00ea 100644
 -    public function getName();
 +    public function getName(): string;
  
+     /**
+@@ -31,5 +31,5 @@ interface HelperInterface
+      * @return void
+      */
+-    public function setCharset(string $charset);
++    public function setCharset(string $charset): void;
+ 
      /**
 diff --git a/src/Symfony/Component/Templating/Helper/SlotsHelper.php b/src/Symfony/Component/Templating/Helper/SlotsHelper.php
 index 358e5fc071..2a716108d2 100644
@@ -11726,6 +11866,16 @@ index 0b158be9f2..cc3209cc9e 100644
 +    protected function initializeEscapers(): void
      {
          $flags = \ENT_QUOTES | \ENT_SUBSTITUTE;
+diff --git a/src/Symfony/Component/Templating/StreamingEngineInterface.php b/src/Symfony/Component/Templating/StreamingEngineInterface.php
+index 539bcbce14..a172cd2ed4 100644
+--- a/src/Symfony/Component/Templating/StreamingEngineInterface.php
++++ b/src/Symfony/Component/Templating/StreamingEngineInterface.php
+@@ -29,4 +29,4 @@ interface StreamingEngineInterface
+      * @return void
+      */
+-    public function stream(string|TemplateReferenceInterface $name, array $parameters = []);
++    public function stream(string|TemplateReferenceInterface $name, array $parameters = []): void;
+ }
 diff --git a/src/Symfony/Component/Translation/Catalogue/MergeOperation.php b/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
 index 1b777a8435..804cc138fc 100644
 --- a/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
@@ -11748,6 +11898,23 @@ index 2c0ec722ee..ff3a7c7c85 100644
 +    protected function processDomain(string $domain): void
      {
          $this->messages[$domain] = [
+diff --git a/src/Symfony/Component/Translation/CatalogueMetadataAwareInterface.php b/src/Symfony/Component/Translation/CatalogueMetadataAwareInterface.php
+index c845959f1a..faa5b0b34e 100644
+--- a/src/Symfony/Component/Translation/CatalogueMetadataAwareInterface.php
++++ b/src/Symfony/Component/Translation/CatalogueMetadataAwareInterface.php
+@@ -35,5 +35,5 @@ interface CatalogueMetadataAwareInterface
+      * @return void
+      */
+-    public function setCatalogueMetadata(string $key, mixed $value, string $domain = 'messages');
++    public function setCatalogueMetadata(string $key, mixed $value, string $domain = 'messages'): void;
+ 
+     /**
+@@ -45,4 +45,4 @@ interface CatalogueMetadataAwareInterface
+      * @return void
+      */
+-    public function deleteCatalogueMetadata(string $key = '', string $domain = 'messages');
++    public function deleteCatalogueMetadata(string $key = '', string $domain = 'messages'): void;
+ }
 diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
 index 91001c5644..cfeb6c1fdc 100644
 --- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php
@@ -12385,7 +12552,7 @@ index 94ad5eacab..7873a33c2b 100644
      {
          if (!$constraint instanceof AtLeastOneOf) {
 diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php
-index 54a4c140c9..3661f3206d 100644
+index ca0ed331c1..32fc2f28c1 100644
 --- a/src/Symfony/Component/Validator/Constraints/BicValidator.php
 +++ b/src/Symfony/Component/Validator/Constraints/BicValidator.php
 @@ -67,5 +67,5 @@ class BicValidator extends ConstraintValidator
@@ -12546,7 +12713,7 @@ index 0e3d848430..b4a6755388 100644
      {
          if (!$constraint instanceof Date) {
 diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
-index 90f7727c22..9b99e56460 100644
+index 8c0ff77308..ca64a5fe88 100644
 --- a/src/Symfony/Component/Validator/Constraints/EmailValidator.php
 +++ b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
 @@ -55,5 +55,5 @@ class EmailValidator extends ConstraintValidator
@@ -14211,17 +14378,6 @@ index 2e1dad116c..abe2b0b229 100644
 +    public static function dump(mixed $var/* , string $label = null */): mixed
      {
          $label = 2 <= \func_num_args() ? func_get_arg(1) : null;
-diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
-index ae12ec414a..971280f868 100644
---- a/src/Symfony/Component/VarExporter/Internal/Exporter.php
-+++ b/src/Symfony/Component/VarExporter/Internal/Exporter.php
-@@ -36,5 +36,5 @@ class Exporter
-      * @throws NotInstantiableTypeException When a value cannot be serialized
-      */
--    public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount, &$valuesAreStatic)
-+    public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount, &$valuesAreStatic): array
-     {
-         $refs = $values;
 diff --git a/src/Symfony/Component/VarExporter/Internal/Hydrator.php b/src/Symfony/Component/VarExporter/Internal/Hydrator.php
 index f665f6ee15..429db33d19 100644
 --- a/src/Symfony/Component/VarExporter/Internal/Hydrator.php
@@ -14298,7 +14454,7 @@ index 8d82824eb0..fab7b30160 100644
      {
          foreach ($event->getTransition()->getTos() as $place) {
 diff --git a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
-index ab5ea51110..8831d93588 100644
+index 82fe165152..f62b2a09f0 100644
 --- a/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
 +++ b/src/Symfony/Component/Workflow/EventListener/ExpressionLanguage.php
 @@ -26,5 +26,5 @@ class ExpressionLanguage extends BaseExpressionLanguage
diff --git a/.github/patch-types.php b/.github/patch-types.php
index 619faa10686c6..2517e1dab835d 100644
--- a/.github/patch-types.php
+++ b/.github/patch-types.php
@@ -1,6 +1,7 @@
 <?php
 
-if (false === getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
+$mode = $argv[1] ?? 'patch';
+if ('lint' !== $mode && false === getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
     echo "Please define the SYMFONY_PATCH_TYPE_DECLARATIONS env var when running this script.\n";
     exit(1);
 }
@@ -11,6 +12,7 @@
 
 Symfony\Component\ErrorHandler\DebugClassLoader::enable();
 
+$missingReturnTypes = [];
 foreach ($loader->getClassMap() as $class => $file) {
     $file = realpath($file);
 
@@ -53,6 +55,7 @@
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/NotLoadableClass.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionIntersectionTypeFixture.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionUnionTypeWithIntersectionFixture.php'):
+        case false !== strpos($file, '/src/Symfony/Component/VarExporter/Internal'):
         case false !== strpos($file, '/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyGhost/ReadOnlyClass.php'):
         case false !== strpos($file, '/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyProxy/ReadOnlyClass.php'):
         case false !== strpos($file, '/src/Symfony/Component/Cache/Traits/RelayProxy.php'):
@@ -62,6 +65,33 @@
     }
 
     class_exists($class);
+
+    if ('lint' !== $mode) {
+        continue;
+    }
+
+    $refl = new \ReflectionClass($class);
+    foreach ($refl->getMethods() as $method) {
+        if (
+            !$refl->isInterface()
+            || $method->getReturnType()
+            || str_contains($method->getDocComment(), '@return')
+            || str_starts_with($method->getName(), '__')
+            || $method->getDeclaringClass()->getName() !== $class
+        ) {
+            continue;
+        }
+
+        $missingReturnTypes[] = $class.'::'.$method->getName();
+    }
 }
 
-Symfony\Component\ErrorHandler\DebugClassLoader::checkClasses();
+if ($missingReturnTypes) {
+    echo \count($missingReturnTypes)." missing return types on interfaces\n\n";
+    echo implode("\n", $missingReturnTypes);
+    exit(1);
+}
+
+if ('patch' === $mode) {
+    Symfony\Component\ErrorHandler\DebugClassLoader::checkClasses();
+}
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 45a52e22cf3e0..001231e1acf12 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -148,6 +148,11 @@ jobs:
           git checkout src/Symfony/Contracts/Service/ResetInterface.php
           git diff --exit-code
 
+      - name: Check interface return types
+        if: "matrix.php == '8.1' && ! matrix.mode"
+        run: |
+          php .github/patch-types.php lint
+
       - name: Run tests
         run: |
           _run_tests() {
diff --git a/src/Symfony/Component/Console/Output/OutputInterface.php b/src/Symfony/Component/Console/Output/OutputInterface.php
index f5ab9182f6b0a..fb1557720f34a 100644
--- a/src/Symfony/Component/Console/Output/OutputInterface.php
+++ b/src/Symfony/Component/Console/Output/OutputInterface.php
@@ -85,6 +85,8 @@ public function isDebug(): bool;
 
     /**
      * Sets the decorated flag.
+     *
+     * @return void
      */
     public function setDecorated(bool $decorated);
 
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
index 57ed1c84ce909..a72d41df9ec10 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
@@ -24,6 +24,8 @@ interface ViolationMapperInterface
      * the given form.
      *
      * @param bool $allowNonSynchronized Whether to allow mapping to non-synchronized forms
+     *
+     * @return void
      */
     public function mapViolation(ConstraintViolation $violation, FormInterface $form, bool $allowNonSynchronized = false);
 }
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Compiler/BundleCompilerInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Compiler/BundleCompilerInterface.php
index 02dd4293d81f2..db2c6b8bbc7dd 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Compiler/BundleCompilerInterface.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Compiler/BundleCompilerInterface.php
@@ -23,6 +23,8 @@ interface BundleCompilerInterface
     /**
      * Compiles a resource bundle at the given source to the given target
      * directory.
+     *
+     * @return void
      */
     public function compile(string $sourcePath, string $targetDir);
 }
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php
index 1af0185d3865c..cb9e76fd097a8 100644
--- a/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php
+++ b/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php
@@ -20,5 +20,8 @@
  */
 interface BundleWriterInterface
 {
+    /**
+     * @return void
+     */
     public function write(string $path, string $locale, mixed $data);
 }
diff --git a/src/Symfony/Component/Ldap/Adapter/ConnectionInterface.php b/src/Symfony/Component/Ldap/Adapter/ConnectionInterface.php
index 1808709a35f99..93d13c831de6a 100644
--- a/src/Symfony/Component/Ldap/Adapter/ConnectionInterface.php
+++ b/src/Symfony/Component/Ldap/Adapter/ConnectionInterface.php
@@ -31,6 +31,8 @@ public function isBound(): bool;
      * @throws AlreadyExistsException      When the connection can't be created because of an LDAP_ALREADY_EXISTS error
      * @throws ConnectionTimeoutException  When the connection can't be created because of an LDAP_TIMEOUT error
      * @throws InvalidCredentialsException When the connection can't be created because of an LDAP_INVALID_CREDENTIALS error
+     *
+     * @return void
      */
     public function bind(string $dn = null, #[\SensitiveParameter] string $password = null);
 }
diff --git a/src/Symfony/Component/Ldap/LdapInterface.php b/src/Symfony/Component/Ldap/LdapInterface.php
index 9a97017348cdb..60628cd74e71e 100644
--- a/src/Symfony/Component/Ldap/LdapInterface.php
+++ b/src/Symfony/Component/Ldap/LdapInterface.php
@@ -29,6 +29,8 @@ interface LdapInterface
      * Return a connection bound to the ldap.
      *
      * @throws ConnectionException if dn / password could not be bound
+     *
+     * @return void
      */
     public function bind(string $dn = null, #[\SensitiveParameter] string $password = null);
 
diff --git a/src/Symfony/Component/Mime/Header/HeaderInterface.php b/src/Symfony/Component/Mime/Header/HeaderInterface.php
index 092fc238a323e..5bc4162c30e9a 100644
--- a/src/Symfony/Component/Mime/Header/HeaderInterface.php
+++ b/src/Symfony/Component/Mime/Header/HeaderInterface.php
@@ -22,6 +22,8 @@ interface HeaderInterface
      * Sets the body.
      *
      * The type depends on the Header concrete class.
+     *
+     * @return void
      */
     public function setBody(mixed $body);
 
@@ -32,16 +34,25 @@ public function setBody(mixed $body);
      */
     public function getBody(): mixed;
 
+    /**
+     * @return void
+     */
     public function setCharset(string $charset);
 
     public function getCharset(): ?string;
 
+    /**
+     * @return void
+     */
     public function setLanguage(string $lang);
 
     public function getLanguage(): ?string;
 
     public function getName(): string;
 
+    /**
+     * @return void
+     */
     public function setMaxLineLength(int $lineLength);
 
     public function getMaxLineLength(): int;
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php b/src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
index 9d863baaf9b97..8336df4d72f84 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
@@ -42,6 +42,8 @@ interface PropertyAccessorInterface
      * @throws Exception\InvalidArgumentException If the property path is invalid
      * @throws Exception\AccessException          If a property/index does not exist or is not public
      * @throws Exception\UnexpectedTypeException  If a value within the path is neither object nor array
+     *
+     * @return void
      */
     public function setValue(object|array &$objectOrArray, string|PropertyPathInterface $propertyPath, mixed $value);
 
diff --git a/src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php b/src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php
index 2c99c913a3022..cbbbf0459519c 100644
--- a/src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php
+++ b/src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php
@@ -40,6 +40,8 @@ interface ConfigurableRequirementsInterface
     /**
      * Enables or disables the exception on incorrect parameters.
      * Passing null will deactivate the requirements check completely.
+     *
+     * @return void
      */
     public function setStrictRequirements(?bool $enabled);
 
diff --git a/src/Symfony/Component/Routing/RequestContextAwareInterface.php b/src/Symfony/Component/Routing/RequestContextAwareInterface.php
index 9ab31f6dfe23a..04acbdc80033a 100644
--- a/src/Symfony/Component/Routing/RequestContextAwareInterface.php
+++ b/src/Symfony/Component/Routing/RequestContextAwareInterface.php
@@ -15,6 +15,8 @@ interface RequestContextAwareInterface
 {
     /**
      * Sets the request context.
+     *
+     * @return void
      */
     public function setContext(RequestContext $context);
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
index 73cff737727a3..503f3cb5183c2 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
@@ -33,6 +33,8 @@ interface DenormalizableInterface
      * @param string|null                 $format       The format is optionally given to be able to denormalize
      *                                                  differently based on different input formats
      * @param array                       $context      Options for denormalizing
+     *
+     * @return void
      */
     public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, string $format = null, array $context = []);
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Dummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Dummy.php
index 76f042e0b1152..74d94f78f9e74 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/Dummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/Dummy.php
@@ -33,7 +33,7 @@ public function normalize(NormalizerInterface $normalizer, string $format = null
         ];
     }
 
-    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, string $format = null, array $context = [])
+    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, string $format = null, array $context = []): void
     {
         $this->foo = $data['foo'];
         $this->bar = $data['bar'];
diff --git a/src/Symfony/Component/Templating/Helper/HelperInterface.php b/src/Symfony/Component/Templating/Helper/HelperInterface.php
index 5dade65db52ef..8377f1446734a 100644
--- a/src/Symfony/Component/Templating/Helper/HelperInterface.php
+++ b/src/Symfony/Component/Templating/Helper/HelperInterface.php
@@ -27,6 +27,8 @@ public function getName();
 
     /**
      * Sets the default charset.
+     *
+     * @return void
      */
     public function setCharset(string $charset);
 
diff --git a/src/Symfony/Component/Templating/StreamingEngineInterface.php b/src/Symfony/Component/Templating/StreamingEngineInterface.php
index 81733cdf4772b..539bcbce14ff1 100644
--- a/src/Symfony/Component/Templating/StreamingEngineInterface.php
+++ b/src/Symfony/Component/Templating/StreamingEngineInterface.php
@@ -25,6 +25,8 @@ interface StreamingEngineInterface
      *
      * @throws \RuntimeException if the template cannot be rendered
      * @throws \LogicException   if the template cannot be streamed
+     *
+     * @return void
      */
     public function stream(string|TemplateReferenceInterface $name, array $parameters = []);
 }
diff --git a/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php b/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php
index c3544f9156bd1..112aff3537afa 100644
--- a/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php
+++ b/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php
@@ -50,13 +50,10 @@ public function testStreamDelegatesToSupportedEngine()
         $streamingEngine = $this->getStreamingEngineMock('template.php', true);
         $streamingEngine->expects($this->once())
             ->method('stream')
-            ->with('template.php', ['foo' => 'bar'])
-            ->willReturn('<html />');
+            ->with('template.php', ['foo' => 'bar']);
 
         $delegatingEngine = new DelegatingEngine([$streamingEngine]);
-        $result = $delegatingEngine->stream('template.php', ['foo' => 'bar']);
-
-        $this->assertNull($result);
+        $delegatingEngine->stream('template.php', ['foo' => 'bar']);
     }
 
     public function testStreamRequiresStreamingEngine()
diff --git a/src/Symfony/Component/Translation/CatalogueMetadataAwareInterface.php b/src/Symfony/Component/Translation/CatalogueMetadataAwareInterface.php
index 7e76857da415b..c845959f1a187 100644
--- a/src/Symfony/Component/Translation/CatalogueMetadataAwareInterface.php
+++ b/src/Symfony/Component/Translation/CatalogueMetadataAwareInterface.php
@@ -31,6 +31,8 @@ public function getCatalogueMetadata(string $key = '', string $domain = 'message
 
     /**
      * Adds catalogue metadata to a message domain.
+     *
+     * @return void
      */
     public function setCatalogueMetadata(string $key, mixed $value, string $domain = 'messages');
 
@@ -39,6 +41,8 @@ public function setCatalogueMetadata(string $key, mixed $value, string $domain =
      *
      * Passing an empty domain will delete all catalogue metadata. Passing an empty key will
      * delete all metadata for the given domain.
+     *
+     * @return void
      */
     public function deleteCatalogueMetadata(string $key = '', string $domain = 'messages');
 }

From e1faaaeca42f6d2a1532332e06b37598beaeb5b9 Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Sat, 22 Apr 2023 15:51:15 +0200
Subject: [PATCH 449/475] [Serializer] Fix tests

---
 .../Serializer/Tests/Fixtures/DenormalizableDummy.php       | 2 +-
 .../Tests/Fixtures/NormalizableTraversableDummy.php         | 6 +-----
 .../Component/Serializer/Tests/Fixtures/ScalarDummy.php     | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizableDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizableDummy.php
index bbf54bd5f7055..a768a19989c48 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizableDummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/DenormalizableDummy.php
@@ -16,7 +16,7 @@
 
 class DenormalizableDummy implements DenormalizableInterface
 {
-    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, string $format = null, array $context = [])
+    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, string $format = null, array $context = []): void
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/NormalizableTraversableDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/NormalizableTraversableDummy.php
index 5ee205fd16bea..d6b38b89af1dc 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/NormalizableTraversableDummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/NormalizableTraversableDummy.php
@@ -26,11 +26,7 @@ public function normalize(NormalizerInterface $normalizer, string $format = null
         ];
     }
 
-    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, string $format = null, array $context = [])
+    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, string $format = null, array $context = []): void
     {
-        return [
-            'foo' => 'denormalizedFoo',
-            'bar' => 'denormalizedBar',
-        ];
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/ScalarDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/ScalarDummy.php
index 31ca36ab72e42..949407d116b68 100644
--- a/src/Symfony/Component/Serializer/Tests/Fixtures/ScalarDummy.php
+++ b/src/Symfony/Component/Serializer/Tests/Fixtures/ScalarDummy.php
@@ -26,7 +26,7 @@ public function normalize(NormalizerInterface $normalizer, string $format = null
         return 'xml' === $format ? $this->xmlFoo : $this->foo;
     }
 
-    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, string $format = null, array $context = [])
+    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, string $format = null, array $context = []): void
     {
         if ('xml' === $format) {
             $this->xmlFoo = $data;

From d1050e7aae0336c46c2170a0df161380191b6211 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Sat, 22 Apr 2023 12:10:11 -0400
Subject: [PATCH 450/475] [Scheduler] add @kbond to CODEOWNERS

---
 .github/CODEOWNERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 19e868793ac36..d925c20a4f318 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -42,6 +42,8 @@
 /src/Symfony/Bundle/SecurityBundle/ @wouterj @chalasr
 /src/Symfony/Component/Security/ @wouterj @chalasr
 /src/Symfony/Component/Ldap/Security/ @wouterj @chalasr
+# Scheduler
+/src/Symfony/Component/Scheduler/ @kbond
 # TwigBundle
 /src/Symfony/Bundle/TwigBundle/ @yceruto
 # WebLink

From 375319d2a1870d6e0c105edd39f4f2c1ca855d32 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Sat, 22 Apr 2023 12:38:56 -0400
Subject: [PATCH 451/475] [Scheduler] fix brittle test

---
 .../Component/Scheduler/Tests/SchedulerTest.php    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Scheduler/Tests/SchedulerTest.php b/src/Symfony/Component/Scheduler/Tests/SchedulerTest.php
index 9f5a96cd43397..770911b54791a 100644
--- a/src/Symfony/Component/Scheduler/Tests/SchedulerTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/SchedulerTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Scheduler\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Clock\MockClock;
 use Symfony\Component\Scheduler\RecurringMessage;
 use Symfony\Component\Scheduler\Schedule;
 use Symfony\Component\Scheduler\Scheduler;
@@ -21,11 +23,12 @@ class SchedulerTest extends TestCase
     public function testCanRunAndStop()
     {
         $handler = new Handler();
-        $schedule = (new Schedule())->add(RecurringMessage::every('1 millisecond', new Message()));
-        $scheduler = new Scheduler([Message::class => $handler], [$schedule]);
+        $handler->clock = $clock = new MockClock();
+        $schedule = (new Schedule())->add(RecurringMessage::every('1 second', new Message()));
+        $scheduler = new Scheduler([Message::class => $handler], [$schedule], $clock);
         $handler->scheduler = $scheduler;
 
-        $scheduler->run(['sleep' => 0]);
+        $scheduler->run(['sleep' => 1]);
 
         $this->assertSame(3, $handler->count);
     }
@@ -39,11 +42,16 @@ class Handler
 {
     public int $count = 0;
     public Scheduler $scheduler;
+    public ClockInterface $clock;
 
     public function __invoke(Message $message): void
     {
         if (3 === ++$this->count) {
             $this->scheduler->stop();
+
+            return;
         }
+
+        $this->clock->sleep(1);
     }
 }

From 9f7abbe5a617e8c94f3a29f79127f5a387ea9ed5 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sat, 22 Apr 2023 18:58:25 +0200
Subject: [PATCH 452/475] [DependencyInjection] Fix code generating lazy
 closures

---
 .../Component/DependencyInjection/Argument/LazyClosure.php    | 4 ++--
 src/Symfony/Component/DependencyInjection/composer.json       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php b/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php
index 6324f021afadf..a114c0f522ddf 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/LazyClosure.php
@@ -72,7 +72,7 @@ public static function getCode(string $initializer, array $callable, Definition
             throw new RuntimeException(sprintf('Cannot create lazy closure for service "%s" because its corresponding callable is invalid.', $id));
         }
 
-        $code = ProxyHelper::exportSignature($r->getMethod($method));
+        $code = ProxyHelper::exportSignature($r->getMethod($method), true, $args);
 
         if ($asClosure) {
             $code = ' { '.preg_replace('/: static$/', ': \\'.$r->name, $code);
@@ -81,7 +81,7 @@ public static function getCode(string $initializer, array $callable, Definition
         }
 
         $code = 'new class('.$initializer.') extends \\'.self::class
-            .$code.' { return $this->service->'.$callable[1].'(...\func_get_args()); } '
+            .$code.' { return $this->service->'.$callable[1].'('.$args.'); } '
             .'}';
 
         return $asClosure ? '('.$code.')->'.$method.'(...)' : $code;
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index e0e44e38da5d0..7949058b66448 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -20,7 +20,7 @@
         "psr/container": "^1.1|^2.0",
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/service-contracts": "^2.5|^3.0",
-        "symfony/var-exporter": "^6.2.7"
+        "symfony/var-exporter": "^6.2.10"
     },
     "require-dev": {
         "symfony/yaml": "^5.4|^6.0",

From 48a953f7127298bee43a35ab8b0e782df66c9c67 Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Sun, 23 Apr 2023 11:25:08 +0200
Subject: [PATCH 453/475] [HttpClient] Adjust JsonMockResponse exception

---
 src/Symfony/Component/HttpClient/Response/JsonMockResponse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpClient/Response/JsonMockResponse.php b/src/Symfony/Component/HttpClient/Response/JsonMockResponse.php
index 17c17cf68fb34..d09f66f9dd968 100644
--- a/src/Symfony/Component/HttpClient/Response/JsonMockResponse.php
+++ b/src/Symfony/Component/HttpClient/Response/JsonMockResponse.php
@@ -20,7 +20,7 @@ public function __construct(mixed $body = [], array $info = [])
         try {
             $json = json_encode($body, \JSON_THROW_ON_ERROR);
         } catch (\JsonException $e) {
-            throw new InvalidArgumentException('JSON encoding failed: '.$e->getMessage(), $e->getCode());
+            throw new InvalidArgumentException('JSON encoding failed: '.$e->getMessage(), $e->getCode(), $e);
         }
 
         $info['response_headers']['content-type'] ??= 'application/json';

From d565aa0b8b2c2bace22e9d7e75d005fa32374cf2 Mon Sep 17 00:00:00 2001
From: Romain Monteil <monteil.romain@gmail.com>
Date: Sun, 23 Apr 2023 12:45:22 +0200
Subject: [PATCH 454/475] [Form] Move  classes to Twig bridge

---
 .../Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php  | 1 -
 .../Twig/Tests/Extension}/AbstractDivLayoutTestCase.php        | 2 +-
 .../Twig/Tests/Extension}/AbstractLayoutTestCase.php           | 3 ++-
 .../Twig/Tests/Extension}/AbstractTableLayoutTestCase.php      | 2 +-
 .../Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php | 1 -
 .../Twig/Tests/Extension/FormExtensionTableLayoutTest.php      | 1 -
 6 files changed, 4 insertions(+), 6 deletions(-)
 rename src/Symfony/{Component/Form/Tests => Bridge/Twig/Tests/Extension}/AbstractDivLayoutTestCase.php (99%)
 rename src/Symfony/{Component/Form/Tests => Bridge/Twig/Tests/Extension}/AbstractLayoutTestCase.php (99%)
 rename src/Symfony/{Component/Form/Tests => Bridge/Twig/Tests/Extension}/AbstractTableLayoutTestCase.php (99%)

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
index 969e3c7803216..7f4a77e2d5bf7 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Form\Extension\Core\Type\PercentType;
 use Symfony\Component\Form\FormError;
-use Symfony\Component\Form\Tests\AbstractLayoutTestCase;
 
 abstract class AbstractBootstrap3LayoutTestCase extends AbstractLayoutTestCase
 {
diff --git a/src/Symfony/Component/Form/Tests/AbstractDivLayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractDivLayoutTestCase.php
similarity index 99%
rename from src/Symfony/Component/Form/Tests/AbstractDivLayoutTestCase.php
rename to src/Symfony/Bridge/Twig/Tests/Extension/AbstractDivLayoutTestCase.php
index 32468895d901b..a02fca4bc54ca 100644
--- a/src/Symfony/Component/Form/Tests/AbstractDivLayoutTestCase.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractDivLayoutTestCase.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Componen
10000
t\Form\Tests;
+namespace Symfony\Bridge\Twig\Tests\Extension;
 
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Security\Csrf\CsrfToken;
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractLayoutTestCase.php
similarity index 99%
rename from src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
rename to src/Symfony/Bridge/Twig/Tests/Extension/AbstractLayoutTestCase.php
index 33799bfcc13bf..af1a013a556fa 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTestCase.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractLayoutTestCase.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\Tests;
+namespace Symfony\Bridge\Twig\Tests\Extension;
 
 use PHPUnit\Framework\SkippedTestError;
 use Symfony\Component\Form\Extension\Core\Type\PercentType;
@@ -18,6 +18,7 @@
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\Test\FormIntegrationTestCase;
+use Symfony\Component\Form\Tests\VersionAwareTest;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\Component\Translation\TranslatableMessage;
 use Symfony\Contracts\Translation\TranslatableInterface;
diff --git a/src/Symfony/Component/Form/Tests/AbstractTableLayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractTableLayoutTestCase.php
similarity index 99%
rename from src/Symfony/Component/Form/Tests/AbstractTableLayoutTestCase.php
rename to src/Symfony/Bridge/Twig/Tests/Extension/AbstractTableLayoutTestCase.php
index 09d669129fce9..c3cdb08e547e8 100644
--- a/src/Symfony/Component/Form/Tests/AbstractTableLayoutTestCase.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractTableLayoutTestCase.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Form\Tests;
+namespace Symfony\Bridge\Twig\Tests\Extension;
 
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Security\Csrf\CsrfToken;
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
index 9fa6a01316ba0..19efa9455d3d1 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -18,7 +18,6 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Form\FormRenderer;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\Tests\AbstractDivLayoutTestCase;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
index c0a7a9e8a8002..c94f9b5c0d1f1 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -17,7 +17,6 @@
 use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
 use Symfony\Component\Form\FormRenderer;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\Tests\AbstractTableLayoutTestCase;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;

From 3664d0847104bc4d50e81c8ad4e74a4380935d1e Mon Sep 17 00:00:00 2001
From: Tugdual Saunier <tugdual.saunier@gmail.com>
Date: Fri, 21 Apr 2023 16:43:31 -0400
Subject: [PATCH 455/475] [Scheduler] Allow MessageGenerator to provide a
 MessageContext

And add it to the ScheduledStamp in case of use within Messenger.

Replaces 50096
Fix 50085

This approach allows to provie some context that the message consumers can use or not depending on its use case
---
 .../Scheduler/Generator/MessageContext.php    | 29 ++++++++++++++
 .../Scheduler/Generator/MessageGenerator.php  |  2 +-
 .../Generator/MessageGeneratorInterface.php   |  2 +-
 .../Scheduler/Messenger/ScheduledStamp.php    |  4 ++
 .../Messenger/SchedulerTransport.php          |  4 +-
 .../Tests/Generator/MessageGeneratorTest.php  | 38 ++++++++++++++++++-
 .../Messenger/SchedulerTransportTest.php      | 10 ++++-
 7 files changed, 82 insertions(+), 7 deletions(-)
 create mode 100644 src/Symfony/Component/Scheduler/Generator/MessageContext.php

diff --git a/src/Symfony/Component/Scheduler/Generator/MessageContext.php b/src/Symfony/Component/Scheduler/Generator/MessageContext.php
new file mode 100644
index 0000000000000..51caf94e9e042
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Generator/MessageContext.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Generator;
+
+use Symfony\Component\Scheduler\Trigger\TriggerInterface;
+
+/**
+ * @author Tugdual Saunier <tugdual@saunier.tech>
+ *
+ * @experimental
+ */
+final class MessageContext
+{
+    public function __construct(
+        public readonly TriggerInterface $trigger,
+        public readonly \DateTimeImmutable $triggeredAt,
+        public readonly \DateTimeImmutable|null $nextTriggerAt = null,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php b/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
index 2f9743c59bfc2..ffa5618332624 100644
--- a/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
+++ b/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
@@ -70,7 +70,7 @@ public function getMessages(): \Generator
             }
 
             if ($yield) {
-                yield $message;
+                yield (new MessageContext($trigger, $time, $nextTime)) => $message;
                 $this->checkpoint->save($time, $index);
             }
         }
diff --git a/src/Symfony/Component/Scheduler/Generator/MessageGeneratorInterface.php b/src/Symfony/Component/Scheduler/Generator/MessageGeneratorInterface.php
index 8b2f7eeacc4ce..64835e19d6138 100644
--- a/src/Symfony/Component/Scheduler/Generator/MessageGeneratorInterface.php
+++ b/src/Symfony/Component/Scheduler/Generator/MessageGeneratorInterface.php
@@ -17,7 +17,7 @@
 interface MessageGeneratorInterface
 {
     /**
-     * @return iterable<object>
+     * @return iterable<MessageContext, object>
      */
     public function getMessages(): iterable;
 }
diff --git a/src/Symfony/Component/Scheduler/Messenger/ScheduledStamp.php b/src/Symfony/Component/Scheduler/Messenger/ScheduledStamp.php
index 4b1b5cf1b577d..79efc1121e581 100644
--- a/src/Symfony/Component/Scheduler/Messenger/ScheduledStamp.php
+++ b/src/Symfony/Component/Scheduler/Messenger/ScheduledStamp.php
@@ -12,10 +12,14 @@
 namespace Symfony\Component\Scheduler\Messenger;
 
 use Symfony\Component\Messenger\Stamp\NonSendableStampInterface;
+use Symfony\Component\Scheduler\Generator\MessageContext;
 
 /**
  * @experimental
  */
 final class ScheduledStamp implements NonSendableStampInterface
 {
+    public function __construct(public readonly MessageContext $messageContext)
+    {
+    }
 }
diff --git a/src/Symfony/Component/Scheduler/Messenger/SchedulerTransport.php b/src/Symfony/Component/Scheduler/Messenger/SchedulerTransport.php
index 9625e8c41bba9..414945e617c83 100644
--- a/src/Symfony/Component/Scheduler/Messenger/SchedulerTransport.php
+++ b/src/Symfony/Component/Scheduler/Messenger/SchedulerTransport.php
@@ -28,8 +28,8 @@ public function __construct(
 
     public function get(): iterable
     {
-        foreach ($this->messageGenerator->getMessages() as $message) {
-            yield Envelope::wrap($message, [new ScheduledStamp()]);
+        foreach ($this->messageGenerator->getMessages() as $context => $message) {
+            yield Envelope::wrap($message, [new ScheduledStamp($context)]);
         }
     }
 
diff --git a/src/Symfony/Component/Scheduler/Tests/Generator/MessageGeneratorTest.php b/src/Symfony/Component/Scheduler/Tests/Generator/MessageGeneratorTest.php
index 8b6900b8bb037..1926bbb70fb7f 100644
--- a/src/Symfony/Component/Scheduler/Tests/Generator/MessageGeneratorTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Generator/MessageGeneratorTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Scheduler\Generator\MessageContext;
 use Symfony\Component\Scheduler\Generator\MessageGenerator;
 use Symfony\Component\Scheduler\RecurringMessage;
 use Symfony\Component\Scheduler\Schedule;
@@ -43,14 +44,47 @@ public function testGetMessages(string $startTime, array $runs, array $schedule)
         $scheduler = new MessageGenerator($schedule, 'dummy', $clock);
 
         // Warmup. The first run is always returns nothing.
-        $this->assertSame([], iterator_to_array($scheduler->getMessages()));
+        $this->assertSame([], iterator_to_array($scheduler->getMessages(), false));
 
         foreach ($runs as $time => $expected) {
             $now = self::makeDateTime($time);
-            $this->assertSame($expected, iterator_to_array($scheduler->getMessages()));
+            $this->assertSame($expected, iterator_to_array($scheduler->getMessages(), false));
         }
     }
 
+    public function testYieldedContext()
+    {
+        // for referencing
+        $now = self::makeDateTime('22:12:00');
+
+        $clock = $this->createMock(ClockInterface::class);
+        $clock->method('now')->willReturnReference($now);
+
+        $message = $this->createMessage((object) ['id' => 'message'], '22:13:00', '22:14:00', '22:16:00');
+        $schedule = (new Schedule())->add($message);
+        $schedule->stateful(new ArrayAdapter());
+
+        $scheduler = new MessageGenerator($schedule, 'dummy', $clock);
+
+        // Warmup. The first run is alw ays returns nothing.
+        $this->assertSame([], iterator_to_array($scheduler->getMessages(), false));
+
+        $now = self::makeDateTime('22:14:10');
+
+        $iterator = $scheduler->getMessages();
+
+        $this->assertInstanceOf(MessageContext::class, $context = $iterator->key());
+        $this->assertSame($message->getTrigger(), $context->trigger);
+        $this->assertEquals(self::makeDateTime('22:13:00'), $context->triggeredAt);
+        $this->assertEquals(self::makeDateTime('22:14:00'), $context->nextTriggerAt);
+
+        $iterator->next();
+        $this->assertInstanceOf(MessageContext::class, $context = $iterator->key());
+        $this->assertSame($message->getTrigger(), $context->trigger);
+        $this->assertEquals(self::makeDateTime('22:14:00'), $context->triggeredAt);
+        $this->assertEquals(self::makeDateTime('22:16:00'), $context->nextTriggerAt);
+    }
+
     public static function messagesProvider(): \Generator
     {
         $first = (object) ['id' => 'first'];
diff --git a/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php b/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php
index 09f980c07ba2f..315048e9fbe0e 100644
--- a/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php
@@ -14,9 +14,11 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Scheduler\Exception\LogicException;
+use Symfony\Component\Scheduler\Generator\MessageContext;
 use Symfony\Component\Scheduler\Generator\MessageGeneratorInterface;
 use Symfony\Component\Scheduler\Messenger\ScheduledStamp;
 use Symfony\Component\Scheduler\Messenger\SchedulerTransport;
+use Symfony\Component\Scheduler\Trigger\TriggerInterface;
 
 class SchedulerTransportTest extends TestCase
 {
@@ -26,9 +28,15 @@ public function testGetFromIterator()
             (object) ['id' => 'first'],
             (object) ['id' => 'second'],
         ];
-        $generator = $this->createConfiguredMock(MessageGeneratorInterface::class, [
+        $generator = $this->createMock(MessageGeneratorInterface::class, [
             'getMessages' => $messages,
         ]);
+        $generator->method('getMessages')->willReturnCallback(function () use ($messages): \Generator {
+            $trigger = $this->createMock(TriggerInterface::class);
+            $triggerAt = new \DateTimeImmutable('2020-02-20T02:00:00', new \DateTimeZone('UTC'));
+            yield (new MessageContext($trigger, $triggerAt)) => $messages[0];
+            yield (new MessageContext($trigger, $triggerAt)) => $messages[1];
+        });
         $transport = new SchedulerTransport($generator);
 
         foreach ($transport->get() as $envelope) {

From 60dfc7f1653c6ac5bfdebd5c7c3f6bb7a7e6ba56 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Wed, 29 Mar 2023 16:25:57 -0400
Subject: [PATCH 456/475] [Scheduler] have `TriggerInterface` extend
 `\Stringable`

---
 .../Scheduler/Tests/Generator/MessageGeneratorTest.php |  5 +++++
 .../Component/Scheduler/Trigger/CallbackTrigger.php    |  5 +++++
 .../Scheduler/Trigger/CronExpressionTrigger.php        |  2 +-
 .../Component/Scheduler/Trigger/DatePeriodTrigger.php  | 10 ++++++++++
 .../Component/Scheduler/Trigger/ExcludeTimeTrigger.php |  5 +++++
 .../Component/Scheduler/Trigger/TriggerInterface.php   |  2 +-
 6 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Scheduler/Tests/Generator/MessageGeneratorTest.php b/src/Symfony/Component/Scheduler/Tests/Generator/MessageGeneratorTest.php
index 8b6900b8bb037..c3aabec72812e 100644
--- a/src/Symfony/Component/Scheduler/Tests/Generator/MessageGeneratorTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Generator/MessageGeneratorTest.php
@@ -135,6 +135,11 @@ public static function messagesProvider(): \Generator
             ],
             'schedule' => [
                 RecurringMessage::trigger(new class() implements TriggerInterface {
+                    public function __toString(): string
+                    {
+                        return 'foo';
+                    }
+
                     public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
                     {
                         return null;
diff --git a/src/Symfony/Component/Scheduler/Trigger/CallbackTrigger.php b/src/Symfony/Component/Scheduler/Trigger/CallbackTrigger.php
index 353d53d456a1c..311fc9f2b178c 100644
--- a/src/Symfony/Component/Scheduler/Trigger/CallbackTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/CallbackTrigger.php
@@ -25,6 +25,11 @@ public function __construct(callable $callback)
         $this->callback = $callback(...);
     }
 
+    public function __toString(): string
+    {
+        return spl_object_hash($this->callback);
+    }
+
     public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
     {
         return ($this->callback)($run);
diff --git a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
index 3a53bbc2c1a43..f1a1c0edad5bb 100644
--- a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
@@ -21,7 +21,7 @@
  *
  * @experimental
  */
-final class CronExpressionTrigger implements TriggerInterface, \Stringable
+final class CronExpressionTrigger implements TriggerInterface
 {
     public function __construct(
         private readonly CronExpression $expression = new CronExpression('* * * * *'),
diff --git a/src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php b/src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php
index 9d17af05ae69b..a292fcea1efe6 100644
--- a/src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/DatePeriodTrigger.php
@@ -21,6 +21,16 @@ public function __construct(
     ) {
     }
 
+    public function __toString(): string
+    {
+        return sprintf(
+            '%s - %s, %s',
+            $this->period->getStartDate()->format(\DateTimeInterface::ATOM),
+            $this->period->getEndDate()?->format(\DateTimeInterface::ATOM) ?? '(inf)',
+            '-',
+        );
+    }
+
     public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
     {
         $iterator = $this->period->getIterator();
diff --git a/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php b/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php
index 6ddefb8bcb4e8..619d3dccb9618 100644
--- a/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/ExcludeTimeTrigger.php
@@ -23,6 +23,11 @@ public function __construct(
     ) {
     }
 
+    public function __toString(): string
+    {
+        return sprintf('%s, from: %s, until: %s', $this->inner, $this->from->format(\DateTimeInterface::ATOM), $this->until->format(\DateTimeInterface::ATOM));
+    }
+
     public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
     {
         $nextRun = $this->inner->getNextRunDate($run);
diff --git a/src/Symfony/Component/Scheduler/Trigger/TriggerInterface.php b/src/Symfony/Component/Scheduler/Trigger/TriggerInterface.php
index 5fd07e9a610cb..12c6a779ae8e3 100644
--- a/src/Symfony/Component/Scheduler/Trigger/TriggerInterface.php
+++ b/src/Symfony/Component/Scheduler/Trigger/TriggerInterface.php
@@ -14,7 +14,7 @@
 /**
  * @experimental
  */
-interface TriggerInterface
+interface TriggerInterface extends \Stringable
 {
     public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable;
 }

From 6c486305602c09b4f412c67ce32d6686668ed110 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Mon, 24 Apr 2023 07:42:23 +0200
Subject: [PATCH 457/475] [Scheduler] Add the possibility to override the
 default CallbackTrigger description

---
 .../Tests/Trigger/CallbackTriggerTest.php     | 30 +++++++++++++++++++
 .../Scheduler/Trigger/CallbackTrigger.php     |  6 ++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Trigger/CallbackTriggerTest.php

diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/CallbackTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/CallbackTriggerTest.php
new file mode 100644
index 0000000000000..608866241ac05
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/CallbackTriggerTest.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Trigger;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Scheduler\Trigger\CallbackTrigger;
+
+class CallbackTriggerTest extends TestCase
+{
+    public function testToString()
+    {
+        $trigger = new CallbackTrigger(fn () => null);
+        $this->assertMatchesRegularExpression('/^\d{32}$/', (string) $trigger);
+
+        $trigger = new CallbackTrigger(fn () => null, '');
+        $this->assertSame('', (string) $trigger);
+
+        $trigger = new CallbackTrigger(fn () => null, 'foo');
+        $this->assertSame('foo', (string) $trigger);
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Trigger/CallbackTrigger.php b/src/Symfony/Component/Scheduler/Trigger/CallbackTrigger.php
index 311fc9f2b178c..20dbaa84e42b6 100644
--- a/src/Symfony/Component/Scheduler/Trigger/CallbackTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/CallbackTrigger.php
@@ -19,15 +19,17 @@
 final class CallbackTrigger implements TriggerInterface
 {
     private \Closure $callback;
+    private string $description;
 
-    public function __construct(callable $callback)
+    public function __construct(callable $callback, string $description = null)
     {
         $this->callback = $callback(...);
+        $this->description = $description ?? spl_object_hash($this->callback);
     }
 
     public function __toString(): string
     {
-        return spl_object_hash($this->callback);
+        return $this->description;
     }
 
     public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable

From 3429f979aae403247e224eee886b304a4a025345 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Mon, 24 Apr 2023 09:06:38 +0200
Subject: [PATCH 458/475] [Validator] Update the name of a password strength
 level

---
 .../Component/Validator/Constraints/PasswordStrength.php      | 4 ++--
 .../Validator/Constraints/PasswordStrengthValidator.php       | 2 +-
 .../Tests/Constraints/PasswordStrengthValidatorTest.php       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Validator/Constraints/PasswordStrength.php b/src/Symfony/Component/Validator/Constraints/PasswordStrength.php
index eef98ef337a36..b41965879f5eb 100644
--- a/src/Symfony/Component/Validator/Constraints/PasswordStrength.php
+++ b/src/Symfony/Component/Validator/Constraints/PasswordStrength.php
@@ -26,7 +26,7 @@ final class PasswordStrength extends Constraint
 {
     public const STRENGTH_VERY_WEAK = 0;
     public const STRENGTH_WEAK = 1;
-    public const STRENGTH_REASONABLE = 2;
+    public const STRENGTH_MEDIUM = 2;
     public const STRENGTH_STRONG = 3;
     public const STRENGTH_VERY_STRONG = 4;
 
@@ -42,7 +42,7 @@ final class PasswordStrength extends Constraint
 
     public function __construct(array $options = null, int $minScore = null, array $groups = null, mixed $payload = null)
     {
-        $options['minScore'] ??= self::STRENGTH_REASONABLE;
+        $options['minScore'] ??= self::STRENGTH_MEDIUM;
 
         parent::__construct($options, $groups, $payload);
 
diff --git a/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php b/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
index e4799645b8ec2..c3d2b7d76a2bc 100644
--- a/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
@@ -82,7 +82,7 @@ private static function estimateStrength(#[\SensitiveParameter] string $password
         return match (true) {
             $entropy >= 120 => PasswordStrength::STRENGTH_VERY_STRONG,
             $entropy >= 100 => PasswordStrength::STRENGTH_STRONG,
-            $entropy >= 80 => PasswordStrength::STRENGTH_REASONABLE,
+            $entropy >= 80 => PasswordStrength::STRENGTH_MEDIUM,
             $entropy >= 60 => PasswordStrength::STRENGTH_WEAK,
             default => PasswordStrength::STRENGTH_VERY_WEAK,
         };
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php
index f4f5816e249a1..474dd889c3686 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php
@@ -45,7 +45,7 @@ public function testValidValues(string $value, int $expectedStrength)
     public static function getValidValues(): iterable
     {
         yield ['How-is-this', PasswordStrength::STRENGTH_WEAK];
-        yield ['Reasonable-pwd', PasswordStrength::STRENGTH_REASONABLE];
+        yield ['Reasonable-pwd', PasswordStrength::STRENGTH_MEDIUM];
         yield ['This 1s a very g00d Pa55word! ;-)', PasswordStrength::STRENGTH_VERY_STRONG];
         yield ['pudding-smack-👌🏼-fox-😎', PasswordStrength::STRENGTH_VERY_STRONG];
     }

From 4ee55b0fab6419f143e178fdb876003e538f4d8d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 24 Apr 2023 15:00:41 +0200
Subject: [PATCH 459/475] Fix tests

---
 src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
index eaf393ba0cc84..9453297d7dc8b 100644
--- a/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
+++ b/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
@@ -117,6 +117,8 @@ public function testNormalizeBodyMultipart()
     /**
      * @group network
      *
+     * @requires extension openssl
+     *
      * @dataProvider provideNormalizeBodyMultipartForwardStream
      */
     public function testNormalizeBodyMultipartForwardStream($stream)

From 4f806062d50604b0cb340eb6a9daa1ec67a91244 Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Sat, 22 Apr 2023 23:52:28 +0200
Subject: [PATCH 460/475] Add remaining missing return types to safe methods

---
 .github/expected-missing-return-types.diff    | 61 ++-----------------
 .../Monolog/Handler/NotifierHandler.php       |  2 +-
 .../Monolog/Handler/ServerLogHandler.php      |  2 +-
 .../Bridge/Twig/Command/DebugCommand.php      |  2 +-
 .../Bridge/Twig/Command/LintCommand.php       |  8 +--
 .../Twig/Extension/WorkflowExtension.php      |  2 +-
 .../Command/ConfigDebugCommand.php            |  2 +-
 .../Console/Descriptor/Descriptor.php         |  4 +-
 .../Console/Descriptor/MarkdownDescriptor.php | 22 +++++--
 .../Debug/TraceableListenerTrait.php          |  4 +-
 .../Csp/ContentSecurityPolicyHandler.php      |  2 +-
 src/Symfony/Component/Cache/LockRegistry.php  |  5 +-
 .../Cache/Marshaller/DefaultMarshaller.php    |  2 +-
 .../Cache/Traits/AbstractAdapterTrait.php     |  2 +-
 .../Component/Cache/Traits/ContractsTrait.php |  2 +-
 .../Cache/Traits/FilesystemCommonTrait.php    |  4 +-
 .../Console/Descriptor/Descriptor.php         | 10 +--
 .../Component/Console/Helper/ProgressBar.php  |  2 +-
 .../RegisterAutoconfigureAttributesPass.php   |  8 ++-
 .../Component/ErrorHandler/ErrorHandler.php   |  6 +-
 .../Node/ConditionalNode.php                  |  2 +-
 .../ExpressionLanguage/Node/FunctionNode.php  |  2 +-
 .../ExpressionLanguage/Node/UnaryNode.php     |  2 +-
 .../HttpClient/Response/AsyncResponse.php     |  3 +
 .../Response/CommonResponseTrait.php          |  3 +
 .../Data/Generator/AbstractDataGenerator.php  |  4 +-
 .../Util/ArrayAccessibleResourceBundle.php    |  2 +-
 .../Intl/Data/Util/RecursiveArrayAccess.php   |  2 +-
 .../Component/Mailer/Transport/Dsn.php        |  2 +-
 .../Tests/Transport/ConnectionTest.php        | 33 ++++------
 .../Transport/DoctrineIntegrationTest.php     |  3 +-
 .../DoctrineTransportFactoryTest.php          |  1 +
 .../Transport/PostgreSqlConnectionTest.php    |  6 ++
 .../Bridge/Doctrine/Transport/Connection.php  | 15 ++---
 .../Command/AbstractFailedMessagesCommand.php |  2 +-
 .../Messenger/Handler/HandlerDescriptor.php   |  2 +-
 .../Transport/Serialization/PhpSerializer.php |  2 +-
 src/Symfony/Component/Mime/Header/Headers.php |  2 +-
 .../Component/Notifier/Transport/Dsn.php      |  4 +-
 src/Symfony/Component/Process/Process.php     |  4 +-
 .../Component/RateLimiter/Policy/Window.php   |  2 +-
 .../Component/Routing/CompiledRoute.php       |  2 +-
 src/Symfony/Component/Routing/Route.php       |  2 +-
 .../Authentication/Token/AbstractToken.php    |  2 +-
 .../Authenticator/JsonLoginAuthenticator.php  |  2 +-
 .../Security/Http/Event/LazyResponseEvent.php |  2 +-
 .../Security/Http/Firewall/AccessListener.php |  4 +-
 .../Http/Firewall/ContextListener.php         |  4 +-
 .../Http/Firewall/ExceptionListener.php       |  2 +-
 .../Component/Translation/Provider/Dsn.php    |  4 +-
 src/Symfony/Component/Yaml/Parser.php         |  4 +-
 .../Component/Yaml/Tag/TaggedValue.php        |  2 +-
 52 files changed, 125 insertions(+), 155 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index 92a388e798b4c..372396a814603 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -386,7 +386,7 @@ index 8bfaa0a22c..745ba6aff3 100644
      {
          $this->debug = $debug;
 diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
-index fe581b5987..8109e7c68d 100644
+index 43e4d9c9f1..ea0116870b 100644
 --- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php
 +++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
 @@ -63,5 +63,5 @@ class DebugCommand extends Command
@@ -397,7 +397,7 @@ index fe581b5987..8109e7c68d 100644
      {
          $this
 diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
-index fa8effc12a..deced50a90 100644
+index e059740a13..e7d6fbdd05 100644
 --- a/src/Symfony/Bridge/Twig/Command/LintCommand.php
 +++ b/src/Symfony/Bridge/Twig/Command/LintCommand.php
 @@ -52,5 +52,5 @@ class LintCommand extends Command
@@ -1500,7 +1500,7 @@ index 00e912686b..58872ec2bc 100644
      {
          if (!$container->hasDefinition('console.command.cache_pool_prune')) {
 diff --git a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
-index 2ee96e9b37..f49ed24f68 100644
+index 200406a564..0bad73fe6a 100644
 --- a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
 +++ b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
 @@ -81,5 +81,5 @@ trait FilesystemCommonTrait
@@ -5038,28 +5038,10 @@ index 9e107401a2..7f92321a2b 100644
 +    protected function registerFunctions(): void
      {
          $this->addFunction(ExpressionFunction::fromPhp('constant'));
-diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
-index fec02abaae..7d02544275 100644
---- a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
-+++ b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
-@@ -41,5 +41,5 @@ class ConditionalNode extends Node
-     }
- 
--    public function evaluate(array $functions, array $values)
-+    public function evaluate(array $functions, array $values): mixed
-     {
-         if ($this->nodes['expr1']->evaluate($functions, $values)) {
 diff --git a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
-index d4ab3e0922..811fec7e2e 100644
+index 33323f388f..811fec7e2e 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
 +++ b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
-@@ -41,5 +41,5 @@ class FunctionNode extends Node
-     }
- 
--    public function evaluate(array $functions, array $values)
-+    public function evaluate(array $functions, array $values): mixed
-     {
-         $arguments = [$values];
 @@ -54,5 +54,5 @@ class FunctionNode extends Node
       * @return array
       */
@@ -5106,17 +5088,6 @@ index f6fff09b1e..4661f7d165 100644
 +    protected function isHash(array $value): bool
      {
          $expectedKey = 0;
-diff --git a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
-index 580ee13095..55e2121fcf 100644
---- a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
-+++ b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
-@@ -46,5 +46,5 @@ class UnaryNode extends Node
-     }
- 
--    public function evaluate(array $functions, array $values)
-+    public function evaluate(array $functions, array $values): mixed
-     {
-         $value = $this->nodes['node']->evaluate($functions, $values);
 diff --git a/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php b/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php
 index 239624ec2c..3b497d5ccf 100644
 --- a/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php
@@ -10730,7 +10701,7 @@ index cf41e0c507..61f7397734 100644
 +    public function createNewToken(PersistentTokenInterface $token): void;
  }
 diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
-index 4416cda616..0fcf4303e0 100644
+index 10cb8f776e..0da1b3330e 100644
 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
 +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
 @@ -57,5 +57,5 @@ abstract class AbstractToken implements TokenInterface, \Serializable
@@ -11173,17 +11144,6 @@ index 91271d14a3..100c2fb549 100644
 -    public function start(Request $request, AuthenticationException $authException = null);
 +    public function start(Request $request, AuthenticationException $authException = null): Response;
  }
-diff --git a/src/Symfony/Component/Security/Http/Event/LazyResponseEvent.php b/src/Symfony/Component/Security/Http/Event/LazyResponseEvent.php
-index 46a25eed07..b3e25f1af3 100644
---- a/src/Symfony/Component/Security/Http/Event/LazyResponseEvent.php
-+++ b/src/Symfony/Component/Security/Http/Event/LazyResponseEvent.php
-@@ -32,5 +32,5 @@ final class LazyResponseEvent extends RequestEvent
-     }
- 
--    public function setResponse(Response $response)
-+    public function setResponse(Response $response): void
-     {
-         $this->stopPropagation();
 diff --git a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
 index 3b7c5086f2..97fb99f0b5 100644
 --- a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php
@@ -11238,17 +11198,6 @@ index fc56733efa..8538f5f821 100644
 +    protected function callListeners(RequestEvent $event, iterable $listeners): void
      {
          foreach ($listeners as $listener) {
-diff --git a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
-index ad343ef085..9a1a2563c4 100644
---- a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
-+++ b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
-@@ -65,5 +65,5 @@ class AccessListener extends AbstractListener
-      * @throws AccessDeniedException
-      */
--    public function authenticate(RequestEvent $event)
-+    public function authenticate(RequestEvent $event): void
-     {
-         $request = $event->getRequest();
 diff --git a/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php b/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php
 index be200c0d12..69483f8f1d 100644
 --- a/src/Symfony/Component/Security/Http/Firewall/FirewallListenerInterface.php
diff --git a/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php b/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php
index 8576706080d44..6aedc7c36e267 100644
--- a/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php
@@ -71,7 +71,7 @@ private function notify(array $records): void
         $this->notifier->send($notification, ...$this->notifier->getAdminRecipients());
     }
 
-    private function getHighestRecord(array $records)
+    private function getHighestRecord(array $records): array
     {
         $highestRecord = null;
         foreach ($records as $record) {
diff --git a/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php b/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php
index 4ba90f7efbea3..4d566885c3e46 100644
--- a/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php
@@ -126,7 +126,7 @@ protected function getDefaultFormatter(): FormatterInterface
         return new VarDumperFormatter();
     }
 
-    private static function nullErrorHandler()
+    private static function nullErrorHandler(): void
     {
     }
 
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
index fe581b5987419..43e4d9c9f12c6 100644
--- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -305,7 +305,7 @@ private function getLoaderPaths(string $name = null): array
         return $loaderPaths;
     }
 
-    private function getMetadata(string $type, mixed $entity)
+    private function getMetadata(string $type, mixed $entity): mixed
     {
         if ('globals' === $type) {
             return $entity;
diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
index fa8effc12a2e4..e059740a1375d 100644
--- a/src/Symfony/Bridge/Twig/Command/LintCommand.php
+++ b/src/Symfony/Bridge/Twig/Command/LintCommand.php
@@ -143,7 +143,7 @@ private function getFilesInfo(array $filenames): array
         return $filesInfo;
     }
 
-    protected function findFiles(string $filename)
+    protected function findFiles(string $filename): iterable
     {
         if (is_file($filename)) {
             return [$filename];
@@ -172,7 +172,7 @@ private function validate(string $template, string $file): array
         return ['template' => $template, 'file' => $file, 'valid' => true];
     }
 
-    private function display(InputInterface $input, OutputInterface $output, SymfonyStyle $io, array $files)
+    private function display(InputInterface $input, OutputInterface $output, SymfonyStyle $io, array $files): int
     {
         return match ($this->format) {
             'txt' => $this->displayTxt($output, $io, $files),
@@ -205,7 +205,7 @@ private function displayTxt(OutputInterface $output, SymfonyStyle $io, array $fi
         return min($errors, 1);
     }
 
-    private function displayJson(OutputInterface $output, array $filesInfo)
+    private function displayJson(OutputInterface $output, array $filesInfo): int
     {
         $errors = 0;
 
@@ -224,7 +224,7 @@ private function displayJson(OutputInterface $output, array $filesInfo)
         return min($errors, 1);
     }
 
-    private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, GithubActionReporter $githubReporter = null)
+    private function renderException(SymfonyStyle $output, string $template, Error $exception, string $file = null, GithubActionReporter $githubReporter = null): void
     {
         $line = $exception->getTemplateLine();
 
diff --git a/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php b/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php
index 71f556aead03e..661a063f98e61 100644
--- a/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php
@@ -99,7 +99,7 @@ public function getMarkedPlaces(object $subject, bool $placesNameOnly = true, st
      *                                                Use a string (the place name) to get place metadata
      *                                                Use a Transition instance to get transition metadata
      */
-    public function getMetadata(object $subject, string $key, string|Transition $metadataSubject = null, string $name = null)
+    public function getMetadata(object $subject, string $key, string|Transition $metadataSubject = null, string $name = null): mixed
     {
         return $this
             ->workflowRegistry
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
index 8ddfc13af61f1..f3eab9d6085cc 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -237,7 +237,7 @@ private function getAvailableBundles(bool $alias): array
         return $availableBundles;
     }
 
-    private function getConfig(ExtensionInterface $extension, ContainerBuilder $container, bool $resolveEnvs = false)
+    private function getConfig(ExtensionInterface $extension, ContainerBuilder $container, bool $resolveEnvs = false): mixed
     {
         return $container->resolveEnvPlaceholders(
             $container->getParameterBag()->resolveValue(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
index eb5aa54ed17ad..7dd2c72206853 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -120,9 +120,9 @@ abstract protected function describeContainerEnvVars(array $envs, array $options
      * Common options are:
      * * name: name of listened event
      */
-    abstract protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = []);
+    abstract protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = []): void;
 
-    abstract protected function describeCallable(mixed $callable, array $options = []);
+    abstract protected function describeCallable(mixed $callable, array $options = []): void;
 
     protected function formatValue(mixed $value): string
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
index 1424001c5e81b..4581e0e198b99 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -336,7 +336,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
         }
     }
 
-    protected function describeCallable(mixed $callable, array $options = [])
+    protected function describeCallable(mixed $callable, array $options = []): void
     {
         $string = '';
 
@@ -359,7 +359,9 @@ protected function describeCallable(mixed $callable, array $options = [])
                 }
             }
 
-            return $this->write($string."\n");
+            $this->write($string."\n");
+
+            return;
         }
 
         if (\is_string($callable)) {
@@ -375,7 +377,9 @@ protected function describeCallable(mixed $callable, array $options = [])
                 $string .= "\n- Static: yes";
             }
 
-            return $this->write($string."\n");
+            $this->write($string."\n");
+
+            return;
         }
 
         if ($callable instanceof \Closure) {
@@ -383,7 +387,9 @@ protected function describeCallable(mixed $callable, array $options = [])
 
             $r = new \ReflectionFunction($callable);
             if (str_contains($r->name, '{closure}')) {
-                return $this->write($string."\n");
+                $this->write($string."\n");
+
+                return;
             }
             $string .= "\n".sprintf('- Name: `%s`', $r->name);
 
@@ -394,14 +400,18 @@ protected function describeCallable(mixed $callable, array $options = [])
                 }
             }
 
-            return $this->write($string."\n");
+            $this->write($string."\n");
+
+            return;
         }
 
         if (method_exists($callable, '__invoke')) {
             $string .= "\n- Type: `object`";
             $string .= "\n".sprintf('- Name: `%s`', $callable::class);
 
-            return $this->write($string."\n");
+            $this->write($string."\n");
+
+            return;
         }
 
         throw new \InvalidArgumentException('Callable is not describable.');
diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableListenerTrait.php b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableListenerTrait.php
index 357d2414d8bf2..0c4ff9e5cfb90 100644
--- a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableListenerTrait.php
+++ b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableListenerTrait.php
@@ -30,12 +30,12 @@ trait TraceableListenerTrait
     /**
      * Proxies all method calls to the original listener.
      */
-    public function __call(string $method, array $arguments)
+    public function __call(string $method, array $arguments): mixed
     {
         return $this->listener->{$method}(...$arguments);
     }
 
-    public function getWrappedListener()
+    public function getWrappedListener(): mixed
     {
         return $this->listener;
     }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
index 7fe5018317081..4cc0f8db1efe0 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
@@ -233,7 +233,7 @@ private function hasHashOrNonce(array $directives): bool
         return false;
     }
 
-    private function getDirectiveFallback(array $directiveSet, string $type)
+    private function getDirectiveFallback(array $directiveSet, string $type): ?array
     {
         if (\in_array($type, ['script-src-elem', 'style-src-elem'], true) || !isset($directiveSet['default-src'])) {
             // Let the browser fallback on it's own
diff --git a/src/Symfony/Component/Cache/LockRegistry.php b/src/Symfony/Component/Cache/LockRegistry.php
index 9339e6a2c5f0d..22d71839e3b57 100644
--- a/src/Symfony/Component/Cache/LockRegistry.php
+++ b/src/Symfony/Component/Cache/LockRegistry.php
@@ -83,7 +83,7 @@ public static function setFiles(array $files): array
         return $previousFiles;
     }
 
-    public static function compute(callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata = null, LoggerInterface $logger = null)
+    public static function compute(callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata = null, LoggerInterface $logger = null): mixed
     {
         if ('\\' === \DIRECTORY_SEPARATOR && null === self::$lockedFiles) {
             // disable locking on Windows by default
@@ -146,6 +146,9 @@ public static function compute(callable $callback, ItemInterface $item, bool &$s
         return null;
     }
 
+    /**
+     * @return resource|false
+     */
     private static function open(int $key)
     {
         if (null !== $h = self::$openedFiles[$key] ?? null) {
diff --git a/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php b/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php
index e11607b3daaf2..973b137ae3eee 100644
--- a/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php
+++ b/src/Symfony/Component/Cache/Marshaller/DefaultMarshaller.php
@@ -91,7 +91,7 @@ public function unmarshall(string $value): mixed
     /**
      * @internal
      */
-    public static function handleUnserializeCallback(string $class)
+    public static function handleUnserializeCallback(string $class): never
     {
         throw new \DomainException('Class not found: '.$class);
     }
diff --git a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
index 10f28054ec675..fb27c90714767 100644
--- a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
+++ b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
@@ -367,7 +367,7 @@ protected function getId(mixed $key): string
     /**
      * @internal
      */
-    public static function handleUnserializeCallback(string $class)
+    public static function handleUnserializeCallback(string $class): never
     {
         throw new \DomainException('Class not found: '.$class);
     }
diff --git a/src/Symfony/Component/Cache/Traits/ContractsTrait.php b/src/Symfony/Component/Cache/Traits/ContractsTrait.php
index 60b7d2bf98b4e..476883a679e3a 100644
--- a/src/Symfony/Component/Cache/Traits/ContractsTrait.php
+++ b/src/Symfony/Component/Cache/Traits/ContractsTrait.php
@@ -59,7 +59,7 @@ public function setCallbackWrapper(?callable $callbackWrapper): callable
         return $previousWrapper;
     }
 
-    private function doGet(AdapterInterface $pool, string $key, callable $callback, ?float $beta, array &$metadata = null)
+    private function doGet(AdapterInterface $pool, string $key, callable $callback, ?float $beta, array &$metadata = null): mixed
     {
         if (0 > $beta ??= 1.0) {
             throw new InvalidArgumentException(sprintf('Argument "$beta" provided to "%s::get()" must be a positive number, %f given.', static::class, $beta));
diff --git a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
index 2ee96e9b3702c..200406a5645db 100644
--- a/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
+++ b/src/Symfony/Component/Cache/Traits/FilesystemCommonTrait.php
@@ -23,7 +23,7 @@ trait FilesystemCommonTrait
     private string $directory;
     private string $tmpSuffix;
 
-    private function init(string $namespace, ?string $directory)
+    private function init(string $namespace, ?string $directory): void
     {
         if (!isset($directory[0])) {
             $directory = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'symfony-cache';
@@ -161,7 +161,7 @@ private function scanHashDir(string $directory): \Generator
     /**
      * @internal
      */
-    public static function throwError(int $type, string $message, string $file, int $line)
+    public static function throwError(int $type, string $message, string $file, int $line): never
     {
         throw new \ErrorException($message, 0, $type, $file, $line);
     }
diff --git a/src/Symfony/Component/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Console/Descriptor/Descriptor.php
index 43a397d37a90a..7b2509c601fe0 100644
--- a/src/Symfony/Component/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Descriptor.php
@@ -50,25 +50,25 @@ protected function write(string $content, bool $decorated = false): void
     /**
      * Describes an InputArgument instance.
      */
-    abstract protected function describeInputArgument(InputArgument $argument, array $options = []);
+    abstract protected function describeInputArgument(InputArgument $argument, array $options = []): void;
 
     /**
      * Describes an InputOption instance.
      */
-    abstract protected function describeInputOption(InputOption $option, array $options = []);
+    abstract protected function describeInputOption(InputOption $option, array $options = []): void;
 
     /**
      * Describes an InputDefinition instance.
      */
-    abstract protected function describeInputDefinition(InputDefinition $definition, array $options = []);
+    abstract protected function describeInputDefinition(InputDefinition $definition, array $options = []): void;
 
     /**
      * Describes a Command instance.
      */
-    abstract protected function describeCommand(Command $command, array $options = []);
+    abstract protected function describeCommand(Command $command, array $options = []): void;
 
     /**
      * Describes an Application instance.
      */
-    abstract protected function describeApplication(Application $application, array $options = []);
+    abstract protected function describeApplication(Application $application, array $options = []): void;
 }
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
index a8d9f1683ecd5..19faea47c05b2 100644
--- a/src/Symfony/Component/Console/Helper/ProgressBar.php
+++ b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -183,7 +183,7 @@ public function setMessage(string $message, string $name = 'message'): void
         $this->messages[$name] = $message;
     }
 
-    public function getMessage(string $name = 'message')
+    public function getMessage(string $name = 'message'): string
     {
         return $this->messages[$name];
     }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterAutoconfigureAttributesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterAutoconfigureAttributesPass.php
index 576bb9376e6c6..b706a62471ba9 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RegisterAutoconfigureAttributesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RegisterAutoconfigureAttributesPass.php
@@ -47,10 +47,12 @@ public function processClass(ContainerBuilder $container, \ReflectionClass $clas
         }
     }
 
-    private static function registerForAutoconfiguration(ContainerBuilder $container, \ReflectionClass $class, \ReflectionAttribute $attribute)
+    private static function registerForAutoconfiguration(ContainerBuilder $container, \ReflectionClass $class, \ReflectionAttribute $attribute): void
     {
         if (self::$registerForAutoconfiguration) {
-            return (self::$registerForAutoconfiguration)($container, $class, $attribute);
+            (self::$registerForAutoconfiguration)($container, $class, $attribute);
+
+            return;
         }
 
         $parseDefinitions = new \ReflectionMethod(YamlFileLoader::class, 'parseDefinitions');
@@ -79,6 +81,6 @@ private static function registerForAutoconfiguration(ContainerBuilder $container
             );
         };
 
-        return (self::$registerForAutoconfiguration)($container, $class, $attribute);
+        (self::$registerForAutoconfiguration)($container, $class, $attribute);
     }
 }
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
index d372c632ac39d..bda939a828073 100644
--- a/src/Symfony/Component/ErrorHandler/ErrorHandler.php
+++ b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -483,7 +483,7 @@ public function handleError(int $type, string $message, string $file, int $line)
      *
      * @internal
      */
-    public function handleException(\Throwable $exception)
+    public function handleException(\Throwable $exception): void
     {
         $handlerException = null;
 
@@ -534,7 +534,9 @@ public function handleException(\Throwable $exception)
 
         try {
             if (null !== $exceptionHandler) {
-                return $exceptionHandler($exception);
+                $exceptionHandler($exception);
+
+                return;
             }
             $handlerException ??= $exception;
         } catch (\Throwable $handlerException) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
index fec02abaaea47..7d02544275098 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
@@ -40,7 +40,7 @@ public function compile(Compiler $compiler): void
         ;
     }
 
-    public function evaluate(array $functions, array $values)
+    public function evaluate(array $functions, array $values): mixed
     {
         if ($this->nodes['expr1']->evaluate($functions, $values)) {
             return $this->nodes['expr2']->evaluate($functions, $values);
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
index d4ab3e0922770..33323f388f045 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
@@ -40,7 +40,7 @@ public function compile(Compiler $compiler): void
         $compiler->raw($function['compiler'](...$arguments));
     }
 
-    public function evaluate(array $functions, array $values)
+    public function evaluate(array $functions, array $values): mixed
     {
         $arguments = [$values];
         foreach ($this->nodes['arguments']->nodes as $node) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
index 580ee13095765..55e2121fcf798 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
@@ -45,7 +45,7 @@ public function compile(Compiler $compiler): void
         ;
     }
 
-    public function evaluate(array $functions, array $values)
+    public function evaluate(array $functions, array $values): mixed
     {
         $value = $this->nodes['node']->evaluate($functions, $values);
 
diff --git a/src/Symfony/Component/HttpClient/Response/AsyncResponse.php b/src/Symfony/Component/HttpClient/Response/AsyncResponse.php
index 8236623b2793f..66152e3d90c7e 100644
--- a/src/Symfony/Component/HttpClient/Response/AsyncResponse.php
+++ b/src/Symfony/Component/HttpClient/Response/AsyncResponse.php
@@ -123,6 +123,9 @@ public function getInfo(string $type = null): mixed
         return $this->info + $this->response->getInfo();
     }
 
+    /**
+     * @return resource
+     */
     public function toStream(bool $throw = true)
     {
         if ($throw) {
diff --git a/src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php b/src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php
index b4cf588a4177d..08a833dfecf9b 100644
--- a/src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php
+++ b/src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php
@@ -100,6 +100,9 @@ public function toArray(bool $throw = true): array
         return $content;
     }
 
+    /**
+     * @return resource
+     */
     public function toStream(bool $throw = true)
     {
         if ($throw) {
diff --git a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
index 453954bebdc51..d37fb28ff66bd 100644
--- a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
@@ -95,9 +95,9 @@ public function generateData(GeneratorConfig $config): void
      */
     abstract protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array;
 
-    abstract protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir);
+    abstract protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir): void;
 
-    abstract protected function preGenerate();
+    abstract protected function preGenerate(): void;
 
     abstract protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array;
 
diff --git a/src/Symfony/Component/Intl/Data/Util/ArrayAccessibleResourceBundle.php b/src/Symfony/Component/Intl/Data/Util/ArrayAccessibleResourceBundle.php
index 04110a46f1890..bbc0b2ed9c84a 100644
--- a/src/Symfony/Component/Intl/Data/Util/ArrayAccessibleResourceBundle.php
+++ b/src/Symfony/Component/Intl/Data/Util/ArrayAccessibleResourceBundle.php
@@ -32,7 +32,7 @@ public function __construct(\ResourceBundle $bundleImpl)
         $this->bundleImpl = $bundleImpl;
     }
 
-    public function get(int|string $offset)
+    public function get(int|string $offset): mixed
     {
         $value = $this->bundleImpl->get($offset);
 
diff --git a/src/Symfony/Component/Intl/Data/Util/RecursiveArrayAccess.php b/src/Symfony/Component/Intl/Data/Util/RecursiveArrayAccess.php
index 665f63d1ad73c..e8f720faabfa6 100644
--- a/src/Symfony/Component/Intl/Data/Util/RecursiveArrayAccess.php
+++ b/src/Symfony/Component/Intl/Data/Util/RecursiveArrayAccess.php
@@ -20,7 +20,7 @@
  */
 class RecursiveArrayAccess
 {
-    public static function get(mixed $array, array $indices)
+    public static function get(mixed $array, array $indices): mixed
     {
         foreach ($indices as $index) {
             // Use array_key_exists() for arrays, isset() otherwise
diff --git a/src/Symfony/Component/Mailer/Transport/Dsn.php b/src/Symfony/Component/Mailer/Transport/Dsn.php
index abd0becbbe857..4c0fb48c3b389 100644
--- a/src/Symfony/Component/Mailer/Transport/Dsn.php
+++ b/src/Symfony/Component/Mailer/Transport/Dsn.php
@@ -82,7 +82,7 @@ public function getPort(int $default = null): ?int
         return $this->port ?? $default;
     }
 
-    public function getOption(string $key, mixed $default = null)
+    public function getOption(string $key, mixed $default = null): mixed
     {
         return $this->options[$key] ?? $default;
     }
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
index 0d6e3af3656a4..6bacc7426c6bc 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
@@ -11,9 +11,7 @@
 
 namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport;
 
-use Doctrine\DBAL\Abstraction\Result as AbstractionResult;
 use Doctrine\DBAL\Connection as DBALConnection;
-use Doctrine\DBAL\Driver\Result as DriverResult;
 use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
@@ -59,6 +57,9 @@ public function testGetAMessageWillChangeItsStatus()
         $driverConnection
             ->method('executeQuery')
             ->willReturn($stmt);
+        $driverConnection
+            ->method('executeStatement')
+            ->willReturn(1);
 
         $connection = new Connection([], $driverConnection);
         $doctrineEnvelope = $connection->get();
@@ -156,10 +157,10 @@ private function getQueryBuilderMock()
 
     private function getResultMock($expectedResult)
     {
-        $stmt = $this->createMock(class_exists(Result::class) ? Result::class : (interface_exists(AbstractionResult::class) ? AbstractionResult::class : Statement::class));
+        $stmt = $this->createMock(class_exists(Result::class) ? Result::class : ResultStatement::class);
 
         $stmt->expects($this->once())
-            ->method(interface_exists(AbstractionResult::class) || class_exists(Result::class) ? 'fetchAssociative' : 'fetch')
+            ->method(class_exists(Result::class) ? 'fetchAssociative' : 'fetch')
             ->willReturn($expectedResult);
 
         return $stmt;
@@ -315,9 +316,9 @@ public function testFindAll()
             'headers' => json_encode(['type' => DummyMessage::class]),
         ];
 
-        $stmt = $this->createMock(class_exists(Result::class) ? Result::class : (interface_exists(AbstractionResult::class) ? AbstractionResult::class : Statement::class));
+        $stmt = $this->createMock(class_exists(Result::class) ? Result::class : ResultStatement::class);
         $stmt->expects($this->once())
-            ->method(interface_exists(AbstractionResult::class) || class_exists(Result::class) ? 'fetchAllAssociative' : 'fetchAll')
+            ->method(class_exists(Result::class) ? 'fetchAllAssociative' : 'fetchAll')
             ->willReturn([$message1, $message2]);
 
         $driverConnection
@@ -360,13 +361,9 @@ public function testGeneratedSql(AbstractPlatform $platform, string $expectedSql
         $driverConnection->method('getDatabasePlatform')->willReturn($platform);
         $driverConnection->method('createQueryBuilder')->willReturnCallback(fn () => new QueryBuilder($driverConnection));
 
-        if (interface_exists(DriverResult::class)) {
-            $result = $this->createMock(DriverResult::class);
+        if (class_exists(Result::class)) {
+            $result = $this->createMock(Result::class);
             $result->method('fetchAssociative')->willReturn(false);
-
-            if (class_exists(Result::class)) {
-                $result = new Result($result, $driverConnection);
-            }
         } else {
             $result = $this->createMock(ResultStatement::class);
             $result->method('fetch')->willReturn(false);
@@ -447,16 +444,12 @@ public function testFindAllSqlGenerated(AbstractPlatform $platform, string $expe
             return new QueryBuilder($driverConnection);
         });
 
-        if (interface_exists(DriverResult::class)) {
-            $result = $this->createMock(DriverResult::class);
-            $result->method('fetchAssociative')->willReturn(false);
-
-            if (class_exists(Result::class)) {
-                $result = new Result($result, $driverConnection);
-            }
+        if (class_exists(Result::class)) {
+            $result = $this->createMock(Result::class);
+            $result->method('fetchAllAssociative')->willReturn([]);
         } else {
             $result = $this->createMock(ResultStatement::class);
-            $result->method('fetch')->willReturn(false);
+            $result->method('fetchAll')->willReturn([]);
         }
 
         $driverConnection
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php
index 448aa16e6f5b1..5cd3b55787654 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrin
10000
e/Tests/Transport/DoctrineIntegrationTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport;
 
-use Doctrine\DBAL\Driver\Result as DriverResult;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
@@ -60,7 +59,7 @@ public function testSendWithDelay()
             ->setParameter('body', '{"message": "Hi i am delayed"}')
             ->execute();
 
-        $available_at = new \DateTimeImmutable($stmt instanceof Result || $stmt instanceof DriverResult ? $stmt->fetchOne() : $stmt->fetchColumn());
+        $available_at = new \DateTimeImmutable($stmt instanceof Result ? $stmt->fetchOne() : $stmt->fetchColumn());
 
         $now = new \DateTimeImmutable('now + 60 seconds');
         $this->assertGreaterThan($now, $available_at);
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportFactoryTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportFactoryTest.php
index b81b95fd07ad9..6ef1734e6745b 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportFactoryTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportFactoryTest.php
@@ -72,6 +72,7 @@ public function testCreateTransportNotifyWithPostgreSQLPlatform()
         $schemaManager->method('createSchemaConfig')->willReturn($schemaConfig);
         $driverConnection->method('getSchemaManager')->willReturn($schemaManager);
         $driverConnection->method('getDatabasePlatform')->willReturn($platform);
+        $driverConnection->method('executeStatement')->willReturn(1);
         $registry = $this->createMock(ConnectionRegistry::class);
 
         $registry->expects($this->once())
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php
index e8e00d97b3876..74357dc461e2a 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/PostgreSqlConnectionTest.php
@@ -31,6 +31,7 @@ public function testSerialize()
         $this->expectExceptionMessage('Cannot serialize '.PostgreSqlConnection::class);
 
         $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $driverConnection->method('executeStatement')->willReturn(1);
 
         $connection = new PostgreSqlConnection([], $driverConnection);
         serialize($connection);
@@ -42,6 +43,7 @@ public function testUnserialize()
         $this->expectExceptionMessage('Cannot unserialize '.PostgreSqlConnection::class);
 
         $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $driverConnection->method('executeStatement')->willReturn(1);
 
         $connection = new PostgreSqlConnection([], $driverConnection);
         $connection->__wakeup();
@@ -50,6 +52,7 @@ public function testUnserialize()
     public function testListenOnConnection()
     {
         $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $driverConnection->method('executeStatement')->willReturn(1);
 
         $driverConnection
             ->expects(self::any())
@@ -112,6 +115,7 @@ public function countNotifyCalls()
     public function testGetExtraSetupSql()
     {
         $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $driverConnection->method('executeStatement')->willReturn(1);
         $connection = new PostgreSqlConnection(['table_name' => 'queue_table'], $driverConnection);
 
         $table = new Table('queue_table');
@@ -128,6 +132,7 @@ public function testGetExtraSetupSql()
     public function testTransformTableNameWithSchemaToValidProcedureName()
     {
         $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $driverConnection->method('executeStatement')->willReturn(1);
         $connection = new PostgreSqlConnection(['table_name' => 'schema.queue_table'], $driverConnection);
 
         $table = new Table('schema.queue_table');
@@ -141,6 +146,7 @@ public function testTransformTableNameWithSchemaToValidProcedureName()
     public function testGetExtraSetupSqlWrongTable()
     {
         $driverConnection = $this->createMock(\Doctrine\DBAL\Connection::class);
+        $driverConnection->method('executeStatement')->willReturn(1);
         $connection = new PostgreSqlConnection(['table_name' => 'queue_table'], $driverConnection);
 
         $table = new Table('queue_table');
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
index be9fc6b11b686..98eb224841585 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Messenger\Bridge\Doctrine\Transport;
 
+use Doctrine\DBAL\Abstraction\Result as AbstractionResult;
 use Doctrine\DBAL\Connection as DBALConnection;
 use Doctrine\DBAL\Driver\Exception as DriverException;
-use Doctrine\DBAL\Driver\Result as DriverResult;
+use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Exception\TableNotFoundException;
 use Doctrine\DBAL\LockMode;
@@ -202,7 +203,7 @@ public function get(): ?array
                 $query->getParameters(),
                 $query->getParameterTypes()
             );
-            $doctrineEnvelope = $stmt instanceof Result || $stmt instanceof DriverResult ? $stmt->fetchAssociative() : $stmt->fetch();
+            $doctrineEnvelope = $stmt instanceof Result ? $stmt->fetchAssociative() : $stmt->fetch();
 
             if (false === $doctrineEnvelope) {
                 $this->driverConnection->commit();
@@ -287,7 +288,7 @@ public function getMessageCount(): int
 
         $stmt = $this->executeQuery($queryBuilder->getSQL(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
 
-        return $stmt instanceof Result || $stmt instanceof DriverResult ? $stmt->fetchOne() : $stmt->fetchColumn();
+        return $stmt instanceof Result ? $stmt->fetchOne() : $stmt->fetchColumn();
     }
 
     public function findAll(int $limit = null): array
@@ -299,7 +300,7 @@ public function findAll(int $limit = null): array
         }
 
         $stmt = $this->executeQuery($queryBuilder->getSQL(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
-        $data = $stmt instanceof Result || $stmt instanceof DriverResult ? $stmt->fetchAllAssociative() : $stmt->fetchAll();
+        $data = $stmt instanceof Result ? $stmt->fetchAllAssociative() : $stmt->fetchAll();
 
         return array_map(fn ($doctrineEnvelope) => $this->decodeEnvelopeHeaders($doctrineEnvelope), $data);
     }
@@ -310,7 +311,7 @@ public function find(mixed $id): ?array
             ->where('m.id = ? and m.queue_name = ?');
 
         $stmt = $this->executeQuery($queryBuilder->getSQL(), [$id, $this->configuration['queue_name']]);
-        $data = $stmt instanceof Result || $stmt instanceof DriverResult ? $stmt->fetchAssociative() : $stmt->fetch();
+        $data = $stmt instanceof Result ? $stmt->fetchAssociative() : $stmt->fetch();
 
         return false === $data ? null : $this->decodeEnvelopeHeaders($data);
     }
@@ -379,7 +380,7 @@ private function createQueryBuilder(string $alias = 'm'): QueryBuilder
         ));
     }
 
-    private function executeQuery(string $sql, array $parameters = [], array $types = [])
+    private function executeQuery(string $sql, array $parameters = [], array $types = []): Result|AbstractionResult|ResultStatement
     {
         try {
             $stmt = $this->driverConnection->executeQuery($sql, $parameters, $types);
@@ -398,7 +399,7 @@ private function executeQuery(string $sql, array $parameters = [], array $types
         return $stmt;
     }
 
-    protected function executeStatement(string $sql, array $parameters = [], array $types = [])
+    protected function executeStatement(string $sql, array $parameters = [], array $types = []): int|string
     {
         try {
             if (method_exists($this->driverConnection, 'executeStatement')) {
diff --git a/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php b/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php
index 3bb31bab9efa6..28aedeb1255c5 100644
--- a/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php
+++ b/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php
@@ -208,7 +208,7 @@ protected function printWarningAvailableFailureTransports(SymfonyStyle $io, ?str
         }
     }
 
-    protected function interactiveChooseFailureTransport(SymfonyStyle $io)
+    protected function interactiveChooseFailureTransport(SymfonyStyle $io): string
     {
         $failedTransports = array_keys($this->failureTransports->getProvidedServices());
         $question = new ChoiceQuestion('Select failed transport:', $failedTransports, 0);
diff --git a/src/Symfony/Component/Messenger/Handler/HandlerDescriptor.php b/src/Symfony/Component/Messenger/Handler/HandlerDescriptor.php
index 821754b37bb81..98d0bced59b4b 100644
--- a/src/Symfony/Component/Messenger/Handler/HandlerDescriptor.php
+++ b/src/Symfony/Component/Messenger/Handler/HandlerDescriptor.php
@@ -69,7 +69,7 @@ public function getBatchHandler(): ?BatchHandlerInterface
         return $this->batchHandler;
     }
 
-    public function getOption(string $option)
+    public function getOption(string $option): mixed
     {
         return $this->options[$option] ?? null;
     }
diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php
index da08f21d3781c..b1cb42d7e3dba 100644
--- a/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php
+++ b/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php
@@ -112,7 +112,7 @@ private function safelyUnserialize(string $contents): Envelope
     /**
      * @internal
      */
-    public static function handleUnserializeCallback(string $class)
+    public static function handleUnserializeCallback(string $class): never
     {
         throw new MessageDecodingFailedException(sprintf('Message class "%s" not found during decoding.', $class));
     }
diff --git a/src/Symfony/Component/Mime/Header/Headers.php b/src/Symfony/Component/Mime/Header/Headers.php
index ef1c44a7fe6d3..57d730127ba09 100644
--- a/src/Symfony/Component/Mime/Header/Headers.php
+++ b/src/Symfony/Component/Mime/Header/Headers.php
@@ -264,7 +264,7 @@ public function toArray(): array
         return $arr;
     }
 
-    public function getHeaderBody(string $name)
+    public function getHeaderBody(string $name): mixed
     {
         return $this->has($name) ? $this->get($name)->getBody() : null;
     }
diff --git a/src/Symfony/Component/Notifier/Transport/Dsn.php b/src/Symfony/Component/Notifier/Transport/Dsn.php
index 3d38f1444c07f..fa37b6d338eb0 100644
--- a/src/Symfony/Component/Notifier/Transport/Dsn.php
+++ b/src/Symfony/Component/Notifier/Transport/Dsn.php
@@ -79,12 +79,12 @@ public function getPort(int $default = null): ?int
         return $this->port ?? $default;
     }
 
-    public function getOption(string $key, mixed $default = null)
+    public function getOption(string $key, mixed $default = null): mixed
     {
         return $this->options[$key] ?? $default;
     }
 
-    public function getRequiredOption(string $key)
+    public function getRequiredOption(string $key): mixed
     {
         if (!\array_key_exists($key, $this->options) || '' === trim($this->options[$key])) {
             throw new MissingRequiredOptionException($key);
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index 7defb879f77a7..6a38e965aad37 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -912,7 +912,7 @@ public function stop(float $timeout = 10, int $signal = null): ?int
      *
      * @internal
      */
-    public function addOutput(string $line)
+    public function addOutput(string $line): void
     {
         $this->lastOutputTime = microtime(true);
 
@@ -926,7 +926,7 @@ public function addOutput(string $line)
      *
      * @internal
      */
-    public function addErrorOutput(string $line)
+    public function addErrorOutput(string $line): void
     {
         $this->lastOutputTime = microtime(true);
 
diff --git a/src/Symfony/Component/RateLimiter/Policy/Window.php b/src/Symfony/Component/RateLimiter/Policy/Window.php
index 19f436ac1a16c..ec3e458787e5a 100644
--- a/src/Symfony/Component/RateLimiter/Policy/Window.php
+++ b/src/Symfony/Component/RateLimiter/Policy/Window.php
@@ -44,7 +44,7 @@ public function getExpirationTime(): ?int
         return $this->intervalInSeconds;
     }
 
-    public function add(int $hits = 1, float $now = null)
+    public function add(int $hits = 1, float $now = null): void
     {
         $now ??= microtime(true);
         if (($now - $this->timer) > $this->intervalInSeconds) {
diff --git a/src/Symfony/Component/Routing/CompiledRoute.php b/src/Symfony/Component/Routing/CompiledRoute.php
index 745120a6df65f..8664158db4e40 100644
--- a/src/Symfony/Component/Routing/CompiledRoute.php
+++ b/src/Symfony/Component/Routing/CompiledRoute.php
@@ -86,7 +86,7 @@ public function __unserialize(array $data): void
     /**
      * @internal
      */
-    final public function unserialize(string $serialized)
+    final public function unserialize(string $serialized): void
     {
         $this->__unserialize(unserialize($serialized, ['allowed_classes' => false]));
     }
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
index 900547e0acdf6..ac8d8bc6e9086 100644
--- a/src/Symfony/Component/Routing/Route.php
+++ b/src/Symfony/Component/Routing/Route.php
@@ -102,7 +102,7 @@ public function __unserialize(array $data): void
     /**
      * @internal
      */
-    final public function unserialize(string $serialized)
+    final public function unserialize(string $serialized): void
     {
         $this->__unserialize(unserialize($serialized));
     }
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
index 4416cda6168cd..10cb8f776e5ba 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
@@ -172,7 +172,7 @@ final public function serialize(): string
     /**
      * @internal
      */
-    final public function unserialize(string $serialized)
+    final public function unserialize(string $serialized): void
     {
         $this->__unserialize(unserialize($serialized));
     }
diff --git a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
index 8f1dc60b12688..73b4dd434db69 100644
--- a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
+++ b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php
@@ -137,7 +137,7 @@ public function isInteractive(): bool
         return true;
     }
 
-    public function setTranslator(TranslatorInterface $translator)
+    public function setTranslator(TranslatorInterface $translator): void
     {
         $this->translator = $translator;
     }
diff --git a/src/Symfony/Component/Security/Http/Event/LazyResponseEvent.php b/src/Symfony/Component/Security/Http/Event/LazyResponseEvent.php
index 46a25eed0725a..b9ea71c749210 100644
--- a/src/Symfony/Component/Security/Http/Event/LazyResponseEvent.php
+++ b/src/Symfony/Component/Security/Http/Event/LazyResponseEvent.php
@@ -31,7 +31,7 @@ public function __construct(parent $event)
         $this->event = $event;
     }
 
-    public function setResponse(Response $response)
+    public function setResponse(Response $response): never
     {
         $this->stopPropagation();
         $this->event->stopPropagation();
diff --git a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
index ad343ef085dad..9f4337975c58b 100644
--- a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php
@@ -60,11 +60,9 @@ public function supports(Request $request): ?bool
     /**
      * Handles access authorization.
      *
-     * @void
-     *
      * @throws AccessDeniedException
      */
-    public function authenticate(RequestEvent $event)
+    public function authenticate(RequestEvent $event): void
     {
         $request = $event->getRequest();
 
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
index f9b36fb35a28a..baf8dff3fddbd 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -251,7 +251,7 @@ protected function refreshUser(TokenInterface $token): ?TokenInterface
         throw new \RuntimeException(sprintf('There is no user provider for user "%s". Shouldn\'t the "supportsClass()" method of your user provider return true for this classname?', $userClass));
     }
 
-    private function safelyUnserialize(string $serializedToken)
+    private function safelyUnserialize(string $serializedToken): mixed
     {
         $token = null;
         $prevUnserializeHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
@@ -323,7 +323,7 @@ private static function hasUserChanged(UserInterface $originalUser, TokenInterfa
     /**
      * @internal
      */
-    public static function handleUnserializeCallback(string $class)
+    public static function handleUnserializeCallback(string $class): never
     {
         throw new \ErrorException('Class not found: '.$class, 0x37313BC);
     }
diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
index 5d7545a5a7c69..81fa06173faa6 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
@@ -225,7 +225,7 @@ protected function setTargetPath(Request $request): void
         }
     }
 
-    private function throwUnauthorizedException(AuthenticationException $authException)
+    private function throwUnauthorizedException(AuthenticationException $authException): never
     {
         $this->logger?->notice(sprintf('No Authentication entry point configured, returning a %s HTTP response. Configure "entry_point" on the firewall "%s" if you want to modify the response.', Response::HTTP_UNAUTHORIZED, $this->firewallName));
 
diff --git a/src/Symfony/Component/Translation/Provider/Dsn.php b/src/Symfony/Component/Translation/Provider/Dsn.php
index 77577b0f64df2..af75cb3ae6721 100644
--- a/src/Symfony/Component/Translation/Provider/Dsn.php
+++ b/src/Symfony/Component/Translation/Provider/Dsn.php
@@ -79,12 +79,12 @@ public function getPort(int $default = null): ?int
         return $this->port ?? $default;
     }
 
-    public function getOption(string $key, mixed $default = null)
+    public function getOption(string $key, mixed $default = null): mixed
     {
         return $this->options[$key] ?? $default;
     }
 
-    public function getRequiredOption(string $key)
+    public function getRequiredOption(string $key): mixed
     {
         if (!\array_key_exists($key, $this->options) || '' === trim($this->options[$key])) {
             throw new MissingRequiredOptionException($key);
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
index f1cc47e7fbf67..ddfbcfd83a06f 100644
--- a/src/Symfony/Component/Yaml/Parser.php
+++ b/src/Symfony/Component/Yaml/Parser.php
@@ -99,7 +99,7 @@ public function parse(string $value, int $flags = 0): mixed
         return $data;
     }
 
-    private function doParse(string $value, int $flags)
+    private function doParse(string $value, int $flags): mixed
     {
         $this->currentLineNb = -1;
         $this->currentLine = '';
@@ -503,7 +503,7 @@ private function doParse(string $value, int $flags)
         return empty($data) ? null : $data;
     }
 
-    private function parseBlock(int $offset, string $yaml, int $flags)
+    private function parseBlock(int $offset, string $yaml, int $flags): mixed
     {
         $skippedLineNumbers = $this->skippedLineNumbers;
 
diff --git a/src/Symfony/Component/Yaml/Tag/TaggedValue.php b/src/Symfony/Component/Yaml/Tag/TaggedValue.php
index c7946c27ec4d0..3e09b93ee021f 100644
--- a/src/Symfony/Component/Yaml/Tag/TaggedValue.php
+++ b/src/Symfony/Component/Yaml/Tag/TaggedValue.php
@@ -31,7 +31,7 @@ public function getTag(): string
         return $this->tag;
     }
 
-    public function getValue()
+    public function getValue(): mixed
     {
         return $this->value;
     }

From f8c450ceb5e57b2f52ee508c91b665c23ca0acaa Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 24 Apr 2023 16:34:38 +0200
Subject: [PATCH 461/475] cs fix

---
 .../Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
index 6bacc7426c6bc..12f48b22f305e 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
@@ -23,7 +23,6 @@
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaConfig;
-use Doctrine\DBAL\Statement;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection;

From 6ff8c28c03303817294737f5cce75c6c501b4da1 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Fri, 24 Mar 2023 08:21:19 -0400
Subject: [PATCH 462/475] [Scheduler] add "hashed" cron expression support

---
 psalm.xml                                     |  2 +
 .../Component/Scheduler/RecurringMessage.php  | 10 +-
 .../Scheduler/Tests/RecurringMessageTest.php  | 45 +++++++++
 .../Trigger/CronExpressionTriggerTest.php     | 99 +++++++++++++++++++
 .../Trigger/CronExpressionTrigger.php         | 79 ++++++++++++++-
 src/Symfony/Component/Scheduler/composer.json |  2 +-
 6 files changed, 233 insertions(+), 4 deletions(-)
 create mode 100644 src/Symfony/Component/Scheduler/Tests/RecurringMessageTest.php
 create mode 100644 src/Symfony/Component/Scheduler/Tests/Trigger/CronExpressionTriggerTest.php

diff --git a/psalm.xml b/psalm.xml
index 7a895615e7457..e6cfa6009e135 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -26,6 +26,8 @@
                 <referencedClass name="BackedEnum"/>
                 <referencedClass name="ReflectionIntersectionType"/>
                 <referencedClass name="UnitEnum"/>
+                <!-- These classes have been added in PHP 8.2 -->
+                <referencedClass name="Random\*"/>
             </errorLevel>
         </UndefinedClass>
         <UndefinedDocblockClass>
diff --git a/src/Symfony/Component/Scheduler/RecurringMessage.php b/src/Symfony/Component/Scheduler/RecurringMessage.php
index b4e9e0ce8947e..4e89adc8c783a 100644
--- a/src/Symfony/Component/Scheduler/RecurringMessage.php
+++ b/src/Symfony/Component/Scheduler/RecurringMessage.php
@@ -43,7 +43,15 @@ public static function every(string $frequency, object $message, string|\DateTim
 
     public static function cron(string $expression, object $message): self
     {
-        return new self(CronExpressionTrigger::fromSpec($expression), $message);
+        if (!str_contains($expression, '#')) {
+            return new self(CronExpressionTrigger::fromSpec($expression), $message);
+        }
+
+        if (!$message instanceof \Stringable) {
+            throw new InvalidArgumentException('A message must be stringable to use "hashed" cron expressions.');
+        }
+
+        return new self(CronExpressionTrigger::fromSpec($expression, (string) $message), $message);
     }
 
     public static function trigger(TriggerInterface $trigger, object $message): self
diff --git a/src/Symfony/Component/Scheduler/Tests/RecurringMessageTest.php b/src/Symfony/Component/Scheduler/Tests/RecurringMessageTest.php
new file mode 100644
index 0000000000000..390fd007d6bac
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/RecurringMessageTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Random\Randomizer;
+use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
+use Symfony\Component\Scheduler\RecurringMessage;
+
+class RecurringMessageTest extends TestCase
+{
+    public function testCanCreateHashedCronMessage()
+    {
+        $object = new class() {
+            public function __toString(): string
+            {
+                return 'my task';
+            }
+        };
+
+        if (class_exists(Randomizer::class)) {
+            $this->assertSame('30 0 * * *', (string) RecurringMessage::cron('#midnight', $object)->getTrigger());
+            $this->assertSame('30 0 * * 3', (string) RecurringMessage::cron('#weekly', $object)->getTrigger());
+        } else {
+            $this->assertSame('36 0 * * *', (string) RecurringMessage::cron('#midnight', $object)->getTrigger());
+            $this->assertSame('36 0 * * 6', (string) RecurringMessage::cron('#weekly', $object)->getTrigger());
+        }
+    }
+
+    public function testHashedCronContextIsRequiredIfMessageIsNotStringable()
+    {
+        $this->expectException(InvalidArgumentException::class);
+
+        RecurringMessage::cron('#midnight', new \stdClass());
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/CronExpressionTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/CronExpressionTriggerTest.php
new file mode 100644
index 0000000000000..db21020c61e0b
--- /dev/null
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/CronExpressionTriggerTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Scheduler\Tests\Trigger;
+
+use PHPUnit\Framework\TestCase;
+use Random\Randomizer;
+use Symfony\Component\Scheduler\Trigger\CronExpressionTrigger;
+
+class CronExpressionTriggerTest extends TestCase
+{
+    /**
+     * @dataProvider hashedExpressionProvider
+     */
+    public function testHashedExpressionParsing(string $input, string $expected)
+    {
+        $triggerA = CronExpressionTrigger::fromSpec($input, 'my task');
+        $triggerB = CronExpressionTrigger::fromSpec($input, 'my task');
+        $triggerC = CronExpressionTrigger::fromSpec($input, 'another task');
+
+        $this->assertSame($expected, (string) $triggerA);
+        $this->assertSame((string) $triggerB, (string) $triggerA);
+        $this->assertNotSame((string) $triggerC, (string) $triggerA);
+    }
+
+    public static function hashedExpressionProvider(): array
+    {
+        if (class_exists(Randomizer::class)) {
+            return [
+                ['# * * * *', '30 * * * *'],
+                ['# # * * *', '30 0 * * *'],
+                ['# # # * *', '30 0 25 * *'],
+                ['# # # # *', '30 0 25 10 *'],
+                ['# # # # #', '30 0 25 10 5'],
+                ['# # 1,15 1-11 *', '30 0 1,15 1-11 *'],
+                ['# # 1,15 * *', '30 0 1,15 * *'],
+                ['#hourly', '30 * * * *'],
+                ['#daily', '30 0 * * *'],
+                ['#weekly', '30 0 * * 3'],
+                ['#weekly@midnight', '30 0 * * 3'],
+                ['#monthly', '30 0 25 * *'],
+                ['#monthly@midnight', '30 0 25 * *'],
+                ['#yearly', '30 0 25 10 *'],
+                ['#yearly@midnight', '30 0 25 10 *'],
+                ['#annually', '30 0 25 10 *'],
+                ['#annually@midnight', '30 0 25 10 *'],
+                ['#midnight', '30 0 * * *'],
+                ['#(1-15) * * * *', '1 * * * *'],
+                ['#(1-15) * * * #(3-5)', '1 * * * 3'],
+                ['#(1-15) * # * #(3-5)', '1 * 17 * 5'],
+            ];
+        }
+
+        return [
+            ['# * * * *', '36 * * * *'],
+            ['# # * * *', '36 0 * * *'],
+            ['# # # * *', '36 0 14 * *'],
+            ['# # # # *', '36 0 14 3 *'],
+            ['# # # # #', '36 0 14 3 5'],
+            ['# # 1,15 1-11 *', '36 0 1,15 1-11 *'],
+            ['# # 1,15 * *', '36 0 1,15 * *'],
+            ['#hourly', '36 * * * *'],
+            ['#daily', '36 0 * * *'],
+            ['#weekly', '36 0 * * 6'],
+            ['#weekly@midnight', '36 0 * * 6'],
+            ['#monthly', '36 0 14 * *'],
+            ['#monthly@midnight', '36 0 14 * *'],
+            ['#yearly', '36 0 14 3 *'],
+            ['#yearly@midnight', '36 0 14 3 *'],
+            ['#annually', '36 0 14 3 *'],
+            ['#annually@midnight', '36 0 14 3 *'],
+            ['#midnight', '36 0 * * *'],
+            ['#(1-15) * * * *', '7 * * * *'],
+            ['#(1-15) * * * #(3-5)', '7 * * * 3'],
+            ['#(1-15) * # * #(3-5)', '7 * 1 * 5'],
+        ];
+    }
+
+    public function testHashFieldsAreRandomizedIndependently()
+    {
+        $parts = explode(' ', (string) CronExpressionTrigger::fromSpec('#(1-6) #(1-6) #(1-6) #(1-6) #(1-6)', 'some context'));
+
+        $this->assertNotCount(1, array_unique($parts));
+    }
+
+    public function testFromHashWithStandardExpression()
+    {
+        $this->assertSame('56 20 1 9 0', (string) CronExpressionTrigger::fromSpec('56 20 1 9 0', 'some context'));
+        $this->assertSame('0 0 * * *', (string) CronExpressionTrigger::fromSpec('@daily'));
+    }
+}
diff --git a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
index 8393753967657..c8465965570d1 100644
--- a/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
+++ b/src/Symfony/Component/Scheduler/Trigger/CronExpressionTrigger.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Scheduler\Trigger;
 
 use Cron\CronExpression;
+use Random\Engine\Xoshiro256StarStar;
+use Random\Randomizer;
 use Symfony\Component\Scheduler\Exception\LogicException;
 
 /**
@@ -23,6 +25,27 @@
  */
 final class CronExpressionTrigger implements TriggerInterface
 {
+    private const HASH_ALIAS_MAP = [
+        '#hourly' => '# * * * *',
+        '#daily' => '# # * * *',
+        '#weekly' => '# # * * #',
+        '#weekly@midnight' => '# #(0-2) * * #',
+        '#monthly' => '# # # * *',
+        '#monthly@midnight' => '# #(0-2) # * *',
+        '#annually' => '# # # # *',
+        '#annually@midnight' => '# #(0-2) # # *',
+        '#yearly' => '# # # # *',
+        '#yearly@midnight' => '# #(0-2) # # *',
+        '#midnight' => '# #(0-2) * * *',
+    ];
+    private const HASH_RANGES = [
+        [0, 59],
+        [0, 23],
+        [1, 28],
+        [1, 12],
+        [0, 6],
+    ];
+
     public function __construct(
         private readonly CronExpression $expression = new CronExpression('* * * * *'),
     ) {
@@ -33,17 +56,69 @@ public function __toString(): string
         return $this->expression->getExpression();
     }
 
-    public static function fromSpec(string $expression = '* * * * *'): self
+    public static function fromSpec(string $expression = '* * * * *', string $context = null): self
     {
         if (!class_exists(CronExpression::class)) {
             throw new LogicException(sprintf('You cannot use "%s" as the "cron expression" package is not installed. Try running "composer require dragonmantank/cron-expression".', __CLASS__));
         }
 
-        return new self(new CronExpression($expression));
+        if (!str_contains($expression, '#')) {
+            return new self(new CronExpression($expression));
+        }
+
+        if (null === $context) {
+            throw new LogicException('A context must be provided to use "hashed" cron expressions.');
+        }
+
+        return new self(new CronExpression(self::parseHashed($expression, $context)));
     }
 
     public function getNextRunDate(\DateTimeImmutable $run): ?\DateTimeImmutable
     {
         return \DateTimeImmutable::createFromMutable($this->expression->getNextRunDate($run));
     }
+
+    private static function parseHashed(string $expression, string $context): string
+    {
+        $expression = self::HASH_ALIAS_MAP[$expression] ?? $expression;
+        $parts = explode(' ', $expression);
+
+        if (5 !== \count($parts)) {
+            return $expression;
+        }
+
+        $hashEngine = self::hashEngine($context);
+
+        foreach ($parts as $position => $part) {
+            if (preg_match('#^\#(\((\d+)-(\d+)\))?$#', $part, $matches)) {
+                $parts[$position] = $hashEngine(
+                    (int) ($matches[2] ?? self::HASH_RANGES[$position][0]),
+                    (int) ($matches[3] ?? self::HASH_RANGES[$position][1]),
+                );
+            }
+        }
+
+        return implode(' ', $parts);
+    }
+
+    /**
+     * @return callable(int,int):int
+     */
+    private static function hashEngine(string $context): callable
+    {
+        if (class_exists(Randomizer::class)) {
+            $randomizer = new Randomizer(new Xoshiro256StarStar(hash('sha256', $context, true)));
+
+            return static fn ($start, $end) => $randomizer->getInt($start, $end);
+        }
+
+        $counter = 0;
+
+        return static function ($start, $end) use ($context, &$counter) {
+            $possibleValues = range($start, $end);
+            ++$counter;
+
+            return $possibleValues[(int) fmod(hexdec(substr(md5($context.'-'.$counter), 0, 10)), \count($possibleValues))];
+        };
+    }
 }
diff --git a/src/Symfony/Component/Scheduler/composer.json b/src/Symfony/Component/Scheduler/composer.json
index 308c79d42e070..c515aff29c890 100644
--- a/src/Symfony/Component/Scheduler/composer.json
+++ b/src/Symfony/Component/Scheduler/composer.json
@@ -24,7 +24,7 @@
         "symfony/clock": "^6.3"
     },
     "require-dev": {
-        "dragonmantank/cron-expression": "^3",
+        "dragonmantank/cron-expression": "^3.1",
         "symfony/cache": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
         "symfony/lock": "^5.4|^6.0",

From f0b9511474ddb007a248b2b75b072448be9b52b2 Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Sun, 23 Apr 2023 22:29:19 +0200
Subject: [PATCH 463/475] Add missing return types

---
 .github/expected-missing-return-types.diff    | 183 ++++++++++++++----
 .../Component/BrowserKit/AbstractBrowser.php  |   2 +
 .../Component/Cache/Adapter/ArrayAdapter.php  |   6 +-
 .../Cache/Adapter/MemcachedAdapter.php        |   2 +-
 .../DependencyInjection/CachePoolPass.php     |   3 +
 .../Component/Config/Definition/BaseNode.php  |   2 +
 .../Config/Definition/PrototypedArrayNode.php |   2 +
 src/Symfony/Component/Config/FileLocator.php  |   3 +
 .../Component/Config/Loader/FileLoader.php    |   6 +-
 .../Config/ResourceCheckerConfigCache.php     |   2 +-
 .../Console/Command/LockableTrait.php         |   2 +-
 .../Console/Formatter/OutputFormatter.php     |   3 +
 .../Component/Console/Helper/Helper.php       |   3 +
 .../Component/Console/Helper/Table.php        |  14 +-
 src/Symfony/Component/Console/Input/Input.php |   7 +
 .../Component/Console/Output/Output.php       |   2 +
 16 files changed, 193 insertions(+), 49 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index 372396a814603..c4d3f78983720 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -1195,7 +1195,7 @@ index cffea43c49..0645fbd756 100644
      {
          $this->packages[$name] = $package;
 diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
-index c6014ca81e..c0d4cf84bb 100644
+index 5c263e6fac..3482ed2397 100644
 --- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 +++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 @@ -67,5 +67,5 @@ abstract class AbstractBrowser
@@ -1254,21 +1254,28 @@ index c6014ca81e..c0d4cf84bb 100644
 +    abstract protected function doRequest(object $request): object;
  
      /**
-@@ -493,5 +493,5 @@ abstract class AbstractBrowser
+@@ -485,5 +485,5 @@ abstract class AbstractBrowser
+      * @throws LogicException When this abstract class is not implemented
+      */
+-    protected function getScript(object $request)
++    protected function getScript(object $request): string
+     {
+         throw new LogicException('To insulate requests, you need to override the getScript() method.');
+@@ -495,5 +495,5 @@ abstract class AbstractBrowser
       * @return object
       */
 -    protected function filterRequest(Request $request)
 +    protected function filterRequest(Request $request): object
      {
          return $request;
-@@ -503,5 +503,5 @@ abstract class AbstractBrowser
+@@ -505,5 +505,5 @@ abstract class AbstractBrowser
       * @return Response
       */
 -    protected function filterResponse(object $response)
 +    protected function filterResponse(object $response): Response
      {
          return $response;
-@@ -628,5 +628,5 @@ abstract class AbstractBrowser
+@@ -630,5 +630,5 @@ abstract class AbstractBrowser
       * @return void
       */
 -    public function restart()
@@ -1339,6 +1346,28 @@ index 7fce4e32b0..a7f192c5e3 100644
 +    public function add(Request $request): void
      {
          $this->stack = \array_slice($this->stack, 0, $this->position + 1);
+diff --git a/src/Symfony/Component/BrowserKit/Tests/TestClient.php b/src/Symfony/Component/BrowserKit/Tests/TestClient.php
+index c98c650298..47c76ad5e5 100644
+--- a/src/Symfony/Component/BrowserKit/Tests/TestClient.php
++++ b/src/Symfony/Component/BrowserKit/Tests/TestClient.php
+@@ -42,5 +42,5 @@ class TestClient extends AbstractBrowser
+     }
+ 
+-    protected function getScript(object $request)
++    protected function getScript(object $request): string
+     {
+         $r = new \ReflectionClass(Response::class);
+diff --git a/src/Symfony/Component/BrowserKit/Tests/TestHttpClient.php b/src/Symfony/Component/BrowserKit/Tests/TestHttpClient.php
+index afb0197c91..7a3c9a7ec6 100644
+--- a/src/Symfony/Component/BrowserKit/Tests/TestHttpClient.php
++++ b/src/Symfony/Component/BrowserKit/Tests/TestHttpClient.php
+@@ -65,5 +65,5 @@ class TestHttpClient extends HttpBrowser
+     }
+ 
+-    protected function getScript(object $request)
++    protected function getScript(object $request): string
+     {
+         $r = new \ReflectionClass(Response::class);
 diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
 index 3dc93fd541..8a7df7a19b 100644
 --- a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
@@ -1351,7 +1380,7 @@ index 3dc93fd541..8a7df7a19b 100644
      {
          return \function_exists('apcu_fetch') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOL);
 diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
-index ca5bcaded8..90c2bf5080 100644
+index 319dc0487b..6a4f825360 100644
 --- a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
 +++ b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
 @@ -264,5 +264,5 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
@@ -1373,7 +1402,7 @@ index ffaa56f3ed..c63206e18d 100644
      {
          foreach ($this->adapters as $adapter) {
 diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
-index d447e9f2fd..1f99e0725e 100644
+index 054f6d1957..68731fb028 100644
 --- a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
 +++ b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
 @@ -71,5 +71,5 @@ class MemcachedAdapter extends AbstractAdapter
@@ -1478,12 +1507,12 @@ index 6793bea94c..230575ef42 100644
      {
          $container->getParameterBag()->remove('cache.prefix.seed');
 diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
-index 3a9d4f23db..8e9253824d 100644
+index 5055ba9918..3d92c9844f 100644
 --- a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
 +++ b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
-@@ -30,5 +30,5 @@ use Symfony\Component\DependencyInjection\Reference;
- class CachePoolPass implements CompilerPassInterface
- {
+@@ -33,5 +33,5 @@ class CachePoolPass implements CompilerPassInterface
+      * @return void
+      */
 -    public function process(ContainerBuilder $container)
 +    public function process(ContainerBuilder $container): void
      {
@@ -1595,7 +1624,7 @@ index 1448220cdd..12935fb079 100644
      {
          if (!\is_array($value) && (!$this->allowFalse || false !== $value)) {
 diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
-index f2e32384a9..b42bc8d3c7 100644
+index 85f0f7eebd..f2c3ca0d0d 100644
 --- a/src/Symfony/Component/Config/Definition/BaseNode.php
 +++ b/src/Symfony/Component/Config/Definition/BaseNode.php
 @@ -102,5 +102,5 @@ abstract class BaseNode implements NodeInterface
@@ -1682,6 +1711,13 @@ index f2e32384a9..b42bc8d3c7 100644
 +    public function setFinalValidationClosures(array $closures): void
      {
          $this->finalValidationClosures = $closures;
+@@ -447,5 +447,5 @@ abstract class BaseNode implements NodeInterface
+      * @throws InvalidTypeException when the value is invalid
+      */
+-    abstract protected function validateType(mixed $value);
++    abstract protected function validateType(mixed $value): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Config/Definition/BooleanNode.php b/src/Symfony/Component/Config/Definition/BooleanNode.php
 index 7ec903cd67..9a86de2559 100644
 --- a/src/Symfony/Component/Config/Definition/BooleanNode.php
@@ -1872,7 +1908,7 @@ index 9dce7444b0..46ab38e3ff 100644
 +    public function setName(string $name): void;
  }
 diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
-index 11910fb338..58489913ce 100644
+index c105ac1f30..1ea0880c9b 100644
 --- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
 +++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
 @@ -41,5 +41,5 @@ class PrototypedArrayNode extends ArrayNode
@@ -1910,11 +1946,11 @@ index 11910fb338..58489913ce 100644
 +    public function setPrototype(PrototypeNodeInterface $node): void
      {
          $this->prototype = $node;
-@@ -159,5 +159,5 @@ class PrototypedArrayNode extends ArrayNode
+@@ -161,5 +161,5 @@ class PrototypedArrayNode extends ArrayNode
       * @throws Exception
       */
 -    public function addChild(NodeInterface $node)
-+    public function addChild(NodeInterface $node): void
++    public function addChild(NodeInterface $node): never
      {
          throw new Exception('A prototyped array node cannot have concrete children.');
 diff --git a/src/Symfony/Component/Config/Definition/ScalarNode.php b/src/Symfony/Component/Config/Definition/ScalarNode.php
@@ -1983,12 +2019,12 @@ index 57afd6a8db..3d662340ea 100644
      {
          if (\is_object($var)) {
 diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php
-index ab18232db1..bc5af7f89c 100644
+index e147d9b1aa..6b0ce493ea 100644
 --- a/src/Symfony/Component/Config/FileLocator.php
 +++ b/src/Symfony/Component/Config/FileLocator.php
-@@ -31,5 +31,5 @@ class FileLocator implements FileLocatorInterface
-     }
- 
+@@ -34,5 +34,5 @@ class FileLocator implements FileLocatorInterface
+      * @return string|array
+      */
 -    public function locate(string $name, string $currentPath = null, bool $first = true)
 +    public function locate(string $name, string $currentPath = null, bool $first = true): string|array
      {
@@ -2004,10 +2040,17 @@ index e3ca1d49c4..526d350484 100644
 +    public function locate(string $name, string $currentPath = null, bool $first = true): string|array;
  }
 diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
-index 3f06f0c38c..ce0fd1d76d 100644
+index 8cfaa23ba2..68a4120506 100644
 --- a/src/Symfony/Component/Config/Loader/FileLoader.php
 +++ b/src/Symfony/Component/Config/Loader/FileLoader.php
-@@ -67,5 +67,5 @@ abstract class FileLoader extends Loader
+@@ -43,5 +43,5 @@ abstract class FileLoader extends Loader
+      * @return void
+      */
+-    public function setCurrentDir(string $dir)
++    public function setCurrentDir(string $dir): void
+     {
+         $this->currentDir = $dir;
+@@ -71,5 +71,5 @@ abstract class FileLoader extends Loader
       * @throws FileLocatorFileNotFoundException
       */
 -    public function import(mixed $resource, string $type = null, bool $ignoreErrors = false, string $sourceResource = null, string|array $exclude = null)
@@ -2075,7 +2118,7 @@ index 670e320122..134e4069e7 100644
      {
          $this->loaders[] = $loader;
 diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
-index 93e5c44d39..e00acc3d7f 100644
+index a8478a8cc3..d2ec80ec99 100644
 --- a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
 +++ b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
 @@ -110,5 +110,5 @@ class ResourceCheckerConfigCache implements ConfigCacheInterface
@@ -2389,7 +2432,7 @@ index 9925a5f746..e72fb5fc89 100644
      {
          if (null === $this->logger) {
 diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
-index 88519f725d..8d728257fe 100644
+index 9cb6310484..327aa3671c 100644
 --- a/src/Symfony/Component/Console/Formatter/OutputFormatter.php
 +++ b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
 @@ -85,5 +85,5 @@ class OutputFormatter implements WrappableOutputFormatterInterface
@@ -2406,9 +2449,9 @@ index 88519f725d..8d728257fe 100644
 +    public function setStyle(string $name, OutputFormatterStyleInterface $style): void
      {
          $this->styles[strtolower($name)] = $style;
-@@ -122,5 +122,5 @@ class OutputFormatter implements WrappableOutputFormatterInterface
-     }
- 
+@@ -125,5 +125,5 @@ class OutputFormatter implements WrappableOutputFormatterInterface
+      * @return string
+      */
 -    public function formatAndWrap(?string $message, int $width)
 +    public function formatAndWrap(?string $message, int $width): string
      {
@@ -2549,7 +2592,7 @@ index eb32bce8fc..57edd56954 100644
      {
          $options = array_merge([
 diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
-index 77de9daba2..a41cbd8111 100644
+index 3631b30f69..5e4407a591 100644
 --- a/src/Symfony/Component/Console/Helper/Helper.php
 +++ b/src/Symfony/Component/Console/Helper/Helper.php
 @@ -27,5 +27,5 @@ abstract class Helper implements HelperInterface
@@ -2559,14 +2602,21 @@ index 77de9daba2..a41cbd8111 100644
 +    public function setHelperSet(HelperSet $helperSet = null): void
      {
          if (1 > \func_num_args()) {
-@@ -124,5 +124,5 @@ abstract class Helper implements HelperInterface
+@@ -95,5 +95,5 @@ abstract class Helper implements HelperInterface
+      * @return string
+      */
+-    public static function formatTime(int|float $secs)
++    public static function formatTime(int|float $secs): string
+     {
+         static $timeFormats = [
+@@ -127,5 +127,5 @@ abstract class Helper implements HelperInterface
       * @return string
       */
 -    public static function formatMemory(int $memory)
 +    public static function formatMemory(int $memory): string
      {
          if ($memory >= 1024 * 1024 * 1024) {
-@@ -144,5 +144,5 @@ abstract class Helper implements HelperInterface
+@@ -147,5 +147,5 @@ abstract class Helper implements HelperInterface
       * @return string
       */
 -    public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string)
@@ -2695,16 +2745,30 @@ index 8ebc84376b..4af2691707 100644
      {
          if ($output instanceof SymfonyStyle) {
 diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
-index 26be690473..c248d4819b 100644
+index cf714873f5..e16ffaf97d 100644
 --- a/src/Symfony/Component/Console/Helper/Table.php
 +++ b/src/Symfony/Component/Console/Helper/Table.php
-@@ -193,5 +193,5 @@ class Table
+@@ -70,5 +70,5 @@ class Table
+      * @return void
+      */
+-    public static function setStyleDefinition(string $name, TableStyle $style)
++    public static function setStyleDefinition(string $name, TableStyle $style): void
+     {
+         self::$styles ??= self::initStyles();
+@@ -195,5 +195,5 @@ class Table
       * @return $this
       */
 -    public function setRows(array $rows)
 +    public function setRows(array $rows): static
      {
          $this->rows = [];
+@@ -316,5 +316,5 @@ class Table
+      * @return void
+      */
+-    public function render()
++    public function render(): void
+     {
+         $divider = new TableSeparator();
 diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
 index 59f9217ec5..77b402b7d7 100644
 --- a/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -2735,7 +2799,7 @@ index 355de61dd6..c6b82a2886 100644
      {
          foreach ($this->parameters as $key => $value) {
 diff --git a/src/Symfony/Component/Console/Input/Input.php b/src/Symfony/Component/Console/Input/Input.php
-index 22ede15e11..d8e5f58b74 100644
+index 0f5617cd17..bdd5dd264f 100644
 --- a/src/Symfony/Component/Console/Input/Input.php
 +++ b/src/Symfony/Component/Console/Input/Input.php
 @@ -47,5 +47,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
@@ -2745,35 +2809,41 @@ index 22ede15e11..d8e5f58b74 100644
 +    public function bind(InputDefinition $definition): void
      {
          $this->arguments = [];
-@@ -64,5 +64,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
+@@ -61,10 +61,10 @@ abstract class Input implements InputInterface, StreamableInputInterface
+      * @return void
+      */
+-    abstract protected function parse();
++    abstract protected function parse(): void;
+ 
+     /**
       * @return void
       */
 -    public function validate()
 +    public function validate(): void
      {
          $definition = $this->definition;
-@@ -84,5 +84,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
+@@ -86,5 +86,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
       * @return void
       */
 -    public function setInteractive(bool $interactive)
 +    public function setInteractive(bool $interactive): void
      {
          $this->interactive = $interactive;
-@@ -106,5 +106,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
+@@ -108,5 +108,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
       * @return void
       */
 -    public function setArgument(string $name, mixed $value)
 +    public function setArgument(string $name, mixed $value): void
      {
          if (!$this->definition->hasArgument($name)) {
-@@ -145,5 +145,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
+@@ -147,5 +147,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
       * @return void
       */
 -    public function setOption(string $name, mixed $value)
 +    public function setOption(string $name, mixed $value): void
      {
          if ($this->definition->hasNegation($name)) {
-@@ -174,5 +174,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
+@@ -178,5 +178,5 @@ abstract class Input implements InputInterface, StreamableInputInterface
       * @return void
       */
 -    public function setStream($stream)
@@ -3054,7 +3124,7 @@ index f3aa15b1d4..206df78910 100644
      {
          // do nothing
 diff --git a/src/Symfony/Component/Console/Output/Output.php b/src/Symfony/Component/Console/Output/Output.php
-index 29761351f9..0a599c6042 100644
+index 3a06311a8b..8204b8a744 100644
 --- a/src/Symfony/Component/Console/Output/Output.php
 +++ b/src/Symfony/Component/Console/Output/Output.php
 @@ -48,5 +48,5 @@ abstract class Output implements OutputInterface
@@ -3092,6 +3162,12 @@ index 29761351f9..0a599c6042 100644
 +    public function write(string|iterable $messages, bool $newline = false, int $options = self::OUTPUT_NORMAL): void
      {
          if (!is_iterable($messages)) {
+@@ -152,4 +152,4 @@ abstract class Output implements OutputInterface
+      * @return void
+      */
+-    abstract protected function doWrite(string $message, bool $newline);
++    abstract protected function doWrite(string $message, bool $newline): void;
+ }
 diff --git a/src/Symfony/Component/Console/Output/OutputInterface.php b/src/Symfony/Component/Console/Output/OutputInterface.php
 index fb1557720f..8b31dee20c 100644
 --- a/src/Symfony/Component/Console/Output/OutputInterface.php
@@ -3469,6 +3545,28 @@ index cecce6c01b..f2e0c7fdf5 100644
 +    public function newLine(int $count = 1): void
      {
          parent::newLine($count);
+diff --git a/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php
+index 6ad89dc522..40020baee7 100644
+--- a/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php
++++ b/src/Symfony/Component/Console/Tests/EventListener/ErrorListenerTest.php
+@@ -141,5 +141,5 @@ class NonStringInput extends Input
+     }
+ 
+-    public function parse()
++    public function parse(): void
+     {
+     }
+diff --git a/src/Symfony/Component/Console/Tests/Output/OutputTest.php b/src/Symfony/Component/Console/Tests/Output/OutputTest.php
+index f337c4ddd5..b7c0a98d9f 100644
+--- a/src/Symfony/Component/Console/Tests/Output/OutputTest.php
++++ b/src/Symfony/Component/Console/Tests/Output/OutputTest.php
+@@ -183,5 +183,5 @@ class TestOutput extends Output
+     }
+ 
+-    protected function doWrite(string $message, bool $newline)
++    protected function doWrite(string $message, bool $newline): void
+     {
+         $this->output .= $message.($newline ? "\n" : '');
 diff --git a/src/Symfony/Component/CssSelector/Parser/Reader.php b/src/Symfony/Component/CssSelector/Parser/Reader.php
 index 7f6ae7a600..d79db02567 100644
 --- a/src/Symfony/Component/CssSelector/Parser/Reader.php
@@ -14595,6 +14693,17 @@ index c1a77ad157..1e926dc83a 100644
 +    public function setParsedLine(int $parsedLine): void
      {
          $this->parsedLine = $parsedLine;
+diff --git a/src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php b/src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php
+index 88f6a0687a..a0f20a6a7c 100644
+--- a/src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php
++++ b/src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php
+@@ -16,5 +16,5 @@ use Psr\Container\ContainerInterface;
+ use Symfony\Contracts\Service\ServiceLocatorTrait;
+ 
+-abstract class ServiceLocatorTest extends TestCase
++abstract class ServiceLocatorTestCase extends TestCase
+ {
+     protected function getServiceLocator(array $factories): ContainerInterface
 diff --git a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
 index db40ba13e0..48928ca959 100644
 --- a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
index c6014ca81eeac..5c263e6facc3b 100644
--- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
+++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
@@ -480,6 +480,8 @@ abstract protected function doRequest(object $request);
      *
      * @param object $request An origin request instance
      *
+     * @return string
+     *
      * @throws LogicException When this abstract class is not implemented
      */
     protected function getScript(object $request)
diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
index ca5bcaded81ea..319dc0487b3e9 100644
--- a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
@@ -298,7 +298,7 @@ private function generateItems(array $keys, float $now, \Closure $f): \Generator
         }
     }
 
-    private function freeze($value, string $key)
+    private function freeze($value, string $key): string|int|float|bool|array|null
     {
         if (null === $value) {
             return 'N;';
@@ -317,7 +317,7 @@ private function freeze($value, string $key)
                 $message = sprintf('Failed to save key "{key}" of type %s: %s', $type, $e->getMessage());
                 CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e, 'cache-adapter' => get_debug_type($this)]);
 
-                return;
+                return null;
             }
             // Keep value serialized if it contains any objects or any internal references
             if ('C' === $serialized[0] || 'O' === $serialized[0] || preg_match('/;[OCRr]:[1-9]/', $serialized)) {
@@ -328,7 +328,7 @@ private function freeze($value, string $key)
         return $value;
     }
 
-    private function unfreeze(string $key, bool &$isHit)
+    private function unfreeze(string $key, bool &$isHit): mixed
     {
         if ('N;' === $value = $this->values[$key]) {
             return null;
diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
index d447e9f2fd88a..054f6d19576e6 100644
--- a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
@@ -289,7 +289,7 @@ protected function doClear(string $namespace): bool
         return '' === $namespace && $this->getClient()->flush();
     }
 
-    private function checkResultCode(mixed $result)
+    private function checkResultCode(mixed $result): mixed
     {
         $code = $this->client->getResultCode();
 
diff --git a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
index 3a9d4f23db3cf..5055ba9918df3 100644
--- a/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
+++ b/src/Symfony/Component/Cache/DependencyInjection/CachePoolPass.php
@@ -29,6 +29,9 @@
  */
 class CachePoolPass implements CompilerPassInterface
 {
+    /**
+     * @return void
+     */
     public function process(ContainerBuilder $container)
     {
         if ($container->hasParameter('cache.prefix.seed')) {
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
index f2e32384a9e23..85f0f7eebd30b 100644
--- a/src/Symfony/Component/Config/Definition/BaseNode.php
+++ b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -442,6 +442,8 @@ final public function finalize(mixed $value): mixed
     /**
      * Validates the type of a Node.
      *
+     * @return void
+     *
      * @throws InvalidTypeException when the value is invalid
      */
     abstract protected function validateType(mixed $value);
diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
index 11910fb33846a..c105ac1f303f0 100644
--- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
+++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
@@ -156,6 +156,8 @@ public function getPrototype(): PrototypeNodeInterface
     /**
      * Disable adding concrete children for prototyped nodes.
      *
+     * @return never
+     *
      * @throws Exception
      */
     public function addChild(NodeInterface $node)
diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php
index ab18232db164c..e147d9b1aaa29 100644
--- a/src/Symfony/Component/Config/FileLocator.php
+++ b/src/Symfony/Component/Config/FileLocator.php
@@ -30,6 +30,9 @@ public function __construct(string|array $paths = [])
         $this->paths = (array) $paths;
     }
 
+    /**
+     * @return string|array
+     */
     public function locate(string $name, string $currentPath = null, bool $first = true)
     {
         if ('' === $name) {
diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php
index 3f06f0c38c23e..8cfaa23ba2b30 100644
--- a/src/Symfony/Component/Config/Loader/FileLoader.php
+++ b/src/Symfony/Component/Config/Loader/FileLoader.php
@@ -39,6 +39,8 @@ public function __construct(FileLocatorInterface $locator, string $env = null)
 
     /**
      * Sets the current directory.
+     *
+     * @return void
      */
     public function setCurrentDir(string $dir)
     {
@@ -62,6 +64,8 @@ public function getLocator(): FileLocatorInterface
      * @param string|null          $sourceResource The original resource importing the new resource
      * @param string|string[]|null $exclude        Glob patterns to exclude from the import
      *
+     * @return mixed
+     *
      * @throws LoaderLoadException
      * @throws FileLoaderImportCircularReferenceException
      * @throws FileLocatorFileNotFoundException
@@ -129,7 +133,7 @@ protected function glob(string $pattern, bool $recursive, array|GlobResource &$r
         yield from $resource;
     }
 
-    private function doImport(mixed $resource, string $type = null, bool $ignoreErrors = false, string $sourceResource = null)
+    private function doImport(mixed $resource, string $type = null, bool $ignoreErrors = false, string $sourceResource = null): mixed
     {
         try {
             $loader = $this->resolve($resource, $type);
diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
index 93e5c44d3963a..a8478a8cc3f0d 100644
--- a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
+++ b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
@@ -143,7 +143,7 @@ private function getMetaFile(): string
         return $this->file.'.meta';
     }
 
-    private function safelyUnserialize(string $file)
+    private function safelyUnserialize(string $file): mixed
     {
         $meta = false;
         $content = file_get_contents($file);
diff --git a/src/Symfony/Component/Console/Command/LockableTrait.php b/src/Symfony/Component/Console/Command/LockableTrait.php
index c5de40dc0d965..c1006a65c0aff 100644
--- a/src/Symfony/Component/Console/Command/LockableTrait.php
+++ b/src/Symfony/Component/Console/Command/LockableTrait.php
@@ -58,7 +58,7 @@ private function lock(string $name = null, bool $blocking = false): bool
     /**
      * Releases the command lock if there is one.
      */
-    private function release()
+    private function release(): void
     {
         if ($this->lock) {
             $this->lock->release();
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
index 88519f725d3c7..9cb6310484f7b 100644
--- a/src/Symfony/Component/Console/Formatter/OutputFormatter.php
+++ b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
@@ -121,6 +121,9 @@ public function format(?string $message): ?string
         return $this->formatAndWrap($message, 0);
     }
 
+    /**
+     * @return string
+     */
     public function formatAndWrap(?string $message, int $width)
     {
         if (null === $m
10000
essage) {
diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
index 77de9daba2ee6..3631b30f692ab 100644
--- a/src/Symfony/Component/Console/Helper/Helper.php
+++ b/src/Symfony/Component/Console/Helper/Helper.php
@@ -91,6 +91,9 @@ public static function substr(?string $string, int $from, int $length = null): s
         return mb_substr($string, $from, $length, $encoding);
     }
 
+    /**
+     * @return string
+     */
     public static function formatTime(int|float $secs)
     {
         static $timeFormats = [
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
index 26be690473a98..cf714873f5b3b 100644
--- a/src/Symfony/Component/Console/Helper/Table.php
+++ b/src/Symfony/Component/Console/Helper/Table.php
@@ -66,6 +66,8 @@ public function __construct(OutputInterface $output)
 
     /**
      * Sets a style definition.
+     *
+     * @return void
      */
     public static function setStyleDefinition(string $name, TableStyle $style)
     {
@@ -310,6 +312,8 @@ public function setVertical(bool $vertical = true): static
      *     | 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |
      *     | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
      *     +---------------+-----------------------+------------------+
+     *
+     * @return void
      */
     public function render()
     {
@@ -450,7 +454,7 @@ public function render()
      *
      *     +-----+-----------+-------+
      */
-    private function renderRowSeparator(int $type = self::SEPARATOR_MID, string $title = null, string $titleFormat = null)
+    private function renderRowSeparator(int $type = self::SEPARATOR_MID, string $title = null, string $titleFormat = null): void
     {
         if (!$count = $this->numberOfColumns) {
             return;
@@ -515,7 +519,7 @@ private function renderColumnSeparator(int $type = self::BORDER_OUTSIDE): string
      *
      *     | 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |
      */
-    private function renderRow(array $row, string $cellFormat, string $firstCellFormat = null)
+    private function renderRow(array $row, string $cellFormat, string $firstCellFormat = null): void
     {
         $rowContent = $this->renderColumnSeparator(self::BORDER_OUTSIDE);
         $columns = $this->getRowColumns($row);
@@ -588,7 +592,7 @@ private function renderCell(array $row, int $column, string $cellFormat): string
     /**
      * Calculate number of columns for this table.
      */
-    private function calculateNumberOfColumns(array $rows)
+    private function calculateNumberOfColumns(array $rows): void
     {
         $columns = [0];
         foreach ($rows as $row) {
@@ -789,7 +793,7 @@ private function getRowColumns(array $row): array
     /**
      * Calculates columns widths.
      */
-    private function calculateColumnsWidth(iterable $groups)
+    private function calculateColumnsWidth(iterable $groups): void
     {
         for ($column = 0; $column < $this->numberOfColumns; ++$column) {
             $lengths = [];
@@ -843,7 +847,7 @@ private function getCellWidth(array $row, int $column): int
     /**
      * Called after rendering to cleanup cache data.
      */
-    private function cleanup()
+    private function cleanup(): void
     {
         $this->effectiveColumnWidths = [];
         unset($this->numberOfColumns);
diff --git a/src/Symfony/Component/Console/Input/Input.php b/src/Symfony/Component/Console/Input/Input.php
index 22ede15e11b07..0f5617cd17a9d 100644
--- a/src/Symfony/Component/Console/Input/Input.php
+++ b/src/Symfony/Component/Console/Input/Input.php
@@ -57,6 +57,8 @@ public function bind(InputDefinition $definition)
 
     /**
      * Processes command line arguments.
+     *
+     * @return void
      */
     abstract protected function parse();
 
@@ -171,6 +173,8 @@ public function escapeToken(string $token): string
     }
 
     /**
+     * @param resource $stream
+     *
      * @return void
      */
     public function setStream($stream)
@@ -178,6 +182,9 @@ public function setStream($stream)
         $this->stream = $stream;
     }
 
+    /**
+     * @return resource
+     */
     public function getStream()
     {
         return $this->stream;
diff --git a/src/Symfony/Component/Console/Output/Output.php b/src/Symfony/Component/Console/Output/Output.php
index 29761351f9029..3a06311a8b6ed 100644
--- a/src/Symfony/Component/Console/Output/Output.php
+++ b/src/Symfony/Component/Console/Output/Output.php
@@ -148,6 +148,8 @@ public function write(string|iterable $messages, bool $newline = false, int $opt
 
     /**
      * Writes a message to the output.
+     *
+     * @return void
      */
     abstract protected function doWrite(string $message, bool $newline);
 }

From dc0f0e266b6e707c6fa2ebd38bffb778f6846242 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Tue, 25 Apr 2023 18:41:00 -0400
Subject: [PATCH 464/475] [Scheduler] add schedule name to `MessageContext`

---
 .../Component/Scheduler/Generator/MessageContext.php   |  3 ++-
 .../Component/Scheduler/Generator/MessageGenerator.php | 10 ++++------
 .../Scheduler/Messenger/SchedulerTransportFactory.php  |  4 +---
 .../Tests/Messenger/SchedulerTransportTest.php         |  7 ++++---
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Component/Scheduler/Generator/MessageContext.php b/src/Symfony/Component/Scheduler/Generator/MessageContext.php
index 51caf94e9e042..849074c6162ad 100644
--- a/src/Symfony/Component/Scheduler/Generator/MessageContext.php
+++ b/src/Symfony/Component/Scheduler/Generator/MessageContext.php
@@ -21,9 +21,10 @@
 final class MessageContext
 {
     public function __construct(
+        public readonly string $name,
         public readonly TriggerInterface $trigger,
         public readonly \DateTimeImmutable $triggeredAt,
-        public readonly \DateTimeImmutable|null $nextTriggerAt = null,
+        public readonly ?\DateTimeImmutable $nextTriggerAt = null,
     ) {
     }
 }
diff --git a/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php b/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
index ffa5618332624..7b4e6b33684b3 100644
--- a/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
+++ b/src/Symfony/Component/Scheduler/Generator/MessageGenerator.php
@@ -27,14 +27,12 @@ final class MessageGenerator implements MessageGeneratorInterface
 
     public function __construct(
         private readonly Schedule $schedule,
-        string|CheckpointInterface $checkpoint,
+        private readonly string $name,
         private readonly ClockInterface $clock = new Clock(),
+        CheckpointInterface $checkpoint = null,
     ) {
         $this->waitUntil = new \DateTimeImmutable('@0');
-        if (\is_string($checkpoint)) {
-            $checkpoint = new Checkpoint('scheduler_checkpoint_'.$checkpoint, $this->schedule->getLock(), $this->schedule->getState());
-        }
-        $this->checkpoint = $checkpoint;
+        $this->checkpoint = $checkpoint ?? new Checkpoint('scheduler_checkpoint_'.$this->name, $this->schedule->getLock(), $this->schedule->getState());
     }
 
     public function getMessages(): \Generator
@@ -70,7 +68,7 @@ public function getMessages(): \Generator
             }
 
             if ($yield) {
-                yield (new MessageContext($trigger, $time, $nextTime)) => $message;
+                yield (new MessageContext($this->name, $trigger, $time, $nextTime)) => $message;
                 $this->checkpoint->save($time, $index);
             }
         }
diff --git a/src/Symfony/Component/Scheduler/Messenger/SchedulerTransportFactory.php b/src/Symfony/Component/Scheduler/Messenger/SchedulerTransportFactory.php
index 9fac1115ae596..3b7fc9b94503f 100644
--- a/src/Symfony/Component/Scheduler/Messenger/SchedulerTransportFactory.php
+++ b/src/Symfony/Component/Scheduler/Messenger/SchedulerTransportFactory.php
@@ -17,7 +17,6 @@
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
 use Symfony\Component\Scheduler\Exception\InvalidArgumentException;
-use Symfony\Component\Scheduler\Generator\Checkpoint;
 use Symfony\Component\Scheduler\Generator\MessageGenerator;
 use Symfony\Component\Scheduler\Schedule;
 
@@ -46,9 +45,8 @@ public function createTransport(string $dsn, array $options, SerializerInterface
 
         /** @var Schedule $schedule */
         $schedule = $this->scheduleProviders->get($scheduleName)->getSchedule();
-        $checkpoint = new Checkpoint('scheduler_checkpoint_'.$scheduleName, $schedule->getLock(), $schedule->getState());
 
-        return new SchedulerTransport(new MessageGenerator($schedule, $checkpoint, $this->clock));
+        return new SchedulerTransport(new MessageGenerator($schedule, $scheduleName, $this->clock));
     }
 
     public function supports(string $dsn, array $options): bool
diff --git a/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php b/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php
index 315048e9fbe0e..3c106626d1336 100644
--- a/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Messenger/SchedulerTransportTest.php
@@ -34,15 +34,16 @@ public function testGetFromIterator()
         $generator->method('getMessages')->willReturnCallback(function () use ($messages): \Generator {
             $trigger = $this->createMock(TriggerInterface::class);
             $triggerAt = new \DateTimeImmutable('2020-02-20T02:00:00', new \DateTimeZone('UTC'));
-            yield (new MessageContext($trigger, $triggerAt)) => $messages[0];
-            yield (new MessageContext($trigger, $triggerAt)) => $messages[1];
+            yield (new MessageContext('default', $trigger, $triggerAt)) => $messages[0];
+            yield (new MessageContext('default', $trigger, $triggerAt)) => $messages[1];
         });
         $transport = new SchedulerTransport($generator);
 
         foreach ($transport->get() as $envelope) {
             $this->assertInstanceOf(Envelope::class, $envelope);
-            $this->assertNotNull($envelope->last(ScheduledStamp::class));
+            $this->assertNotNull($stamp = $envelope->last(ScheduledStamp::class));
             $this->assertSame(array_shift($messages), $envelope->getMessage());
+            $this->assertSame('default', $stamp->messageContext->name);
         }
 
         $this->assertEmpty($messages);

From ab9cefc204977b438ad8c66481ab7ab5d844d4ac Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 26 Apr 2023 18:18:17 +0200
Subject: [PATCH 465/475] [HttpClient] Add PSR-18 to HttplugClient since
 HTTPlug is deprecated

---
 src/Symfony/Component/HttpClient/HttplugClient.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpClient/HttplugClient.php b/src/Symfony/Component/HttpClient/HttplugClient.php
index 406ceb4bc5bbe..6cb815bd2d196 100644
--- a/src/Symfony/Component/HttpClient/HttplugClient.php
+++ b/src/Symfony/Component/HttpClient/HttplugClient.php
@@ -26,6 +26,7 @@
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Nyholm\Psr7\Request;
 use Nyholm\Psr7\Uri;
+use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
@@ -53,6 +54,10 @@
     throw new \LogicException('You cannot use the "Symfony\Component\HttpClient\HttplugClient" as the "psr/http-factory" package is not installed. Try running "composer require nyholm/psr7".');
 }
 
+if (!interface_exists(ClientInterface::class)) {
+    throw new \LogicException('You cannot use "Symfony\Component\HttpClient\HttplugClient" as the "psr/http-client" package is not installed. Try running "composer require psr/http-client".');
+}
+
 /**
  * An adapter to turn a Symfony HttpClientInterface into an Httplug client.
  *
@@ -61,7 +66,7 @@
  *
  * @author Nicolas Grekas <p@tchwork.com>
  */
-final class HttplugClient implements HttplugInterface, HttpAsyncClient, RequestFactoryInterface, StreamFactoryInterface, UriFactoryInterface, RequestFactory, StreamFactory, UriFactory, ResetInterface
+final class HttplugClient implements ClientInterface, HttplugInterface, HttpAsyncClient, RequestFactoryInterface, StreamFactoryInterface, UriFactoryInterface, RequestFactory, StreamFactory, UriFactory, ResetInterface
 {
     private HttpClientInterface $client;
     private ResponseFactoryInterface $responseFactory;

From ef9136cc70f2b00137feb6487b87aa216299ba0e Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Wed, 26 Apr 2023 21:30:20 +0200
Subject: [PATCH 466/475] [Mime] Fix method name in Changelog

---
 src/Symfony/Component/Mime/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Mime/CHANGELOG.md b/src/Symfony/Component/Mime/CHANGELOG.md
index 395226c76bcbb..41eb14a4ec1cf 100644
--- a/src/Symfony/Component/Mime/CHANGELOG.md
+++ b/src/Symfony/Component/Mime/CHANGELOG.md
@@ -5,7 +5,7 @@ CHANGELOG
 ---
 
  * Support detection of related parts if `Content-Id` is used instead of the name
- * Add `TextPart::getDispostion()`
+ * Add `TextPart::getDisposition()`
 
 6.2
 ---

From 1771eb4a231bbc3868f694366a7beaf3f701fa5c Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Thu, 27 Apr 2023 11:33:19 +0200
Subject: [PATCH 467/475] [Notifier] Remove strict_types=1 from test

---
 .../Notifier/Bridge/Telegram/Tests/TelegramOptionsTest.php      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramOptionsTest.php b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramOptionsTest.php
index 8a0b3658d6117..002d6dde47058 100644
--- a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramOptionsTest.php
+++ b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramOptionsTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /*
  * This file is part of the Symfony package.
  *

From 731951d4b5106e84e4d1d1d56d48e4970040b011 Mon Sep 17 00:00:00 2001
From: Hubert Lenoir <Jean-Beru@users.noreply.github.com>
Date: Thu, 27 Apr 2023 15:25:38 +0200
Subject: [PATCH 468/475] Update CallbackTriggerTest.php

spl_objkect_hash can return an hexadecimal  value
---
 .../Component/Scheduler/Tests/Trigger/CallbackTriggerTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Scheduler/Tests/Trigger/CallbackTriggerTest.php b/src/Symfony/Component/Scheduler/Tests/Trigger/CallbackTriggerTest.php
index 608866241ac05..55a076fa17fa6 100644
--- a/src/Symfony/Component/Scheduler/Tests/Trigger/CallbackTriggerTest.php
+++ b/src/Symfony/Component/Scheduler/Tests/Trigger/CallbackTriggerTest.php
@@ -19,7 +19,7 @@ class CallbackTriggerTest extends TestCase
     public function testToString()
     {
         $trigger = new CallbackTrigger(fn () => null);
-        $this->assertMatchesRegularExpression('/^\d{32}$/', (string) $trigger);
+        $this->assertMatchesRegularExpression('/^[\da-f]{32}$/', (string) $trigger);
 
         $trigger = new CallbackTrigger(fn () => null, '');
         $this->assertSame('', (string) $trigger);

From 461466f7b3195321dd3b81f6d509ea19ac84c8df Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Fri, 28 Apr 2023 15:47:33 +0200
Subject: [PATCH 469/475] [WebProfilerBundle] Readded some missing styles

---
 .../views/Collector/logger.html.twig          |  28 +-
 .../views/Collector/mailer.html.twig          |  20 +
 .../views/Profiler/profiler.css.twig          | 817 ++----------------
 3 files changed, 131 insertions(+), 734 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
index 20cf25840bf5b..78de5763f7610 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
@@ -58,12 +58,32 @@
             font-weight: bold;
             padding: 0 1px;
         }
-        .log-filter .tab-navigation .tab-control input {
-            display: none;
+        .log-filter .tab-navigation {
+            position: relative;
         }
-        .log-filter .tab-navigation .tab-control label {
-            cursor: pointer;
+        .log-filter .tab-navigation input[type="radio"] {
+            position: absolute;
+            pointer-events: none;
+            opacity: 0;
+        }
+        .tab-navigation input[type="radio"]:checked + .tab-control {
+            background-color: var(--tab-active-background);
+            border-radius: 6px;
+            box-shadow: inset 0 0 0 1.5px var(--tab-active-border-color);
+            color: var(--tab-active-color);
+            position: relative;
+            z-index: 1;
+        }
+        .theme-dark .tab-navigation input[type="radio"]:checked + .tab-control {
+            box-shadow: inset 0 0 0 1px var(--tab-border-color);
+        }
+        .tab-navigation input[type="radio"]:focus-visible + .tab-control {
+            outline: 1px solid var(--color-link);
         }
+        .tab-navigation input[type="radio"]:checked + .tab-control + input[type="radio"] + .tab-control:before{
+            width: 0;
+        }
+
         .log-filters .log-filter .log-filter-content {
             background: var(--base-0);
             border: 1px solid var(--table-border-color);
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
index 0ce49a542c0fa..11b5ae07f53b1 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
@@ -125,6 +125,26 @@
         .mailer-message-attachments-list li a {
             margin-left: 5px;
         }
+        .mailer-email-body {
+            margin: 0;
+            padding: 6px 8px;
+        }
+        .mailer-empty-email-body {
+            background-image: url("data:image/svg+xml,%3csvg width='100%25' height='100%25' xmlns='http://www.w3.org/2000/svg'%3e%3crect width='100%25' height='100%25' fill='none' stroke='%23e5e5e5' stroke-width='4' stroke-dasharray='6%2c 14' stroke-dashoffset='0' stroke-linecap='square'/%3e%3c/svg%3e");
+            border-radius: 6px;
+            color: var(--color-muted);
+            margin: 1em 0 0;
+            padding: .5em 1em;
+        }
+        .theme-dark .mailer-empty-email-body {
+            background-image: url("data:image/svg+xml,%3csvg width='100%25' height='100%25' xmlns='http://www.w3.org/2000/svg'%3e%3crect width='100%25' height='100%25' fill='none' stroke='%23737373' stroke-width='4' stroke-dasharray='6%2c 14' stroke-dashoffset='0' stroke-linecap='square'/%3e%3c/svg%3e");
+        }
+        .mailer-empty-email-body p {
+            font-size: var(--font-size-body);
+            margin: 0;
+            padding: 0.5em 0;
+        }
+
         .mailer-message-download-raw {
             align-items: center;
             display: flex;
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
index 953ee53f8d2f9..b706620496b75 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
@@ -147,8 +147,6 @@ button,hr,input{overflow:visible}progress,sub,sup{vertical-align:baseline}[type=
     --tab-active-color: var(--color-text);
     --tab-disabled-background: #f5f5f5;
     --tab-disabled-color: #999;
-    --log-filter-active-num-color: #2563EB;
-    --log-timestamp-color: #555;
     --code-block-background: var(--gray-50);
     --metric-value-background: var(--page-background);
     --metric-border-color: var(--gray-300);
@@ -169,9 +167,6 @@ button,hr,input{overflow:visible}progress,sub,sup{vertical-align:baseline}[type=
     --shadow: 0px 0px 1px rgba(128, 128, 128, .2);
     --border: 1px solid #e0e0e0;
     --background-error: var(--color-error);
-    --mailer-email-table-wrapper-background: var(--gray-100);
-    --mailer-email-table-active-row-background: #dbeafe;
-    --mailer-email-table-active-row-color: var(--color-text);
 
     --highlight-variable: #e36209;
     --highlight-string: #22863a;
@@ -288,8 +283,6 @@ button,hr,input{overflow:visible}progress,sub,sup{vertical-align:baseline}[type=
     --tab-active-color: var(--gray-800);
     --tab-disabled-background: var(--page-background);
     --tab-disabled-color: var(--gray-400);
-    --log-filter-active-num-color: #2563EB;
-    --log-timestamp-color: #ccc;
     --code-block-background: var(--gray-900);
     --metric-value-background: var(--page-background);
     --metric-border-color: var(--gray-500);
@@ -310,9 +303,6 @@ button,hr,input{overflow:visible}progress,sub,sup{vertical-align:baseline}[type=
     --shadow: 0px 0px 1px rgba(32, 32, 32, .2);
     --border: 1px solid #666;
     --background-error: #b0413e;
-    --mailer-email-table-wrapper-background: var(--gray-900);
-    --mailer-email-table-active-row-background: var(--gray-300);
-    --mailer-email-table-active-row-color: var(--gray-800);
     --highlight-variable: #ffa657;
     --highlight-string: #7ee787;
     --highlight-comment: #8b949e;
@@ -466,6 +456,11 @@ input[type="radio"], input[type="checkbox"] {
     box-shadow: none;
 }
 
+time[data-render-as-date],
+time[data-render-as-time] {
+    white-space: nowrap;
+}
+
 /* Used to hide elements added for accessibility reasons (the !important modifier is needed here) */
 .visually-hidden {
     border: 0 !important;
@@ -519,7 +514,6 @@ input[type="radio"], input[type="checkbox"] {
     color: var(--color-link);
     text-decoration: none;
     background-color: transparent;
-    outline: none;
     border: 0;
     padding: 0;
     cursor: pointer;
@@ -669,8 +663,7 @@ table tbody td.num-col {
 .empty p {
     font-size: var(--font-size-body);
     max-width: 60ch;
-    margin-left: auto;
-    margin-right: auto;
+    margin: 1em auto;
     text-align: center;
 }
 .empty.empty-panel {
@@ -881,23 +874,6 @@ tr.status-warning td {
     color: var(--color-error);
 }
 
-{# Syntax highlighting
-   ========================================================================= #}
-.highlight pre {
-    margin: 0;
-    white-space: pre-wrap;
-}
-
-.highlight .keyword   { color: var(--highlight-keyword); font-weight: bold; }
-.highlight .word      { color: var(--color-text); }
-.highlight .variable  { color: var(--highlight-variable); }
-.highlight .symbol    { color: var(--color-text); }
-.highlight .comment   { color: var(--highlight-comment); }
-.highlight .backtick  { color: var(--color-muted); }
-.highlight .string    { color: var(--highlight-string); }
-.highlight .number    { color: var(--highlight-constant); font-weight: bold; }
-.highlight .error     { color: var(--highlight-error); }
-
 {# Icons
    ========================================================================= #}
 .sf-icon {
@@ -1468,72 +1444,6 @@ tr.status-warning td {
     box-shadow: var(--selected-badge-danger-shadow);
 }
 
-{# Timeline panel
-   ========================================================================= #}
-#timeline-control {
-    background: var(--table-background);
-    box-shadow: var(--shadow);
-    margin: 1em 0;
-    padding: 10px;
-}
-#timeline-control label {
-    font-weight: bold;
-    margin-right: 1em;
-}
-#timeline-control input {
-    background: var(--metric-value-background);
-    font-size: 16px;
-    padding: 4px;
-    text-align: right;
-    width: 5em;
-}
-#timeline-control .help {
-    margin-left: 1em;
-}
-
-.sf-profiler-timeline .legends {
-    font-size: 12px;
-    line-height: 1.5em;
-}
-.sf-profiler-timeline .legends button {
-    color: var(--color-text);
-}
-.sf-profiler-timeline + p.help {
-    margin-top: 0;
-}
-
-{# HttpClient panel
-   ========================================================================= #}
-.sf-profiler-httpclient-requests thead th {
-    vertical-align: top;
-}
-.sf-profiler-httpclient-requests .http-method {
-    border: 1px solid var(--header-status-request-method-color);
-    border-radius: 5px;
-    color: var(--header-status-request-method-color);
-    display: inline-block;
-    font-weight: 500;
-    line-height: 1;
-    margin-right: 6px;
-    padding: 2px 4px;
-    text-align: center;
-    white-space: nowrap;
-}
-.sf-profiler-httpclient-requests .status-response-status-code {
-    background: var(--gray-600);
-    border-radius: 4px;
-    color: var(--white);
-    display: inline-block;
-    font-size: 12px;
-    font-weight: bold;
-    margin-bottom: 2px;
-    padding: 1px 3px;
-}
-.sf-profiler-httpclient-requests .status-response-status-code.status-success { background: var(--header-success-status-code-background); color: var(--header-success-status-code-color); }
-.sf-profiler-httpclient-requests .status-response-status-code.status-warning { background: var(--header-warning-status-code-background); color: var(--header-warning-status-code-color); }
-.sf-profiler-httpclient-requests .status-response-status-code.status-error { background: var(--header-error-status-code-background); color: var(--header-error-status-code-color); }
-
-
 {# Tabbed navigation
    ========================================================================= #}
 .tab-navigation {
@@ -1551,23 +1461,26 @@ tr.status-warning td {
     box-shadow: inset 0 0 0 1px var(--tab-border-color), 0 0 0 4px var(--page-background);
     margin: 0 0 10px;
 }
-.tab-navigation li {
+.tab-navigation .tab-control {
+    background: transparent;
+    border: 0;
     box-shadow: none;
     transition: box-shadow .05s ease-in, background-color .05s ease-in;
     cursor: pointer;
+    font-size: 14px;
     font-weight: 500;
-    list-style: none;
+    line-height: 1.4;
     margin: 0;
     padding: 4px 14px;
     position: relative;
     text-align: center;
     z-index: 1;
 }
-.sf-tabs-sm .tab-navigation li {
+.sf-tabs-sm .tab-navigation .tab-control {
     font-size: 13px;
     padding: 2.5px 10px;
 }
-.tab-navigation li:before {
+.tab-navigation .tab-control:before {
     background: var(--tab-border-color);
     bottom: 15%;
     content: "";
@@ -1576,10 +1489,12 @@ tr.status-warning td {
     top: 15%;
     width: 1px;
 }
-.tab-navigation li:first-child:before, .tab-navigation li.active + li:before, .tab-navigation li.active:before {
+.tab-navigation .tab-control:first-child:before,
+.tab-navigation .tab-control.active + .tab-control:before,
+.tab-navigation .tab-control.active:before {
     width: 0;
 }
-.tab-navigation li .badge {
+.tab-navigation .tab-control .badge {
     background: var(--selected-badge-background);
     box-shadow: var(--selected-badge-shadow);
     color: var(--selected-badge-color);
@@ -1593,10 +1508,10 @@ tr.status-warning td {
     text-align: center;
     white-space: nowrap;
 }
-.tab-navigation li.disabled {
+.tab-navigation .tab-control.disabled {
     color: var(--tab-disabled-color);
 }
-.tab-navigation li.active {
+.tab-navigation .tab-control.active {
     background-color: var(--tab-active-background);
     border-radius: 6px;
     box-shadow: inset 0 0 0 1.5px var(--tab-active-border-color);
@@ -1610,12 +1525,12 @@ tr.status-warning td {
 .tab-content > *:first-child {
     margin-top: 0;
 }
-.tab-navigation li .badge.status-warning {
+.tab-navigation .tab-control .badge.status-warning {
     background: var(--selected-badge-warning-background);
     box-shadow: var(--selected-badge-warning-shadow);
     color: var(--selected-badge-warning-color);
 }
-.tab-navigation li .badge.status-error {
+.tab-navigation .tab-control .badge.status-error {
     background: var(--selected-badge-danger-background);
     box-shadow: var(--selected-badge-danger-shadow);
     color: var(--selected-badge-danger-color);
@@ -1673,59 +1588,7 @@ tr.status-warning td {
 .filter-list-choice li:before { content: '\2714\00a0'; color: transparent; }
 .filter-list-choice li.active:before { color: unset; }
 
-{# Twig panel
-   ========================================================================= #}
-#twig-dump pre {
-    font-size: var(--font-size-monospace);
-    line-height: 1.7;
-    background-color: var(--base-0);
-    border: var(--border);
-    border-radius: 6px;
-    padding: 15px;
-    box-shadow: 0 0 1px rgba(128, 128, 128, .2);
-}
-#twig-dump span {
-    border-radius: 2px;
-    padding: 1px 2px;
-}
-#twig-dump .status-error { background: transparent; color: var(--color-error); }
-#twig-dump .status-warning { background: rgba(240, 181, 24, 0.3); }
-#twig-dump .status-success { background: rgba(100, 189, 99, 0.2); }
-#twig-dump .status-info { background: var(--info-background); }
-.theme-dark #twig-dump .status-warning { color: var(--yellow-200); }
-.theme-dark #twig-dump .status-success { color: var(--green-200); }
-
-#twig-table tbody td {
-    position: relative;
-}
-#twig-table tbody td div {
-    margin: 0;
-}
-#twig-table .template-file-path {
-    color: var(--color-muted);
-    display: block;
-}
-
-{# Request panel
-   ========================================================================= #}
-.empty-query-post-files {
-    display: flex;
-    justify-content: space-between;
-}
-.empty-query-post-files > div {
-    flex: 1;
-}
-.empty-query-post-files > div + div {
-    margin-left: 30px;
-}
-.empty-query-post-files h3 {
-    margin-top: 0;
-}
-.empty-query-post-files .empty {
-    margin-bottom: 0;
-}
-
-{# Logger panel
+{# Badges
    ========================================================================= #}
 .badge {
     background: var(--badge-background);
@@ -1744,455 +1607,7 @@ tr.status-warning td {
     color: var(--badge-warning-color);
 }
 
-.log-filters {
-    display: flex;
-    flex-wrap: wrap;
-}
-.log-filters .log-filter {
-    flex-shrink: 0;
-    margin-right: 15px;
-    position: relative;
-}
-.log-filters .log-filter summary {
-    align-items: center;
-    background: var(--button-background);
-    border-radius: 6px;
-    border: 1px solid var(--button-border-color);
-    box-shadow: var(--button-box-shadow);
-    color: var(--button-color);
-    cursor: pointer;
-    display: flex;
-    font-size: 13px;
-    font-weight: 500;
-    padding: 4px 8px;
-    white-space: nowrap;
-}
-.log-filters .log-filter summary:active {
-    box-shadow: none;
-    transform: translateY(1px);
-}
-.log-filters .log-filter summary .icon {
-    height: 18px;
-    width: 18px;
-    margin: 0 7px 0 0;
-}
-.log-filters .log-filter summary svg {
-    height: 18px;
-    width: 18px;
-    opacity: 0.7;
-}
-.log-filters .log-filter summary svg {
-    stroke-width: 2;
-}
-.log-filters .log-filter summary .filter-active-num {
-    color: var(--log-filter-active-num-color);
-    font-weight: bold;
-    padding: 0 1px;
-}
-.log-filter .tab-navigation li input {
-    display: none;
-}
-.log-filter .tab-navigation li label {
-    cursor: pointer;
-}
-.log-filters .log-filter .log-filter-content {
-    background: var(--base-0);
-    border: 1px solid var(--table-border-color);
-    border-radius: 6px;
-    box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
-    padding: 15px;
-    position: absolute;
-    left: 0;
-    top: 32px;
-    max-width: 400px;
-    min-width: 200px;
-    z-index: 9999;
-}
-.log-filters .log-filter .log-filter-content .log-filter-option {
-    align-items: center;
-    display: flex;
-}
-.log-filter .filter-select-all-or-none {
-    margin-bottom: 10px;
-}
-.log-filter .filter-select-all-or-none button + button {
-    margin-left: 15px;
-}
-.log-filters .log-filter .log-filter-content .log-filter-option + .log-filter-option {
-    margin: 7px 0 0;
-}
-.log-filters .log-filter .log-filter-content .log-filter-option label {
-    cursor: pointer;
-    flex: 1;
-    padding-left: 10px;
-}
-
-table.logs {
-    border-bottom-width: 0;
-    border-collapse: collapse;
-}
-table.logs tr + tr td {
-    border-width: 1px 0 0;
-}
-table.logs .metadata {
-    display: block;
-    font-size: 12px;
-}
-.theme-dark tr.status-error td,
-.theme-dark tr.status-warning td { border-bottom: unset; border-top: unset; }
-
-table.logs .log-timestamp {
-    color: var(--log-timestamp-color);
-}
-table.logs .log-metadata {
-    margin: 8px 0 0;
-}
-table.logs .log-metadata > span {
-    display: inline-block;
-}
-table.logs .log-metadata > span + span {
-    margin-left: 10px;
-}
-table.logs .log-metadata .log-channel {
-    color: var(--base-1);
-    font-size: 13px;
-    font-weight: bold;
-}
-table.logs .log-metadata .badge {
-    background: var(--badge-light-background);
-    color: var(--badge-light-color);
-}
-table.logs .log-metadata .log-num-occurrences {
-    color: var(--color-muted);
-    font-size: 13px;
-}
-table.logs .log-metadata .context {
-    background: var(--code-block-background);
-    border-radius: 4px;
-    padding: 5px;
-}
-table.logs .log-metadata .context + .context {
-    margin-top: 10px;
-}
-.log-type-badge {
-    background: var(--badge-light-background);
-    box-shadow: none;
-    color: var(--badge-light-color);
-    display: inline-block;
-    font-family: var(--font-family-system);
-    margin-top: 5px;
-}
-.log-type-badge.badge-deprecation,
-.log-type-badge.badge-warning {
-    background: var(--badge-warning-background);
-    color: var(--badge-warning-color);
-}
-.log-type-badge.badge-error {
-    background: var(--badge-danger-background);
-    color: var(--badge-danger-color);
-}
-.log-type-badge.badge-silenced {
-    background: #EDE9FE;
-    color: #6D28D9;
-}
-.theme-dark .log-type-badge.badge-silenced {
-    background: #5B21B6;
-    color: #EDE9FE;
-}
-
-tr.log-status-warning > td:first-child,
-tr.log-status-error > td:first-child,
-tr.log-status-silenced > td:first-child {
-    position: relative;
-}
-tr.log-status-warning > td:first-child:before,
-tr.log-status-error > td:first-child:before,
-tr.log-status-silenced > td:first-child:before {
-    background: transparent;
-    border-radius: 0;
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 4px;
-    height: 100%;
-}
-tr.log-status-warning > td:first-child:before {
-    background: var(--yellow-400);
-}
-tr.log-status-error > td:first-child:before {
-    background: var(--red-400);
-}
-tr.log-status-silenced > td:first-child:before {
-    background: #a78bfa;
-}
-
-.container-compilation-logs {
-    background: var(--table-background);
-    border: 1px solid var(--base-2);
-    border-radius: 6px;
-    margin-top: 30px;
-    padding: 15px;
-}
-.container-compilation-logs summary {
-    cursor: pointer;
-}
-.container-compilation-logs summary h4 {
-    margin: 0 0 5px;
-}
-.container-compilation-logs summary p {
-    margin: 0;
-}
-
-{# Mailer panel
-   ========================================================================= #}
-.mailer-email-summary-table-wrapper {
-    background: var(--mailer-email-table-wrapper-background);
-    border-bottom: 4px double var(--table-border-color);
-    border-radius: inherit;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-    margin: 0 -9px 10px -9px;
-    padding-bottom: 10px;
-    transform: translateY(-9px);
-    max-height: 265px;
-    overflow-y: auto;
-}
-.mailer-email-summary-table,
-.mailer-email-summary-table tr,
-.mailer-email-summary-table td {
-    border: 0;
-    border-radius: inherit;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-    box-shadow: none;
-}
-.mailer-email-summary-table th {
-    color: var(--color-muted);
-    font-size: 13px;
-    padding: 4px 10px;
-}
-.mailer-email-summary-table tr td,
-.mailer-email-summary-table tr:last-of-type td {
-    border: solid var(--table-border-color);
-    border-width: 1px 0;
-}
-.mailer-email-summary-table-row {
-    margin: 5px 0;
-}
-.mailer-email-summary-table-row:hover {
-    cursor: pointer;
-}
-.mailer-email-summary-table-row.active {
-    background: var(--mailer-email-table-active-row-background);
-    color: var(--mailer-email-table-active-row-color);
-}
-.mailer-email-summary-table-row td {
-    font-family: var(--font-family-system);
-    font-size: inherit;
-}
-.mailer-email-details {
-    display: none;
-}
-.mailer-email-details.active {
-    display: block;
-}
-.mailer-transport-information {
-    border-bottom: 1px solid var(--form-input-border-color);
-    padding-bottom: 5px;
-    font-size: var(--font-size-body);
-    margin: 5px 0 10px 5px;
-}
-.mailer-transport-information .badge {
-    font-size: inherit;
-    font-weight: inherit;
-}
-.mailer-message-subject {
-    font-size: 21px;
-    font-weight: bold;
-    margin: 5px;
-}
-.mailer-message-headers {
-    margin-bottom: 10px;
-}
-.mailer-message-headers p {
-    font-size: var(--font-size-body);
-    margin: 2px 5px;
-}
-.mailer-message-header-secondary {
-    color: var(--color-muted);
-}
-.mailer-message-attachments-title {
-    align-items: center;
-    display: flex;
-    font-size: var(--font-size-body);
-    font-weight: 600;
-    margin-bottom: 10px;
-}
-.mailer-message-attachments-title svg {
-    color: var(--color-muted);
-    margin-right: 5px;
-    height: 18px;
-    width: 18px;
-}
-.mailer-message-attachments-title span {
-    font-weight: normal;
-    margin-left: 4px;
-}
-.mailer-message-attachments-list {
-    list-style: none;
-    margin: 0 0 5px 20px;
-    padding: 0;
-}
-.mailer-message-attachments-list li {
-    align-items: center;
-    display: flex;
-}
-.mailer-message-attachments-list li svg {
-    margin-right: 5px;
-    height: 18px;
-    width: 18px;
-}
-.mailer-message-attachments-list li a {
-    margin-left: 5px;
-}
-.mailer-message-download-raw {
-    align-items: center;
-    display: flex;
-    padding: 5px 0 0 5px;
-}
-.mailer-message-download-raw svg {
-    height: 18px;
-    width: 18px;
-    margin-right: 3px;
-}
-
-{# Doctrine panel
-   ========================================================================= #}
-.sql-runnable {
-    background: var(--base-1);
-    margin: .5em 0;
-    padding: 1em;
-}
-.sql-explain {
-    overflow-x: auto;
-    max-width: 888px;
-}
-.width-full .sql-explain {
-    max-width: unset;
-}
-.sql-explain table td, .sql-explain table tr {
-    word-break: normal;
-}
-.queries-table pre {
-    margin: 0;
-    white-space: pre-wrap;
-    -ms-word-break: break-all;
-    word-break: break-all;
-    word-break: break-word;
-    -webkit-hyphens: auto;
-    -moz-hyphens: auto;
-    hyphens: auto;
-}
-
-{# Security panel
-   ========================================================================= #}
-#collector-content .decision-log .voter_result td {
-    border-top-width: 1px;
-    border-bottom-width: 0;
-    padding-bottom: 0;
-}
-
-#collector-content .decision-log .voter_details td {
-    border-top-width: 0;
-    border-bottom-width: 1px;
-    padding-bottom: 0;
-}
-
-#collector-content .decision-log .voter_details table {
-    border: 0;
-    margin: 0;
-    box-shadow: unset;
-}
-
-#collector-content .decision-log .voter_details table td {
-    border: 0;
-    padding: 0 0 8px 0;
-}
-
-{# Validator panel
-   ========================================================================= #}
-
-#collector-content .sf-validator {
-    margin-bottom: 2em;
-}
-
-#collector-content .sf-validator .sf-validator-context,
-#collector-content .sf-validator .trace {
-    border: var(--border);
-    background: var(--base-0);
-    padding: 10px;
-    margin: 0.5em 0;
-    overflow: auto;
-}
-#collector-content .sf-validator .trace {
-    font-size: 12px;
-}
-#collector-content .sf-validator .trace li {
-    margin-bottom: 0;
-    padding: 0;
-}
-#collector-content .sf-validator .trace li.selected {
-    background: var(--highlight-selected-line);
-}
-
-{# Serializer panel
-   ========================================================================= #}
-
-#collector-content .sf-serializer {
-    margin-bottom: 2em;
-}
-
-#collector-content .sf-serializer .trace {
-    border: var(--border);
-    background: var(--base-0);
-    padding: 10px;
-    margin: 0.5em 0;
-    overflow: auto;
-}
-#collector-content .sf-serializer .trace {
-    font-size: 12px;
-}
-#collector-content .sf-serializer .trace li {
-    margin-bottom: 0;
-    padding: 0;
-}
-#collector-content .sf-serializer .trace li.selected {
-    background: var(--highlight-selected-line);
-}
-
-{# Messenger panel
-   ========================================================================= #}
-
-#collector-content .message-bus .trace {
-    border: var(--border);
-    background: var(--base-0);
-    padding: 10px;
-    margin: 0.5em 0;
-    overflow: auto;
-}
-#collector-content .message-bus .trace {
-    font-size: 12px;
-}
-#collector-content .message-bus .trace li {
-    margin-bottom: 0;
-    padding: 0;
-}
-#collector-content .message-bus .trace li.selected {
-    background: var(--highlight-selected-line);
-}
-
-{# Dump panel
+{# Dumped contents (used in many different panels)
    ========================================================================= #}
 pre.sf-dump, pre.sf-dump .sf-dump-default {
     white-space: pre-wrap;
@@ -2250,93 +1665,85 @@ pre.sf-dump, pre.sf-dump .sf-dump-default {
     padding: 0;
 }
 
-{# Forms panel
-   ========================================================================= #}
-.form-type-class {
-    font-size: var(--font-size-body);
-    display: flex;
-    margin: 0 0 15px;
-}
-.form-type-class-label {
-    margin-right: 4px;
-}
-.form-type-class pre.sf-dump {
-    font-family: var(--font-family-system) !important;
-    font-size: var(--font-size-body) !important;
-    margin-left: 5px;
-}
-.form-type-class .sf-dump .sf-dump-str {
-    color: var(--color-link) !important;
-    text-decoration: underline;
-}
-.form-type-class .sf-dump .sf-dump-str:hover {
-    text-decoration: none;
-}
-
-{# Configuration panel
-   ========================================================================= #}
-.config-symfony-version-lts {
-    border: 0;
-    color: var(--color-muted);
-    font-size: 21px;
-    line-height: 33px;
-}
-.config-symfony-version-lts[title] {
-    text-decoration: none;
-}
-.config-symfony-version-status-badge {
-    background-color: var(--badge-background);
-    border-radius: 4px;
-    color: var(--badge-color);
-    display: inline-block;
-    font-size: 15px;
-    font-weight: bold;
-    margin: 10px 0 5px;
-    padding: 3px 7px;
-    white-space: nowrap;
+#collector-content pre.sf-dump, #collector-content .sf-dump code, #collector-content .sf-dump samp {
+    font-size: var(--font-size-monospace);
+    font-weight: normal;
 }
-.config-symfony-version-status-badge.status-success {
-    background-color: var(--badge-success-background);
-    color: var(--badge-success-color);
+#collector-content .sf-dump pre.sf-dump,
+#collector-content .sf-dump .trace {
+    background: var(--page-background);
 }
-.config-symfony-version-status-badge.status-warning {
-    background-color: var(--badge-warning-background);
-    color: var(--badge-warning-color);
+#collector-content pre.sf-dump,
+#collector-content .sf-dump-default {
+    color: var(--color-text);
 }
-.config-symfony-version-status-badge.status-error {
-    background-color: var(--badge-danger-background);
-    color: var(--badge-danger-color);
+#collector-content .sf-dump samp {
+    line-height: 1.7;
 }
-.config-symfony-version-roadmap-link {
-    display: inline-block;
-    margin: 10px 5px 5px;
+body.theme-light #collector-content .sf-dump-expanded { color: var(--color-text); }
+body.theme-light #collector-content .sf-dump-str { color: var(--highlight-string); }
+body.theme-light #collector-content .sf-dump-private,
+body.theme-light #collector-content .sf-dump-protected,
+body.theme-light #collector-content .sf-dump-public { color: var(--color-text); }
+body.theme-light #collector-content .sf-dump-note { color: #e36209; }
+body.theme-light #collector-content .sf-dump-meta { color: #6f42c1; }
+body.theme-light #collector-content .sf-dump-key { color: #067d17; }
+body.theme-light #collector-content .sf-dump-num,
+body.theme-light #collector-content .sf-dump-const { color: var(--highlight-constant); }
+body.theme-light #collector-content .sf-dump-ref { color: #6E6E6E; }
+body.theme-light #collector-content .sf-dump-ellipsis { color: var(--gray-600); max-width: 100em; }
+body.theme-light #collector-content .sf-dump-ellipsis-path { max-width: 5em; }
+body.theme-light #collector-content .sf-dump .trace li.selected {
+    background: rgba(255, 255, 153, 0.5);
 }
-.config-symfony-eol {
-    margin-top: 5px;
+body.theme-dark #collector-content .sf-dump-expanded { color: var(--color-text); }
+body.theme-dark #collector-content .sf-dump-str { color: var(--highlight-string); }
+body.theme-dark #collector-content .sf-dump-private,
+body.theme-dark #collector-content .sf-dump-protected,
+body.theme-dark #collector-content .sf-dump-public { color: var(--color-text); }
+body.theme-dark #collector-content .sf-dump-note { color: #ffa657; }
+body.theme-dark #collector-content .sf-dump-meta { color: #d2a8ff; }
+body.theme-dark #collector-content .sf-dump-key { color: #a5d6ff; }
+body.theme-dark #collector-content .sf-dump-num,
+body.theme-dark #collector-content .sf-dump-const { color: var(--highlight-constant); }
+body.theme-dark #collector-content .sf-dump-ref { color: var(--gray-400); }
+body.theme-dark #collector-content .sf-dump-ellipsis { color: var(--gray-300); max-width: 100em; }
+body.theme-dark #collector-content .sf-dump-ellipsis-path { max-width: 5em; }
+body.theme-dark #collector-content .sf-dump .trace li.selected {
+    background: rgba(255, 255, 153, 0.5);
 }
 
-{# Search Results page
+
+{# Doctrine panel
    ========================================================================= #}
-#search-results td {
-    font-family: var(--font-family-system);
-    vertical-align: middle;
+.sql-runnable {
+    background: var(--base-1);
+    margin: .5em 0;
+    padding: 1em;
 }
-
-#search-results .sf-search {
-
-    visibility: hidden;
-    margin-left: 2px;
+.sql-explain {
+    overflow-x: auto;
+    max-width: 888px;
 }
-#search-results tr:hover .sf-search {
-    visibility: visible;
+.width-full .sql-explain {
+    max-width: unset;
 }
-#search-results .sf-search svg {
-    stroke-width: 3;
+.sql-explain table td, .sql-explain table tr {
+    word-break: normal;
+}
+.queries-table pre {
+    margin: 0;
+    white-space: pre-wrap;
+    -ms-word-break: break-all;
+    word-break: break-all;
+    word-break: break-word;
+    -webkit-hyphens: auto;
+    -moz-hyphens: auto;
+    hyphens: auto;
 }
 
 {# Small screens
    ========================================================================= #}
-
 .visible-small {
     display: none;
 }
@@ -2410,53 +1817,3 @@ body.width-full .container {
     body.width-full .container { margin: 0 30px; }
 }
 
-{# VarDumper dumps
-   ========================================================================= #}
-#collector-content pre.sf-dump, #collector-content .sf-dump code, #collector-content .sf-dump samp {
-    font-size: var(--font-size-monospace);
-    font-weight: normal;
-}
-
-#collector-content .sf-dump pre.sf-dump,
-#collector-content .sf-dump .trace {
-    background: var(--page-background);
-}
-#collector-content pre.sf-dump,
-#collector-content .sf-dump-default {
-    color: var(--color-text);
-}
-#collector-content .sf-dump samp {
-    line-height: 1.7;
-}
-body.theme-light #collector-content .sf-dump-expanded { color: var(--color-text); }
-body.theme-light #collector-content .sf-dump-str { color: var(--highlight-string); }
-body.theme-light #collector-content .sf-dump-private,
-body.theme-light #collector-content .sf-dump-protected,
-body.theme-light #collector-content .sf-dump-public { color: var(--color-text); }
-body.theme-light #collector-content .sf-dump-note { color: #e36209; }
-body.theme-light #collector-content .sf-dump-meta { color: #6f42c1; }
-body.theme-light #collector-content .sf-dump-key { color: #067d17; }
-body.theme-light #collector-content .sf-dump-num,
-body.theme-light #collector-content .sf-dump-const { color: var(--highlight-constant); }
-body.theme-light #collector-content .sf-dump-ref { color: #6E6E6E; }
-body.theme-light #collector-content .sf-dump-ellipsis { color: var(--gray-600); max-width: 100em; }
-body.theme-light #collector-content .sf-dump-ellipsis-path { max-width: 5em; }
-body.theme-light #collector-content .sf-dump .trace li.selected {
-    background: rgba(255, 255, 153, 0.5);
-}
-body.theme-dark #collector-content .sf-dump-expanded { color: var(--color-text); }
-body.theme-dark #collector-content .sf-dump-str { color: var(--highlight-string); }
-body.theme-dark #collector-content .sf-dump-private,
-body.theme-dark #collector-content .sf-dump-protected,
-body.theme-dark #collector-content .sf-dump-public { color: var(--color-text); }
-body.theme-dark #collector-content .sf-dump-note { color: #ffa657; }
-body.theme-dark #collector-content .sf-dump-meta { color: #d2a8ff; }
-body.theme-dark #collector-content .sf-dump-key { color: #a5d6ff; }
-body.theme-dark #collector-content .sf-dump-num,
-body.theme-dark #collector-content .sf-dump-const { color: var(--highlight-constant); }
-body.theme-dark #collector-content .sf-dump-ref { color: var(--gray-400); }
-body.theme-dark #collector-content .sf-dump-ellipsis { color: var(--gray-300); max-width: 100em; }
-body.theme-dark #collector-content .sf-dump-ellipsis-path { max-width: 5em; }
-body.theme-dark #collector-content .sf-dump .trace li.selected {
-    background: rgba(255, 255, 153, 0.5);
-}

From 2407467f220f477973372aa2f5be8c57928ba0fd Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 28 Apr 2023 15:57:48 +0200
Subject: [PATCH 470/475] Bump Symfony version to 6.2.11

---
 src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index e9694e978e3c5..c0dd3e646d336 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -75,12 +75,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     private static array $freshCache = [];
 
-    public const VERSION = '6.2.10';
-    public const VERSION_ID = 60210;
+    public const VERSION = '6.2.11-DEV';
+    public const VERSION_ID = 60211;
     public const MAJOR_VERSION = 6;
     public const MINOR_VERSION = 2;
-    public const RELEASE_VERSION = 10;
-    public const EXTRA_VERSION = '';
+    public const RELEASE_VERSION = 11;
+    public const EXTRA_VERSION = 'DEV';
 
     public const END_OF_MAINTENANCE = '07/2023';
     public const END_OF_LIFE = '07/2023';

From f86dbbdca1fb378af46bad5ada7af8b8a0276536 Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Fri, 28 Apr 2023 14:21:20 +0200
Subject: [PATCH 471/475] Add missing return types

---
 .github/expected-missing-return-types.diff    | 249 ++++++++++++++----
 .../HttpClient/Response/StreamWrapper.php     |   5 +-
 .../Component/HttpFoundation/Request.php      |   3 +
 .../ConfigurableExtension.php                 |   2 +
 .../Ldap/Security/LdapUserProvider.php        |   2 +-
 .../Mailjet/Transport/MailjetApiTransport.php |   2 +-
 src/Symfony/Component/Mime/Email.php          |   3 +
 .../Exception/ProcessFailedException.php      |   3 +
 .../Exception/ProcessTimedOutException.php    |   5 +-
 src/Symfony/Component/Process/Process.php     |  18 +-
 .../Routing/Loader/AnnotationClassLoader.php  |   3 +
 .../Component/Routing/Matcher/UrlMatcher.php  |   3 +
 src/Symfony/Component/Routing/Router.php      |   3 +
 .../Tests/Loader/PhpFileLoaderTest.php        |   4 +-
 .../Tests/Loader/Psr4DirectoryLoaderTest.php  |   2 +-
 .../Tests/Loader/XmlFileLoaderTest.php        |   4 +-
 .../Tests/Loader/YamlFileLoaderTest.php       |   4 +-
 .../Core/User/InMemoryUserProvider.php        |   2 +
 .../Component/Security/Http/Firewall.php      |   3 +
 .../Normalizer/AbstractObjectNormalizer.php   |  15 +-
 .../Catalogue/AbstractOperation.php           |   2 +
 .../Translation/Command/XliffLintCommand.php  |  14 +-
 .../Translation/Extractor/PhpExtractor.php    |   6 +-
 .../Translation/Util/ArrayConverter.php       |   2 +-
 .../Validator/Constraints/IsbnValidator.php   |   3 +
 .../Exception/ValidationFailedException.php   |   3 +
 26 files changed, 288 insertions(+), 77 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index c4d3f78983720..3787d71148871 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -7188,7 +7188,7 @@ index 9d7012de35..545339d4ef 100644
      {
          unset($this->parameters[$key]);
 diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
-index cf7e56f13e..e07d5fab79 100644
+index 633b4a63e2..b69b8cc723 100644
 --- a/src/Symfony/Component/HttpFoundation/Request.php
 +++ b/src/Symfony/Component/HttpFoundation/Request.php
 @@ -269,5 +269,5 @@ class Request
@@ -7275,7 +7275,14 @@ index cf7e56f13e..e07d5fab79 100644
 +    public function setLocale(string $locale): void
      {
          $this->setPhpDefaultLocale($this->locale = $locale);
-@@ -1904,5 +1904,5 @@ class Request
+@@ -1736,5 +1736,5 @@ class Request
+      * @return string
+      */
+-    protected function prepareRequestUri()
++    protected function prepareRequestUri(): string
+     {
+         $requestUri = '';
+@@ -1907,5 +1907,5 @@ class Request
       * @return void
       */
 -    protected static function initializeFormats()
@@ -8225,6 +8232,16 @@ index 1924b1ddb0..62c58c8e8b 100644
 +    public function process(ContainerBuilder $container): void
      {
          $annotatedClasses = [];
+diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php
+index 12d468cf04..2ca89c128e 100644
+--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php
++++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php
+@@ -38,4 +38,4 @@ abstract class ConfigurableExtension extends Extension
+      * @return void
+      */
+-    abstract protected function loadInternal(array $mergedConfig, ContainerBuilder $container);
++    abstract protected function loadInternal(array $mergedConfig, ContainerBuilder $container): void;
+ }
 diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
 index dff3e248ae..381db9aa8f 100644
 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/ControllerArgumentValueResolverPass.php
@@ -9845,12 +9862,12 @@ index 70fa786331..f27afd0f01 100644
      {
          if ($container->has('mime_types')) {
 diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
-index 97f5ded24d..05e3ed5202 100644
+index 7f3496d1fc..be6a1eff61 100644
 --- a/src/Symfony/Component/Mime/Email.php
 +++ b/src/Symfony/Component/Mime/Email.php
-@@ -397,5 +397,5 @@ class Email extends Message
-     }
- 
+@@ -400,5 +400,5 @@ class Email extends Message
+      * @return void
+      */
 -    public function ensureValidity()
 +    public function ensureValidity(): void
      {
@@ -10013,18 +10030,36 @@ index b429812176..21aec2b9e8 100644
 +    public function addAllowedTypes(string $option, string|array $allowedTypes): static
      {
          if ($this->locked) {
+diff --git a/src/Symfony/Component/Process/Exception/ProcessFailedException.php b/src/Symfony/Component/Process/Exception/ProcessFailedException.php
+index cf006daebf..51b1ccb810 100644
+--- a/src/Symfony/Component/Process/Exception/ProcessFailedException.php
++++ b/src/Symfony/Component/Process/Exception/ProcessFailedException.php
+@@ -51,5 +51,5 @@ class ProcessFailedException extends RuntimeException
+      * @return Process
+      */
+-    public function getProcess()
++    public function getProcess(): Process
+     {
+         return $this->process;
 diff --git a/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php b/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
-index 27ce7fd430..708e611502 100644
+index e507ca3099..75b5f010b8 100644
 --- a/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
 +++ b/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
-@@ -47,5 +47,5 @@ class ProcessTimedOutException extends RuntimeException
+@@ -42,5 +42,5 @@ class ProcessTimedOutException extends RuntimeException
+      * @return Process
+      */
+-    public function getProcess()
++    public function getProcess(): Process
+     {
+         return $this->process;
+@@ -50,5 +50,5 @@ class ProcessTimedOutException extends RuntimeException
       * @return bool
       */
 -    public function isGeneralTimeout()
 +    public function isGeneralTimeout(): bool
      {
          return self::TYPE_GENERAL === $this->timeoutType;
-@@ -55,5 +55,5 @@ class ProcessTimedOutException extends RuntimeException
+@@ -58,5 +58,5 @@ class ProcessTimedOutException extends RuntimeException
       * @return bool
       */
 -    public function isIdleTimeout()
@@ -10092,6 +10127,38 @@ index ef54a3d2b0..d084e5ba24 100644
 +    public function start(callable $callback = null, array $env = []): void
      {
          if (null === $this->getCommandLine()) {
+diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
+index 2f4b5a24cc..afe03a912a 100644
+--- a/src/Symfony/Component/Process/Process.php
++++ b/src/Symfony/Component/Process/Process.php
+@@ -292,5 +292,5 @@ class Process implements \IteratorAggregate
+      * @throws LogicException   In case a callback is provided and output has been disabled
+      */
+-    public function start(callable $callback = null, array $env = [])
++    public function start(callable $callback = null, array $env = []): void
+     {
+         if ($this->isRunning()) {
+@@ -1147,5 +1147,5 @@ class Process implements \IteratorAggregate
+      * @throws ProcessTimedOutException In case the timeout was reached
+      */
+-    public function checkTimeout()
++    public function checkTimeout(): void
+     {
+         if (self::STATUS_STARTED !== $this->status) {
+@@ -1188,5 +1188,5 @@ class Process implements \IteratorAggregate
+      * @return void
+      */
+-    public function setOptions(array $options)
++    public function setOptions(array $options): void
+     {
+         if ($this->isRunning()) {
+@@ -1285,5 +1285,5 @@ class Process implements \IteratorAggregate
+      * @return void
+      */
+-    protected function updateStatus(bool $blocking)
++    protected function updateStatus(bool $blocking): void
+     {
+         if (self::STATUS_STARTED !== $this->status) {
 diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
 index c9125af216..bcd044de52 100644
 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -10438,7 +10505,7 @@ index e3fb17e81c..cd27f3e387 100644
      {
          $this->strictRequirements = $enabled;
 diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
-index b06c649885..e98945cb7d 100644
+index decd2a2b1d..a37965ed5b 100644
 --- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
 +++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
 @@ -96,5 +96,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
@@ -10483,6 +10550,13 @@ index b06c649885..e98945cb7d 100644
 +    protected function createRoute(string $path, array $defaults, array $requirements, array $options, ?string $host, array $schemes, array $methods, ?string $condition): Route
      {
          return new Route($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
+@@ -362,5 +362,5 @@ abstract class AnnotationClassLoader implements LoaderInterface
+      * @return void
+      */
+-    abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot);
++    abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
 index 24ec21bb5c..1dac35dc8e 100644
 --- a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
@@ -10563,7 +10637,7 @@ index 417f156415..75d770d852 100644
      {
          $this->request = $request;
 diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
-index 062be150b8..7c925fbbdb 100644
+index d1cee21377..19e949fbc6 100644
 --- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
 +++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
 @@ -66,5 +66,5 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
@@ -10580,6 +10654,13 @@ index 062be150b8..7c925fbbdb 100644
 +    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider): void
      {
          $this->expressionLanguageProviders[] = $provider;
+@@ -259,5 +259,5 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
+      * @return ExpressionLanguage
+      */
+-    protected function getExpressionLanguage()
++    protected function getExpressionLanguage(): ExpressionLanguage
+     {
+         if (null === $this->expressionLanguage) {
 diff --git a/src/Symfony/Component/Routing/RequestContextAwareInterface.php b/src/Symfony/Component/Routing/RequestContextAwareInterface.php
 index 04acbdc800..eedb53c594 100644
 --- a/src/Symfony/Component/Routing/RequestContextAwareInterface.php
@@ -10687,7 +10768,7 @@ index f244e62bed..a5e918317c 100644
      {
          $key = (string) $resource;
 diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
-index b41dd55ef0..c03c3888cd 100644
+index 3fa13457b2..efcbc4219f 100644
 --- a/src/Symfony/Component/Routing/Router.php
 +++ b/src/Symfony/Component/Routing/Router.php
 @@ -121,5 +121,5 @@ class Router implements RouterInterface, RequestMatcherInterface
@@ -10704,28 +10785,28 @@ index b41dd55ef0..c03c3888cd 100644
 +    public function setOption(string $key, mixed $value): void
      {
          if (!\array_key_exists($key, $this->options)) {
-@@ -179,5 +179,5 @@ class Router implements RouterInterface, RequestMatcherInterface
-     }
- 
+@@ -182,5 +182,5 @@ class Router implements RouterInterface, RequestMatcherInterface
+      * @return RouteCollection
+      */
 -    public function getRouteCollection()
 +    public function getRouteCollection(): RouteCollection
      {
          return $this->collection ??= $this->loader->load($this->resource, $this->options['resource_type']);
-@@ -187,5 +187,5 @@ class Router implements RouterInterface, RequestMatcherInterface
+@@ -190,5 +190,5 @@ class Router implements RouterInterface, RequestMatcherInterface
       * @return void
       */
 -    public function setContext(RequestContext $context)
 +    public function setContext(RequestContext $context): void
      {
          $this->context = $context;
-@@ -209,5 +209,5 @@ class Router implements RouterInterface, RequestMatcherInterface
+@@ -212,5 +212,5 @@ class Router implements RouterInterface, RequestMatcherInterface
       * @return void
       */
 -    public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory)
 +    public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory): void
      {
          $this->configCacheFactory = $configCacheFactory;
-@@ -315,5 +315,5 @@ class Router implements RouterInterface, RequestMatcherInterface
+@@ -318,5 +318,5 @@ class Router implements RouterInterface, RequestMatcherInterface
       * @return void
       */
 -    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
@@ -11064,10 +11145,17 @@ index a493b00e79..377dcacc09 100644
      {
      }
 diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
-index ed6c2d8b38..7b61505fd5 100644
+index e0aef90a14..651578d1f1 100644
 --- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
 +++ b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
-@@ -98,5 +98,5 @@ class InMemoryUserProvider implements UserProviderInterface
+@@ -55,5 +55,5 @@ class InMemoryUserProvider implements UserProviderInterface
+      * @throws \LogicException
+   
10000
   */
+-    public function createUser(UserInterface $user)
++    public function createUser(UserInterface $user): void
+     {
+         if (!$user instanceof InMemoryUser) {
+@@ -100,5 +100,5 @@ class InMemoryUserProvider implements UserProviderInterface
       * @throws UserNotFoundException if user whose given username does not exist
       */
 -    private function getUser(string $username): UserInterface
@@ -11265,7 +11353,7 @@ index 513b6494e5..c0211b6e39 100644
      {
          /** @var IsGranted[] $attributes */
 diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php
-index fc56733efa..8538f5f821 100644
+index f2f86a5dfa..bd47629587 100644
 --- a/src/Symfony/Component/Security/Http/Firewall.php
 +++ b/src/Symfony/Component/Security/Http/Firewall.php
 @@ -51,5 +51,5 @@ class Firewall implements EventSubscriberInterface
@@ -11282,14 +11370,14 @@ index fc56733efa..8538f5f821 100644
 +    public function onKernelFinishRequest(FinishRequestEvent $event): void
      {
          $request = $event->getRequest();
-@@ -109,5 +109,5 @@ class Firewall implements EventSubscriberInterface
-     }
- 
+@@ -112,5 +112,5 @@ class Firewall implements EventSubscriberInterface
+      * @return array
+      */
 -    public static function getSubscribedEvents()
 +    public static function getSubscribedEvents(): array
      {
          return [
-@@ -120,5 +120,5 @@ class Firewall implements EventSubscriberInterface
+@@ -123,5 +123,5 @@ class Firewall implements EventSubscriberInterface
       * @return void
       */
 -    protected function callListeners(RequestEvent $event, iterable $listeners)
@@ -11521,55 +11609,65 @@ index 61b14a1a80..f745caaada 100644
      {
          if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) {
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
-index 16b2bb70af..e1a7dd2df1 100644
+index ed42d56f40..9cf5a883b3 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
-@@ -141,10 +141,10 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
-      * @param array $context
+@@ -143,5 +143,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+      * @return bool
       */
 -    public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */)
 +    public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */): bool
      {
          return \is_object($data) && !$data instanceof \Traversable;
-     }
- 
+@@ -151,5 +151,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+      * @return array|string|int|float|bool|\ArrayObject|null
+      */
 -    public function normalize(mixed $object, string $format = null, array $context = [])
 +    public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
      {
          if (!isset($context['cache_key'])) {
-@@ -227,5 +227,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
-     }
- 
+@@ -235,5 +235,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+      * @return object
+      */
 -    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null)
 +    protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object
      {
          if ($this->classDiscriminatorResolver && $mapping = $this->classDiscriminatorResolver->getMappingForClass($class)) {
-@@ -289,5 +289,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+@@ -297,5 +297,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
       * @return string[]
       */
 -    abstract protected function extractAttributes(object $object, string $format = null, array $context = []);
 +    abstract protected function extractAttributes(object $object, string $format = null, array $context = []): array;
  
      /**
-@@ -296,15 +296,15 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+@@ -304,5 +304,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
       * @return mixed
       */
 -    abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []);
 +    abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed;
  
      /**
-      * @param array $context
+@@ -311,5 +311,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+      * @return bool
       */
 -    public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */)
 +    public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */): bool
      {
          return class_exists($type) || (interface_exists($type, false) && null !== $this->classDiscriminatorResolver?->getMappingForClass($type));
-     }
- 
+@@ -319,5 +319,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+      * @return mixed
+      */
 -    public function denormalize(mixed $data, string $type, string $format = null, array $context = [])
 +    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
      {
          if (!isset($context['cache_key'])) {
+@@ -424,5 +424,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
+      * @return void
+      */
+-    abstract protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = []);
++    abstract protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = []): void;
+ 
+     /**
 diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
 index 503f3cb518..78f48e086d 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
@@ -11702,9 +11800,30 @@ index 1835568745..2b98fc11d6 100644
      {
          $this->serializer = $serializer;
 diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
-index df0b6121ea..7441f9fd6e 100644
+index df0b6121ea..37ca485e88 100644
 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
 +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
+@@ -592,5 +592,5 @@ class AbstractObjectNormalizerDummy extends AbstractObjectNormalizer
+     }
+ 
+-    protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = [])
++    protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []): void
+     {
+         $object->$attribute = $value;
+@@ -720,5 +720,5 @@ class AbstractObjectNormalizerWithMetadata extends AbstractObjectNormalizer
+     }
+ 
+-    protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = [])
++    protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []): void
+     {
+         $object->$attribute = $value;
+@@ -839,5 +839,5 @@ class AbstractObjectNormalizerCollectionDummy extends AbstractObjectNormalizer
+     }
+ 
+-    protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = [])
++    protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []): void
+     {
+         $object->$attribute = $value;
 @@ -896,5 +896,5 @@ class ArrayDenormalizerDummy implements DenormalizerInterface, SerializerAwareIn
      }
  
@@ -11923,6 +12042,16 @@ index 539bcbce14..a172cd2ed4 100644
 -    public function stream(string|TemplateReferenceInterface $name, array $parameters = []);
 +    public function stream(string|TemplateReferenceInterface $name, array $parameters = []): void;
  }
+diff --git a/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php b/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php
+index 65eea0bb9b..12e30f4cf5 100644
+--- a/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php
++++ b/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php
+@@ -187,4 +187,4 @@ abstract class AbstractOperation implements OperationInterface
+      * @return void
+      */
+-    abstract protected function processDomain(string $domain);
++    abstract protected function processDomain(string $domain): void;
+ }
 diff --git a/src/Symfony/Component/Translation/Catalogue/MergeOperation.php b/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
 index 1b777a8435..804cc138fc 100644
 --- a/src/Symfony/Component/Translation/Catalogue/MergeOperation.php
@@ -11963,7 +12092,7 @@ index c845959f1a..faa5b0b34e 100644
 +    public function deleteCatalogueMetadata(string $key = '', string $domain = 'messages'): void;
  }
 diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
-index 91001c5644..cfeb6c1fdc 100644
+index ba68635db7..fd3b32a02a 100644
 --- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php
 +++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
 @@ -54,5 +54,5 @@ class XliffLintCommand extends Command
@@ -12126,7 +12255,7 @@ index 642130af75..c9ae2693a4 100644
 +    public function setPrefix(string $prefix): void;
  }
 diff --git a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
-index 6b59c7cacc..50c1eba7c6 100644
+index 7ff27f7c80..495067ed2e 100644
 --- a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
 +++ b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
 @@ -136,5 +136,5 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
@@ -12143,6 +12272,13 @@ index 6b59c7cacc..50c1eba7c6 100644
 +    public function setPrefix(string $prefix): void
      {
          $this->prefix = $prefix;
+@@ -265,5 +265,5 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
+      * @return void
+      */
+-    protected function parseTokens(array $tokens, MessageCatalogue $catalog, string $filename)
++    protected function parseTokens(array $tokens, MessageCatalogue $catalog, string $filename): void
+     {
+         $tokenIterator = new \ArrayIterator($tokens);
 diff --git a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
 index 7f2f96be64..266c7f48c9 100644
 --- a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
@@ -12870,7 +13006,7 @@ index 644bbf70cb..4a1336e78b 100644
      {
          if (!$constraint instanceof IsTrue) {
 diff --git a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
-index c6445b16a5..50d738bdc9 100644
+index 3a64f11cf6..b271a2e1df 100644
 --- a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
 +++ b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
 @@ -31,5 +31,5 @@ class IsbnValidator extends ConstraintValidator
@@ -12894,6 +13030,13 @@ index c6445b16a5..50d738bdc9 100644
 +    protected function validateIsbn13(string $isbn): string|bool
      {
          // Error priority:
+@@ -179,5 +179,5 @@ class IsbnValidator extends ConstraintValidator
+      * @return string
+      */
+-    protected function getMessage(Isbn $constraint, string $type = null)
++    protected function getMessage(Isbn $constraint, string $type = null): string
+     {
+         if (null !== $constraint->message) {
 diff --git a/src/Symfony/Component/Validator/Constraints/IsinValidator.php b/src/Symfony/Component/Validator/Constraints/IsinValidator.php
 index 21539cbcb7..86d85efe95 100644
 --- a/src/Symfony/Component/Validator/Constraints/IsinValidator.php
@@ -13213,6 +13356,17 @@ index a7eda1457d..28630f205f 100644
 +    public function getOptions(): array
      {
          return $this->options;
+diff --git a/src/Symfony/Component/Validator/Exception/ValidationFailedException.php b/src/Symfony/Component/Validator/Exception/ValidationFailedException.php
+index 2106e0a0ba..0b64f07c89 100644
+--- a/src/Symfony/Component/Validator/Exception/ValidationFailedException.php
++++ b/src/Symfony/Component/Validator/Exception/ValidationFailedException.php
+@@ -32,5 +32,5 @@ class ValidationFailedException extends RuntimeException
+      * @return mixed
+      */
+-    public function getValue()
++    public function getValue(): mixed
+     {
+         return $this->value;
 diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
 index f5f084f2ed..b0f6545ab0 100644
 --- a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
@@ -14693,17 +14847,6 @@ index c1a77ad157..1e926dc83a 100644
 +    public function setParsedLine(int $parsedLine): void
      {
          $this->parsedLine = $parsedLine;
-diff --git a/src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php b/src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php
-index 88f6a0687a..a0f20a6a7c 100644
---- a/src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php
-+++ b/src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php
-@@ -16,5 +16,5 @@ use Psr\Container\ContainerInterface;
- use Symfony\Contracts\Service\ServiceLocatorTrait;
- 
--abstract class ServiceLocatorTest extends TestCase
-+abstract class ServiceLocatorTestCase extends TestCase
- {
-     protected function getServiceLocator(array $factories): ContainerInterface
 diff --git a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
 index db40ba13e0..48928ca959 100644
 --- a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
diff --git a/src/Symfony/Component/HttpClient/Response/StreamWrapper.php b/src/Symfony/Component/HttpClient/Response/StreamWrapper.php
index f891313dd3c88..b5554a8ad2ced 100644
--- a/src/Symfony/Component/HttpClient/Response/StreamWrapper.php
+++ b/src/Symfony/Component/HttpClient/Response/StreamWrapper.php
@@ -32,7 +32,7 @@ class StreamWrapper
     /** @var resource|string|null */
     private $content;
 
-    /** @var resource|null */
+    /** @var resource|callable|null */
     private $handle;
 
     private bool $blocking = true;
@@ -266,6 +266,9 @@ public function stream_seek(int $offset, int $whence = \SEEK_SET): bool
         return false;
     }
 
+    /**
+     * @return resource|false
+     */
     public function stream_cast(int $castAs)
     {
         if (\STREAM_CAST_FOR_SELECT === $castAs) {
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index cf7e56f13eb2f..633b4a63e2e43 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1732,6 +1732,9 @@ public function preferSafeContent(): bool
      * Copyright (c) 2005-2010 Zend Technologies USA Inc. (https://www.zend.com/)
      */
 
+    /**
+     * @return string
+     */
     protected function prepareRequestUri()
     {
         $requestUri = '';
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php
index da88e4f78767a..12d468cf04865 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php
@@ -34,6 +34,8 @@ final public function load(array $configs, ContainerBuilder $container): void
 
     /**
      * Configures the passed container according to the merged configuration.
+     *
+     * @return void
      */
     abstract protected function loadInternal(array $mergedConfig, ContainerBuilder $container);
 }
diff --git a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php
index f5095a0d841bd..eef59c28308a3 100644
--- a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php
+++ b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php
@@ -167,7 +167,7 @@ protected function loadUser(string $identifier, Entry $entry): UserInterface
         return new LdapUser($entry, $identifier, $password, $this->defaultRoles, $extraFields);
     }
 
-    private function getAttributeValue(Entry $entry, string $attribute)
+    private function getAttributeValue(Entry $entry, string $attribute): mixed
     {
         if (!$entry->hasAttribute($attribute)) {
             throw new InvalidArgumentException(sprintf('Missing attribute "%s" for user "%s".', $attribute, $entry->getDn()));
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php
index 3ee3f01317e12..02ae3737b5352 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php
@@ -199,7 +199,7 @@ private function getEndpoint(): ?string
         return ($this->host ?: self::HOST).($this->port ? ':'.$this->port : '');
     }
 
-    private function castCustomHeader(string $value, string $type)
+    private function castCustomHeader(string $value, string $type): mixed
     {
         return match ($type) {
             'bool' => filter_var($value, \FILTER_VALIDATE_BOOL),
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
index 97f5ded24d6dc..7f3496d1fcb6a 100644
--- a/src/Symfony/Component/Mime/Email.php
+++ b/src/Symfony/Component/Mime/Email.php
@@ -396,6 +396,9 @@ public function getBody(): AbstractPart
         return $this->generateBody();
     }
 
+    /**
+     * @return void
+     */
     public function ensureValidity()
     {
         $this->ensureBodyValid();
diff --git a/src/Symfony/Component/Process/Exception/ProcessFailedException.php b/src/Symfony/Component/Process/Exception/ProcessFailedException.php
index 328acfde5e883..cf006daebfe61 100644
--- a/src/Symfony/Component/Process/Exception/ProcessFailedException.php
+++ b/src/Symfony/Component/Process/Exception/ProcessFailedException.php
@@ -47,6 +47,9 @@ public function __construct(Process $process)
         $this->process = $process;
     }
 
+    /**
+     * @return Process
+     */
     public function getProcess()
     {
         return $this->process;
diff --git a/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php b/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
index 27ce7fd43082b..e507ca3099003 100644
--- a/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
+++ b/src/Symfony/Component/Process/Exception/ProcessTimedOutException.php
@@ -38,6 +38,9 @@ public function __construct(Process $process, int $timeoutType)
         ));
     }
 
+    /**
+     * @return Process
+     */
     public function getProcess()
     {
         return $this->process;
@@ -59,7 +62,7 @@ public function isIdleTimeout()
         return self::TYPE_IDLE === $this->timeoutType;
     }
 
-    public function getExceededTimeout()
+    public function getExceededTimeout(): ?float
     {
         return match ($this->timeoutType) {
             self::TYPE_GENERAL => $this->process->getTimeout(),
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index 6a38e965aad37..2f4b5a24cc421 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -285,6 +285,8 @@ public function mustRun(callable $callback = null, array $env = []): static
      * @param callable|null $callback A PHP callback to run whenever there is some
      *                                output available on STDOUT or STDERR
      *
+     * @return void
+     *
      * @throws RuntimeException When process can't be launched
      * @throws RuntimeException When process is already running
      * @throws LogicException   In case a callback is provided and output has been disabled
@@ -1140,6 +1142,8 @@ public function setInput(mixed $input): static
      * In case you run a background process (with the start method), you should
      * trigger this method regularly to ensure the process timeout
      *
+     * @return void
+     *
      * @throws ProcessTimedOutException In case the timeout was reached
      */
     public function checkTimeout()
@@ -1180,6 +1184,8 @@ public function getStartTime(): float
      *
      * Enabling the "create_new_console" option allows a subprocess to continue
      * to run after the main process exited, on both Windows and *nix
+     *
+     * @return void
      */
     public function setOptions(array $options)
     {
@@ -1275,6 +1281,8 @@ protected function buildCallback(callable $callback = null): \Closure
      * Updates the status of the process, reads pipes.
      *
      * @param bool $blocking Whether to use a blocking read call
+     *
+     * @return void
      */
     protected function updateStatus(bool $blocking)
     {
@@ -1323,7 +1331,7 @@ protected function isSigchildEnabled(): bool
      *
      * @throws LogicException in case output has been disabled or process is not started
      */
-    private function readPipesForOutput(string $caller, bool $blocking = false)
+    private function readPipesForOutput(string $caller, bool $blocking = false): void
     {
         if ($this->outputDisabled) {
             throw new LogicException('Output has been disabled.');
@@ -1358,7 +1366,7 @@ private function validateTimeout(?float $timeout): ?float
      * @param bool $blocking Whether to use blocking calls or not
      * @param bool $close    Whether to close file handles or not
      */
-    private function readPipes(bool $blocking, bool $close)
+    private function readPipes(bool $blocking, bool $close): void
     {
         $result = $this->processPipes->readAndWrite($blocking, $close);
 
@@ -1407,7 +1415,7 @@ private function close(): int
     /**
      * Resets data related to the latest run of the process.
      */
-    private function resetProcessData()
+    private function resetProcessData(): void
     {
         $this->starttime = null;
         $this->callback = null;
@@ -1528,7 +1536,7 @@ function ($m) use (&$env, $uid) {
      *
      * @throws LogicException if the process has not run
      */
-    private function requireProcessIsStarted(string $functionName)
+    private function requireProcessIsStarted(string $functionName): void
     {
         if (!$this->isStarted()) {
             throw new LogicException(sprintf('Process must be started before calling "%s()".', $functionName));
@@ -1540,7 +1548,7 @@ private function requireProcessIsStarted(string $functionName)
      *
      * @throws LogicException if the process is not yet terminated
      */
-    private function requireProcessIsTerminated(string $functionName)
+    private function requireProcessIsTerminated(string $functionName): void
     {
         if (!$this->isTerminated()) {
             throw new LogicException(sprintf('Process must be terminated before calling "%s()".', $functionName));
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
index b06c649885b56..decd2a2b1d60c 100644
--- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -358,6 +358,9 @@ protected function createRoute(string $path, array $defaults, array $requirement
         return new Route($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
     }
 
+    /**
+     * @return void
+     */
     abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot);
 
     /**
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
index 062be150b8941..d1cee213778f3 100644
--- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
+++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -255,6 +255,9 @@ protected function mergeDefaults(array $params, array $defaults): array
         return $defaults;
     }
 
+    /**
+     * @return ExpressionLanguage
+     */
     protected function getExpressionLanguage()
     {
         if (null === $this->expressionLanguage) {
diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
index b41dd55ef0d92..3fa13457b2112 100644
--- a/src/Symfony/Component/Routing/Router.php
+++ b/src/Symfony/Component/Routing/Router.php
@@ -178,6 +178,9 @@ public function getOption(string $key): mixed
         return $this->options[$key];
     }
 
+    /**
+     * @return RouteCollection
+     */
     public function getRouteCollection()
     {
         return $this->collection ??= $this->loader->load($this->resource, $this->options['resource_type']);
diff --git a/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
index 48db540a75372..6a0d04479bee2 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
@@ -312,7 +312,7 @@ public function testImportAttributesWithPsr4Prefix(string $configFile)
             $loader = new PhpFileLoader($locator),
             new Psr4DirectoryLoader($locator),
             new class() extends AnnotationClassLoader {
-                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
+                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void
                 {
                     $route->setDefault('_controller', $class->getName().'::'.$method->getName());
                 }
@@ -337,7 +337,7 @@ public function testImportAttributesFromClass()
         new LoaderResolver([
             $loader = new PhpFileLoader(new FileLocator(\dirname(__DIR__).'/Fixtures')),
             new class() extends AnnotationClassLoader {
-                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
+                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void
                 {
                     $route->setDefault('_controller', $class->getName().'::'.$method->getName());
                 }
diff --git a/src/Symfony/Component/Routing/Tests/Loader/Psr4DirectoryLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/Psr4DirectoryLoaderTest.php
index 4b2a4676b6e87..bd225913a69ff 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/Psr4DirectoryLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/Psr4DirectoryLoaderTest.php
@@ -106,7 +106,7 @@ private function getLoader(): DelegatingLoader
             new LoaderResolver([
                 new Psr4DirectoryLoader($locator),
                 new class() extends AnnotationClassLoader {
-                    protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
+                    protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void
                     {
                         $route->setDefault('_controller', $class->getName().'::'.$method->getName());
                     }
diff --git a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
index 65ea4a9d4e5b2..6ebf2183271db 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
@@ -607,7 +607,7 @@ public function testImportAttributesWithPsr4Prefix(string $configFile)
             $loader = new XmlFileLoader($locator),
             new Psr4DirectoryLoader($locator),
             new class() extends AnnotationClassLoader {
-                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
+                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void
                 {
                     $route->setDefault('_controller', $class->getName().'::'.$method->getName());
                 }
@@ -632,7 +632,7 @@ public function testImportAttributesFromClass()
         new LoaderResolver([
             $loader = new XmlFileLoader(new FileLocator(\dirname(__DIR__).'/Fixtures')),
             new class() extends AnnotationClassLoader {
-                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
+                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void
                 {
                     $route->setDefault('_controller', $class->getName().'::'.$method->getName());
                 }
diff --git a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
index 41d1605e638e3..515a8c747ea01 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
@@ -473,7 +473,7 @@ public function testImportAttributesWithPsr4Prefix(string $configFile)
             $loader = new YamlFileLoader($locator),
             new Psr4DirectoryLoader($locator),
             new class() extends AnnotationClassLoader {
-                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
+                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void
                 {
                     $route->setDefault('_controller', $class->getName().'::'.$method->getName());
                 }
@@ -498,7 +498,7 @@ public function testImportAttributesFromClass()
         new LoaderResolver([
             $loader = new YamlFileLoader(new FileLocator(\dirname(__DIR__).'/Fixtures')),
             new class() extends AnnotationClassLoader {
-                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
+                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void
                 {
                     $route->setDefault('_controller', $class->getName().'::'.$method->getName());
                 }
diff --git a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
index ed6c2d8b389d8..e0aef90a14147 100644
--- a/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
+++ b/src/Symfony/Component/Security/Core/User/InMemoryUserProvider.php
@@ -50,6 +50,8 @@ public function __construct(array $users = [])
     /**
      * Adds a new User to the provider.
      *
+     * @return void
+     *
      * @throws \LogicException
      */
     public function createUser(UserInterface $user)
diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php
index fc56733efacde..f2f86a5dfa7b2 100644
--- a/src/Symfony/Component/Security/Http/Firewall.php
+++ b/src/Symfony/Component/Security/Http/Firewall.php
@@ -108,6 +108,9 @@ public function onKernelFinishRequest(FinishRequestEvent $event)
         }
     }
 
+    /**
+     * @return array
+     */
     public static function getSubscribedEvents()
     {
         return [
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 16b2bb70af3fc..ed42d56f40588 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -139,12 +139,17 @@ public function __construct(
 
     /**
      * @param array $context
+     *
+     * @return bool
      */
     public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */)
     {
         return \is_object($data) && !$data instanceof \Traversable;
     }
 
+    /**
+     * @return array|string|int|float|bool|\ArrayObject|null
+     */
     public function normalize(mixed $object, string $format = null, array $context = [])
     {
         if (!isset($context['cache_key'])) {
@@ -226,6 +231,9 @@ public function normalize(mixed $object, string $format = null, array $context =
         return $data;
     }
 
+    /**
+     * @return object
+     */
     protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null)
     {
         if ($this->classDiscriminatorResolver && $mapping = $this->classDiscriminatorResolver->getMappingForClass($class)) {
@@ -299,12 +307,17 @@ abstract protected function getAttributeValue(object $object, string $attribute,
 
     /**
      * @param array $context
+     *
+     * @return bool
      */
     public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */)
     {
         return class_exists($type) || (interface_exists($type, false) && null !== $this->classDiscriminatorResolver?->getMappingForClass($type));
     }
 
+    /**
+     * @return mixed
+     */
     public function denormalize(mixed $data, string $type, string $format = null, array $context = [])
     {
         if (!isset($context['cache_key'])) {
@@ -408,7 +421,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
     }
 
     /**
-     * Sets attribute value.
+     * @return void
      */
     abstract protected function setAttributeValue(object $object, string $attribute, mixed $value, string $format = null, array $context = []);
 
diff --git a/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php b/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php
index 419ba95e6667d..65eea0bb9ba91 100644
--- a/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php
+++ b/src/Symfony/Component/Translation/Catalogue/AbstractOperation.php
@@ -183,6 +183,8 @@ public function moveMessagesToIntlDomainsIfPossible(string $batch = self::ALL_BA
      * stores the results.
      *
      * @param string $domain The domain which the operation will be performed for
+     *
+     * @return void
      */
     abstract protected function processDomain(string $domain);
 }
diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
index 91001c5644d27..ba68635db74f9 100644
--- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php
+++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php
@@ -154,7 +154,7 @@ private function validate(string $content, string $file = null): array
         return ['file' => $file, 'valid' => 0 === \count($errors), 'messages' => $errors];
     }
 
-    private function display(SymfonyStyle $io, array $files)
+    private function display(SymfonyStyle $io, array $files): int
     {
         return match ($this->format) {
             'txt' => $this->displayTxt($io, $files),
@@ -196,7 +196,7 @@ private function displayTxt(SymfonyStyle $io, array $filesInfo, bool $errorAsGit
         return min($erroredFiles, 1);
     }
 
-    private function displayJson(SymfonyStyle $io, array $filesInfo)
+    private function displayJson(SymfonyStyle $io, array $filesInfo): int
     {
         $errors = 0;
 
@@ -212,6 +212,9 @@ private function displayJson(SymfonyStyle $io, array $filesInfo)
         return min($errors, 1);
     }
 
+    /**
+     * @return iterable<\SplFileInfo>
+     */
     private function getFiles(string $fileOrDirectory): iterable
     {
         if (is_file($fileOrDirectory)) {
@@ -229,7 +232,10 @@ private function getFiles(string $fileOrDirectory): iterable
         }
     }
 
-    private function getDirectoryIterator(string $directory)
+    /**
+     * @return iterable<\SplFileInfo>
+     */
+    private function getDirectoryIterator(string $directory): iterable
     {
         $default = fn ($directory) => new \RecursiveIteratorIterator(
             new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
@@ -243,7 +249,7 @@ private function getDirectoryIterator(string $directory)
         return $default($directory);
     }
 
-    private function isReadable(string $fileOrDirectory)
+    private function isReadable(string $fileOrDirectory): bool
     {
         $default = fn ($fileOrDirectory) => is_readable($fileOrDirectory);
 
diff --git a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
index 6b59c7cacc41a..7ff27f7c8096b 100644
--- a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
+++ b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
@@ -168,7 +168,7 @@ protected function normalizeToken(mixed $token): ?string
     /**
      * Seeks to a non-whitespace token.
      */
-    private function seekToNextRelevantToken(\Iterator $tokenIterator)
+    private function seekToNextRelevantToken(\Iterator $tokenIterator): void
     {
         for (; $tokenIterator->valid(); $tokenIterator->next()) {
             $t = $tokenIterator->current();
@@ -178,7 +178,7 @@ private function seekToNextRelevantToken(\Iterator $tokenIterator)
         }
     }
 
-    private function skipMethodArgument(\Iterator $tokenIterator)
+    private function skipMethodArgument(\Iterator $tokenIterator): void
     {
         $openBraces = 0;
 
@@ -261,6 +261,8 @@ private function getValue(\Iterator $tokenIterator): string
 
     /**
      * Extracts trans message from PHP tokens.
+     *
+     * @return void
      */
     protected function parseTokens(array $tokens, MessageCatalogue $catalog, string $filename)
     {
diff --git a/src/Symfony/Component/Translation/Util/ArrayConverter.php b/src/Symfony/Component/Translation/Util/ArrayConverter.php
index 2f1738de4b386..8938e54f83b6e 100644
--- a/src/Symfony/Component/Translation/Util/ArrayConverter.php
+++ b/src/Symfony/Component/Translation/Util/ArrayConverter.php
@@ -46,7 +46,7 @@ public static function expandToTree(array $messages): array
         return $tree;
     }
 
-    private static function &getElementByPath(array &$tree, array $parts)
+    private static function &getElementByPath(array &$tree, array $parts): mixed
     {
         $elem = &$tree;
         $parentOfElem = null;
diff --git a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
index c6445b16a5e06..3a64f11cf6037 100644
--- a/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IsbnValidator.php
@@ -175,6 +175,9 @@ protected function validateIsbn13(string $isbn)
         return 0 === $checkSum % 10 ? true : Isbn::CHECKSUM_FAILED_ERROR;
     }
 
+    /**
+     * @return string
+     */
     protected function getMessage(Isbn $constraint, string $type = null)
     {
         if (null !== $constraint->message) {
diff --git a/src/Symfony/Component/Validator/Exception/ValidationFailedException.php b/src/Symfony/Component/Validator/Exception/ValidationFailedException.php
index 8d191699e81c6..2106e0a0baea0 100644
--- a/src/Symfony/Component/Validator/Exception/ValidationFailedException.php
+++ b/src/Symfony/Component/Validator/Exception/ValidationFailedException.php
@@ -28,6 +28,9 @@ public function __construct(mixed $value, ConstraintViolationListInterface $viol
         parent::__construct($violations);
     }
 
+    /**
+     * @return mixed
+     */
     public function getValue()
     {
         return $this->value;

From 66c214740f05cd5b6e66fcf38fa2c372f9e4aa55 Mon Sep 17 00:00:00 2001
From: Wouter de Jong <wouter@wouterj.nl>
Date: Sun, 23 Apr 2023 22:56:27 +0200
Subject: [PATCH 472/475] Add missing return types

---
 .github/expected-missing-return-types.diff    | 501 ++++++++++++++----
 .../Argument/ReferenceSetArgumentTrait.php    |   2 +
 .../DependencyInjection/Container.php         |   4 +-
 .../DependencyInjection/Dumper/PhpDumper.php  |   2 +-
 .../Extension/Extension.php                   |   9 +
 .../Loader/YamlFileLoader.php                 |   4 +-
 .../ParameterBag/FrozenParameterBag.php       |  15 +
 .../ParameterBag/ParameterBag.php             |   3 +
 .../Fixtures/php/services10_as_files.txt      |   2 +-
 .../Tests/Fixtures/php/services9_as_files.txt |   2 +-
 ...ervices_deprecated_parameters_as_files.txt |   2 +-
 .../php/services_non_shared_lazy_as_files.txt |   2 +-
 .../DomCrawler/AbstractUriElement.php         |   2 +
 .../Component/DomCrawler/Field/FormField.php  |   2 +
 .../Component/ExpressionLanguage/Compiler.php |   3 +
 .../ExpressionLanguage/Node/Node.php          |   5 +
 .../Component/ExpressionLanguage/Parser.php   |   6 +
 .../SerializedParsedExpression.php            |   5 +
 .../Component/Filesystem/Filesystem.php       |   2 +-
 src/Symfony/Component/Form/AbstractType.php   |   6 +
 src/Symfony/Component/Form/ButtonBuilder.php  |  64 +++
 .../DataAccessor/PropertyPathAccessor.php     |   2 +-
 .../Form/Extension/Core/Type/ChoiceType.php   |  16 +-
 .../Form/Extension/Core/Type/DateType.php     |   9 +
 .../Form/Extension/Core/Type/FileType.php     |  12 +
 .../Form/Extension/Core/Type/MoneyType.php    |   2 +
 .../ViolationMapper/ViolationPathIterator.php |   3 +
 27 files changed, 568 insertions(+), 119 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index c4d3f78983720..08bc291dac067 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -4081,7 +4081,7 @@ index 2d6542660b..20287f9286 100644
      {
          $this->extensionConfig = [];
 diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
-index 2bdc9e7d96..4489ecbc12 100644
+index 3ea2228b94..f1d7078383 100644
 --- a/src/Symfony/Component/DependencyInjection/Container.php
 +++ b/src/Symfony/Component/DependencyInjection/Container.php
 @@ -83,5 +83,5 @@ class Container implements ContainerInterface, ResetInterface
@@ -4119,6 +4119,13 @@ index 2bdc9e7d96..4489ecbc12 100644
 +    public function reset(): void
      {
          $services = $this->services + $this->privates;
+@@ -342,5 +342,5 @@ class Container implements ContainerInterface, ResetInterface
+      * @return mixed
+      */
+-    protected function load(string $file)
++    protected function load(string $file): mixed
+     {
+         return require $file;
 diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
 index 084a321ab5..09fb37f3aa 100644
 --- a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
@@ -4388,25 +4395,26 @@ index a42967f4da..4e86e16f9d 100644
 +    public function getConfiguration(array $config, ContainerBuilder $container): ?ConfigurationInterface;
  }
 diff --git a/src/Symfony/Component/DependencyInjection/Extension/Extension.php b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
-index 00192d0da5..620efa4fd1 100644
+index d0bd05ea4b..f9df65fd7c 100644
 --- a/src/Symfony/Component/DependencyInjection/Extension/Extension.php
 +++ b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
-@@ -29,10 +29,10 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn
-     private array $processedConfigs = [];
- 
+@@ -32,5 +32,5 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn
+      * @return string|false
+      */
 -    public function getXsdValidationBasePath()
 +    public function getXsdValidationBasePath(): string|false
      {
          return false;
-     }
- 
+@@ -40,5 +40,5 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn
+      * @return string
+      */
 -    public function getNamespace()
 +    public function getNamespace(): string
      {
          return 'http://example.org/schema/dic/'.$this->getAlias();
-@@ -68,5 +68,5 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn
-     }
- 
+@@ -77,5 +77,5 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn
+      * @return ConfigurationInterface|null
+      */
 -    public function getConfiguration(array $config, ContainerBuilder $container)
 +    public function getConfiguration(array $config, ContainerBuilder $container): ?ConfigurationInterface
      {
@@ -4531,42 +4539,46 @@ index 9c66e1f944..619e44fc73 100644
      {
          if ($this->resolved) {
 diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
-index d4933af33e..47b4778c26 100644
+index 1ede090384..7b6b63c599 100644
 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
 +++ b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
-@@ -35,25 +35,25 @@ class FrozenParameterBag extends ParameterBag
-     }
- 
+@@ -38,5 +38,5 @@ class FrozenParameterBag extends ParameterBag
+      * @return never
+      */
 -    public function clear()
-+    public function clear(): void
++    public function clear(): never
      {
          throw new LogicException('Impossible to call clear() on a frozen ParameterBag.');
-     }
- 
+@@ -46,5 +46,5 @@ class FrozenParameterBag extends ParameterBag
+      * @return never
+      */
 -    public function add(array $parameters)
-+    public function add(array $parameters): void
++    public function add(array $parameters): never
      {
          throw new LogicException('Impossible to call add() on a frozen ParameterBag.');
-     }
- 
+@@ -54,5 +54,5 @@ class FrozenParameterBag extends ParameterBag
+      * @return never
+      */
 -    public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value)
-+    public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value): void
++    public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value): never
      {
          throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
-     }
- 
+@@ -62,5 +62,5 @@ class FrozenParameterBag extends ParameterBag
+      * @return never
+      */
 -    public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.')
-+    public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.'): void
++    public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.'): never
      {
          throw new LogicException('Impossible to call deprecate() on a frozen ParameterBag.');
-     }
- 
+@@ -70,5 +70,5 @@ class FrozenParameterBag extends ParameterBag
+      * @return never
+      */
 -    public function remove(string $name)
-+    public function remove(string $name): void
++    public function remove(string $name): never
      {
          throw new LogicException('Impossible to call remove() on a frozen ParameterBag.');
 diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
-index 4a420464ec..d28df164f5 100644
+index 6ba8a4cf7c..5e5e22bc09 100644
 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
 +++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
 @@ -35,5 +35,5 @@ class ParameterBag implements ParameterBagInterface
@@ -4611,6 +4623,13 @@ index 4a420464ec..d28df164f5 100644
 +    public function resolve(): void
      {
          if ($this->resolved) {
+@@ -259,5 +259,5 @@ class ParameterBag implements ParameterBagInterface
+      * @return bool
+      */
+-    public function isResolved()
++    public function isResolved(): bool
+     {
+         return $this->resolved;
 diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
 index 18ddfde147..b8651648bd 100644
 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
@@ -4668,6 +4687,16 @@ index 9b431cd65b..5fdb0643cd 100644
 +    public function getType(): string
      {
          return $this->type;
+diff --git a/src/Symfony/Component/DomCrawler/AbstractUriElement.php b/src/Symfony/Component/DomCrawler/AbstractUriElement.php
+index f610b014a0..9458751c28 100644
+--- a/src/Symfony/Component/DomCrawler/AbstractUriElement.php
++++ b/src/Symfony/Component/DomCrawler/AbstractUriElement.php
+@@ -120,4 +120,4 @@ abstract class AbstractUriElement
+      * @throws \LogicException If given node is not an anchor
+      */
+-    abstract protected function setNode(\DOMElement $node);
++    abstract protected function setNode(\DOMElement $node): void;
+ }
 diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
 index 59eec3068c..b750e80938 100644
 --- a/src/Symfony/Component/DomCrawler/Crawler.php
@@ -4828,7 +4857,7 @@ index 4ebe766f0b..eca59a131d 100644
      {
          if ('input' !== $this->node->nodeName) {
 diff --git a/src/Symfony/Component/DomCrawler/Field/FormField.php b/src/Symfony/Component/DomCrawler/Field/FormField.php
-index 483b08f089..f0f7d96f67 100644
+index b97d54dda0..b6a9ebb549 100644
 --- a/src/Symfony/Component/DomCrawler/Field/FormField.php
 +++ b/src/Symfony/Component/DomCrawler/Field/FormField.php
 @@ -96,5 +96,5 @@ abstract class FormField
@@ -4838,6 +4867,12 @@ index 483b08f089..f0f7d96f67 100644
 +    public function setValue(?string $value): void
      {
          $this->value = $value ?? '';
+@@ -122,4 +122,4 @@ abstract class FormField
+      * @return void
+      */
+-    abstract protected function initialize();
++    abstract protected function initialize(): void;
+ }
 diff --git a/src/Symfony/Component/DomCrawler/Field/InputFormField.php b/src/Symfony/Component/DomCrawler/Field/InputFormField.php
 index 19d77352fc..ece901b578 100644
 --- a/src/Symfony/Component/DomCrawler/Field/InputFormField.php
@@ -5084,10 +5119,17 @@ index d385d3f833..1fc9f23ea0 100644
      {
          throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
 diff --git a/src/Symfony/Component/ExpressionLanguage/Compiler.php b/src/Symfony/Component/ExpressionLanguage/Compiler.php
-index 66471d29ff..98f2f1eab2 100644
+index ab50d361e3..c25e18117b 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Compiler.php
 +++ b/src/Symfony/Component/ExpressionLanguage/Compiler.php
-@@ -67,5 +67,5 @@ class Compiler implements ResetInterface
+@@ -32,5 +32,5 @@ class Compiler implements ResetInterface
+      * @return array
+      */
+-    public function getFunction(string $name)
++    public function getFunction(string $name): array
+     {
+         return $this->functions[$name];
+@@ -70,5 +70,5 @@ class Compiler implements ResetInterface
       * @return string
       */
 -    public function subcompile(Node\Node $node)
@@ -5148,7 +5190,7 @@ index 33323f388f..811fec7e2e 100644
      {
          $array = [];
 diff --git a/src/Symfony/Component/ExpressionLanguage/Node/Node.php b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
-index f6fff09b1e..4661f7d165 100644
+index 91fcc363ed..8756971315 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Node/Node.php
 +++ b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
 @@ -61,5 +61,5 @@ class Node
@@ -5165,21 +5207,28 @@ index f6fff09b1e..4661f7d165 100644
 +    public function evaluate(array $functions, array $values): mixed
      {
          $results = [];
-@@ -89,5 +89,5 @@ class Node
+@@ -86,5 +86,5 @@ class Node
+      * @throws \BadMethodCallException when this node cannot be transformed to an array
+      */
+-    public function toArray()
++    public function toArray(): array
+     {
+         throw new \BadMethodCallException(sprintf('Dumping a "%s" instance is not supported yet.', static::class));
+@@ -94,5 +94,5 @@ class Node
       * @return string
       */
 -    public function dump()
 +    public function dump(): string
      {
          $dump = '';
-@@ -103,5 +103,5 @@ class Node
+@@ -108,5 +108,5 @@ class Node
       * @return string
       */
 -    protected function dumpString(string $value)
 +    protected function dumpString(string $value): string
      {
          return sprintf('"%s"', addcslashes($value, "\0\t\"\\"));
-@@ -111,5 +111,5 @@ class Node
+@@ -116,5 +116,5 @@ class Node
       * @return bool
       */
 -    protected function isHash(array $value)
@@ -5198,45 +5247,59 @@ index 239624ec2c..3b497d5ccf 100644
      {
          return $this->nodes;
 diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
-index 71bcf398d4..88bbb13eab 100644
+index a163a7a82f..3f83e0cfe8 100644
 --- a/src/Symfony/Component/ExpressionLanguage/Parser.php
 +++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
-@@ -178,5 +178,5 @@ class Parser
+@@ -134,5 +134,5 @@ class Parser
+      * @return Node\Node
+      */
+-    public function parseExpression(int $precedence = 0)
++    public function parseExpression(int $precedence = 0): Node\Node
+     {
+         $expr = $this->getPrimary();
+@@ -158,5 +158,5 @@ class Parser
+      * @return Node\Node
+      */
+-    protected function getPrimary()
++    protected function getPrimary(): Node\Node
+     {
+         $token = $this->stream->current;
+@@ -184,5 +184,5 @@ class Parser
       * @return Node\Node
       */
 -    protected function parseConditionalExpression(Node\Node $expr)
 +    protected function parseConditionalExpression(Node\Node $expr): Node\Node
      {
          while ($this->stream->current->test(Token::PUNCTUATION_TYPE, '??')) {
-@@ -212,5 +212,5 @@ class Parser
+@@ -218,5 +218,5 @@ class Parser
       * @return Node\Node
       */
 -    public function parsePrimaryExpression()
 +    public function parsePrimaryExpression(): Node\Node
      {
          $token = $this->stream->current;
-@@ -280,5 +280,5 @@ class Parser
+@@ -286,5 +286,5 @@ class Parser
       * @return Node\ArrayNode
       */
 -    public function parseArrayExpression()
 +    public function parseArrayExpression(): Node\ArrayNode
      {
          $this->stream->expect(Token::PUNCTUATION_TYPE, '[', 'An array element was expected');
-@@ -307,5 +307,5 @@ class Parser
+@@ -313,5 +313,5 @@ class Parser
       * @return Node\ArrayNode
       */
 -    public function parseHashExpression()
 +    public function parseHashExpression(): Node\ArrayNode
      {
          $this->stream->expect(Token::PUNCTUATION_TYPE, '{', 'A hash element was expected');
-@@ -354,5 +354,5 @@ class Parser
+@@ -360,5 +360,5 @@ class Parser
       * @return Node\GetAttrNode|Node\Node
       */
 -    public function parsePostfixExpression(Node\Node $node)
 +    public function parsePostfixExpression(Node\Node $node): Node\GetAttrNode|Node\Node
      {
          $token = $this->stream->current;
-@@ -416,5 +416,5 @@ class Parser
+@@ -422,5 +422,5 @@ class Parser
       * @return Node\Node
       */
 -    public function parseArguments()
@@ -5244,18 +5307,12 @@ index 71bcf398d4..88bbb13eab 100644
      {
          $args = [];
 diff --git a/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php b/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php
-index 56207b0985..133a3a1061 100644
+index 5691907c86..92d423af86 100644
 --- a/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php
 +++ b/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php
-@@ -12,4 +12,5 @@
- namespace Symfony\Component\ExpressionLanguage;
- 
-+use Symfony\Component\ExpressionLanguage\Node\Node;
- /**
-  * Represents an already parsed expression.
-@@ -31,5 +32,5 @@ class SerializedParsedExpression extends ParsedExpression
-     }
- 
+@@ -36,5 +36,5 @@ class SerializedParsedExpression extends ParsedExpression
+      * @return Node
+      */
 -    public function getNodes()
 +    public function getNodes(): Node
      {
@@ -5279,7 +5336,7 @@ index 241725b9c5..420932897f 100644
      {
          $token = $this->current;
 diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
-index a47ce66216..168f345e93 100644
+index d3280bee51..913c309358 100644
 --- a/src/Symfony/Component/Filesystem/Filesystem.php
 +++ b/src/Symfony/Component/Filesystem/Filesystem.php
 @@ -37,5 +37,5 @@ class Filesystem
@@ -5421,7 +5478,7 @@ index 3f1ab79c26..bddb459b86 100644
  
      /**
 diff --git a/src/Symfony/Component/Form/AbstractType.php b/src/Symfony/Component/Form/AbstractType.php
-index b163506132..d8f2cc5d49 100644
+index ad4b195696..ba4cf5c85b 100644
 --- a/src/Symfony/Component/Form/AbstractType.php
 +++ b/src/Symfony/Component/Form/AbstractType.php
 @@ -24,5 +24,5 @@ abstract class AbstractType implements FormTypeInterface
@@ -5445,20 +5502,23 @@ index b163506132..d8f2cc5d49 100644
 +    public function finishView(FormView $view, FormInterface $form, array $options): void
      {
      }
-@@ -45,14 +45,14 @@ abstract class AbstractType implements FormTypeInterface
+@@ -45,5 +45,5 @@ abstract class AbstractType implements FormTypeInterface
       * @return void
       */
 -    public function configureOptions(OptionsResolver $resolver)
 +    public function configureOptions(OptionsResolver $resolver): void
      {
      }
- 
+@@ -52,5 +52,5 @@ abstract class AbstractType implements FormTypeInterface
+      * @return string
+      */
 -    public function getBlockPrefix()
 +    public function getBlockPrefix(): string
      {
          return StringUtil::fqcnToBlockPrefix(static::class) ?: '';
-     }
- 
+@@ -60,5 +60,5 @@ abstract class AbstractType implements FormTypeInterface
+      * @return string|null
+      */
 -    public function getParent()
 +    public function getParent(): ?string
      {
@@ -5496,16 +5556,233 @@ index 422f28bf33..b1d608fd4d 100644
      {
      }
 diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
-index 9cc32888e1..0fa604ceec 100644
+index 20a30968d4..dbded1d7f3 100644
 --- a/src/Symfony/Component/Form/ButtonBuilder.php
 +++ b/src/Symfony/Component/Form/ButtonBuilder.php
-@@ -327,5 +327,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+@@ -57,5 +57,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function add(string|FormBuilderInterface $child, string $type = null, array $options = []): static
++    public function add(string|FormBuilderInterface $child, string $type = null, array $options = []): never
+     {
+         throw new BadMethodCallException('Buttons cannot have children.');
+@@ -69,5 +69,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function create(string $name, string $type = null, array $options = []): FormBuilderInterface
++    public function create(string $name, string $type = null, array $options = []): never
+     {
+         throw new BadMethodCallException('Buttons cannot have children.');
+@@ -81,5 +81,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function get(string $name): FormBuilderInterface
++    public function get(string $name): never
+     {
+         throw new BadMethodCallException('Buttons cannot have children.');
+@@ -93,5 +93,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function remove(string $name): static
++    public function remove(string $name): never
+     {
+         throw new BadMethodCallException('Buttons cannot have children.');
+@@ -129,5 +129,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function addEventListener(string $eventName, callable $listener, int $priority = 0): static
++    public function addEventListener(string $eventName, callable $listener, int $priority = 0): never
+     {
+         throw new BadMethodCallException('Buttons do not support event listeners.');
+@@ -141,5 +141,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function addEventSubscriber(EventSubscriberInterface $subscriber): static
++    public function addEventSubscriber(EventSubscriberInterface $subscriber): never
+     {
+         throw new BadMethodCallException('Buttons do not support event subscribers.');
+@@ -153,5 +153,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function addViewTransformer(DataTransformerInterface $viewTransformer, bool $forcePrepend = false): static
++    public function addViewTransformer(DataTransformerInterface $viewTransformer, bool $forcePrepend = false): never
+     {
+         throw new BadMethodCallException('Buttons do not support data transformers.');
+@@ -165,5 +165,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function resetViewTransformers(): static
++    public function resetViewTransformers(): never
+     {
+         throw new BadMethodCallException('Buttons do not support data transformers.');
+@@ -177,5 +177,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function addModelTransformer(DataTransformerInterface $modelTransformer, bool $forceAppend = false): static
++    public function addModelTransformer(DataTransformerInterface $modelTransformer, bool $forceAppend = false): never
+     {
+         throw new BadMethodCallException('Buttons do not support data transformers.');
+@@ -189,5 +189,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function resetModelTransformers(): static
++    public function resetModelTransformers(): never
+     {
+         throw new BadMethodCallException('Buttons do not support data transformers.');
+@@ -221,5 +221,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setDataMapper(DataMapperInterface $dataMapper = null): static
++    public function setDataMapper(DataMapperInterface $dataMapper = null): never
+     {
+         if (1 > \func_num_args()) {
+@@ -249,5 +249,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setEmptyData(mixed $emptyData): static
++    public function setEmptyData(mixed $emptyData): never
+     {
+         throw new BadMethodCallException('Buttons do not support empty data.');
+@@ -261,5 +261,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setErrorBubbling(bool $errorBubbling): static
++    public function setErrorBubbling(bool $errorBubbling): never
+
10000
     {
+         throw new BadMethodCallException('Buttons do not support error bubbling.');
+@@ -273,5 +273,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setRequired(bool $required): static
++    public function setRequired(bool $required): never
+     {
+         throw new BadMethodCallException('Buttons cannot be required.');
+@@ -285,5 +285,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setPropertyPath(string|PropertyPathInterface|null $propertyPath): static
++    public function setPropertyPath(string|PropertyPathInterface|null $propertyPath): never
+     {
+         throw new BadMethodCallException('Buttons do not support property paths.');
+@@ -297,5 +297,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setMapped(bool $mapped): static
++    public function setMapped(bool $mapped): never
+     {
+         throw new BadMethodCallException('Buttons do not support data mapping.');
+@@ -309,5 +309,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setByReference(bool $byReference): static
++    public function setByReference(bool $byReference): never
+     {
+         throw new BadMethodCallException('Buttons do not support data mapping.');
+@@ -321,5 +321,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setCompound(bool $compound): static
++    public function setCompound(bool $compound): never
+     {
+         throw new BadMethodCallException('Buttons cannot be compound.');
+@@ -345,5 +345,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setData(mixed $data): static
++    public function setData(mixed $data): never
+     {
+         throw new BadMethodCallException('Buttons do not support data.');
+@@ -357,5 +357,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setDataLocked(bool $locked): static
++    public function setDataLocked(bool $locked): never
+     {
+         throw new BadMethodCallException('Buttons do not support data locking.');
+@@ -369,5 +369,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
       * @throws BadMethodCallException
       */
 -    public function setFormFactory(FormFactoryInterface $formFactory)
-+    public function setFormFactory(FormFactoryInterface $formFactory): static
++    public function setFormFactory(FormFactoryInterface $formFactory): never
      {
          throw new BadMethodCallException('Buttons do not support form factories.');
+@@ -381,5 +381,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setAction(string $action): static
++    public function setAction(string $action): never
+     {
+         throw new BadMethodCallException('Buttons do not support actions.');
+@@ -393,5 +393,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setMethod(string $method): static
++    public function setMethod(string $method): never
+     {
+         throw new BadMethodCallException('Buttons do not support methods.');
+@@ -405,5 +405,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setRequestHandler(RequestHandlerInterface $requestHandler): static
++    public function setRequestHandler(RequestHandlerInterface $requestHandler): never
+     {
+         throw new BadMethodCallException('Buttons do not support request handlers.');
+@@ -433,5 +433,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setInheritData(bool $inheritData): static
++    public function setInheritData(bool $inheritData): never
+     {
+         throw new BadMethodCallException('Buttons do not support data inheritance.');
+@@ -457,5 +457,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function setIsEmptyCallback(?callable $isEmptyCallback): static
++    public function setIsEmptyCallback(?callable $isEmptyCallback): never
+     {
+         throw new BadMethodCallException('Buttons do not support "is empty" callback.');
+@@ -469,5 +469,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function getEventDispatcher(): EventDispatcherInterface
++    public function getEventDispatcher(): never
+     {
+         throw new BadMethodCallException('Buttons do not support event dispatching.');
+@@ -628,5 +628,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @return never
+      */
+-    public function getFormFactory(): FormFactoryInterface
++    public function getFormFactory(): never
+     {
+         throw new BadMethodCallException('Buttons do not support adding children.');
+@@ -640,5 +640,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function getAction(): string
++    public function getAction(): never
+     {
+         throw new BadMethodCallException('Buttons do not support actions.');
+@@ -652,5 +652,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function getMethod(): string
++    public function getMethod(): never
+     {
+         throw new BadMethodCallException('Buttons do not support methods.');
+@@ -664,5 +664,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function getRequestHandler(): RequestHandlerInterface
++    public function getRequestHandler(): never
+     {
+         throw new BadMethodCallException('Buttons do not support request handlers.');
+@@ -716,5 +716,5 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
+      * @throws BadMethodCallException
+      */
+-    public function getIsEmptyCallback(): ?callable
++    public function getIsEmptyCallback(): never
+     {
+         throw new BadMethodCallException('Buttons do not support "is empty" callback.');
 diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
 index 40c0604ea4..34f7f441f2 100644
 --- a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
@@ -5751,33 +6028,33 @@ index 291ede93ef..a4128a3880 100644
      {
          $emptyData = static fn (FormInterface $form, $viewData) => $viewData;
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
-index 5e5997ddf9..6ea20c57ab 100644
+index 4dcd3b6877..16e18de555 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
-@@ -63,5 +63,5 @@ class ChoiceType extends AbstractType
-     }
- 
+@@ -66,5 +66,5 @@ class ChoiceType extends AbstractType
+      * @return void
+      */
 -    public function buildForm(FormBuilderInterface $builder, array $options)
 +    public function buildForm(FormBuilderInterface $builder, array $options): void
      {
          $unknownValues = [];
-@@ -216,5 +216,5 @@ class ChoiceType extends AbstractType
-     }
- 
+@@ -222,5 +222,5 @@ class ChoiceType extends AbstractType
+      * @return void
+      */
 -    public function buildView(FormView $view, FormInterface $form, array $options)
 +    public function buildView(FormView $view, FormInterface $form, array $options): void
      {
          $choiceTranslationDomain = $options['choice_translation_domain'];
-@@ -270,5 +270,5 @@ class ChoiceType extends AbstractType
-     }
- 
+@@ -279,5 +279,5 @@ class ChoiceType extends AbstractType
+      * @return void
+      */
 -    public function finishView(FormView $view, FormInterface $form, array $options)
 +    public function finishView(FormView $view, FormInterface $form, array $options): void
      {
          if ($options['expanded']) {
-@@ -287,5 +287,5 @@ class ChoiceType extends AbstractType
-     }
- 
+@@ -299,5 +299,5 @@ class ChoiceType extends AbstractType
+      * @return void
+      */
 -    public function configureOptions(OptionsResolver $resolver)
 +    public function configureOptions(OptionsResolver $resolver): void
      {
@@ -5905,26 +6182,26 @@ index 32c58447cd..ec35f6ee41 100644
      {
          $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
-index 5c079f137d..e511dbb0c6 100644
+index 3b68dc241a..474139a6ee 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
-@@ -44,5 +44,5 @@ class DateType extends AbstractType
-     ];
- 
+@@ -47,5 +47,5 @@ class DateType extends AbstractType
+      * @return void
+      */
 -    public function buildForm(FormBuilderInterface $builder, array $options)
 +    public function buildForm(FormBuilderInterface $builder, array $options): void
      {
          $dateFormat = \is_int($options['format']) ? $options['format'] : self::DEFAULT_FORMAT;
-@@ -178,5 +178,5 @@ class DateType extends AbstractType
-     }
- 
+@@ -184,5 +184,5 @@ class DateType extends AbstractType
+      * @return void
+      */
 -    public function finishView(FormView $view, FormInterface $form, array $options)
 +    public function finishView(FormView $view, FormInterface $form, array $options): void
      {
          $view->vars['widget'] = $options['widget'];
-@@ -215,5 +215,5 @@ class DateType extends AbstractType
-     }
- 
+@@ -224,5 +224,5 @@ class DateType extends AbstractType
+      * @return void
+      */
 -    public function configureOptions(OptionsResolver $resolver)
 +    public function configureOptions(OptionsResolver $resolver): void
      {
@@ -5941,32 +6218,33 @@ index 64d01ee67a..0cd6cd3b79 100644
      {
          $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
-index 6e4b78251d..4e52e19cfc 100644
+index cf8e1a7439..2ee4fa5fea 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
-@@ -42,5 +42,5 @@ class FileType extends AbstractType
-     }
- 
+@@ -45,5 +45,5 @@ class FileType extends AbstractType
+      * @return void
+      */
 -    public function buildForm(FormBuilderInterface $builder, array $options)
 +    public function buildForm(FormBuilderInterface $builder, array $options): void
      {
          // Ensure that submitted data is always an uploaded file or an array of some
-@@ -83,5 +83,5 @@ class FileType extends AbstractType
-     }
- 
+@@ -89,5 +89,5 @@ class FileType extends AbstractType
+      * @return void
+      */
 -    public function buildView(FormView $view, FormInterface $form, array $options)
 +    public function buildView(FormView $view, FormInterface $form, array $options): void
      {
          if ($options['multiple']) {
-@@ -96,10 +96,10 @@ class FileType extends AbstractType
-     }
- 
+@@ -105,5 +105,5 @@ class FileType extends AbstractType
+      * @return void
+      */
 -    public function finishView(FormView $view, FormInterface $form, array $options)
 +    public function finishView(FormView $view, FormInterface $form, array $options): void
      {
          $view->vars['multipart'] = true;
-     }
- 
+@@ -113,5 +113,5 @@ class FileType extends AbstractType
+      * @return void
+      */
 -    public function configureOptions(OptionsResolver $resolver)
 +    public function configureOptions(OptionsResolver $resolver): void
      {
@@ -6062,7 +6340,7 @@ index e98134febd..9f2662031e 100644
      {
          $resolver->setDefaults([
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
-index 27c1dbb49b..24209ffc85 100644
+index 9c9e5b4d7c..c8d4ecf232 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
 +++ b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
 @@ -28,5 +28,5 @@ class MoneyType extends AbstractType
@@ -6086,6 +6364,13 @@ index 27c1dbb49b..24209ffc85 100644
 +    public function configureOptions(OptionsResolver $resolver): void
      {
          $resolver->setDefaults([
+@@ -107,5 +107,5 @@ class MoneyType extends AbstractType
+      * @return string
+      */
+-    protected static function getPattern(?string $currency)
++    protected static function getPattern(?string $currency): string
+     {
+         if (!$currency) {
 diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
 index 578991f9fd..16f39e873b 100644
 --- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
@@ -6727,6 +7012,17 @@ index a72d41df9e..6a58a1bddc 100644
 -    public function mapViolation(ConstraintViolation $violation, FormInterface $form, bool $allowNonSynchronized = false);
 +    public function mapViolation(ConstraintViolation $violation, FormInterface $form, bool $allowNonSynchronized = false): void;
  }
+diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPathIterator.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPathIterator.php
+index ed363a7b15..967d95cc27 100644
+--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPathIterator.php
++++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPathIterator.php
+@@ -27,5 +27,5 @@ class ViolationPathIterator extends PropertyPathIterator
+      * @return bool
+      */
+-    public function mapsForm()
++    public function mapsForm(): bool
+     {
+         return $this->path->mapsForm($this->key());
 diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
 index 9fed3d1a0a..5cd4eb5f16 100644
 --- a/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -14693,17 +14989,6 @@ index c1a77ad157..1e926dc83a 100644
 +    public function setParsedLine(int $parsedLine): void
      {
          $this->parsedLine = $parsedLine;
-diff --git a/src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php b/src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php
-index 88f6a0687a..a0f20a6a7c 100644
---- a/src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php
-+++ b/src/Symfony/Contracts/Service/Test/ServiceLocatorTestCase.php
-@@ -16,5 +16,5 @@ use Psr\Container\ContainerInterface;
- use Symfony\Contracts\Service\ServiceLocatorTrait;
- 
--abstract class ServiceLocatorTest extends TestCase
-+abstract class ServiceLocatorTestCase extends TestCase
- {
-     protected function getServiceLocator(array $factories): ContainerInterface
 diff --git a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
 index db40ba13e0..48928ca959 100644
 --- a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
diff --git a/src/Symfony/Component/DependencyInjection/Argument/ReferenceSetArgumentTrait.php b/src/Symfony/Component/DependencyInjection/Argument/ReferenceSetArgumentTrait.php
index 00b6e191a3c1d..293d9a0a14328 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/ReferenceSetArgumentTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/ReferenceSetArgumentTrait.php
@@ -44,6 +44,8 @@ public function getValues(): array
 
     /**
      * @param Reference[] $values The service references to put in the set
+     *
+     * @return void
      */
     public function setValues(array $values)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 2bdc9e7d96d33..3ea2228b94c1a 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -217,7 +217,7 @@ public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALI
      *
      * As a separate method to allow "get()" to use the really fast `??` operator.
      */
-    private static function make(self $container, string $id, int $invalidBehavior)
+    private static function make(self $container, string $id, int $invalidBehavior): ?object
     {
         if (isset($container->loading[$id])) {
             throw new ServiceCircularReferenceException($id, array_merge(array_keys($container->loading), [$id]));
@@ -338,6 +338,8 @@ public static function underscore(string $id): string
 
     /**
      * Creates a service by requiring its factory file.
+     *
+     * @return mixed
      */
     protected function load(string $file)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index f147a644fa422..c7b3e72bce7ae 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1325,7 +1325,7 @@ public function isCompiled(): bool
         if ($this->asFiles && !$this->inlineFactories) {
             $code .= <<<'EOF'
 
-    protected function load($file, $lazyLoad = true)
+    protected function load($file, $lazyLoad = true): mixed
     {
         if (class_exists($class = __NAMESPACE__.'\\'.$file, false)) {
             return $class::do($this, $lazyLoad);
diff --git a/src/Symfony/Component/DependencyInjection/Extension/Extension.php b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
index 00192d0da577d..d0bd05ea4b07c 100644
--- a/src/Symfony/Component/DependencyInjection/Extension/Extension.php
+++ b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
@@ -28,11 +28,17 @@ abstract class Extension implements ExtensionInterface, ConfigurationExtensionIn
 {
     private array $processedConfigs = [];
 
+    /**
+     * @return string|false
+     */
     public function getXsdValidationBasePath()
     {
         return false;
     }
 
+    /**
+     * @return string
+     */
     public function getNamespace()
     {
         return 'http://example.org/schema/dic/'.$this->getAlias();
@@ -67,6 +73,9 @@ public function getAlias(): string
         return Container::underscore($classBaseName);
     }
 
+    /**
+     * @return ConfigurationInterface|null
+     */
     public function getConfiguration(array $config, ContainerBuilder $container)
     {
         $class = static::class;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 62acf55404dbf..822b45ef79b16 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -332,7 +332,7 @@ private function isUsingShortSyntax(array $service): bool
     /**
      * @throws InvalidArgumentException When tags are invalid
      */
-    private function parseDefinition(string $id, array|string|null $service, string $file, array $defaults, bool $return = false, bool $trackBindings = true)
+    private function parseDefinition(string $id, array|string|null $service, string $file, array $defaults, bool $return = false, bool $trackBindings = true): Definition|Alias|null
     {
         if (preg_match('/^_[a-zA-Z0-9_]*$/', $id)) {
             throw new InvalidArgumentException(sprintf('Service names that start with an underscore are reserved. Rename the "%s" service or define it in XML instead.', $id));
@@ -706,6 +706,8 @@ private function parseDefinition(string $id, array|string|null $service, string
         } else {
             $this->setDefinition($id, $definition);
         }
+
+        return null;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
index d4933af33e8aa..1ede090384216 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
@@ -34,26 +34,41 @@ public function __construct(
         $this->resolved = true;
     }
 
+    /**
+     * @return never
+     */
     public function clear()
     {
         throw new LogicException('Impossible to call clear() on a frozen ParameterBag.');
     }
 
+    /**
+     * @return never
+     */
     public function add(array $parameters)
     {
         throw new LogicException('Impossible to call add() on a frozen ParameterBag.');
     }
 
+    /**
+     * @return never
+     */
     public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value)
     {
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
 
+    /**
+     * @return never
+     */
     public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.')
     {
         throw new LogicException('Impossible to call deprecate() on a frozen ParameterBag.');
     }
 
+    /**
+     * @return never
+     */
     public function remove(string $name)
     {
         throw new LogicException('Impossible to call remove() on a frozen ParameterBag.');
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
index 4a420464ec0bc..6ba8a4cf7cdc6 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
@@ -255,6 +255,9 @@ public function resolveString(string $value, array $resolving = []): mixed
         }, $value);
     }
 
+    /**
+     * @return bool
+     */
     public function isResolved()
     {
         return $this->resolved;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
index c6e71e52e1b5f..cd63684ca9f3a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
@@ -93,7 +93,7 @@ class ProjectServiceContainer extends Container
         return require $this->containerDir.\DIRECTORY_SEPARATOR.'removed-ids.php';
     }
 
-    protected function load($file, $lazyLoad = true)
+    protected function load($file, $lazyLoad = true): mixed
     {
         if (class_exists($class = __NAMESPACE__.'\\'.$file, false)) {
             return $class::do($this, $lazyLoad);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index 1897adcc09e47..9528de3651608 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -627,7 +627,7 @@ class ProjectServiceContainer extends Container
         return require $this->containerDir.\DIRECTORY_SEPARATOR.'removed-ids.php';
     }
 
-    protected function load($file, $lazyLoad = true)
+    protected function load($file, $lazyLoad = true): mixed
     {
         if (class_exists($class = __NAMESPACE__.'\\'.$file, false)) {
             return $class::do($this, $lazyLoad);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt
index 7d2af40ebda4d..5081cf415d0cc 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt
@@ -73,7 +73,7 @@ class ProjectServiceContainer extends Container
         return true;
     }
 
-    protected function load($file, $lazyLoad = true)
+    protected function load($file, $lazyLoad = true): mixed
     {
         if (class_exists($class = __NAMESPACE__.'\\'.$file, false)) {
             return $class::do($this, $lazyLoad);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
index 6f74a94bc464b..8cd2a9e190e70 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
@@ -103,7 +103,7 @@ class ProjectServiceContainer extends Container
         return true;
     }
 
-    protected function load($file, $lazyLoad = true)
+    protected function load($file, $lazyLoad = true): mixed
     {
         if (class_exists($class = __NAMESPACE__.'\\'.$file, false)) {
             return $class::do($this, $lazyLoad);
diff --git a/src/Symfony/Component/DomCrawler/AbstractUriElement.php b/src/Symfony/Component/DomCrawler/AbstractUriElement.php
index c14174251372e..f610b014a042c 100644
--- a/src/Symfony/Component/DomCrawler/AbstractUriElement.php
+++ b/src/Symfony/Component/DomCrawler/AbstractUriElement.php
@@ -115,6 +115,8 @@ protected function canonicalizePath(string $path): string
      *
      * @param \DOMElement $node A \DOMElement instance
      *
+     * @return void
+     *
      * @throws \LogicException If given node is not an anchor
      */
     abstract protected function setNode(\DOMElement $node);
diff --git a/src/Symfony/Component/DomCrawler/Field/FormField.php b/src/Symfony/Component/DomCrawler/Field/FormField.php
index 483b08f089379..b97d54dda0a8e 100644
--- a/src/Symfony/Component/DomCrawler/Field/FormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/FormField.php
@@ -118,6 +118,8 @@ public function isDisabled(): bool
 
     /**
      * Initializes the form field.
+     *
+     * @return void
      */
     abstract protected function initialize();
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Compiler.php b/src/Symfony/Component/ExpressionLanguage/Compiler.php
index 66471d29ff033..ab50d361e3dc9 100644
--- a/src/Symfony/Component/ExpressionLanguage/Compiler.php
+++ b/src/Symfony/Component/ExpressionLanguage/Compiler.php
@@ -28,6 +28,9 @@ public function __construct(array $functions)
         $this->functions = $functions;
     }
 
+    /**
+     * @return array
+     */
     public function getFunction(string $name)
     {
         return $this->functions[$name];
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/Node.php b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
index f6fff09b1ead3..91fcc363edd50 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/Node.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
@@ -80,6 +80,11 @@ public function evaluate(array $functions, array $values)
         return $results;
     }
 
+    /**
+     * @return array
+     *
+     * @throws \BadMethodCallException when this node cannot be transformed to an array
+     */
     public function toArray()
     {
         throw new \BadMethodCallException(sprintf('Dumping a "%s" instance is not supported yet.', static::class));
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
index 71bcf398d4e0d..a163a7a82f7d4 100644
--- a/src/Symfony/Component/ExpressionLanguage/Parser.php
+++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -130,6 +130,9 @@ private function doParse(TokenStream $stream, ?array $names = []): Node\Node
         return $node;
     }
 
+    /**
+     * @return Node\Node
+     */
     public function parseExpression(int $precedence = 0)
     {
         $expr = $this->getPrimary();
@@ -151,6 +154,9 @@ public function parseExpression(int $precedence = 0)
         return $expr;
     }
 
+    /**
+     * @return Node\Node
+     */
     protected function getPrimary()
     {
         $token = $this->stream->current;
diff --git a/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php b/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php
index 56207b09854ca..5691907c868c6 100644
--- a/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php
+++ b/src/Symfony/Component/ExpressionLanguage/SerializedParsedExpression.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\ExpressionLanguage;
 
+use Symfony\Component\ExpressionLanguage\Node\Node;
+
 /**
  * Represents an already parsed expression.
  *
@@ -30,6 +32,9 @@ public function __construct(string $expression, string $nodes)
         $this->nodes = $nodes;
     }
 
+    /**
+     * @return Node
+     */
     public function getNodes()
     {
         return unserialize($this->nodes);
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index a47ce66216015..d3280bee51fa9 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -401,7 +401,7 @@ public function hardlink(string $originFile, string|iterable $targetFiles)
     /**
      * @param string $linkType Name of the link type, typically 'symbolic' or 'hard'
      */
-    private function linkException(string $origin, string $target, string $linkType)
+    private function linkException(string $origin, string $target, string $linkType): never
     {
         if (self::$lastError) {
             if ('\\' === \DIRECTORY_SEPARATOR && str_contains(self::$lastError, 'error code(1314)')) {
diff --git a/src/Symfony/Component/Form/AbstractType.php b/src/Symfony/Component/Form/AbstractType.php
index b163506132d12..ad4b1956969da 100644
--- a/src/Symfony/Component/Form/AbstractType.php
+++ b/src/Symfony/Component/Form/AbstractType.php
@@ -48,11 +48,17 @@ public function configureOptions(OptionsResolver $resolver)
     {
     }
 
+    /**
+     * @return string
+     */
     public function getBlockPrefix()
     {
         return StringUtil::fqcnToBlockPrefix(static::class) ?: '';
     }
 
+    /**
+     * @return string|null
+     */
     public function getParent()
     {
         return FormType::class;
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
index 9cc32888e1d68..20a30968d402e 100644
--- a/src/Symfony/Component/Form/ButtonBuilder.php
+++ b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -52,6 +52,8 @@ public function __construct(?string $name, array $options = [])
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function add(string|FormBuilderInterface $child, string $type = null, array $options = []): static
@@ -62,6 +64,8 @@ public function add(string|FormBuilderInterface $child, string $type = null, arr
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function create(string $name, string $type = null, array $options = []): FormBuilderInterface
@@ -72,6 +76,8 @@ public function create(string $name, string $type = null, array $options = []):
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function get(string $name): FormBuilderInterface
@@ -82,6 +88,8 @@ public function get(string $name): FormBuilderInterface
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function remove(string $name): static
@@ -116,6 +124,8 @@ public function getForm(): Button
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function addEventListener(string $eventName, callable $listener, int $priority = 0): static
@@ -126,6 +136,8 @@ public function addEventListener(string $eventName, callable $listener, int $pri
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function addEventSubscriber(EventSubscriberInterface $subscriber): static
@@ -136,6 +148,8 @@ public function addEventSubscriber(EventSubscriberInterface $subscriber): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function addViewTransformer(DataTransformerInterface $viewTransformer, bool $forcePrepend = false): static
@@ -146,6 +160,8 @@ public function addViewTransformer(DataTransformerInterface $viewTransformer, bo
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function resetViewTransformers(): static
@@ -156,6 +172,8 @@ public function resetViewTransformers(): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function addModelTransformer(DataTransformerInterface $modelTransformer, bool $forceAppend = false): static
@@ -166,6 +184,8 @@ public function addModelTransformer(DataTransformerInterface $modelTransformer,
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function resetModelTransformers(): static
@@ -196,6 +216,8 @@ public function setAttributes(array $attributes): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setDataMapper(DataMapperInterface $dataMapper = null): static
@@ -222,6 +244,8 @@ public function setDisabled(bool $disabled): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setEmptyData(mixed $emptyData): static
@@ -232,6 +256,8 @@ public function setEmptyData(mixed $emptyData): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setErrorBubbling(bool $errorBubbling): static
@@ -242,6 +268,8 @@ public function setErrorBubbling(bool $errorBubbling): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setRequired(bool $required): static
@@ -252,6 +280,8 @@ public function setRequired(bool $required): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setPropertyPath(string|PropertyPathInterface|null $propertyPath): static
@@ -262,6 +292,8 @@ public function setPropertyPath(string|PropertyPathInterface|null $propertyPath)
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setMapped(bool $mapped): static
@@ -272,6 +304,8 @@ public function setMapped(bool $mapped): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setByReference(bool $byReference): static
@@ -282,6 +316,8 @@ public function setByReference(bool $byReference): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setCompound(bool $compound): static
@@ -304,6 +340,8 @@ public function setType(ResolvedFormTypeInterface $type): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setData(mixed $data): static
@@ -314,6 +352,8 @@ public function setData(mixed $data): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setDataLocked(bool $locked): static
@@ -324,6 +364,8 @@ public function setDataLocked(bool $locked): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setFormFactory(FormFactoryInterface $formFactory)
@@ -334,6 +376,8 @@ public function setFormFactory(FormFactoryInterface $formFactory)
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setAction(string $action): static
@@ -344,6 +388,8 @@ public function setAction(string $action): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setMethod(string $method): static
@@ -354,6 +400,8 @@ public function setMethod(string $method): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setRequestHandler(RequestHandlerInterface $requestHandler): static
@@ -380,6 +428,8 @@ public function setAutoInitialize(bool $initialize): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setInheritData(bool $inheritData): static
@@ -402,6 +452,8 @@ public function getFormConfig(): FormConfigInterface
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function setIsEmptyCallback(?callable $isEmptyCallback): static
@@ -412,6 +464,8 @@ public function setIsEmptyCallback(?callable $isEmptyCallback): static
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function getEventDispatcher(): EventDispatcherInterface
@@ -570,6 +624,8 @@ public function getDataLocked(): bool
 
     /**
      * Unsupported method.
+     *
+     * @return never
      */
     public function getFormFactory(): FormFactoryInterface
     {
@@ -579,6 +635,8 @@ public function getFormFactory(): FormFactoryInterface
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function getAction(): string
@@ -589,6 +647,8 @@ public function getAction(): string
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function getMethod(): string
@@ -599,6 +659,8 @@ public function getMethod(): string
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function getRequestHandler(): RequestHandlerInterface
@@ -649,6 +711,8 @@ public function getOption(string $name, mixed $default = null): mixed
     /**
      * Unsupported method.
      *
+     * @return never
+     *
      * @throws BadMethodCallException
      */
     public function getIsEmptyCallback(): ?callable
diff --git a/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php b/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php
index 85efa150f4fb7..e06f583cbd5a3 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php
@@ -74,7 +74,7 @@ public function isWritable(object|array $data, FormInterface $form): bool
         return null !== $form->getPropertyPath();
     }
 
-    private function getPropertyValue(object|array $data, PropertyPathInterface $propertyPath)
+    private function getPropertyValue(object|array $data, PropertyPathInterface $propertyPath): mixed
     {
         try {
             return $this->propertyAccessor->getValue($data, $propertyPath);
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 5e5997ddf9f82..4dcd3b687753e 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -62,6 +62,9 @@ public function __construct(ChoiceListFactoryInterface $choiceListFactory = null
         $this->translator = $translator;
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $unknownValues = [];
@@ -215,6 +218,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }, 256);
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $choiceTranslationDomain = $options['choice_translation_domain'];
@@ -269,6 +275,9 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
         if ($options['expanded']) {
@@ -286,6 +295,9 @@ public function finishView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $emptyData = static function (Options $options) {
@@ -383,7 +395,7 @@ public function getBlockPrefix(): string
     /**
      * Adds the sub fields for an expanded choice field.
      */
-    private function addSubForms(FormBuilderInterface $builder, array $choiceViews, array $options)
+    private function addSubForms(FormBuilderInterface $builder, array $choiceViews, array $options): void
     {
         foreach ($choiceViews as $name => $choiceView) {
             // Flatten groups
@@ -401,7 +413,7 @@ private function addSubForms(FormBuilderInterface $builder, array $choiceViews,
         }
     }
 
-    private function addSubForm(FormBuilderInterface $builder, string $name, ChoiceView $choiceView, array $options)
+    private function addSubForm(FormBuilderInterface $builder, string $name, ChoiceView $choiceView, array $options): void
     {
         $choiceOpts = [
             'value' => $choiceView->value,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
index 5c079f137dd8d..3b68dc241af59 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -43,6 +43,9 @@ class DateType extends AbstractType
         'choice' => ChoiceType::class,
     ];
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $dateFormat = \is_int($options['format']) ? $options['format'] : self::DEFAULT_FORMAT;
@@ -177,6 +180,9 @@ class_exists(\IntlTimeZone::class, false) ? \IntlTimeZone::createDefault() : nul
         }
     }
 
+    /**
+     * @return void
+     */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['widget'] = $options['widget'];
@@ -214,6 +220,9 @@ public function finishView(FormView $view, FormInterface $form, array $options)
         }
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $compound = static fn (Options $options) => 'single_text' !== $options['widget'];
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
index 6e4b78251d74c..cf8e1a7439e57 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -41,6 +41,9 @@ public function __construct(TranslatorInterface $translator = null)
         $this->translator = $translator;
     }
 
+    /**
+     * @return void
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // Ensure that submitted data is always an uploaded file or an array of some
@@ -82,6 +85,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         });
     }
 
+    /**
+     * @return void
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         if ($options['multiple']) {
@@ -95,11 +101,17 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         ]);
     }
 
+    /**
+     * @return void
+     */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['multipart'] = true;
     }
 
+    /**
+     * @return void
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $dataClass = null;
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
index 27c1dbb49ba32..9c9e5b4d7c30f 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
@@ -103,6 +103,8 @@ public function getBlockPrefix(): string
      *
      * The pattern contains the placeholder "{{ widget }}" where the HTML tag should
      * be inserted
+     *
+     * @return string
      */
     protected static function getPattern(?string $currency)
     {
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPathIterator.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPathIterator.php
index 50baa4533e318..ed363a7b158f3 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPathIterator.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPathIterator.php
@@ -23,6 +23,9 @@ public function __construct(ViolationPath $violationPath)
         parent::__construct($violationPath);
     }
 
+    /**
+     * @return bool
+     */
     public function mapsForm()
     {
         return $this->path->mapsForm($this->key());

From e71a3a1ce515ae2d8af5342de2c1677875a6cd87 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Thu, 20 Apr 2023 21:00:42 -0400
Subject: [PATCH 473/475] [Asset] [AssetMapper] New AssetMapper component: Map
 assets to publicly available, versioned paths

---
 composer.json                                 |   1 +
 .../Twig/Extension/ImportMapExtension.php     |  28 ++
 .../Twig/Extension/ImportMapRuntime.php       |  29 ++
 .../Extension/ImportMapExtensionTest.php      |  49 ++
 src/Symfony/Bridge/Twig/composer.json         |   1 +
 .../Controller/AbstractController.php         |  16 +-
 .../Compiler/UnusedTagsPass.php               |   1 +
 .../DependencyInjection/Configuration.php     |  94 ++++
 .../FrameworkExtension.php                    |  78 +++
 .../Resources/config/asset_mapper.php         | 129 +++++
 .../Resources/config/schema/symfony-1.0.xsd   |  28 ++
 .../Controller/AbstractControllerTest.php     |   1 +
 .../DependencyInjection/ConfigurationTest.php |  36 ++
 .../Fixtures/xml/asset_mapper.xml             |  24 +
 .../XmlFrameworkExtensionTest.php             |  16 +-
 .../Bundle/FrameworkBundle/composer.json      |   1 +
 .../Compiler/ExtensionPass.php                |   6 +
 .../DependencyInjection/TwigExtension.php     |   5 +
 .../TwigBundle/Resources/config/importmap.php |  27 ++
 .../Component/AssetMapper/.gitattributes      |   4 +
 src/Symfony/Component/AssetMapper/.gitignore  |   4 +
 .../Component/AssetMapper/AssetDependency.php |  29 ++
 .../Component/AssetMapper/AssetMapper.php     | 277 +++++++++++
 .../AssetMapper/AssetMapperCompiler.php       |  44 ++
 .../AssetMapperDevServerSubscriber.php        |  92 ++++
 .../AssetMapper/AssetMapperInterface.php      |  54 +++
 .../AssetMapper/AssetMapperRepository.php     | 139 ++++++
 .../Component/AssetMapper/CHANGELOG.md        |   7 +
 .../Command/AssetMapperCompileCommand.php     | 110 +++++
 .../Command/ImportMapExportCommand.php        |  40 ++
 .../Command/ImportMapRemoveCommand.php        |  56 +++
 .../Command/ImportMapRequireCommand.php       | 111 +++++
 .../Command/ImportMapUpdateCommand.php        |  44 ++
 .../Compiler/AssetCompilerInterface.php       |  33 ++
 .../AssetCompilerPathResolverTrait.php        |  50 ++
 .../Compiler/CssAssetUrlCompiler.php          |  60 +++
 .../Compiler/JavaScriptImportPathCompiler.php |  69 +++
 .../Compiler/SourceMappingUrlsCompiler.php    |  52 ++
 .../AssetMapper/ImportMap/ImportMapEntry.php  |  34 ++
 .../ImportMap/ImportMapManager.php            | 399 +++++++++++++++
 .../ImportMap/ImportMapRenderer.php           |  82 ++++
 .../ImportMap/PackageRequireOptions.php       |  32 ++
 src/Symfony/Component/AssetMapper/LICENSE     |  19 +
 .../Component/AssetMapper/MappedAsset.php     | 147 ++++++
 .../AssetMapper/MapperAwareAssetPackage.php   |  45 ++
 src/Symfony/Component/AssetMapper/README.md   |  21 +
 .../Tests/AssetMapperCompilerTest.php         |  66 +++
 ...apperDevServerSubscriberFunctionalTest.php |  72 +++
 .../Tests/AssetMapperRepositoryTest.php       | 125 +++++
 .../AssetMapper/Tests/AssetMapperTest.php     | 227 +++++++++
 .../AssetsMapperCompileCommandTest.php        |  65 +++
 .../AssetCompilerPathResolverTraitTest.php    |  74 +++
 .../Compiler/CssAssetUrlCompilerTest.php      | 171 +++++++
 .../JavaScriptImportPathCompilerTest.php      | 237 +++++++++
 .../SourceMappingUrlsCompilerTest.php         | 148 ++++++
 .../Tests/ImportMap/ImportMapManagerTest.php  | 457 ++++++++++++++++++
 .../Tests/ImportMap/ImportMapRendererTest.php |  83 ++++
 .../AssetMapper/Tests/MappedAssetTest.php     |  79 +++
 ...MapperAwareAssetPackageIntegrationTest.php |  30 ++
 .../Tests/MapperAwareAssetPackageTest.php     |  77 +++
 .../fixtures/AssetMapperTestAppKernel.php     |  55 +++
 .../Tests/fixtures/circular_dir/circular1.css |   1 +
 .../Tests/fixtures/circular_dir/circular2.css |   1 +
 .../AssetMapper/Tests/fixtures/dir1/file1.css |   2 +
 .../AssetMapper/Tests/fixtures/dir1/file2.js  |   1 +
 ...already-abcdefVWXYZ0123456789.digested.css |   2 +
 .../AssetMapper/Tests/fixtures/dir2/file3.css |   2 +
 .../AssetMapper/Tests/fixtures/dir2/file4.js  |   1 +
 .../Tests/fixtures/dir2/subdir/file5.js       |   2 +
 .../Tests/fixtures/dir2/subdir/file6.js       |   2 +
 .../Tests/fixtures/dir3/test.gif.foo          | Bin 0 -> 801 bytes
 .../Tests/fixtures/importmaps/assets/app.js   |   7 +
 .../importmaps/assets/imported_async.js       |   1 +
 .../fixtures/importmaps/assets/pizza/index.js |   1 +
 .../fixtures/importmaps/assets/popcorn.js     |   1 +
 .../importmaps/assets/vendor/lodash.js        |   1 +
 .../Tests/fixtures/importmaps/assets2/app2.js |   1 +
 .../Tests/fixtures/importmaps/importmap.php   |  20 +
 .../test_public/final-assets/importmap.json   |   6 +
 .../test_public/final-assets/manifest.json    |   3 +
 .../Component/AssetMapper/composer.json       |  38 ++
 .../Component/AssetMapper/phpunit.xml.dist    |  30 ++
 82 files changed, 4711 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Bridge/Twig/Extension/ImportMapExtension.php
 create mode 100644 src/Symfony/Bridge/Twig/Extension/ImportMapRuntime.php
 create mode 100644 src/Symfony/Bridge/Twig/Tests/Extension/ImportMapExtensionTest.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/asset_mapper.xml
 create mode 100644 src/Symfony/Bundle/TwigBundle/Resources/config/importmap.php
 create mode 100644 src/Symfony/Component/AssetMapper/.gitattributes
 create mode 100644 src/Symfony/Component/AssetMapper/.gitignore
 create mode 100644 src/Symfony/Component/AssetMapper/AssetDependency.php
 create mode 100644 src/Symfony/Component/AssetMapper/AssetMapper.php
 create mode 100644 src/Symfony/Component/AssetMapper/AssetMapperCompiler.php
 create mode 100644 src/Symfony/Component/AssetMapper/AssetMapperDevServerSubscriber.php
 create mode 100644 src/Symfony/Component/AssetMapper/AssetMapperInterface.php
 create mode 100644 src/Symfony/Component/AssetMapper/AssetMapperRepository.php
 create mode 100644 src/Symfony/Component/AssetMapper/CHANGELOG.md
 create mode 100644 src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php
 create mode 100644 src/Symfony/Component/AssetMapper/Command/ImportMapExportCommand.php
 create mode 100644 src/Symfony/Component/AssetMapper/Command/ImportMapRemoveCommand.php
 create mode 100644 src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php
 create mode 100644 src/Symfony/Component/AssetMapper/Command/ImportMapUpdateCommand.php
 create mode 100644 src/Symfony/Component/AssetMapper/Compiler/AssetCompilerInterface.php
 create mode 100644 src/Symfony/Component/AssetMapper/Compiler/AssetCompilerPathResolverTrait.php
 create mode 100644 src/Symfony/Component/AssetMapper/Compiler/CssAssetUrlCompiler.php
 create mode 100644 src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
 create mode 100644 src/Symfony/Component/AssetMapper/Compiler/SourceMappingUrlsCompiler.php
 create mode 100644 src/Symfony/Component/AssetMapper/ImportMap/ImportMapEntry.php
 create mode 100644 src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php
 create mode 100644 src/Symfony/Component/AssetMapper/ImportMap/ImportMapRenderer.php
 create mode 100644 src/Symfony/Component/AssetMapper/ImportMap/PackageRequireOptions.php
 create mode 100644 src/Symfony/Component/AssetMapper/LICENSE
 create mode 100644 src/Symfony/Component/AssetMapper/MappedAsset.php
 create mode 100644 src/Symfony/Component/AssetMapper/MapperAwareAssetPackage.php
 create mode 100644 src/Symfony/Component/AssetMapper/README.md
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/AssetMapperCompilerTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/AssetMapperDevServerSubscriberFunctionalTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/AssetMapperRepositoryTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/AssetMapperTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/Command/AssetsMapperCompileCommandTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/Compiler/AssetCompilerPathResolverTraitTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/Compiler/CssAssetUrlCompilerTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/Compiler/SourceMappingUrlsCompilerTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapRendererTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/MappedAssetTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/MapperAwareAssetPackageIntegrationTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/MapperAwareAssetPackageTest.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/AssetMapperTestAppKernel.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/circular_dir/circular1.css
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/circular_dir/circular2.css
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/dir1/file1.css
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/dir1/file2.js
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/file3.css
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/file4.js
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/subdir/file5.js
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/subdir/file6.js
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/dir3/test.gif.foo
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/app.js
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/imported_async.js
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/pizza/index.js
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/popcorn.js
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/vendor/lodash.js
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets2/app2.js
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/importmap.php
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/test_public/final-assets/importmap.json
 create mode 100644 src/Symfony/Component/AssetMapper/Tests/fixtures/test_public/final-assets/manifest.json
 create mode 100644 src/Symfony/Component/AssetMapper/composer.json
 create mode 100644 src/Symfony/Component/AssetMapper/phpunit.xml.dist

diff --git a/composer.json b/composer.json
index 38dc3d5d70bf4..3f1cfb489f294 100644
--- a/composer.json
+++ b/composer.json
@@ -58,6 +58,7 @@
     },
     "replace": {
         "symfony/asset": "self.version",
+        "symfony/asset-mapper": "self.version",
         "symfony/browser-kit": "self.version",
         "symfony/cache": "self.version",
         "symfony/clock": "self.version",
diff --git a/src/Symfony/Bridge/Twig/Extension/ImportMapExtension.php b/src/Symfony/Bridge/Twig/Extension/ImportMapExtension.php
new file mode 100644
index 0000000000000..2156c74d5a0c9
--- /dev/null
+++ b/src/Symfony/Bridge/Twig/Extension/ImportMapExtension.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Extension;
+
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
+
+/**
+ * @author Kévin Dunglas <kevin@dunglas.dev>
+ */
+final class ImportMapExtension extends AbstractExtension
+{
+    public function getFunctions(): array
+    {
+        return [
+            new TwigFunction('importmap', [ImportMapRuntime::class, 'importmap'], ['is_safe' => ['html']]),
+        ];
+    }
+}
diff --git a/src/Symfony/Bridge/Twig/Extension/ImportMapRuntime.php b/src/Symfony/Bridge/Twig/Extension/ImportMapRuntime.php
new file mode 100644
index 0000000000000..aa5097d35de5d
--- /dev/null
+++ b/src/Symfony/Bridge/Twig/Extension/ImportMapRuntime.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Extension;
+
+use Symfony\Component\AssetMapper\ImportMap\ImportMapRenderer;
+
+/**
+ * @author Kévin Dunglas <kevin@dunglas.dev>
+ */
+class ImportMapRuntime
+{
+    public function __construct(private readonly ImportMapRenderer $importMapRenderer)
+    {
+    }
+
+    public function importmap(?string $entryPoint = 'app'): string
+    {
+        return $this->importMapRenderer->render($entryPoint);
+    }
+}
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/ImportMapExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/ImportMapExtensionTest.php
new file mode 100644
index 0000000000000..26a572e1954f5
--- /dev/null
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/ImportMapExtensionTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Extension;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Extension\ImportMapExtension;
+use Symfony\Bridge\Twig\Extension\ImportMapRuntime;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapRenderer;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
+use Twig\RuntimeLoader\RuntimeLoaderInterface;
+
+class ImportMapExtensionTest extends TestCase
+{
+    public function testItRendersTheImportmap()
+    {
+        $twig = new Environment(new ArrayLoader([
+            'template' => '{{ importmap("application") }}',
+        ]), ['debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0]);
+        $twig->addExtension(new ImportMapExtension());
+        $importMapRenderer = $this->createMock(ImportMapRenderer::class);
+        $expected = '<script type="importmap">{ "imports": {}}</script>';
+        $importMapRenderer->expects($this->once())
+            ->method('render')
+            ->with('application')
+            ->willReturn($expected);
+        $runtime = new ImportMapRuntime($importMapRenderer);
+
+        $mockRuntimeLoader = $this->createMock(RuntimeLoaderInterface::class);
+        $mockRuntimeLoader
+            ->method('load')
+            ->willReturnMap([
+                [ImportMapRuntime::class, $runtime],
+            ])
+        ;
+        $twig->addRuntimeLoader($mockRuntimeLoader);
+
+        $this->assertSame($expected, $twig->render('template'));
+    }
+}
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index 8cf462fea5938..cac49224c88be 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -26,6 +26,7 @@
         "league/html-to-markdown": "^5.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
         "symfony/asset": "^5.4|^6.0",
+        "symfony/asset-mapper": "^6.3",
         "symfony/dependency-injection": "^5.4|^6.0",
         "symfony/finder": "^5.4|^6.0",
         "symfony/form": "^6.3",
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
index 2a2c1983166b0..6d39e9440f02a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -14,6 +14,7 @@
 use Psr\Container\ContainerInterface;
 use Psr\Link\EvolvableLinkInterface;
 use Psr\Link\LinkInterface;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -44,6 +45,7 @@
 use Symfony\Component\WebLink\EventListener\AddLinkHeaderListener;
 use Symfony\Component\WebLink\GenericLinkProvider;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
+use Symfony\Component\WebLink\Link;
 use Symfony\Contracts\Service\Attribute\Required;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
 use Twig\Environment;
@@ -95,6 +97,7 @@ public static function getSubscribedServices(): array
             'security.csrf.token_manager' => '?'.CsrfTokenManagerInterface::class,
             'parameter_bag' => '?'.ContainerBagInterface::class,
             'web_link.http_header_serializer' => '?'.HttpHeaderSerializer::class,
+            'asset_mapper.importmap.manager' => '?'.ImportMapManager::class,
         ];
     }
 
@@ -409,7 +412,7 @@ protected function addLink(Request $request, LinkInterface $link): void
     /**
      * @param LinkInterface[] $links
      */
-    protected function sendEarlyHints(iterable $links, Response $response = null): Response
+    protected function sendEarlyHints(iterable $links = [], Response $response = null, bool $preloadJavaScriptModules = false): Response
     {
 
10000
        if (!$this->container->has('web_link.http_header_serializer')) {
             throw new \LogicException('You cannot use the "sendEarlyHints" method if the WebLink component is not available. Try running "composer require symfony/web-link".');
@@ -418,6 +421,17 @@ protected function sendEarlyHints(iterable $links, Response $response = null): R
         $response ??= new Response();
 
         $populatedLinks = [];
+
+        if ($preloadJavaScriptModules) {
+            if (!$this->container->has('asset_mapper.importmap.manager')) {
+                throw new \LogicException('You cannot use the JavaScript modules method if the AssetMapper component is not available. Try running "composer require symfony/asset-mapper".');
+            }
+
+            foreach ($this->container->get('asset_mapper.importmap.manager')->getModulesToPreload() as $url) {
+                $populatedLinks[] = new Link('modulepreload', $url);
+            }
+        }
+
         foreach ($links as $link) {
             if ($link instanceof EvolvableLinkInterface && !$link->getRels()) {
                 $link = $link->withRel('preload');
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
index 9da5b91bb3bb0..a76b84ad8337c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -24,6 +24,7 @@ class UnusedTagsPass implements CompilerPassInterface
     private const KNOWN_TAGS = [
         'annotations.cached_reader',
         'assets.package',
+        'asset_mapper.compiler',
         'auto_alias',
         'cache.pool',
         'cache.pool.clearer',
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index c5378238b92a4..d668d435a42e2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -16,6 +16,8 @@
 use Psr\Log\LogLevel;
 use Symfony\Bundle\FullStack;
 use Symfony\Component\Asset\Package;
+use Symfony\Component\AssetMapper\AssetMapper;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\Cache\Adapter\DoctrineAdapter;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
@@ -161,6 +163,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         $this->addSessionSection($rootNode);
         $this->addRequestSection($rootNode);
         $this->addAssetsSection($rootNode, $enableIfStandalone);
+        $this->addAssetMapperSection($rootNode, $enableIfStandalone);
         $this->addTranslatorSection($rootNode, $enableIfStandalone);
         $this->addValidationSection($rootNode, $enableIfStandalone);
         $this->addAnnotationsSection($rootNode, $willBeAvailable);
@@ -810,6 +813,97 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode, callable $enabl
         ;
     }
 
+    private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
+    {
+        $rootNode
+            ->children()
+                ->arrayNode('asset_mapper')
+                    ->info('Asset Mapper configuration')
+                    ->{$enableIfStandalone('symfony/asset-mapper', AssetMapper::class)}()
+                    ->fixXmlConfig('path')
+                    ->fixXmlConfig('extension')
+                    ->fixXmlConfig('importmap_script_attribute')
+                    ->children()
+                        // add array node called "paths" that will be an array of strings
+                        ->arrayNode('paths')
+                            ->info('Directories that hold assets that should be in the mapper. Can be a simple array of an array of ["path/to/assets": "namespace"]')
+                            ->example(['assets/'])
+                            ->normalizeKeys(false)
+                            ->useAttributeAsKey('namespace')
+                            ->beforeNormalization()
+                                ->always()
+                                ->then(function ($v) {
+                                    $result = [];
+                                    foreach ($v as $key => $item) {
+                                        // "dir" => "namespace"
+                                        if (\is_string($key)) {
+                                            $result[$key] = $item;
+
+                                            continue;
+                                        }
+
+                                        if (\is_array($item)) {
+                                            // $item = ["namespace" => "the/namespace", "value" => "the/dir"]
+                                            $result[$item['value']] = $item['namespace'] ?? '';
+                                        } else {
+                                            // $item = "the/dir"
+                                            $result[$item] = '';
+                                        }
+                                    }
+
+                                    return $result;
+                                })
+                            ->end()
+                            ->prototype('scalar')->end()
+                        ->end()
+                        ->booleanNode('server')
+                            ->info('If true, a "dev server" will return the assets from the public directory (true in "debug" mode only by default)')
+                            ->defaultValue($this->debug)
+                        ->end()
+                        ->scalarNode('public_prefix')
+                            ->info('The public path where the assets will be written to (and served from when "server" is true)')
+                            ->defaultValue('/assets/')
+                        ->end()
+                        ->booleanNode('strict_mode')
+                            ->info('If true, an exception will be thrown if an asset cannot be found when imported from JavaScript or CSS files - e.g. "import \'./non-existent.js\'"')
+                            ->defaultValue(true)
+                        ->end()
+                        ->arrayNode('extensions')
+                            ->info('Key-value pair of file extensions set to their mime type.')
+                            ->normalizeKeys(false)
+                            ->useAttributeAsKey('extension')
+                            ->example(['.zip' => 'application/zip'])
+                            ->prototype('scalar')->end()
+                        ->end()
+                        ->scalarNode('importmap_path')
+                            ->info('The path of the importmap.php file.')
+                            ->defaultValue('%kernel.project_dir%/importmap.php')
+                        ->end()
+                        ->scalarNode('importmap_polyfill')
+                            ->info('URL of the ES Module Polyfill to use, false to disable. Defaults to using a CDN URL.')
+                            ->defaultValue(null)
+                        ->end()
+                        ->arrayNode('importmap_script_attributes')
+                            ->info('Key-value pair of attributes to add to script tags output for the importmap.')
+                            ->normalizeKeys(false)
+                            ->useAttributeAsKey('key')
+                            ->example(['data-turbo-track' => 'reload'])
+                            ->prototype('scalar')->end()
+                        ->end()
+                        ->scalarNode('vendor_dir')
+                            ->info('The directory to store JavaScript vendors.')
+                            ->defaultValue('%kernel.project_dir%/assets/vendor')
+                        ->end()
+                        ->scalarNode('provider')
+                            ->info('The provider (CDN) to use', class_exists(ImportMapManager::class) ? sprintf(' (e.g.: "%s").', implode('", "', ImportMapManager::PROVIDERS)) : '.')
+                            ->defaultValue('jspm')
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+    }
+
     private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 36622ee23d604..7acee5c278e07 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -31,6 +31,8 @@
 use Symfony\Bundle\FullStack;
 use Symfony\Bundle\MercureBundle\MercureBundle;
 use Symfony\Component\Asset\PackageInterface;
+use Symfony\Component\AssetMapper\AssetMapper;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -45,6 +47,7 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\Resource\DirectoryResource;
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\ResourceCheckerInterface;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
@@ -330,6 +333,14 @@ public function load(array $configs, ContainerBuilder $container)
             $this->registerAssetsConfiguration($config['assets'], $container, $loader);
         }
 
+        if ($this->readConfigEnabled('asset_mapper', $container, $config['asset_mapper'])) {
+            if (!class_exists(AssetMapper::class)) {
+                throw new LogicException('AssetMapper support cannot be enabled as the AssetMapper component is not installed. Try running "composer require symfony/asset-mapper".');
+            }
+
+            $this->registerAssetMapperConfiguration($config['asset_mapper'], $container, $loader, $this->readConfigEnabled('assets', $container, $config['assets']));
+        }
+
         if ($this->readConfigEnabled('http_client', $container, $config['http_client'])) {
             $this->registerHttpClientConfiguration($config['http_client'], $container, $loader);
         }
@@ -1231,6 +1242,57 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co
         }
     }
 
+    private function registerAssetMapperConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $assetEnabled): void
+    {
+        $loader->load('asset_mapper.php');
+
+        if (!$assetEnabled) {
+            $container->removeDefinition('asset_mapper.asset_package');
+        }
+
+        $publicDirName = $this->getPublicDirectoryName($container);
+        $container->getDefinition('asset_mapper')
+            ->setArgument(3, $config['public_prefix'])
+            ->setArgument(4, $publicDirName)
+            ->setArgument(5, $config['extensions'])
+        ;
+
+        $paths = $config['paths'];
+        foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
+            if ($container->fileExists($dir = $bundle['path'].'/Resources/public') || $container->fileExists($dir = $bundle['path'].'/public')) {
+                $paths[$dir] = sprintf('bundles/%s', preg_replace('/bundle$/', '', strtolower($name)));
+            }
+        }
+        $container->getDefinition('asset_mapper.repository')
+            ->setArgument(0, $paths);
+
+        $container->getDefinition('asset_mapper.command.compile')
+            ->setArgument(4, $publicDirName);
+
+        if (!$config['server']) {
+            $container->removeDefinition('asset_mapper.dev_server_subscriber');
+        }
+
+        $container->getDefinition('asset_mapper.compiler.css_asset_url_compiler')
+            ->setArgument(0, $config['strict_mode']);
+
+        $container->getDefinition('asset_mapper.compiler.javascript_import_path_compiler')
+            ->setArgument(0, $config['strict_mode']);
+
+        $container
+            ->getDefinition('asset_mapper.importmap.manager')
+            ->replaceArgument(1, $config['importmap_path'])
+            ->replaceArgument(2, $config['vendor_dir'])
+            ->replaceArgument(3, $config['provider'])
+        ;
+
+        $container
+            ->getDefinition('asset_mapper.importmap.renderer')
+            ->replaceArgument(2, $config['importmap_polyfill'] ?? ImportMapManager::POLYFILL_URL)
+            ->replaceArgument(3, $config['importmap_script_attributes'])
+        ;
+    }
+
     /**
      * Returns a definition for an asset package.
      */
@@ -2994,4 +3056,20 @@ private function writeConfigEnabled(string $path, bool $value, array &$config):
         $this->configsEnabled[$path] = $value;
         $config['enabled'] = $value;
     }
+
+    private function getPublicDirectoryName(ContainerBuilder $container): string
+    {
+        $defaultPublicDir = 'public';
+
+        $composerFilePath = $container->getParameter('kernel.project_dir').'/composer.json';
+
+        if (!file_exists($composerFilePath)) {
+            return $defaultPublicDir;
+        }
+
+        $container->addResource(new FileResource($composerFilePath));
+        $composerConfig = json_decode(file_get_contents($composerFilePath), true);
+
+        return $composerConfig['extra']['public-dir'] ?? $defaultPublicDir;
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php
new file mode 100644
index 0000000000000..5d471ea623258
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/asset_mapper.php
@@ -0,0 +1,129 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\AssetMapper\AssetMapper;
+use Symfony\Component\AssetMapper\AssetMapperCompiler;
+use Symfony\Component\AssetMapper\AssetMapperDevServerSubscriber;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\AssetMapperRepository;
+use Symfony\Component\AssetMapper\Command\AssetMapperCompileCommand;
+use Symfony\Component\AssetMapper\Command\ImportMapExportCommand;
+use Symfony\Component\AssetMapper\Command\ImportMapRemoveCommand;
+use Symfony\Component\AssetMapper\Command\ImportMapRequireCommand;
+use Symfony\Component\AssetMapper\Command\ImportMapUpdateCommand;
+use Symfony\Component\AssetMapper\Compiler\CssAssetUrlCompiler;
+use Symfony\Component\AssetMapper\Compiler\JavaScriptImportPathCompiler;
+use Symfony\Component\AssetMapper\Compiler\SourceMappingUrlsCompiler;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapRenderer;
+use Symfony\Component\AssetMapper\MapperAwareAssetPackage;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('asset_mapper', AssetMapper::class)
+            ->args([
+                service('asset_mapper.repository'),
+                service('asset_mapper_compiler'),
+                param('kernel.project_dir'),
+                abstract_arg('asset public prefix'),
+                abstract_arg('public directory name'),
+                abstract_arg('extensions map'),
+            ])
+        ->alias(AssetMapperInterface::class, 'asset_mapper')
+        ->set('asset_mapper.repository', AssetMapperRepository::class)
+            ->args([
+                abstract_arg('array of asset mapper paths'),
+                param('kernel.project_dir'),
+            ])
+        ->set('asset_mapper.asset_package', MapperAwareAssetPackage::class)
+            ->decorate('assets._default_package')
+            ->args([
+                service('.inner'),
+                service('asset_mapper'),
+            ])
+
+        ->set('asset_mapper.dev_server_subscriber', AssetMapperDevServerSubscriber::class)
+            ->args([
+                service('asset_mapper'),
+            ])
+            ->tag('kernel.event_subscriber', ['event' => RequestEvent::class])
+
+        ->set('asset_mapper.command.compile', AssetMapperCompileCommand::class)
+            ->args([
+                service('asset_mapper'),
+                service('asset_mapper.importmap.manager'),
+                service('filesystem'),
+                param('kernel.project_dir'),
+                abstract_arg('public directory name'),
+                param('kernel.debug'),
+            ])
+            ->tag('console.command')
+
+        ->set('asset_mapper_compiler', AssetMapperCompiler::class)
+            ->args([
+                tagged_iterator('asset_mapper.compiler'),
+            ])
+
+        ->set('asset_mapper.compiler.css_asset_url_compiler', CssAssetUrlCompiler::class)
+            ->args([
+                abstract_arg('strict mode'),
+            ])
+            ->tag('asset_mapper.compiler')
+
+        ->set('asset_mapper.compiler.source_mapping_urls_compiler', SourceMappingUrlsCompiler::class)
+            ->tag('asset_mapper.compiler')
+
+        ->set('asset_mapper.compiler.javascript_import_path_compiler', JavaScriptImportPathCompiler::class)
+            ->args([
+                abstract_arg('strict mode'),
+            ])
+            ->tag('asset_mapper.compiler')
+
+        ->set('asset_mapper.importmap.manager', ImportMapManager::class)
+            ->args([
+                service('asset_mapper'),
+                abstract_arg('importmap.php path'),
+                abstract_arg('vendor directory'),
+                abstract_arg('provider'),
+            ])
+        ->alias(ImportMapManager::class, 'asset_mapper.importmap.manager')
+
+        ->set('asset_mapper.importmap.renderer', ImportMapRenderer::class)
+            ->args([
+                service('asset_mapper.importmap.manager'),
+                param('kernel.charset'),
+                abstract_arg('polyfill URL'),
+                abstract_arg('script HTML attributes'),
+            ])
+
+        ->set('asset_mapper.importmap.command.require', ImportMapRequireCommand::class)
+            ->args([
+                service('asset_mapper.importmap.manager'),
+                service('asset_mapper'),
+            ])
+            ->tag('console.command')
+
+        ->set('asset_mapper.importmap.command.remove', ImportMapRemoveCommand::class)
+            ->args([service('asset_mapper.importmap.manager')])
+            ->tag('console.command')
+
+        ->set('asset_mapper.importmap.command.update', ImportMapUpdateCommand::class)
+            ->args([service('asset_mapper.importmap.manager')])
+            ->tag('console.command')
+
+        ->set('asset_mapper.importmap.command.export', ImportMapExportCommand::class)
+            ->args([service('asset_mapper.importmap.manager')])
+            ->tag('console.command')
+    ;
+};
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
index 33ac86560b756..52b1f158d4391 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -10,6 +10,7 @@
     <xsd:complexType name="config">
         <xsd:choice maxOccurs="unbounded">
             <xsd:element name="assets" type="assets" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="asset-mapper" type="asset_mapper" minOccurs="0" maxOccurs="1" />
             <xsd:element name="form" type="form" minOccurs="0" maxOccurs="1" />
             <xsd:element name="csrf-protection" type="csrf_protection" minOccurs="0" maxOccurs="1" />
             <xsd:element name="esi" type="esi" minOccurs="0" maxOccurs="1" />
@@ -186,6 +187,33 @@
         <xsd:attribute name="strict-mode" type="xsd:boolean" />
     </xsd:complexType>
 
+    <xsd:complexType name="asset_mapper">
+        <xsd:sequence>
+            <xsd:element name="path" type="asset_mapper_path" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="server" type="xsd:boolean" minOccurs="0" />
+            <xsd:element name="public_prefix" type="xsd:string" minOccurs="0" />
+            <xsd:element name="strict-mode" type="xsd:boolean" minOccurs="0" />
+            <xsd:element name="extension" type="asset_mapper_extension" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="importmap-path" type="xsd:string" minOccurs="0" />
+            <xsd:element name="importmap-polyfill" type="xsd:string" minOccurs="0" nillable="true" />
+            <xsd:element name="importmap-script-attribute" type="asset_mapper_attribute" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="vendor_dir" type="xsd:string" minOccurs="0" />
+            <xsd:element name="provider" type="xsd:string" minOccurs="0" />
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="asset_mapper_path" mixed="true">
+        <xsd:attribute name="namespace" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="asset_mapper_extension" mixed="true">
+        <xsd:attribute name="extension" type="xsd:string" use="required" />
+    </xsd:complexType>
+
+    <xsd:complexType name="asset_mapper_attribute" mixed="true">
+        <xsd:attribute name="key" type="xsd:string" use="required" />
+    </xsd:complexType>
+
     <xsd:complexType name="translator">
         <xsd:sequence>
             <xsd:element name="fallback" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
index efa9c7becab59..960735e884958 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
@@ -74,6 +74,7 @@ public function testSubscribedServices()
             'security.token_storage' => '?Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorageInterface',
             'security.csrf.token_manager' => '?Symfony\\Component\\Security\\Csrf\\CsrfTokenManagerInterface',
             'web_link.http_header_serializer' => '?Symfony\\Component\\WebLink\\HttpHeaderSerializer',
+            'asset_mapper.importmap.manager' => '?Symfony\\Component\\AssetMapper\\ImportMap\\ImportMapManager',
         ];
 
         $this->assertEquals($expectedServices, $subscribed, 'Subscribed core services in AbstractController have changed');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index e11042d66e941..e91d32a68e74e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -95,6 +95,29 @@ public function testAssetsCanBeEnabled()
         $this->assertEquals($defaultConfig, $config['assets']);
     }
 
+    public function testAssetMapperCanBeEnabled()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $config = $processor->processConfiguration($configuration, [['http_method_override' => false, 'asset_mapper' => null]]);
+
+        $defaultConfig = [
+            'enabled' => true,
+            'paths' => [],
+            'server' => true,
+            'public_prefix' => '/assets/',
+            'strict_mode' => true,
+            'extensions' => [],
+            'importmap_path' => '%kernel.project_dir%/importmap.php',
+            'importmap_polyfill' => null,
+            'vendor_dir' => '%kernel.project_dir%/assets/vendor',
+            'provider' => 'jspm',
+            'importmap_script_attributes' => [],
+        ];
+
+        $this->assertEquals($defaultConfig, $config['asset_mapper']);
+    }
+
     /**
      * @dataProvider provideValidAssetsPackageNameConfigurationTests
      */
@@ -589,6 +612,19 @@ protected static function getBundleDefaultConfig()
                 'json_manifest_path' => null,
                 'strict_mode' => false,
             ],
+            'asset_mapper' => [
+                'enabled' => !class_exists(FullStack::class),
+                'paths' => [],
+                'server' => true,
+                'public_prefix' => '/assets/',
+                'strict_mode' => true,
+                'extensions' => [],
+                'importmap_path' => '%kernel.project_dir%/importmap.php',
+                'importmap_polyfill' => null,
+                'vendor_dir' => '%kernel.project_dir%/assets/vendor',
+                'provider' => 'jspm',
+                'importmap_script_attributes' => [],
+            ],
             'cache' => [
                 'pools' => [],
                 'app' => 'cache.adapter.filesystem',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/asset_mapper.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/asset_mapper.xml
new file mode 100644
index 0000000000000..ebde46f585e2b
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/asset_mapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+
+<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 http-method-override="false">
+        <framework:asset-mapper>
+            <framework:path>assets/</framework:path>
+            <framework:path namespace="my_namespace">assets2/</framework:path>
+            <framework:server>true</framework:server>
+            <framework:public_prefix>/assets_path/</framework:public_prefix>
+            <framework:strict-mode>true</framework:strict-mode>
+            <framework:extension extension="zip">application/zip</framework:extension>
+            <framework:importmap-path>%kernel.project_dir%/importmap.php</framework:importmap-path>
+            <framework:importmap-polyfill>https://cdn.example.com/polyfill.js</framework:importmap-polyfill>
+            <framework:importmap-script-attribute key="data-turbo-track">reload</framework:importmap-script-attribute>
+            <framework:vendor_dir>%kernel.project_dir%/assets/vendor</framework:vendor_dir>
+            <framework:provider>jspm</framework:provider>
+        </framework:asset-mapper>
+    </framework:config>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
index 4a2ff788bf5c6..6b08cc19f712a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\RateLimiter\Policy\SlidingWindowLimiter;
 
 class XmlFrameworkExtensionTest extends FrameworkExtensionTestCase
 {
@@ -74,4 +73,19 @@ public function testRateLimiter()
 
         $this->assertTrue($container->hasDefinition('limiter.sliding_window'));
     }
+
+    public function testAssetMapper()
+    {
+        $container = $this->createContainerFromFile('asset_mapper');
+
+        $definition = $container->getDefinition('asset_mapper');
+        $this->assertSame('/assets_path/', $definition->getArgument(3));
+        $this->assertSame(['zip' => 'application/zip'], $definition->getArgument(5));
+
+        $definition = $container->getDefinition('asset_mapper.importmap.renderer');
+        $this->assertSame(['data-turbo-track' => 'reload'], $definition->getArgument(3));
+
+        $definition = $container->getDefinition('asset_mapper.repository');
+        $this->assertSame(['assets/' => '', 'assets2/' => 'my_namespace'], $definition->getArgument(0));
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index e17a3a4c5cda9..eb3d340a71b96 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -36,6 +36,7 @@
         "doctrine/annotations": "^1.13.1|^2",
         "doctrine/persistence": "^1.3|^2|^3",
         "symfony/asset": "^5.4|^6.0",
+        "symfony/asset-mapper": "^6.3",
         "symfony/browser-kit": "^5.4|^6.0",
         "symfony/console": "^5.4.9|^6.0.9",
         "symfony/clock": "^6.2",
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
index 5c3cff66fc411..63dd68e91b90d 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -46,6 +46,12 @@ public function process(ContainerBuilder $container)
             $container->removeDefinition('twig.extension.yaml');
         }
 
+        if (!$container->has('asset_mapper')) {
+            // edge case where AssetMapper is installed, but not enabled
+            $container->removeDefinition('twig.extension.importmap');
+            $container->removeDefinition('twig.runtime.importmap');
+        }
+
         $viewDir = \dirname((new \ReflectionClass(\Symfony\Bridge\Twig\Extension\FormExtension::class))->getFileName(), 2).'/Resources/views';
         $templateIterator = $container->getDefinition('twig.template_iterator');
         $templatePaths = $templateIterator->getArgument(1);
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
index 101dbf699a5a4..f257f60298bb6 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\TwigBundle\DependencyInjection;
 
+use Symfony\Component\AssetMapper\AssetMapper;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\FileExistenceResource;
 use Symfony\Component\Console\Application;
@@ -86,6 +87,10 @@ public function load(array $configs, ContainerBuilder $container)
             }
         }
 
+        if ($container::willBeAvailable('symfony/asset-mapper', AssetMapper::class, ['symfony/twig-bundle'])) {
+            $loader->load('importmap.php');
+        }
+
         $container->setParameter('twig.form.resources', $config['form_themes']);
         $container->setParameter('twig.default_path', $config['default_path']);
         $defaultTwigPath = $container->getParameterBag()->resolveValue($config['default_path']);
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/importmap.php b/src/Symfony/Bundle/TwigBundle/Resources/config/importmap.php
new file mode 100644
index 0000000000000..c28021959e0f1
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/importmap.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Bridge\Twig\Extension\ImportMapExtension;
+use Symfony\Bridge\Twig\Extension\ImportMapRuntime;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+
+        ->set('twig.runtime.importmap', ImportMapRuntime::class)
+            ->args([service('asset_mapper.importmap.renderer')])
+            ->tag('twig.runtime')
+
+        ->set('twig.extension.importmap', ImportMapExtension::class)
+            ->tag('twig.extension')
+    ;
+};
diff --git a/src/Symfony/Component/AssetMapper/.gitattributes b/src/Symfony/Component/AssetMapper/.gitattributes
new file mode 100644
index 0000000000000..84c7add058fb5
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/.gitattributes
@@ -0,0 +1,4 @@
+/Tests export-ignore
+/phpunit.xml.dist export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/AssetMapper/.gitignore b/src/Symfony/Component/AssetMapper/.gitignore
new file mode 100644
index 0000000000000..8e2a76cfcb804
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/.gitignore
@@ -0,0 +1,4 @@
+vendor/
+composer.lock
+phpunit.xml
+Tests/fixtures/var/
diff --git a/src/Symfony/Component/AssetMapper/AssetDependency.php b/src/Symfony/Component/AssetMapper/AssetDependency.php
new file mode 100644
index 0000000000000..17ae1a125a79d
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/AssetDependency.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper;
+
+/**
+ * Represents a dependency that a MappedAsset has.
+ *
+ * @experimental
+ */
+final class AssetDependency
+{
+    /**
+     * @param bool $isLazy whether this dependency is immediately needed
+     */
+    public function __construct(
+        public readonly MappedAsset $asset,
+        public readonly bool $isLazy,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/AssetMapper.php b/src/Symfony/Component/AssetMapper/AssetMapper.php
new file mode 100644
index 0000000000000..f05348d2df68f
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/AssetMapper.php
@@ -0,0 +1,277 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper;
+
+/**
+ * Finds and returns assets in the pipeline.
+ *
+ * @experimental
+ *
+ * @final
+ */
+class AssetMapper implements AssetMapperInterface
+{
+    public const MANIFEST_FILE_NAME = 'manifest.json';
+    // source: https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
+    private const EXTENSIONS_MAP = [
+        'aac' => 'audio/aac',
+         'abw' => 'application/x-abiword',
+         'arc' => 'application/x-freearc',
+         'avif' => 'image/avif',
+         'avi' => 'video/x-msvideo',
+         'azw' => 'application/vnd.amazon.ebook',
+         'bin' => 'application/octet-stream',
+         'bmp' => 'image/bmp',
+         'bz' => 'application/x-bzip',
+         'bz2' => 'application/x-bzip2',
+         'cda' => 'application/x-cdf',
+         'csh' => 'application/x-csh',
+         'css' => 'text/css',
+         'csv' => 'text/csv',
+         'doc' => 'application/msword',
+         'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+         'eot' => 'application/vnd.ms-fontobject',
+         'epub' => 'application/epub+zip',
+         'gz' => 'application/gzip',
+         'gif' => 'image/gif',
+         'htm' => 'text/html',
+         'html' => 'text/html',
+         'ico' => 'image/vnd.microsoft.icon',
+         'ics' => 'text/calendar',
+         'jar' => 'application/java-archive',
+         'jpeg' => 'image/jpeg',
+         'jpg' => 'image/jpeg',
+         'js' => 'text/javascript',
+         'json' => 'application/json',
+         'jsonld' => 'application/ld+json',
+         'mid' => 'audio/midi',
+         'midi' => 'audio/midi',
+         'mjs' => 'text/javascript',
+         'mp3' => 'audio/mpeg',
+         'mp4' => 'video/mp4',
+         'mpeg' => 'video/mpeg',
+         'mpkg' => 'application/vnd.apple.installer+xml',
+         'odp' => 'application/vnd.oasis.opendocument.presentation',
+         'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+         'odt' => 'application/vnd.oasis.opendocument.text',
+         'oga' => 'audio/ogg',
+         'ogv' => 'video/ogg',
+         'ogx' => 'application/ogg',
+         'opus' => 'audio/opus',
+         'otf' => 'font/otf',
+         'png' => 'image/png',
+         'pdf' => 'application/pdf',
+         'php' => 'application/x-httpd-php',
+         'ppt' => 'application/vnd.ms-powerpoint',
+         'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+         'rar' => 'application/vnd.rar',
+         'rtf' => 'application/rtf',
+         'sh' => 'application/x-sh',
+         'svg' => 'image/svg+xml',
+         'tar' => 'application/x-tar',
+         'tif' => 'image/tiff',
+         'tiff' => 'image/tiff',
+         'ts' => 'video/mp2t',
+         'ttf' => 'font/ttf',
+         'txt' => 'text/plain',
+         'vsd' => 'application/vnd.visio',
+         'wav' => 'audio/wav',
+         'weba' => 'audio/webm',
+         'webm' => 'video/webm',
+         'webp' => 'image/webp',
+         'woff' => 'font/woff',
+         'woff2' => 'font/woff2',
+    ];
+    private const PREDIGESTED_REGEX = '/-([0-9a-zA-Z]{7,128}\.digested)/';
+
+    private ?array $manifestData = null;
+    private array $fileContentsCache = [];
+    private array $assetsBeingCreated = [];
+    private readonly string $publicPrefix;
+    private array $extensionsMap = [];
+
+    private array $assetsCache = [];
+
+    public function __construct(
+        private readonly AssetMapperRepository $mapperRepository,
+        private readonly AssetMapperCompiler $compiler,
+        private readonly string $projectRootDir,
+        string $publicPrefix = '/assets/',
+        private readonly string $publicDirName = 'public',
+        array $extensionsMap = [],
+    ) {
+        // ensure that the public prefix always ends with a single slash
+        $this->publicPrefix = rtrim($publicPrefix, '/').'/';
+        $this->extensionsMap = array_merge(self::EXTENSIONS_MAP, $extensionsMap);
+    }
+
+    public function getPublicPrefix(): string
+    {
+        return $this->publicPrefix;
+    }
+
+    public function getAsset(string $logicalPath): ?MappedAsset
+    {
+        if (\in_array($logicalPath, $this->assetsBeingCreated, true)) {
+            throw new \RuntimeException(sprintf('Circular reference detected while creating asset for "%s": "%s".', $logicalPath, implode(' -> ', $this->assetsBeingCreated).' -> '.$logicalPath));
+        }
+
+        if (!isset($this->assetsCache[$logicalPath])) {
+            $this->assetsBeingCreated[] = $logicalPath;
+
+            $filePath = $this->mapperRepository->find($logicalPath);
+            if (null === $filePath) {
+                return null;
+            }
+
+            $asset = new MappedAsset($logicalPath);
+            $this->assetsCache[$logicalPath] = $asset;
+            $asset->setSourcePath($filePath);
+
+            $asset->setMimeType($this->getMimeType($logicalPath));
+            $publicPath = $this->getPublicPath($logicalPath);
+            $asset->setPublicPath($publicPath);
+            [$digest, $isPredigested] = $this->getDigest($asset);
+            $asset->setDigest($digest, $isPredigested);
+            $asset->setContent($this->calculateContent($asset));
+
+            array_pop($this->assetsBeingCreated);
+        }
+
+        return $this->assetsCache[$logicalPath];
+    }
+
+    /**
+     * @return MappedAsset[]
+     */
+    public function allAssets(): array
+    {
+        $assets = [];
+        foreach ($this->mapperRepository->all() as $logicalPath => $filePath) {
+            $asset = $this->getAsset($logicalPath);
+            if (null === $asset) {
+                throw new \LogicException(sprintf('Asset "%s" could not be found.', $logicalPath));
+            }
+            $assets[] = $asset;
+        }
+
+        return $assets;
+    }
+
+    public function getAssetFromSourcePath(string $sourcePath): ?MappedAsset
+    {
+        $logicalPath = $this->mapperRepository->findLogicalPath($sourcePath);
+        if (null === $logicalPath) {
+            return null;
+        }
+
+        return $this->getAsset($logicalPath);
+    }
+
+    public function getPublicPath(string $logicalPath): ?string
+    {
+        $manifestData = $this->loadManifest();
+        if (isset($manifestData[$logicalPath])) {
+            return $manifestData[$logicalPath];
+        }
+
+        $filePath = $this->mapperRepository->find($logicalPath);
+        if (null === $filePath) {
+            return null;
+        }
+
+        // grab the Asset - first look in the cache, as it may only be partially created
+        $asset = $this->assetsCache[$logicalPath] ?? $this->getAsset($logicalPath);
+        [$digest, $isPredigested] = $this->getDigest($asset);
+
+        if ($isPredigested) {
+            return $this->publicPrefix.$logicalPath;
+        }
+
+        return $this->publicPrefix.preg_replace_callback('/\.(\w+)$/', function ($matches) use ($digest) {
+            return "-{$digest}{$matches[0]}";
+        }, $logicalPath);
+    }
+
+    public static function isPathPredigested(string $path): bool
+    {
+        return 1 === preg_match(self::PREDIGESTED_REGEX, $path);
+    }
+
+    public function getPublicAssetsFilesystemPath(): string
+    {
+        return rtrim(rtrim($this->projectRootDir, '/').'/'.$this->publicDirName.$this->publicPrefix, '/');
+    }
+
+    /**
+     * Returns an array of "string digest" and "bool predigested".
+     *
+     * @return array{0: string, 1: bool}
+     */
+    private function getDigest(MappedAsset $asset): array
+    {
+        // check for a pre-digested file
+        if (1 === preg_match(self::PREDIGESTED_REGEX, $asset->logicalPath, $matches)) {
+            return [$matches[1], true];
+        }
+
+        return [
+            hash('xxh128', $this->calculateContent($asset)),
+            false,
+        ];
+    }
+
+    private function getMimeType(string $logicalPath): ?string
+    {
+        $filePath = $this->mapperRepository->find($logicalPath);
+        if (null === $filePath) {
+            return null;
+        }
+
+        $extension = pathinfo($logicalPath, \PATHINFO_EXTENSION);
+
+        if (!isset($this->extensionsMap[$extension])) {
+            throw new \LogicException(sprintf('The file extension "%s" from "%s" does not correspond to any known types in the asset mapper. To support this extension, configure framework.asset_mapper.extensions.', $extension, $logicalPath));
+        }
+
+        return $this->extensionsMap[$extension];
+    }
+
+    private function calculateContent(MappedAsset $asset): string
+    {
+        if (isset($this->fileContentsCache[$asset->logicalPath])) {
+            return $this->fileContentsCache[$asset->logicalPath];
+        }
+
+        $content = file_get_contents($asset->getSourcePath());
+        $content = $this->compiler->compile($content, $asset, $this);
+
+        $this->fileContentsCache[$asset->logicalPath] = $content;
+
+        return $content;
+    }
+
+    private function loadManifest(): array
+    {
+        if (null === $this->manifestData) {
+            $path = $this->getPublicAssetsFilesystemPath().'/'.self::MANIFEST_FILE_NAME;
+
+            if (!file_exists($path)) {
+                $this->manifestData = [];
+            } else {
+                $this->manifestData = json_decode(file_get_contents($path), true);
+            }
+        }
+
+        return $this->manifestData;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/AssetMapperCompiler.php b/src/Symfony/Component/AssetMapper/AssetMapperCompiler.php
new file mode 100644
index 0000000000000..388095cc0a758
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/AssetMapperCompiler.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper;
+
+use Symfony\Component\AssetMapper\Compiler\AssetCompilerInterface;
+
+/**
+ * Runs a chain of compiles intended to adjust the source of assets.
+ *
+ * @experimental
+ *
+ * @final
+ */
+class AssetMapperCompiler
+{
+    /**
+     * @param iterable<AssetCompilerInterface> $assetCompilers
+     */
+    public function __construct(private iterable $assetCompilers)
+    {
+    }
+
+    public function compile(string $content, MappedAsset $mappedAsset, AssetMapperInterface $assetMapper): string
+    {
+        foreach ($this->assetCompilers as $compiler) {
+            if (!$compiler->supports($mappedAsset)) {
+                continue;
+            }
+
+            $content = $compiler->compile($content, $mappedAsset, $assetMapper);
+        }
+
+        return $content;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/AssetMapperDevServerSubscriber.php b/src/Symfony/Component/AssetMapper/AssetMapperDevServerSubscriber.php
new file mode 100644
index 0000000000000..e7ba6f2ff4bc7
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/AssetMapperDevServerSubscriber.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * Functions like a controller that returns assets from the asset mapper.
+ *
+ * @experimental
+ *
+ * @author Ryan Weaver <ryan@symfonycasts.com>
+ */
+final class AssetMapperDevServerSubscriber implements EventSubscriberInterface
+{
+    public function __construct(
+        private readonly AssetMapperInterface $assetMapper,
+    ) {
+    }
+
+    public function onKernelRequest(RequestEvent $event): void
+    {
+        if (!$event->isMainRequest()) {
+            return;
+        }
+
+        $pathInfo = $event->getRequest()->getPathInfo();
+        if (!str_starts_with($pathInfo, $this->assetMapper->getPublicPrefix())) {
+            return;
+        }
+
+        [$assetPath, $digest] = $this->extractAssetPathAndDigest($pathInfo);
+        $asset = $this->assetMapper->getAsset($assetPath);
+
+        if (!$asset) {
+            throw new NotFoundHttpException(sprintf('Asset "%s" not found.', $assetPath));
+        }
+
+        if ($asset->getDigest() !== $digest) {
+            throw new NotFoundHttpException(sprintf('Asset "%s" was found but the digest does not match.', $assetPath));
+        }
+
+        $response = (new Response(
+            $asset->getContent(),
+            headers: $asset->getMimeType() ? ['Content-Type' => $asset->getMimeType()] : [],
+        ))
+            ->setPublic()
+            ->setMaxAge(604800)
+            ->setImmutable()
+            ->setEtag($asset->getDigest())
+        ;
+
+        $event->setResponse($response);
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            // priority higher than RouterListener
+            KernelEvents::REQUEST => [['onKernelRequest', 35]],
+        ];
+    }
+
+    private function extractAssetPathAndDigest(string $fullPath): array
+    {
+        $fullPath = substr($fullPath, \strlen($this->assetMapper->getPublicPrefix()));
+        preg_match('/-([0-9a-zA-Z]{7,128}(?:\.digested)?)\.[^.]+\z/', $fullPath, $matches);
+
+        if (!isset($matches[1])) {
+            return [$fullPath, null];
+        }
+
+        $digest = $matches[1];
+
+        $path = AssetMapper::isPathPredigested($fullPath) ? $fullPath : str_replace("-{$digest}", '', $fullPath);
+
+        return [$path, $digest];
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/AssetMapperInterface.php b/src/Symfony/Component/AssetMapper/AssetMapperInterface.php
new file mode 100644
index 0000000000000..0acd886d6dc1a
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/AssetMapperInterface.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper;
+
+/**
+ * Finds and returns assets in the pipeline.
+ *
+ * @experimental
+ *
+ * @author Ryan Weaver <ryan@symfonycasts.com>
+ */
+interface AssetMapperInterface
+{
+    /**
+     * The path that should be prefixed on all asset paths to point to the output location.
+     */
+    public function getPublicPrefix(): string;
+
+    /**
+     * Given the logical path (e.g. path relative to a mapped directory), return the asset.
+     */
+    public function getAsset(string $logicalPath): ?MappedAsset;
+
+    /**
+     * Returns all mapped assets.
+     *
+     * @return MappedAsset[]
+     */
+    public function allAssets(): array;
+
+    /**
+     * Fetches the asset given its source path (i.e. filesystem path).
+     */
+    public function getAssetFromSourcePath(string $sourcePath): ?MappedAsset;
+
+    /**
+     * Returns the public path for this asset, if it can be found.
+     */
+    public function getPublicPath(string $logicalPath): ?string;
+
+    /**
+     * Returns the filesystem path to where assets are stored when compiled.
+     */
+    public function getPublicAssetsFilesystemPath(): string;
+}
diff --git a/src/Symfony/Component/AssetMapper/AssetMapperRepository.php b/src/Symfony/Component/AssetMapper/AssetMapperRepository.php
new file mode 100644
index 0000000000000..87c165ccf23e3
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/AssetMapperRepository.php
@@ -0,0 +1,139 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper;
+
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Finder\Iterator\RecursiveDirectoryIterator;
+
+/**
+ * Finds assets in the asset mapper.
+ *
+ * @experimental
+ *
+ * @author Ryan Weaver <ryan@symfonycasts.com>
+ *
+ * @final
+ */
+class AssetMapperRepository
+{
+    private ?array $absolutePaths = null;
+
+    /**
+     * @param string[] $paths Array of assets paths: key is the path, value is the namespace
+     *                        (empty string for no namespace)
+     */
+    public function __construct(
+        private readonly array $paths,
+        private readonly string $projectRootDir
+    ) {
+    }
+
+    /**
+     * Given the logical path - styles/app.css - returns the absolute path to the file.
+     */
+    public function find(string $logicalPath): ?string
+    {
+        foreach ($this->getDirectories() as $path => $namespace) {
+            $localLogicalPath = $logicalPath;
+            // if this path has a namespace, only look for files in that namespace
+            if ('' !== $namespace) {
+                if (!str_starts_with($logicalPath, rtrim($namespace, '/').'/')) {
+                    continue;
+                }
+
+                $localLogicalPath = substr($logicalPath, \strlen($namespace) + 1);
+            }
+
+            $file = rtrim($path, '/').'/'.$localLogicalPath;
+            if (file_exists($file)) {
+                return $file;
+            }
+        }
+
+        return null;
+    }
+
+    public function findLogicalPath(string $filesystemPath): ?string
+    {
+        foreach ($this->getDirectories() as $path => $namespace) {
+            if (!str_starts_with($filesystemPath, $path)) {
+                continue;
+            }
+
+            $logicalPath = substr($filesystemPath, \strlen($path));
+            if ('' !== $namespace) {
+                $logicalPath = $namespace.'/'.$logicalPath;
+            }
+
+            return ltrim($logicalPath, '/');
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns an array of all files in the asset_mapper.
+     *
+     * Key is the logical path, value is the absolute path.
+     *
+     * @return string[]
+     */
+    public function all(): array
+    {
+        $paths = [];
+        foreach ($this->getDirectories() as $path => $namespace) {
+            $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
+            foreach ($iterator as $file) {
+                if (!$file->isFile()) {
+                    continue;
+                }
+
+                /** @var RecursiveDirectoryIterator $innerIterator */
+                $innerIterator = $iterator->getInnerIterator();
+                $logicalPath = ($namespace ? rtrim($namespace, '/').'/' : '').$innerIterator->getSubPathName();
+                $paths[$logicalPath] = $file->getPathname();
+            }
+        }
+
+        return $paths;
+    }
+
+    private function getDirectories(): array
+    {
+        $filesystem = new Filesystem();
+        if (null !== $this->absolutePaths) {
+            return $this->absolutePaths;
+        }
+
+        $this->absolutePaths = [];
+        foreach ($this->paths as $path => $namespace) {
+            if ($filesystem->isAbsolutePath($path)) {
+                if (!file_exists($path)) {
+                    throw new \InvalidArgumentException(sprintf('The asset mapper directory "%s" does not exist.', $path));
+                }
+                $this->absolutePaths[$path] = $namespace;
+
+                continue;
+            }
+
+            if (file_exists($this->projectRootDir.'/'.$path)) {
+                $this->absolutePaths[$this->projectRootDir.'/'.$path] = $namespace;
+
+                continue;
+            }
+
+            throw new \InvalidArgumentException(sprintf('The asset mapper directory "%s" does not exist.', $path));
+        }
+
+        return $this->absolutePaths;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/CHANGELOG.md b/src/Symfony/Component/AssetMapper/CHANGELOG.md
new file mode 100644
index 0000000000000..f5a3d015eac64
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+6.3
+---
+
+ * Add the component as experimental
diff --git a/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php b/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php
new file mode 100644
index 0000000000000..6c08da1c7d68b
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Command/AssetMapperCompileCommand.php
@@ -0,0 +1,110 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Command;
+
+use Symfony\Component\AssetMapper\AssetMapper;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Filesystem\Filesystem;
+
+/**
+ * Compiles the assets in the asset mapper to the final output directory.
+ *
+ * This command is intended to be used during deployment.
+ *
+ * @experimental
+ *
+ * @author Ryan Weaver <ryan@symfonycasts.com>
+ */
+#[AsCommand(name: 'assetmap:compile', description: 'Compiles all mapped assets and writes them to the final public output directory.')]
+final class AssetMapperCompileCommand extends Command
+{
+    public function __construct(
+        private readonly AssetMapperInterface $assetMapper,
+        private readonly ImportMapManager $importMapManager,
+        private readonly Filesystem $filesystem,
+        private readonly string $projectDir,
+        private readonly string $publicDirName,
+        private readonly bool $isDebug,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->addOption('clean', null, null, 'Whether to clean the public directory before compiling assets')
+            ->setHelp(<<<'EOT'
+The <info>%command.name%</info> command compiles and dumps all the assets in
+the asset mapper into the final public directory (usually <comment>public/assets</comment>).
+
+This command is meant to be run during deployment.
+EOT
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+        $publicDir = $this->projectDir.'/'.$this->publicDirName;
+        if (!is_dir($publicDir)) {
+            throw new InvalidArgumentException(sprintf('The public directory "%s" does not exist.', $publicDir));
+        }
+
+        if ($input->getOption('clean')) {
+            $outputDir = $publicDir.$this->assetMapper->getPublicPrefix();
+            $io->comment(sprintf('Cleaning <info>%s</info>', $outputDir));
+            $this->filesystem->remove($outputDir);
+            $this->filesystem->mkdir($outputDir);
+        }
+
+        $allAssets = $this->assetMapper->allAssets();
+
+        $io->comment(sprintf('Compiling <info>%d</info> assets to <info>%s%s</info>', \count($allAssets), $publicDir, $this->assetMapper->getPublicPrefix()));
+        $manifest = [];
+        foreach ($allAssets as $asset) {
+            // $asset->getPublicPath() will start with a "/"
+            $targetPath = $publicDir.$asset->getPublicPath();
+
+            if (!is_dir($dir = \dirname($targetPath))) {
+                $this->filesystem->mkdir($dir);
+            }
+
+            $this->filesystem->dumpFile($targetPath, $asset->getContent());
+            $manifest[$asset->logicalPath] = $asset->getPublicPath();
+        }
+
+        $manifestPath = $publicDir.$this->assetMapper->getPublicPrefix().AssetMapper::MANIFEST_FILE_NAME;
+        $this->filesystem->dumpFile($manifestPath, json_encode($manifest, \JSON_PRETTY_PRINT));
+        $io->comment(sprintf('Manifest written to <info>%s</info>', $manifestPath));
+
+        $importMapPath = $publicDir.$this->assetMapper->getPublicPrefix().ImportMapManager::IMPORT_MAP_FILE_NAME;
+        $this->filesystem->dumpFile($importMapPath, $this->importMapManager->getImportMapJson());
+        $io->comment(sprintf('Import map written to <info>%s</info>', $importMapPath));
+
+        if ($this->isDebug) {
+            $io->warning(sprintf(
+                'You are compiling assets in development. Symfony will not serve any changed assets until you delete %s and %s.',
+                $manifestPath,
+                $importMapPath
+            ));
+        }
+
+        return self::SUCCESS;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Command/ImportMapExportCommand.php b/src/Symfony/Component/AssetMapper/Command/ImportMapExportCommand.php
new file mode 100644
index 0000000000000..4a3af6e18f93d
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Command/ImportMapExportCommand.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Command;
+
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @experimental
+ *
+ * @author Kévin Dunglas <kevin@dunglas.dev>
+ */
+#[AsCommand(name: 'importmap:export', description: 'Exports the importmap JSON')]
+final class ImportMapExportCommand extends Command
+{
+    public function __construct(
+        private readonly ImportMapManager $importMapManager,
+    ) {
+        parent::__construct();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $output->writeln($this->importMapManager->getImportMapJson());
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Command/ImportMapRemoveCommand.php b/src/Symfony/Component/AssetMapper/Command/ImportMapRemoveCommand.php
new file mode 100644
index 0000000000000..cec830e2ece06
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Command/ImportMapRemoveCommand.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Command;
+
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+/**
+ * @experimental
+ *
+ * @author Kévin Dunglas <kevin@dunglas.dev>
+ */
+#[AsCommand(name: 'importmap:remove', description: 'Removes JavaScript packages')]
+final class ImportMapRemoveCommand extends Command
+{
+    public function __construct(
+        protected readonly ImportMapManager $importMapManager,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this->addArgument('packages', InputArgument::IS_ARRAY | InputArgument::REQUIRED, 'The packages to remove');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+
+        $packageList = $input->getArgument('packages');
+        $this->importMapManager->remove($packageList);
+
+        if (1 === \count($packageList)) {
+            $io->success(sprintf('Removed "%s" from importmap.php.', $packageList[0]));
+        } else {
+            $io->success(sprintf('Removed %d items from importmap.php.', \count($packageList)));
+        }
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php b/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php
new file mode 100644
index 0000000000000..529a90bca7f57
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Command/ImportMapRequireCommand.php
@@ -0,0 +1,111 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Command;
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+/**
+ * @experimental
+ *
+ * @author Kévin Dunglas <kevin@dunglas.dev>
+ */
+#[AsCommand(name: 'importma
10000
p:require', description: 'Requires JavaScript packages')]
+final class ImportMapRequireCommand extends Command
+{
+    public function __construct(
+        private readonly ImportMapManager $importMapManager,
+        private readonly AssetMapperInterface $assetMapper,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this->addArgument('packages', InputArgument::IS_ARRAY | InputArgument::REQUIRED, 'The packages to add');
+        $this->addOption('download', 'd', InputOption::VALUE_NONE, 'Download packages locally');
+        $this->addOption('preload', 'p', InputOption::VALUE_NONE, 'Preload packages');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+
+        $packageList = $input->getArgument('packages');
+        if ($input->hasOption('path') && \count($packageList) > 1) {
+            $io->error('The "--path" option can only be used when you require a single package.');
+
+            return Command::FAILURE;
+        }
+
+        $packages = [];
+        foreach ($packageList as $packageName) {
+            $parts = ImportMapManager::parsePackageName($packageName);
+            if (null === $parts) {
+                $io->error(sprintf('Package "%s" is not a valid package name format. Use the format PACKAGE@VERSION - e.g. "lodash" or "lodash@^4"', $packageName));
+
+                return Command::FAILURE;
+            }
+
+            $packages[] = new PackageRequireOptions(
+                $parts['package'],
+                $parts['version'] ?? null,
+                $input->getOption('download'),
+                $input->getOption('preload'),
+                null,
+                isset($parts['registry']) && $parts['registry'] ? $parts['registry'] : null,
+            );
+        }
+
+        $newPackages = $this->importMapManager->require($packages);
+        if (1 === \count($newPackages)) {
+            $newPackage = $newPackages[0];
+            $message = sprintf('Package "%s" added to importmap.php', $newPackage->importName);
+
+            if ($newPackage->isDownloaded && null !== $downloadedAsset = $this->assetMapper->getAsset($newPackage->path)) {
+                $application = $this->getApplication();
+                if ($application instanceof Application) {
+                    $projectDir = $application->getKernel()->getProjectDir();
+                    $downloadedPath = $downloadedAsset->getSourcePath();
+                    if (str_starts_with($downloadedPath, $projectDir)) {
+                        $downloadedPath = substr($downloadedPath, \strlen($projectDir) + 1);
+                    }
+
+                    $message .= sprintf(' and downloaded locally to "%s"', $downloadedPath);
+                }
+            }
+
+            $message .= '.';
+        } else {
+            $message = sprintf('%d new packages (%s) added to the importmap.php!', \count($newPackages), implode(', ', array_keys($newPackages)));
+        }
+
+        $messages = [$message];
+
+        if (1 === \count($newPackages)) {
+            $messages[] = sprintf('Use the new package normally by importing "%s".', $newPackages[0]->importName);
+        }
+
+        $io->success($messages);
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Command/ImportMapUpdateCommand.php b/src/Symfony/Component/AssetMapper/Command/ImportMapUpdateCommand.php
new file mode 100644
index 0000000000000..97559699d06f4
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Command/ImportMapUpdateCommand.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Command;
+
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+/**
+ * @experimental
+ *
+ * @author Kévin Dunglas <kevin@dunglas.dev>
+ */
+#[AsCommand(name: 'importmap:update', description: 'Updates all JavaScript packages to their latest versions')]
+final class ImportMapUpdateCommand extends Command
+{
+    public function __construct(
+        protected readonly ImportMapManager $importMapManager,
+    ) {
+        parent::__construct();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+        $this->importMapManager->update();
+
+        $io->success('Updated all packages in importmap.php.');
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerInterface.php b/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerInterface.php
new file mode 100644
index 0000000000000..247161dffa329
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Compiler;
+
+use Symfony\Component\AssetMapper\AssetMapper;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\MappedAsset;
+
+/**
+ * An asset compiler is responsible for applying any changes to the contents of an asset.
+ *
+ * @experimental
+ *
+ * @author Ryan Weaver <ryan@symfonycasts.com>
+ */
+interface AssetCompilerInterface
+{
+    public function supports(MappedAsset $asset): bool;
+
+    /**
+     * Applies any changes to the contents of the asset.
+     */
+    public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string;
+}
diff --git a/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerPathResolverTrait.php b/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerPathResolverTrait.php
new file mode 100644
index 0000000000000..e40e827548934
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Compiler/AssetCompilerPathResolverTrait.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Compiler;
+
+use Symfony\Component\Asset\Exception\RuntimeException;
+
+/**
+ * Helps resolve "../" and "./" in paths.
+ *
+ * @experimental
+ *
+ * @internal
+ */
+trait AssetCompilerPathResolverTrait
+{
+    private function resolvePath(string $directory, string $filename): string
+    {
+        $pathParts = array_filter(explode('/', $directory.'/'.$filename));
+        $output = [];
+
+        foreach ($pathParts as $part) {
+            if ('..' === $part) {
+                if (0 === \count($output)) {
+                    throw new RuntimeException(sprintf('Cannot import the file "%s": it is outside the current "%s" directory.', $filename, $directory));
+                }
+
+                array_pop($output);
+                continue;
+            }
+
+            if ('.' === $part) {
+                // skip
+                continue;
+            }
+
+            $output[] = $part;
+        }
+
+        return implode('/', $output);
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Compiler/CssAssetUrlCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/CssAssetUrlCompiler.php
new file mode 100644
index 0000000000000..0ba3e650ef361
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Compiler/CssAssetUrlCompiler.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Compiler;
+
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\MappedAsset;
+
+/**
+ * Resolves url() paths in CSS files.
+ *
+ * Originally sourced from https://github.com/rails/propshaft/blob/main/lib/propshaft/compilers/css_asset_urls.rb
+ *
+ * @experimental
+ */
+final class CssAssetUrlCompiler implements AssetCompilerInterface
+{
+    use AssetCompilerPathResolverTrait;
+
+    // https://regex101.com/r/BOJ3vG/1
+    public const ASSET_URL_PATTERN = '/url\(\s*["\']?(?!(?:\/|\#|%23|data|http|\/\/))([^"\'\s?#)]+)([#?][^"\')]+)?\s*["\']?\)/';
+
+    public function __construct(private readonly bool $strictMode = true)
+    {
+    }
+
+    public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
+    {
+        return preg_replace_callback(self::ASSET_URL_PATTERN, function ($matches) use ($asset, $assetMapper) {
+            $resolvedPath = $this->resolvePath(\dirname($asset->logicalPath), $matches[1]);
+            $dependentAsset = $assetMapper->getAsset($resolvedPath);
+
+            if (null === $dependentAsset) {
+                if ($this->strictMode) {
+                    throw new \RuntimeException(sprintf('Unable to find asset "%s" referenced in "%s".', $resolvedPath, $asset->getSourcePath()));
+                }
+
+                // return original, unchanged path
+                return $matches[0];
+            }
+
+            $asset->addDependency($dependentAsset);
+
+            return 'url("'.$dependentAsset->getPublicPath().'")';
+        }, $content);
+    }
+
+    public function supports(MappedAsset $asset): bool
+    {
+        return 'text/css' === $asset->getMimeType();
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
new file mode 100644
index 0000000000000..f252bb7bb9abe
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Compiler/JavaScriptImportPathCompiler.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Compiler;
+
+use Symfony\Component\AssetMapper\AssetMapper;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\MappedAsset;
+
+/**
+ * Resolves import paths in JS files.
+ *
+ * @experimental
+ *
+ * @author Ryan Weaver <ryan@symfonycasts.com>
+ */
+final class JavaScriptImportPathCompiler implements AssetCompilerInterface
+{
+    use AssetCompilerPathResolverTrait;
+
+    // https://regex101.com/r/VFdR4H/1
+    private const IMPORT_PATTERN = '/(?:import\s+(?:(?:\*\s+as\s+\w+|[\w\s{},*]+)\s+from\s+)?|\bimport\()\s*[\'"`](\.\/[^\'"`]+|(\.\.\/)+[^\'"`]+)[\'"`]\s*[;\)]?/m';
+
+    public function __construct(private readonly bool $strictMode = true)
+    {
+    }
+
+    public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
+    {
+        return preg_replace_callback(self::IMPORT_PATTERN, function ($matches) use ($asset, $assetMapper) {
+            $resolvedPath = $this->resolvePath(\dirname($asset->logicalPath), $matches[1]);
+
+            $dependentAsset = $assetMapper->getAsset($resolvedPath);
+
+            if (!$dependentAsset && $this->strictMode) {
+                $message = sprintf('Unable to find asset "%s" imported from "%s".', $resolvedPath, $asset->getSourcePath());
+
+                if (null !== $assetMapper->getAsset(sprintf('%s.js', $resolvedPath))) {
+                    $message .= sprintf(' Try adding ".js" to the end of the import - i.e. "%s.js".', $resolvedPath);
+                }
+
+                throw new \RuntimeException($message);
+            }
+
+            if ($dependentAsset && $this->supports($dependentAsset)) {
+                // If we found the path and it's a JavaScript file, list it as a dependency.
+                // This will cause the asset to be included in the importmap.
+                $isLazy = str_contains($matches[0], 'import(');
+
+                $asset->addDependency($dependentAsset, $isLazy);
+            }
+
+            return $matches[0];
+        }, $content);
+    }
+
+    public function supports(MappedAsset $asset): bool
+    {
+        return 'application/javascript' === $asset->getMimeType()  || 'text/javascript' === $asset->getMimeType();
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Compiler/SourceMappingUrlsCompiler.php b/src/Symfony/Component/AssetMapper/Compiler/SourceMappingUrlsCompiler.php
new file mode 100644
index 0000000000000..31dab5a79c7e2
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Compiler/SourceMappingUrlsCompiler.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Compiler;
+
+use Symfony\Component\AssetMapper\AssetMapper;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\MappedAsset;
+
+/**
+ * Rewrites already-existing source map URLs to their final digested path.
+ *
+ * Originally sourced from https://github.com/rails/propshaft/blob/main/lib/propshaft/compilers/source_mapping_urls.rb
+ *
+ * @experimental
+ */
+final class SourceMappingUrlsCompiler implements AssetCompilerInterface
+{
+    use AssetCompilerPathResolverTrait;
+
+    private const SOURCE_MAPPING_PATTERN = '/^(\/\/|\/\*)# sourceMappingURL=(.+\.map)/m';
+
+    public function supports(MappedAsset $asset): bool
+    {
+        return \in_array($asset->getMimeType(), ['application/javascript', 'text/css'], true);
+    }
+
+    public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
+    {
+        return preg_replace_callback(self::SOURCE_MAPPING_PATTERN, function ($matches) use ($asset, $assetMapper) {
+            $resolvedPath = $this->resolvePath(\dirname($asset->logicalPath), $matches[2]);
+
+            $dependentAsset = $assetMapper->getAsset($resolvedPath);
+            if (!$dependentAsset) {
+                // return original, unchanged path
+                return $matches[0];
+            }
+
+            $asset->addDependency($dependentAsset);
+
+            return $matches[1].'# sourceMappingURL='.$dependentAsset->getPublicPath();
+        }, $content);
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapEntry.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapEntry.php
new file mode 100644
index 0000000000000..ad31b99427ee4
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapEntry.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\ImportMap;
+
+/**
+ * Represents an item that should be in the importmap.
+ *
+ * @experimental
+ *
+ * @author Ryan Weaver <ryan@symfonycasts.com>
+ */
+final class ImportMapEntry
+{
+    public function __construct(
+        /**
+         * The logical path to this asset if local or downloaded.
+         */
+        public readonly string $importName,
+        public readonly ?string $path = null,
+        public readonly ?string $url = null,
+        public readonly bool $isDownloaded = false,
+        public readonly bool $preload = false,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php
new file mode 100644
index 0000000000000..1dbbf34d28d92
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapManager.php
@@ -0,0 +1,399 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\ImportMap;
+
+use Symfony\Component\AssetMapper\AssetDependency;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Component\VarExporter\VarExporter;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+/**
+ * @experimental
+ *
+ * @author Kévin Dunglas <kevin@dunglas.dev>
+ * @author Ryan Weaver <ryan@symfonycasts.com>
+ * @final
+ */
+class ImportMapManager
+{
+    public const PROVIDER_JSPM = 'jspm';
+    public const PROVIDER_JSPM_SYSTEM = 'jspm.system';
+    public const PROVIDER_SKYPACK = 'skypack';
+    public const PROVIDER_JSDELIVR = 'jsdelivr';
+    public const PROVIDER_UNPKG = 'unpkg';
+    public const PROVIDERS = [
+        self::PROVIDER_JSPM,
+        self::PROVIDER_JSPM_SYSTEM,
+        self::PROVIDER_SKYPACK,
+        self::PROVIDER_JSDELIVR,
+        self::PROVIDER_UNPKG,
+    ];
+
+    public const POLYFILL_URL = 'https://ga.jspm.io/npm:es-module-shims@1.7.2/dist/es-module-shims.js';
+
+    /**
+     * @see https://regex101.com/r/2cR9Rh/1
+     *
+     * Partially based on https://github.com/dword-design/package-name-regex
+     */
+    private const PACKAGE_PATTERN = '/^(?:https?:\/\/[\w\.-]+\/)?(?:(?<registry>\w+):)?(?<package>(?:@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*)(?:@(?<version>[\w\._-]+))?(?:(?<subpath>\/.*))?$/';
+    public const IMPORT_MAP_FILE_NAME = 'importmap.json';
+
+    private array $importMapEntries;
+    private array $modulesToPreload;
+    private string $json;
+
+    public function __construct(
+        private readonly AssetMapperInterface $assetMapper,
+        private readonly string $importMapConfigPath,
+        private readonly string $vendorDir,
+        private readonly string $provider = self::PROVIDER_JSPM,
+        private ?HttpClientInterface $httpClient = null,
+    ) {
+        $this->httpClient = $httpClient ?? HttpClient::create(['base_uri' => 'https://api.jspm.io/']);
+    }
+
+    public function getModulesToPreload(): array
+    {
+        $this->buildImportMapJson();
+
+        return $this->modulesToPreload;
+    }
+
+    public function getImportMapJson(): string
+    {
+        $this->buildImportMapJson();
+
+        return $this->json;
+    }
+
+    /**
+     * Adds or updates packages.
+     *
+     * @param PackageRequireOptions[] $packages
+     * @return ImportMapEntry[]
+     */
+    public function require(array $packages): array
+    {
+        return $this->updateImportMapConfig(false, $packages, []);
+    }
+
+    /**
+     * Removes packages.
+     *
+     * @param string[] $packages
+     */
+    public function remove(array $packages): void
+    {
+        $this->updateImportMapConfig(false, [], $packages);
+    }
+
+    /**
+     * Updates all existing packages to the latest version.
+     */
+    public function update(): array
+    {
+        return $this->updateImportMapConfig(true, [], []);
+    }
+
+    /**
+     * @internal
+     */
+    public static function parsePackageName(string $packageName): ?array
+    {
+        // https://regex101.com/r/58bl9L/1
+        $regex = '/(?:(?P<registry>[^:\n]+):)?(?P<package>[^@\n]+)(?:@(?P<version>[^\s\n]+))?/';
+
+        return preg_match($regex, $packageName, $matches) ? $matches : null;
+    }
+
+    private function buildImportMapJson(): void
+    {
+        if (isset($this->json)) {
+            return;
+        }
+
+        $dumpedPath = $this->assetMapper->getPublicAssetsFilesystemPath().'/'.self::IMPORT_MAP_FILE_NAME;
+        if (file_exists($dumpedPath)) {
+            $this->json = file_get_contents($dumpedPath);
+
+            return;
+        }
+
+        $entries = $this->loadImportMapEntries();
+        $this->modulesToPreload = [];
+
+        $imports = $this->convertEntriesToImports($entries);
+
+        $importmap['imports'] = $imports;
+
+        // Use JSON_UNESCAPED_SLASHES | JSON_HEX_TAG to prevent XSS
+        $this->json = json_encode($importmap, \JSON_THROW_ON_ERROR | \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_HEX_TAG);
+    }
+
+    /**
+     * @param PackageRequireOptions[] $packagesToRequire
+     * @param string[] $packagesToRemove
+     * @return ImportMapEntry[]
+     */
+    private function updateImportMapConfig(bool $update, array $packagesToRequire, array $packagesToRemove): array
+    {
+        $currentEntries = $this->loadImportMapEntries();
+
+        foreach ($packagesToRemove as $packageName) {
+            if (!isset($currentEntries[$packageName])) {
+                throw new \InvalidArgumentException(sprintf('Package "%s" listed for removal was not found in "%s".', $packageName, basename($this->importMapConfigPath)));
+            }
+
+            $this->cleanupPackageFiles($currentEntries[$packageName]);
+            unset($currentEntries[$packageName]);
+        }
+
+        if ($update) {
+            foreach ($currentEntries as $importName => $entry) {
+                if (null === $entry->url) {
+                    continue;
+                }
+
+                // assume the import name === package name, unless we can parse
+                // the true package name from the URL
+                $packageName = $importName;
+                $registry = null;
+
+                // try to grab the package name & jspm "registry" from the URL
+                if (str_starts_with($entry->url, 'https://ga.jspm.io') && 1 === preg_match(self::PACKAGE_PATTERN, $entry->url, $matches)) {
+                    $packageName = $matches['package'];
+                    $registry = $matches['registry'] ?? null;
+                }
+
+                $packagesToRequire[] = new PackageRequireOptions(
+                    $packageName,
+                    null,
+                    $entry->isDownloaded,
+                    $entry->preload,
+                    $importName,
+                    $registry,
+                );
+
+                // remove it: then it will be re-added
+                $this->cleanupPackageFiles($entry);
+                unset($currentEntries[$importName]);
+            }
+        }
+
+        $newEntries = $this->requirePackages($packagesToRequire, $currentEntries);
+        $this->writeImportMapConfig($currentEntries);
+
+        return $newEntries;
+    }
+
+    /**
+     * Gets information about (and optionally downloads) the packages & updates the entries.
+     *
+     * Returns an array of the entries that were added.
+     *
+     * @param PackageRequireOptions[] $packagesToRequire
+     * @param array<string, ImportMapEntry> $importMapEntries
+     */
+    private function requirePackages(array $packagesToRequire, array &$importMapEntries): array
+    {
+        if (!$packagesToRequire) {
+            return [];
+        }
+
+        $installData = [];
+        $packageRequiresByName = [];
+        foreach ($packagesToRequire as $requireOptions) {
+            $constraint = $requireOptions->packageName;
+            if (null !== $requireOptions->versionConstraint) {
+                $constraint .= '@' . $requireOptions->versionConstraint;
+            }
+            if (null !== $requireOptions->registryName) {
+                $constraint = sprintf('%s:%s', $requireOptions->registryName, $constraint);
+            }
+            $installData[] = $constraint;
+            $packageRequiresByName[$requireOptions->packageName] = $requireOptions;
+        }
+
+        $json = [
+            'install' => $installData,
+            'flattenScope' => true,
+            // always grab production-ready assets
+            'env' => ['browser', 'module', 'production'],
+        ];
+        if (self::PROVIDER_JSPM !== $this->provider) {
+            $json['provider'] = $this->provider;
+        }
+
+        $response = $this->httpClient->request('POST', 'generate', [
+            'json' => $json,
+        ]);
+
+        if (200 !== $response->getStatusCode()) {
+            $data = $response->toArray(false);
+
+            if (isset($data['error'])) {
+                throw new \RuntimeException(sprintf('Error requiring JavaScript package: "%s"', $data['error']));
+            }
+
+            // Throws the original HttpClient exception
+            $response->getHeaders();
+        }
+
+        // if we're requiring just one package, in case it has any peer deps, match the preload
+        $defaultPreload = 1 === count($packagesToRequire) ? $packagesToRequire[0]->preload : false;
+
+        $addedEntries = [];
+        foreach ($response->toArray()['map']['imports'] as $packageName => $url) {
+            $requireOptions = $packageRequiresByName[$packageName] ?? null;
+            $importName = $requireOptions && $requireOptions->importName ? $requireOptions->importName : $packageName;
+            $preload = $requireOptions ? $requireOptions->preload : $defaultPreload;
+            $download = $requireOptions ? $requireOptions->download : false;
+            $path = null;
+
+            if ($download) {
+                $vendorPath = $this->vendorDir.'/'.$packageName.'.js';
+
+                @mkdir(\dirname($vendorPath), 0777, true);
+                file_put_contents($vendorPath, $this->httpClient->request('GET', $url)->getContent());
+
+                $mappedAsset = $this->assetMapper->getAssetFromSourcePath($vendorPath);
+                if (null === $mappedAsset) {
+                    unlink($vendorPath);
+
+                    throw new \LogicException(sprintf('The package was downloaded to "%s", but this path does not appear to be in any of your asset paths.', $vendorPath));
+                }
+                $path = $mappedAsset->logicalPath;
+            }
+
+            $newEntry = new ImportMapEntry($importName, $path, $url, $download, $preload);
+            $importMapEntries[$importName] = $newEntry;
+            $addedEntries[] = $newEntry;
+        }
+
+        return $addedEntries;
+    }
+
+    private function cleanupPackageFiles(ImportMapEntry $entry): void
+    {
+        if (null === $entry->path) {
+            return;
+        }
+
+        $asset = $this->assetMapper->getAsset($entry->path);
+
+        if (is_file($asset->getSourcePath())) {
+            @unlink($asset->getSourcePath());
+        }
+    }
+
+    /**
+     * @return array<string, ImportMapEntry>
+     */
+    private function loadImportMapEntries(): array
+    {
+        if (isset($this->importMapEntries)) {
+            return $this->importMapEntries;
+        }
+
+        $path = $this->importMapConfigPath;
+        $importMapConfig = is_file($path) ? (static fn () => include $path)() : [];
+
+        $entries = [];
+        foreach ($importMapConfig ?? [] as $importName => $data) {
+            $entries[$importName] = new ImportMapEntry(
+                $importName,
+                path: $data['path'] ?? $data['downloaded_to'] ?? null,
+                url: $data['url'] ?? null,
+                isDownloaded: isset($data['downloaded_to']),
+                preload: $data['preload'] ?? false,
+            );
+        }
+
+        return $this->importMapEntries = $entries;
+    }
+
+    /**
+     * @param ImportMapEntry[] $entries
+     */
+    private function writeImportMapConfig(array $entries): void
+    {
+        $this->importMapEntries = $entries;
+        unset($this->modulesToPreload);
+        unset($this->json);
+
+        $importMapConfig = [];
+        foreach ($entries as $entry) {
+            $config = [];
+            if ($entry->path) {
+                $config[$entry->isDownloaded ? 'downloaded_to' : 'path'] = $entry->path;
+            }
+            if ($entry->url) {
+                $config['url'] = $entry->url;
+            }
+            if ($entry->preload) {
+                $config['preload'] = $entry->preload;
+            }
+            $importMapConfig[$entry->importName] = $config;
+        }
+
+        $map = class_exists(VarExporter::class) ? VarExporter::export($importMapConfig) : var_export($importMapConfig, true);
+        file_put_contents($this->importMapConfigPath, "<?php\n\nreturn {$map};\n");
+    }
+
+    /**
+     * @param ImportMapEntry[] $entries
+     */
+    private function convertEntriesToImports(array $entries): array
+    {
+        $imports = [];
+        foreach ($entries as $entryOptions) {
+            // while processing dependencies, we may recurse: no reason to calculate the same entry twice
+            if (isset($imports[$entryOptions->importName])) {
+                continue;
+            }
+
+            $dependencies = [];
+
+            if (null !== $entryOptions->path) {
+                $asset = $this->assetMapper->getAsset($entryOptions->path);
+                if (!$asset) {
+                    throw new \InvalidArgumentException(sprintf('The asset "%s" mentioned in "%s" cannot be found in any asset map paths.', $entryOptions->path, basename($this->importMapConfigPath)));
+                }
+                $path = $asset->getPublicPath();
+                $dependencies = $asset->getDependencies();
+            } elseif (null !== $entryOptions->url) {
+                $path = $entryOptions->url;
+            } else {
+                throw new \InvalidArgumentException(sprintf('The package "%s" mentioned in "%s" must have a "path" or "url" key.', $entryOptions->importName, basename($this->importMapConfigPath)));
+            }
+
+            $imports[$entryOptions->importName] = $path;
+
+            if ($entryOptions->preload ?? false) {
+                $this->modulesToPreload[] = $path;
+            }
+
+            $dependencyImportMapEntries = array_map(function (AssetDependency $dependency) {
+                return new ImportMapEntry(
+                    $dependency->asset->getPublicPathWithoutDigest(),
+                    $dependency->asset->logicalPath,
+                    preload: !$dependency->isLazy,
+                );
+            }, $dependencies);
+            $imports = array_merge($imports, $this->convertEntriesToImports($dependencyImportMapEntries));
+        }
+
+        return $imports;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapRenderer.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapRenderer.php
new file mode 100644
index 0000000000000..08c75f52771ba
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapRenderer.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\ImportMap;
+
+/**
+ * @experimental
+ *
+ * @author Kévin Dunglas <kevin@dunglas.dev>
+ * @author Ryan Weaver <ryan@symfonycasts.com>
+ * @final
+ */
+class ImportMapRenderer
+{
+    public function __construct(
+        private readonly ImportMapManager $importMapManager,
+        private readonly string $charset = 'UTF-8',
+        private readonly string|false $polyfillUrl = ImportMapManager::POLYFILL_URL,
+        private readonly array $scriptAttributes = [],
+    ) {
+    }
+
+    public function render(?string $entryPoint = null): string
+    {
+        $attributeString = '';
+
+        if (isset($this->scriptAttributes['src']) || isset($this->scriptAttributes['type'])) {
+            throw new \InvalidArgumentException(sprintf('The "src" and "type" attributes are not allowed on the <script> tag rendered by "%s".', self::class));
+        }
+
+        foreach ($this->scriptAttributes as $name => $value) {
+            $attributeString .= ' ';
+            if (true === $value) {
+                $attributeString .= $name;
+
+                continue;
+            }
+            $attributeString .= sprintf('%s="%s"', $name, $this->escapeAttributeValue($value));
+        }
+
+        $output = <<<HTML
+            <script type="importmap"{$attributeString}>
+            {$this->importMapManager->getImportMapJson()}
+            </script>
+            HTML;
+
+        if ($this->polyfillUrl) {
+            $url = $this->escapeAttributeValue($this->polyfillUrl);
+
+            $output .= <<<HTML
+
+                <!-- ES Module Shims: Import maps polyfill for modules browsers without import maps support -->
+                <script async src="$url"$attributeString></script>
+                HTML;
+        }
+
+        foreach ($this->importMapManager->getModulesToPreload() as $url) {
+            $url = $this->escapeAttributeValue($url);
+
+            $output .= "\n<link rel=\"modulepreload\" href=\"{$url}\">";
+        }
+
+        if (null !== $entryPoint) {
+            $output .= "\n<script type=\"module\">import '" . str_replace("'", "\\'", $entryPoint) . "';</script>";
+        }
+
+        return $output;
+    }
+
+    private function escapeAttributeValue(string $value): string
+    {
+        return htmlspecialchars($value, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset);
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/PackageRequireOptions.php b/src/Symfony/Component/AssetMapper/ImportMap/PackageRequireOptions.php
new file mode 100644
index 0000000000000..6d44efede25fb
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/ImportMap/PackageRequireOptions.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\ImportMap;
+
+/**
+ * Represents a package that should be installed or updated.
+ *
+ * @experimental
+ *
+ * @author Kévin Dunglas <kevin@dunglas.dev>
+ */
+final class PackageRequireOptions
+{
+    public function __construct(
+        public readonly string $packageName,
+        public readonly ?string $versionConstraint = null,
+        public readonly bool $download = false,
+        public readonly bool $preload = false,
+        public readonly ?string $importName = null,
+        public readonly ?string $registryName = null,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/LICENSE b/src/Symfony/Component/AssetMapper/LICENSE
new file mode 100644
index 0000000000000..3ed9f412ce53d
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2023-present Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Component/AssetMapper/MappedAsset.php b/src/Symfony/Component/AssetMapper/MappedAsset.php
new file mode 100644
index 0000000000000..7d09bd3acb6f0
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/MappedAsset.php
@@ -0,0 +1,147 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper;
+
+/**
+ * Represents a single asset in the asset mapper system.
+ *
+ * @experimental
+ *
+ * @author Ryan Weaver <ryan@symfonycasts.com>
+ */
+final class MappedAsset
+{
+    public string $publicPath;
+    /**
+     * @var string The filesystem path to the source file.
+     */
+    private string $sourcePath;
+    private string $content;
+    private string $digest;
+    private bool $isPredigested;
+    private ?string $mimeType;
+    /** @var AssetDependency[]  */
+    private array $dependencies = [];
+
+    public function __construct(public readonly string $logicalPath)
+    {
+    }
+
+    public function getPublicPath(): string
+    {
+        return $this->publicPath;
+    }
+
+    public function getSourcePath(): string
+    {
+        return $this->sourcePath;
+    }
+
+    public function getContent(): string
+    {
+        return $this->content;
+    }
+
+    public function getDigest(): string
+    {
+        return $this->digest;
+    }
+
+    public function isPredigested(): bool
+    {
+        return $this->isPredigested;
+    }
+
+    public function getMimeType(): ?string
+    {
+        return $this->mimeType;
+    }
+
+    public function getExtension(): string
+    {
+        return pathinfo($this->logicalPath, \PATHINFO_EXTENSION);
+    }
+
+    /**
+     * @return AssetDependency[]
+     */
+    public function getDependencies(): array
+    {
+        return $this->dependencies;
+    }
+
+    public function setPublicPath(string $publicPath): void
+    {
+        if (isset($this->publicPath)) {
+            throw new \LogicException('Cannot set public path: it was already set on the asset.');
+        }
+
+        $this->publicPath = $publicPath;
+    }
+
+    public function setSourcePath(string $sourcePath): void
+    {
+        if (isset($this->sourcePath)) {
+            throw new \LogicException('Cannot set source path: it was already set on the asset.');
+        }
+
+        $this->sourcePath = $sourcePath;
+    }
+
+    public function setDigest(string $digest, bool $isPredigested): void
+    {
+        if (isset($this->digest)) {
+            throw new \LogicException('Cannot set digest: it was already set on the asset.');
+        }
+
+        $this->digest = $digest;
+        $this->isPredigested = $isPredigested;
+    }
+
+    public function setMimeType(?string $mimeType): void
+    {
+        if (isset($this->mimeType)) {
+            throw new \LogicException('Cannot set mime type: it was already set on the asset.');
+        }
+
+        $this->mimeType = $mimeType;
+    }
+
+    public function setContent(string $content): void
+    {
+        if (isset($this->content)) {
+            throw new \LogicException('Cannot set content: it was already set on the asset.');
+        }
+
+        $this->content = $content;
+    }
+
+    public function addDependency(MappedAsset $asset, bool $isLazy = false): void
+    {
+        $this->dependencies[] = new AssetDependency($asset, $isLazy);
+    }
+
+    public function getPublicPathWithoutDigest(): string
+    {
+        if ($this->isPredigested()) {
+            return $this->getPublicPath();
+        }
+
+        // remove last part of publicPath and replace with last part of logicalPath
+        $publicPathParts = explode('/', $this->getPublicPath());
+        $logicalPathParts = explode('/', $this->logicalPath);
+        array_pop($publicPathParts);
+        $publicPathParts[] = array_pop($logicalPathParts);
+
+        return implode('/', $publicPathParts);
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/MapperAwareAssetPackage.php b/src/Symfony/Component/AssetMapper/MapperAwareAssetPackage.php
new file mode 100644
index 0000000000000..2dfa0b58aaf9f
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/MapperAwareAssetPackage.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper;
+
+use Symfony\Component\Asset\PackageInterface;
+
+/**
+ * Decorates asset packages to support resolving assets from the asset mapper.
+ *
+ * @experimental
+ *
+ * @author Ryan Weaver <ryan@symfonycasts.com>
+ */
+final class MapperAwareAssetPackage implements PackageInterface
+{
+    public function __construct(
+        private readonly PackageInterface $innerPackage,
+        private readonly AssetMapperInterface $assetMapper,
+    ) {
+    }
+
+    public function getVersion(string $path): string
+    {
+        return $this->innerPackage->getVersion($path);
+    }
+
+    public function getUrl(string $path): string
+    {
+        $publicPath = $this->assetMapper->getPublicPath($path);
+        if ($publicPath) {
+            $path = ltrim($publicPath, '/');
+        }
+
+        return $this->innerPackage->getUrl($path);
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/README.md b/src/Symfony/Component/AssetMapper/README.md
new file mode 100644
index 0000000000000..dad6763a644b8
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/README.md
@@ -0,0 +1,21 @@
+AssetMapper Component
+=====================
+
+The AssetMapper component allows you to expose directories of assets that are
+then moved to a public directory with digested (i.e. versioned) filenames. It
+also allows you to dump an [importmap](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script/type/importmap)
+to allow writing modern JavaScript without a build system.
+
+**This Component is experimental**.
+[Experimental features](https://symfony.com/doc/current/contributing/code/experimental.html)
+are not covered by Symfony's
+[Backward Compatibility Promise](https://symfony.com/doc/current/contributing/code/bc.html).
+
+Resources
+---------
+
+ * [Documentation](https://symfony.com/doc/current/components/asset_mapper/introduction.html)
+ * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+ * [Report issues](https://github.com/symfony/symfony/issues) and
+   [send Pull Requests](https://github.com/symfony/symfony/pulls)
+   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/AssetMapper/Tests/AssetMapperCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/AssetMapperCompilerTest.php
new file mode 100644
index 0000000000000..8dfdfd1fe04c2
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/AssetMapperCompilerTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\AssetMapper\AssetMapperCompiler;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\Compiler\AssetCompilerInterface;
+use Symfony\Component\AssetMapper\MappedAsset;
+
+class AssetMapperCompilerTest extends TestCase
+{
+    public function testCompile()
+    {
+        $compiler1 = new class() implements AssetCompilerInterface {
+            public function supports(MappedAsset $asset): bool
+            {
+                return 'text/css' === $asset->getMimeType();
+            }
+
+            public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
+            {
+                return 'should_not_be_called';
+            }
+        };
+
+        $compiler2 = new class() implements AssetCompilerInterface {
+            public function supports(MappedAsset $asset): bool
+            {
+                return 'application/javascript' === $asset->getMimeType();
+            }
+
+            public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
+            {
+                return $content.' compiler2 called';
+            }
+        };
+
+        $compiler3 = new class() implements AssetCompilerInterface {
+            public function supports(MappedAsset $asset): bool
+            {
+                return 'application/javascript' === $asset->getMimeType();
+            }
+
+            public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
+            {
+                return $content.' compiler3 called';
+            }
+        };
+
+        $compiler = new AssetMapperCompiler([$compiler1, $compiler2, $compiler3]);
+        $asset = new MappedAsset('foo.js');
+        $asset->setMimeType('application/javascript');
+        $actualContents = $compiler->compile('starting contents', $asset, $this->createMock(AssetMapperInterface::class));
+        $this->assertSame('starting contents compiler2 called compiler3 called', $actualContents);
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/AssetMapperDevServerSubscriberFunctionalTest.php b/src/Symfony/Component/AssetMapper/Tests/AssetMapperDevServerSubscriberFunctionalTest.php
new file mode 100644
index 0000000000000..aa95be6cce2f6
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/AssetMapperDevServerSubscriberFunctionalTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\AssetMapper\Tests\fixtures\AssetMapperTestAppKernel;
+
+class AssetMapperDevServerSubscriberFunctionalTest extends WebTestCase
+{
+    public function testGettingAssetWorks()
+    {
+        $client = static::createClient();
+
+        $client->request('GET', '/assets/file1-b3445cb7a86a0795a7af7f2004498aef.css');
+        $response = $client->getResponse();
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame(<<<EOF
+        /* file1.css */
+        body {}
+
+        EOF, $response->getContent());
+        $this->assertSame('"b3445cb7a86a0795a7af7f2004498aef"', $response->headers->get('ETag'));
+        $this->assertSame('immutable, max-age=604800, public', $response->headers->get('Cache-Control'));
+    }
+
+    public function test404OnUnknownAsset()
+    {
+        $client = static::createClient();
+
+        $client->request('GET', '/assets/unknown.css');
+        $response = $client->getResponse();
+        $this->assertSame(404, $response->getStatusCode());
+    }
+
+    public function test404OnInvalidDigest()
+    {
+        $client = static::createClient();
+
+        $client->request('GET', '/assets/file1-fakedigest.css');
+        $response = $client->getResponse();
+        $this->assertSame(404, $response->getStatusCode());
+        $this->assertStringContainsString('Asset &quot;file1.css&quot; was found but the digest does not match.', $response->getContent());
+    }
+
+    public function testPreDigestedAssetIsReturned()
+    {
+        $client = static::createClient();
+
+        $client->request('GET', '/assets/already-abcdefVWXYZ0123456789.digested.css');
+        $response = $client->getResponse();
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame(<<<EOF
+        /* already-abcdefVWXYZ0123456789.digested.css */
+        body {}
+
+        EOF, $response->getContent());
+    }
+
+    protected static function getKernelClass(): string
+    {
+        return AssetMapperTestAppKernel::class;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/AssetMapperRepositoryTest.php b/src/Symfony/Component/AssetMapper/Tests/AssetMapperRepositoryTest.php
new file mode 100644
index 0000000000000..f2110f1e2a2a6
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/AssetMapperRepositoryTest.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\AssetMapper\AssetMapperRepository;
+
+class AssetMapperRepositoryTest extends TestCase
+{
+    public function testFindWithAbsolutePaths()
+    {
+        $repository = new AssetMapperRepository([
+            __DIR__.'/fixtures/dir1' => '',
+            __DIR__.'/fixtures/dir2' => '',
+        ], __DIR__);
+
+        $this->assertSame(__DIR__.'/fixtures/dir1/file1.css', $repository->find('file1.css'));
+        $this->assertSame(__DIR__.'/fixtures/dir2/file4.js', $repository->find('file4.js'));
+        $this->assertSame(__DIR__.'/fixtures/dir2/subdir/file5.js', $repository->find('subdir/file5.js'));
+        $this->assertNull($repository->find('file5.css'));
+    }
+
+    public function testFindWithRelativePaths()
+    {
+        $repository = new AssetMapperRepository([
+            'dir1' => '',
+            'dir2' => '',
+        ], __DIR__.'/fixtures');
+
+        $this->assertSame(__DIR__.'/fixtures/dir1/file1.css', $repository->find('file1.css'));
+        $this->assertSame(__DIR__.'/fixtures/dir2/file4.js', $repository->find('file4.js'));
+        $this->assertSame(__DIR__.'/fixtures/dir2/subdir/file5.js', $repository->find('subdir/file5.js'));
+        $this->assertNull($repository->find('file5.css'));
+    }
+
+    public function testFindWithNamespaces()
+    {
+        $repository = new AssetMapperRepository([
+            'dir1' => 'dir1_namespace',
+            'dir2' => 'dir2_namespace',
+        ], __DIR__.'/fixtures');
+
+        $this->assertSame(__DIR__.'/fixtures/dir1/file1.css', $repository->find('dir1_namespace/file1.css'));
+        $this->assertSame(__DIR__.'/fixtures/dir2/file4.js', $repository->find('dir2_namespace/file4.js'));
+        $this->assertSame(__DIR__.'/fixtures/dir2/subdir/file5.js', $repository->find('dir2_namespace/subdir/file5.js'));
+        // non-namespaced path does not work
+        $this->assertNull($repository->find('file4.js'));
+    }
+
+    public function testFindLogicalPath()
+    {
+        $repository = new AssetMapperRepository([
+            'dir1' => '',
+            'dir2' => '',
+        ], __DIR__.'/fixtures');
+        $this->assertSame('subdir/file5.js', $repository->findLogicalPath(__DIR__.'/fixtures/dir2/subdir/file5.js'));
+    }
+
+    public function testAll()
+    {
+        $repository = new AssetMapperRepository([
+            'dir1' => '',
+            'dir2' => '',
+            'dir3' => '',
+        ], __DIR__.'/fixtures');
+
+        $actualAllAssets = $repository->all();
+        $this->assertCount(8, $actualAllAssets);
+
+        // use realpath to normalize slashes on Windows for comparison
+        $expectedAllAssets = array_map('realpath', [
+            'file1.css' => __DIR__.'/fixtures/dir1/file1.css',
+            'file2.js' => __DIR__.'/fixtures/dir1/file2.js',
+            'already-abcdefVWXYZ0123456789.digested.css' => __DIR__.'/fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css',
+            'file3.css' => __DIR__.'/fixtures/dir2/file3.css',
+            'file4.js' => __DIR__.'/fixtures/dir2/file4.js',
+            'subdir'.DIRECTORY_SEPARATOR.'file5.js' => __DIR__.'/fixtures/dir2/subdir/file5.js',
+            'subdir'.DIRECTORY_SEPARATOR.'file6.js' => __DIR__.'/fixtures/dir2/subdir/file6.js',
+            'test.gif.foo' => __DIR__.'/fixtures/dir3/test.gif.foo',
+        ]);
+        $this->assertEquals($expectedAllAssets, array_map('realpath', $actualAllAssets));
+    }
+
+    public function testAllWithNamespaces()
+    {
+        $repository = new AssetMapperRepository([
+            'dir1' => 'dir1_namespace',
+            'dir2' => 'dir2_namespace',
+            'dir3' => 'dir3_namespace',
+        ], __DIR__.'/fixtures');
+
+        $expectedAllAssets = [
+            'dir1_namespace/file1.css' => __DIR__.'/fixtures/dir1/file1.css',
+            'dir1_namespace/file2.js' => __DIR__.'/fixtures/dir1/file2.js',
+            'dir2_namespace/already-abcdefVWXYZ0123456789.digested.css' => __DIR__.'/fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css',
+            'dir2_namespace/file3.css' => __DIR__.'/fixtures/dir2/file3.css',
+            'dir2_namespace/file4.js' => __DIR__.'/fixtures/dir2/file4.js',
+            'dir2_namespace/subdir/file5.js' => __DIR__.'/fixtures/dir2/subdir/file5.js',
+            'dir2_namespace/subdir/file6.js' => __DIR__.'/fixtures/dir2/subdir/file6.js',
+            'dir3_namespace/test.gif.foo' => __DIR__.'/fixtures/dir3/test.gif.foo',
+        ];
+
+        $normalizedExpectedAllAssets = [];
+        foreach ($expectedAllAssets as $key => $val) {
+            $normalizedExpectedAllAssets[str_replace('/', DIRECTORY_SEPARATOR, $key)] = realpath($val);
+        }
+
+        $actualAssets = $repository->all();
+        $normalizedActualAssets = [];
+        foreach ($actualAssets as $key => $val) {
+            $normalizedActualAssets[str_replace('/', DIRECTORY_SEPARATOR, $key)] = realpath($val);
+        }
+
+        $this->assertEquals($normalizedExpectedAllAssets, $normalizedActualAssets);
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/AssetMapperTest.php b/src/Symfony/Component/AssetMapper/Tests/AssetMapperTest.php
new file mode 100644
index 0000000000000..79cf7267135fd
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/AssetMapperTest.php
@@ -0,0 +1,227 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\AssetMapper\AssetMapper;
+use Symfony\Component\AssetMapper\AssetMapperCompiler;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\AssetMapperRepository;
+use Symfony\Component\AssetMapper\Compiler\AssetCompilerInterface;
+use Symfony\Component\AssetMapper\Compiler\CssAssetUrlCompiler;
+use Symfony\Component\AssetMapper\Compiler\JavaScriptImportPathCompiler;
+use Symfony\Component\AssetMapper\MappedAsset;
+
+class AssetMapperTest extends TestCase
+{
+    public function testGetPublicPrefix()
+    {
+        $assetMapper = new AssetMapper(
+            $this->createMock(AssetMapperRepository::class),
+            $this->createMock(AssetMapperCompiler::class),
+            '/projectRootDir/',
+            '/publicPrefix/',
+            'publicDirName',
+        );
+        $this->assertSame('/publicPrefix/', $assetMapper->getPublicPrefix());
+
+        $assetMapper = new AssetMapper(
+            $this->createMock(AssetMapperRepository::class),
+            $this->createMock(AssetMapperCompiler::class),
+            '/projectRootDir/',
+            '/publicPrefix',
+            'publicDirName',
+        );
+        // The trailing slash should be added automatically
+        $this->assertSame('/publicPrefix/', $assetMapper->getPublicPrefix());
+    }
+
+    public function testGetPublicAssetsFilesystemPath()
+    {
+        $assetMapper = new AssetMapper(
+            $this->createMock(AssetMapperRepository::class),
+            $this->createMock(AssetMapperCompiler::class),
+            '/projectRootDir/',
+            '/publicPrefix/',
+            'publicDirName',
+        );
+        $this->assertSame('/projectRootDir/publicDirName/publicPrefix', $assetMapper->getPublicAssetsFilesystemPath());
+    }
+
+    public function testGetAsset()
+    {
+        $assetMapper = $this->createAssetMapper();
+        $this->assertNull($assetMapper->getAsset('non-existent.js'));
+
+        $asset = $assetMapper->getAsset('file2.js');
+        $this->assertSame('file2.js', $asset->logicalPath);
+        $this->assertMatchesRegularExpression('/^\/final-assets\/file2-[a-zA-Z0-9]{7,128}\.js$/', $asset->getPublicPath());
+    }
+
+    public function testGetAssetRespectsPreDigestedPaths()
+    {
+        $assetMapper = $this->createAssetMapper();
+        $asset = $assetMapper->getAsset('already-abcdefVWXYZ0123456789.digested.css');
+        $this->assertSame('already-abcdefVWXYZ0123456789.digested.css', $asset->logicalPath);
+        $this->assertSame('/final-assets/already-abcdefVWXYZ0123456789.digested.css', $asset->getPublicPath());
+    }
+
+    public function testGetAssetUsesManifestIfAvailable()
+    {
+        $assetMapper = $this->createAssetMapper();
+        $asset = $assetMapper->getAsset('file4.js');
+        $this->assertSame('/final-assets/file4.checksumfrommanifest.js', $asset->getPublicPath());
+    }
+
+    public function testGetPublicPath()
+    {
+        $assetMapper = $this->createAssetMapper();
+        $this->assertSame('/final-assets/file1-b3445cb7a86a0795a7af7f2004498aef.css', $assetMapper->getPublicPath('file1.css'));
+
+        // check the manifest is used
+        $this->assertSame('/final-assets/file4.checksumfrommanifest.js', $assetMapper->getPublicPath('file4.js'));
+    }
+
+    public function testAllAssets()
+    {
+        $assetMapper = $this->createAssetMapper();
+        $assets = $assetMapper->allAssets();
+        $this->assertCount(8, $assets);
+        $this->assertInstanceOf(MappedAsset::class, $assets[0]);
+    }
+
+    public function testGetAssetFromFilesystemPath()
+    {
+        $assetMapper = $this->createAssetMapper();
+        $asset = $assetMapper->getAssetFromSourcePath(__DIR__.'/fixtures/dir1/file1.css');
+        $this->assertSame('file1.css', $asset->logicalPath);
+    }
+
+    public function testGetAssetWithContentBasic()
+    {
+        $assetMapper = $this->createAssetMapper();
+        $expected = <<<EOF
+        /* file1.css */
+        body {}
+
+        EOF;
+
+        $asset = $assetMapper->getAsset('file1.css');
+        $this->assertSame($expected, $asset->getContent());
+
+        // verify internal caching doesn't cause issues
+        $asset = $assetMapper->getAsset('file1.css');
+        $this->assertSame($expected, $asset->getContent());
+    }
+
+    public function testGetAssetWithContentUsesCompilers()
+    {
+        $assetMapper = $this->createAssetMapper();
+        $expected = <<<EOF
+        import '../file4.js';
+        console.log('file5.js');
+
+        EOF;
+
+        $asset = $assetMapper->getAsset('subdir/file5.js');
+        $this->assertSame($expected, $asset->getContent());
+    }
+
+    public function testGetAssetWithContentErrorsOnCircularReferences()
+    {
+        $assetMapper = $this->createAssetMapper('circular_dir');
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Circular reference detected while creating asset for "circular1.css": "circular1.css -> circular2.css -> circular1.css".');
+        $assetMapper->getAsset('circular1.css');
+    }
+
+    public function testGetAssetWithDigest()
+    {
+        $file6Compiler = new class() implements AssetCompilerInterface {
+            public function supports(MappedAsset $asset): bool
+            {
+                return true;
+            }
+
+            public function compile(string $content, MappedAsset $asset, AssetMapperInterface $assetMapper): string
+            {
+                if ('subdir/file6.js' === $asset->logicalPath) {
+                    return $content.'/* compiled */';
+                }
+
+                return $content;
+            }
+        };
+
+        $assetMapper = $this->createAssetMapper();
+        $asset = $assetMapper->getAsset('subdir/file6.js');
+        $this->assertSame('7f983f4053a57f07551fed6099c0da4e', $asset->getDigest());
+        $this->assertFalse($asset->isPredigested());
+
+        // trigger the compiler, which will change file5.js
+        // since file6.js imports file5.js, the digest for file6 should change,
+        // because, internally, the file path in file6.js to file5.js will need to change
+        $assetMapper = $this->createAssetMapper(null, $file6Compiler);
+        $asset = $assetMapper->getAsset('subdir/file6.js');
+        $this->assertSame('7e4f24ebddd4ab2a3bcf0d89270b9f30', $asset->getDigest());
+    }
+
+    public function testGetAssetWithPredigested()
+    {
+        $assetMapper = $this->createAssetMapper();
+        $asset = $assetMapper->getAsset('already-abcdefVWXYZ0123456789.digested.css');
+        $this->assertSame('abcdefVWXYZ0123456789.digested', $asset->getDigest());
+        $this->assertTrue($asset->isPredigested());
+    }
+
+    public function testGetAssetWithMimeType()
+    {
+        $assetMapper = $this->createAssetMapper();
+        $file1Asset = $assetMapper->getAsset('file1.css');
+        $this->assertSame('text/css', $file1Asset->getMimeType());
+        $file2Asset = $assetMapper->getAsset('file2.js');
+        $this->assertSame('text/javascript', $file2Asset->getMimeType());
+        // an extension not in the known extensions
+        $testAsset = $assetMapper->getAsset('test.gif.foo');
+        $this->assertSame('image/gif', $testAsset->getMimeType());
+    }
+
+    private function createAssetMapper(string $extraDir = null, AssetCompilerInterface $extraCompiler = null): AssetMapper
+    {
+        $dirs = ['dir1' => '', 'dir2' => '', 'dir3' => ''];
+        if ($extraDir) {
+            $dirs[$extraDir] = '';
+        }
+        $repository = new AssetMapperRepository($dirs, __DIR__.'/fixtures');
+
+        $compilers = [
+            new JavaScriptImportPathCompiler(),
+            new CssAssetUrlCompiler(),
+        ];
+        if ($extraCompiler) {
+            $compilers[] = $extraCompiler;
+        }
+        $compiler = new AssetMapperCompiler($compilers);
+        $extensions = [
+            'foo' => 'image/gif',
+        ];
+
+        return new AssetMapper(
+            $repository,
+            $compiler,
+            __DIR__.'/fixtures',
+            '/final-assets/',
+            'test_public',
+            $extensions,
+        );
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/Command/AssetsMapperCompileCommandTest.php b/src/Symfony/Component/AssetMapper/Tests/Command/AssetsMapperCompileCommandTest.php
new file mode 100644
index 0000000000000..3bbaac82d723e
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/Command/AssetsMapperCompileCommandTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Tests\Command\AssetsMapperCompileCommand\Fixture\TestAppKernel;
+use Symfony\Component\AssetMapper\Tests\fixtures\AssetMapperTestAppKernel;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Finder\Finder;
+
+class AssetsMapperCompileCommandTest extends TestCase
+{
+    private AssetMapperTestAppKernel $kernel;
+    private Filesystem $filesystem;
+
+    protected function setUp(): void
+    {
+        $this->filesystem = new Filesystem();
+        $this->kernel = new AssetMapperTestAppKernel('test', true);
+        $this->filesystem->mkdir($this->kernel->getProjectDir().'/public');
+    }
+
+    protected function tearDown(): void
+    {
+        $this->filesystem->remove($this->kernel->getProjectDir().'/public');
+        $this->filesystem->remove($this->kernel->getProjectDir().'/var');
+    }
+
+    public function testAssetsAreCompiled()
+    {
+        $application = new Application($this->kernel);
+
+        $command = $application->find('assetmap:compile');
+        $tester = new CommandTester($command);
+        $res = $tester->execute([]);
+        $this->assertSame(0, $res);
+        // match Compiling \d+ assets
+        $this->assertMatchesRegularExpression('/Compiling \d+ assets/', $tester->getDisplay());
+
+        $targetBuildDir = $this->kernel->getProjectDir().'/public/assets';
+        $this->assertFileExists($targetBuildDir.'/subdir/file5-f4fdc37375c7f5f2629c5659a0579967.js');
+        $this->assertSame(<<<EOF
+   
10000
     import '../file4.js';
+        console.log('file5.js');
+
+        EOF, file_get_contents($targetBuildDir.'/subdir/file5-f4fdc37375c7f5f2629c5659a0579967.js'));
+
+        $finder = new Finder();
+        $finder->in($targetBuildDir)->files();
+        $this->assertCount(9, $finder);
+        $this->assertFileExists($targetBuildDir.'/manifest.json');
+        $this->assertFileExists($targetBuildDir.'/importmap.json');
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/AssetCompilerPathResolverTraitTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/AssetCompilerPathResolverTraitTest.php
new file mode 100644
index 0000000000000..bb25bdbcd2aef
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/Compiler/AssetCompilerPathResolverTraitTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Asset\Exception\RuntimeException;
+use Symfony\Component\AssetMapper\Compiler\AssetCompilerPathResolverTrait;
+
+class AssetCompilerPathResolverTraitTest extends TestCase
+{
+    /**
+     * @dataProvider provideCompileTests
+     */
+    public function testResolvePath(string $directory, string $filename, string $expectedPath)
+    {
+        $resolver = new StubTestAssetCompilerPathResolver();
+        $this->assertSame($expectedPath, $resolver->doResolvePath($directory, $filename));
+    }
+
+    public static function provideCompileTests(): iterable
+    {
+        yield 'simple_empty_directory' => [
+            'directory' => '',
+            'input' => 'other.js',
+            'expectedOutput' => 'other.js',
+        ];
+
+        yield 'single_dot' => [
+            'directory' => 'subdir',
+            'input' => './other.js',
+            'expectedOutput' => 'subdir/other.js',
+        ];
+
+        yield 'double_dot' => [
+            'directory' => 'subdir',
+            'input' => '../other.js',
+            'expectedOutput' => 'other.js',
+        ];
+
+        yield 'mixture_of_dots' => [
+            'directory' => 'subdir/another-dir/third-dir',
+            'input' => './.././../other.js',
+            'expectedOutput' => 'subdir/other.js',
+        ];
+    }
+
+    public function testExceptionIfPathGoesAboveDirectory()
+    {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Cannot import the file "../../other.js": it is outside the current "subdir" directory.');
+
+        $resolver = new StubTestAssetCompilerPathResolver();
+        $resolver->doResolvePath('subdir', '../../other.js');
+    }
+}
+
+class StubTestAssetCompilerPathResolver
+{
+    use AssetCompilerPathResolverTrait;
+
+    public function doResolvePath(string $directory, string $filename): string
+    {
+        return $this->resolvePath($directory, $filename);
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/CssAssetUrlCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/CssAssetUrlCompilerTest.php
new file mode 100644
index 0000000000000..e4e2ce3a8bdcd
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/Compiler/CssAssetUrlCompilerTest.php
@@ -0,0 +1,171 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\AssetMapper\AssetDependency;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\Compiler\CssAssetUrlCompiler;
+use Symfony\Component\AssetMapper\MappedAsset;
+
+class CssAssetUrlCompilerTest extends TestCase
+{
+    /**
+     * @dataProvider provideCompileTests
+     */
+    public function testCompile(string $sourceLogicalName, string $input, string $expectedOutput, array $expectedDependencies)
+    {
+        $compiler = new CssAssetUrlCompiler(false);
+        $asset = new MappedAsset($sourceLogicalName);
+        $this->assertSame($expectedOutput, $compiler->compile($input, $asset, $this->createAssetMapper()));
+        $assetDependencyLogicalPaths = array_map(fn (AssetDependency $dependency) => $dependency->asset->logicalPath, $asset->getDependencies());
+        $this->assertSame($expectedDependencies, $assetDependencyLogicalPaths);
+    }
+
+    public static function provideCompileTests(): iterable
+    {
+        yield 'simple_double_quotes' => [
+            'sourceLogicalName' => 'styles.css',
+            'input' => 'body { background: url("images/foo.png"); }',
+            'expectedOutput' => 'body { background: url("/assets/images/foo.123456.png"); }',
+            'expectedDependencies' => ['images/foo.png'],
+        ];
+
+        yield 'simple_multiline' => [
+            'sourceLogicalName' => 'styles.css',
+            'input' => <<<EOF
+                body {
+                    background: url("images/foo.png");
+                }
+                EOF
+            ,
+            'expectedOutput' => <<<EOF
+                body {
+                    background: url("/assets/images/foo.123456.png");
+                }
+                EOF
+            ,
+            'expectedDependencies' => ['images/foo.png'],
+        ];
+
+        yield 'simple_single_quotes' => [
+            'sourceLogicalName' => 'styles.css',
+            'input' => 'body { background: url(\'images/foo.png\'); }',
+            'expectedOutput' => 'body { background: url("/assets/images/foo.123456.png"); }',
+            'expectedDependencies' => ['images/foo.png'],
+        ];
+
+        yield 'simple_no_quotes' => [
+            'sourceLogicalName' => 'styles.css',
+            'input' => 'body { background: url(images/foo.png); }',
+            'expectedOutput' => 'body { background: url("/assets/images/foo.123456.png"); }',
+            'expectedDependencies' => ['images/foo.png'],
+        ];
+
+        yield 'import_other_css_file' => [
+            'sourceLogicalName' => 'styles.css',
+            'input' => '@import url(more-styles.css)',
+            'expectedOutput' => '@import url("/assets/more-styles.abcd123.css")',
+            'expectedDependencies' => ['more-styles.css'],
+        ];
+
+        yield 'move_up_a_directory' => [
+            'sourceLogicalName' => 'styles/app.css',
+            'input' => 'body { background: url("../images/foo.png"); }',
+            'expectedOutput' => 'body { background: url("/assets/images/foo.123456.png"); }',
+            'expectedDependencies' => ['images/foo.png'],
+        ];
+
+        yield 'path_not_found_left_alone' => [
+            'sourceLogicalName' => 'styles/app.css',
+            'input' => 'body { background: url("../images/bar.png"); }',
+            'expectedOutput' => 'body { background: url("../images/bar.png"); }',
+            'expectedDependencies' => [],
+        ];
+
+        yield 'absolute_paths_left_alone' => [
+            'sourceLogicalName' => 'styles/app.css',
+            'input' => 'body { background: url("https://cdn.io/images/bar.png"); }',
+            'expectedOutput' => 'body { background: url("https://cdn.io/images/bar.png"); }',
+            'expectedDependencies' => [],
+        ];
+    }
+
+    /**
+     * @dataProvider provideStrictModeTests
+     */
+    public function testStrictMode(string $sourceLogicalName, string $input, ?string $expectedExceptionMessage)
+    {
+        if (null !== $expectedExceptionMessage) {
+            $this->expectException(\RuntimeException::class);
+            $this->expectExceptionMessage($expectedExceptionMessage);
+        }
+
+        $asset = new MappedAsset($sourceLogicalName);
+        $asset->setSourcePath('/path/to/styles.css');
+
+        $compiler = new CssAssetUrlCompiler(true);
+        $this->assertSame($input, $compiler->compile($input, $asset, $this->createAssetMapper()));
+    }
+
+    public static function provideStrictModeTests(): iterable
+    {
+        yield 'importing_non_existent_file_throws_exception' => [
+            'sourceLogicalName' => 'styles.css',
+            'input' => '@import url(non-existent.css)',
+            'expectedExceptionMessage' => 'Unable to find asset "non-existent.css" referenced in "/path/to/styles.css".',
+        ];
+
+        yield 'importing_absolute_file_path_is_ignored' => [
+            'sourceLogicalName' => 'styles.css',
+            'input' => '@import url(/path/to/non-existent.css)',
+            'expectedExceptionMessage' => null,
+        ];
+
+        yield 'importing_a_url_is_ignored' => [
+            'sourceLogicalName' => 'styles.css',
+            'input' => '@import url(https://cdn.io/non-existent.css)',
+            'expectedExceptionMessage' => null,
+        ];
+
+        yield 'importing_a_data_uri_is_ignored' => [
+            'sourceLogicalName' => 'styles.css',
+            'input' => "background-image: url(\'data:image/png;base64,iVBORw0KG\')",
+            'expectedExceptionMessage' => null,
+        ];
+    }
+
+    private function createAssetMapper(): AssetMapperInterface
+    {
+        $assetMapper = $this->createMock(AssetMapperInterface::class);
+        $assetMapper->expects($this->any())
+            ->method('getAsset')
+            ->willReturnCallback(function ($path) {
+                switch ($path) {
+                    case 'images/foo.png':
+                        $asset = new MappedAsset('images/foo.png');
+                        $asset->setPublicPath('/assets/images/foo.123456.png');
+
+                        return $asset;
+                    case 'more-styles.css':
+                        $asset = new MappedAsset('more-styles.css');
+                        $asset->setPublicPath('/assets/more-styles.abcd123.css');
+
+                        return $asset;
+                    default:
+                        return null;
+                }
+            });
+
+        return $assetMapper;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
new file mode 100644
index 0000000000000..da34a4ef5a8ec
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/Compiler/JavaScriptImportPathCompilerTest.php
@@ -0,0 +1,237 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\Compiler\JavaScriptImportPathCompiler;
+use Symfony\Component\AssetMapper\MappedAsset;
+
+class JavaScriptImportPathCompilerTest extends TestCase
+{
+    /**
+     * @dataProvider provideCompileTests
+     */
+    public function testCompile(string $sourceLogicalName, string $input, array $expectedDependencies)
+    {
+        $asset = new MappedAsset($sourceLogicalName);
+
+        $compiler = new JavaScriptImportPathCompiler(false);
+        // compile - and check that content doesn't change
+        $this->assertSame($input, $compiler->compile($input, $asset, $this->createAssetMapper()));
+        $actualDependencies = [];
+        foreach ($asset->getDependencies() as $dependency) {
+            $actualDependencies[$dependency->asset->logicalPath] = $dependency->isLazy;
+        }
+        $this->assertEquals($expectedDependencies, $actualDependencies);
+    }
+
+    public static function provideCompileTests(): iterable
+    {
+        yield 'dynamic_simple_double_quotes' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => 'import("./other.js");',
+            'expectedDependencies' => ['other.js' => true]
+        ];
+
+        yield 'dynamic_simple_multiline' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => <<<EOF
+                const fun;
+                import("./other.js");
+                EOF
+            ,
+            'expectedDependencies' => ['other.js' => true]
+        ];
+
+        yield 'dynamic_simple_single_quotes' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => 'import(\'./other.js\');',
+            'expectedDependencies' => ['other.js' => true]
+        ];
+
+        yield 'dynamic_simple_tick_quotes' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => 'import(`./other.js`);',
+            'expectedDependencies' => ['other.js' => true]
+        ];
+
+        yield 'dynamic_resolves_multiple' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => 'import("./other.js"); import("./subdir/foo.js");',
+            'expectedDependencies' => ['other.js' => true, 'subdir/foo.js' => true],
+        ];
+
+        yield 'dynamic_avoid_resolving_non_relative_imports' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => 'import("other.js");',
+            'expectedDependencies' => [],
+        ];
+
+        yield 'dynamic_resolves_dynamic_imports_later_in_file' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => "console.log('Hello test!');\n import('./subdir/foo.js').then(() => console.log('inside promise!'));",
+            'expectedDependencies' => ['subdir/foo.js' => true],
+        ];
+
+        yield 'dynamic_correctly_moves_to_higher_directories' => [
+            'sourceLogicalName' => 'subdir/app.js',
+            'input' => 'import("../other.js");',
+            'expectedDependencies' => ['other.js' => true],
+        ];
+
+        yield 'static_named_import_double_quotes' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => 'import { myFunction } from "./other.js";',
+            'expectedDependencies' => ['other.js' => false],
+        ];
+
+        yield 'static_named_import_single_quotes' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => 'import { myFunction } from \'./other.js\';',
+            'expectedDependencies' => ['other.js' => false],
+        ];
+
+        yield 'static_default_import' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => 'import myFunction from "./other.js";',
+            'expectedDependencies' => ['other.js' => false],
+        ];
+
+        yield 'static_default_and_named_import' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => 'import myFunction, { helperFunction } from "./other.js";',
+            'expectedDependencies' => ['other.js' => false],
+        ];
+
+        yield 'static_import_everything' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => 'import * as myModule from "./other.js";',
+            'expectedDependencies' => ['other.js' => false],
+        ];
+
+        yield 'static_import_just_for_side_effects' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => 'import "./other.js";',
+            'expectedDependencies' => ['other.js' => false],
+        ];
+
+        yield 'mix_of_static_and_dynamic_imports' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => 'import "./other.js"; import("./subdir/foo.js");',
+            'expectedDependencies' => ['other.js' => false, 'subdir/foo.js' => true],
+        ];
+
+        yield 'extra_import_word_does_not_cause_issues' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => "// about to do an import\nimport('./other.js');",
+            'expectedDependencies' => ['other.js' => true],
+        ];
+
+        yield 'import_on_one_line_then_module_name_on_next_is_ok' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => "import \n    './other.js';",
+            'expectedDependencies' => ['other.js' => false],
+        ];
+
+        yield 'importing_a_css_file_is_not_included' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => "import './styles.css';",
+            'expectedDependencies' => [],
+        ];
+
+        yield 'importing_non_existent_file_without_strict_mode_is_ignored' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => "import './non-existent.js';",
+            'expectedDependencies' => [],
+        ];
+    }
+
+    /**
+     * @dataProvider provideStrictModeTests
+     */
+    public function testStrictMode(string $sourceLogicalName, string $input, ?string $expectedExceptionMessage)
+    {
+        if (null !== $expectedExceptionMessage) {
+            $this->expectException(\RuntimeException::class);
+            $this->expectExceptionMessage($expectedExceptionMessage);
+        }
+
+        $asset = new MappedAsset($sourceLogicalName);
+        $asset->setSourcePath('/path/to/app.js');
+
+        $compiler = new JavaScriptImportPathCompiler(true);
+        $this->assertSame($input, $compiler->compile($input, $asset, $this->createAssetMapper()));
+    }
+
+    public static function provideStrictModeTests(): iterable
+    {
+        yield 'importing_non_existent_file_throws_exception' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => "import './non-existent.js';",
+            'expectedExceptionMessage' => 'Unable to find asset "non-existent.js" imported from "/path/to/app.js".',
+        ];
+
+        yield 'importing_file_just_missing_js_extension_adds_extra_info' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => "import './other';",
+            'expectedExceptionMessage' => 'Unable to find asset "other" imported from "/path/to/app.js". Try adding ".js" to the end of the import - i.e. "other.js".',
+        ];
+
+        yield 'importing_absolute_file_path_is_ignored' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => "import '/path/to/other.js';",
+            'expectedExceptionMessage' => null,
+        ];
+
+        yield 'importing_a_url_is_ignored' => [
+            'sourceLogicalName' => 'app.js',
+            'input' => "import 'https://example.com/other.js';",
+            'expectedExceptionMessage' => null,
+        ];
+    }
+
+    private function createAssetMapper(): AssetMapperInterface
+    {
+        $assetMapper = $this->createMock(AssetMapperInterface::class);
+        $assetMapper->expects($this->any())
+            ->method('getAsset')
+            ->willReturnCallback(function ($path) {
+                switch ($path) {
+                    case 'other.js':
+                        $asset = new MappedAsset('other.js');
+                        $asset->setMimeType('application/javascript');
+
+                        return $asset;
+                    case 'subdir/foo.js':
+                        $asset = new MappedAsset('subdir/foo.js');
+                        $asset->setMimeType('text/javascript');
+
+                        return $asset;
+                    case 'dir_with_index/index.js':
+                        $asset = new MappedAsset('dir_with_index/index.js');
+                        $asset->setMimeType('text/javascript');
+
+                        return $asset;
+                    case 'styles.css':
+                        $asset = new MappedAsset('styles.css');
+                        $asset->setMimeType('text/css');
+
+                        return $asset;
+                    default:
+                        return null;
+                }
+            });
+
+        return $assetMapper;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/Compiler/SourceMappingUrlsCompilerTest.php b/src/Symfony/Component/AssetMapper/Tests/Compiler/SourceMappingUrlsCompilerTest.php
new file mode 100644
index 0000000000000..838b3d90d97d0
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/Compiler/SourceMappingUrlsCompilerTest.php
@@ -0,0 +1,148 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\AssetMapper\AssetDependency;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\Compiler\SourceMappingUrlsCompiler;
+use Symfony\Component\AssetMapper\MappedAsset;
+
+class SourceMappingUrlsCompilerTest extends TestCase
+{
+    /**
+     * @dataProvider provideCompileTests
+     */
+    public function testCompile(string $sourceLogicalName, string $input, string $expectedOutput, $expectedDependencies)
+    {
+        $assetMapper = $this->createMock(AssetMapperInterface::class);
+        $assetMapper->expects($this->any())
+            ->method('getAsset')
+            ->willReturnCallback(function ($path) {
+                switch ($path) {
+                    case 'foo.js.map':
+                        $asset = new MappedAsset('foo.js.map');
+                        $asset->setPublicPath('/assets/foo.123456.js.map');
+
+                        return $asset;
+                    case 'styles/bar.css.map':
+                        $asset = new MappedAsset('styles/bar.css.map');
+                        $asset->setPublicPath('/assets/styles/bar.abcd123.css.map');
+
+                        return $asset;
+                    default:
+                        return null;
+                }
+            });
+
+        $compiler = new SourceMappingUrlsCompiler();
+        $asset = new MappedAsset($sourceLogicalName);
+        $this->assertSame($expectedOutput, $compiler->compile($input, $asset, $assetMapper));
+        $assetDependencyLogicalPaths = array_map(fn (AssetDependency $dependency) => $dependency->asset->logicalPath, $asset->getDependencies());
+        $this->assertSame($expectedDependencies, $assetDependencyLogicalPaths);
+    }
+
+    public static function provideCompileTests(): iterable
+    {
+        yield 'js_simple_sourcemap' => [
+            'sourceLogicalName' => 'foo.js',
+            'input' => <<<EOF
+                var fun;
+                //# sourceMappingURL=foo.js.map
+                EOF
+            ,
+            'expectedOutput' => <<<EOF
+                var fun;
+                //# sourceMappingURL=/assets/foo.123456.js.map
+                EOF
+            ,
+            'expectedDependencies' => ['foo.js.map'],
+        ];
+
+        yield 'css_simple_sourcemap' => [
+            'sourceLogicalName' => 'styles/bar.css',
+            'input' => <<<EOF
+                .class { color: green; }
+                /*# sourceMappingURL=bar.css.map */
+                EOF
+            ,
+            'expectedOutput' => <<<EOF
+                .class { color: green; }
+                /*# sourceMappingURL=/assets/styles/bar.abcd123.css.map */
+                EOF
+            ,
+            'expectedDependencies' => ['styles/bar.css.map'],
+        ];
+
+        yield 'no_sourcemap_found' => [
+            'sourceLogicalName' => 'styles/bar.css',
+            'input' => <<<EOF
+                .class { color: green; }
+                EOF
+            ,
+            'expectedOutput' => <<<EOF
+                .class { color: green; }
+                EOF
+            ,
+            'expectedDependencies' => [],
+        ];
+
+        yield 'path_not_in_asset_mapper_is_left_alone' => [
+            'sourceLogicalName' => 'styles/bar.css',
+            'input' => <<<EOF
+                .class { color: green; }
+                /*# sourceMappingURL=unknown.css.map */
+                EOF
+            ,
+            'expectedOutput' => <<<EOF
+                .class { color: green; }
+                /*# sourceMappingURL=unknown.css.map */
+                EOF
+            ,
+            'expectedDependencies' => [],
+        ];
+
+        yield 'sourcemap_outside_of_comment_left_alone' => [
+            'sourceLogicalName' => 'styles/bar.css',
+            'input' => <<<EOF
+                .class::before {
+                  content: "# sourceMappingURL=sourceMappingURL-outside-comment.css.map";
+                }
+                EOF
+            ,
+            'expectedOutput' => <<<EOF
+                .class::before {
+                  content: "# sourceMappingURL=sourceMappingURL-outside-comment.css.map";
+                }
+                EOF
+            ,
+            'expectedDependencies' => [],
+        ];
+
+        yield 'sourcemap_not_at_start_of_line_left_alone' => [
+            'sourceLogicalName' => 'styles/bar.css',
+            'input' => <<<EOF
+                .class {
+                  color: green; /*# sourceMappingURL=sourceMappingURL-not-at-start.css.map */
+                }
+                EOF
+            ,
+            'expectedOutput' => <<<EOF
+                .class {
+                  color: green; /*# sourceMappingURL=sourceMappingURL-not-at-start.css.map */
+                }
+                EOF
+            ,
+            'expectedDependencies' => [],
+        ];
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php
new file mode 100644
index 0000000000000..4c75084c8681d
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php
@@ -0,0 +1,457 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests\ImportMap;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\AssetMapper\AssetMapper;
+use Symfony\Component\AssetMapper\AssetMapperCompiler;
+use Symfony\Component\AssetMapper\AssetMapperRepository;
+use Symfony\Component\AssetMapper\Compiler\JavaScriptImportPathCompiler;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\AssetMapper\ImportMap\PackageRequireOptions;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+
+class ImportMapManagerTest extends TestCase
+{
+    private MockHttpClient $httpClient;
+    private Filesystem $filesystem;
+
+
+    protected function setUp(): void
+    {
+        $this->filesystem = new Filesystem();
+        if (!file_exists(__DIR__ . '/../fixtures/importmaps_for_writing')) {
+            $this->filesystem->mkdir(__DIR__ . '/../fixtures/importmaps_for_writing');
+        }
+    }
+
+    protected function tearDown(): void
+    {
+        $this->filesystem->remove(__DIR__ . '/../fixtures/importmaps_for_writing');
+    }
+
+    public function testGetModulesToPreload()
+    {
+        $manager = $this->createImportMapManager(
+            ['assets' => '', 'assets2' => 'namespaced_assets2'],
+            __DIR__ . '/../fixtures/importmaps/'
+        );
+        $this->assertEquals([
+            'https://unpkg.com/@hotwired/stimulus@3.2.1/dist/stimulus.js',
+            '/assets/app-ea9ebe6156adc038aba53164e2be0867.js',
+            // these are non-lazily imported from app.js
+            '/assets/pizza/index-b3fb5ee31adaf5e1b32d28edf1ab8e7a.js',
+            '/assets/popcorn-c0778b84ef9893592385aebc95a2896e.js',
+        ], $manager->getModulesToPreload());
+    }
+
+    public function testGetImportMapJson()
+    {
+        $manager = $this->createImportMapManager(
+            ['assets' => '', 'assets2' => 'namespaced_assets2'],
+            __DIR__ . '/../fixtures/importmaps/'
+        );
+        $this->assertEquals(['imports' => [
+            '@hotwired/stimulus' => 'https://unpkg.com/@hotwired/stimulus@3.2.1/dist/stimulus.js',
+            'lodash' => '/assets/vendor/lodash-ad7bd7bf42edd09654255a82b9027810.js',
+            'app' => '/assets/app-ea9ebe6156adc038aba53164e2be0867.js',
+            '/assets/pizza/index.js' => '/assets/pizza/index-b3fb5ee31adaf5e1b32d28edf1ab8e7a.js',
+            '/assets/popcorn.js' => '/assets/popcorn-c0778b84ef9893592385aebc95a2896e.js',
+            '/assets/imported_async.js' => '/assets/imported_async-8f0cd418bfeb0cf63826e09a4474a81c.js',
+            'other_app' => '/assets/namespaced_assets2/app2-344d0d513d424647e7d8a394ffe5e4b5.js',
+        ]], json_decode($manager->getImportMapJson(), true));
+    }
+
+    public function testGetImportMapJsonUsesDumpedFile()
+    {
+        $manager = $this->createImportMapManager(
+            ['assets' => ''],
+            __DIR__ . '/../fixtures/',
+            '/final-assets',
+            'test_public'
+        );
+        $this->assertEquals(['imports' => [
+            '@hotwired/stimulus' => 'https://unpkg.com/@hotwired/stimulus@3.2.1/dist/stimulus.js',
+            'app' => '/assets/app-ea9ebe6156adc038aba53164e2be0867.js',
+        ]], json_decode($manager->getImportMapJson(), true));
+    }
+
+    /**
+     * @dataProvider getRequirePackageTests
+     */
+    public function testRequire(array $packages, array $expectedInstallRequest, array $responseMap, array $expectedImportMap, array $expectedDownloadedFiles)
+    {
+        $rootDir = __DIR__ . '/../fixtures/importmaps_for_writing';
+        $manager = $this->createImportMapManager(['assets' => ''], $rootDir);
+
+        $expectedRequestBody = [
+            'install' => $expectedInstallRequest,
+            'flattenScope' => true,
+            'env' => ['browser', 'module', 'production'],
+        ];
+        $responseData = [
+            'map' => [
+                'imports' => $responseMap,
+            ],
+        ];
+        $responses = [];
+        $responses[] = function ($method, $url, $options) use ($responseData, $expectedRequestBody) {
+            $this->assertSame('POST', $method);
+            $this->assertSame('https://example.com/generate', $url);
+            $this->assertSame($expectedRequestBody, json_decode($options['body'], true));
+
+            return new MockResponse(json_encode($responseData));
+        };
+        // mock the "file download" requests
+        foreach ($expectedDownloadedFiles as $file) {
+            $responses[] = new MockResponse(sprintf('contents of %s', $file));
+        }
+        $this->httpClient->setResponseFactory($responses);
+
+        $manager->require($packages);
+        $actualImportMap = require($rootDir.'/importmap.php');
+        $this->assertEquals($expectedImportMap, $actualImportMap);
+        foreach ($expectedDownloadedFiles as $file) {
+            $this->assertFileExists($rootDir.'/' . $file);
+            $actualContents = file_get_contents($rootDir.'/' . $file);
+            $this->assertSame(sprintf('contents of %s', $file), $actualContents);
+        }
+    }
+
+    public static function getRequirePackageTests(): iterable
+    {
+        yield 'require single lodash package' => [
+            'packages' => [new PackageRequireOptions('lodash')],
+            'expectedInstallRequest' => ['lodash'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            ],
+            'expectedImportMap' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                ]
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+
+        yield 'require two packages' => [
+            'packages' => [new PackageRequireOptions('lodash'), new PackageRequireOptions('cowsay')],
+            'expectedInstallRequest' => ['lodash', 'cowsay'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                'cowsay' => 'https://ga.jspm.io/npm:cowsay@4.5.6/cowsay.js',
+            ],
+            'expectedImportMap' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                ],
+                'cowsay' => [
+                    'url' => 'https://ga.jspm.io/npm:cowsay@4.5.6/cowsay.js',
+                ],
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+
+        yield  'single_package_that_returns_as_two' => [
+            'packages' => [new PackageRequireOptions('lodash')],
+            'expectedInstallRequest' => ['lodash'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                'lodash-dependency' => 'https://ga.jspm.io/npm:lodash-dependency@9.8.7/lodash-dependency.js',
+            ],
+            'expectedImportMap' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                ],
+                'lodash-dependency' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash-dependency@9.8.7/lodash-dependency.js',
+                ],
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+
+        yield 'single_package_with_version_constraint' => [
+            'packages' => [new PackageRequireOptions('lodash', '^1.2.3')],
+            'expectedInstallRequest' => ['lodash@^1.2.3'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.7/lodash.js',
+            ],
+            'expectedImportMap' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.7/lodash.js',
+                ],
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+
+        yield 'single_package_that_downloads' => [
+            'packages' => [new PackageRequireOptions('lodash', download: true)],
+            'expectedInstallRequest' => ['lodash'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            ],
+            'expectedImportMap' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                    'downloaded_to' => 'vendor/lodash.js',
+                ],
+            ],
+            'expectedDownloadedFiles' => [
+                'assets/vendor/lodash.js',
+            ],
+        ];
+
+        yield 'single_package_that_preloads' => [
+            'packages' => [new PackageRequireOptions('lodash', preload: true)],
+            'expectedInstallRequest' => ['lodash'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            ],
+            'expectedImportMap' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                    'preload' => true,
+                ],
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+
+        yield 'single_package_with_custom_import_name' => [
+            'packages' => [new PackageRequireOptions('lodash', importName: 'lodash-es')],
+            'expectedInstallRequest' => ['lodash'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            ],
+            'expectedImportMap' => [
+                'lodash-es' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                ],
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+
+        yield 'single_package_with_jspm_custom_registry' => [
+            'packages' => [new PackageRequireOptions('lodash', registryName: 'jspm')],
+            'expectedInstallRequest' => ['jspm:lodash'],
+            'responseMap' => [
+                'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            ],
+            'expectedImportMap' => [
+                'lodash' => [
+                    'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+                ],
+            ],
+            'expectedDownloadedFiles' => [],
+        ];
+    }
+
+    public function testRemove()
+    {
+        $rootDir = __DIR__ . '/../fixtures/importmaps_for_writing';
+        $manager = $this->createImportMapManager(['assets' => ''], $rootDir);
+
+        $map = [
+            'lodash' => [
+                'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            ],
+            'cowsay' => [
+                'url' => 'https://ga.jspm.io/npm:cowsay@4.5.6/cowsay.umd.js',
+                'downloaded_to' => 'vendor/moo.js',
+            ],
+            'chance' => [
+                'url' => 'https://ga.jspm.io/npm:chance@7.8.9/build/chance.js',
+                'downloaded_to' => 'vendor/chance.js',
+            ],
+            'app' => [
+                'path' => 'app.js',
+            ],
+            'other' => [
+                'path' => 'other.js',
+            ],
+        ];
+        $mapString = var_export($map, true);
+        file_put_contents($rootDir.'/importmap.php', "<?php\n\nreturn {$mapString};\n");
+        $this->filesystem->mkdir($rootDir.'/assets/vendor');
+        touch($rootDir.'/assets/vendor/moo.js');
+        touch($rootDir.'/assets/vendor/chance.js');
+        touch($rootDir.'/assets/app.js');
+        touch($rootDir.'/assets/other.js');
+
+        $manager->remove(['cowsay', 'app']);
+        $actualImportMap = require($rootDir.'/importmap.php');
+        $expectedImportMap = $map;
+        unset($expectedImportMap['cowsay'], $expectedImportMap['app']);
+        $this->assertEquals($expectedImportMap, $actualImportMap);
+        $this->assertFileDoesNotExist($rootDir.'/assets/vendor/moo.js');
+        $this->assertFileDoesNotExist($rootDir.'/assets/app.js');
+        $this->assertFileExists($rootDir.'/assets/vendor/chance.js');
+        $this->assertFileExists($rootDir.'/assets/other.js');
+    }
+
+    public function testUpdate()
+    {
+        $rootDir = __DIR__ . '/../fixtures/importmaps_for_writing';
+        $manager = $this->createImportMapManager(['assets' => ''], $rootDir);
+
+        $map = [
+            'lodash' => [
+                'url' => 'https://ga.jspm.io/npm:lodash@1.2.3/lodash.js',
+            ],
+            'cowsay' => [
+                'url' => 'https://ga.jspm.io/npm:cowsay@4.5.6/cowsay.umd.js',
+                'downloaded_to' => 'vendor/moo.js',
+            ],
+            'canvas-confetti' => [
+                'url' => 'https://cdn.skypack.dev/pin/canvas-confetti@v1.5.0-t438JJTXIbBReqvLtDua/mode=imports,min/optimized/canvas-confetti.js',
+                'preload' => true,
+            ],
+            'app' => [
+                'path' => 'app.js',
+            ],
+        ];
+        $mapString = var_export($map, true);
+        file_put_contents($rootDir.'/importmap.php', "<?php\n\nreturn {$mapString};\n");
+        $this->filesystem->mkdir($rootDir.'/assets/vendor');
+        file_put_contents($rootDir.'/assets/vendor/moo.js', 'moo.js contents');
+        file_put_contents($rootDir.'/assets/app.js', 'app.js contents');
+
+        $responses = [];
+        $responses[] = function ($method, $url, $options) {
+            $this->assertSame('POST', $method);
+            $this->assertSame('https://example.com/generate', $url);
+
+            return new MockResponse(json_encode([
+                'map' => [
+                    'imports' => [
+                        'lodash' => 'https://ga.jspm.io/npm:lodash@1.2.9/lodash.js',
+                        'cowsay' => 'https://ga.jspm.io/npm:cowsay@4.5.9/cowsay.umd.js',
+                        'canvas-confetti' => 'https://cdn.skypack.dev/pin/canvas-confetti@v1.6.0-t438JJTXIbBReqvLtDua/mode=imports,min/optimized/canvas-confetti.js',
+                    ],
+                ],
+            ]));
+        };
+        // 1 file will be downloaded
+        $responses[] = new MockResponse(sprintf('contents of cowsay.js'));
+        $this->httpClient->setResponseFactory($responses);
+
+        $manager->update();
+        $actualImportMap = require($rootDir.'/importmap.php');
+        $expectedImportMap = [
+            'lodash' => [
+                'url' => 'https://ga.jspm.io/npm:lodash@1.2.9/lodash.js',
+            ],
+            'cowsay' => [
+                'url' => 'https://ga.jspm.io/npm:cowsay@4.5.9/cowsay.umd.js',
+                'downloaded_to' => 'vendor/cowsay.js',
+            ],
+            // a non-jspm URL so we can make sure it updates
+            'canvas-confetti' => [
+                'url' => 'https://cdn.skypack.dev/pin/canvas-confetti@v1.6.0-t438JJTXIbBReqvLtDua/mode=imports,min/optimized/canvas-confetti.js',
+                'preload' => true,
+            ],
+            'app' => [
+                'path' => 'app.js',
+            ],
+        ];
+        $this->assertEquals($expectedImportMap, $actualImportMap);
+        $this->assertFileDoesNotExist($rootDir.'/assets/vendor/moo.js');
+        $this->assertFileExists($rootDir.'/assets/vendor/cowsay.js');
+        $actualContents = file_get_contents($rootDir.'/assets/vendor/cowsay.js');
+        $this->assertSame('contents of cowsay.js', $actualContents);
+    }
+
+    /**
+     * @dataProvider getPackageNameTests
+     */
+    public function testParsePackageName(string $packageName, array $expectedReturn)
+    {
+        $parsed = ImportMapManager::parsePackageName($packageName);
+        // remove integer keys - they're noise
+
+        if (is_array($parsed)) {
+            $parsed = array_filter($parsed, function ($key) {
+                return !is_int($key);
+            }, ARRAY_FILTER_USE_KEY);
+        }
+        $this->assertEquals($expectedReturn, $parsed);
+    }
+
+    public static function getPackageNameTests(): iterable
+    {
+        yield 'simple' => [
+            'lodash',
+            [
+                'package' => 'lodash',
+                'registry' => '',
+            ],
+        ];
+
+        yield 'with_version_constraint' => [
+            'lodash@^1.2.3',
+            [
+                'package' => 'lodash',
+                'registry' => '',
+                'version' => '^1.2.3',
+            ],
+        ];
+
+        yield 'with_registry' => [
+            'npm:lodash',
+            [
+                'package' => 'lodash',
+                'registry' => 'npm',
+            ],
+        ];
+
+        yield 'with_registry_and_version' => [
+            'npm:lodash@^1.2.3',
+            [
+                'package' => 'lodash',
+                'registry' => 'npm',
+                'version' => '^1.2.3',
+            ],
+        ];
+    }
+
+    private function createImportMapManager(array $dirs, string $rootDir, string $publicPrefix = '/assets/', string $publicDirName = 'public'): ImportMapManager
+    {
+        $mapper = $this->createAssetMapper($dirs, $rootDir, $publicPrefix, $publicDirName);
+        $this->httpClient = new MockHttpClient();
+
+        return new ImportMapManager(
+            $mapper,
+            $rootDir . '/importmap.php',
+            $rootDir . '/assets/vendor',
+            ImportMapManager::PROVIDER_JSPM,
+            $this->httpClient
+        );
+    }
+
+    private function createAssetMapper(array $dirs, string $rootDir, string $publicPrefix = '/assets/', string $publicDirName = 'public'): AssetMapper
+    {
+        $repository = new AssetMapperRepository($dirs, $rootDir);
+
+        $compiler = new AssetMapperCompiler([
+            new JavaScriptImportPathCompiler(),
+        ]);
+
+        return new AssetMapper(
+            $repository,
+            $compiler,
+            $rootDir,
+            $publicPrefix,
+            $publicDirName,
+        );
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapRendererTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapRendererTest.php
new file mode 100644
index 0000000000000..7742e9e7841ab
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapRendererTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests\ImportMap;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\AssetMapper\ImportMap\ImportMapRenderer;
+
+class ImportMapRendererTest extends TestCase
+{
+    public function testBasicRenderNoEntry()
+    {
+        $renderer = new ImportMapRenderer($this->createImportMapManager());
+        $html = $renderer->render();
+        $this->assertStringContainsString(<<<EOF
+            <script type="importmap">
+            {"imports":{}}
+            </script>
+            EOF
+        , $html);
+        $this->assertStringContainsString('<script async src="https://ga.jspm.io/npm:es-module-shims', $html);
+    }
+
+    public function testNoPolyfill()
+    {
+        $renderer = new ImportMapRenderer($this->createImportMapManager(), 'UTF-8', false);
+        $this->assertStringNotContainsString('https://ga.jspm.io/npm:es-module-shims', $renderer->render());
+    }
+
+    public function testCustomScriptAttributes()
+    {
+        $renderer = new ImportMapRenderer($this->createImportMapManager(), 'UTF-8', 'https://polyfillUrl.example', [
+            'something' => true,
+            'data-turbo-track' => 'reload'
+        ]);
+        $html = $renderer->render();
+        $this->assertStringContainsString('<script type="importmap" something data-turbo-track="reload">', $html);
+        $this->assertStringContainsString('<script async src="https://polyfillUrl.example" something data-turbo-track="reload"></script>', $html);
+    }
+
+    public function testWithEntrypoint()
+    {
+        $renderer = new ImportMapRenderer($this->createImportMapManager());
+        $this->assertStringContainsString("<script type=\"module\">import 'application';</script>", $renderer->render('application'));
+
+        $renderer = new ImportMapRenderer($this->createImportMapManager());
+        $this->assertStringContainsString("<script type=\"module\">import 'application\'s';</script>", $renderer->render("application's"));
+    }
+
+    public function testWithPreloads()
+    {
+        $renderer = new ImportMapRenderer($this->createImportMapManager([
+            '/assets/application.js',
+            'https://cdn.example.com/assets/foo.js'
+        ]));
+        $html = $renderer->render();
+        $this->assertStringContainsString('<link rel="modulepreload" href="/assets/application.js">', $html);
+        $this->assertStringContainsString('<link rel="modulepreload" href="https://cdn.example.com/assets/foo.js">', $html);
+    }
+
+    private function createImportMapManager(array $urlsToPreload = []): ImportMapManager
+    {
+        $importMapManager = $this->createMock(ImportMapManager::class);
+        $importMapManager->expects($this->once())
+            ->method('getImportMapJson')
+            ->willReturn('{"imports":{}}');
+
+        $importMapManager->expects($this->once())
+            ->method('getModulesToPreload')
+            ->willReturn($urlsToPreload);
+
+        return $importMapManager;
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/MappedAssetTest.php b/src/Symfony/Component/AssetMapper/Tests/MappedAssetTest.php
new file mode 100644
index 0000000000000..244c70dd2ad69
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/MappedAssetTest.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\AssetMapper\MappedAsset;
+
+class MappedAssetTest extends TestCase
+{
+    public function testGetLogicalPath()
+    {
+        $asset = new MappedAsset('foo.css');
+
+        $this->assertSame('foo.css', $asset->logicalPath);
+    }
+
+    public function testGetPublicPath()
+    {
+        $asset = new MappedAsset('anything');
+        $asset->setPublicPath('/assets/foo.1234567.css');
+
+        $this->assertSame('/assets/foo.1234567.css', $asset->getPublicPath());
+    }
+
+    /**
+     * @dataProvider getExtensionTests
+     */
+    public function testGetExtension(string $filename, string $expectedExtension)
+    {
+        $asset = new MappedAsset($filename);
+
+        $this->assertSame($expectedExtension, $asset->getExtension());
+    }
+
+    public static function getExtensionTests(): iterable
+    {
+        yield 'simple' => ['foo.css', 'css'];
+        yield 'with_multiple_dot' => ['foo.css.map', 'map'];
+        yield 'with_directory' => ['foo/bar.css', 'css'];
+    }
+
+    public function testGetSourcePath(): void
+    {
+        $asset = new MappedAsset('foo.css');
+        $asset->setSourcePath('/path/to/source.css');
+        $this->assertSame('/path/to/source.css', $asset->getSourcePath());
+    }
+
+    public function testGetMimeType(): void
+    {
+        $asset = new MappedAsset('foo.css');
+        $asset->setMimeType('text/css');
+        $this->assertSame('text/css', $asset->getMimeType());
+    }
+
+    public function testGetDigest(): void
+    {
+        $asset = new MappedAsset('foo.css');
+        $asset->setDigest('1234567', false);
+        $this->assertSame('1234567', $asset->getDigest());
+        $this->assertFalse($asset->isPredigested());
+    }
+
+    public function testGetContent(): void
+    {
+        $asset = new MappedAsset('foo.css');
+        $asset->setContent('body { color: red; }');
+        $this->assertSame('body { color: red; }', $asset->getContent());
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/MapperAwareAssetPackageIntegrationTest.php b/src/Symfony/Component/AssetMapper/Tests/MapperAwareAssetPackageIntegrationTest.php
new file mode 100644
index 0000000000000..1f6c627df3aec
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/MapperAwareAssetPackageIntegrationTest.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests;
+
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Asset\Packages;
+use Symfony\Component\AssetMapper\Tests\fixtures\AssetMapperTestAppKernel;
+
+class MapperAwareAssetPackageIntegrationTest extends KernelTestCase
+{
+    public function testDefaultAssetPackageIsDecorated()
+    {
+        $kernel = new AssetMapperTestAppKernel('test', true);
+        $kernel->boot();
+
+        $packages = $kernel->getContainer()->get('public.assets.packages');
+        \assert($packages instanceof Packages);
+        $this->assertSame('/assets/file1-b3445cb7a86a0795a7af7f2004498aef.css', $packages->getUrl('file1.css'));
+        $this->assertSame('/non-existent.css', $packages->getUrl('non-existent.css'));
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/MapperAwareAssetPackageTest.php b/src/Symfony/Component/AssetMapper/Tests/MapperAwareAssetPackageTest.php
new file mode 100644
index 0000000000000..fd97904af3b30
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/MapperAwareAssetPackageTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Asset\PackageInterface;
+use Symfony\Component\AssetMapper\AssetMapper;
+use Symfony\Component\AssetMapper\AssetMapperInterface;
+use Symfony\Component\AssetMapper\MapperAwareAssetPackage;
+
+class MapperAwareAssetPackageTest extends TestCase
+{
+    public function testGetVersion()
+    {
+        $inner = $this->createMock(PackageInterface::class);
+        $inner->expects($this->once())
+            ->method('getVersion')
+            ->with('foo')
+            ->willReturn('2.0');
+
+        $assetMapperPackage = new MapperAwareAssetPackage($inner, $this->createMock(AssetMapperInterface::class));
+
+        $this->assertSame('2.0', $assetMapperPackage->getVersion('foo'));
+    }
+
+    /**
+     * @dataProvider getUrlTests
+     */
+    public function testGetUrl(string $path, string $expectedPathSentToInner)
+    {
+        $inner = $this->createMock(PackageInterface::class);
+        $inner->expects($this->once())
+            ->method('getUrl')
+            ->with($expectedPathSentToInner)
+            ->willReturnCallback(function ($path) {
+                return '/'.$path;
+            });
+        $assetMapper = $this->createMock(AssetMapperInterface::class);
+        $assetMapper->expects($this->any())
+            ->method('getPublicPath')
+            ->willReturnCallback(function ($path) {
+                switch ($path) {
+                    case 'images/foo.png':
+                        return '/assets/images/foo.123456.png';
+                    case 'more-styles.css':
+                        return '/assets/more-styles.abcd123.css';
+                    default:
+                        return null;
+                }
+            });
+
+        $assetMapperPackage = new MapperAwareAssetPackage($inner, $assetMapper);
+        $this->assertSame('/'.$expectedPathSentToInner, $assetMapperPackage->getUrl($path));
+    }
+
+    public static function getUrlTests(): iterable
+    {
+        yield 'path_is_found_in_asset_mapper' => [
+            'path' => 'images/foo.png',
+            'expectedPathSentToInner' => 'assets/images/foo.123456.png',
+        ];
+
+        yield 'path_not_found_in_asset_mapper' => [
+            'path' => 'styles.css',
+            'expectedPathSentToInner' => 'styles.css',
+        ];
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/AssetMapperTestAppKernel.php b/src/Symfony/Component/AssetMapper/Tests/fixtures/AssetMapperTestAppKernel.php
new file mode 100644
index 0000000000000..8225efdfb24fd
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/AssetMapperTestAppKernel.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\AssetMapper\Tests\fixtures;
+
+use Psr\Log\NullLogger;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Kernel;
+
+class AssetMapperTestAppKernel extends Kernel
+{
+    public function registerBundles(): iterable
+    {
+        return [
+            new FrameworkBundle(),
+        ];
+    }
+
+    public function getProjectDir(): string
+    {
+        return __DIR__;
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader): void
+    {
+        $loader->load(static function (ContainerBuilder $container) {
+            $container->loadFromExtension('framework', [
+                'http_method_override' => false,
+                'assets' => null,
+                'asset_mapper' => [
+                    'paths' => ['dir1', 'dir2'],
+                ],
+                'test' => true,
+            ]);
+
+            $container->setAlias('public.assets.packages', new Alias('assets.packages', true));
+        });
+    }
+
+    protected function build(ContainerBuilder $container): void
+    {
+        $container->register('logger', NullLogger::class);
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/circular_dir/circular1.css b/src/Symfony/Component/AssetMapper/Tests/fixtures/circular_dir/circular1.css
new file mode 100644
index 0000000000000..841628d41979e
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/circular_dir/circular1.css
@@ -0,0 +1 @@
+@import url(circular2.css);
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/circular_dir/circular2.css b/src/Symfony/Component/AssetMapper/Tests/fixtures/circular_dir/circular2.css
new file mode 100644
index 0000000000000..26e6498940443
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/circular_dir/circular2.css
@@ -0,0 +1 @@
+@import url(circular1.css);
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/dir1/file1.css b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir1/file1.css
new file mode 100644
index 0000000000000..cc4c83cdd389e
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir1/file1.css
@@ -0,0 +1,2 @@
+/* file1.css */
+body {}
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/dir1/file2.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir1/file2.js
new file mode 100644
index 0000000000000..cba61d3118d2c
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir1/file2.js
@@ -0,0 +1 @@
+console.log('file2.js');
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css
new file mode 100644
index 0000000000000..8ee3e02fb0086
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css
@@ -0,0 +1,2 @@
+/* already-abcdefVWXYZ0123456789.digested.css */
+body {}
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/file3.css b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/file3.css
new file mode 100644
index 0000000000000..493a16dd6757e
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/file3.css
@@ -0,0 +1,2 @@
+/* file3.css */
+body {}
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/file4.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/file4.js
new file mode 100644
index 0000000000000..3d8e8aa0770dd
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/file4.js
@@ -0,0 +1 @@
+console.log('file4.js');
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/subdir/file5.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/subdir/file5.js
new file mode 100644
index 0000000000000..50ae355aba6c8
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/subdir/file5.js
@@ -0,0 +1,2 @@
+import '../file4.js';
+console.log('file5.js');
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/subdir/file6.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/subdir/file6.js
new file mode 100644
index 0000000000000..602ae173f3d40
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir2/subdir/file6.js
@@ -0,0 +1,2 @@
+import './file5.js';
+console.log('file6.js');
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/dir3/test.gif.foo b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir3/test.gif.foo
new file mode 100644
index 0000000000000000000000000000000000000000..6b44fc7dfb859cbcfd1b5cc72b1fa68ddd5b4328
GIT binary patch
literal 801
wcmZ?wbhEHbWMW`q_|Cxa|Nno6Q7{?;BQ*qcKpqF>1qKc_21X7R0RaYU0BZ&YM*si-

literal 0
HcmV?d00001

diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/app.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/app.js
new file mode 100644
index 0000000000000..5c0f7a1fb2a16
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/app.js
@@ -0,0 +1,7 @@
+import
+    './pizza/index.js';
+import Popcorn from './popcorn.js';
+
+import('./imported_async.js').then(() => {
+    console.log('async import done');
+});
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/imported_async.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/imported_async.js
new file mode 100644
index 0000000000000..47641c0e7e50c
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/imported_async.js
@@ -0,0 +1 @@
+console.log('imported_async.js');
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/pizza/index.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/pizza/index.js
new file mode 100644
index 0000000000000..dc37421341e49
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/pizza/index.js
@@ -0,0 +1 @@
+console.log('pizza/index.js');
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/popcorn.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/popcorn.js
new file mode 100644
index 0000000000000..06a3046c979ad
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/popcorn.js
@@ -0,0 +1 @@
+console.log('popcorn.js');
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/vendor/lodash.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/vendor/lodash.js
new file mode 100644
index 0000000000000..ac1d7f73afb58
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets/vendor/lodash.js
@@ -0,0 +1 @@
+console.log('fake downloaded lodash.js');
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets2/app2.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets2/app2.js
new file mode 100644
index 0000000000000..b565c50b03ce9
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/assets2/app2.js
@@ -0,0 +1 @@
+console.log('app2');
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/importmap.php b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/importmap.php
new file mode 100644
index 0000000000000..8071f7ecb4c18
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/importmaps/importmap.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    '@hotwired/stimulus' => [
+        'url' => 'https://unpkg.com/@hotwired/stimulus@3.2.1/dist/stimulus.js',
+        'preload' => true,
+    ],
+    'lodash' => [
+        'url' => 'https://ga.jspm.io/npm:lodash@4.17.21/lodash.js',
+        'downloaded_to' => 'vendor/lodash.js',
+    ],
+    'app' => [
+        'path' => 'app.js',
+        'preload' => true,
+    ],
+    'other_app' => [
+        // "namespaced_assets2" is defined as a namespaced path in the test
+        'path' => 'namespaced_assets2/app2.js',
+    ]
+];
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/test_public/final-assets/importmap.json b/src/Symfony/Component/AssetMapper/Tests/fixtures/test_public/final-assets/importmap.json
new file mode 100644
index 0000000000000..20b6c40cf9679
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/test_public/final-assets/importmap.json
@@ -0,0 +1,6 @@
+{
+    "imports": {
+        "@hotwired/stimulus": "https://unpkg.com/@hotwired/stimulus@3.2.1/dist/stimulus.js",
+        "app": "/assets/app-ea9ebe6156adc038aba53164e2be0867.js"
+    }
+}
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/test_public/final-assets/manifest.json b/src/Symfony/Component/AssetMapper/Tests/fixtures/test_public/final-assets/manifest.json
new file mode 100644
index 0000000000000..b32c6a99d4bef
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/Tests/fixtures/test_public/final-assets/manifest.json
@@ -0,0 +1,3 @@
+{
+    "file4.js": "/final-assets/file4.checksumfrommanifest.js"
+}
diff --git a/src/Symfony/Component/AssetMapper/composer.json b/src/Symfony/Component/AssetMapper/composer.json
new file mode 100644
index 0000000000000..24fcdc65376df
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/composer.json
@@ -0,0 +1,38 @@
+{
+    "name": "symfony/asset-mapper",
+    "type": "library",
+    "description": "Maps directories of assets & makes them available in a public directory with versioned filenames.",
+    "keywords": [],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "symfony/filesystem": "^5.4|^6.0",
+        "symfony/http-client": "^5.4|^6.0"
+    },
+    "require-dev": {
+        "symfony/asset": "^5.4|^6.0",
+        "symfony/browser-kit": "^5.4|
4027
^6.0",
+        "symfony/console": "^5.4|^6.0",
+        "symfony/framework-bundle": "^6.3",
+        "symfony/http-foundation": "^5.4|^6.0",
+        "symfony/http-kernel": "^5.4|^6.0"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Component\\AssetMapper\\": "" },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/src/Symfony/Component/AssetMapper/phpunit.xml.dist b/src/Symfony/Component/AssetMapper/phpunit.xml.dist
new file mode 100644
index 0000000000000..21a1e9bf9ede4
--- /dev/null
+++ b/src/Symfony/Component/AssetMapper/phpunit.xml.dist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Symfony AssetMapper Component Test Suite">
+            <directory>./Tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage>
+        <include>
+            <directory>./</directory>
+        </include>
+        <exclude>
+            <directory>./Tests</directory>
+            <directory>./vendor</directory>
+        </exclude>
+    </coverage>
+</phpunit>

From 98755a857746a9d53d42726bbba9695bbfffdcac Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Mon, 1 May 2023 08:24:47 +0200
Subject: [PATCH 474/475] Update CHANGELOG for 6.3.0-BETA1

---
 CHANGELOG-6.3.md | 145 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 CHANGELOG-6.3.md

diff --git a/CHANGELOG-6.3.md b/CHANGELOG-6.3.md
new file mode 100644
index 0000000000000..44d759f00f7bf
--- /dev/null
+++ b/CHANGELOG-6.3.md
@@ -0,0 +1,145 @@
+CHANGELOG for 6.3.x
+===================
+
+This changelog references the relevant changes (bug and security fixes) done
+in 6.3 minor versions.
+
+To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
+To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.3.0...v6.3.1
+
+* 6.3.0-BETA1 (2023-05-01)
+
+ * feature #49729 [Scheduler] Add a simple Scheduler class for when the component is used standalone (fabpot)
+ * feature #49725 [Messenger] Add support for the DelayStamp in InMemoryTransport (fabpot)
+ * feature #47112 [Messenger] Add a scheduler component (upyx, fabpot)
+ * feature #49691 [FrameworkBundle] Add scoped httplug clients and deprecate httplugs use like psr18 client (simonberger)
+ * feature #48542 [Webhook][RemoteEvent] Add the components (fabpot)
+ * feature #49620 [ErrorHander] Display exception properties in the HTML error page (lyrixx)
+ * feature #48128 [HttpFoundation] Add support for the 103 status code (Early Hints) and other 1XX statuses (dunglas)
+ * feature #48990 [DependencyInjection] deprecate the ``@required`` annotation (alexislefebvre)
+ * feature #49306 [Security] Add logout configuration for Clear-Site-Data header (maxbeckers)
+ * feature #49596 [Validator] Add the `exclude` option to the `Cascade` constraint (alexandre-daubois)
+ * feature #49291 [Serializer] Add methods `getSupportedTypes` to allow better performance (tucksaun, nicolas-grekas)
+ * feature #49642 [DependencyInjection] Deprecate `#[MapDecorated]` in favor of `#[AutowireDecorated]` (nicolas-grekas)
+ * feature #49539 [Messenger] make StopWorkerOnSignalsListener listen by default on SIGTERM and SIGINT (lyrixx)
+ * feature #49628 [DependencyInjection] Add support for autowiring services as closures using attributes (nicolas-grekas)
+ * feature #48992 [HttpKernel] Introduce pinnable value resolvers with `#[ValueResolver]` and `#[AsPinnedValueResolver]` (MatTheCat)
+ * feature #49121 [DomCrawler] Give choice of used parser (victor-prdh)
+ * feature #49610 [DoctrineBridge] deprecate doctrine schema subscribers in favor of listeners (alli83)
+ * feature #48821 [Serializer] add a context to allow invalid values in BackedEnumNormalizer (nikophil)
+ * feature #49529 [Console] Add support for managing exit code while handling signals (lyrixx)
+ * feature #49015 [Security] Added condition to always return the real Authenticator from security events (florentdestremau)
+ * feature #48899 [Security] Add remember me option for JSON logins (baumerdev, nicolas-grekas)
+ * feature #49302 [HttpClient] Add `UriTemplateHttpClient` (fancyweb)
+ * feature #49013 [Serializer] Replace the MissingConstructorArgumentsException class with MissingConstructorArgumentException (HypeMC)
+ * feature #49454 [Notifier] Add Pushover bridge (mocodo)
+ * feature #49461 [Mailer] Add MailerSend bridge (doobas)
+ * feature #49492 [DependencyInjection] Add support for Exclude attribute (lyrixx)
+ * feature #49139 [FrameworkBundle][HttpKernel] Display warmers duration on debug verbosity for `cache:clear` command (alexandre-daubois)
+ * feature #49417 [Validator] Add the option filenameMaxLength to the File constraint (Kevin Auvinet)
+ * feature #49487 [FrameworkBundle] Allow disabling dumping of container to XML to improve performance (ruudk)
+ * feature #49275 [FrameworkBundle][HttpKernel] Configure `ErrorHandler` on boot (HypeMC)
+ * feature #49464 [Validator] Implement countUnit option for Length constraint (spackmat)
+ * feature #49300 [Validator] Add a `NoSuspiciousCharacters` constraint to validate a string is not suspicious (MatTheCat)
+ * feature #49318 [HttpKernel] Add `skip_response_headers` to the `HttpCache` options (Toflar)
+ * feature #49428 [Messenger] Allow to define batch size when using `BatchHandlerTrait` with `getBatchSize()` (alexandre-daubois)
+ * feature #49429 [Mailer] Add option to enable Sandbox via dsn option sandbox=true (mdawart)
+ * feature #49433 [DependencyInjection] allow extending `Autowire` attribute (kbond)
+ * feature #49412 [DependencyInjection] Allow trimming service parameters value in XML configuration files (alexandre-daubois)
+ * feature #49442 [TwigBundle] Add alias deprecation for `Twig_Environment` (94noni)
+ * feature #49331 [PropertyAccess] Allow escaping in PropertyPath (alanpoulain)
+ * feature #49411 [DependencyInjection] Add AsAlias attribute (alanpoulain)
+ * feature #49343 [HtmlSanitizer] Remove experimental status (tgalopin)
+ * feature #49261 Smsapi - Make "from" optional (szal1k)
+ * feature #49327 [Notifier] Introduce FromNotificationInterface for MessageInterface implementations (fabpot)
+ * feature #49270 [Messenger] Allow passing a string instead of an array in `TransportNamesStamp` (alexandre-daubois)
+ * feature #49193 [Security] Return 403 instead of 500 when no firewall is defined (nicolas-grekas)
+ * feature #49098 [Config] Allow enum values in EnumNode (fancyweb)
+ * feature #49164 [Yaml] Feature #48920  Allow milliseconds and microseconds in dates (dustinwilson)
+ * feature #48981 [Console] Add ReStructuredText descriptor (danepowell)
+ * feature #48748 [VarDumper] Display invisible characters (alamirault)
+ * feature #48250 [Cache] Compatible with aliyun redis instance (tourze)
+ * feature #47066 [DependencyInjection] Allow attribute autoconfiguration on static methods (alex-dev)
+ * feature #49021 [SecurityBundle] Make firewalls event dispatcher traceable on debug mode (MatTheCat)
+ * feature #48930 [Cache] Add Redis Relay support (ostrolucky)
+ * feature #49102 [FrameworkBundle][Workflow] Register alias for argument for workflow services with workflow name only (lyrixx)
+ * feature #49064 [ExpressionLanguage] Deprecate loose comparisons when using the "in" operator (nicolas-grekas)
+ * feature #48999 [Lock] create migration for lock table when DoctrineDbalStore is used (alli83)
+ * feature #49011 [WebProfilerBundle] Close profiler settings on escape (norkunas)
+ * feature #48997 [WebProfilerBundle] Mailer panel tweaks (javiereguiluz)
+ * feature #49012 [WebProfilerBundle] Display date/time elements in the user local timezone (javiereguiluz)
+ * feature #48957 [Config] Do not array_unique EnumNode values (fancyweb)
+ * feature #48976 [ErrorHandler] try to read SYMFONY_PATCH_TYPE_DECLARATIONS from superglobal arrays too (xabbuh)
+ * feature #48938 [FrameworkBundle] Allow setting private services with the test container (nicolas-grekas)
+ * feature #48959 [Messenger] Allow password in redis dsn when using sockets (PhilETaylor)
+ * feature #48940 [DomCrawler] Add argument `$normalizeWhitespace` to `Crawler::innerText()` and make it return the first non-empty text (otsch)
+ * feature #48762 [WebProfilerBundle] Improve accessibility of tabs and some links (javiereguiluz)
+ * feature #48945 [WebProfilerBundle] Use a dynamic SVG favicon in the profiler (javiereguiluz)
+ * feature #48901 Allow Usage of ContentId in html (m42e)
+ * feature #48669 [ExpressionLanguage] Add `enum` expression function (alexandre-daubois)
+ * feature #48678 [FrameworkBundle] Rename service `notifier.logger_notification_listener` to `notifier.notification_logger_listener` (ker0x)
+ * feature #48516 [PhpUnitBridge] Add `enum_exists` mock (alexandre-daubois)
+ * feature #48855 [Notifier] Add new Symfony Notifier for PagerDuty (stloyd)
+ * feature #48876 [HttpKernel] Rename HttpStatus atribute to WithHttpStatus (fabpot)
+ * feature #48797 [FrameworkBundle] Add `extra` attribute for HttpClient Configuration (voodooism)
+ * feature #48747 [HttpKernel] Allow using `#[WithLogLevel]` for setting custom log level for exceptions (angelov)
+ * feature #48820 [HttpFoundation] ParameterBag::getEnum() (nikophil)
+ * feature #48685 [DependencyInjection] Exclude referencing service (self) in `TaggedIteratorArgument` (chalasr)
+ * feature #48409 [Mailer] add reject to `MessageEvent` to stop sending mail (Thomas Hanke, fabpot)
+ * feature #47709 [HttpFoundation] Add `StreamedJsonResponse` for efficient JSON streaming (alexander-schranz)
+ * feature #48810 Drop v1 contracts packages everywhere (derrabus)
+ * feature #48802 [DependencyInjection] Cut compilation time (nicolas-grekas)
+ * feature #48707 [DependencyInjection] Target Attribute must fail if the target does not exist (rodmen)
+ * feature #48387 [SecurityBundle] Rename `firewalls.logout.csrf_token_generator` to `firewalls.logout.csrf_token_manager` (MatTheCat)
+ * feature #48671 [Validator] Add `getConstraint()` method to `ConstraintViolationInterface` (syl20b)
+ * feature #48665 [FrameworkBundle] Deprecate `framework:exceptions` XML tag (MatTheCat)
+ * feature #48686 [DependencyInjection] Deprecate integer keys in "service_locator" config (upyx)
+ * feature #48616 [Notifier] GoogleChat CardsV1 is deprecated we must use cardsV2 instead (daifma)
+ * feature #48396 [Intl] Add a special locale to strip emojis easily with `EmojiTransliterator` (fancyweb)
+ * feature #48098 [HttpKernel]  Resolve DateTime value using the Clock (GromNaN)
+ * feature #48642 [Clock] Add `Clock` class and `now()` function (nicolas-grekas)
+ * feature #48531 [FrameworkBundle][Messenger] Add support for namespace wildcard in Messenger routing (brzuchal)
+ * feature #48121 [Messenger] Do not return fallback senders when other senders were already found (wouterj)
+ * feature #48582 [Security] Make login redirection logic available to programmatic login (hellomedia)
+ * feature #48352 [HttpKernel] Allow using `#[HttpStatus]` for setting status code and headers for HTTP exceptions (angelov)
+ * feature #48710 [DependencyInjection] Add support for nesting autowiring-related attributes into `#[Autowire(...)]` (nicolas-grekas)
+ * feature #48127 [Yaml] Add flag to dump numeric key as string (alamirault)
+ * feature #48696 [WebProfilerBundle] Add a title and img role to svg of the web debug toolbar (Monet Emilien)
+ * feature #48594 [SecurityBundle] Improve support for authenticators that don't need a user provider (wouterj)
+ * feature #48457 [FrameworkBundle] Improve UX ConfigDebugCommand has not yaml component (alamirault)
+ * feature #48044 [SecurityBundle] Set request stateless when firewall is stateless (alamirault)
+ * feature #48200 [Security] Allow custom user identifier for X509 authenticator (Spomky)
+ * feature #47352 [HttpKernel] FileProfilerStorage remove expired profiles mechanism (alamirault)
+ * feature #48614 [Messenger] Move Transport/InMemoryTransport to Transport/InMemory/InMemoryTransport (lyrixx)
+ * feature #48059 [HttpFoundation] Create migration for session table when pdo handler is used (alli83)
+ * feature #47349 [Notifier] Allow to update Slack messages (maxim-dovydenok-busuu)
+ * feature #48432 [VarDumper] Add support of named arguments to `dd()` and `dump()` to display a label (alexandre-daubois)
+ * feature #48275 [FrameworkBundle] Allow to avoid `limit` definition in a RateLimiter configuration when using the `no_limit` policy (alexandre-daubois)
+ * feature #39353 [FrameworkBundle][Notifier] Allow to configure or disable the message bus to use (jschaedl, fabpot)
+ * feature #48565 [Notifier] [FakeChat] Allow missing optional dependency (Benjamin Schoch)
+ * feature #48503 [Notifier] Add options to `SmsMessage` (gnito-org)
+ * feature #48164 [Serializer] Add encoder option for saving options (ihmels)
+ * feature #48206 [Console] Add placeholder formatters per ProgressBar instance (GromNaN)
+ * feature #48232 [Validator] Add `{{pattern}}` to `Regex` constraint violations (alamirault)
+ * feature #48299 [Console] #47809 remove exit() call in last SignalHandler (akuzia)
+ * feature #48424 [DomCrawler][FrameworkBundle] Add `assertSelectorCount` (curlycarla2004)
+ * feature #48546 [Notifier] [FakeSms] Allow missing optional dependency (Benjamin Schoch)
+ * feature #48484 [ProxyManagerBridge] Deprecate the package (nicolas-grekas)
+ * feature #48101 [Notifier] Add Mastodon Notifier (qdequippe)
+ * feature #48362 [Clock] Add ClockAwareTrait to help write time-sensitive classes (nicolas-grekas)
+ * feature #48478 [VarDumper] Add caster for WeakMap (nicolas-grekas)
+ * feature #47680 [DependencyInjection][HttpKernel] Introduce build parameters (HeahDude)
+ * feature #48374 [Notifier] [Telegram] Add support to answer callback queries (alexsoft)
+ * feature #48466 [Notifier] Add Line bridge (kurozumi)
+ * feature #48381 [Validator] Add `Uuid::TIME_BASED_VERSIONS` to match that a UUID being validated embeds a timestamp (alexandre-daubois)
+ * feature #48379 [HttpKernel] Set a default file link format when none is provided to FileLinkFormatter (alexandre-daubois)
+ * feature #48389 [Notifier] Add Bandwidth bridge (gnito-org)
+ * feature #48394 [Notifier] Add Plivo bridge (gnito-org)
+ * feature #48397 [Notifier] Add RingCentral bridge (gnito-org)
+ * feature #48398 [Notifier] Add Termii bridge (gnito-org)
+ * feature #48399 [Notifier] Add iSendPro bridge (leblanc-simon)
+ * feature #48084 [Notifier] Add Twitter notifier (nicolas-grekas)
+ * feature #48053 [Messenger] Improve DX (Nommyde)
+ * feature #48043 [SecurityBundle] Deprecate enabling bundle and not configuring it (alamirault)
+ * feature #48147 [DependencyInjection] Add `env` and `param` parameters for Autowire attribute (alexndlm)
+

From 94b719ec2ea1593cf3accf0c2c18e3ccf1ca8c47 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Mon, 1 May 2023 08:24:51 +0200
Subject: [PATCH 475/475] Update VERSION for 6.3.0-BETA1

---
 src/Symfony/Component/HttpKernel/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index f9a969b659130..c88671d8b4d13 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     private static array $freshCache = [];
 
-    public const VERSION = '6.3.0-DEV';
+    public const VERSION = '6.3.0-BETA1';
     public const VERSION_ID = 60300;
     public const MAJOR_VERSION = 6;
     public const MINOR_VERSION = 3;
     public const RELEASE_VERSION = 0;
-    public const EXTRA_VERSION = 'DEV';
+    public const EXTRA_VERSION = 'BETA1';
 
     public const END_OF_MAINTENANCE = '01/2024';
     public const END_OF_LIFE = '01/2024';

0